diff options
165 files changed, 3774 insertions, 4034 deletions
diff --git a/asm-de/contest_link_80C2020.s b/asm-de/contest_link_80C2020.s index 209a1bb24..0213fe90c 100644 --- a/asm-de/contest_link_80C2020.s +++ b/asm-de/contest_link_80C2020.s @@ -86,25 +86,25 @@ sub_80C2020: @ 80C2020 strh r2, [r0] ldr r0, _080C2118 @ =gUnknown_030042A0 strh r2, [r0] - ldr r0, _080C211C @ =gUnknown_030042C0 + ldr r0, _080C211C @ =gBattle_BG1_X strh r2, [r0] - ldr r0, _080C2120 @ =gUnknown_030041B4 + ldr r0, _080C2120 @ =gBattle_BG1_Y strh r2, [r0] - ldr r0, _080C2124 @ =gUnknown_03004288 + ldr r0, _080C2124 @ =gBattle_BG2_X strh r2, [r0] - ldr r0, _080C2128 @ =gUnknown_03004280 + ldr r0, _080C2128 @ =gBattle_BG2_Y strh r2, [r0] ldr r0, _080C212C @ =gUnknown_030041B0 strh r2, [r0] ldr r0, _080C2130 @ =gUnknown_030041B8 strh r2, [r0] - ldr r0, _080C2134 @ =gUnknown_030042C4 + ldr r0, _080C2134 @ =gBattle_WIN0H strh r2, [r0] - ldr r0, _080C2138 @ =gUnknown_03004240 + ldr r0, _080C2138 @ =gBattle_WIN0V strh r2, [r0] - ldr r0, _080C213C @ =gUnknown_03004200 + ldr r0, _080C213C @ =gBattle_WIN1H strh r2, [r0] - ldr r0, _080C2140 @ =gUnknown_03004244 + ldr r0, _080C2140 @ =gBattle_WIN1V strh r2, [r0] pop {r4,r5} pop {r0} @@ -121,16 +121,16 @@ _080C210C: .4byte 0x00003f3f _080C2110: .4byte REG_WIN0H _080C2114: .4byte gUnknown_030042A4 _080C2118: .4byte gUnknown_030042A0 -_080C211C: .4byte gUnknown_030042C0 -_080C2120: .4byte gUnknown_030041B4 -_080C2124: .4byte gUnknown_03004288 -_080C2128: .4byte gUnknown_03004280 +_080C211C: .4byte gBattle_BG1_X +_080C2120: .4byte gBattle_BG1_Y +_080C2124: .4byte gBattle_BG2_X +_080C2128: .4byte gBattle_BG2_Y _080C212C: .4byte gUnknown_030041B0 _080C2130: .4byte gUnknown_030041B8 -_080C2134: .4byte gUnknown_030042C4 -_080C2138: .4byte gUnknown_03004240 -_080C213C: .4byte gUnknown_03004200 -_080C2140: .4byte gUnknown_03004244 +_080C2134: .4byte gBattle_WIN0H +_080C2138: .4byte gBattle_WIN0V +_080C213C: .4byte gBattle_WIN1H +_080C2140: .4byte gBattle_WIN1V thumb_func_end sub_80C2020 thumb_func_start sub_80C2144 @@ -435,10 +435,10 @@ sub_80C2358: @ 80C2358 strb r0, [r4, 0x2] ldr r0, _080C2418 @ =sub_80C2430 bl SetMainCallback2 - ldr r1, _080C241C @ =gUnknown_03004200 + ldr r1, _080C241C @ =gBattle_WIN1H movs r0, 0xF0 strh r0, [r1] - ldr r1, _080C2420 @ =gUnknown_03004244 + ldr r1, _080C2420 @ =gBattle_WIN1V ldr r2, _080C2424 @ =0x000080a0 adds r0, r2, 0 strh r0, [r1] @@ -460,8 +460,8 @@ _080C240C: .4byte gPaletteFade _080C2410: .4byte gSharedMem + 0x18000 _080C2414: .4byte sub_80C24F4 _080C2418: .4byte sub_80C2430 -_080C241C: .4byte gUnknown_03004200 -_080C2420: .4byte gUnknown_03004244 +_080C241C: .4byte gBattle_WIN1H +_080C2420: .4byte gBattle_WIN1V _080C2424: .4byte 0x000080a0 _080C2428: .4byte sub_80C2F28 _080C242C: .4byte sub_80C2448 @@ -490,19 +490,19 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24CC @ =gUnknown_030042C0 + ldr r0, _080C24CC @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D0 @ =gUnknown_030041B4 + ldr r0, _080C24D0 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D4 @ =gUnknown_03004288 + ldr r0, _080C24D4 @ =gBattle_BG2_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D8 @ =gUnknown_03004280 + ldr r0, _080C24D8 @ =gBattle_BG2_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 @@ -514,19 +514,19 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x22 - ldr r0, _080C24E4 @ =gUnknown_030042C4 + ldr r0, _080C24E4 @ =gBattle_WIN0H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _080C24E8 @ =gUnknown_03004240 + ldr r0, _080C24E8 @ =gBattle_WIN0V ldrh r0, [r0] strh r0, [r1] subs r1, 0x2 - ldr r0, _080C24EC @ =gUnknown_03004200 + ldr r0, _080C24EC @ =gBattle_WIN1H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _080C24F0 @ =gUnknown_03004244 + ldr r0, _080C24F0 @ =gBattle_WIN1V ldrh r0, [r0] strh r0, [r1] bl LoadOam @@ -539,16 +539,16 @@ sub_80C2448: @ 80C2448 _080C24C0: .4byte REG_BG0HOFS _080C24C4: .4byte gUnknown_030042A4 _080C24C8: .4byte gUnknown_030042A0 -_080C24CC: .4byte gUnknown_030042C0 -_080C24D0: .4byte gUnknown_030041B4 -_080C24D4: .4byte gUnknown_03004288 -_080C24D8: .4byte gUnknown_03004280 +_080C24CC: .4byte gBattle_BG1_X +_080C24D0: .4byte gBattle_BG1_Y +_080C24D4: .4byte gBattle_BG2_X +_080C24D8: .4byte gBattle_BG2_Y _080C24DC: .4byte gUnknown_030041B0 _080C24E0: .4byte gUnknown_030041B8 -_080C24E4: .4byte gUnknown_030042C4 -_080C24E8: .4byte gUnknown_03004240 -_080C24EC: .4byte gUnknown_03004200 -_080C24F0: .4byte gUnknown_03004244 +_080C24E4: .4byte gBattle_WIN0H +_080C24E8: .4byte gBattle_WIN0V +_080C24EC: .4byte gBattle_WIN1H +_080C24F0: .4byte gBattle_WIN1V thumb_func_end sub_80C2448 thumb_func_start sub_80C24F4 @@ -1302,10 +1302,10 @@ _080C2AC4: .4byte _080C2CA8 .4byte _080C2CE8 _080C2ADC: - ldr r1, _080C2BC4 @ =gUnknown_030042C4 + ldr r1, _080C2BC4 @ =gBattle_WIN0H movs r0, 0xF0 strh r0, [r1] - ldr r1, _080C2BC8 @ =gUnknown_03004240 + ldr r1, _080C2BC8 @ =gBattle_WIN0V ldr r3, _080C2BCC @ =0x00005050 adds r0, r3, 0 strh r0, [r1] @@ -1413,8 +1413,8 @@ _080C2B14: strh r0, [r1, 0x8] b _080C2D04 .align 2, 0 -_080C2BC4: .4byte gUnknown_030042C4 -_080C2BC8: .4byte gUnknown_03004240 +_080C2BC4: .4byte gBattle_WIN0H +_080C2BC8: .4byte gBattle_WIN0V _080C2BCC: .4byte 0x00005050 _080C2BD0: .4byte gContestFinalStandings _080C2BD4: .4byte gContestMons @@ -1454,7 +1454,7 @@ _080C2C04: strh r0, [r4, 0xC] _080C2C30: ldrb r2, [r4, 0xC] - ldr r3, _080C2C50 @ =gUnknown_03004240 + ldr r3, _080C2C50 @ =gBattle_WIN0V movs r0, 0x50 subs r0, r2 lsls r0, 8 @@ -1469,7 +1469,7 @@ _080C2C30: strh r0, [r4, 0x8] b _080C2D04 .align 2, 0 -_080C2C50: .4byte gUnknown_03004240 +_080C2C50: .4byte gBattle_WIN0V _080C2C54: ldr r0, _080C2C60 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x6] @@ -1515,7 +1515,7 @@ _080C2CA8: ldrb r0, [r0, 0x6] cmp r0, 0x2 bne _080C2D04 - ldr r3, _080C2CE4 @ =gUnknown_03004240 + ldr r3, _080C2CE4 @ =gBattle_WIN0V ldrh r0, [r3] lsrs r2, r0, 8 adds r0, r2, 0x2 @@ -1543,7 +1543,7 @@ _080C2CD0: b _080C2D04 .align 2, 0 _080C2CE0: .4byte gSharedMem + 0x18000 -_080C2CE4: .4byte gUnknown_03004240 +_080C2CE4: .4byte gBattle_WIN0V _080C2CE8: ldr r2, _080C2D14 @ =gSharedMem + 0x18000 ldrb r0, [r2, 0x6] @@ -2857,10 +2857,10 @@ _080C36DA: adds r5, 0x1 cmp r5, 0x2 ble _080C36DA - ldr r1, _080C3754 @ =gUnknown_030042C4 + ldr r1, _080C3754 @ =gBattle_WIN0H movs r0, 0xF0 strh r0, [r1] - ldr r2, _080C3758 @ =gUnknown_03004240 + ldr r2, _080C3758 @ =gBattle_WIN0V ldrh r1, [r4, 0x22] adds r0, r1, 0 subs r0, 0x10 @@ -2878,8 +2878,8 @@ _080C36DA: .align 2, 0 _080C374C: .4byte gSharedMem + 0x18000 _080C3750: .4byte gSprites -_080C3754: .4byte gUnknown_030042C4 -_080C3758: .4byte gUnknown_03004240 +_080C3754: .4byte gBattle_WIN0H +_080C3758: .4byte gBattle_WIN0V _080C375C: .4byte REG_WININ _080C3760: .4byte 0x00003f3e thumb_func_end sub_80C3698 @@ -2902,8 +2902,8 @@ sub_80C3764: @ 80C3764 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r7, _080C37D0 @ =gUnknown_030042C4 - ldr r6, _080C37D4 @ =gUnknown_03004240 + ldr r7, _080C37D0 @ =gBattle_WIN0H + ldr r6, _080C37D4 @ =gBattle_WIN0V adds r5, r3, 0 movs r4, 0x4 adds r2, 0x2E @@ -2940,8 +2940,8 @@ _080C3790: .align 2, 0 _080C37C8: .4byte gSharedMem + 0x18000 _080C37CC: .4byte gSprites -_080C37D0: .4byte gUnknown_030042C4 -_080C37D4: .4byte gUnknown_03004240 +_080C37D0: .4byte gBattle_WIN0H +_080C37D4: .4byte gBattle_WIN0V _080C37D8: .4byte REG_WIN0H _080C37DC: .4byte REG_WININ _080C37E0: .4byte 0x00003f3f diff --git a/asm/battle_1.s b/asm/battle_1.s index c37418e5c..f0a883ec4 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -490,8 +490,8 @@ _0800D7B0: .4byte 0x0000675a _0800D7B4: .4byte gPlttBufferFaded + 0xB8 thumb_func_end sub_800D74C - thumb_func_start sub_800D7B8 -sub_800D7B8: @ 800D7B8 + thumb_func_start DrawMainBattleBackground +DrawMainBattleBackground: @ 800D7B8 push {r4,r5,lr} ldr r0, _0800D7DC @ =gBattleTypeFlags ldrh r1, [r0] @@ -792,7 +792,7 @@ _0800DAA8: .4byte 0x06008000 _0800DAAC: .4byte gBattleTerrainTilemap_Building _0800DAB0: .4byte 0x0600d000 _0800DAB4: .4byte gBattleTerrainPalette_BattleTower - thumb_func_end sub_800D7B8 + thumb_func_end DrawMainBattleBackground thumb_func_start sub_800DAB8 sub_800DAB8: @ 800DAB8 @@ -811,7 +811,7 @@ sub_800DAB8: @ 800DAB8 movs r2, 0x40 bl LoadCompressedPalette bl sub_800D74C - bl sub_800D7B8 + bl DrawMainBattleBackground pop {r0} bx r0 .align 2, 0 @@ -1231,7 +1231,7 @@ _0800E03C: ldrsh r0, [r6, r1] cmp r0, 0 beq _0800E0A4 - ldr r4, _0800E090 @ =gUnknown_030042C0 + ldr r4, _0800E090 @ =gBattle_BG1_X ldrh r0, [r6, 0xA] bl Sin2 lsls r0, 16 @@ -1246,7 +1246,7 @@ _0800E056: adds r0, r2, 0 subs r0, r1 strh r0, [r4] - ldr r4, _0800E094 @ =gUnknown_03004288 + ldr r4, _0800E094 @ =gBattle_BG2_X ldrh r0, [r6, 0xC] bl Sin2 lsls r0, 16 @@ -1261,21 +1261,21 @@ _0800E074: adds r0, r5, 0 subs r0, r1 strh r0, [r4] - ldr r0, _0800E098 @ =gUnknown_030041B4 + ldr r0, _0800E098 @ =gBattle_BG1_Y ldr r2, _0800E09C @ =0x0000ffdc adds r1, r2, 0 strh r1, [r0] - ldr r0, _0800E0A0 @ =gUnknown_03004280 + ldr r0, _0800E0A0 @ =gBattle_BG2_Y strh r1, [r0] b _0800E110 .align 2, 0 -_0800E090: .4byte gUnknown_030042C0 -_0800E094: .4byte gUnknown_03004288 -_0800E098: .4byte gUnknown_030041B4 +_0800E090: .4byte gBattle_BG1_X +_0800E094: .4byte gBattle_BG2_X +_0800E098: .4byte gBattle_BG1_Y _0800E09C: .4byte 0x0000ffdc -_0800E0A0: .4byte gUnknown_03004280 +_0800E0A0: .4byte gBattle_BG2_Y _0800E0A4: - ldr r4, _0800E134 @ =gUnknown_030042C0 + ldr r4, _0800E134 @ =gBattle_BG1_X ldrh r0, [r6, 0xA] bl Sin2 lsls r0, 16 @@ -1290,7 +1290,7 @@ _0800E0B6: adds r0, r5, 0 subs r0, r1 strh r0, [r4] - ldr r4, _0800E138 @ =gUnknown_030041B4 + ldr r4, _0800E138 @ =gBattle_BG1_Y ldrh r0, [r6, 0xA] bl Cos2 lsls r0, 16 @@ -1302,7 +1302,7 @@ _0800E0D4: asrs r0, 5 subs r0, 0xA4 strh r0, [r4] - ldr r4, _0800E13C @ =gUnknown_03004288 + ldr r4, _0800E13C @ =gBattle_BG2_X ldrh r0, [r6, 0xC] bl Sin2 lsls r0, 16 @@ -1317,7 +1317,7 @@ _0800E0EC: adds r0, r2, 0 subs r0, r1 strh r0, [r4] - ldr r4, _0800E140 @ =gUnknown_03004280 + ldr r4, _0800E140 @ =gBattle_BG2_Y ldrh r0, [r6, 0xC] bl Cos2 lsls r0, 16 @@ -1348,10 +1348,10 @@ _0800E110: strh r0, [r1, 0xA] b _0800E212 .align 2, 0 -_0800E134: .4byte gUnknown_030042C0 -_0800E138: .4byte gUnknown_030041B4 -_0800E13C: .4byte gUnknown_03004288 -_0800E140: .4byte gUnknown_03004280 +_0800E134: .4byte gBattle_BG1_X +_0800E138: .4byte gBattle_BG1_Y +_0800E13C: .4byte gBattle_BG2_X +_0800E140: .4byte gBattle_BG2_Y _0800E144: .4byte gTasks _0800E148: movs r5, 0x12 @@ -1506,11 +1506,11 @@ sub_800E23C: @ 800E23C strh r1, [r0] adds r0, 0x2 strh r1, [r0] - ldr r0, _0800E2CC @ =gUnknown_030041B4 + ldr r0, _0800E2CC @ =gBattle_BG1_Y ldr r2, _0800E2D0 @ =0x0000ff5c adds r1, r2, 0 strh r1, [r0] - ldr r0, _0800E2D4 @ =gUnknown_03004280 + ldr r0, _0800E2D4 @ =gBattle_BG2_Y strh r1, [r0] ldr r0, _0800E2D8 @ =gUnknown_081F95A4 bl LoadCompressedObjectPic @@ -1528,9 +1528,9 @@ _0800E2BC: .4byte gVersusFramePal _0800E2C0: .4byte REG_BG1CNT _0800E2C4: .4byte 0x00005c04 _0800E2C8: .4byte REG_WININ -_0800E2CC: .4byte gUnknown_030041B4 +_0800E2CC: .4byte gBattle_BG1_Y _0800E2D0: .4byte 0x0000ff5c -_0800E2D4: .4byte gUnknown_03004280 +_0800E2D4: .4byte gBattle_BG2_Y _0800E2D8: .4byte gUnknown_081F95A4 _0800E2DC: ldr r0, _0800E2F0 @ =0x00000902 diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s index 6705c0fd7..2c19ad731 100644 --- a/asm/battle_anim_81258BC.s +++ b/asm/battle_anim_81258BC.s @@ -77,12 +77,12 @@ sub_812AF30: @ 812AF30 strh r0, [r6, 0xA] movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r5, r0, 0 lsls r4, 24 asrs r4, 24 @@ -91,7 +91,7 @@ sub_812AF30: @ 812AF30 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x2 - bl sub_807712C + bl CalculatePanIncrement strh r4, [r6, 0xC] strh r5, [r6, 0xE] lsls r0, 24 @@ -188,7 +188,7 @@ sub_812B004: @ 812B004 movs r0, 0 strh r0, [r4, 0x1C] movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 ldrh r0, [r4, 0xA] lsls r1, 24 @@ -236,14 +236,14 @@ sub_812B058: @ 812B058 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 lsls r5, 24 asrs r5, 24 adds r0, r5, 0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r5, r0, 0 lsls r4, 24 asrs r4, 24 @@ -254,7 +254,7 @@ sub_812B058: @ 812B058 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 - bl sub_807712C + bl CalculatePanIncrement ldr r2, _0812B100 @ =gTasks mov r3, r8 lsls r1, r3, 2 @@ -373,10 +373,10 @@ sub_812B18C: @ 812B18C movs r4, 0 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 lsrs r6, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812B1CC @@ -402,29 +402,29 @@ _0812B1CC: adds r2, r0, 0 cmp r1, 0 bne _0812B1E8 - ldr r0, _0812B1E4 @ =gBattleAnimBankAttacker + ldr r0, _0812B1E4 @ =gAnimBankAttacker ldrb r4, [r0] b _0812B20E .align 2, 0 _0812B1E0: .4byte gBattleAnimArgs -_0812B1E4: .4byte gBattleAnimBankAttacker +_0812B1E4: .4byte gAnimBankAttacker _0812B1E8: cmp r1, 0x1 bne _0812B1F8 - ldr r0, _0812B1F4 @ =gBattleAnimBankTarget + ldr r0, _0812B1F4 @ =gAnimBankTarget ldrb r4, [r0] b _0812B20E .align 2, 0 -_0812B1F4: .4byte gBattleAnimBankTarget +_0812B1F4: .4byte gAnimBankTarget _0812B1F8: cmp r1, 0x2 bne _0812B204 - ldr r0, _0812B200 @ =gBattleAnimBankAttacker + ldr r0, _0812B200 @ =gAnimBankAttacker b _0812B206 .align 2, 0 -_0812B200: .4byte gBattleAnimBankAttacker +_0812B200: .4byte gAnimBankAttacker _0812B204: - ldr r0, _0812B230 @ =gBattleAnimBankTarget + ldr r0, _0812B230 @ =gAnimBankTarget _0812B206: ldrb r1, [r0] movs r0, 0x2 @@ -447,7 +447,7 @@ _0812B21A: bl DestroyAnimVisualTask b _0812B2B0 .align 2, 0 -_0812B230: .4byte gBattleAnimBankTarget +_0812B230: .4byte gAnimBankTarget _0812B234: adds r0, r4, 0 bl GetBankSide @@ -520,10 +520,10 @@ sub_812B2B8: @ 812B2B8 lsrs r5, r0, 24 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812B2DC @@ -532,8 +532,8 @@ sub_812B2B8: @ 812B2B8 .align 2, 0 _0812B2D8: .4byte gSharedMem + 0x19348 _0812B2DC: - ldr r1, _0812B304 @ =gUnknown_0202F7CA - ldr r0, _0812B308 @ =gBattleAnimBankAttacker + ldr r1, _0812B304 @ =gAnimSpeciesByBanks + ldr r0, _0812B308 @ =gAnimBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -552,8 +552,8 @@ _0812B2F6: pop {r0} bx r0 .align 2, 0 -_0812B304: .4byte gUnknown_0202F7CA -_0812B308: .4byte gBattleAnimBankAttacker +_0812B304: .4byte gAnimSpeciesByBanks +_0812B308: .4byte gAnimBankAttacker thumb_func_end sub_812B2B8 thumb_func_start sub_812B30C @@ -567,7 +567,7 @@ sub_812B30C: @ 812B30C ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -593,7 +593,7 @@ sub_812B340: @ 812B340 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -626,14 +626,14 @@ sub_812B374: @ 812B374 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 lsls r5, 24 asrs r5, 24 adds r0, r5, 0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r5, r0, 0 lsls r4, 24 asrs r4, 24 @@ -644,7 +644,7 @@ sub_812B374: @ 812B374 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 - bl sub_807712C + bl CalculatePanIncrement ldr r2, _0812B3FC @ =gTasks mov r3, r8 lsls r1, r3, 2 diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 91033c777..02eec98ec 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -77,7 +77,7 @@ sub_812C184: @ 812C184 b _0812C1CA _0812C1C4: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C1CA: pop {r0} bx r0 @@ -89,10 +89,10 @@ sub_812C1D0: @ 812C1D0 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _0812C21C @ =gBattleAnimBankTarget + ldr r6, _0812C21C @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 8 @@ -102,7 +102,7 @@ sub_812C1D0: @ 812C1D0 asrs r4, 16 ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r1, r0, 0 lsls r1, 24 lsrs r1, 8 @@ -119,7 +119,7 @@ sub_812C1D0: @ 812C1D0 pop {r0} bx r0 .align 2, 0 -_0812C21C: .4byte gBattleAnimBankTarget +_0812C21C: .4byte gAnimBankTarget thumb_func_end sub_812C1D0 thumb_func_start sub_812C220 @@ -198,7 +198,7 @@ sub_812C2A4: @ 812C2A4 strh r2, [r1] adds r1, 0x2 strh r2, [r1] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 @@ -210,16 +210,16 @@ sub_812C2BC: @ 812C2BC push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 - ldr r4, _0812C348 @ =gBattleAnimBankTarget + ldr r4, _0812C348 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 @@ -240,7 +240,7 @@ sub_812C2BC: @ 812C2BC lsls r1, 23 adds r0, r1 lsrs r4, r0, 16 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812C31A @@ -264,7 +264,7 @@ _0812C31A: strh r6, [r5, 0x36] ldr r0, _0812C350 @ =sub_8078B34 str r0, [r5, 0x1C] - ldr r1, _0812C354 @ =move_anim_8072740 + ldr r1, _0812C354 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData add sp, 0x4 @@ -272,10 +272,10 @@ _0812C31A: pop {r0} bx r0 .align 2, 0 -_0812C348: .4byte gBattleAnimBankTarget +_0812C348: .4byte gAnimBankTarget _0812C34C: .4byte gBattleAnimArgs _0812C350: .4byte sub_8078B34 -_0812C354: .4byte move_anim_8072740 +_0812C354: .4byte DestroyAnimSprite thumb_func_end sub_812C2BC thumb_func_start sub_812C358 @@ -547,7 +547,7 @@ _0812C53A: strh r0, [r1] strh r0, [r4] adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C550: pop {r4} pop {r0} @@ -796,7 +796,7 @@ sub_812C720: @ 812C720 adds r4, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _0812C784 @ =gBattleAnimBankTarget + ldr r0, _0812C784 @ =gAnimBankTarget ldrb r0, [r0] mov r5, sp adds r5, 0x2 @@ -804,7 +804,7 @@ sub_812C720: @ 812C720 mov r2, sp adds r3, r5, 0 bl sub_807A3FC - ldr r0, _0812C788 @ =gBattleAnimBankAttacker + ldr r0, _0812C788 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -838,8 +838,8 @@ _0812C754: pop {r0} bx r0 .align 2, 0 -_0812C784: .4byte gBattleAnimBankTarget -_0812C788: .4byte gBattleAnimBankAttacker +_0812C784: .4byte gAnimBankTarget +_0812C788: .4byte gAnimBankAttacker _0812C78C: .4byte gBattleAnimArgs _0812C790: .4byte 0x0000ffce _0812C794: .4byte sub_812C798 @@ -904,7 +904,7 @@ _0812C7F4: cmp r0, 0x10 bne _0812C808 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C808: pop {r0} bx r0 @@ -926,7 +926,7 @@ sub_812C80C: @ 812C80C strh r0, [r4, 0x22] ldr r0, _0812C840 @ =sub_8078600 str r0, [r4, 0x1C] - ldr r1, _0812C844 @ =move_anim_8072740 + ldr r1, _0812C844 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -935,7 +935,7 @@ sub_812C80C: @ 812C80C .align 2, 0 _0812C83C: .4byte gBattleAnimArgs _0812C840: .4byte sub_8078600 -_0812C844: .4byte move_anim_8072740 +_0812C844: .4byte DestroyAnimSprite thumb_func_end sub_812C80C thumb_func_start sub_812C848 @@ -953,11 +953,11 @@ sub_812C848: @ 812C848 ldrsh r1, [r5, r2] adds r0, r4, 0 bl sub_807867C - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812C89C - ldr r0, _0812C888 @ =gBattleAnimBankAttacker + ldr r0, _0812C888 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -967,7 +967,7 @@ sub_812C848: @ 812C848 b _0812C8A2 .align 2, 0 _0812C884: .4byte gBattleAnimArgs -_0812C888: .4byte gBattleAnimBankAttacker +_0812C888: .4byte gAnimBankAttacker _0812C88C: movs r1, 0x4 ldrsh r0, [r5, r1] @@ -1028,7 +1028,7 @@ _0812C8A8: cmp r0, 0xF0 bls _0812C900 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C900: pop {r4,r5} pop {r0} @@ -1046,7 +1046,7 @@ sub_812C908: @ 812C908 cmp r0, 0 beq _0812C91E adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812C91E: pop {r0} bx r0 @@ -1057,7 +1057,7 @@ sub_812C924: @ 812C924 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0812C940 @ =gBattleAnimBankTarget + ldr r0, _0812C940 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1068,7 +1068,7 @@ sub_812C924: @ 812C924 movs r0, 0 b _0812C94C .align 2, 0 -_0812C940: .4byte gBattleAnimBankTarget +_0812C940: .4byte gAnimBankTarget _0812C944: .4byte gBattleAnimArgs _0812C948: ldr r1, _0812C95C @ =gBattleAnimArgs @@ -1089,7 +1089,7 @@ sub_812C960: @ 812C960 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0812C974 @ =gMoveDmgMoveAnim + ldr r0, _0812C974 @ =gAnimMoveDmg ldr r0, [r0] cmp r0, 0 ble _0812C97C @@ -1097,7 +1097,7 @@ sub_812C960: @ 812C960 movs r0, 0 b _0812C980 .align 2, 0 -_0812C974: .4byte gMoveDmgMoveAnim +_0812C974: .4byte gAnimMoveDmg _0812C978: .4byte gBattleAnimArgs _0812C97C: ldr r1, _0812C98C @ =gBattleAnimArgs @@ -1128,10 +1128,10 @@ sub_812C990: @ 812C990 adds r1, r3, 0 orrs r0, r1 strh r0, [r2] - ldr r0, _0812C9F4 @ =gUnknown_030042C4 + ldr r0, _0812C9F4 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _0812C9F8 @ =gUnknown_03004240 + ldr r0, _0812C9F8 @ =gBattle_WIN0V strh r1, [r0] ldr r0, _0812C9FC @ =REG_WIN0H strh r1, [r0] @@ -1161,8 +1161,8 @@ sub_812C990: @ 812C990 .align 2, 0 _0812C9EC: .4byte REG_WINOUT _0812C9F0: .4byte 0x00001f3f -_0812C9F4: .4byte gUnknown_030042C4 -_0812C9F8: .4byte gUnknown_03004240 +_0812C9F4: .4byte gBattle_WIN0H +_0812C9F8: .4byte gBattle_WIN0V _0812C9FC: .4byte REG_WIN0H _0812CA00: .4byte sub_812CA04 thumb_func_end sub_812C990 @@ -1288,7 +1288,7 @@ sub_812CAD0: @ 812CAD0 adds r2, r4, 0 eors r1, r2 strh r1, [r3] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r4} pop {r0} bx r0 @@ -1306,16 +1306,16 @@ sub_812CAFC: @ 812CAFC ldrsh r0, [r6, r1] cmp r0, 0 bne _0812CB28 - ldr r4, _0812CB74 @ =gBattleAnimBankAttacker + ldr r4, _0812CB74 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1357,7 +1357,7 @@ _0812CB28: b _0812CB8A .align 2, 0 _0812CB70: .4byte gBattleAnimArgs -_0812CB74: .4byte gBattleAnimBankAttacker +_0812CB74: .4byte gAnimBankAttacker _0812CB78: .4byte 0x000003ff _0812CB7C: .4byte 0xfffffc00 _0812CB80: .4byte 0x0000fff4 @@ -1412,7 +1412,7 @@ sub_812CBB4: @ 812CBB4 bne _0812CC12 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -1443,7 +1443,7 @@ _0812CC12: cmp r0, 0 bne _0812CC20 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812CC20: pop {r4} pop {r0} @@ -1472,7 +1472,7 @@ sub_812CC44: @ 812CC44 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812CC7A @@ -1480,19 +1480,19 @@ sub_812CC44: @ 812CC44 ldr r2, _0812CC8C @ =0x00001f3f adds r0, r2, 0 strh r0, [r1] - ldr r1, _0812CC90 @ =gUnknown_03004200 + ldr r1, _0812CC90 @ =gBattle_WIN1H ldr r2, _0812CC94 @ =0x000098f0 adds r0, r2, 0 strh r0, [r1] - ldr r1, _0812CC98 @ =gUnknown_03004244 + ldr r1, _0812CC98 @ =gBattle_WIN1V movs r0, 0xA0 strh r0, [r1] ldr r1, _0812CC9C @ =REG_WIN1H - ldr r0, _0812CCA0 @ =gUnknown_030042C4 + ldr r0, _0812CCA0 @ =gBattle_WIN0H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _0812CCA4 @ =gUnknown_03004240 + ldr r0, _0812CCA4 @ =gBattle_WIN0V ldrh r0, [r0] strh r0, [r1] _0812CC7A: @@ -1504,12 +1504,12 @@ _0812CC7A: .align 2, 0 _0812CC88: .4byte REG_WININ _0812CC8C: .4byte 0x00001f3f -_0812CC90: .4byte gUnknown_03004200 +_0812CC90: .4byte gBattle_WIN1H _0812CC94: .4byte 0x000098f0 -_0812CC98: .4byte gUnknown_03004244 +_0812CC98: .4byte gBattle_WIN1V _0812CC9C: .4byte REG_WIN1H -_0812CCA0: .4byte gUnknown_030042C4 -_0812CCA4: .4byte gUnknown_03004240 +_0812CCA0: .4byte gBattle_WIN0H +_0812CCA4: .4byte gBattle_WIN0V thumb_func_end sub_812CC44 thumb_func_start sub_812CCA8 @@ -1517,7 +1517,7 @@ sub_812CCA8: @ 812CCA8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812CCCA @@ -1525,10 +1525,10 @@ sub_812CCA8: @ 812CCA8 ldr r2, _0812CCDC @ =0x00003f3f adds r0, r2, 0 strh r0, [r1] - ldr r0, _0812CCE0 @ =gUnknown_03004200 + ldr r0, _0812CCE0 @ =gBattle_WIN1H movs r1, 0 strh r1, [r0] - ldr r0, _0812CCE4 @ =gUnknown_03004244 + ldr r0, _0812CCE4 @ =gBattle_WIN1V strh r1, [r0] _0812CCCA: adds r0, r4, 0 @@ -1539,8 +1539,8 @@ _0812CCCA: .align 2, 0 _0812CCD8: .4byte REG_WININ _0812CCDC: .4byte 0x00003f3f -_0812CCE0: .4byte gUnknown_03004200 -_0812CCE4: .4byte gUnknown_03004244 +_0812CCE0: .4byte gBattle_WIN1H +_0812CCE4: .4byte gBattle_WIN1V thumb_func_end sub_812CCA8 thumb_func_start sub_812CCE8 @@ -1552,17 +1552,17 @@ sub_812CCE8: @ 812CCE8 ldrsh r0, [r6, r1] cmp r0, 0 bne _0812CD04 - ldr r4, _0812CD00 @ =gBattleAnimBankAttacker + ldr r4, _0812CD00 @ =gAnimBankAttacker b _0812CD06 .align 2, 0 _0812CCFC: .4byte gBattleAnimArgs -_0812CD00: .4byte gBattleAnimBankAttacker +_0812CD00: .4byte gAnimBankAttacker _0812CD04: - ldr r4, _0812CD58 @ =gBattleAnimBankTarget + ldr r4, _0812CD58 @ =gAnimBankTarget _0812CD06: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x2] @@ -1570,7 +1570,7 @@ _0812CD06: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1601,7 +1601,7 @@ _0812CD3E: pop {r0} bx r0 .align 2, 0 -_0812CD58: .4byte gBattleAnimBankTarget +_0812CD58: .4byte gAnimBankTarget _0812CD5C: .4byte gBattleAnimArgs _0812CD60: .4byte sub_812CD64 thumb_func_end sub_812CCE8 @@ -1640,7 +1640,7 @@ sub_812CD64: @ 812CD64 cmp r0, r1 bge _0812CDC2 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _0812CDC2 .align 2, 0 _0812CDAC: .4byte gSineTable @@ -1652,7 +1652,7 @@ _0812CDB0: cmp r0, r1 ble _0812CDC2 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812CDC2: pop {r0} bx r0 @@ -1674,14 +1674,14 @@ sub_812CDC8: @ 812CDC8 ldrsh r0, [r0, r1] cmp r0, 0 bne _0812CDF4 - ldr r4, _0812CDF0 @ =gBattleAnimBankAttacker + ldr r4, _0812CDF0 @ =gAnimBankAttacker b _0812CDF6 .align 2, 0 _0812CDE8: .4byte gTasks _0812CDEC: .4byte gBattleAnimArgs -_0812CDF0: .4byte gBattleAnimBankAttacker +_0812CDF0: .4byte gAnimBankAttacker _0812CDF4: - ldr r4, _0812CE3C @ =gBattleAnimBankTarget + ldr r4, _0812CE3C @ =gAnimBankTarget _0812CDF6: ldrb r0, [r4] bl sub_8077FC0 @@ -1714,14 +1714,14 @@ _0812CE20: strh r2, [r5, 0x16] cmp r7, 0x1 bne _0812CE48 - ldr r0, _0812CE44 @ =gUnknown_030042C0 + ldr r0, _0812CE44 @ =gBattle_BG1_X b _0812CE4A .align 2, 0 -_0812CE3C: .4byte gBattleAnimBankTarget +_0812CE3C: .4byte gAnimBankTarget _0812CE40: .4byte gBattleAnimArgs -_0812CE44: .4byte gUnknown_030042C0 +_0812CE44: .4byte gBattle_BG1_X _0812CE48: - ldr r0, _0812CE68 @ =gUnknown_03004288 + ldr r0, _0812CE68 @ =gBattle_BG2_X _0812CE4A: ldrh r2, [r0] strh r2, [r5, 0x18] @@ -1738,7 +1738,7 @@ _0812CE4A: ldrh r3, [r5, 0x18] b _0812CE70 .align 2, 0 -_0812CE68: .4byte gUnknown_03004288 +_0812CE68: .4byte gBattle_BG2_X _0812CE6C: strh r2, [r5, 0x1E] ldrh r3, [r5, 0x1A] @@ -1974,16 +1974,16 @@ sub_812D008: @ 812D008 movs r5, 0 strh r5, [r4, 0x8] strh r5, [r4, 0xA] - ldr r6, _0812D060 @ =gBattleAnimBankAttacker + ldr r6, _0812D060 @ =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xE] @@ -2004,7 +2004,7 @@ sub_812D008: @ 812D008 bx r0 .align 2, 0 _0812D05C: .4byte gTasks -_0812D060: .4byte gBattleAnimBankAttacker +_0812D060: .4byte gAnimBankAttacker _0812D064: .4byte 0x0000ffec _0812D068: .4byte sub_812D06C thumb_func_end sub_812D008 @@ -2081,7 +2081,7 @@ _0812D0D4: lsrs r4, r0, 24 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -2347,7 +2347,7 @@ _0812D2F0: ldrsh r0, [r5, r1] cmp r0, 0x3D bne _0812D33C - ldr r1, _0812D344 @ =move_anim_8072740 + ldr r1, _0812D344 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldrh r0, [r5, 0x24] @@ -2363,16 +2363,16 @@ _0812D2F0: strh r1, [r5, 0x26] movs r0, 0x14 strh r0, [r5, 0x2E] - ldr r4, _0812D348 @ =gBattleAnimBankTarget + ldr r4, _0812D348 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -2383,8 +2383,8 @@ _0812D33C: pop {r0} bx r0 .align 2, 0 -_0812D344: .4byte move_anim_8072740 -_0812D348: .4byte gBattleAnimBankTarget +_0812D344: .4byte DestroyAnimSprite +_0812D348: .4byte gAnimBankTarget _0812D34C: .4byte sub_8078B34 thumb_func_end sub_812D294 @@ -2460,16 +2460,16 @@ _0812D3CC: beq _0812D490 b _0812D4AE _0812D3D6: - ldr r4, _0812D408 @ =gBattleAnimBankAttacker + ldr r4, _0812D408 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2482,7 +2482,7 @@ _0812D3D6: strh r0, [r5, 0x32] b _0812D484 .align 2, 0 -_0812D408: .4byte gBattleAnimBankAttacker +_0812D408: .4byte gAnimBankAttacker _0812D40C: ldrh r0, [r5, 0x30] adds r0, 0x60 @@ -2563,7 +2563,7 @@ _0812D490: cmp r0, r1 bge _0812D4AE adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812D4AE: pop {r4-r6} pop {r0} @@ -2574,7 +2574,7 @@ _0812D4AE: sub_812D4B4: @ 812D4B4 push {r4,lr} adds r4, r0, 0 - ldr r0, _0812D4CC @ =gBattleAnimBankAttacker + ldr r0, _0812D4CC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2583,7 +2583,7 @@ sub_812D4B4: @ 812D4B4 ldr r0, _0812D4D0 @ =0x0000fff0 b _0812D4D8 .align 2, 0 -_0812D4CC: .4byte gBattleAnimBankAttacker +_0812D4CC: .4byte gAnimBankAttacker _0812D4D0: .4byte 0x0000fff0 _0812D4D4: movs r0, 0x80 @@ -2608,7 +2608,7 @@ sub_812D4EC: @ 812D4EC ldrh r0, [r4, 0x2E] adds r0, 0x48 strh r0, [r4, 0x2E] - ldr r0, _0812D50C @ =gBattleAnimBankAttacker + ldr r0, _0812D50C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2619,7 +2619,7 @@ sub_812D4EC: @ 812D4EC asrs r0, 20 b _0812D518 .align 2, 0 -_0812D50C: .4byte gBattleAnimBankAttacker +_0812D50C: .4byte gAnimBankAttacker _0812D510: ldrh r0, [r4, 0x2E] lsls r0, 16 @@ -2674,7 +2674,7 @@ _0812D564: cmp r0, r1 bls _0812D57E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812D57E: pop {r4,r5} pop {r0} @@ -2919,10 +2919,10 @@ _0812D736: movs r0, 0x90 lsls r0, 4 strh r0, [r4, 0x30] - ldr r0, _0812D75C @ =gBattleAnimBankAttacker + ldr r0, _0812D75C @ =gAnimBankAttacker ldrb r0, [r0] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -2931,7 +2931,7 @@ _0812D736: strh r0, [r4, 0x2E] b _0812D788 .align 2, 0 -_0812D75C: .4byte gBattleAnimBankAttacker +_0812D75C: .4byte gAnimBankAttacker _0812D760: ldrh r2, [r4, 0x30] lsls r1, r2, 16 @@ -2951,7 +2951,7 @@ _0812D760: cmp r0, r1 ble _0812D788 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812D788: pop {r4} pop {r0} @@ -3043,7 +3043,7 @@ _0812D834: ldr r1, _0812D850 @ =REG_MOSAIC movs r0, 0 strh r0, [r1] - ldr r0, _0812D854 @ =gBattleAnimBankAttacker + ldr r0, _0812D854 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -3054,7 +3054,7 @@ _0812D834: b _0812D85E .align 2, 0 _0812D850: .4byte REG_MOSAIC -_0812D854: .4byte gBattleAnimBankAttacker +_0812D854: .4byte gAnimBankAttacker _0812D858: .4byte REG_BG1CNT _0812D85C: ldr r0, _0812D87C @ =REG_BG2CNT @@ -3110,9 +3110,9 @@ _0812D8BC: .align 2, 0 _0812D8C0: .4byte REG_MOSAIC _0812D8C4: - ldr r5, _0812D8F4 @ =gBattleAnimBankAttacker + ldr r5, _0812D8F4 @ =gAnimBankAttacker ldrb r0, [r5] - ldr r1, _0812D8F8 @ =gBattleAnimBankTarget + ldr r1, _0812D8F8 @ =gAnimBankTarget ldrb r1, [r1] mov r2, r8 lsls r4, r2, 2 @@ -3124,7 +3124,7 @@ _0812D8C4: ldrb r1, [r5] mov r0, sp bl sub_8078954 - bl NotInBattle + bl IsContest lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -3132,8 +3132,8 @@ _0812D8C4: movs r1, 0 b _0812D906 .align 2, 0 -_0812D8F4: .4byte gBattleAnimBankAttacker -_0812D8F8: .4byte gBattleAnimBankTarget +_0812D8F4: .4byte gAnimBankAttacker +_0812D8F8: .4byte gAnimBankTarget _0812D8FC: ldrb r0, [r5] bl GetBankIdentity @@ -3144,7 +3144,7 @@ _0812D906: lsls r1, 2 adds r1, r0 ldr r2, _0812D9D0 @ =gBattleMonForms - ldr r0, _0812D9D4 @ =gBattleAnimBankAttacker + ldr r0, _0812D9D4 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r2 ldrb r0, [r0] @@ -3158,16 +3158,16 @@ _0812D906: ldr r1, _0812D9DC @ =0x84000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812DA20 ldr r5, _0812D9E0 @ =gSharedMem + 0x19348 ldrh r0, [r5] - bl sub_80AEB1C + bl IsSpeciesNotUnown adds r4, r0, 0 ldrh r0, [r5, 0x2] - bl sub_80AEB1C + bl IsSpeciesNotUnown lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -3222,13 +3222,13 @@ _0812D98E: _0812D9A2: ldr r0, _0812D9E0 @ =gSharedMem + 0x19348 ldrh r0, [r0, 0x2] - bl sub_80AEB1C + bl IsSpeciesNotUnown lsls r0, 24 cmp r0, 0 beq _0812D9F0 ldr r3, _0812D9E4 @ =gSprites ldr r4, _0812D9E8 @ =gObjectBankIDs - ldr r2, _0812D9D4 @ =gBattleAnimBankAttacker + ldr r2, _0812D9D4 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r4 ldrb r1, [r0] @@ -3243,7 +3243,7 @@ _0812D9A2: .align 2, 0 _0812D9CC: .4byte gUnknown_081FAF4C _0812D9D0: .4byte gBattleMonForms -_0812D9D4: .4byte gBattleAnimBankAttacker +_0812D9D4: .4byte gAnimBankAttacker _0812D9D8: .4byte 0x040000d4 _0812D9DC: .4byte 0x84000200 _0812D9E0: .4byte gSharedMem + 0x19348 @@ -3253,7 +3253,7 @@ _0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18 _0812D9F0: ldr r3, _0812DA34 @ =gSprites ldr r4, _0812DA38 @ =gObjectBankIDs - ldr r2, _0812DA3C @ =gBattleAnimBankAttacker + ldr r2, _0812DA3C @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r4 ldrb r1, [r0] @@ -3289,7 +3289,7 @@ _0812DA2A: .align 2, 0 _0812DA34: .4byte gSprites _0812DA38: .4byte gObjectBankIDs -_0812DA3C: .4byte gBattleAnimBankAttacker +_0812DA3C: .4byte gAnimBankAttacker _0812DA40: .4byte gSpriteAffineAnimTable_81E7BEC _0812DA44: .4byte gTasks _0812DA48: @@ -3328,7 +3328,7 @@ _0812DA84: ldr r1, _0812DAA0 @ =REG_MOSAIC movs r0, 0 strh r0, [r1] - ldr r0, _0812DAA4 @ =gBattleAnimBankAttacker + ldr r0, _0812DAA4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -3339,7 +3339,7 @@ _0812DA84: b _0812DAAE .align 2, 0 _0812DAA0: .4byte REG_MOSAIC -_0812DAA4: .4byte gBattleAnimBankAttacker +_0812DAA4: .4byte gAnimBankAttacker _0812DAA8: .4byte REG_BG1CNT _0812DAAC: ldr r2, _0812DB08 @ =REG_BG2CNT @@ -3349,11 +3349,11 @@ _0812DAAE: negs r0, r0 ands r0, r1 strb r0, [r2] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812DAF4 - ldr r4, _0812DB0C @ =gBattleAnimBankAttacker + ldr r4, _0812DB0C @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -3389,7 +3389,7 @@ _0812DAFA: bx r0 .align 2, 0 _0812DB08: .4byte REG_BG2CNT -_0812DB0C: .4byte gBattleAnimBankAttacker +_0812DB0C: .4byte gAnimBankAttacker _0812DB10: .4byte gTasks _0812DB14: .4byte gSharedMem + 0x17800 thumb_func_end sub_812D7E8 @@ -3402,7 +3402,7 @@ c3_80DFBE4: @ 812DB18 ldr r4, _0812DB48 @ =gBattleAnimArgs ldr r3, _0812DB4C @ =gSprites ldr r2, _0812DB50 @ =gObjectBankIDs - ldr r1, _0812DB54 @ =gBattleAnimBankAttacker + ldr r1, _0812DB54 @ =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 ldrb r2, [r1] @@ -3423,7 +3423,7 @@ c3_80DFBE4: @ 812DB18 _0812DB48: .4byte gBattleAnimArgs _0812DB4C: .4byte gSprites _0812DB50: .4byte gObjectBankIDs -_0812DB54: .4byte gBattleAnimBankAttacker +_0812DB54: .4byte gAnimBankAttacker thumb_func_end c3_80DFBE4 thumb_func_start sub_812DB58 @@ -3432,9 +3432,9 @@ sub_812DB58: @ 812DB58 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0812DB7C @ =gBattleAnimBankAttacker + ldr r0, _0812DB7C @ =gAnimBankAttacker ldrb r0, [r0] - ldr r1, _0812DB80 @ =gBattleAnimBankTarget + ldr r1, _0812DB80 @ =gAnimBankTarget ldrb r1, [r1] movs r2, 0x1 bl sub_8031FC4 @@ -3444,8 +3444,8 @@ sub_812DB58: @ 812DB58 pop {r0} bx r0 .align 2, 0 -_0812DB7C: .4byte gBattleAnimBankAttacker -_0812DB80: .4byte gBattleAnimBankTarget +_0812DB7C: .4byte gAnimBankAttacker +_0812DB80: .4byte gAnimBankTarget thumb_func_end sub_812DB58 thumb_func_start sub_812DB84 @@ -3506,7 +3506,7 @@ _0812DBD0: movs r1, 0x1 orrs r0, r1 strb r0, [r4] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812DC12 @@ -3541,7 +3541,7 @@ _0812DC12: lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812DC9C @@ -3551,11 +3551,11 @@ _0812DC12: movs r2, 0 movs r3, 0 bl sub_80763FC - ldr r1, _0812DC90 @ =gUnknown_030042C0 + ldr r1, _0812DC90 @ =gBattle_BG1_X ldr r2, _0812DC94 @ =0x0000ffc8 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0812DC98 @ =gUnknown_030041B4 + ldr r0, _0812DC98 @ =gBattle_BG1_Y strh r4, [r0] b _0812DCCE .align 2, 0 @@ -3567,31 +3567,31 @@ _0812DC80: .4byte 0x85000400 _0812DC84: .4byte gUnknown_08D2AA98 _0812DC88: .4byte gUnknown_08D2A9E0 _0812DC8C: .4byte gUnknown_08D2AA80 -_0812DC90: .4byte gUnknown_030042C0 +_0812DC90: .4byte gBattle_BG1_X _0812DC94: .4byte 0x0000ffc8 -_0812DC98: .4byte gUnknown_030041B4 +_0812DC98: .4byte gBattle_BG1_Y _0812DC9C: - ldr r0, _0812DCB4 @ =gBattleAnimBankAttacker + ldr r0, _0812DCB4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812DCC0 - ldr r1, _0812DCB8 @ =gUnknown_030042C0 + ldr r1, _0812DCB8 @ =gBattle_BG1_X ldr r4, _0812DCBC @ =0x0000ff79 adds r0, r4, 0 b _0812DCC6 .align 2, 0 -_0812DCB4: .4byte gBattleAnimBankAttacker -_0812DCB8: .4byte gUnknown_030042C0 +_0812DCB4: .4byte gAnimBankAttacker +_0812DCB8: .4byte gBattle_BG1_X _0812DCBC: .4byte 0x0000ff79 _0812DCC0: - ldr r1, _0812DCEC @ =gUnknown_030042C0 + ldr r1, _0812DCEC @ =gBattle_BG1_X ldr r2, _0812DCF0 @ =0x0000fff6 adds r0, r2, 0 _0812DCC6: strh r0, [r1] - ldr r1, _0812DCF4 @ =gUnknown_030041B4 + ldr r1, _0812DCF4 @ =gBattle_BG1_Y movs r0, 0 strh r0, [r1] _0812DCCE: @@ -3600,19 +3600,19 @@ _0812DCCE: adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, _0812DCEC @ =gUnknown_030042C0 + ldr r0, _0812DCEC @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r1, 0x1C] - ldr r0, _0812DCF4 @ =gUnknown_030041B4 + ldr r0, _0812DCF4 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r1, 0x1E] ldrh r0, [r1, 0x8] adds r0, 0x1 b _0812DDD2 .align 2, 0 -_0812DCEC: .4byte gUnknown_030042C0 +_0812DCEC: .4byte gBattle_BG1_X _0812DCF0: .4byte 0x0000fff6 -_0812DCF4: .4byte gUnknown_030041B4 +_0812DCF4: .4byte gBattle_BG1_Y _0812DCF8: .4byte gTasks _0812DCFC: lsls r0, r7, 2 @@ -3685,7 +3685,7 @@ _0812DD64: beq _0812DD7C b _0812DE80 _0812DD7C: - ldr r2, _0812DDA8 @ =gUnknown_030042C0 + ldr r2, _0812DDA8 @ =gBattle_BG1_X ldr r1, _0812DDAC @ =gUnknown_084025C0 movs r4, 0xC ldrsh r0, [r3, r4] @@ -3707,7 +3707,7 @@ _0812DD7C: b _0812DE80 .align 2, 0 _0812DDA4: .4byte REG_BLDALPHA -_0812DDA8: .4byte gUnknown_030042C0 +_0812DDA8: .4byte gBattle_BG1_X _0812DDAC: .4byte gUnknown_084025C0 _0812DDB0: movs r0, 0x3 @@ -3732,7 +3732,7 @@ _0812DDD2: strh r0, [r1, 0x8] movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -3785,7 +3785,7 @@ _0812DE0C: ldr r1, _0812DE98 @ =0x85000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812DE5A @@ -3804,9 +3804,9 @@ _0812DE5A: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _0812DEA0 @ =gUnknown_030042C0 + ldr r0, _0812DEA0 @ =gBattle_BG1_X strh r4, [r0] - ldr r0, _0812DEA4 @ =gUnknown_030041B4 + ldr r0, _0812DEA4 @ =gBattle_BG1_Y strh r4, [r0] ldr r0, _0812DEA8 @ =REG_BLDCNT strh r4, [r0] @@ -3827,8 +3827,8 @@ _0812DE90: .4byte 0x040000d4 _0812DE94: .4byte 0x85000400 _0812DE98: .4byte 0x85000200 _0812DE9C: .4byte REG_BG1CNT -_0812DEA0: .4byte gUnknown_030042C0 -_0812DEA4: .4byte gUnknown_030041B4 +_0812DEA0: .4byte gBattle_BG1_X +_0812DEA4: .4byte gBattle_BG1_Y _0812DEA8: .4byte REG_BLDCNT thumb_func_end sub_812DB84 @@ -3855,17 +3855,17 @@ sub_812DEAC: @ 812DEAC lsls r0, 16 lsrs r5, r0, 16 _0812DED6: - ldr r4, _0812DFD0 @ =gBattleAnimBankAttacker + ldr r4, _0812DFD0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, r5 strh r0, [r7, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -3974,7 +3974,7 @@ _0812DED6: pop {r0} bx r0 .align 2, 0 -_0812DFD0: .4byte gBattleAnimBankAttacker +_0812DFD0: .4byte gAnimBankAttacker _0812DFD4: .4byte gBattleAnimArgs _0812DFD8: .4byte gBattleAnimSpriteTemplate_84025EC _0812DFDC: .4byte gSprites @@ -4113,7 +4113,7 @@ sub_812E09C: @ 812E09C adds r0, r5 bl DestroySprite adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812E0E8: pop {r4-r6} pop {r0} @@ -4225,7 +4225,7 @@ _0812E194: movs r1, 0x1 orrs r0, r1 strb r0, [r4] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812E1D4 @@ -4260,7 +4260,7 @@ _0812E1D4: lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812E260 @@ -4270,11 +4270,11 @@ _0812E1D4: movs r2, 0 movs r3, 0 bl sub_80763FC - ldr r1, _0812E254 @ =gUnknown_030042C0 + ldr r1, _0812E254 @ =gBattle_BG1_X ldr r3, _0812E258 @ =0x0000ffc8 adds r0, r3, 0 strh r0, [r1] - ldr r0, _0812E25C @ =gUnknown_030041B4 + ldr r0, _0812E25C @ =gBattle_BG1_Y strh r4, [r0] b _0812E2D2 .align 2, 0 @@ -4287,11 +4287,11 @@ _0812E244: .4byte 0x85000400 _0812E248: .4byte gUnknown_08D2AA98 _0812E24C: .4byte gUnknown_08D2A9E0 _0812E250: .4byte gUnknown_08D2AA80 -_0812E254: .4byte gUnknown_030042C0 +_0812E254: .4byte gBattle_BG1_X _0812E258: .4byte 0x0000ffc8 -_0812E25C: .4byte gUnknown_030041B4 +_0812E25C: .4byte gBattle_BG1_Y _0812E260: - ldr r0, _0812E2A0 @ =gBattleAnimBankTarget + ldr r0, _0812E2A0 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity lsls r0, 24 @@ -4301,7 +4301,7 @@ _0812E260: lsrs r0, 24 cmp r0, 0x1 bne _0812E2B4 - ldr r1, _0812E2A4 @ =gUnknown_030042C0 + ldr r1, _0812E2A4 @ =gBattle_BG1_X cmp r4, 0x1 bne _0812E284 ldr r2, _0812E2A8 @ =0x0000ff65 @@ -4321,32 +4321,32 @@ _0812E28E: _0812E296: cmp r4, 0x2 bne _0812E2CC - ldr r1, _0812E2A4 @ =gUnknown_030042C0 + ldr r1, _0812E2A4 @ =gBattle_BG1_X ldr r2, _0812E2B0 @ =0x0000ffec b _0812E2C8 .align 2, 0 -_0812E2A0: .4byte gBattleAnimBankTarget -_0812E2A4: .4byte gUnknown_030042C0 +_0812E2A0: .4byte gAnimBankTarget +_0812E2A4: .4byte gBattle_BG1_X _0812E2A8: .4byte 0x0000ff65 _0812E2AC: .4byte 0x0000ff8d _0812E2B0: .4byte 0x0000ffec _0812E2B4: cmp r4, 0x1 bne _0812E2C0 - ldr r1, _0812E2EC @ =gUnknown_030042C0 + ldr r1, _0812E2EC @ =gBattle_BG1_X ldr r3, _0812E2F0 @ =0x0000ff79 adds r0, r3, 0 strh r0, [r1] _0812E2C0: cmp r4, 0 bne _0812E2CC - ldr r1, _0812E2EC @ =gUnknown_030042C0 + ldr r1, _0812E2EC @ =gBattle_BG1_X ldr r2, _0812E2F4 @ =0x0000fff6 _0812E2C8: adds r0, r2, 0 strh r0, [r1] _0812E2CC: - ldr r1, _0812E2F8 @ =gUnknown_030041B4 + ldr r1, _0812E2F8 @ =gBattle_BG1_Y movs r0, 0 strh r0, [r1] _0812E2D2: @@ -4355,18 +4355,18 @@ _0812E2D2: adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _0812E2EC @ =gUnknown_030042C0 + ldr r0, _0812E2EC @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r1, 0x1C] - ldr r0, _0812E2F8 @ =gUnknown_030041B4 + ldr r0, _0812E2F8 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r1, 0x1E] b _0812E380 .align 2, 0 -_0812E2EC: .4byte gUnknown_030042C0 +_0812E2EC: .4byte gBattle_BG1_X _0812E2F0: .4byte 0x0000ff79 _0812E2F4: .4byte 0x0000fff6 -_0812E2F8: .4byte gUnknown_030041B4 +_0812E2F8: .4byte gBattle_BG1_Y _0812E2FC: .4byte gTasks _0812E300: ldr r1, _0812E334 @ =gTasks @@ -4376,14 +4376,14 @@ _0812E300: adds r5, r0, r1 movs r0, 0 strh r0, [r5, 0xE] - ldr r0, _0812E338 @ =gBattleAnimBankTarget + ldr r0, _0812E338 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0812E344 - ldr r2, _0812E33C @ =gUnknown_030042C0 + ldr r2, _0812E33C @ =gBattle_BG1_X ldr r1, _0812E340 @ =gUnknown_08402604 movs r3, 0xC ldrsh r0, [r5, r3] @@ -4396,11 +4396,11 @@ _0812E300: b _0812E356 .align 2, 0 _0812E334: .4byte gTasks -_0812E338: .4byte gBattleAnimBankTarget -_0812E33C: .4byte gUnknown_030042C0 +_0812E338: .4byte gAnimBankTarget +_0812E33C: .4byte gBattle_BG1_X _0812E340: .4byte gUnknown_08402604 _0812E344: - ldr r2, _0812E374 @ =gUnknown_030042C0 + ldr r2, _0812E374 @ =gBattle_BG1_X ldr r1, _0812E378 @ =gUnknown_08402604 movs r3, 0xC ldrsh r0, [r5, r3] @@ -4425,7 +4425,7 @@ _0812E356: strh r0, [r1, 0x8] b _0812E476 .align 2, 0 -_0812E374: .4byte gUnknown_030042C0 +_0812E374: .4byte gBattle_BG1_X _0812E378: .4byte gUnknown_08402604 _0812E37C: .4byte gTasks _0812E380: @@ -4528,7 +4528,7 @@ _0812E420: ldr r0, _0812E484 @ =0x85000200 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812E450 @@ -4547,9 +4547,9 @@ _0812E450: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _0812E48C @ =gUnknown_030042C0 + ldr r0, _0812E48C @ =gBattle_BG1_X strh r4, [r0] - ldr r0, _0812E490 @ =gUnknown_030041B4 + ldr r0, _0812E490 @ =gBattle_BG1_Y strh r4, [r0] ldr r0, _0812E494 @ =REG_BLDCNT strh r4, [r0] @@ -4566,8 +4566,8 @@ _0812E476: _0812E480: .4byte 0x040000d4 _0812E484: .4byte 0x85000200 _0812E488: .4byte REG_BG1CNT -_0812E48C: .4byte gUnknown_030042C0 -_0812E490: .4byte gUnknown_030041B4 +_0812E48C: .4byte gBattle_BG1_X +_0812E490: .4byte gBattle_BG1_Y _0812E494: .4byte REG_BLDCNT thumb_func_end sub_812E14C @@ -4642,7 +4642,7 @@ _0812E50E: ldrh r0, [r4, 0x32] adds r0, 0x80 strh r0, [r4, 0x32] - ldr r0, _0812E53C @ =gBattleAnimBankAttacker + ldr r0, _0812E53C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4654,7 +4654,7 @@ _0812E50E: negs r0, r0 b _0812E546 .align 2, 0 -_0812E53C: .4byte gBattleAnimBankAttacker +_0812E53C: .4byte gAnimBankAttacker _0812E540: ldrh r0, [r4, 0x30] lsls r0, 16 @@ -4672,7 +4672,7 @@ _0812E546: cmp r0, 0x40 ble _0812E562 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812E562: pop {r4} pop {r0} @@ -4747,12 +4747,12 @@ _0812E5AC: ldrsh r0, [r5, r1] cmp r0, 0 bne _0812E5F8 - ldr r0, _0812E5F4 @ =gBattleAnimBankAttacker + ldr r0, _0812E5F4 @ =gAnimBankAttacker b _0812E5FA .align 2, 0 -_0812E5F4: .4byte gBattleAnimBankAttacker +_0812E5F4: .4byte gAnimBankAttacker _0812E5F8: - ldr r0, _0812E630 @ =gBattleAnimBankTarget + ldr r0, _0812E630 @ =gAnimBankTarget _0812E5FA: ldrb r0, [r0] bl GetBankSide @@ -4781,7 +4781,7 @@ _0812E628: pop {r0} bx r0 .align 2, 0 -_0812E630: .4byte gBattleAnimBankTarget +_0812E630: .4byte gAnimBankTarget _0812E634: .4byte sub_812E638 thumb_func_end sub_812E568 @@ -4970,7 +4970,7 @@ _0812E798: sub_812E7A0: @ 812E7A0 push {r4,lr} adds r4, r0, 0 - ldr r0, _0812E7BC @ =gBattleAnimBankAttacker + ldr r0, _0812E7BC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4982,7 +4982,7 @@ sub_812E7A0: @ 812E7A0 ldrh r0, [r1] b _0812E7CE .align 2, 0 -_0812E7BC: .4byte gBattleAnimBankAttacker +_0812E7BC: .4byte gAnimBankAttacker _0812E7C0: .4byte gBattleAnimArgs _0812E7C4: movs r0, 0xF0 @@ -5014,7 +5014,7 @@ sub_812E7F0: @ 812E7F0 ldrh r0, [r4, 0x2E] adds r0, 0x3 strh r0, [r4, 0x2E] - ldr r0, _0812E830 @ =gBattleAnimBankAttacker + ldr r0, _0812E830 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5031,7 +5031,7 @@ sub_812E7F0: @ 812E7F0 cmp r1, 0xF0 ble _0812E822 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812E822: ldrh r1, [r4, 0x2E] movs r0, 0xFF @@ -5040,7 +5040,7 @@ _0812E822: bl Sin b _0812E858 .align 2, 0 -_0812E830: .4byte gBattleAnimBankAttacker +_0812E830: .4byte gAnimBankAttacker _0812E834: ldrh r1, [r4, 0x20] subs r1, 0x5 @@ -5052,7 +5052,7 @@ _0812E834: cmp r1, 0 bge _0812E84C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812E84C: ldrh r1, [r4, 0x2E] movs r0, 0xFF @@ -5329,16 +5329,16 @@ sub_812EA4C: @ 812EA4C ldrsh r0, [r6, r2] cmp r0, 0 bne _0812EA80 - ldr r4, _0812EAA8 @ =gBattleAnimBankAttacker + ldr r4, _0812EAA8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -5363,7 +5363,7 @@ _0812EA80: b _0812EB0A .align 2, 0 _0812EAA4: .4byte gBattleAnimArgs -_0812EAA8: .4byte gBattleAnimBankAttacker +_0812EAA8: .4byte gAnimBankAttacker _0812EAAC: ldrh r1, [r5, 0x30] lsls r0, r1, 16 @@ -5410,7 +5410,7 @@ _0812EAEA: cmp r0, 0 beq _0812EB0A adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812EB0A: pop {r4-r6} pop {r0} @@ -5440,14 +5440,14 @@ sub_812EB10: @ 812EB10 mov r8, r0 cmp r1, 0 bne _0812EB4C - ldr r0, _0812EB48 @ =gBattleAnimBankAttacker + ldr r0, _0812EB48 @ =gAnimBankAttacker b _0812EB4E .align 2, 0 _0812EB40: .4byte gTasks _0812EB44: .4byte gBattleAnimArgs -_0812EB48: .4byte gBattleAnimBankAttacker +_0812EB48: .4byte gAnimBankAttacker _0812EB4C: - ldr r0, _0812EB88 @ =gBattleAnimBankTarget + ldr r0, _0812EB88 @ =gAnimBankTarget _0812EB4E: ldrb r0, [r0] strh r0, [r2, 0x1E] @@ -5477,7 +5477,7 @@ _0812EB4E: lsls r2, r5, 4 b _0812EBF8 .align 2, 0 -_0812EB88: .4byte gBattleAnimBankTarget +_0812EB88: .4byte gAnimBankTarget _0812EB8C: .4byte gTasks _0812EB90: cmp r0, 0x2 @@ -5512,7 +5512,7 @@ _0812EBC2: bl obj_id_set_rotscale adds r0, r5, 0 bl sub_8079A64 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0812EBE8 @@ -5733,7 +5733,7 @@ _0812ED6A: cmp r0, 0x1F bne _0812ED7E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812ED7E: pop {r4} pop {r0} @@ -5756,10 +5756,10 @@ sub_812ED84: @ 812ED84 adds r1, r3, 0 orrs r0, r1 strh r0, [r2] - ldr r0, _0812EDEC @ =gUnknown_030042C4 + ldr r0, _0812EDEC @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _0812EDF0 @ =gUnknown_03004240 + ldr r0, _0812EDF0 @ =gBattle_WIN0V strh r1, [r0] ldr r0, _0812EDF4 @ =REG_WIN0H strh r1, [r0] @@ -5792,8 +5792,8 @@ sub_812ED84: @ 812ED84 .align 2, 0 _0812EDE4: .4byte REG_WINOUT _0812EDE8: .4byte 0x00001f3f -_0812EDEC: .4byte gUnknown_030042C4 -_0812EDF0: .4byte gUnknown_03004240 +_0812EDEC: .4byte gBattle_WIN0H +_0812EDF0: .4byte gBattle_WIN0V _0812EDF4: .4byte REG_WIN0H _0812EDF8: .4byte gBattleAnimArgs _0812EDFC: .4byte sub_812EE00 @@ -5878,7 +5878,7 @@ _0812EE76: eors r0, r1 strh r0, [r2] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812EE94: pop {r4} pop {r0} @@ -5892,16 +5892,16 @@ _0812EEA0: .4byte 0x00003f3f sub_812EEA4: @ 812EEA4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _0812EEE0 @ =gBattleAnimBankAttacker + ldr r5, _0812EEE0 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -5918,7 +5918,7 @@ sub_812EEA4: @ 812EEA4 pop {r0} bx r0 .align 2, 0 -_0812EEE0: .4byte gBattleAnimBankAttacker +_0812EEE0: .4byte gAnimBankAttacker _0812EEE4: .4byte gBattleAnimArgs _0812EEE8: .4byte sub_812EEEC thumb_func_end sub_812EEA4 @@ -5953,15 +5953,15 @@ sub_812EEEC: @ 812EEEC cmp r0, 0xC3 ble _0812EF38 _0812EF26: - ldr r0, _0812EF34 @ =gBattleAnimBankAttacker + ldr r0, _0812EF34 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 subs r0, 0x1 b _0812EF42 .align 2, 0 -_0812EF34: .4byte gBattleAnimBankAttacker +_0812EF34: .4byte gAnimBankAttacker _0812EF38: - ldr r0, _0812EF84 @ =gBattleAnimBankAttacker + ldr r0, _0812EF84 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 adds r0, 0x1 @@ -5999,7 +5999,7 @@ _0812EF42: strh r0, [r4, 0x38] b _0812EFB8 .align 2, 0 -_0812EF84: .4byte gBattleAnimBankAttacker +_0812EF84: .4byte gAnimBankAttacker _0812EF88: cmp r2, 0x1 bne _0812EFB8 @@ -6023,7 +6023,7 @@ _0812EF88: cmp r0, r1 bne _0812EFB8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0812EFB8: pop {r4} pop {r0} @@ -6046,7 +6046,7 @@ sub_812EFC8: @ 812EFC8 str r0, [sp, 0x10] movs r0, 0 bl GetAnimBankSpriteId - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _0812F004 @@ -6063,7 +6063,7 @@ sub_812EFC8: @ 812EFC8 .align 2, 0 _0812F000: .4byte gSharedMem + 0x19348 _0812F004: - ldr r0, _0812F070 @ =gBattleAnimBankAttacker + ldr r0, _0812F070 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -6072,7 +6072,7 @@ _0812F004: movs r0, 0 str r0, [sp, 0x14] ldr r6, _0812F074 @ =gBattlePartyID - ldr r4, _0812F078 @ =gBattleAnimBankTarget + ldr r4, _0812F078 @ =gAnimBankTarget ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -6113,9 +6113,9 @@ _0812F004: adds r0, r7 b _0812F092 .align 2, 0 -_0812F070: .4byte gBattleAnimBankAttacker +_0812F070: .4byte gAnimBankAttacker _0812F074: .4byte gBattlePartyID -_0812F078: .4byte gBattleAnimBankTarget +_0812F078: .4byte gAnimBankTarget _0812F07C: .4byte gPlayerParty _0812F080: .4byte gSharedMem + 0x17800 _0812F084: @@ -6144,7 +6144,7 @@ _0812F0AC: movs r2, 0x1 str r2, [sp, 0x14] ldr r6, _0812F10C @ =gBattlePartyID - ldr r4, _0812F110 @ =gBattleAnimBankTarget + ldr r4, _0812F110 @ =gAnimBankTarget ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -6187,7 +6187,7 @@ _0812F0AC: b _0812F12C .align 2, 0 _0812F10C: .4byte gBattlePartyID -_0812F110: .4byte gBattleAnimBankTarget +_0812F110: .4byte gAnimBankTarget _0812F114: .4byte gEnemyParty _0812F118: .4byte gSharedMem + 0x17800 _0812F11C: .4byte gPlayerParty @@ -6211,21 +6211,21 @@ _0812F13A: _0812F13C: mov r10, r3 _0812F13E: - ldr r0, _0812F21C @ =gBattleAnimBankAttacker + ldr r0, _0812F21C @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079ED4 lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _0812F21C @ =gBattleAnimBankAttacker + ldr r5, _0812F21C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 mov r2, r10 lsls r1, r2, 16 @@ -6317,7 +6317,7 @@ _0812F13E: bx r0 .align 2, 0 _0812F218: .4byte 0x0000ffec -_0812F21C: .4byte gBattleAnimBankAttacker +_0812F21C: .4byte gAnimBankAttacker _0812F220: .4byte gSprites _0812F224: .4byte 0x00007fff _0812F228: .4byte REG_BLDCNT @@ -6454,14 +6454,14 @@ sub_812F314: @ 812F314 ldrsh r0, [r0, r1] cmp r0, 0 bne _0812F340 - ldr r0, _0812F33C @ =gBattleAnimBankAttacker + ldr r0, _0812F33C @ =gAnimBankAttacker b _0812F342 .align 2, 0 _0812F334: .4byte gTasks _0812F338: .4byte gBattleAnimArgs -_0812F33C: .4byte gBattleAnimBankAttacker +_0812F33C: .4byte gAnimBankAttacker _0812F340: - ldr r0, _0812F3C0 @ =gBattleAnimBankTarget + ldr r0, _0812F3C0 @ =gAnimBankTarget _0812F342: ldrb r5, [r0] movs r6, 0 @@ -6519,18 +6519,18 @@ _0812F388: ldr r2, _0812F3D0 @ =0x00003f42 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0812F3D4 @ =gUnknown_030042C0 + ldr r0, _0812F3D4 @ =gBattle_BG1_X ldrh r5, [r0] - ldr r0, _0812F3D8 @ =gUnknown_030041B4 + ldr r0, _0812F3D8 @ =gBattle_BG1_Y b _0812F3EE .align 2, 0 -_0812F3C0: .4byte gBattleAnimBankTarget +_0812F3C0: .4byte gAnimBankTarget _0812F3C4: .4byte gBattleAnimArgs _0812F3C8: .4byte REG_BG1HOFS _0812F3CC: .4byte REG_BLDCNT _0812F3D0: .4byte 0x00003f42 -_0812F3D4: .4byte gUnknown_030042C0 -_0812F3D8: .4byte gUnknown_030041B4 +_0812F3D4: .4byte gBattle_BG1_X +_0812F3D8: .4byte gBattle_BG1_Y _0812F3DC: ldr r0, _0812F454 @ =REG_BG2HOFS str r0, [sp] @@ -6538,9 +6538,9 @@ _0812F3DC: ldr r2, _0812F45C @ =0x00003f44 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0812F460 @ =gUnknown_03004288 + ldr r0, _0812F460 @ =gBattle_BG2_X ldrh r5, [r0] - ldr r0, _0812F464 @ =gUnknown_03004280 + ldr r0, _0812F464 @ =gBattle_BG2_Y _0812F3EE: ldrh r3, [r0] movs r7, 0 @@ -6597,8 +6597,8 @@ _0812F3FE: _0812F454: .4byte REG_BG2HOFS _0812F458: .4byte REG_BLDCNT _0812F45C: .4byte 0x00003f44 -_0812F460: .4byte gUnknown_03004288 -_0812F464: .4byte gUnknown_03004280 +_0812F460: .4byte gBattle_BG2_X +_0812F464: .4byte gBattle_BG2_Y _0812F468: .4byte gUnknown_03004DE0 _0812F46C: .4byte 0xa6600001 _0812F470: .4byte sub_812F474 @@ -6625,20 +6625,20 @@ sub_812F474: @ 812F474 lsrs r0, 24 cmp r0, 0x1 bne _0812F4B4 - ldr r0, _0812F4AC @ =gUnknown_030042C0 + ldr r0, _0812F4AC @ =gBattle_BG1_X ldrh r0, [r0] str r0, [sp, 0x4] - ldr r0, _0812F4B0 @ =gUnknown_030041B4 + ldr r0, _0812F4B0 @ =gBattle_BG1_Y b _0812F4BC .align 2, 0 _0812F4A8: .4byte gTasks -_0812F4AC: .4byte gUnknown_030042C0 -_0812F4B0: .4byte gUnknown_030041B4 +_0812F4AC: .4byte gBattle_BG1_X +_0812F4B0: .4byte gBattle_BG1_Y _0812F4B4: - ldr r0, _0812F4D4 @ =gUnknown_03004288 + ldr r0, _0812F4D4 @ =gBattle_BG2_X ldrh r0, [r0] str r0, [sp, 0x4] - ldr r0, _0812F4D8 @ =gUnknown_03004280 + ldr r0, _0812F4D8 @ =gBattle_BG2_Y _0812F4BC: ldrh r0, [r0] str r0, [sp, 0x8] @@ -6654,8 +6654,8 @@ _0812F4CA: beq _0812F4EA b _0812F712 .align 2, 0 -_0812F4D4: .4byte gUnknown_03004288 -_0812F4D8: .4byte gUnknown_03004280 +_0812F4D4: .4byte gBattle_BG2_X +_0812F4D8: .4byte gBattle_BG2_Y _0812F4DC: cmp r0, 0x2 bne _0812F4E2 @@ -7249,7 +7249,7 @@ sub_812F948: @ 812F948 ldrb r1, [r6] adds r0, r5, 0 bl StartSpriteAffineAnim - ldr r0, _0812F9A4 @ =gBattleAnimBankTarget + ldr r0, _0812F9A4 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -7259,10 +7259,10 @@ sub_812F948: @ 812F948 negs r0, r0 strh r0, [r6, 0x2] _0812F96E: - ldr r4, _0812F9A8 @ =gBattleAnimBankAttacker + ldr r4, _0812F9A8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x2] @@ -7270,7 +7270,7 @@ _0812F96E: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x4] @@ -7283,8 +7283,8 @@ _0812F96E: bx r0 .align 2, 0 _0812F9A0: .4byte gBattleAnimArgs -_0812F9A4: .4byte gBattleAnimBankTarget -_0812F9A8: .4byte gBattleAnimBankAttacker +_0812F9A4: .4byte gAnimBankTarget +_0812F9A8: .4byte gAnimBankAttacker _0812F9AC: .4byte sub_80DA48C thumb_func_end sub_812F948 @@ -7673,7 +7673,7 @@ sub_812FC68: @ 812FC68 mov r1, r8 adds r4, r0, r1 ldr r1, _0812FCCC @ =gObjectBankIDs - ldr r2, _0812FCD0 @ =gBattleAnimBankAttacker + ldr r2, _0812FCD0 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] @@ -7710,7 +7710,7 @@ _0812FCAC: .align 2, 0 _0812FCC8: .4byte gTasks _0812FCCC: .4byte gObjectBankIDs -_0812FCD0: .4byte gBattleAnimBankAttacker +_0812FCD0: .4byte gAnimBankAttacker _0812FCD4: .4byte gBattleAnimArgs _0812FCD8: .4byte 0xffff8000 _0812FCDC: @@ -7821,25 +7821,25 @@ _0812FD9C: ldrsh r0, [r4, r1] cmp r0, 0 bne _0812FDC0 - ldr r0, _0812FDBC @ =gBattleAnimBankAttacker + ldr r0, _0812FDBC @ =gAnimBankAttacker b _0812FDC2 .align 2, 0 _0812FDB4: .4byte gTasks _0812FDB8: .4byte gBattleAnimArgs -_0812FDBC: .4byte gBattleAnimBankAttacker +_0812FDBC: .4byte gAnimBankAttacker _0812FDC0: - ldr r0, _0812FE10 @ =gBattleAnimBankTarget + ldr r0, _0812FE10 @ =gAnimBankTarget _0812FDC2: ldrb r4, [r0] adds r0, r4, 0 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x10] adds r0, r4, 0 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] @@ -7864,7 +7864,7 @@ _0812FDC2: pop {r0} bx r0 .align 2, 0 -_0812FE10: .4byte gBattleAnimBankTarget +_0812FE10: .4byte gAnimBankTarget _0812FE14: .4byte gBattleAnimArgs _0812FE18: .4byte gUnknown_084028AC _0812FE1C: .4byte sub_812FE20 @@ -8214,7 +8214,7 @@ sub_81300A4: @ 81300A4 lsrs r0, 24 movs r2, 0xD0 lsls r2, 1 - ldr r1, _081300E0 @ =gBattleAnimBankAttacker + ldr r1, _081300E0 @ =gAnimBankAttacker ldrb r3, [r1] ldr r1, _081300E4 @ =gBattleAnimArgs ldrb r1, [r1] @@ -8237,7 +8237,7 @@ sub_81300A4: @ 81300A4 pop {r0} bx r0 .align 2, 0 -_081300E0: .4byte gBattleAnimBankAttacker +_081300E0: .4byte gAnimBankAttacker _081300E4: .4byte gBattleAnimArgs _081300E8: .4byte gUnknown_08D2E014 _081300EC: .4byte gUnknown_08D2E170 @@ -8248,7 +8248,7 @@ _081300F0: .4byte gUnknown_08D2E150 sub_81300F4: @ 81300F4 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0813014C @ =gBattleAnimBankAttacker + ldr r6, _0813014C @ =gAnimBankAttacker ldrb r0, [r6] bl GetBankSide lsls r0, 24 @@ -8262,7 +8262,7 @@ sub_81300F4: @ 81300F4 _08130110: ldrb r0, [r6] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _08130150 @ =gBattleAnimArgs lsrs r0, 24 @@ -8271,7 +8271,7 @@ _08130110: strh r0, [r5, 0x20] ldrb r0, [r6] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x2] @@ -8288,7 +8288,7 @@ _08130110: strh r0, [r5, 0x30] b _08130180 .align 2, 0 -_0813014C: .4byte gBattleAnimBankAttacker +_0813014C: .4byte gAnimBankAttacker _08130150: .4byte gBattleAnimArgs _08130154: .4byte 0x0000fd80 _08130158: @@ -8313,7 +8313,7 @@ _08130172: lsls r0, 2 strh r0, [r5, 0x2E] _08130180: - ldr r0, _081301AC @ =gBattleAnimBankAttacker + ldr r0, _081301AC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -8335,7 +8335,7 @@ _081301A0: pop {r0} bx r0 .align 2, 0 -_081301AC: .4byte gBattleAnimBankAttacker +_081301AC: .4byte gAnimBankAttacker _081301B0: .4byte sub_81301B4 thumb_func_end sub_81300F4 @@ -8365,7 +8365,7 @@ sub_81301B4: @ 81301B4 cmp r0, 0xE bne _081301E8 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081301E8: pop {r0} bx r0 @@ -8381,7 +8381,7 @@ sub_81301EC: @ 81301EC lsls r1, 3 ldr r0, _08130218 @ =gTasks adds r6, r1, r0 - bl NotInBattle + bl IsContest lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -8402,7 +8402,7 @@ _0813021C: strh r0, [r6, 0x14] strh r1, [r6, 0x16] _08130226: - ldr r5, _0813025C @ =gBattleAnimBankAttacker + ldr r5, _0813025C @ =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -8410,7 +8410,7 @@ _08130226: bne _08130260 ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8427,11 +8427,11 @@ _08130254: adds r0, r4, r0 b _08130284 .align 2, 0 -_0813025C: .4byte gBattleAnimBankAttacker +_0813025C: .4byte gAnimBankAttacker _08130260: ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8448,10 +8448,10 @@ _08130280: subs r0, r4, r0 _08130284: strh r0, [r6, 0x1E] - ldr r5, _081302D8 @ =gBattleAnimBankAttacker + ldr r5, _081302D8 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8467,16 +8467,16 @@ _081302A8: asrs r0, 2 subs r0, r4, r0 strh r0, [r6, 0x20] - ldr r4, _081302DC @ =gBattleAnimBankTarget + ldr r4, _081302DC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x22] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x24] @@ -8486,8 +8486,8 @@ _081302A8: pop {r0} bx r0 .align 2, 0 -_081302D8: .4byte gBattleAnimBankAttacker -_081302DC: .4byte gBattleAnimBankTarget +_081302D8: .4byte gAnimBankAttacker +_081302DC: .4byte gAnimBankTarget _081302E0: .4byte sub_81302E4 thumb_func_end sub_81301EC @@ -8807,7 +8807,7 @@ sub_813051C: @ 813051C strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, _0813054C @ =move_anim_8072740 + ldr r1, _0813054C @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r0, _08130550 @ =sub_8078CC0 @@ -8817,7 +8817,7 @@ sub_813051C: @ 813051C bx r0 .align 2, 0 _08130548: .4byte gBattleAnimArgs -_0813054C: .4byte move_anim_8072740 +_0813054C: .4byte DestroyAnimSprite _08130550: .4byte sub_8078CC0 thumb_func_end sub_813051C @@ -8836,33 +8836,33 @@ sub_8130554: @ 8130554 lsls r0, 3 ldr r1, _08130674 @ =gTasks adds r7, r0, r1 - ldr r0, _08130678 @ =gBattleAnimBankAttacker + ldr r0, _08130678 @ =gAnimBankAttacker mov r10, r0 ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x1E] mov r1, r10 ldrb r0, [r1] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x20] - ldr r0, _0813067C @ =gBattleAnimBankTarget + ldr r0, _0813067C @ =gAnimBankTarget mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x22] mov r1, r8 ldrb r0, [r1] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 mov r1, r8 ldrb r0, [r1] @@ -8961,8 +8961,8 @@ _0813066E: b _08130696 .align 2, 0 _08130674: .4byte gTasks -_08130678: .4byte gBattleAnimBankAttacker -_0813067C: .4byte gBattleAnimBankTarget +_08130678: .4byte gAnimBankAttacker +_0813067C: .4byte gAnimBankTarget _08130680: .4byte gSpriteTemplate_84029AC _08130684: .4byte gSprites _08130688: .4byte 0x0000ffe0 @@ -9128,13 +9128,13 @@ sub_81307B0: @ 81307B0 adds r6, r0, 0 cmp r1, 0 bne _081307CC - ldr r0, _081307C8 @ =gBattleAnimBankAttacker + ldr r0, _081307C8 @ =gAnimBankAttacker b _081307CE .align 2, 0 _081307C4: .4byte gBattleAnimArgs -_081307C8: .4byte gBattleAnimBankAttacker +_081307C8: .4byte gAnimBankAttacker _081307CC: - ldr r0, _08130834 @ =gBattleAnimBankTarget + ldr r0, _08130834 @ =gAnimBankTarget _081307CE: ldrb r5, [r0] ldrh r2, [r4, 0x4] @@ -9163,7 +9163,7 @@ _081307FC: strh r1, [r4, 0x3C] adds r0, r5, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -9187,7 +9187,7 @@ _081307FC: subs r0, 0x8 b _0813084A .align 2, 0 -_08130834: .4byte gBattleAnimBankTarget +_08130834: .4byte gAnimBankTarget _08130838: .4byte 0x000003ff _0813083C: .4byte 0xfffffc00 _08130840: @@ -9306,7 +9306,7 @@ _081308DA: b _08130914 _0813090E: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08130914: pop {r0} bx r0 @@ -9460,17 +9460,17 @@ sub_8130A2C: @ 8130A2C ldrsh r0, [r0, r1] cmp r0, 0 bne _08130A48 - ldr r4, _08130A44 @ =gBattleAnimBankAttacker + ldr r4, _08130A44 @ =gAnimBankAttacker b _08130A4A .align 2, 0 _08130A40: .4byte gBattleAnimArgs -_08130A44: .4byte gBattleAnimBankAttacker +_08130A44: .4byte gAnimBankAttacker _08130A48: - ldr r4, _08130A88 @ =gBattleAnimBankTarget + ldr r4, _08130A88 @ =gAnimBankTarget _08130A4A: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] @@ -9499,7 +9499,7 @@ _08130A6E: pop {r0} bx r0 .align 2, 0 -_08130A88: .4byte gBattleAnimBankTarget +_08130A88: .4byte gAnimBankTarget _08130A8C: .4byte gBattleAnimArgs _08130A90: .4byte sub_8130A94 thumb_func_end sub_8130A2C @@ -9546,7 +9546,7 @@ sub_8130A94: @ 8130A94 cmp r0, 0 bne _08130AE8 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08130AE8: pop {r0} bx r0 @@ -9840,7 +9840,7 @@ _08130CF6: cmp r0, 0x5 bne _08130D18 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08130D18: pop {r4} pop {r0} @@ -9862,7 +9862,7 @@ sub_8130D20: @ 8130D20 lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x26] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _08130DA8 @@ -9871,10 +9871,10 @@ sub_8130D20: @ 8130D20 lsrs r7, r0, 24 cmp r7, 0x1 bne _08130D8C - ldr r5, _08130D80 @ =gBattleAnimBankAttacker + ldr r5, _08130D80 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -9882,7 +9882,7 @@ sub_8130D20: @ 8130D20 movs r0, 0x2 eors r0, r1 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -9891,14 +9891,14 @@ sub_8130D20: @ 8130D20 b _08130DAC .align 2, 0 _08130D7C: .4byte gTasks -_08130D80: .4byte gBattleAnimBankAttacker +_08130D80: .4byte gAnimBankAttacker _08130D84: ldr r0, _08130D88 @ =0x0000ffff b _08130DAA .align 2, 0 _08130D88: .4byte 0x0000ffff _08130D8C: - ldr r0, _08130DA0 @ =gBattleAnimBankAttacker + ldr r0, _08130DA0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -9907,7 +9907,7 @@ _08130D8C: ldr r0, _08130DA4 @ =0x0000ffff b _08130DAA .align 2, 0 -_08130DA0: .4byte gBattleAnimBankAttacker +_08130DA0: .4byte gAnimBankAttacker _08130DA4: .4byte 0x0000ffff _08130DA8: movs r0, 0x1 @@ -10152,13 +10152,13 @@ sub_8130F5C: @ 8130F5C adds r0, r4, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _08130F7C @ =gBattleAnimBankAttacker + ldr r0, _08130F7C @ =gAnimBankAttacker b _08130F82 .align 2, 0 _08130F78: .4byte gBattleAnimArgs -_08130F7C: .4byte gBattleAnimBankAttacker +_08130F7C: .4byte gAnimBankAttacker _08130F80: - ldr r0, _08130FD8 @ =gBattleAnimBankTarget + ldr r0, _08130FD8 @ =gAnimBankTarget _08130F82: ldrb r0, [r0] strh r0, [r4, 0x3C] @@ -10203,7 +10203,7 @@ _08130FA6: pop {r0} bx r0 .align 2, 0 -_08130FD8: .4byte gBattleAnimBankTarget +_08130FD8: .4byte gAnimBankTarget _08130FDC: .4byte sub_8130FE0 thumb_func_end sub_8130F5C @@ -10323,14 +10323,14 @@ _081310C4: lsls r0, 24 lsrs r0, 24 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r1, r0, 24 _081310E4: @@ -10467,7 +10467,7 @@ _081311CA: _081311D4: .4byte REG_BLDALPHA _081311D8: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081311DE: pop {r4,r5} pop {r0} @@ -10528,7 +10528,7 @@ _08131242: cmp r1, r0 bne _08131254 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08131254: ldrh r0, [r4, 0x38] adds r0, 0x1 @@ -10544,19 +10544,19 @@ _08131260: .4byte gSpriteTemplate_8402500 sub_8131264: @ 8131264 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081312A0 @ =gBattleAnimBankTarget + ldr r4, _081312A0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition ldrb r0, [r4] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08131290 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _081312A8 @@ -10570,7 +10570,7 @@ _08131290: subs r1, r0 b _081312B6 .align 2, 0 -_081312A0: .4byte gBattleAnimBankTarget +_081312A0: .4byte gAnimBankTarget _081312A4: .4byte gBattleAnimArgs _081312A8: ldr r2, _081312DC @ =gBattleAnimArgs @@ -10685,11 +10685,11 @@ _08131378: .align 2, 0 _08131380: .4byte gSprites _08131384: - ldr r4, _081313F4 @ =gBattleAnimBankAttacker + ldr r4, _081313F4 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 bl refresh_graphics_maybe - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _081313C6 @@ -10742,7 +10742,7 @@ _081313E8: pop {r0} bx r0 .align 2, 0 -_081313F4: .4byte gBattleAnimBankAttacker +_081313F4: .4byte gAnimBankAttacker _081313F8: .4byte gSprites _081313FC: .4byte gObjectBankIDs _08131400: .4byte gSpriteAffineAnimTable_81E7C18 @@ -10838,7 +10838,7 @@ _081314A6: bne _0813155A movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -10911,7 +10911,7 @@ _08131538: bne _0813155A movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -10931,7 +10931,7 @@ _08131560: .4byte gSprites sub_8131564: @ 8131564 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08131588 @ =gBattleAnimBankTarget + ldr r4, _08131588 @ =gAnimBankTarget ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -10946,7 +10946,7 @@ sub_8131564: @ 8131564 ldr r4, _0813158C @ =0x0000ff70 b _081315A0 .align 2, 0 -_08131588: .4byte gBattleAnimBankTarget +_08131588: .4byte gAnimBankTarget _0813158C: .4byte 0x0000ff70 _08131590: ldrb r0, [r4] @@ -10957,10 +10957,10 @@ _08131590: strb r0, [r1] ldr r4, _081315BC @ =0x0000ffa0 _081315A0: - ldr r0, _081315C0 @ =gBattleAnimBankTarget + ldr r0, _081315C0 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -10972,7 +10972,7 @@ _081315A0: bx r0 .align 2, 0 _081315BC: .4byte 0x0000ffa0 -_081315C0: .4byte gBattleAnimBankTarget +_081315C0: .4byte gAnimBankTarget _081315C4: .4byte sub_81315C8 thumb_func_end sub_8131564 @@ -11008,7 +11008,7 @@ _081315F8: cmp r0, 0 blt _081316F2 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -11037,7 +11037,7 @@ _0813161C: cmp r1, 0x7F ble _081316F2 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -11081,7 +11081,7 @@ _0813168C: cmp r0, 0x8 ble _081316F2 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -11122,7 +11122,7 @@ _081316B8: cmp r0, 0x7 bne _081316F2 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _081316F2: pop {r4,r5} pop {r0} @@ -11139,7 +11139,7 @@ sub_81316F8: @ 81316F8 lsls r0, 24 lsrs r4, r0, 24 mov r10, r4 - bl NotInBattle + bl IsContest lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 @@ -11395,7 +11395,7 @@ sub_81318F0: @ 81318F0 ldr r3, _0813193C @ =gBattleAnimArgs movs r2, 0 strh r2, [r3, 0xE] - ldr r1, _08131940 @ =gHappinessMoveAnim + ldr r1, _08131940 @ =gAnimFriendship ldrb r0, [r1] ldrb r1, [r1] adds r0, r1, 0 @@ -11431,7 +11431,7 @@ _08131930: bx r0 .align 2, 0 _0813193C: .4byte gBattleAnimArgs -_08131940: .4byte gHappinessMoveAnim +_08131940: .4byte gAnimFriendship thumb_func_end sub_81318F0 thumb_func_start sub_8131944 @@ -11488,7 +11488,7 @@ _08131990: ldrh r1, [r6, 0xA] adds r0, r1 strh r0, [r6, 0xA] - ldr r0, _081319E0 @ =gBattleAnimBankAttacker + ldr r0, _081319E0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11509,7 +11509,7 @@ _08131990: b _08131A02 .align 2, 0 _081319DC: .4byte gTasks -_081319E0: .4byte gBattleAnimBankAttacker +_081319E0: .4byte gAnimBankAttacker _081319E4: .4byte gSprites _081319E8: ldr r3, _08131A3C @ =gSprites @@ -11559,7 +11559,7 @@ _08131A2E: _08131A3C: .4byte gSprites _08131A40: .4byte gTasks _08131A44: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _08131A74 @@ -11569,7 +11569,7 @@ _08131A44: ldr r3, [r0, 0xC] mov r9, r3 ldrh r5, [r0] - ldr r0, _08131A70 @ =gBattleAnimBankAttacker + ldr r0, _08131A70 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 lsls r0, 24 @@ -11578,9 +11578,9 @@ _08131A44: b _08131B92 .align 2, 0 _08131A6C: .4byte gSharedMem + 0x19348 -_08131A70: .4byte gBattleAnimBankAttacker +_08131A70: .4byte gAnimBankAttacker _08131A74: - ldr r4, _08131AD4 @ =gBattleAnimBankAttacker + ldr r4, _08131AD4 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -11625,7 +11625,7 @@ _08131A74: lsrs r5, r0, 16 b _08131AE6 .align 2, 0 -_08131AD4: .4byte gBattleAnimBankAttacker +_08131AD4: .4byte gAnimBankAttacker _08131AD8: .4byte gBattlePartyID _08131ADC: .4byte gPlayerParty _08131AE0: .4byte gSharedMem + 0x17800 @@ -11716,10 +11716,10 @@ _08131B72: _08131B92: ldr r6, _08131C08 @ =0x0000ffe0 _08131B94: - ldr r0, _08131C0C @ =gBattleAnimBankTarget + ldr r0, _08131C0C @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 lsls r3, r6, 16 @@ -11736,7 +11736,7 @@ _08131B94: bl sub_8079F44 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08131C10 @ =gBattleAnimBankAttacker + ldr r0, _08131C10 @ =gAnimBankAttacker ldrb r0, [r0] lsls r0, 2 ldr r1, _08131C14 @ =gSharedMem + 0x17800 @@ -11772,8 +11772,8 @@ _08131BF2: .align 2, 0 _08131C04: .4byte gSprites _08131C08: .4byte 0x0000ffe0 -_08131C0C: .4byte gBattleAnimBankTarget -_08131C10: .4byte gBattleAnimBankAttacker +_08131C0C: .4byte gAnimBankTarget +_08131C10: .4byte gAnimBankAttacker _08131C14: .4byte gSharedMem + 0x17800 _08131C18: .4byte 0x00007fff _08131C1C: .4byte gTasks @@ -11793,7 +11793,7 @@ _08131C20: ldrh r2, [r6, 0xA] adds r0, r2 strh r0, [r6, 0xA] - ldr r0, _08131C70 @ =gBattleAnimBankAttacker + ldr r0, _08131C70 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11816,7 +11816,7 @@ _08131C20: b _08131C8E .align 2, 0 _08131C6C: .4byte gTasks -_08131C70: .4byte gBattleAnimBankAttacker +_08131C70: .4byte gAnimBankAttacker _08131C74: .4byte gSprites _08131C78: ldr r2, _08131CDC @ =gSprites @@ -11850,7 +11850,7 @@ _08131C8E: ldrsh r0, [r6, r1] cmp r0, 0 bne _08131D0E - ldr r0, _08131CE4 @ =gBattleAnimBankAttacker + ldr r0, _08131CE4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11858,10 +11858,10 @@ _08131C8E: bne _08131CEC lsls r4, r5, 16 asrs r4, 16 - ldr r0, _08131CE8 @ =gBattleAnimBankTarget + ldr r0, _08131CE8 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -11870,15 +11870,15 @@ _08131C8E: .align 2, 0 _08131CDC: .4byte gSprites _08131CE0: .4byte gTasks -_08131CE4: .4byte gBattleAnimBankAttacker -_08131CE8: .4byte gBattleAnimBankTarget +_08131CE4: .4byte gAnimBankAttacker +_08131CE8: .4byte gAnimBankTarget _08131CEC: lsls r4, r5, 16 asrs r4, 16 - ldr r0, _08131D30 @ =gBattleAnimBankTarget + ldr r0, _08131D30 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -11910,7 +11910,7 @@ _08131D20: strh r0, [r1, 0xA] b _08131DB6 .align 2, 0 -_08131D30: .4byte gBattleAnimBankTarget +_08131D30: .4byte gAnimBankTarget _08131D34: .4byte gBattleAnimArgs _08131D38: .4byte 0x0000ffff _08131D3C: .4byte gTasks @@ -11934,7 +11934,7 @@ _08131D40: ldr r5, _08131D90 @ =gSprites adds r0, r5 bl sub_807A0F4 - ldr r0, _08131D94 @ =gBattleAnimBankAttacker + ldr r0, _08131D94 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -11953,7 +11953,7 @@ _08131D40: .align 2, 0 _08131D8C: .4byte gTasks _08131D90: .4byte gSprites -_08131D94: .4byte gBattleAnimBankAttacker +_08131D94: .4byte gAnimBankAttacker _08131D98: lsls r0, r7, 4 adds r0, r7 @@ -11995,7 +11995,7 @@ _08131DC4: ldrh r3, [r2, 0xA] adds r0, r3 strh r0, [r2, 0xA] - ldr r0, _08131E3C @ =gBattleAnimBankAttacker + ldr r0, _08131E3C @ =gAnimBankAttacker mov r10, r0 ldrb r0, [r0] str r2, [sp, 0x10] @@ -12024,7 +12024,7 @@ _08131DC4: mov r1, r10 ldrb r0, [r1] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r3, r5, 0 @@ -12035,7 +12035,7 @@ _08131DC4: b _08131E7C .align 2, 0 _08131E38: .4byte gTasks -_08131E3C: .4byte gBattleAnimBankAttacker +_08131E3C: .4byte gAnimBankAttacker _08131E40: .4byte gSprites _08131E44: ldr r1, _08131EB0 @ =gSprites @@ -12057,7 +12057,7 @@ _08131E44: mov r2, r10 ldrb r0, [r2] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r3, r5, 0 @@ -12117,16 +12117,16 @@ _08131ECA: cmp r1, r0 bne _08131F64 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 movs r0, 0x7A bl PlaySE12WithPanning - ldr r0, _08131F54 @ =gBattleAnimBankTarget + ldr r0, _08131F54 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -12143,14 +12143,14 @@ _08131ECA: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _08131F5C @ =gBattleAnimBankAttacker + ldr r0, _08131F5C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08131FF4 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _08131FF4 @@ -12172,9 +12172,9 @@ _08131ECA: b _08131FF4 .align 2, 0 _08131F50: .4byte gBattleAnimArgs -_08131F54: .4byte gBattleAnimBankTarget +_08131F54: .4byte gAnimBankTarget _08131F58: .4byte 0x0000ffe0 -_08131F5C: .4byte gBattleAnimBankAttacker +_08131F5C: .4byte gAnimBankAttacker _08131F60: .4byte gSprites _08131F64: adds r0, r4, 0 @@ -12217,7 +12217,7 @@ _08131FA6: ldrh r1, [r4, 0x32] adds r0, r1 strh r0, [r4, 0x32] - ldr r0, _08131FD0 @ =gBattleAnimBankAttacker + ldr r0, _08131FD0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12232,7 +12232,7 @@ _08131FA6: adds r1, r2, 0 b _08131FE0 .align 2, 0 -_08131FD0: .4byte gBattleAnimBankAttacker +_08131FD0: .4byte gAnimBankAttacker _08131FD4: ldrh r1, [r4, 0x32] lsls r0, r1, 16 @@ -12249,7 +12249,7 @@ _08131FE0: cmp r0, 0x2 bne _08131FF4 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08131FF4: pop {r4} pop {r0} @@ -12289,17 +12289,17 @@ _0813202C: .4byte _08132104 .4byte _0813216A _08132040: - ldr r0, _08132084 @ =gBattleAnimBankAttacker + ldr r0, _08132084 @ =gAnimBankAttacker ldrb r0, [r0] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, _08132088 @ =gBattleAnimBankTarget + ldr r0, _08132088 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 @@ -12322,12 +12322,12 @@ _08132076: strh r0, [r1, 0x26] b _08132188 .align 2, 0 -_08132084: .4byte gBattleAnimBankAttacker -_08132088: .4byte gBattleAnimBankTarget +_08132084: .4byte gAnimBankAttacker +_08132088: .4byte gAnimBankTarget _0813208C: .4byte gTasks _08132090: ldr r1, _081320CC @ =gObjectBankIDs - ldr r0, _081320D0 @ =gBattleAnimBankAttacker + ldr r0, _081320D0 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -12358,7 +12358,7 @@ _08132090: b _0813215E .align 2, 0 _081320CC: .4byte gObjectBankIDs -_081320D0: .4byte gBattleAnimBankAttacker +_081320D0: .4byte gAnimBankAttacker _081320D4: .4byte gSprites _081320D8: movs r3, 0x20 @@ -12386,7 +12386,7 @@ _081320EC: b _08132188 _08132104: ldr r1, _08132144 @ =gObjectBankIDs - ldr r0, _08132148 @ =gBattleAnimBankAttacker + ldr r0, _08132148 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -12419,7 +12419,7 @@ _08132104: b _08132162 .align 2, 0 _08132144: .4byte gObjectBankIDs -_08132148: .4byte gBattleAnimBankAttacker +_08132148: .4byte gAnimBankAttacker _0813214C: .4byte gSprites _08132150: movs r3, 0x20 @@ -12439,7 +12439,7 @@ _08132162: b _08132188 _0813216A: ldr r1, _08132190 @ =gObjectBankIDs - ldr r0, _08132194 @ =gBattleAnimBankAttacker + ldr r0, _08132194 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -12458,7 +12458,7 @@ _08132188: bx r0 .align 2, 0 _08132190: .4byte gObjectBankIDs -_08132194: .4byte gBattleAnimBankAttacker +_08132194: .4byte gAnimBankAttacker _08132198: .4byte gSprites thumb_func_end sub_8131FFC @@ -12478,7 +12478,7 @@ sub_813219C: @ 813219C lsrs r0, 24 movs r5, 0 strh r0, [r4, 0xE] - ldr r0, _08132208 @ =gBattleAnimBankAttacker + ldr r0, _08132208 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12517,7 +12517,7 @@ _081321D0: bx r0 .align 2, 0 _08132204: .4byte gTasks -_08132208: .4byte gBattleAnimBankAttacker +_08132208: .4byte gAnimBankAttacker _0813220C: .4byte gSprites _08132210: .4byte sub_8132214 thumb_func_end sub_813219C @@ -12661,7 +12661,7 @@ _08132312: sub_8132318: @ 8132318 push {r4,lr} adds r4, r0, 0 - ldr r0, _0813236C @ =gBattleAnimBankTarget + ldr r0, _0813236C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12689,7 +12689,7 @@ sub_8132318: @ 8132318 cmp r0, 0 beq _0813235E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _0813235E: ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -12698,14 +12698,14 @@ _0813235E: pop {r0} bx r0 .align 2, 0 -_0813236C: .4byte gBattleAnimBankTarget +_0813236C: .4byte gAnimBankTarget thumb_func_end sub_8132318 thumb_func_start sub_8132370 sub_8132370: @ 8132370 push {r4,lr} adds r4, r0, 0 - ldr r0, _081323A8 @ =gBattleAnimBankTarget + ldr r0, _081323A8 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12729,7 +12729,7 @@ sub_8132370: @ 8132370 bl StartSpriteAffineAnim b _081323CE .align 2, 0 -_081323A8: .4byte gBattleAnimBankTarget +_081323A8: .4byte gAnimBankTarget _081323AC: .4byte gBattleAnimArgs _081323B0: .4byte 0x0000fff5 _081323B4: @@ -12761,10 +12761,10 @@ _081323DC: .4byte sub_8132318 sub_81323E0: @ 81323E0 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08132424 @ =gBattleAnimBankAttacker + ldr r4, _08132424 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] @@ -12792,7 +12792,7 @@ _0813240A: pop {r0} bx r0 .align 2, 0 -_08132424: .4byte gBattleAnimBankAttacker +_08132424: .4byte gAnimBankAttacker _08132428: .4byte sub_8132430 _0813242C: .4byte REG_BLDALPHA thumb_func_end sub_81323E0 diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index f09d42062..73f399caa 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -16,12 +16,12 @@ unref_sub_813F0F4: @ 813F0F4 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x10] - ldr r0, _0813F2AC @ =gBattleAnimBankAttacker + ldr r0, _0813F2AC @ =gAnimBankAttacker ldrb r3, [r0] - ldr r0, _0813F2B0 @ =gUnknown_030042C4 + ldr r0, _0813F2B0 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _0813F2B4 @ =gUnknown_03004240 + ldr r0, _0813F2B4 @ =gBattle_WIN0V strh r1, [r0] ldr r1, _0813F2B8 @ =REG_WININ ldr r2, _0813F2BC @ =0x00003f3f @@ -183,12 +183,12 @@ unref_sub_813F0F4: @ 813F0F4 lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - ldr r1, _0813F2F0 @ =gUnknown_030042C0 + ldr r1, _0813F2F0 @ =gBattle_BG1_X ldrh r0, [r7, 0x20] negs r0, r0 adds r0, 0x20 strh r0, [r1] - ldr r1, _0813F2F4 @ =gUnknown_030041B4 + ldr r1, _0813F2F4 @ =gBattle_BG1_Y ldrh r0, [r7, 0x22] negs r0, r0 subs r0, 0x20 @@ -219,9 +219,9 @@ unref_sub_813F0F4: @ 813F0F4 pop {r0} bx r0 .align 2, 0 -_0813F2AC: .4byte gBattleAnimBankAttacker -_0813F2B0: .4byte gUnknown_030042C4 -_0813F2B4: .4byte gUnknown_03004240 +_0813F2AC: .4byte gAnimBankAttacker +_0813F2B0: .4byte gBattle_WIN0H +_0813F2B4: .4byte gBattle_WIN0V _0813F2B8: .4byte REG_WININ _0813F2BC: .4byte 0x00003f3f _0813F2C0: .4byte 0x00003f3d @@ -236,8 +236,8 @@ _0813F2E0: .4byte 0x85000400 _0813F2E4: .4byte gUnknown_08D2EE48 _0813F2E8: .4byte gUnknown_08D2EDFC _0813F2EC: .4byte gUnknown_08D2E150 -_0813F2F0: .4byte gUnknown_030042C0 -_0813F2F4: .4byte gUnknown_030041B4 +_0813F2F0: .4byte gBattle_BG1_X +_0813F2F4: .4byte gBattle_BG1_Y _0813F2F8: .4byte gTasks _0813F2FC: .4byte sub_813F300 thumb_func_end unref_sub_813F0F4 @@ -251,7 +251,7 @@ sub_813F300: @ 813F300 sub sp, 0x10 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0813F34C @ =gBattleAnimBankAttacker + ldr r0, _0813F34C @ =gAnimBankAttacker ldrb r0, [r0] mov r9, r0 ldr r1, _0813F350 @ =gTasks @@ -264,7 +264,7 @@ sub_813F300: @ 813F300 adds r1, r0 movs r3, 0 strh r1, [r4, 0x22] - ldr r2, _0813F354 @ =gUnknown_030041B4 + ldr r2, _0813F354 @ =gBattle_BG1_Y lsls r0, r1, 16 lsrs r0, 24 ldrh r5, [r2] @@ -283,9 +283,9 @@ sub_813F300: @ 813F300 beq _0813F35E b _0813F4B2 .align 2, 0 -_0813F34C: .4byte gBattleAnimBankAttacker +_0813F34C: .4byte gAnimBankAttacker _0813F350: .4byte gTasks -_0813F354: .4byte gUnknown_030041B4 +_0813F354: .4byte gBattle_BG1_Y _0813F358: cmp r0, 0x2 beq _0813F3AC @@ -357,9 +357,9 @@ _0813F3AC: bne _0813F4B2 movs r0, 0 bl sub_8076464 - ldr r0, _0813F4C4 @ =gUnknown_030042C4 + ldr r0, _0813F4C4 @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _0813F4C8 @ =gUnknown_03004240 + ldr r0, _0813F4C8 @ =gBattle_WIN0V strh r5, [r0] ldr r0, _0813F4CC @ =REG_WININ ldr r2, _0813F4D0 @ =0x00003f3f @@ -367,7 +367,7 @@ _0813F3AC: strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _0813F406 @@ -470,8 +470,8 @@ _0813F4B2: bx r0 .align 2, 0 _0813F4C0: .4byte REG_BLDALPHA -_0813F4C4: .4byte gUnknown_030042C4 -_0813F4C8: .4byte gUnknown_03004240 +_0813F4C4: .4byte gBattle_WIN0H +_0813F4C8: .4byte gBattle_WIN0V _0813F4CC: .4byte REG_WININ _0813F4D0: .4byte 0x00003f3f _0813F4D4: .4byte REG_BG1CNT @@ -494,7 +494,7 @@ sub_813F4EC: @ 813F4EC lsrs r0, 24 str r0, [sp] ldr r1, _0813F5D0 @ =gHealthboxIDs - ldr r0, _0813F5D4 @ =gBattleAnimBankAttacker + ldr r0, _0813F5D4 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -594,7 +594,7 @@ sub_813F4EC: @ 813F4EC bx r0 .align 2, 0 _0813F5D0: .4byte gHealthboxIDs -_0813F5D4: .4byte gBattleAnimBankAttacker +_0813F5D4: .4byte gAnimBankAttacker _0813F5D8: .4byte gSprites _0813F5DC: .4byte 0x0000d709 _0813F5E0: .4byte 0x0000d70a @@ -613,7 +613,7 @@ sub_813F5E8: @ 813F5E8 lsrs r0, 24 mov r8, r0 ldr r1, _0813F684 @ =gHealthboxIDs - ldr r0, _0813F688 @ =gBattleAnimBankAttacker + ldr r0, _0813F688 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -677,7 +677,7 @@ sub_813F5E8: @ 813F5E8 bx r0 .align 2, 0 _0813F684: .4byte gHealthboxIDs -_0813F688: .4byte gBattleAnimBankAttacker +_0813F688: .4byte gAnimBankAttacker _0813F68C: .4byte gSprites _0813F690: .4byte 0x0000d709 _0813F694: .4byte 0x0000d70a @@ -819,7 +819,7 @@ sub_813F798: @ 813F798 lsls r0, 24 lsrs r6, r0, 24 ldr r1, _0813F7C4 @ =gObjectBankIDs - ldr r0, _0813F7C8 @ =gBattleAnimBankAttacker + ldr r0, _0813F7C8 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r5, [r0] @@ -839,7 +839,7 @@ sub_813F798: @ 813F798 b _0813F838 .align 2, 0 _0813F7C4: .4byte gObjectBankIDs -_0813F7C8: .4byte gBattleAnimBankAttacker +_0813F7C8: .4byte gAnimBankAttacker _0813F7CC: .4byte gTasks _0813F7D0: cmp r0, 0x2 @@ -910,7 +910,7 @@ sub_813F844: @ 813F844 lsls r0, 24 lsrs r5, r0, 24 ldr r1, _0813F87C @ =gObjectBankIDs - ldr r4, _0813F880 @ =gBattleAnimBankAttacker + ldr r4, _0813F880 @ =gAnimBankAttacker ldrb r0, [r4] adds r1, r0, r1 ldrb r1, [r1] @@ -930,7 +930,7 @@ sub_813F844: @ 813F844 b _0813F89C .align 2, 0 _0813F87C: .4byte gObjectBankIDs -_0813F880: .4byte gBattleAnimBankAttacker +_0813F880: .4byte gAnimBankAttacker _0813F884: .4byte gBattlePartyID _0813F888: .4byte gPlayerParty _0813F88C: @@ -969,16 +969,16 @@ _0813F8CC: .4byte gBattlePartyID _0813F8D0: .4byte gEnemyParty _0813F8D4: .4byte gTasks _0813F8D8: - ldr r5, _0813F950 @ =gBattleAnimBankAttacker + ldr r5, _0813F950 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition adds r1, r0, 0 lsls r1, 24 ldr r2, _0813F954 @ =gSprites @@ -1024,7 +1024,7 @@ _0813F8D8: strh r0, [r6, 0x8] b _0813F982 .align 2, 0 -_0813F950: .4byte gBattleAnimBankAttacker +_0813F950: .4byte gAnimBankAttacker _0813F954: .4byte gSprites _0813F958: movs r1, 0x1C @@ -1234,18 +1234,18 @@ sub_813FA94: @ 813FA94 adds r6, r4, r1 movs r0, 0x22 strh r0, [r6, 0x2E] - ldr r2, _0813FB64 @ =gBattleAnimBankTarget + ldr r2, _0813FB64 @ =gAnimBankTarget mov r8, r2 ldrb r0, [r2] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x30] mov r1, r8 ldrb r0, [r1] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 subs r0, 0x10 @@ -1296,7 +1296,7 @@ sub_813FA94: @ 813FA94 _0813FB58: .4byte gLastUsedItem _0813FB5C: .4byte gBallSpriteTemplates _0813FB60: .4byte gSprites -_0813FB64: .4byte gBattleAnimBankTarget +_0813FB64: .4byte gAnimBankTarget _0813FB68: .4byte sub_813FD90 _0813FB6C: .4byte gSharedMem + 0x17840 _0813FB70: .4byte gObjectBankIDs @@ -1396,18 +1396,18 @@ _0813FBE0: adds r6, r4, r0 movs r0, 0x22 strh r0, [r6, 0x2E] - ldr r1, _0813FCA8 @ =gBattleAnimBankTarget + ldr r1, _0813FCA8 @ =gAnimBankTarget mov r8, r1 ldrb r0, [r1] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x30] mov r1, r8 ldrb r0, [r1] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 subs r0, 0x10 @@ -1448,7 +1448,7 @@ _0813FBE0: _0813FC9C: .4byte gLastUsedItem _0813FCA0: .4byte gBallSpriteTemplates _0813FCA4: .4byte gSprites -_0813FCA8: .4byte gBattleAnimBankTarget +_0813FCA8: .4byte gAnimBankTarget _0813FCAC: .4byte SpriteCallbackDummy _0813FCB0: .4byte gObjectBankIDs _0813FCB4: .4byte gTasks @@ -1651,7 +1651,7 @@ _0813FE10: movs r2, 0x1 movs r3, 0x1C bl sub_814086C - ldr r0, _0813FE6C @ =gBattleAnimBankTarget + ldr r0, _0813FE6C @ =gAnimBankTarget ldrb r1, [r0] movs r0, 0 movs r2, 0xE @@ -1665,7 +1665,7 @@ _0813FE5A: .align 2, 0 _0813FE64: .4byte sub_813FE70 _0813FE68: .4byte gLastUsedItem -_0813FE6C: .4byte gBattleAnimBankTarget +_0813FE6C: .4byte gAnimBankTarget thumb_func_end sub_813FDC0 thumb_func_start sub_813FE70 @@ -1689,7 +1689,7 @@ sub_813FE70: @ 813FE70 str r0, [r4, 0x1C] ldr r2, _0813FEBC @ =gSprites ldr r1, _0813FEC0 @ =gObjectBankIDs - ldr r0, _0813FEC4 @ =gBattleAnimBankTarget + ldr r0, _0813FEC4 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -1708,7 +1708,7 @@ _0813FEB4: .4byte TaskDummy _0813FEB8: .4byte sub_813FEC8 _0813FEBC: .4byte gSprites _0813FEC0: .4byte gObjectBankIDs -_0813FEC4: .4byte gBattleAnimBankTarget +_0813FEC4: .4byte gAnimBankTarget thumb_func_end sub_813FE70 thumb_func_start sub_813FEC8 @@ -1716,7 +1716,7 @@ sub_813FEC8: @ 813FEC8 push {r4-r7,lr} adds r7, r0, 0 ldr r1, _0813FF0C @ =gObjectBankIDs - ldr r0, _0813FF10 @ =gBattleAnimBankTarget + ldr r0, _0813FF10 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r4, [r0] @@ -1749,7 +1749,7 @@ _0813FEFA: b _0813FFDC .align 2, 0 _0813FF0C: .4byte gObjectBankIDs -_0813FF10: .4byte gBattleAnimBankTarget +_0813FF10: .4byte gAnimBankTarget _0813FF14: .4byte gTasks _0813FF18: cmp r0, 0x2 @@ -2450,7 +2450,7 @@ _08140450: .4byte sub_8140454 sub_8140454: @ 8140454 push {r4-r7,lr} adds r6, r0, 0 - ldr r7, _08140484 @ =gBattleAnimBankTarget + ldr r7, _08140484 @ =gAnimBankTarget ldrh r0, [r6, 0x36] adds r0, 0x1 strh r0, [r6, 0x36] @@ -2464,13 +2464,13 @@ sub_8140454: @ 8140454 movs r1, 0 strb r1, [r0] movs r0, 0x1 - bl sub_8043EB4 + bl UpdateOamPriorityInAllHealthboxes bl m4aMPlayAllStop ldr r0, _0814048C @ =0x00000173 bl PlaySE b _081404CC .align 2, 0 -_08140484: .4byte gBattleAnimBankTarget +_08140484: .4byte gAnimBankTarget _08140488: .4byte gDoingBattleAnim _0814048C: .4byte 0x00000173 _08140490: @@ -2689,7 +2689,7 @@ sub_81405F4: @ 81405F4 movs r2, 0x1 movs r3, 0x1C bl sub_814086C - ldr r0, _081406B0 @ =gBattleAnimBankTarget + ldr r0, _081406B0 @ =gAnimBankTarget ldrb r1, [r0] movs r0, 0x1 movs r2, 0xE @@ -2698,7 +2698,7 @@ sub_81405F4: @ 81405F4 _08140646: ldr r6, _081406B4 @ =gSprites ldr r5, _081406B8 @ =gObjectBankIDs - ldr r4, _081406B0 @ =gBattleAnimBankTarget + ldr r4, _081406B0 @ =gAnimBankTarget ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -2746,7 +2746,7 @@ _08140646: .align 2, 0 _081406A8: .4byte sub_81406BC _081406AC: .4byte gLastUsedItem -_081406B0: .4byte gBattleAnimBankTarget +_081406B0: .4byte gAnimBankTarget _081406B4: .4byte gSprites _081406B8: .4byte gObjectBankIDs thumb_func_end sub_81405F4 @@ -2771,7 +2771,7 @@ sub_81406BC: @ 81406BC _081406DA: ldr r4, _08140708 @ =gSprites ldr r3, _0814070C @ =gObjectBankIDs - ldr r2, _08140710 @ =gBattleAnimBankTarget + ldr r2, _08140710 @ =gAnimBankTarget ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -2793,7 +2793,7 @@ _081406DA: .align 2, 0 _08140708: .4byte gSprites _0814070C: .4byte gObjectBankIDs -_08140710: .4byte gBattleAnimBankTarget +_08140710: .4byte gAnimBankTarget _08140714: ldr r6, _0814079C @ =0xfffffee0 adds r0, r6, 0 @@ -2823,7 +2823,7 @@ _08140734: beq _08140796 ldr r4, _081407A0 @ =gSprites ldr r3, _081407A4 @ =gObjectBankIDs - ldr r2, _081407A8 @ =gBattleAnimBankTarget + ldr r2, _081407A8 @ =gAnimBankTarget ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -2859,7 +2859,7 @@ _08140734: ldr r0, _081407B4 @ =gDoingBattleAnim strb r6, [r0] movs r0, 0x1 - bl sub_8043EB4 + bl UpdateOamPriorityInAllHealthboxes _08140796: pop {r4-r7} pop {r0} @@ -2868,7 +2868,7 @@ _08140796: _0814079C: .4byte 0xfffffee0 _081407A0: .4byte gSprites _081407A4: .4byte gObjectBankIDs -_081407A8: .4byte gBattleAnimBankTarget +_081407A8: .4byte gAnimBankTarget _081407AC: .4byte gSharedMem + 0x17840 _081407B0: .4byte sub_81405C8 _081407B4: .4byte gDoingBattleAnim @@ -2962,7 +2962,7 @@ _0814084A: movs r0, 0 strb r0, [r1] movs r0, 0x1 - bl sub_8043EB4 + bl UpdateOamPriorityInAllHealthboxes _0814085E: pop {r4} pop {r0} @@ -4582,7 +4582,7 @@ sub_814151C: @ 814151C movs r0, 0 mov r8, r0 ldr r0, _08141550 @ =gObjectBankIDs - ldr r3, _08141554 @ =gBattleAnimBankAttacker + ldr r3, _08141554 @ =gAnimBankAttacker ldrb r2, [r3] adds r0, r2, r0 ldrb r6, [r0] @@ -4602,7 +4602,7 @@ sub_814151C: @ 814151C b _081416B6 .align 2, 0 _08141550: .4byte gObjectBankIDs -_08141554: .4byte gBattleAnimBankAttacker +_08141554: .4byte gAnimBankAttacker _08141558: .4byte gTasks _0814155C: cmp r0, 0x2 @@ -4737,7 +4737,7 @@ _08141654: adds r0, r1 ldrb r1, [r0, 0x8] strh r1, [r0, 0x8] - ldr r0, _08141690 @ =gBattleAnimBankAttacker + ldr r0, _08141690 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -4758,7 +4758,7 @@ _08141654: .align 2, 0 _08141688: .4byte gSprites _0814168C: .4byte gTasks -_08141690: .4byte gBattleAnimBankAttacker +_08141690: .4byte gAnimBankAttacker _08141694: ldr r0, _081416C0 @ =gSprites adds r1, r4, r6 @@ -4815,7 +4815,7 @@ _081416EC: beq _0814177C b _081417B8 _081416F2: - ldr r0, _08141708 @ =gBattleAnimBankAttacker + ldr r0, _08141708 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -4826,7 +4826,7 @@ _081416F2: ldr r2, _08141710 @ =0x00003f42 b _08141718 .align 2, 0 -_08141708: .4byte gBattleAnimBankAttacker +_08141708: .4byte gAnimBankAttacker _0814170C: .4byte REG_BLDCNT _08141710: .4byte 0x00003f42 _08141714: @@ -4883,7 +4883,7 @@ _08141744: _08141778: .4byte REG_BLDALPHA _0814177C: ldr r1, _081417C0 @ =gObjectBankIDs - ldr r3, _081417C4 @ =gBattleAnimBankAttacker + ldr r3, _081417C4 @ =gAnimBankAttacker ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -4917,7 +4917,7 @@ _081417B8: bx r0 .align 2, 0 _081417C0: .4byte gObjectBankIDs -_081417C4: .4byte gBattleAnimBankAttacker +_081417C4: .4byte gAnimBankAttacker _081417C8: .4byte gSprites _081417CC: .4byte 0x06010000 _081417D0: .4byte 0x040000d4 @@ -4930,7 +4930,7 @@ sub_81417D8: @ 81417D8 lsls r0, 24 lsrs r0, 24 ldr r3, _081417FC @ =gBattleAnimArgs - ldr r1, _08141800 @ =gBattleAnimBankAttacker + ldr r1, _08141800 @ =gAnimBankAttacker ldrb r1, [r1] lsls r1, 2 ldr r2, _08141804 @ =gSharedMem + 0x17800 @@ -4944,7 +4944,7 @@ sub_81417D8: @ 81417D8 bx r0 .align 2, 0 _081417FC: .4byte gBattleAnimArgs -_08141800: .4byte gBattleAnimBankAttacker +_08141800: .4byte gAnimBankAttacker _08141804: .4byte gSharedMem + 0x17800 thumb_func_end sub_81417D8 @@ -4953,7 +4953,7 @@ sub_8141808: @ 8141808 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08141820 @ =gBattleAnimBankTarget + ldr r2, _08141820 @ =gAnimBankTarget ldr r1, _08141824 @ =gEffectBank ldrb r1, [r1] strb r1, [r2] @@ -4961,7 +4961,7 @@ sub_8141808: @ 8141808 pop {r0} bx r0 .align 2, 0 -_08141820: .4byte gBattleAnimBankTarget +_08141820: .4byte gAnimBankTarget _08141824: .4byte gEffectBank thumb_func_end sub_8141808 @@ -5124,12 +5124,12 @@ _08141966: ldrb r0, [r4, 0x8] mov r8, r0 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r5, r0, 24 mov r0, r8 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r2, r0, 24 movs r1, 0x1E @@ -5487,7 +5487,7 @@ sub_8141C30: @ 8141C30 lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r5, _08141CA4 @ =gBattleAnimArgs lsrs r0, 24 @@ -5499,7 +5499,7 @@ sub_8141C30: @ 8141C30 lsls r0, 24 lsrs r0, 24 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -5510,7 +5510,7 @@ sub_8141C30: @ 8141C30 adds r0, r4, 0 bl sub_80786EC ldr r1, _08141CAC @ =gObjectBankIDs - ldr r0, _08141CB0 @ =gBattleAnimBankAttacker + ldr r0, _08141CB0 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -5530,7 +5530,7 @@ sub_8141C30: @ 8141C30 _08141CA4: .4byte gBattleAnimArgs _08141CA8: .4byte 0x0000ffe0 _08141CAC: .4byte gObjectBankIDs -_08141CB0: .4byte gBattleAnimBankAttacker +_08141CB0: .4byte gAnimBankAttacker _08141CB4: .4byte gSprites _08141CB8: .4byte sub_8141CBC thumb_func_end sub_8141C30 @@ -5541,7 +5541,7 @@ sub_8141CBC: @ 8141CBC adds r3, r0, 0 ldr r2, _08141CE4 @ =gSprites ldr r1, _08141CE8 @ =gObjectBankIDs - ldr r0, _08141CEC @ =gBattleAnimBankAttacker + ldr r0, _08141CEC @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -5561,7 +5561,7 @@ _08141CE0: .align 2, 0 _08141CE4: .4byte gSprites _08141CE8: .4byte gObjectBankIDs -_08141CEC: .4byte gBattleAnimBankAttacker +_08141CEC: .4byte gAnimBankAttacker _08141CF0: .4byte sub_8141CF4 thumb_func_end sub_8141CBC @@ -5597,7 +5597,7 @@ sub_8141D20: @ 8141D20 adds r4, r0, 0 ldr r5, _08141D70 @ =gSprites ldr r3, _08141D74 @ =gObjectBankIDs - ldr r2, _08141D78 @ =gBattleAnimBankAttacker + ldr r2, _08141D78 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -5626,7 +5626,7 @@ sub_8141D20: @ 8141D20 movs r1, 0 bl StartSpriteAnim adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _08141D68: pop {r4,r5} pop {r0} @@ -5634,7 +5634,7 @@ _08141D68: .align 2, 0 _08141D70: .4byte gSprites _08141D74: .4byte gObjectBankIDs -_08141D78: .4byte gBattleAnimBankAttacker +_08141D78: .4byte gAnimBankAttacker thumb_func_end sub_8141D20 thumb_func_start sub_8141D7C @@ -5645,11 +5645,11 @@ sub_8141D7C: @ 8141D7C lsrs r4, 24 movs r0, 0 bl GetBankByPlayerAI - ldr r1, _08141DA4 @ =gBattleAnimBankAttacker + ldr r1, _08141DA4 @ =gAnimBankAttacker strb r0, [r1] movs r0, 0x1 bl GetBankByPlayerAI - ldr r1, _08141DA8 @ =gBattleAnimBankTarget + ldr r1, _08141DA8 @ =gAnimBankTarget strb r0, [r1] adds r0, r4, 0 bl DestroyAnimVisualTask @@ -5657,8 +5657,8 @@ sub_8141D7C: @ 8141D7C pop {r0} bx r0 .align 2, 0 -_08141DA4: .4byte gBattleAnimBankAttacker -_08141DA8: .4byte gBattleAnimBankTarget +_08141DA4: .4byte gAnimBankAttacker +_08141DA8: .4byte gAnimBankTarget thumb_func_end sub_8141D7C thumb_func_start sub_8141DAC @@ -5720,20 +5720,20 @@ sub_8141E10: @ 8141E10 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08141E2C @ =gBattleAnimBankAttacker + ldr r2, _08141E2C @ =gAnimBankAttacker ldr r1, _08141E30 @ =gSharedMem + 0x17840 ldrh r1, [r1] strb r1, [r2] - ldr r2, _08141E34 @ =gBattleAnimBankTarget + ldr r2, _08141E34 @ =gAnimBankTarget lsrs r1, 8 strb r1, [r2] bl DestroyAnimVisualTask pop {r0} bx r0 .align 2, 0 -_08141E2C: .4byte gBattleAnimBankAttacker +_08141E2C: .4byte gAnimBankAttacker _08141E30: .4byte gSharedMem + 0x17840 -_08141E34: .4byte gBattleAnimBankTarget +_08141E34: .4byte gAnimBankTarget thumb_func_end sub_8141E10 .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_intro.s b/asm/battle_intro.s index 721583c30..10b504a79 100755 --- a/asm/battle_intro.s +++ b/asm/battle_intro.s @@ -76,14 +76,14 @@ sub_80E443C: @ 80E443C lsls r0, 24 lsrs r0, 24 bl DestroyTask - ldr r0, _080E4474 @ =gUnknown_030042C0 + ldr r0, _080E4474 @ =gBattle_BG1_X movs r1, 0 strh r1, [r0] - ldr r0, _080E4478 @ =gUnknown_030041B4 + ldr r0, _080E4478 @ =gBattle_BG1_Y strh r1, [r0] - ldr r0, _080E447C @ =gUnknown_03004288 + ldr r0, _080E447C @ =gBattle_BG2_X strh r1, [r0] - ldr r0, _080E4480 @ =gUnknown_03004280 + ldr r0, _080E4480 @ =gBattle_BG2_Y strh r1, [r0] ldr r0, _080E4484 @ =REG_BLDCNT strh r1, [r0] @@ -100,10 +100,10 @@ sub_80E443C: @ 80E443C pop {r0} bx r0 .align 2, 0 -_080E4474: .4byte gUnknown_030042C0 -_080E4478: .4byte gUnknown_030041B4 -_080E447C: .4byte gUnknown_03004288 -_080E4480: .4byte gUnknown_03004280 +_080E4474: .4byte gBattle_BG1_X +_080E4478: .4byte gBattle_BG1_Y +_080E447C: .4byte gBattle_BG2_X +_080E4480: .4byte gBattle_BG2_Y _080E4484: .4byte REG_BLDCNT _080E4488: .4byte 0x00003f3f thumb_func_end sub_80E443C @@ -117,7 +117,7 @@ task_battle_intro_80BC47C: @ 80E448C sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080E44C4 @ =gUnknown_030042C0 + ldr r1, _080E44C4 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x6 strh r0, [r1] @@ -139,7 +139,7 @@ _080E44B8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E44C4: .4byte gUnknown_030042C0 +_080E44C4: .4byte gBattle_BG1_X _080E44C8: .4byte gTasks _080E44CC: .4byte _080E44D0 .align 2, 0 @@ -200,7 +200,7 @@ _080E452C: .align 2, 0 _080E453C: .4byte REG_WININ _080E4540: - ldr r1, _080E457C @ =gUnknown_03004240 + ldr r1, _080E457C @ =gBattle_WIN0V ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -231,7 +231,7 @@ _080E4558: strh r0, [r2] b _080E46BE .align 2, 0 -_080E457C: .4byte gUnknown_03004240 +_080E457C: .4byte gBattle_WIN0V _080E4580: .4byte gUnknown_02024DE8 _080E4584: .4byte 0x0000fffe _080E4588: @@ -254,7 +254,7 @@ _080E45A4: ldrsh r0, [r2, r1] cmp r0, 0x1 bne _080E45C4 - ldr r2, _080E45BC @ =gUnknown_030041B4 + ldr r2, _080E45BC @ =gBattle_BG1_Y ldrh r1, [r2] ldr r0, _080E45C0 @ =0x0000ffb0 cmp r1, r0 @@ -262,10 +262,10 @@ _080E45A4: subs r0, r1, 0x2 b _080E45D0 .align 2, 0 -_080E45BC: .4byte gUnknown_030041B4 +_080E45BC: .4byte gBattle_BG1_Y _080E45C0: .4byte 0x0000ffb0 _080E45C4: - ldr r2, _080E4690 @ =gUnknown_030041B4 + ldr r2, _080E4690 @ =gBattle_BG1_Y ldrh r1, [r2] ldr r0, _080E4694 @ =0x0000ffc8 cmp r1, r0 @@ -274,7 +274,7 @@ _080E45C4: _080E45D0: strh r0, [r2] _080E45D2: - ldr r2, _080E4698 @ =gUnknown_03004240 + ldr r2, _080E4698 @ =gBattle_WIN0V ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -373,9 +373,9 @@ _080E464E: strh r0, [r1] b _080E46BE .align 2, 0 -_080E4690: .4byte gUnknown_030041B4 +_080E4690: .4byte gBattle_BG1_Y _080E4694: .4byte 0x0000ffc8 -_080E4698: .4byte gUnknown_03004240 +_080E4698: .4byte gBattle_WIN0V _080E469C: .4byte 0xfffffc04 _080E46A0: .4byte gUnknown_03004DC0 _080E46A4: .4byte gUnknown_03004DE0 @@ -425,14 +425,14 @@ _080E46FC: cmp r0, 0x4 bne _080E4714 _080E4700: - ldr r1, _080E4708 @ =gUnknown_030042C0 + ldr r1, _080E4708 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x8 b _080E4712 .align 2, 0 -_080E4708: .4byte gUnknown_030042C0 +_080E4708: .4byte gBattle_BG1_X _080E470C: - ldr r1, _080E4750 @ =gUnknown_030042C0 + ldr r1, _080E4750 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x6 _080E4712: @@ -447,7 +447,7 @@ _080E4714: adds r6, r0, 0 cmp r1, 0x4 bne _080E4778 - ldr r7, _080E4754 @ =gUnknown_030041B4 + ldr r7, _080E4754 @ =gBattle_BG1_Y ldrh r0, [r4, 0x14] bl Cos2 lsls r0, 16 @@ -468,8 +468,8 @@ _080E473A: adds r0, r1, 0x4 b _080E475E .align 2, 0 -_080E4750: .4byte gUnknown_030042C0 -_080E4754: .4byte gUnknown_030041B4 +_080E4750: .4byte gBattle_BG1_X +_080E4754: .4byte gBattle_BG1_Y _080E4758: .4byte 0x000001ff _080E475C: adds r0, r1, 0x6 @@ -562,7 +562,7 @@ _080E47F6: _080E4804: .4byte gTasks _080E4808: .4byte REG_WININ _080E480C: - ldr r1, _080E484C @ =gUnknown_03004240 + ldr r1, _080E484C @ =gBattle_WIN0V ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -595,7 +595,7 @@ _080E4824: strh r0, [r2] b _080E4996 .align 2, 0 -_080E484C: .4byte gUnknown_03004240 +_080E484C: .4byte gBattle_WIN0V _080E4850: .4byte gTasks _080E4854: .4byte gUnknown_02024DE8 _080E4858: .4byte 0x0000fffe @@ -646,7 +646,7 @@ _080E4898: movs r0, 0x4 strh r0, [r1, 0x12] _080E48B8: - ldr r3, _080E4970 @ =gUnknown_03004240 + ldr r3, _080E4970 @ =gBattle_WIN0V ldrh r1, [r3] movs r0, 0xFF lsls r0, 8 @@ -743,7 +743,7 @@ _080E4932: strh r0, [r1] b _080E4996 .align 2, 0 -_080E4970: .4byte gUnknown_03004240 +_080E4970: .4byte gBattle_WIN0V _080E4974: .4byte 0xfffffc04 _080E4978: .4byte gUnknown_03004DC0 _080E497C: .4byte gUnknown_03004DE0 @@ -786,7 +786,7 @@ task_battle_intro_anim: @ 80E49C0 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080E49F4 @ =gUnknown_030042C0 + ldr r1, _080E49F4 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x8 strh r0, [r1] @@ -808,7 +808,7 @@ _080E49EA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E49F4: .4byte gUnknown_030042C0 +_080E49F4: .4byte gBattle_BG1_X _080E49F8: .4byte gTasks _080E49FC: .4byte _080E4A00 .align 2, 0 @@ -884,7 +884,7 @@ _080E4A84: _080E4A94: .4byte gTasks _080E4A98: .4byte REG_WININ _080E4A9C: - ldr r1, _080E4ADC @ =gUnknown_03004240 + ldr r1, _080E4ADC @ =gBattle_WIN0V ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -918,7 +918,7 @@ _080E4AB4: strh r0, [r2] b _080E4C06 .align 2, 0 -_080E4ADC: .4byte gUnknown_03004240 +_080E4ADC: .4byte gBattle_WIN0V _080E4AE0: .4byte gTasks _080E4AE4: .4byte gUnknown_02024DE8 _080E4AE8: .4byte 0x0000fffe @@ -954,7 +954,7 @@ _080E4B06: movs r0, 0x6 strh r0, [r2, 0x12] _080E4B26: - ldr r2, _080E4BE0 @ =gUnknown_03004240 + ldr r2, _080E4BE0 @ =gBattle_WIN0V ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -1051,7 +1051,7 @@ _080E4B9E: strh r0, [r1] b _080E4C06 .align 2, 0 -_080E4BE0: .4byte gUnknown_03004240 +_080E4BE0: .4byte gBattle_WIN0V _080E4BE4: .4byte 0xfffffc04 _080E4BE8: .4byte gUnknown_03004DC0 _080E4BEC: .4byte gUnknown_03004DE0 @@ -1109,7 +1109,7 @@ sub_80E4C34: @ 80E4C34 ldrsh r0, [r7, r2] cmp r0, 0 bne _080E4CAA - ldr r2, _080E4C84 @ =gUnknown_030042C0 + ldr r2, _080E4C84 @ =gBattle_BG1_X ldrh r1, [r2] movs r0, 0x80 lsls r0, 8 @@ -1123,15 +1123,15 @@ sub_80E4C34: @ 80E4C34 _080E4C72: adds r0, r1, 0x3 strh r0, [r2] - ldr r1, _080E4C88 @ =gUnknown_03004288 + ldr r1, _080E4C88 @ =gBattle_BG2_X ldrh r0, [r1] subs r0, 0x3 strh r0, [r1] b _080E4CAA .align 2, 0 _080E4C80: .4byte gTasks -_080E4C84: .4byte gUnknown_030042C0 -_080E4C88: .4byte gUnknown_03004288 +_080E4C84: .4byte gBattle_BG1_X +_080E4C88: .4byte gBattle_BG2_X _080E4C8C: str r5, [sp] ldr r1, _080E4CCC @ =0x0600e000 @@ -1265,7 +1265,7 @@ _080E4D9C: .4byte 0x0001608b _080E4DA0: .4byte REG_WININ _080E4DA4: .4byte 0x00003f06 _080E4DA8: - ldr r1, _080E4DE0 @ =gUnknown_03004240 + ldr r1, _080E4DE0 @ =gBattle_WIN0V ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -1295,11 +1295,11 @@ _080E4DC0: strh r0, [r2] b _080E4EBA .align 2, 0 -_080E4DE0: .4byte gUnknown_03004240 +_080E4DE0: .4byte gBattle_WIN0V _080E4DE4: .4byte gUnknown_02024DE8 _080E4DE8: .4byte 0x0000fffe _080E4DEC: - ldr r2, _080E4E9C @ =gUnknown_03004240 + ldr r2, _080E4E9C @ =gBattle_WIN0V ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -1393,7 +1393,7 @@ _080E4E94: strh r0, [r1] b _080E4EBA .align 2, 0 -_080E4E9C: .4byte gUnknown_03004240 +_080E4E9C: .4byte gBattle_WIN0V _080E4EA0: .4byte 0xfffffc04 _080E4EA4: .4byte gUnknown_03004DC0 _080E4EA8: .4byte gUnknown_03004DE0 @@ -11,7 +11,7 @@ sub_80DC824: @ 80DC824 push {r4-r6,lr} adds r6, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC850 @@ -29,7 +29,7 @@ sub_80DC824: @ 80DC824 .align 2, 0 _080DC84C: .4byte gBattleAnimArgs _080DC850: - ldr r0, _080DC8E4 @ =gBattleAnimBankTarget + ldr r0, _080DC8E4 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -52,7 +52,7 @@ _080DC850: negs r0, r0 strh r0, [r1] _080DC880: - ldr r5, _080DC8E4 @ =gBattleAnimBankTarget + ldr r5, _080DC8E4 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_8077EE4 @@ -74,7 +74,7 @@ _080DC880: strh r0, [r6, 0x2E] ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -82,7 +82,7 @@ _080DC880: strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x6] @@ -90,24 +90,24 @@ _080DC880: strh r0, [r6, 0x36] ldr r0, _080DC8EC @ =sub_8078B34 str r0, [r6, 0x1C] - ldr r1, _080DC8F0 @ =move_anim_8072740 + ldr r1, _080DC8F0 @ =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080DC8E4: .4byte gBattleAnimBankTarget +_080DC8E4: .4byte gAnimBankTarget _080DC8E8: .4byte gBattleAnimArgs _080DC8EC: .4byte sub_8078B34 -_080DC8F0: .4byte move_anim_8072740 +_080DC8F0: .4byte DestroyAnimSprite thumb_func_end sub_80DC824 thumb_func_start sub_80DC8F4 sub_80DC8F4: @ 80DC8F4 push {r4-r6,lr} adds r6, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC918 @@ -122,7 +122,7 @@ sub_80DC8F4: @ 80DC8F4 .align 2, 0 _080DC914: .4byte gBattleAnimArgs _080DC918: - ldr r0, _080DC990 @ =gBattleAnimBankTarget + ldr r0, _080DC990 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -136,7 +136,7 @@ _080DC918: negs r1, r1 strh r1, [r0] _080DC934: - ldr r5, _080DC990 @ =gBattleAnimBankTarget + ldr r5, _080DC990 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 bl sub_8077EE4 @@ -158,36 +158,36 @@ _080DC934: strh r0, [r6, 0x2E] ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x36] ldr r0, _080DC998 @ =sub_8078B34 str r0, [r6, 0x1C] - ldr r1, _080DC99C @ =move_anim_8072740 + ldr r1, _080DC99C @ =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080DC990: .4byte gBattleAnimBankTarget +_080DC990: .4byte gAnimBankTarget _080DC994: .4byte gBattleAnimArgs _080DC998: .4byte sub_8078B34 -_080DC99C: .4byte move_anim_8072740 +_080DC99C: .4byte DestroyAnimSprite thumb_func_end sub_80DC8F4 thumb_func_start sub_80DC9A0 sub_80DC9A0: @ 80DC9A0 push {r4,r5,lr} adds r5, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC9BC @@ -213,25 +213,25 @@ _080DC9BC: ldrsh r0, [r1, r2] cmp r0, 0 bne _080DCA04 - ldr r4, _080DCA00 @ =gBattleAnimBankTarget + ldr r4, _080DCA00 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] b _080DCA16 .align 2, 0 _080DC9FC: .4byte gBattleAnimArgs -_080DCA00: .4byte gBattleAnimBankTarget +_080DCA00: .4byte gAnimBankTarget _080DCA04: - ldr r0, _080DCA2C @ =gBattleAnimBankTarget + ldr r0, _080DCA2C @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -251,7 +251,7 @@ _080DCA16: pop {r0} bx r0 .align 2, 0 -_080DCA2C: .4byte gBattleAnimBankTarget +_080DCA2C: .4byte gAnimBankTarget _080DCA30: .4byte gBattleAnimArgs _080DCA34: .4byte sub_80DCA38 thumb_func_end sub_80DC9A0 @@ -265,7 +265,7 @@ sub_80DCA38: @ 80DCA38 cmp r0, 0 beq _080DCA4E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080DCA6A _080DCA4E: movs r1, 0x3A @@ -291,7 +291,7 @@ _080DCA6A: sub_80DCA70: @ 80DCA70 push {r4,lr} adds r4, r0, 0 - ldr r0, _080DCAA0 @ =gBattleAnimBankTarget + ldr r0, _080DCAA0 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -299,7 +299,7 @@ sub_80DCA70: @ 80DCA70 adds r3, 0x22 movs r1, 0 bl sub_807A3FC - ldr r0, _080DCAA4 @ =gBattleAnimBankAttacker + ldr r0, _080DCAA4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -312,8 +312,8 @@ sub_80DCA70: @ 80DCA70 strh r1, [r4, 0x20] b _080DCAB8 .align 2, 0 -_080DCAA0: .4byte gBattleAnimBankTarget -_080DCAA4: .4byte gBattleAnimBankAttacker +_080DCAA0: .4byte gAnimBankTarget +_080DCAA4: .4byte gAnimBankAttacker _080DCAA8: .4byte gBattleAnimArgs _080DCAAC: ldr r1, _080DCAE0 @ =gBattleAnimArgs @@ -327,7 +327,7 @@ _080DCAB8: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _080DCAE4 @ =gBattleAnimBankTarget + ldr r0, _080DCAE4 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -344,7 +344,7 @@ _080DCAD4: bx r0 .align 2, 0 _080DCAE0: .4byte gBattleAnimArgs -_080DCAE4: .4byte gBattleAnimBankTarget +_080DCAE4: .4byte gAnimBankTarget _080DCAE8: .4byte sub_80DCAEC thumb_func_end sub_80DCA70 @@ -385,7 +385,7 @@ _080DCB20: cmp r0, 0x33 bne _080DCB34 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DCB34: pop {r0} bx r0 @@ -468,7 +468,7 @@ sub_80DCBB4: @ 80DCBB4 strh r2, [r1] adds r1, 0x2 strh r2, [r1] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 @@ -480,7 +480,7 @@ sub_80DCBCC: @ 80DCBCC push {r4-r7,lr} sub sp, 0x4 adds r7, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DCBEC @@ -492,7 +492,7 @@ sub_80DCBCC: @ 80DCBCC .align 2, 0 _080DCBE8: .4byte gBattleAnimArgs _080DCBEC: - ldr r0, _080DCCE8 @ =gBattleAnimBankAttacker + ldr r0, _080DCCE8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -509,15 +509,15 @@ _080DCBEC: negs r0, r0 strh r0, [r1, 0x6] _080DCC0E: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DCC5E - ldr r0, _080DCCE8 @ =gBattleAnimBankAttacker + ldr r0, _080DCCE8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide adds r4, r0, 0 - ldr r5, _080DCCF0 @ =gBattleAnimBankTarget + ldr r5, _080DCCF0 @ =gAnimBankTarget ldrb r0, [r5] bl GetBankSide lsls r4, 24 @@ -549,10 +549,10 @@ _080DCC5E: adds r0, r7, 0 movs r1, 0x1 bl sub_80787B0 - ldr r5, _080DCCF0 @ =gBattleAnimBankTarget + ldr r5, _080DCCF0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 ldr r6, _080DCCEC @ =gBattleAnimArgs @@ -563,7 +563,7 @@ _080DCC5E: lsrs r4, 16 ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -601,7 +601,7 @@ _080DCC5E: strh r5, [r7, 0x36] ldr r0, _080DCCF4 @ =sub_8078B34 str r0, [r7, 0x1C] - ldr r1, _080DCCF8 @ =move_anim_8072740 + ldr r1, _080DCCF8 @ =DestroyAnimSprite adds r0, r7, 0 bl StoreSpriteCallbackInData add sp, 0x4 @@ -609,11 +609,11 @@ _080DCC5E: pop {r0} bx r0 .align 2, 0 -_080DCCE8: .4byte gBattleAnimBankAttacker +_080DCCE8: .4byte gAnimBankAttacker _080DCCEC: .4byte gBattleAnimArgs -_080DCCF0: .4byte gBattleAnimBankTarget +_080DCCF0: .4byte gAnimBankTarget _080DCCF4: .4byte sub_8078B34 -_080DCCF8: .4byte move_anim_8072740 +_080DCCF8: .4byte DestroyAnimSprite thumb_func_end sub_80DCBCC thumb_func_start sub_80DCCFC @@ -622,7 +622,7 @@ sub_80DCCFC: @ 80DCCFC adds r6, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080DCD68 @ =gBattleAnimBankAttacker + ldr r0, _080DCD68 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -636,10 +636,10 @@ _080DCD1C: ldr r4, _080DCD6C @ =gBattleAnimArgs ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, _080DCD70 @ =gBattleAnimBankTarget + ldr r5, _080DCD70 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -647,7 +647,7 @@ _080DCD1C: strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x6] @@ -669,9 +669,9 @@ _080DCD1C: pop {r0} bx r0 .align 2, 0 -_080DCD68: .4byte gBattleAnimBankAttacker +_080DCD68: .4byte gAnimBankAttacker _080DCD6C: .4byte gBattleAnimArgs -_080DCD70: .4byte gBattleAnimBankTarget +_080DCD70: .4byte gAnimBankTarget _080DCD74: .4byte sub_80DCD78 thumb_func_end sub_80DCCFC @@ -695,7 +695,7 @@ sub_80DCD78: @ 80DCD78 cmp r0, 0 beq _080DCDA4 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080DCE34 _080DCDA4: movs r0, 0x2E @@ -787,23 +787,23 @@ sub_80DCE40: @ 80DCE40 ldrsh r0, [r0, r1] cmp r0, 0 bne _080DCE5C - ldr r4, _080DCE58 @ =gBattleAnimBankAttacker + ldr r4, _080DCE58 @ =gAnimBankAttacker b _080DCE5E .align 2, 0 _080DCE54: .4byte gBattleAnimArgs -_080DCE58: .4byte gBattleAnimBankAttacker +_080DCE58: .4byte gAnimBankAttacker _080DCE5C: - ldr r4, _080DCE90 @ =gBattleAnimBankTarget + ldr r4, _080DCE90 @ =gAnimBankTarget _080DCE5E: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x12 @@ -817,7 +817,7 @@ _080DCE5E: pop {r0} bx r0 .align 2, 0 -_080DCE90: .4byte gBattleAnimBankTarget +_080DCE90: .4byte gAnimBankTarget _080DCE94: .4byte move_anim_8074EE0 _080DCE98: .4byte sub_80785E4 thumb_func_end sub_80DCE40 diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 594d569ad..26ed8e3fe 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -86,25 +86,25 @@ sub_80C2020: @ 80C2020 strh r2, [r0] ldr r0, _080C2118 @ =gUnknown_030042A0 strh r2, [r0] - ldr r0, _080C211C @ =gUnknown_030042C0 + ldr r0, _080C211C @ =gBattle_BG1_X strh r2, [r0] - ldr r0, _080C2120 @ =gUnknown_030041B4 + ldr r0, _080C2120 @ =gBattle_BG1_Y strh r2, [r0] - ldr r0, _080C2124 @ =gUnknown_03004288 + ldr r0, _080C2124 @ =gBattle_BG2_X strh r2, [r0] - ldr r0, _080C2128 @ =gUnknown_03004280 + ldr r0, _080C2128 @ =gBattle_BG2_Y strh r2, [r0] ldr r0, _080C212C @ =gUnknown_030041B0 strh r2, [r0] ldr r0, _080C2130 @ =gUnknown_030041B8 strh r2, [r0] - ldr r0, _080C2134 @ =gUnknown_030042C4 + ldr r0, _080C2134 @ =gBattle_WIN0H strh r2, [r0] - ldr r0, _080C2138 @ =gUnknown_03004240 + ldr r0, _080C2138 @ =gBattle_WIN0V strh r2, [r0] - ldr r0, _080C213C @ =gUnknown_03004200 + ldr r0, _080C213C @ =gBattle_WIN1H strh r2, [r0] - ldr r0, _080C2140 @ =gUnknown_03004244 + ldr r0, _080C2140 @ =gBattle_WIN1V strh r2, [r0] pop {r4,r5} pop {r0} @@ -121,16 +121,16 @@ _080C210C: .4byte 0x00003f3f _080C2110: .4byte REG_WIN0H _080C2114: .4byte gUnknown_030042A4 _080C2118: .4byte gUnknown_030042A0 -_080C211C: .4byte gUnknown_030042C0 -_080C2120: .4byte gUnknown_030041B4 -_080C2124: .4byte gUnknown_03004288 -_080C2128: .4byte gUnknown_03004280 +_080C211C: .4byte gBattle_BG1_X +_080C2120: .4byte gBattle_BG1_Y +_080C2124: .4byte gBattle_BG2_X +_080C2128: .4byte gBattle_BG2_Y _080C212C: .4byte gUnknown_030041B0 _080C2130: .4byte gUnknown_030041B8 -_080C2134: .4byte gUnknown_030042C4 -_080C2138: .4byte gUnknown_03004240 -_080C213C: .4byte gUnknown_03004200 -_080C2140: .4byte gUnknown_03004244 +_080C2134: .4byte gBattle_WIN0H +_080C2138: .4byte gBattle_WIN0V +_080C213C: .4byte gBattle_WIN1H +_080C2140: .4byte gBattle_WIN1V thumb_func_end sub_80C2020 thumb_func_start sub_80C2144 @@ -435,10 +435,10 @@ sub_80C2358: @ 80C2358 strb r0, [r4, 0x2] ldr r0, _080C2418 @ =sub_80C2430 bl SetMainCallback2 - ldr r1, _080C241C @ =gUnknown_03004200 + ldr r1, _080C241C @ =gBattle_WIN1H movs r0, 0xF0 strh r0, [r1] - ldr r1, _080C2420 @ =gUnknown_03004244 + ldr r1, _080C2420 @ =gBattle_WIN1V ldr r2, _080C2424 @ =0x000080a0 adds r0, r2, 0 strh r0, [r1] @@ -460,8 +460,8 @@ _080C240C: .4byte gPaletteFade _080C2410: .4byte gSharedMem + 0x18000 _080C2414: .4byte sub_80C24F4 _080C2418: .4byte sub_80C2430 -_080C241C: .4byte gUnknown_03004200 -_080C2420: .4byte gUnknown_03004244 +_080C241C: .4byte gBattle_WIN1H +_080C2420: .4byte gBattle_WIN1V _080C2424: .4byte 0x000080a0 _080C2428: .4byte sub_80C2F28 _080C242C: .4byte sub_80C2448 @@ -490,19 +490,19 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24CC @ =gUnknown_030042C0 + ldr r0, _080C24CC @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D0 @ =gUnknown_030041B4 + ldr r0, _080C24D0 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D4 @ =gUnknown_03004288 + ldr r0, _080C24D4 @ =gBattle_BG2_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24D8 @ =gUnknown_03004280 + ldr r0, _080C24D8 @ =gBattle_BG2_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 @@ -514,19 +514,19 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x22 - ldr r0, _080C24E4 @ =gUnknown_030042C4 + ldr r0, _080C24E4 @ =gBattle_WIN0H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _080C24E8 @ =gUnknown_03004240 + ldr r0, _080C24E8 @ =gBattle_WIN0V ldrh r0, [r0] strh r0, [r1] subs r1, 0x2 - ldr r0, _080C24EC @ =gUnknown_03004200 + ldr r0, _080C24EC @ =gBattle_WIN1H ldrh r0, [r0] strh r0, [r1] adds r1, 0x4 - ldr r0, _080C24F0 @ =gUnknown_03004244 + ldr r0, _080C24F0 @ =gBattle_WIN1V ldrh r0, [r0] strh r0, [r1] bl LoadOam @@ -539,16 +539,16 @@ sub_80C2448: @ 80C2448 _080C24C0: .4byte REG_BG0HOFS _080C24C4: .4byte gUnknown_030042A4 _080C24C8: .4byte gUnknown_030042A0 -_080C24CC: .4byte gUnknown_030042C0 -_080C24D0: .4byte gUnknown_030041B4 -_080C24D4: .4byte gUnknown_03004288 -_080C24D8: .4byte gUnknown_03004280 +_080C24CC: .4byte gBattle_BG1_X +_080C24D0: .4byte gBattle_BG1_Y +_080C24D4: .4byte gBattle_BG2_X +_080C24D8: .4byte gBattle_BG2_Y _080C24DC: .4byte gUnknown_030041B0 _080C24E0: .4byte gUnknown_030041B8 -_080C24E4: .4byte gUnknown_030042C4 -_080C24E8: .4byte gUnknown_03004240 -_080C24EC: .4byte gUnknown_03004200 -_080C24F0: .4byte gUnknown_03004244 +_080C24E4: .4byte gBattle_WIN0H +_080C24E8: .4byte gBattle_WIN0V +_080C24EC: .4byte gBattle_WIN1H +_080C24F0: .4byte gBattle_WIN1V thumb_func_end sub_80C2448 thumb_func_start sub_80C24F4 @@ -1302,10 +1302,10 @@ _080C2AC4: .4byte _080C2CA8 .4byte _080C2CE8 _080C2ADC: - ldr r1, _080C2BC4 @ =gUnknown_030042C4 + ldr r1, _080C2BC4 @ =gBattle_WIN0H movs r0, 0xF0 strh r0, [r1] - ldr r1, _080C2BC8 @ =gUnknown_03004240 + ldr r1, _080C2BC8 @ =gBattle_WIN0V ldr r3, _080C2BCC @ =0x00005050 adds r0, r3, 0 strh r0, [r1] @@ -1413,8 +1413,8 @@ _080C2B14: strh r0, [r1, 0x8] b _080C2D04 .align 2, 0 -_080C2BC4: .4byte gUnknown_030042C4 -_080C2BC8: .4byte gUnknown_03004240 +_080C2BC4: .4byte gBattle_WIN0H +_080C2BC8: .4byte gBattle_WIN0V _080C2BCC: .4byte 0x00005050 _080C2BD0: .4byte gContestFinalStandings _080C2BD4: .4byte gContestMons @@ -1454,7 +1454,7 @@ _080C2C04: strh r0, [r4, 0xC] _080C2C30: ldrb r2, [r4, 0xC] - ldr r3, _080C2C50 @ =gUnknown_03004240 + ldr r3, _080C2C50 @ =gBattle_WIN0V movs r0, 0x50 subs r0, r2 lsls r0, 8 @@ -1469,7 +1469,7 @@ _080C2C30: strh r0, [r4, 0x8] b _080C2D04 .align 2, 0 -_080C2C50: .4byte gUnknown_03004240 +_080C2C50: .4byte gBattle_WIN0V _080C2C54: ldr r0, _080C2C60 @ =gSharedMem + 0x18000 ldrb r0, [r0, 0x6] @@ -1515,7 +1515,7 @@ _080C2CA8: ldrb r0, [r0, 0x6] cmp r0, 0x2 bne _080C2D04 - ldr r3, _080C2CE4 @ =gUnknown_03004240 + ldr r3, _080C2CE4 @ =gBattle_WIN0V ldrh r0, [r3] lsrs r2, r0, 8 adds r0, r2, 0x2 @@ -1543,7 +1543,7 @@ _080C2CD0: b _080C2D04 .align 2, 0 _080C2CE0: .4byte gSharedMem + 0x18000 -_080C2CE4: .4byte gUnknown_03004240 +_080C2CE4: .4byte gBattle_WIN0V _080C2CE8: ldr r2, _080C2D14 @ =gSharedMem + 0x18000 ldrb r0, [r2, 0x6] @@ -2857,10 +2857,10 @@ _080C36DA: adds r5, 0x1 cmp r5, 0x2 ble _080C36DA - ldr r1, _080C3754 @ =gUnknown_030042C4 + ldr r1, _080C3754 @ =gBattle_WIN0H movs r0, 0xF0 strh r0, [r1] - ldr r2, _080C3758 @ =gUnknown_03004240 + ldr r2, _080C3758 @ =gBattle_WIN0V ldrh r1, [r4, 0x22] adds r0, r1, 0 subs r0, 0x10 @@ -2878,8 +2878,8 @@ _080C36DA: .align 2, 0 _080C374C: .4byte gSharedMem + 0x18000 _080C3750: .4byte gSprites -_080C3754: .4byte gUnknown_030042C4 -_080C3758: .4byte gUnknown_03004240 +_080C3754: .4byte gBattle_WIN0H +_080C3758: .4byte gBattle_WIN0V _080C375C: .4byte REG_WININ _080C3760: .4byte 0x00003f3e thumb_func_end sub_80C3698 @@ -2902,8 +2902,8 @@ sub_80C3764: @ 80C3764 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r7, _080C37D0 @ =gUnknown_030042C4 - ldr r6, _080C37D4 @ =gUnknown_03004240 + ldr r7, _080C37D0 @ =gBattle_WIN0H + ldr r6, _080C37D4 @ =gBattle_WIN0V adds r5, r3, 0 movs r4, 0x4 adds r2, 0x2E @@ -2940,8 +2940,8 @@ _080C3790: .align 2, 0 _080C37C8: .4byte gSharedMem + 0x18000 _080C37CC: .4byte gSprites -_080C37D0: .4byte gUnknown_030042C4 -_080C37D4: .4byte gUnknown_03004240 +_080C37D0: .4byte gBattle_WIN0H +_080C37D4: .4byte gBattle_WIN0V _080C37D8: .4byte REG_WIN0H _080C37DC: .4byte REG_WININ _080C37E0: .4byte 0x00003f3f diff --git a/asm/current.s b/asm/current.s index df72b56af..e77218cc9 100755 --- a/asm/current.s +++ b/asm/current.s @@ -18,10 +18,10 @@ sub_80D648C: @ 80D648C strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r6, _080D6504 @ =gBattleAnimBankTarget + ldr r6, _080D6504 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -29,7 +29,7 @@ sub_80D648C: @ 80D648C strh r0, [r4, 0x34] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -64,7 +64,7 @@ sub_80D648C: @ 80D648C bx r0 .align 2, 0 _080D6500: .4byte gBattleAnimArgs -_080D6504: .4byte gBattleAnimBankTarget +_080D6504: .4byte gAnimBankTarget _080D6508: .4byte 0x000003ff _080D650C: .4byte 0xfffffc00 _080D6510: .4byte sub_80D6514 @@ -123,7 +123,7 @@ sub_80D6514: @ 80D6514 b _080D6584 _080D657E: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D6584: pop {r4} pop {r0} @@ -168,7 +168,7 @@ _080D65C4: cmp r0, 0 bgt _080D65D6 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D65D6: pop {r0} bx r0 @@ -186,7 +186,7 @@ sub_80D65DC: @ 80D65DC ands r0, r1 cmp r0, 0 beq _080D65FE - ldr r0, _080D664C @ =gBattleAnimBankTarget + ldr r0, _080D664C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -198,10 +198,10 @@ _080D65FE: negs r0, r0 strh r0, [r1, 0x2] _080D6606: - ldr r5, _080D664C @ =gBattleAnimBankTarget + ldr r5, _080D664C @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _080D6650 @ =gBattleAnimArgs lsrs r0, 24 @@ -210,7 +210,7 @@ _080D6606: strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -229,7 +229,7 @@ _080D6606: .align 2, 0 _080D6644: .4byte gMain _080D6648: .4byte 0x0000043d -_080D664C: .4byte gBattleAnimBankTarget +_080D664C: .4byte gAnimBankTarget _080D6650: .4byte gBattleAnimArgs _080D6654: .4byte sub_80D658C thumb_func_end sub_80D65DC @@ -248,13 +248,13 @@ sub_80D6658: @ 80D6658 ands r0, r1 cmp r0, 0 beq _080D667C - ldr r0, _080D6678 @ =gBattleAnimBankTarget + ldr r0, _080D6678 @ =gAnimBankTarget b _080D667E .align 2, 0 _080D6674: .4byte gBattleAnimArgs -_080D6678: .4byte gBattleAnimBankTarget +_080D6678: .4byte gAnimBankTarget _080D667C: - ldr r0, _080D670C @ =gBattleAnimBankAttacker + ldr r0, _080D670C @ =gAnimBankAttacker _080D667E: ldrb r6, [r0] ldr r0, _080D6710 @ =gMain @@ -278,7 +278,7 @@ _080D669C: _080D66A4: adds r0, r6, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _080D6718 @ =gBattleAnimArgs lsrs r0, 24 @@ -287,7 +287,7 @@ _080D66A4: strh r0, [r5, 0x20] adds r0, r6, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r2, [r4, 0x2] @@ -325,7 +325,7 @@ _080D66A4: pop {r0} bx r0 .align 2, 0 -_080D670C: .4byte gBattleAnimBankAttacker +_080D670C: .4byte gAnimBankAttacker _080D6710: .4byte gMain _080D6714: .4byte 0x0000043d _080D6718: .4byte gBattleAnimArgs @@ -385,7 +385,7 @@ _080D6782: cmp r0, 0 bgt _080D6794 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D6794: pop {r4} pop {r0} @@ -444,7 +444,7 @@ _080D67F6: strh r0, [r4, 0x2E] ldr r0, _080D6814 @ =sub_80782D8 str r0, [r4, 0x1C] - ldr r1, _080D6818 @ =move_anim_8072740 + ldr r1, _080D6818 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -453,7 +453,7 @@ _080D67F6: .align 2, 0 _080D6810: .4byte gBattleAnimArgs _080D6814: .4byte sub_80782D8 -_080D6818: .4byte move_anim_8072740 +_080D6818: .4byte DestroyAnimSprite thumb_func_end sub_80D679C thumb_func_start sub_80D681C @@ -462,10 +462,10 @@ sub_80D681C: @ 80D681C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _080D6864 @ =gBattleAnimBankTarget + ldr r6, _080D6864 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition ldr r1, _080D6868 @ =gTasks lsls r4, r5, 2 adds r4, r5 @@ -479,7 +479,7 @@ sub_80D681C: @ 80D681C strh r0, [r4, 0x8] ldrb r0, [r6] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r5, 0x2] @@ -493,7 +493,7 @@ sub_80D681C: @ 80D681C pop {r0} bx r0 .align 2, 0 -_080D6864: .4byte gBattleAnimBankTarget +_080D6864: .4byte gAnimBankTarget _080D6868: .4byte gTasks _080D686C: .4byte gBattleAnimArgs _080D6870: .4byte sub_80D6874 @@ -855,7 +855,7 @@ _080D6B24: cmp r0, 0x33 bne _080D6B38 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D6B38: pop {r0} bx r0 @@ -876,24 +876,24 @@ sub_80D6B3C: @ 80D6B3C ldrsh r0, [r0, r1] cmp r0, 0 bne _080D6B68 - ldr r4, _080D6B64 @ =gBattleAnimBankAttacker + ldr r4, _080D6B64 @ =gAnimBankAttacker b _080D6B6A .align 2, 0 _080D6B5C: .4byte gTasks _080D6B60: .4byte gBattleAnimArgs -_080D6B64: .4byte gBattleAnimBankAttacker +_080D6B64: .4byte gAnimBankAttacker _080D6B68: - ldr r4, _080D6BAC @ =gBattleAnimBankTarget + ldr r4, _080D6BAC @ =gAnimBankTarget _080D6B6A: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x24] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x26] @@ -916,7 +916,7 @@ _080D6B6A: pop {r0} bx r0 .align 2, 0 -_080D6BAC: .4byte gBattleAnimBankTarget +_080D6BAC: .4byte gAnimBankTarget _080D6BB0: .4byte gBattleAnimArgs _080D6BB4: .4byte sub_80D6BB8 thumb_func_end sub_80D6B3C @@ -1110,23 +1110,23 @@ sub_80D6D18: @ 80D6D18 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D6D34 - ldr r4, _080D6D30 @ =gBattleAnimBankAttacker + ldr r4, _080D6D30 @ =gAnimBankAttacker b _080D6D36 .align 2, 0 _080D6D2C: .4byte gBattleAnimArgs -_080D6D30: .4byte gBattleAnimBankAttacker +_080D6D30: .4byte gAnimBankAttacker _080D6D34: - ldr r4, _080D6D64 @ =gBattleAnimBankTarget + ldr r4, _080D6D64 @ =gAnimBankTarget _080D6D36: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1139,7 +1139,7 @@ _080D6D36: pop {r0} bx r0 .align 2, 0 -_080D6D64: .4byte gBattleAnimBankTarget +_080D6D64: .4byte gAnimBankTarget _080D6D68: .4byte move_anim_8074EE0 _080D6D6C: .4byte sub_80785E4 thumb_func_end sub_80D6D18 @@ -1153,23 +1153,23 @@ sub_80D6D70: @ 80D6D70 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D6D8C - ldr r4, _080D6D88 @ =gBattleAnimBankAttacker + ldr r4, _080D6D88 @ =gAnimBankAttacker b _080D6D8E .align 2, 0 _080D6D84: .4byte gBattleAnimArgs -_080D6D88: .4byte gBattleAnimBankAttacker +_080D6D88: .4byte gAnimBankAttacker _080D6D8C: - ldr r4, _080D6DC8 @ =gBattleAnimBankTarget + ldr r4, _080D6DC8 @ =gAnimBankTarget _080D6D8E: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1178,7 +1178,7 @@ _080D6D8E: strh r0, [r5, 0x24] ldrh r0, [r1, 0x4] strh r0, [r5, 0x26] - ldr r1, _080D6DD0 @ =move_anim_8072740 + ldr r1, _080D6DD0 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldr r0, _080D6DD4 @ =sub_8078600 @@ -1187,9 +1187,9 @@ _080D6D8E: pop {r0} bx r0 .align 2, 0 -_080D6DC8: .4byte gBattleAnimBankTarget +_080D6DC8: .4byte gAnimBankTarget _080D6DCC: .4byte gBattleAnimArgs -_080D6DD0: .4byte move_anim_8072740 +_080D6DD0: .4byte DestroyAnimSprite _080D6DD4: .4byte sub_8078600 thumb_func_end sub_80D6D70 @@ -1199,16 +1199,16 @@ sub_80D6DD8: @ 80D6DD8 adds r5, r0, 0 movs r1, 0x1 bl StartSpriteAffineAnim - ldr r4, _080D6E30 @ =gBattleAnimBankAttacker + ldr r4, _080D6E30 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1236,7 +1236,7 @@ _080D6E26: pop {r0} bx r0 .align 2, 0 -_080D6E30: .4byte gBattleAnimBankAttacker +_080D6E30: .4byte gAnimBankAttacker _080D6E34: .4byte sub_80D6E38 thumb_func_end sub_80D6DD8 @@ -1331,10 +1331,10 @@ _080D6ED0: lsrs r0, 24 movs r6, 0 strh r0, [r5, 0x26] - ldr r4, _080D6F04 @ =gBattleAnimBankAttacker + ldr r4, _080D6F04 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x24] @@ -1348,7 +1348,7 @@ _080D6ED0: movs r0, 0x2 b _080D6F12 .align 2, 0 -_080D6F04: .4byte gBattleAnimBankAttacker +_080D6F04: .4byte gAnimBankAttacker _080D6F08: .4byte 0x0000ffe0 _080D6F0C: movs r0, 0x20 @@ -1513,7 +1513,7 @@ _080D7034: _080D703A: b _080D718E _080D703C: - ldr r4, _080D707C @ =gBattleAnimBankAttacker + ldr r4, _080D707C @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1545,19 +1545,19 @@ _080D7052: ldr r0, _080D7084 @ =0x0000fff0 b _080D70F0 .align 2, 0 -_080D707C: .4byte gBattleAnimBankAttacker +_080D707C: .4byte gAnimBankAttacker _080D7080: .4byte gBattleAnimArgs _080D7084: .4byte 0x0000fff0 _080D7088: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xE] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] @@ -1574,16 +1574,16 @@ _080D70B0: movs r0, 0x78 subs r0, r1 strh r0, [r5, 0xE] - ldr r4, _080D70E4 @ =gBattleAnimBankTarget + ldr r4, _080D70E4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r2, 0xA @@ -1593,7 +1593,7 @@ _080D70B0: strh r0, [r5, 0x10] b _080D7126 .align 2, 0 -_080D70E4: .4byte gBattleAnimBankTarget +_080D70E4: .4byte gAnimBankTarget _080D70E8: ldr r0, _080D710C @ =0x0000fff0 strh r0, [r5, 0xE] @@ -1826,16 +1826,16 @@ sub_80D727C: @ 80D727C beq _080D72C0 b _080D72D4 _080D728E: - ldr r4, _080D72BC @ =gBattleAnimBankAttacker + ldr r4, _080D72BC @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1847,7 +1847,7 @@ _080D728E: strh r0, [r5, 0x2E] b _080D72D4 .align 2, 0 -_080D72BC: .4byte gBattleAnimBankAttacker +_080D72BC: .4byte gAnimBankAttacker _080D72C0: adds r0, r5, 0 adds r0, 0x3F @@ -1896,25 +1896,25 @@ _080D7308: .4byte _080D7444 .4byte _080D7454 _080D731C: - ldr r4, _080D73A0 @ =gBattleAnimBankAttacker + ldr r4, _080D73A0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x14] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x16] movs r0, 0x4 strh r0, [r5, 0x18] - ldr r0, _080D73A4 @ =gBattleAnimBankTarget + ldr r0, _080D73A4 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x1C] @@ -1933,12 +1933,12 @@ _080D731C: movs r0, 0xC strh r0, [r5, 0x1E] subs r0, 0x4C - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 asrs r0, 24 strh r0, [r5, 0x20] movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 asrs r0, 24 strh r0, [r5, 0x22] @@ -1956,8 +1956,8 @@ _080D731C: adds r0, 0x1 b _080D7466 .align 2, 0 -_080D73A0: .4byte gBattleAnimBankAttacker -_080D73A4: .4byte gBattleAnimBankTarget +_080D73A0: .4byte gAnimBankAttacker +_080D73A4: .4byte gAnimBankTarget _080D73A8: .4byte 0x0000ffff _080D73AC: ldrh r0, [r5, 0xA] @@ -2254,10 +2254,10 @@ _080D75C4: beq _080D7640 b _080D764E _080D75CA: - ldr r0, _080D7614 @ =gBattleAnimBankTarget + ldr r0, _080D7614 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -2276,10 +2276,10 @@ _080D75E4: bgt _080D75E4 strh r1, [r5, 0x24] _080D75F4: - ldr r4, _080D7614 @ =gBattleAnimBankTarget + ldr r4, _080D7614 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2291,7 +2291,7 @@ _080D75F4: strh r0, [r5, 0x20] b _080D7638 .align 2, 0 -_080D7614: .4byte gBattleAnimBankTarget +_080D7614: .4byte gAnimBankTarget _080D7618: ldrh r0, [r5, 0xA] adds r0, 0x1 diff --git a/asm/dark.s b/asm/dark.s index 5175d84f0..3fcc3f56c 100755 --- a/asm/dark.s +++ b/asm/dark.s @@ -116,13 +116,13 @@ sub_80DFFD0: @ 80DFFD0 adds r3, r0, 0 cmp r1, 0 bne _080DFFEC - ldr r0, _080DFFE8 @ =gBattleAnimBankAttacker + ldr r0, _080DFFE8 @ =gAnimBankAttacker b _080DFFEE .align 2, 0 _080DFFE4: .4byte gBattleAnimArgs -_080DFFE8: .4byte gBattleAnimBankAttacker +_080DFFE8: .4byte gAnimBankAttacker _080DFFEC: - ldr r0, _080E001C @ =gBattleAnimBankTarget + ldr r0, _080E001C @ =gAnimBankTarget _080DFFEE: ldrb r5, [r0] movs r6, 0x14 @@ -147,7 +147,7 @@ _080DFFEE: beq _080E0032 b _080E00A0 .align 2, 0 -_080E001C: .4byte gBattleAnimBankTarget +_080E001C: .4byte gAnimBankTarget _080E0020: .4byte 0x000003ff _080E0024: .4byte 0xfffffc00 _080E0028: @@ -259,10 +259,10 @@ sub_80E00EC: @ 80E00EC lsls r1, 3 ldr r0, _080E0150 @ =gTasks adds r5, r1, r0 - ldr r4, _080E0154 @ =gBattleAnimBankAttacker + ldr r4, _080E0154 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x1F @@ -281,7 +281,7 @@ sub_80E00EC: @ 80E00EC strh r1, [r5, 0x22] ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 @@ -298,13 +298,13 @@ sub_80E00EC: @ 80E00EC b _080E015E .align 2, 0 _080E0150: .4byte gTasks -_080E0154: .4byte gBattleAnimBankAttacker +_080E0154: .4byte gAnimBankAttacker _080E0158: .4byte 0x0000fff4 _080E015C: ldr r0, _080E01A8 @ =0x0000ffc0 _080E015E: strh r0, [r5, 0x18] - ldr r0, _080E01AC @ =gBattleAnimBankAttacker + ldr r0, _080E01AC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -315,7 +315,7 @@ _080E015E: add r4, sp, 0xC adds r0, r4, 0 bl sub_8078914 - ldr r0, _080E01B0 @ =gUnknown_030041B4 + ldr r0, _080E01B0 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r5, 0x1C] ldr r1, _080E01B4 @ =REG_BLDCNT @@ -330,22 +330,22 @@ _080E015E: ldr r0, _080E01BC @ =REG_BG1VOFS str r0, [sp] movs r7, 0x2 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E01F4 - ldr r1, _080E01C0 @ =gUnknown_03004288 + ldr r1, _080E01C0 @ =gBattle_BG2_X b _080E01EE .align 2, 0 _080E01A8: .4byte 0x0000ffc0 -_080E01AC: .4byte gBattleAnimBankAttacker -_080E01B0: .4byte gUnknown_030041B4 +_080E01AC: .4byte gAnimBankAttacker +_080E01B0: .4byte gBattle_BG1_Y _080E01B4: .4byte REG_BLDCNT _080E01B8: .4byte 0x00003f42 _080E01BC: .4byte REG_BG1VOFS -_080E01C0: .4byte gUnknown_03004288 +_080E01C0: .4byte gBattle_BG2_X _080E01C4: - ldr r0, _080E0278 @ =gUnknown_03004280 + ldr r0, _080E0278 @ =gBattle_BG2_Y ldrh r0, [r0] strh r0, [r5, 0x1C] ldr r1, _080E027C @ =REG_BLDCNT @@ -359,11 +359,11 @@ _080E01C4: ldr r0, _080E0284 @ =REG_BG2VOFS str r0, [sp] movs r7, 0x4 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E01F4 - ldr r1, _080E0288 @ =gUnknown_030042C0 + ldr r1, _080E0288 @ =gBattle_BG1_X _080E01EE: ldrh r0, [r1] adds r0, 0xF0 @@ -419,13 +419,13 @@ _080E0220: adds r2, 0x3F adds r0, r2, 0 strh r0, [r1] - ldr r2, _080E0298 @ =gUnknown_030042C4 + ldr r2, _080E0298 @ =gBattle_WIN0H ldrh r0, [r5, 0x24] lsls r0, 8 ldrh r1, [r5, 0x26] orrs r0, r1 strh r0, [r2] - ldr r1, _080E029C @ =gUnknown_03004240 + ldr r1, _080E029C @ =gBattle_WIN0V movs r0, 0xA0 strh r0, [r1] ldr r0, _080E02A0 @ =sub_80E02A4 @@ -435,16 +435,16 @@ _080E0220: pop {r0} bx r0 .align 2, 0 -_080E0278: .4byte gUnknown_03004280 +_080E0278: .4byte gBattle_BG2_Y _080E027C: .4byte REG_BLDCNT _080E0280: .4byte 0x00003f44 _080E0284: .4byte REG_BG2VOFS -_080E0288: .4byte gUnknown_030042C0 +_080E0288: .4byte gBattle_BG1_X _080E028C: .4byte 0xa2600001 _080E0290: .4byte gUnknown_03004DE0 _080E0294: .4byte REG_WINOUT -_080E0298: .4byte gUnknown_030042C4 -_080E029C: .4byte gUnknown_03004240 +_080E0298: .4byte gBattle_WIN0H +_080E029C: .4byte gBattle_WIN0V _080E02A0: .4byte sub_80E02A4 thumb_func_end sub_80E00EC @@ -561,7 +561,7 @@ _080E035E: blt _080E0380 strh r2, [r4, 0x24] _080E0380: - ldr r3, _080E0398 @ =gUnknown_030042C4 + ldr r3, _080E0398 @ =gBattle_WIN0H ldrh r2, [r4, 0x24] lsls r0, r2, 8 ldrh r1, [r4, 0x26] @@ -573,7 +573,7 @@ _080E0380: bne _080E03B6 b _080E03A2 .align 2, 0 -_080E0398: .4byte gUnknown_030042C4 +_080E0398: .4byte gBattle_WIN0H _080E039C: ldr r1, _080E03AC @ =gUnknown_03004DC0 movs r0, 0x3 @@ -627,15 +627,15 @@ _080E03EC: .4byte _080E053C .4byte _080E05A4 _080E0400: - bl NotInBattle + bl IsContest lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E043C - ldr r0, _080E042C @ =gUnknown_030042C4 + ldr r0, _080E042C @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080E0430 @ =gUnknown_03004240 + ldr r0, _080E0430 @ =gBattle_WIN0V strh r1, [r0] ldr r0, _080E0434 @ =REG_WININ ldr r2, _080E0438 @ =0x00003f3f @@ -647,12 +647,12 @@ _080E0400: bl DestroyAnimVisualTask b _080E05F2 .align 2, 0 -_080E042C: .4byte gUnknown_030042C4 -_080E0430: .4byte gUnknown_03004240 +_080E042C: .4byte gBattle_WIN0H +_080E0430: .4byte gBattle_WIN0V _080E0434: .4byte REG_WININ _080E0438: .4byte 0x00003f3f _080E043C: - ldr r0, _080E045C @ =gBattleAnimBankTarget + ldr r0, _080E045C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -664,19 +664,19 @@ _080E043C: ldr r2, _080E0464 @ =0x00003f42 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080E0468 @ =gUnknown_03004288 + ldr r1, _080E0468 @ =gBattle_BG2_X b _080E0476 .align 2, 0 -_080E045C: .4byte gBattleAnimBankTarget +_080E045C: .4byte gAnimBankTarget _080E0460: .4byte REG_BLDCNT _080E0464: .4byte 0x00003f42 -_080E0468: .4byte gUnknown_03004288 +_080E0468: .4byte gBattle_BG2_X _080E046C: ldr r1, _080E0480 @ =REG_BLDCNT ldr r2, _080E0484 @ =0x00003f44 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080E0488 @ =gUnknown_030042C0 + ldr r1, _080E0488 @ =gBattle_BG1_X _080E0476: ldrh r0, [r1] adds r0, 0xF0 @@ -685,7 +685,7 @@ _080E0476: .align 2, 0 _080E0480: .4byte REG_BLDCNT _080E0484: .4byte 0x00003f44 -_080E0488: .4byte gUnknown_030042C0 +_080E0488: .4byte gBattle_BG1_X _080E048C: movs r1, 0xE ldrsh r0, [r5, r1] @@ -693,7 +693,7 @@ _080E048C: bne _080E04B4 mov r0, sp bl sub_8078914 - ldr r0, _080E04B0 @ =gUnknown_030041B4 + ldr r0, _080E04B0 @ =gBattle_BG1_Y ldrh r0, [r0] strh r0, [r5, 0x1C] mov r0, sp @@ -704,9 +704,9 @@ _080E048C: bl FillPalette b _080E04C4 .align 2, 0 -_080E04B0: .4byte gUnknown_030041B4 +_080E04B0: .4byte gBattle_BG1_Y _080E04B4: - ldr r0, _080E04CC @ =gUnknown_03004280 + ldr r0, _080E04CC @ =gBattle_BG2_Y ldrh r0, [r0] strh r0, [r5, 0x1C] movs r0, 0 @@ -718,12 +718,12 @@ _080E04C4: bl sub_80E08CC b _080E0590 .align 2, 0 -_080E04CC: .4byte gUnknown_03004280 +_080E04CC: .4byte gBattle_BG2_Y _080E04D0: - ldr r4, _080E051C @ =gBattleAnimBankTarget + ldr r4, _080E051C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x1F @@ -740,7 +740,7 @@ _080E04D0: strh r1, [r5, 0x22] ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 subs r1, r0, 0x4 @@ -755,7 +755,7 @@ _080E04D0: ldr r0, _080E0520 @ =0x0000fff4 b _080E0526 .align 2, 0 -_080E051C: .4byte gBattleAnimBankTarget +_080E051C: .4byte gAnimBankTarget _080E0520: .4byte 0x0000fff4 _080E0524: ldr r0, _080E0538 @ =0x0000ffc0 @@ -846,13 +846,13 @@ _080E05C0: ldr r2, _080E0608 @ =0x00003f3f adds r0, r2, 0 strh r0, [r1] - ldr r2, _080E060C @ =gUnknown_030042C4 + ldr r2, _080E060C @ =gBattle_WIN0H ldrh r0, [r5, 0x24] lsls r0, 8 ldrh r1, [r5, 0x26] orrs r0, r1 strh r0, [r2] - ldr r1, _080E0610 @ =gUnknown_03004240 + ldr r1, _080E0610 @ =gBattle_WIN0V movs r0, 0xA0 strh r0, [r1] movs r0, 0 @@ -875,8 +875,8 @@ _080E05FC: .4byte REG_WINOUT _080E0600: .4byte 0x00003f3b _080E0604: .4byte REG_WININ _080E0608: .4byte 0x00003f3f -_080E060C: .4byte gUnknown_030042C4 -_080E0610: .4byte gUnknown_03004240 +_080E060C: .4byte gBattle_WIN0H +_080E0610: .4byte gBattle_WIN0V _080E0614: .4byte REG_BLDALPHA _080E0618: .4byte 0x0000080c _080E061C: .4byte sub_80E0620 @@ -956,7 +956,7 @@ _080E06A8: movs r0, 0x1 strh r0, [r4, 0xA] _080E06AC: - ldr r2, _080E06F0 @ =gUnknown_030042C4 + ldr r2, _080E06F0 @ =gBattle_WIN0H ldrh r0, [r4, 0x24] lsls r0, 8 ldrh r1, [r4, 0x26] @@ -990,7 +990,7 @@ _080E06CE: strh r0, [r4, 0xA] b _080E075A .align 2, 0 -_080E06F0: .4byte gUnknown_030042C4 +_080E06F0: .4byte gBattle_WIN0H _080E06F4: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -1054,10 +1054,10 @@ _080E075A: .align 2, 0 _080E0764: .4byte gUnknown_03004DC0 _080E0768: - ldr r0, _080E078C @ =gUnknown_030042C4 + ldr r0, _080E078C @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080E0790 @ =gUnknown_03004240 + ldr r0, _080E0790 @ =gBattle_WIN0V strh r1, [r0] ldr r0, _080E0794 @ =REG_WININ ldr r3, _080E0798 @ =0x00003f3f @@ -1072,8 +1072,8 @@ _080E0784: pop {r0} bx r0 .align 2, 0 -_080E078C: .4byte gUnknown_030042C4 -_080E0790: .4byte gUnknown_03004240 +_080E078C: .4byte gBattle_WIN0H +_080E0790: .4byte gBattle_WIN0V _080E0794: .4byte REG_WININ _080E0798: .4byte 0x00003f3f thumb_func_end sub_80E0620 @@ -1293,7 +1293,7 @@ sub_80E0918: @ 80E0918 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r6, _080E09B8 @ =gBattleAnimBankAttacker + ldr r6, _080E09B8 @ =gAnimBankAttacker ldrb r0, [r6] bl GetBankIdentity_permutated lsls r0, 24 @@ -1361,7 +1361,7 @@ _080E09A2: pop {r0} bx r0 .align 2, 0 -_080E09B8: .4byte gBattleAnimBankAttacker +_080E09B8: .4byte gAnimBankAttacker _080E09BC: .4byte gSprites _080E09C0: .4byte gObjectBankIDs thumb_func_end sub_80E0918 @@ -1371,7 +1371,7 @@ sub_80E09C4: @ 80E09C4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _080E0A0C @ =gBattleAnimBankAttacker + ldr r4, _080E0A0C @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankIdentity_permutated lsls r0, 24 @@ -1401,7 +1401,7 @@ _080E0A00: pop {r0} bx r0 .align 2, 0 -_080E0A0C: .4byte gBattleAnimBankAttacker +_080E0A0C: .4byte gAnimBankAttacker thumb_func_end sub_80E09C4 thumb_func_start sub_80E0A10 @@ -1422,7 +1422,7 @@ sub_80E0A10: @ 80E0A10 bl StartSpriteAnim ldr r0, _080E0A44 @ =sub_8078600 str r0, [r4, 0x1C] - ldr r1, _080E0A48 @ =move_anim_8072740 + ldr r1, _080E0A48 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4} @@ -1431,7 +1431,7 @@ sub_80E0A10: @ 80E0A10 .align 2, 0 _080E0A40: .4byte gBattleAnimArgs _080E0A44: .4byte sub_8078600 -_080E0A48: .4byte move_anim_8072740 +_080E0A48: .4byte DestroyAnimSprite thumb_func_end sub_80E0A10 thumb_func_start sub_80E0A4C @@ -1445,9 +1445,9 @@ sub_80E0A4C: @ 80E0A4C lsrs r0, 24 mov r9, r0 movs r7, 0 - ldr r0, _080E0B50 @ =gUnknown_030042C4 + ldr r0, _080E0B50 @ =gBattle_WIN0H strh r7, [r0] - ldr r0, _080E0B54 @ =gUnknown_03004240 + ldr r0, _080E0B54 @ =gBattle_WIN0V strh r7, [r0] ldr r1, _080E0B58 @ =REG_WININ ldr r2, _080E0B5C @ =0x00003f3f @@ -1484,7 +1484,7 @@ sub_80E0A4C: @ 80E0A4C movs r0, 0x3F ands r0, r1 strb r0, [r5, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E0AC4 @@ -1500,11 +1500,11 @@ _080E0AC4: lsls r0, 24 cmp r0, 0 beq _080E0B40 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E0B40 - ldr r4, _080E0B74 @ =gBattleAnimBankAttacker + ldr r4, _080E0B74 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankIdentity lsls r0, 24 @@ -1555,7 +1555,7 @@ _080E0AF4: strb r0, [r5] movs r7, 0x1 _080E0B40: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E0B84 @@ -1563,8 +1563,8 @@ _080E0B40: ldrh r5, [r0] b _080E0BCC .align 2, 0 -_080E0B50: .4byte gUnknown_030042C4 -_080E0B54: .4byte gUnknown_03004240 +_080E0B50: .4byte gBattle_WIN0H +_080E0B54: .4byte gBattle_WIN0V _080E0B58: .4byte REG_WININ _080E0B5C: .4byte 0x00003f3f _080E0B60: .4byte 0x00003f3d @@ -1572,12 +1572,12 @@ _080E0B64: .4byte REG_BLDCNT _080E0B68: .4byte 0x00003f42 _080E0B6C: .4byte 0x00000c08 _080E0B70: .4byte REG_BG1CNT -_080E0B74: .4byte gBattleAnimBankAttacker +_080E0B74: .4byte gAnimBankAttacker _080E0B78: .4byte gSprites _080E0B7C: .4byte gObjectBankIDs _080E0B80: .4byte gSharedMem + 0x19348 _080E0B84: - ldr r4, _080E0BA4 @ =gBattleAnimBankAttacker + ldr r4, _080E0BA4 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1593,7 +1593,7 @@ _080E0B84: ldr r1, _080E0BAC @ =gEnemyParty b _080E0BC0 .align 2, 0 -_080E0BA4: .4byte gBattleAnimBankAttacker +_080E0BA4: .4byte gAnimBankAttacker _080E0BA8: .4byte gBattlePartyID _080E0BAC: .4byte gEnemyParty _080E0BB0: @@ -1617,7 +1617,7 @@ _080E0BCC: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E0C60 @ =gBattleAnimBankAttacker + ldr r0, _080E0C60 @ =gAnimBankAttacker ldrb r0, [r0] adds r1, r4, 0 adds r2, r5, 0 @@ -1647,7 +1647,7 @@ _080E0BCC: lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - ldr r2, _080E0C78 @ =gUnknown_030042C0 + ldr r2, _080E0C78 @ =gBattle_BG1_X ldr r0, _080E0C7C @ =gSprites lsls r1, r4, 4 adds r1, r4 @@ -1657,7 +1657,7 @@ _080E0BCC: negs r0, r0 adds r0, 0x60 strh r0, [r2] - ldr r2, _080E0C80 @ =gUnknown_030041B4 + ldr r2, _080E0C80 @ =gBattle_BG1_Y ldrh r0, [r1, 0x22] negs r0, r0 adds r0, 0x20 @@ -1678,15 +1678,15 @@ _080E0BCC: .align 2, 0 _080E0C58: .4byte gBattlePartyID _080E0C5C: .4byte gPlayerParty -_080E0C60: .4byte gBattleAnimBankAttacker +_080E0C60: .4byte gAnimBankAttacker _080E0C64: .4byte 0x040000d4 _080E0C68: .4byte 0x85000400 _080E0C6C: .4byte gUnknown_08D1D574 _080E0C70: .4byte gUnknown_08D1D410 _080E0C74: .4byte gUnknown_08D1D54C -_080E0C78: .4byte gUnknown_030042C0 +_080E0C78: .4byte gBattle_BG1_X _080E0C7C: .4byte gSprites -_080E0C80: .4byte gUnknown_030041B4 +_080E0C80: .4byte gBattle_BG1_Y _080E0C84: .4byte gBattleAnimArgs _080E0C88: lsls r0, r1, 4 @@ -1740,7 +1740,7 @@ sub_80E0CD0: @ 80E0CD0 adds r0, 0x4 movs r5, 0 strh r0, [r4, 0x1C] - ldr r2, _080E0DF4 @ =gUnknown_030042C0 + ldr r2, _080E0DF4 @ =gBattle_BG1_X ldrh r3, [r2] subs r1, r3, 0x4 strh r1, [r2] @@ -1761,9 +1761,9 @@ sub_80E0CD0: @ 80E0CD0 bne _080E0DE8 movs r0, 0 bl sub_8076464 - ldr r0, _080E0DF8 @ =gUnknown_030042C4 + ldr r0, _080E0DF8 @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _080E0DFC @ =gUnknown_03004240 + ldr r0, _080E0DFC @ =gBattle_WIN0V strh r5, [r0] ldr r0, _080E0E00 @ =REG_WININ ldr r2, _080E0E04 @ =0x00003f3f @@ -1771,7 +1771,7 @@ sub_80E0CD0: @ 80E0CD0 strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E0D40 @@ -1838,7 +1838,7 @@ _080E0D84: cmp r0, 0x1 bne _080E0DE2 ldr r2, _080E0E1C @ =gObjectBankIDs - ldr r0, _080E0E20 @ =gBattleAnimBankAttacker + ldr r0, _080E0E20 @ =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -1870,9 +1870,9 @@ _080E0DE8: bx r0 .align 2, 0 _080E0DF0: .4byte gTasks -_080E0DF4: .4byte gUnknown_030042C0 -_080E0DF8: .4byte gUnknown_030042C4 -_080E0DFC: .4byte gUnknown_03004240 +_080E0DF4: .4byte gBattle_BG1_X +_080E0DF8: .4byte gBattle_WIN0H +_080E0DFC: .4byte gBattle_WIN0V _080E0E00: .4byte REG_WININ _080E0E04: .4byte 0x00003f3f _080E0E08: .4byte REG_BG1CNT @@ -1881,7 +1881,7 @@ _080E0E10: .4byte gSprites _080E0E14: .4byte 0x040000d4 _080E0E18: .4byte 0x85000200 _080E0E1C: .4byte gObjectBankIDs -_080E0E20: .4byte gBattleAnimBankAttacker +_080E0E20: .4byte gAnimBankAttacker thumb_func_end sub_80E0CD0 thumb_func_start sub_80E0E24 @@ -1986,7 +1986,7 @@ sub_80E0EE8: @ 80E0EE8 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080E0F14 @ =gUnknown_0202F7C4 + ldr r2, _080E0F14 @ =gAnimMoveTurn ldrb r0, [r2] cmp r0, 0x1 bhi _080E0EFC @@ -2006,7 +2006,7 @@ _080E0F08: pop {r0} bx r0 .align 2, 0 -_080E0F14: .4byte gUnknown_0202F7C4 +_080E0F14: .4byte gAnimMoveTurn _080E0F18: .4byte gBattleAnimArgs thumb_func_end sub_80E0EE8 diff --git a/asm/dragon.s b/asm/dragon.s index c384e3b6c..7c4ea0547 100755 --- a/asm/dragon.s +++ b/asm/dragon.s @@ -11,16 +11,16 @@ sub_80DF5A0: @ 80DF5A0 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080DF5E8 @ =gBattleAnimBankAttacker + ldr r4, _080DF5E8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -43,7 +43,7 @@ sub_80DF5A0: @ 80DF5A0 adds r1, r2, 0 b _080DF5FA .align 2, 0 -_080DF5E8: .4byte gBattleAnimBankAttacker +_080DF5E8: .4byte gAnimBankAttacker _080DF5EC: .4byte gBattleAnimArgs _080DF5F0: ldr r1, _080DF630 @ =gBattleAnimArgs @@ -89,20 +89,20 @@ sub_80DF63C: @ 80DF63C push {r4,r5,lr} adds r5, r0, 0 bl sub_8078650 - ldr r4, _080DF694 @ =gBattleAnimBankTarget + ldr r4, _080DF694 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _080DF698 @ =gBattleAnimBankAttacker + ldr r0, _080DF698 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -126,8 +126,8 @@ sub_80DF63C: @ 80DF63C strh r0, [r5, 0x36] b _080DF6CA .align 2, 0 -_080DF694: .4byte gBattleAnimBankTarget -_080DF698: .4byte gBattleAnimBankAttacker +_080DF694: .4byte gAnimBankTarget +_080DF698: .4byte gAnimBankAttacker _080DF69C: .4byte gBattleAnimArgs _080DF6A0: ldr r1, _080DF6E4 @ =gBattleAnimArgs @@ -177,23 +177,23 @@ sub_80DF6F0: @ 80DF6F0 ldrsh r0, [r0, r1] cmp r0, 0 bne _080DF70C - ldr r4, _080DF708 @ =gBattleAnimBankAttacker + ldr r4, _080DF708 @ =gAnimBankAttacker b _080DF70E .align 2, 0 _080DF704: .4byte gBattleAnimArgs -_080DF708: .4byte gBattleAnimBankAttacker +_080DF708: .4byte gAnimBankAttacker _080DF70C: - ldr r4, _080DF750 @ =gBattleAnimBankTarget + ldr r4, _080DF750 @ =gAnimBankTarget _080DF70E: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -215,7 +215,7 @@ _080DF70E: pop {r0} bx r0 .align 2, 0 -_080DF750: .4byte gBattleAnimBankTarget +_080DF750: .4byte gAnimBankTarget _080DF754: .4byte gBattleAnimArgs _080DF758: .4byte sub_8078600 _080DF75C: .4byte move_anim_8074EE0 @@ -225,7 +225,7 @@ _080DF75C: .4byte move_anim_8074EE0 sub_80DF760: @ 80DF760 push {r4,lr} adds r4, r0, 0 - ldr r0, _080DF788 @ =gBattleAnimBankAttacker + ldr r0, _080DF788 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -241,24 +241,24 @@ _080DF77A: pop {r0} bx r0 .align 2, 0 -_080DF788: .4byte gBattleAnimBankAttacker +_080DF788: .4byte gAnimBankAttacker thumb_func_end sub_80DF760 thumb_func_start sub_80DF78C sub_80DF78C: @ 80DF78C push {r4-r7,lr} adds r6, r0, 0 - ldr r4, _080DF7E0 @ =gBattleAnimBankAttacker + ldr r4, _080DF7E0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r5, 0 strh r0, [r6, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x22] @@ -284,7 +284,7 @@ sub_80DF78C: @ 80DF78C lsrs r0, r7, 17 b _080DF7EE .align 2, 0 -_080DF7E0: .4byte gBattleAnimBankAttacker +_080DF7E0: .4byte gAnimBankAttacker _080DF7E4: .4byte gBattleAnimArgs _080DF7E8: .4byte gBankAttacker _080DF7EC: @@ -442,7 +442,7 @@ _080DF90A: cmp r0, 0x14 ble _080DF91E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DF91E: pop {r4,r5} pop {r0} @@ -460,7 +460,7 @@ sub_80DF924: @ 80DF924 lsls r1, 3 ldr r0, _080DF950 @ =gTasks adds r4, r1, r0 - ldr r0, _080DF954 @ =gBattleAnimBankAttacker + ldr r0, _080DF954 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -469,17 +469,17 @@ sub_80DF924: @ 80DF924 bne _080DF960 ldr r0, _080DF958 @ =REG_BG1HOFS str r0, [sp] - ldr r0, _080DF95C @ =gUnknown_030042C0 + ldr r0, _080DF95C @ =gBattle_BG1_X b _080DF966 .align 2, 0 _080DF950: .4byte gTasks -_080DF954: .4byte gBattleAnimBankAttacker +_080DF954: .4byte gAnimBankAttacker _080DF958: .4byte REG_BG1HOFS -_080DF95C: .4byte gUnknown_030042C0 +_080DF95C: .4byte gBattle_BG1_X _080DF960: ldr r0, _080DF9DC @ =REG_BG2HOFS str r0, [sp] - ldr r0, _080DF9E0 @ =gUnknown_03004288 + ldr r0, _080DF9E0 @ =gBattle_BG2_X _080DF966: ldrh r0, [r0] strh r0, [r4, 0xC] @@ -491,7 +491,7 @@ _080DF966: strb r0, [r1, 0x8] mov r0, sp strb r5, [r0, 0x9] - ldr r0, _080DF9E8 @ =gBattleAnimBankAttacker + ldr r0, _080DF9E8 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8077FC0 lsls r0, 24 @@ -542,9 +542,9 @@ _080DF9C4: bx r0 .align 2, 0 _080DF9DC: .4byte REG_BG2HOFS -_080DF9E0: .4byte gUnknown_03004288 +_080DF9E0: .4byte gBattle_BG2_X _080DF9E4: .4byte 0xa2600001 -_080DF9E8: .4byte gBattleAnimBankAttacker +_080DF9E8: .4byte gAnimBankAttacker _080DF9EC: .4byte gUnknown_03004DE0 _080DF9F0: .4byte sub_80DF9F4 thumb_func_end sub_80DF924 @@ -724,18 +724,18 @@ sub_80DFB28: @ 80DFB28 movs r1, 0x5 bl __divsi3 adds r6, r0, 0 - ldr r1, _080DFBCC @ =gBattleAnimBankAttacker + ldr r1, _080DFBCC @ =gAnimBankAttacker mov r8, r1 ldrb r0, [r1] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] mov r2, r8 ldrb r0, [r2] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r3, [r5, 0x8] @@ -790,7 +790,7 @@ _080DFBB0: bx r0 .align 2, 0 _080DFBC8: .4byte gBattleAnimArgs -_080DFBCC: .4byte gBattleAnimBankAttacker +_080DFBCC: .4byte gAnimBankAttacker _080DFBD0: .4byte sub_80DFBD8 _080DFBD4: .4byte gUnknown_03000730 thumb_func_end sub_80DFB28 @@ -827,7 +827,7 @@ sub_80DFBD8: @ 80DFBD8 cmp r0, r1 ble _080DFC1C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DFC1C: pop {r4} pop {r0} @@ -847,7 +847,7 @@ sub_80DFC24: @ 80DFC24 ldr r0, _080DFC5C @ =gBattleAnimArgs ldrh r0, [r0] strh r0, [r1, 0x8] - ldr r0, _080DFC60 @ =gBattleAnimBankAttacker + ldr r0, _080DFC60 @ =gAnimBankAttacker ldrb r0, [r0] movs r2, 0x10 strh r2, [r1, 0xA] @@ -864,7 +864,7 @@ sub_80DFC24: @ 80DFC24 .align 2, 0 _080DFC58: .4byte gTasks _080DFC5C: .4byte gBattleAnimArgs -_080DFC60: .4byte gBattleAnimBankAttacker +_080DFC60: .4byte gAnimBankAttacker _080DFC64: .4byte REG_BLDALPHA _080DFC68: .4byte REG_BLDCNT _080DFC6C: .4byte 0x00003f42 @@ -927,7 +927,7 @@ sub_80DFC9C: @ 80DFC9C bne _080DFD1E ldr r2, _080DFD0C @ =gSprites ldr r1, _080DFD10 @ =gObjectBankIDs - ldr r0, _080DFD14 @ =gBattleAnimBankAttacker + ldr r0, _080DFD14 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -948,7 +948,7 @@ _080DFD04: .4byte gTasks _080DFD08: .4byte REG_BLDALPHA _080DFD0C: .4byte gSprites _080DFD10: .4byte gObjectBankIDs -_080DFD14: .4byte gBattleAnimBankAttacker +_080DFD14: .4byte gAnimBankAttacker _080DFD18: ldrh r0, [r4, 0xC] adds r0, 0x1 @@ -1050,7 +1050,7 @@ sub_80DFDC0: @ 80DFDC0 lsls r2, 5 adds r0, r2, 0 strh r0, [r1] - ldr r0, _080DFDEC @ =gBattleAnimBankAttacker + ldr r0, _080DFDEC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -1062,7 +1062,7 @@ sub_80DFDC0: @ 80DFDC0 b _080DFDFC .align 2, 0 _080DFDE8: .4byte REG_BLDALPHA -_080DFDEC: .4byte gBattleAnimBankAttacker +_080DFDEC: .4byte gAnimBankAttacker _080DFDF0: .4byte REG_BLDCNT _080DFDF4: .4byte 0x00003f42 _080DFDF8: @@ -1085,29 +1085,29 @@ _080DFE10: .4byte 0x00003f44 sub_80DFE14: @ 80DFE14 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _080DFE80 @ =gBattleAnimBankTarget + ldr r6, _080DFE80 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x30] - ldr r5, _080DFE84 @ =gBattleAnimBankAttacker + ldr r5, _080DFE84 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x34] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -1131,8 +1131,8 @@ sub_80DFE14: @ 80DFE14 pop {r0} bx r0 .align 2, 0 -_080DFE80: .4byte gBattleAnimBankTarget -_080DFE84: .4byte gBattleAnimBankAttacker +_080DFE80: .4byte gAnimBankTarget +_080DFE84: .4byte gAnimBankAttacker _080DFE88: .4byte 0x0000ffd8 _080DFE8C: .4byte sub_80DFE90 thumb_func_end sub_80DFE14 @@ -1204,7 +1204,7 @@ _080DFF02: cmp r0, 0 bne _080DFF14 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DFF14: pop {r4-r6} pop {r0} diff --git a/asm/fight.s b/asm/fight.s index c6ef33840..d0d042113 100755 --- a/asm/fight.s +++ b/asm/fight.s @@ -24,7 +24,7 @@ unc_080B08A0: @ 80D8FF0 strh r0, [r4, 0x2E] ldr r0, _080D9024 @ =sub_80782D8 str r0, [r4, 0x1C] - ldr r1, _080D9028 @ =move_anim_8072740 + ldr r1, _080D9028 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -33,7 +33,7 @@ unc_080B08A0: @ 80D8FF0 .align 2, 0 _080D9020: .4byte gBattleAnimArgs _080D9024: .4byte sub_80782D8 -_080D9028: .4byte move_anim_8072740 +_080D9028: .4byte DestroyAnimSprite thumb_func_end unc_080B08A0 thumb_func_start sub_80D902C @@ -45,7 +45,7 @@ sub_80D902C: @ 80D902C ldrsh r0, [r4, r1] cmp r0, 0x1 bne _080D9054 - ldr r0, _080D9074 @ =gBattleAnimBankAttacker + ldr r0, _080D9074 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -71,14 +71,14 @@ _080D9054: bx r0 .align 2, 0 _080D9070: .4byte gBattleAnimArgs -_080D9074: .4byte gBattleAnimBankAttacker +_080D9074: .4byte gAnimBankAttacker thumb_func_end sub_80D902C thumb_func_start sub_80D9078 sub_80D9078: @ 80D9078 push {r4,lr} adds r4, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D9094 @@ -126,7 +126,7 @@ _080D90D0: strh r0, [r5, 0x2E] ldr r0, _080D90EC @ =sub_80782D8 str r0, [r5, 0x1C] - ldr r1, _080D90F0 @ =move_anim_8072740 + ldr r1, _080D90F0 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -135,7 +135,7 @@ _080D90D0: .align 2, 0 _080D90E8: .4byte gBattleAnimArgs _080D90EC: .4byte sub_80782D8 -_080D90F0: .4byte move_anim_8072740 +_080D90F0: .4byte DestroyAnimSprite thumb_func_end sub_80D90A4 thumb_func_start sub_80D90F4 @@ -151,13 +151,13 @@ sub_80D90F4: @ 80D90F4 mov r9, r0 cmp r1, 0 bne _080D9118 - ldr r0, _080D9114 @ =gBattleAnimBankAttacker + ldr r0, _080D9114 @ =gAnimBankAttacker b _080D911A .align 2, 0 _080D9110: .4byte gBattleAnimArgs -_080D9114: .4byte gBattleAnimBankAttacker +_080D9114: .4byte gAnimBankAttacker _080D9118: - ldr r0, _080D9260 @ =gBattleAnimBankTarget + ldr r0, _080D9260 @ =gAnimBankTarget _080D911A: ldrb r0, [r0] mov r8, r0 @@ -178,13 +178,13 @@ _080D9138: bl StartSpriteAnim mov r0, r8 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] mov r0, r8 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -314,7 +314,7 @@ _080D9250: pop {r0} bx r0 .align 2, 0 -_080D9260: .4byte gBattleAnimBankTarget +_080D9260: .4byte gAnimBankTarget _080D9264: .4byte gBanksBySide _080D9268: .4byte 0xfff00000 _080D926C: .4byte gBattleAnimSpriteTemplate_83DB4A8 @@ -355,7 +355,7 @@ sub_80D927C: @ 80D927C bl DestroySprite _080D92B8: adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D92C8 .align 2, 0 _080D92C0: .4byte gSprites @@ -444,7 +444,7 @@ sub_80D9328: @ 80D9328 strh r6, [r5, 0x24] ldr r0, _080D9370 @ =sub_8078B34 str r0, [r5, 0x1C] - ldr r1, _080D9374 @ =move_anim_8072740 + ldr r1, _080D9374 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData _080D9368: @@ -453,17 +453,17 @@ _080D9368: bx r0 .align 2, 0 _080D9370: .4byte sub_8078B34 -_080D9374: .4byte move_anim_8072740 +_080D9374: .4byte DestroyAnimSprite thumb_func_end sub_80D9328 thumb_func_start sub_80D9378 sub_80D9378: @ 80D9378 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _080D93F4 @ =gBattleAnimBankAttacker + ldr r0, _080D93F4 @ =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 - ldr r2, _080D93F8 @ =gBattleAnimBankTarget + ldr r2, _080D93F8 @ =gAnimBankTarget eors r0, r1 ldrb r1, [r2] cmp r0, r1 @@ -483,7 +483,7 @@ _080D93A4: adds r0, r6, 0 movs r1, 0x1 bl sub_8078764 - ldr r0, _080D93F4 @ =gBattleAnimBankAttacker + ldr r0, _080D93F4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -519,8 +519,8 @@ _080D93C2: pop {r0} bx r0 .align 2, 0 -_080D93F4: .4byte gBattleAnimBankAttacker -_080D93F8: .4byte gBattleAnimBankTarget +_080D93F4: .4byte gAnimBankAttacker +_080D93F8: .4byte gAnimBankTarget _080D93FC: .4byte gBattleAnimArgs _080D9400: .4byte sub_80D9404 thumb_func_end sub_80D9378 @@ -549,7 +549,7 @@ sub_80D9404: @ 80D9404 b _080D9436 _080D9430: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9436: pop {r4} pop {r0} @@ -598,7 +598,7 @@ sub_80D9474: @ 80D9474 strh r0, [r4, 0x2E] ldr r0, _080D94A0 @ =sub_80782D8 str r0, [r4, 0x1C] - ldr r1, _080D94A4 @ =move_anim_8072740 + ldr r1, _080D94A4 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4} @@ -606,7 +606,7 @@ sub_80D9474: @ 80D9474 bx r0 .align 2, 0 _080D94A0: .4byte sub_80782D8 -_080D94A4: .4byte move_anim_8072740 +_080D94A4: .4byte DestroyAnimSprite thumb_func_end sub_80D9474 thumb_func_start sub_80D94A8 @@ -643,16 +643,16 @@ sub_80D94CC: @ 80D94CC bne _080D9510 movs r0, 0x6 strh r0, [r5, 0x2E] - ldr r4, _080D9518 @ =gBattleAnimBankTarget + ldr r4, _080D9518 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -666,7 +666,7 @@ _080D9510: pop {r0} bx r0 .align 2, 0 -_080D9518: .4byte gBattleAnimBankTarget +_080D9518: .4byte gAnimBankTarget _080D951C: .4byte sub_8078B34 _080D9520: .4byte sub_80D9524 thumb_func_end sub_80D94CC @@ -678,13 +678,13 @@ sub_80D9524: @ 80D9524 strh r1, [r0, 0x2E] ldr r1, _080D9538 @ =sub_80782D8 str r1, [r0, 0x1C] - ldr r1, _080D953C @ =move_anim_8072740 + ldr r1, _080D953C @ =DestroyAnimSprite bl StoreSpriteCallbackInData pop {r0} bx r0 .align 2, 0 _080D9538: .4byte sub_80782D8 -_080D953C: .4byte move_anim_8072740 +_080D953C: .4byte DestroyAnimSprite thumb_func_end sub_80D9524 thumb_func_start sub_80D9540 @@ -754,7 +754,7 @@ _080D95BA: cmp r0, 0x78 ble _080D95C8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D95C8: pop {r4} pop {r0} @@ -770,23 +770,23 @@ sub_80D95D0: @ 80D95D0 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D95EC - ldr r4, _080D95E8 @ =gBattleAnimBankAttacker + ldr r4, _080D95E8 @ =gAnimBankAttacker b _080D95EE .align 2, 0 _080D95E4: .4byte gBattleAnimArgs -_080D95E8: .4byte gBattleAnimBankAttacker +_080D95E8: .4byte gAnimBankAttacker _080D95EC: - ldr r4, _080D9634 @ =gBattleAnimBankTarget + ldr r4, _080D9634 @ =gAnimBankTarget _080D95EE: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -812,7 +812,7 @@ _080D95EE: pop {r0} bx r0 .align 2, 0 -_080D9634: .4byte gBattleAnimBankTarget +_080D9634: .4byte gAnimBankTarget _080D9638: .4byte gBattleAnimArgs _080D963C: .4byte sub_80D9640 thumb_func_end sub_80D95D0 @@ -840,7 +840,7 @@ _080D9652: cmp r0, 0 bne _080D966E adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D96B0 _080D966E: ldrh r0, [r1, 0x2E] @@ -878,7 +878,7 @@ _080D969E: cmp r0, 0 bne _080D96B0 adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D96B0: pop {r0} bx r0 @@ -895,10 +895,10 @@ sub_80D96B8: @ 80D96B8 ldrsh r0, [r6, r1] cmp r0, 0 bne _080D96E4 - ldr r4, _080D96E0 @ =gBattleAnimBankAttacker + ldr r4, _080D96E0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r2, [r6, 0x4] @@ -906,12 +906,12 @@ sub_80D96B8: @ 80D96B8 b _080D96F6 .align 2, 0 _080D96DC: .4byte gBattleAnimArgs -_080D96E0: .4byte gBattleAnimBankAttacker +_080D96E0: .4byte gAnimBankAttacker _080D96E4: - ldr r4, _080D9740 @ =gBattleAnimBankTarget + ldr r4, _080D9740 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x4] @@ -920,7 +920,7 @@ _080D96F6: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x6] @@ -954,7 +954,7 @@ _080D96F6: beq _080D975A b _080D978A .align 2, 0 -_080D9740: .4byte gBattleAnimBankTarget +_080D9740: .4byte gAnimBankTarget _080D9744: .4byte gBattleAnimArgs _080D9748: .4byte 0x000003ff _080D974C: .4byte 0xfffffc00 @@ -991,7 +991,7 @@ _080D9784: b _080D9792 _080D978A: adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D9796 _080D9792: ldr r0, _080D979C @ =sub_80D97A0 @@ -1024,7 +1024,7 @@ sub_80D97A0: @ 80D97A0 cmp r0, 0x28 ble _080D97C8 adds r0, r1, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D97C8: pop {r0} bx r0 @@ -1042,17 +1042,17 @@ sub_80D97CC: @ 80D97CC ldr r4, _080D981C @ =gBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, _080D9820 @ =gBattleAnimBankAttacker + ldr r0, _080D9820 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -1064,15 +1064,15 @@ sub_80D97CC: @ 80D97CC ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - ldr r0, _080D9824 @ =gBattleAnimBankTarget + ldr r0, _080D9824 @ =gAnimBankTarget b _080D9844 .align 2, 0 _080D9818: .4byte gBattleAnimArgs _080D981C: .4byte gBankAttacker -_080D9820: .4byte gBattleAnimBankAttacker -_080D9824: .4byte gBattleAnimBankTarget +_080D9820: .4byte gAnimBankAttacker +_080D9824: .4byte gAnimBankTarget _080D9828: - ldr r0, _080D9860 @ =gBattleAnimBankTarget + ldr r0, _080D9860 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -1084,7 +1084,7 @@ _080D9828: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - ldr r0, _080D9864 @ =gBattleAnimBankAttacker + ldr r0, _080D9864 @ =gAnimBankAttacker _080D9844: ldrb r0, [r0] strh r0, [r5, 0x3C] @@ -1100,8 +1100,8 @@ _080D9844: pop {r0} bx r0 .align 2, 0 -_080D9860: .4byte gBattleAnimBankTarget -_080D9864: .4byte gBattleAnimBankAttacker +_080D9860: .4byte gAnimBankTarget +_080D9864: .4byte gAnimBankAttacker _080D9868: .4byte sub_80D986C thumb_func_end sub_80D97CC @@ -1127,7 +1127,7 @@ sub_80D986C: @ 80D986C lsls r0, 24 lsrs r0, 24 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -1137,7 +1137,7 @@ sub_80D986C: @ 80D986C lsls r0, 24 lsrs r0, 24 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -1237,7 +1237,7 @@ sub_80D9934: @ 80D9934 cmp r4, r0 bge _080D997E adds r0, r7, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080D99DC _080D997E: ldrh r0, [r7, 0x2E] @@ -1245,31 +1245,31 @@ _080D997E: strh r0, [r7, 0x2E] b _080D99DC _080D9986: - ldr r4, _080D99E8 @ =gBattleAnimBankAttacker + ldr r4, _080D99E8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r2, _080D99EC @ =gBattleAnimBankTarget + ldr r2, _080D99EC @ =gAnimBankTarget mov r8, r2 ldrb r0, [r2] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 mov r1, r8 ldrb r0, [r1] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 subs r4, r6 strh r4, [r7, 0x2E] @@ -1291,8 +1291,8 @@ _080D99DC: pop {r0} bx r0 .align 2, 0 -_080D99E8: .4byte gBattleAnimBankAttacker -_080D99EC: .4byte gBattleAnimBankTarget +_080D99E8: .4byte gAnimBankAttacker +_080D99EC: .4byte gAnimBankTarget _080D99F0: .4byte sub_80D99F4 thumb_func_end sub_80D9934 @@ -1329,7 +1329,7 @@ sub_80D99F4: @ 80D99F4 ble _080D9A34 _080D9A2E: adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9A34: pop {r0} bx r0 @@ -1347,29 +1347,29 @@ sub_80D9A38: @ 80D9A38 ldr r4, _080D9A70 @ =gBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, _080D9A74 @ =gBattleAnimBankTarget + ldr r0, _080D9A74 @ =gAnimBankTarget ldrb r4, [r0] - ldr r0, _080D9A78 @ =gBattleAnimBankAttacker + ldr r0, _080D9A78 @ =gAnimBankAttacker b _080D9A82 .align 2, 0 _080D9A6C: .4byte gBattleAnimArgs _080D9A70: .4byte gBankAttacker -_080D9A74: .4byte gBattleAnimBankTarget -_080D9A78: .4byte gBattleAnimBankAttacker +_080D9A74: .4byte gAnimBankTarget +_080D9A78: .4byte gAnimBankAttacker _080D9A7C: - ldr r0, _080D9AB4 @ =gBattleAnimBankAttacker + ldr r0, _080D9AB4 @ =gAnimBankAttacker ldrb r4, [r0] - ldr r0, _080D9AB8 @ =gBattleAnimBankTarget + ldr r0, _080D9AB8 @ =gAnimBankTarget _080D9A82: ldrb r0, [r0] bl sub_8079ED4 @@ -1382,7 +1382,7 @@ _080D9A82: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D9ABC @@ -1395,8 +1395,8 @@ _080D9A82: subs r0, 0x47 b _080D9AD6 .align 2, 0 -_080D9AB4: .4byte gBattleAnimBankAttacker -_080D9AB8: .4byte gBattleAnimBankTarget +_080D9AB4: .4byte gAnimBankAttacker +_080D9AB8: .4byte gAnimBankTarget _080D9ABC: adds r0, r4, 0 bl GetBankSide @@ -1421,7 +1421,7 @@ _080D9ADC: strh r0, [r5, 0x30] adds r0, r4, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -1429,13 +1429,13 @@ _080D9ADC: strh r0, [r5, 0x34] adds r0, r4, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _080D9B1C @ =move_anim_8072740 + ldr r1, _080D9B1C @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldr r0, _080D9B20 @ =sub_8078BB8 @@ -1444,7 +1444,7 @@ _080D9ADC: pop {r0} bx r0 .align 2, 0 -_080D9B1C: .4byte move_anim_8072740 +_080D9B1C: .4byte DestroyAnimSprite _080D9B20: .4byte sub_8078BB8 thumb_func_end sub_80D9A38 @@ -1459,7 +1459,7 @@ sub_80D9B24: @ 80D9B24 cmp r1, r0 bne _080D9B3A adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9B3A: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -1473,16 +1473,16 @@ _080D9B3A: sub_80D9B48: @ 80D9B48 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _080D9BC4 @ =gBattleAnimBankTarget + ldr r4, _080D9BC4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1495,7 +1495,7 @@ sub_80D9B48: @ 80D9B48 strh r0, [r5, 0x34] ldrh r0, [r1, 0x4] strh r0, [r5, 0x36] - ldr r0, _080D9BCC @ =gUnknown_0202F7C4 + ldr r0, _080D9BCC @ =gAnimMoveTurn ldrb r6, [r0] ldrb r0, [r4] bl GetBankSide @@ -1532,9 +1532,9 @@ _080D9BA6: pop {r0} bx r0 .align 2, 0 -_080D9BC4: .4byte gBattleAnimBankTarget +_080D9BC4: .4byte gAnimBankTarget _080D9BC8: .4byte gBattleAnimArgs -_080D9BCC: .4byte gUnknown_0202F7C4 +_080D9BCC: .4byte gAnimMoveTurn _080D9BD0: .4byte sub_80D9B24 thumb_func_end sub_80D9B48 @@ -1558,7 +1558,7 @@ _080D9BF0: movs r1, 0 bl sub_8078764 _080D9BF8: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D9C0C @@ -1567,7 +1567,7 @@ _080D9BF8: bl StartSpriteAnim b _080D9C22 _080D9C0C: - ldr r0, _080D9C34 @ =gBattleAnimBankAttacker + ldr r0, _080D9C34 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1579,16 +1579,16 @@ _080D9C0C: _080D9C22: ldr r0, _080D9C38 @ =sub_8078600 str r0, [r4, 0x1C] - ldr r1, _080D9C3C @ =move_anim_8072740 + ldr r1, _080D9C3C @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 .align 2, 0 -_080D9C34: .4byte gBattleAnimBankAttacker +_080D9C34: .4byte gAnimBankAttacker _080D9C38: .4byte sub_8078600 -_080D9C3C: .4byte move_anim_8072740 +_080D9C3C: .4byte DestroyAnimSprite thumb_func_end sub_80D9BD4 thumb_func_start sub_80D9C40 @@ -1619,7 +1619,7 @@ sub_80D9C40: @ 80D9C40 cmp r0, 0x28 ble _080D9C7A adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9C7A: pop {r4} pop {r0} @@ -1682,7 +1682,7 @@ _080D9CDE: ldrh r1, [r4, 0x1C] adds r0, r1 strh r0, [r4, 0x1C] - ldr r0, _080D9D0C @ =gBattleAnimBankTarget + ldr r0, _080D9D0C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1698,7 +1698,7 @@ _080D9CDE: adds r7, r1, 0 b _080D9D24 .align 2, 0 -_080D9D0C: .4byte gBattleAnimBankTarget +_080D9D0C: .4byte gAnimBankTarget _080D9D10: .4byte gUnknown_030041B0 _080D9D14: ldr r2, _080D9D64 @ =gUnknown_030041B0 diff --git a/asm/fire.s b/asm/fire.s index bafe1d7e1..dcf793e39 100755 --- a/asm/fire.s +++ b/asm/fire.s @@ -23,7 +23,7 @@ sub_80D4ED8: @ 80D4ED8 movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, _080D4F10 @ =move_anim_8072740 + ldr r1, _080D4F10 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r1, _080D4F14 @ =sub_8078174 @@ -35,7 +35,7 @@ sub_80D4ED8: @ 80D4ED8 bx r0 .align 2, 0 _080D4F0C: .4byte gBattleAnimArgs -_080D4F10: .4byte move_anim_8072740 +_080D4F10: .4byte DestroyAnimSprite _080D4F14: .4byte sub_8078174 thumb_func_end sub_80D4ED8 @@ -60,7 +60,7 @@ sub_80D4F18: @ 80D4F18 strh r0, [r4, 0x32] ldr r0, _080D4F54 @ =sub_8078394 str r0, [r4, 0x1C] - ldr r1, _080D4F58 @ =move_anim_8072740 + ldr r1, _080D4F58 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -69,7 +69,7 @@ sub_80D4F18: @ 80D4F18 .align 2, 0 _080D4F50: .4byte gBattleAnimArgs _080D4F54: .4byte sub_8078394 -_080D4F58: .4byte move_anim_8072740 +_080D4F58: .4byte DestroyAnimSprite thumb_func_end sub_80D4F18 thumb_func_start sub_80D4F5C @@ -77,7 +77,7 @@ sub_80D4F5C: @ 80D4F5C push {r4,lr} adds r4, r0, 0 bl sub_8078650 - ldr r0, _080D4F90 @ =gBattleAnimBankAttacker + ldr r0, _080D4F90 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -98,7 +98,7 @@ sub_80D4F5C: @ 80D4F5C adds r1, r2, 0 b _080D4FAE .align 2, 0 -_080D4F90: .4byte gBattleAnimBankAttacker +_080D4F90: .4byte gAnimBankAttacker _080D4F94: .4byte gBattleAnimArgs _080D4F98: ldr r1, _080D4FC4 @ =gBattleAnimArgs @@ -133,7 +133,7 @@ _080D4FC8: .4byte sub_80D5038 sub_80D4FCC: @ 80D4FCC push {r4,lr} adds r4, r0, 0 - ldr r0, _080D4FF8 @ =gBattleAnimBankAttacker + ldr r0, _080D4FF8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -153,7 +153,7 @@ sub_80D4FCC: @ 80D4FCC adds r1, r2, 0 b _080D5018 .align 2, 0 -_080D4FF8: .4byte gBattleAnimBankAttacker +_080D4FF8: .4byte gAnimBankAttacker _080D4FFC: .4byte gBattleAnimArgs _080D5000: ldr r1, _080D5030 @ =gBattleAnimArgs @@ -225,7 +225,7 @@ sub_80D5074: @ 80D5074 push {r4,lr} adds r4, r0, 0 bl sub_8078650 - ldr r0, _080D5098 @ =gBattleAnimBankAttacker + ldr r0, _080D5098 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -238,7 +238,7 @@ sub_80D5074: @ 80D5074 strh r1, [r4, 0x20] b _080D50B2 .align 2, 0 -_080D5098: .4byte gBattleAnimBankAttacker +_080D5098: .4byte gAnimBankAttacker _080D509C: .4byte gBattleAnimArgs _080D50A0: ldr r0, _080D50E0 @ =gBattleAnimArgs diff --git a/asm/fire_2.s b/asm/fire_2.s index b96962bdf..6e8ea7ce4 100755 --- a/asm/fire_2.s +++ b/asm/fire_2.s @@ -11,11 +11,11 @@ sub_80D51A8: @ 80D51A8 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _080D5200 @ =gBattleAnimBankAttacker + ldr r5, _080D5200 @ =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide adds r4, r0, 0 - ldr r0, _080D5204 @ =gBattleAnimBankTarget + ldr r0, _080D5204 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 @@ -50,8 +50,8 @@ _080D51EE: pop {r0} bx r0 .align 2, 0 -_080D5200: .4byte gBattleAnimBankAttacker -_080D5204: .4byte gBattleAnimBankTarget +_080D5200: .4byte gAnimBankAttacker +_080D5204: .4byte gAnimBankTarget _080D5208: .4byte gBattleAnimArgs _080D520C: .4byte sub_8079534 thumb_func_end sub_80D51A8 @@ -110,10 +110,10 @@ sub_80D5254: @ 80D5254 strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _080D52A4 @ =gBattleAnimBankTarget + ldr r4, _080D52A4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -121,7 +121,7 @@ sub_80D5254: @ 80D5254 strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -134,7 +134,7 @@ _080D529E: pop {r0} bx r0 .align 2, 0 -_080D52A4: .4byte gBattleAnimBankTarget +_080D52A4: .4byte gAnimBankTarget _080D52A8: .4byte sub_80D52AC thumb_func_end sub_80D5254 @@ -148,16 +148,16 @@ sub_80D52AC: @ 80D52AC beq _080D52F4 movs r4, 0 strh r4, [r6, 0x2E] - ldr r5, _080D52EC @ =gBattleAnimBankTarget + ldr r5, _080D52EC @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x22] @@ -169,7 +169,7 @@ sub_80D52AC: @ 80D52AC bl _call_via_r1 b _080D531E .align 2, 0 -_080D52EC: .4byte gBattleAnimBankTarget +_080D52EC: .4byte gAnimBankTarget _080D52F0: .4byte sub_80D5324 _080D52F4: movs r1, 0x3C @@ -210,7 +210,7 @@ sub_80D5324: @ 80D5324 cmp r0, 0x1F bne _080D5340 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D5340: pop {r4} pop {r0} @@ -260,7 +260,7 @@ sub_80D5374: @ 80D5374 strh r0, [r4, 0x30] ldrh r0, [r1, 0x8] strh r0, [r4, 0x32] - ldr r1, _080D53AC @ =move_anim_8072740 + ldr r1, _080D53AC @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r0, _080D53B0 @ =sub_8078364 @@ -270,7 +270,7 @@ sub_80D5374: @ 80D5374 bx r0 .align 2, 0 _080D53A8: .4byte gBattleAnimArgs -_080D53AC: .4byte move_anim_8072740 +_080D53AC: .4byte DestroyAnimSprite _080D53B0: .4byte sub_8078364 thumb_func_end sub_80D5374 @@ -364,7 +364,7 @@ sub_80D541C: @ 80D541C cmp r0, r1 bne _080D5468 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D5468: pop {r4} pop {r0} @@ -400,7 +400,7 @@ sub_80D5470: @ 80D5470 adds r0, r2 ldrh r0, [r0, 0x22] strh r0, [r4, 0x10] - ldr r0, _080D54D8 @ =gBattleAnimBankAttacker + ldr r0, _080D54D8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -420,7 +420,7 @@ sub_80D5470: @ 80D5470 .align 2, 0 _080D54D0: .4byte gTasks _080D54D4: .4byte gSprites -_080D54D8: .4byte gBattleAnimBankAttacker +_080D54D8: .4byte gAnimBankAttacker _080D54DC: .4byte sub_80D54E0 thumb_func_end sub_80D5470 @@ -826,7 +826,7 @@ sub_80D57C4: @ 80D57C4 lsls r0, 2 adds r0, r1 ldrh r4, [r0, 0x20] - ldr r0, _080D5818 @ =gBattleAnimBankAttacker + ldr r0, _080D5818 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -840,7 +840,7 @@ sub_80D57C4: @ 80D57C4 b _080D5826 .align 2, 0 _080D5814: .4byte gSprites -_080D5818: .4byte gBattleAnimBankAttacker +_080D5818: .4byte gAnimBankAttacker _080D581C: adds r0, r4, 0 adds r0, 0x10 diff --git a/asm/flying.s b/asm/flying.s index cf0b1053c..99cb11913 100755 --- a/asm/flying.s +++ b/asm/flying.s @@ -56,7 +56,7 @@ sub_80DA05C: @ 80DA05C cmp r0, 0x47 bne _080DA096 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA096: pop {r4} pop {r0} @@ -175,7 +175,7 @@ sub_80DA16C: @ 80DA16C adds r6, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080DA1D8 @ =gBattleAnimBankAttacker + ldr r0, _080DA1D8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -191,10 +191,10 @@ _080DA18C: strh r0, [r6, 0x2E] ldrh r0, [r6, 0x20] strh r0, [r6, 0x30] - ldr r5, _080DA1E0 @ =gBattleAnimBankTarget + ldr r5, _080DA1E0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -204,7 +204,7 @@ _080DA18C: strh r0, [r6, 0x34] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x6] @@ -221,9 +221,9 @@ _080DA18C: pop {r0} bx r0 .align 2, 0 -_080DA1D8: .4byte gBattleAnimBankAttacker +_080DA1D8: .4byte gAnimBankAttacker _080DA1DC: .4byte gBattleAnimArgs -_080DA1E0: .4byte gBattleAnimBankTarget +_080DA1E0: .4byte gAnimBankTarget _080DA1E4: .4byte sub_80785E4 _080DA1E8: .4byte sub_80DA1EC thumb_func_end sub_80DA16C @@ -237,7 +237,7 @@ sub_80DA1EC: @ 80DA1EC cmp r0, 0 beq _080DA200 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA200: pop {r4} pop {r0} @@ -248,7 +248,7 @@ _080DA200: sub_80DA208: @ 80DA208 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080DA2A4 @ =gBattleAnimBankAttacker + ldr r4, _080DA2A4 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -268,7 +268,7 @@ sub_80DA208: @ 80DA208 negs r0, r0 strh r0, [r1, 0x6] _080DA234: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DA24C @@ -282,13 +282,13 @@ _080DA234: _080DA24C: ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r2, _080DA2A8 @ =gBattleAnimArgs ldrh r1, [r2] @@ -305,26 +305,26 @@ _080DA24C: ldrsh r0, [r2, r3] cmp r0, 0 bne _080DA2B0 - ldr r4, _080DA2AC @ =gBattleAnimBankTarget + ldr r4, _080DA2AC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] b _080DA2C2 .align 2, 0 -_080DA2A4: .4byte gBattleAnimBankAttacker +_080DA2A4: .4byte gAnimBankAttacker _080DA2A8: .4byte gBattleAnimArgs -_080DA2AC: .4byte gBattleAnimBankTarget +_080DA2AC: .4byte gAnimBankTarget _080DA2B0: - ldr r0, _080DA2F0 @ =gBattleAnimBankTarget + ldr r0, _080DA2F0 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -344,7 +344,7 @@ _080DA2C2: strh r0, [r5, 0x36] ldr r0, _080DA2F8 @ =sub_8078B34 str r0, [r5, 0x1C] - ldr r1, _080DA2FC @ =move_anim_8072740 + ldr r1, _080DA2FC @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldrb r1, [r4, 0xA] @@ -354,10 +354,10 @@ _080DA2C2: pop {r0} bx r0 .align 2, 0 -_080DA2F0: .4byte gBattleAnimBankTarget +_080DA2F0: .4byte gAnimBankTarget _080DA2F4: .4byte gBattleAnimArgs _080DA2F8: .4byte sub_8078B34 -_080DA2FC: .4byte move_anim_8072740 +_080DA2FC: .4byte DestroyAnimSprite thumb_func_end sub_80DA208 thumb_func_start sub_80DA300 @@ -429,7 +429,7 @@ _080DA36E: cmp r0, r1 bge _080DA386 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA386: pop {r0} bx r0 @@ -439,7 +439,7 @@ _080DA386: sub_80DA38C: @ 80DA38C push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080DA3B4 @ =gBattleAnimBankAttacker + ldr r0, _080DA3B4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -455,7 +455,7 @@ sub_80DA38C: @ 80DA38C bl StartSpriteAffineAnim b _080DA3C2 .align 2, 0 -_080DA3B4: .4byte gBattleAnimBankAttacker +_080DA3B4: .4byte gAnimBankAttacker _080DA3B8: .4byte 0x0000ffe0 _080DA3BC: ldr r0, _080DA400 @ =0x0000ffe0 @@ -467,10 +467,10 @@ _080DA3C2: strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _080DA408 @ =gBattleAnimBankTarget + ldr r4, _080DA408 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -478,7 +478,7 @@ _080DA3C2: strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -492,7 +492,7 @@ _080DA3C2: .align 2, 0 _080DA400: .4byte 0x0000ffe0 _080DA404: .4byte gBattleAnimArgs -_080DA408: .4byte gBattleAnimBankTarget +_080DA408: .4byte gAnimBankTarget _080DA40C: .4byte sub_80DA410 thumb_func_end sub_80DA38C @@ -552,7 +552,7 @@ _080DA45A: ands r0, r2 strb r0, [r1] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA480: pop {r4} pop {r0} @@ -617,13 +617,13 @@ sub_80DA4D8: @ 80DA4D8 ands r0, r1 cmp r0, 0 beq _080DA500 - ldr r0, _080DA4FC @ =gBattleAnimBankAttacker + ldr r0, _080DA4FC @ =gAnimBankAttacker b _080DA502 .align 2, 0 _080DA4F8: .4byte gBattleAnimArgs -_080DA4FC: .4byte gBattleAnimBankAttacker +_080DA4FC: .4byte gAnimBankAttacker _080DA500: - ldr r0, _080DA5B0 @ =gBattleAnimBankTarget + ldr r0, _080DA5B0 @ =gAnimBankTarget _080DA502: ldrb r6, [r0] adds r0, r6, 0 @@ -638,7 +638,7 @@ _080DA502: _080DA518: adds r0, r6, 0 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _080DA5B4 @ =gBattleAnimArgs lsrs r0, 24 @@ -647,7 +647,7 @@ _080DA518: strh r0, [r7, 0x20] adds r0, r6, 0 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldrh r1, [r4, 0x2] lsrs r0, 24 @@ -710,7 +710,7 @@ _080DA518: strb r1, [r7, 0x5] b _080DA5D8 .align 2, 0 -_080DA5B0: .4byte gBattleAnimBankTarget +_080DA5B0: .4byte gAnimBankTarget _080DA5B4: .4byte gBattleAnimArgs _080DA5B8: .4byte gMain _080DA5BC: .4byte 0x0000043d @@ -1718,7 +1718,7 @@ _080DAD2C: .4byte sub_80DA48C sub_80DAD30: @ 80DAD30 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _080DAD78 @ =gBattleAnimBankTarget + ldr r0, _080DAD78 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -1730,16 +1730,16 @@ sub_80DAD30: @ 80DAD30 ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] - ldr r5, _080DAD7C @ =gBattleAnimBankAttacker + ldr r5, _080DAD7C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -1749,8 +1749,8 @@ sub_80DAD30: @ 80DAD30 pop {r0} bx r0 .align 2, 0 -_080DAD78: .4byte gBattleAnimBankTarget -_080DAD7C: .4byte gBattleAnimBankAttacker +_080DAD78: .4byte gAnimBankTarget +_080DAD7C: .4byte gAnimBankAttacker _080DAD80: .4byte sub_807941C thumb_func_end sub_80DAD30 @@ -1774,7 +1774,7 @@ sub_80DAD84: @ 80DAD84 cmp r0, 0 beq _080DAE44 ldr r0, _080DADD8 @ =gBanksBySide - ldr r1, _080DADDC @ =gBattleAnimBankTarget + ldr r1, _080DADDC @ =gAnimBankTarget ldrb r2, [r1] adds r0, r2, r0 ldrb r1, [r0] @@ -1784,7 +1784,7 @@ sub_80DAD84: @ 80DAD84 beq _080DADE0 adds r0, r2, 0 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -1795,11 +1795,11 @@ _080DADCC: .4byte gBattleAnimArgs _080DADD0: .4byte gMain _080DADD4: .4byte 0x0000043d _080DADD8: .4byte gBanksBySide -_080DADDC: .4byte gBattleAnimBankTarget +_080DADDC: .4byte gAnimBankTarget _080DADE0: adds r0, r2, 0 movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x28 @@ -1810,7 +1810,7 @@ _080DADEE: ldrsh r0, [r0, r1] cmp r0, 0 beq _080DAE24 - ldr r0, _080DAE20 @ =gBattleAnimBankTarget + ldr r0, _080DAE20 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 lsls r0, 24 @@ -1828,9 +1828,9 @@ _080DADEE: b _080DAE58 .align 2, 0 _080DAE1C: .4byte gBattleAnimArgs -_080DAE20: .4byte gBattleAnimBankTarget +_080DAE20: .4byte gAnimBankTarget _080DAE24: - ldr r0, _080DAE40 @ =gBattleAnimBankTarget + ldr r0, _080DAE40 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -1844,12 +1844,12 @@ _080DAE24: strb r0, [r4, 0x5] b _080DAE58 .align 2, 0 -_080DAE40: .4byte gBattleAnimBankTarget +_080DAE40: .4byte gAnimBankTarget _080DAE44: - ldr r0, _080DAEFC @ =gBattleAnimBankTarget + ldr r0, _080DAEFC @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -1940,7 +1940,7 @@ _080DAEF2: pop {r0} bx r0 .align 2, 0 -_080DAEFC: .4byte gBattleAnimBankTarget +_080DAEFC: .4byte gAnimBankTarget _080DAF00: .4byte gSineTable _080DAF04: .4byte gOamMatrices _080DAF08: .4byte sub_80DAF0C @@ -2100,7 +2100,7 @@ _080DB024: ldrsh r0, [r4, r2] cmp r0, 0 bne _080DB03C - ldr r0, _080DB090 @ =gBattleAnimBankAttacker + ldr r0, _080DB090 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2111,7 +2111,7 @@ _080DB03C: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _080DB058 - ldr r0, _080DB094 @ =gBattleAnimBankTarget + ldr r0, _080DB094 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2149,8 +2149,8 @@ _080DB058: bx r0 .align 2, 0 _080DB08C: .4byte gBattleAnimArgs -_080DB090: .4byte gBattleAnimBankAttacker -_080DB094: .4byte gBattleAnimBankTarget +_080DB090: .4byte gAnimBankAttacker +_080DB094: .4byte gAnimBankTarget _080DB098: .4byte 0x00000ccc _080DB09C: .4byte sub_80DB0A0 thumb_func_end sub_80DB000 @@ -2188,7 +2188,7 @@ _080DB0CA: cmp r0, r1 bne _080DB0E2 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB0E2: pop {r4} pop {r0} @@ -2236,16 +2236,16 @@ sub_80DB0E8: @ 80DB0E8 strh r0, [r4, 0x6] ldr r0, _080DB18C @ =gBattleAnimSpriteTemplate_83DB538 mov r8, r0 - ldr r5, _080DB190 @ =gBattleAnimBankTarget + ldr r5, _080DB190 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -2274,7 +2274,7 @@ _080DB180: .4byte gTasks _080DB184: .4byte gAnimVisualTaskCount _080DB188: .4byte gBattleAnimArgs _080DB18C: .4byte gBattleAnimSpriteTemplate_83DB538 -_080DB190: .4byte gBattleAnimBankTarget +_080DB190: .4byte gAnimBankTarget thumb_func_end sub_80DB0E8 thumb_func_start sub_80DB194 @@ -2321,7 +2321,7 @@ _080DB1D8: cmp r0, 0 beq _080DB1EC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB1EC: pop {r4} pop {r0} @@ -2346,10 +2346,10 @@ _080DB20A: beq _080DB240 b _080DB27E _080DB210: - ldr r0, _080DB228 @ =gBattleAnimBankTarget + ldr r0, _080DB228 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -2358,7 +2358,7 @@ _080DB210: strh r0, [r4, 0x26] b _080DB238 .align 2, 0 -_080DB228: .4byte gBattleAnimBankTarget +_080DB228: .4byte gAnimBankTarget _080DB22C: ldrh r0, [r4, 0x26] adds r0, 0xA @@ -2400,7 +2400,7 @@ _080DB240: ands r0, r2 strb r0, [r1] adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB27E: pop {r4} pop {r0} @@ -2532,7 +2532,7 @@ _080DB360: cmp r0, 0 ble _080DB36E adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB36E: pop {r0} bx r0 @@ -2556,23 +2556,23 @@ _080DB388: ldrsh r0, [r0, r2] cmp r0, 0 bne _080DB3A0 - ldr r4, _080DB39C @ =gBattleAnimBankAttacker + ldr r4, _080DB39C @ =gAnimBankAttacker b _080DB3A2 .align 2, 0 _080DB398: .4byte gBattleAnimArgs -_080DB39C: .4byte gBattleAnimBankAttacker +_080DB39C: .4byte gAnimBankAttacker _080DB3A0: - ldr r4, _080DB3DC @ =gBattleAnimBankTarget + ldr r4, _080DB3DC @ =gAnimBankTarget _080DB3A2: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2591,7 +2591,7 @@ _080DB3A2: strh r0, [r5, 0x2E] b _080DB44C .align 2, 0 -_080DB3DC: .4byte gBattleAnimBankTarget +_080DB3DC: .4byte gAnimBankTarget _080DB3E0: movs r1, 0x32 ldrsh r0, [r5, r1] @@ -2645,7 +2645,7 @@ _080DB42C: adds r0, r5, 0 bl sub_8079098 adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB44C: add sp, 0x4 pop {r4,r5} @@ -2716,23 +2716,23 @@ _080DB4C0: ldrsh r0, [r2, r1] cmp r0, 0 bne _080DB4D4 - ldr r4, _080DB4D0 @ =gBattleAnimBankAttacker + ldr r4, _080DB4D0 @ =gAnimBankAttacker b _080DB4D6 .align 2, 0 _080DB4CC: .4byte gBattleAnimArgs -_080DB4D0: .4byte gBattleAnimBankAttacker +_080DB4D0: .4byte gAnimBankAttacker _080DB4D4: - ldr r4, _080DB500 @ =gBattleAnimBankTarget + ldr r4, _080DB500 @ =gAnimBankTarget _080DB4D6: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -2743,7 +2743,7 @@ _080DB4D6: pop {r0} bx r0 .align 2, 0 -_080DB500: .4byte gBattleAnimBankTarget +_080DB500: .4byte gAnimBankTarget _080DB504: .4byte sub_80DB508 thumb_func_end sub_80DB458 @@ -2793,7 +2793,7 @@ _080DB54A: cmp r0, 0x1F bne _080DB55E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB55E: pop {r4} pop {r0} @@ -2866,7 +2866,7 @@ _080DB58A: b _080DB5DE _080DB5D8: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DB5DE: pop {r0} bx r0 @@ -2882,17 +2882,17 @@ sub_80DB5E4: @ 80DB5E4 mov r8, r0 ldrh r4, [r0, 0x20] ldrh r5, [r0, 0x22] - ldr r6, _080DB698 @ =gBattleAnimBankAttacker + ldr r6, _080DB698 @ =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r1, r8 strh r0, [r1, 0x20] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -2958,7 +2958,7 @@ sub_80DB5E4: @ 80DB5E4 pop {r0} bx r0 .align 2, 0 -_080DB698: .4byte gBattleAnimBankAttacker +_080DB698: .4byte gAnimBankAttacker _080DB69C: .4byte sub_80DB6A0 thumb_func_end sub_80DB5E4 diff --git a/asm/ghost.s b/asm/ghost.s index 09458dec1..0db176d08 100755 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -18,10 +18,10 @@ sub_80DDB6C: @ 80DDB6C strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r5, _080DDBCC @ =gBattleAnimBankTarget + ldr r5, _080DDBCC @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -29,7 +29,7 @@ sub_80DDB6C: @ 80DDB6C strh r0, [r4, 0x34] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -52,7 +52,7 @@ sub_80DDB6C: @ 80DDB6C bx r0 .align 2, 0 _080DDBC8: .4byte gBattleAnimArgs -_080DDBCC: .4byte gBattleAnimBankTarget +_080DDBCC: .4byte gAnimBankTarget _080DDBD0: .4byte sub_80DDBD8 _080DDBD4: .4byte REG_BLDCNT thumb_func_end sub_80DDB6C @@ -334,7 +334,7 @@ _080DDDB6: cmp r0, 0x3D bne _080DDDE8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DDDE8: pop {r4} pop {r0} @@ -520,11 +520,11 @@ sub_80DDF40: @ 80DDF40 adds r4, r0, 0 ldrh r5, [r4, 0x20] ldrh r6, [r4, 0x22] - ldr r0, _080DDFDC @ =gBattleAnimBankAttacker + ldr r0, _080DDFDC @ =gAnimBankAttacker mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -533,7 +533,7 @@ sub_80DDF40: @ 80DDF40 mov r1, r8 ldrb r0, [r1] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -587,7 +587,7 @@ sub_80DDF40: @ 80DDF40 pop {r0} bx r0 .align 2, 0 -_080DDFDC: .4byte gBattleAnimBankAttacker +_080DDFDC: .4byte gAnimBankAttacker _080DDFE0: .4byte gBattleAnimArgs _080DDFE4: .4byte sub_80DDFE8 thumb_func_end sub_80DDF40 @@ -640,16 +640,16 @@ _080DE032: lsls r0, 16 cmp r0, 0 bgt _080DE0F6 - ldr r4, _080DE098 @ =gBattleAnimBankTarget + ldr r4, _080DE098 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x30] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -681,7 +681,7 @@ _080DE032: strh r0, [r5, 0x3C] b _080DE0E2 .align 2, 0 -_080DE098: .4byte gBattleAnimBankTarget +_080DE098: .4byte gAnimBankTarget _080DE09C: ldrh r0, [r5, 0x3A] ldrh r1, [r5, 0x36] @@ -703,16 +703,16 @@ _080DE09C: lsls r0, 16 cmp r0, 0 bgt _080DE0F6 - ldr r4, _080DE0EC @ =gBattleAnimBankTarget + ldr r4, _080DE0EC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -722,7 +722,7 @@ _080DE0E2: strh r0, [r5, 0x2E] b _080DE0F6 .align 2, 0 -_080DE0EC: .4byte gBattleAnimBankTarget +_080DE0EC: .4byte gAnimBankTarget _080DE0F0: adds r0, r5, 0 bl move_anim_8074EE0 @@ -824,7 +824,7 @@ _080DE198: cmp r6, 0 beq _080DE1A4 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite b _080DE1AA _080DE1A4: ldrh r0, [r3, 0x30] @@ -886,7 +886,7 @@ _080DE1E0: adds r0, r4 movs r1, 0x50 strh r1, [r0, 0x2E] - ldr r0, _080DE250 @ =gBattleAnimBankTarget + ldr r0, _080DE250 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -912,7 +912,7 @@ _080DE1E0: _080DE244: .4byte REG_BLDCNT _080DE248: .4byte REG_BLDALPHA _080DE24C: .4byte gSprites -_080DE250: .4byte gBattleAnimBankTarget +_080DE250: .4byte gAnimBankTarget _080DE254: .4byte 0x0000ff70 _080DE258: movs r2, 0x8 @@ -1125,7 +1125,7 @@ sub_80DE3D4: @ 80DE3D4 lsls r0, 3 ldr r1, _080DE40C @ =gTasks adds r5, r0, r1 - ldr r0, _080DE410 @ =gBattleAnimBankTarget + ldr r0, _080DE410 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -1143,7 +1143,7 @@ _080DE400: mov pc, r0 .align 2, 0 _080DE40C: .4byte gTasks -_080DE410: .4byte gBattleAnimBankTarget +_080DE410: .4byte gAnimBankTarget _080DE414: .4byte _080DE418 .align 2, 0 _080DE418: @@ -1485,7 +1485,7 @@ sub_80DE6B0: @ 80DE6B0 lsls r0, 3 ldr r1, _080DE6E0 @ =gTasks adds r4, r0, r1 - ldr r0, _080DE6E4 @ =gBattleAnimBankTarget + ldr r0, _080DE6E4 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -1501,7 +1501,7 @@ sub_80DE6B0: @ 80DE6B0 b _080DE7AA .align 2, 0 _080DE6E0: .4byte gTasks -_080DE6E4: .4byte gBattleAnimBankTarget +_080DE6E4: .4byte gAnimBankTarget _080DE6E8: cmp r0, 0x2 beq _080DE740 @@ -1617,54 +1617,54 @@ sub_80DE7B8: @ 80DE7B8 ldrsh r0, [r0, r1] cmp r0, 0 bne _080DE800 - ldr r4, _080DE7F8 @ =gBattleAnimBankAttacker + ldr r4, _080DE7F8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r2, 0xE0 lsls r2, 13 adds r0, r2 lsrs r5, r0, 16 - ldr r4, _080DE7FC @ =gBattleAnimBankTarget + ldr r4, _080DE7FC @ =gAnimBankTarget b _080DE824 .align 2, 0 _080DE7F4: .4byte gBattleAnimArgs -_080DE7F8: .4byte gBattleAnimBankAttacker -_080DE7FC: .4byte gBattleAnimBankTarget +_080DE7F8: .4byte gAnimBankAttacker +_080DE7FC: .4byte gAnimBankTarget _080DE800: - ldr r4, _080DE8C8 @ =gBattleAnimBankTarget + ldr r4, _080DE8C8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r2, 0xE0 lsls r2, 13 adds r0, r2 lsrs r5, r0, 16 - ldr r4, _080DE8CC @ =gBattleAnimBankAttacker + ldr r4, _080DE8CC @ =gAnimBankAttacker _080DE824: ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r10, r0 ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r1, 0xE0 @@ -1734,8 +1734,8 @@ _080DE824: pop {r0} bx r0 .align 2, 0 -_080DE8C8: .4byte gBattleAnimBankTarget -_080DE8CC: .4byte gBattleAnimBankAttacker +_080DE8C8: .4byte gAnimBankTarget +_080DE8CC: .4byte gAnimBankAttacker _080DE8D0: .4byte gBattleAnimArgs _080DE8D4: .4byte sub_80DE8D8 thumb_func_end sub_80DE7B8 @@ -1813,10 +1813,10 @@ sub_80DE918: @ 80DE918 ldr r2, _080DEA70 @ =gBattleAnimArgs ldrh r0, [r2] strh r0, [r1, 0x1C] - ldr r4, _080DEA74 @ =gBattleAnimBankAttacker + ldr r4, _080DEA74 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] @@ -1826,7 +1826,7 @@ sub_80DE918: @ 80DE918 lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DE988 @@ -1836,7 +1836,7 @@ _080DE988: _080DE98A: lsls r1, r4, 16 asrs r3, r1, 16 - ldr r0, _080DEA74 @ =gBattleAnimBankAttacker + ldr r0, _080DEA74 @ =gAnimBankAttacker ldrb r2, [r0] str r1, [sp, 0x10] cmp r3, r2 @@ -1868,7 +1868,7 @@ _080DE98A: beq _080DEA56 adds r0, r4, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -1944,7 +1944,7 @@ _080DEA56: _080DEA68: .4byte gTasks _080DEA6C: .4byte REG_BLDCNT _080DEA70: .4byte gBattleAnimArgs -_080DEA74: .4byte gBattleAnimBankAttacker +_080DEA74: .4byte gAnimBankAttacker _080DEA78: .4byte gSpriteTemplate_83DAF08 _080DEA7C: .4byte gSprites _080DEA80: .4byte gSprites + 0x1C @@ -2240,10 +2240,10 @@ sub_80DECB0: @ 80DECB0 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080DECF8 @ =gUnknown_030042C4 + ldr r0, _080DECF8 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080DECFC @ =gUnknown_03004240 + ldr r0, _080DECFC @ =gBattle_WIN0V strh r1, [r0] ldr r1, _080DED00 @ =REG_WININ ldr r2, _080DED04 @ =0x00003f3f @@ -2259,13 +2259,13 @@ sub_80DECB0: @ 80DECB0 adds r1, 0x4 movs r0, 0x10 strh r0, [r1] - ldr r0, _080DED08 @ =gBattleAnimBankAttacker + ldr r0, _080DED08 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DECF4 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DED0C @@ -2273,21 +2273,21 @@ _080DECF4: movs r6, 0x28 b _080DED0E .align 2, 0 -_080DECF8: .4byte gUnknown_030042C4 -_080DECFC: .4byte gUnknown_03004240 +_080DECF8: .4byte gBattle_WIN0H +_080DECFC: .4byte gBattle_WIN0V _080DED00: .4byte REG_WININ _080DED04: .4byte 0x00003f3f -_080DED08: .4byte gBattleAnimBankAttacker +_080DED08: .4byte gAnimBankAttacker _080DED0C: movs r6, 0xC8 _080DED0E: - ldr r1, _080DED4C @ =gUnknown_030042C4 + ldr r1, _080DED4C @ =gBattle_WIN0H lsls r3, r6, 16 asrs r2, r3, 16 lsls r0, r2, 8 orrs r0, r2 strh r0, [r1] - ldr r1, _080DED50 @ =gUnknown_03004240 + ldr r1, _080DED50 @ =gBattle_WIN0V movs r5, 0x28 ldr r0, _080DED54 @ =0x00002828 strh r0, [r1] @@ -2312,8 +2312,8 @@ _080DED0E: pop {r0} bx r0 .align 2, 0 -_080DED4C: .4byte gUnknown_030042C4 -_080DED50: .4byte gUnknown_03004240 +_080DED4C: .4byte gBattle_WIN0H +_080DED50: .4byte gBattle_WIN0V _080DED54: .4byte 0x00002828 _080DED58: .4byte gTasks _080DED5C: .4byte sub_80DED60 @@ -2470,12 +2470,12 @@ _080DEE8C: ldr r0, _080DEEDC @ =sub_80DEEE8 str r0, [r4] _080DEEBA: - ldr r1, _080DEEE0 @ =gUnknown_030042C4 + ldr r1, _080DEEE0 @ =gBattle_WIN0H mov r2, r9 lsls r0, r2, 8 orrs r7, r0 strh r7, [r1] - ldr r1, _080DEEE4 @ =gUnknown_03004240 + ldr r1, _080DEEE4 @ =gBattle_WIN0V lsls r0, r6, 8 orrs r5, r0 strh r5, [r1] @@ -2489,8 +2489,8 @@ _080DEEBA: bx r0 .align 2, 0 _080DEEDC: .4byte sub_80DEEE8 -_080DEEE0: .4byte gUnknown_030042C4 -_080DEEE4: .4byte gUnknown_03004240 +_080DEEE0: .4byte gBattle_WIN0H +_080DEEE4: .4byte gBattle_WIN0V thumb_func_end sub_80DED60 thumb_func_start sub_80DEEE8 @@ -2506,9 +2506,9 @@ sub_80DEEE8: @ 80DEEE8 lsrs r2, r0, 24 cmp r2, 0 bne _080DEF20 - ldr r0, _080DEF2C @ =gUnknown_030042C4 + ldr r0, _080DEF2C @ =gBattle_WIN0H strh r2, [r0] - ldr r0, _080DEF30 @ =gUnknown_03004240 + ldr r0, _080DEF30 @ =gBattle_WIN0V strh r2, [r0] ldr r0, _080DEF34 @ =REG_WININ ldr r4, _080DEF38 @ =0x00003f3f @@ -2528,8 +2528,8 @@ _080DEF20: bx r0 .align 2, 0 _080DEF28: .4byte gPaletteFade -_080DEF2C: .4byte gUnknown_030042C4 -_080DEF30: .4byte gUnknown_03004240 +_080DEF2C: .4byte gBattle_WIN0H +_080DEF30: .4byte gBattle_WIN0V _080DEF34: .4byte REG_WININ _080DEF38: .4byte 0x00003f3f thumb_func_end sub_80DEEE8 @@ -2540,7 +2540,7 @@ sub_80DEF3C: @ 80DEF3C adds r4, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080DEF68 @ =gBattleAnimBankAttacker + ldr r0, _080DEF68 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2557,7 +2557,7 @@ sub_80DEF3C: @ 80DEF3C strb r1, [r4, 0x3] b _080DEF74 .align 2, 0 -_080DEF68: .4byte gBattleAnimBankAttacker +_080DEF68: .4byte gAnimBankAttacker _080DEF6C: .4byte 0x0000fffe _080DEF70: ldr r2, _080DEF90 @ =0x0000ffe8 @@ -2722,17 +2722,17 @@ sub_80DF090: @ 80DF090 strh r2, [r1] adds r1, 0x2 strh r2, [r1] - ldr r1, _080DF0B0 @ =gUnknown_030042C4 + ldr r1, _080DF0B0 @ =gBattle_WIN0H strh r2, [r1] - ldr r1, _080DF0B4 @ =gUnknown_03004240 + ldr r1, _080DF0B4 @ =gBattle_WIN0V strh r2, [r1] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 _080DF0AC: .4byte REG_BLDCNT -_080DF0B0: .4byte gUnknown_030042C4 -_080DF0B4: .4byte gUnknown_03004240 +_080DF0B0: .4byte gBattle_WIN0H +_080DF0B4: .4byte gBattle_WIN0V thumb_func_end sub_80DF090 thumb_func_start sub_80DF0B8 @@ -2744,7 +2744,7 @@ sub_80DF0B8: @ 80DF0B8 movs r1, 0xC bl Sin strh r0, [r4, 0x24] - ldr r0, _080DF120 @ =gBattleAnimBankAttacker + ldr r0, _080DF120 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2788,7 +2788,7 @@ _080DF0DC: strh r0, [r1] b _080DF17E .align 2, 0 -_080DF120: .4byte gBattleAnimBankAttacker +_080DF120: .4byte gAnimBankAttacker _080DF124: .4byte 0x0000050b _080DF128: .4byte REG_BLDCNT _080DF12C: @@ -2852,7 +2852,7 @@ sub_80DF18C: @ 80DF18C strh r2, [r1] adds r1, 0x2 strh r2, [r1] - bl move_anim_8072740 + bl DestroyAnimSprite pop {r0} bx r0 .align 2, 0 @@ -2877,10 +2877,10 @@ sub_80DF1A4: @ 80DF1A4 mov r8, r0 mov r2, r8 strh r2, [r4, 0xA] - ldr r5, _080DF240 @ =gBattleAnimBankAttacker + ldr r5, _080DF240 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1A] @@ -2934,7 +2934,7 @@ sub_80DF1A4: @ 80DF1A4 bx r0 .align 2, 0 _080DF23C: .4byte gTasks -_080DF240: .4byte gBattleAnimBankAttacker +_080DF240: .4byte gAnimBankAttacker _080DF244: .4byte REG_BLDCNT _080DF248: .4byte sub_80DF24C thumb_func_end sub_80DF1A4 @@ -2991,7 +2991,7 @@ _080DF292: lsls r0, 2 adds r5, r0, r1 strh r7, [r5, 0x2E] - ldr r0, _080DF2FC @ =gBattleAnimBankAttacker + ldr r0, _080DF2FC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide movs r1, 0 @@ -3025,7 +3025,7 @@ _080DF2E6: .align 2, 0 _080DF2F4: .4byte gSpriteTemplate_83DAF80 _080DF2F8: .4byte gSprites -_080DF2FC: .4byte gBattleAnimBankAttacker +_080DF2FC: .4byte gAnimBankAttacker _080DF300: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -3258,7 +3258,7 @@ sub_80DF49C: @ 80DF49C orrs r1, r2 strb r1, [r3] ldr r2, _080DF4E0 @ =gObjectBankIDs - ldr r1, _080DF4E4 @ =gBattleAnimBankAttacker + ldr r1, _080DF4E4 @ =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 ldrb r1, [r1] @@ -3287,7 +3287,7 @@ sub_80DF49C: @ 80DF49C bx lr .align 2, 0 _080DF4E0: .4byte gObjectBankIDs -_080DF4E4: .4byte gBattleAnimBankAttacker +_080DF4E4: .4byte gAnimBankAttacker _080DF4E8: .4byte gBattleAnimArgs _080DF4EC: .4byte sub_80DF4F4 _080DF4F0: .4byte gSprites diff --git a/asm/ground.s b/asm/ground.s index 7a401e9e8..fd4cecbfd 100755 --- a/asm/ground.s +++ b/asm/ground.s @@ -11,31 +11,31 @@ sub_80E0F1C: @ 80E0F1C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080E0F74 @ =gBattleAnimBankAttacker + ldr r5, _080E0F74 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] movs r0, 0x14 strh r0, [r4, 0x2E] - ldr r5, _080E0F78 @ =gBattleAnimBankTarget + ldr r5, _080E0F78 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -49,8 +49,8 @@ sub_80E0F1C: @ 80E0F1C pop {r0} bx r0 .align 2, 0 -_080E0F74: .4byte gBattleAnimBankAttacker -_080E0F78: .4byte gBattleAnimBankTarget +_080E0F74: .4byte gAnimBankAttacker +_080E0F78: .4byte gAnimBankTarget _080E0F7C: .4byte 0x0000ffd8 _080E0F80: .4byte sub_80E0F84 thumb_func_end sub_80E0F1C @@ -76,16 +76,16 @@ sub_80E0F84: @ 80E0F84 strh r1, [r5, 0x24] movs r0, 0x14 strh r0, [r5, 0x2E] - ldr r4, _080E0FE0 @ =gBattleAnimBankAttacker + ldr r4, _080E0FE0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -100,7 +100,7 @@ _080E0FD8: pop {r0} bx r0 .align 2, 0 -_080E0FE0: .4byte gBattleAnimBankAttacker +_080E0FE0: .4byte gAnimBankAttacker _080E0FE4: .4byte sub_80E0FE8 thumb_func_end sub_80E0F84 @@ -113,7 +113,7 @@ sub_80E0FE8: @ 80E0FE8 cmp r0, 0 beq _080E0FFC adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E0FFC: pop {r4} pop {r0} @@ -126,7 +126,7 @@ sub_80E1004: @ 80E1004 adds r6, r0, 0 movs r1, 0x1 bl sub_8078764 - ldr r0, _080E1064 @ =gBattleAnimBankAttacker + ldr r0, _080E1064 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -140,10 +140,10 @@ _080E1024: ldr r4, _080E1068 @ =gBattleAnimArgs ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, _080E106C @ =gBattleAnimBankTarget + ldr r5, _080E106C @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -151,7 +151,7 @@ _080E1024: strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x6] @@ -159,18 +159,18 @@ _080E1024: strh r0, [r6, 0x36] ldr r0, _080E1070 @ =sub_8078B34 str r0, [r6, 0x1C] - ldr r1, _080E1074 @ =move_anim_8072740 + ldr r1, _080E1074 @ =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080E1064: .4byte gBattleAnimBankAttacker +_080E1064: .4byte gAnimBankAttacker _080E1068: .4byte gBattleAnimArgs -_080E106C: .4byte gBattleAnimBankTarget +_080E106C: .4byte gAnimBankTarget _080E1070: .4byte sub_8078B34 -_080E1074: .4byte move_anim_8072740 +_080E1074: .4byte DestroyAnimSprite thumb_func_end sub_80E1004 thumb_func_start sub_80E1078 @@ -181,7 +181,7 @@ sub_80E1078: @ 80E1078 adds r6, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r4, _080E10F8 @ =gBattleAnimBankTarget + ldr r4, _080E10F8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 bl sub_8077EE4 @@ -235,7 +235,7 @@ _080E10D0: pop {r0} bx r0 .align 2, 0 -_080E10F8: .4byte gBattleAnimBankTarget +_080E10F8: .4byte gAnimBankTarget _080E10FC: .4byte gBattleAnimArgs _080E1100: .4byte sub_8078B34 _080E1104: .4byte move_anim_8074EE0 @@ -261,10 +261,10 @@ sub_80E1108: @ 80E1108 ldrsh r0, [r6, r1] cmp r0, 0 bne _080E117C - ldr r4, _080E1174 @ =gBattleAnimBankAttacker + ldr r4, _080E1174 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r2, [r6, 0x2] @@ -272,7 +272,7 @@ sub_80E1108: @ 80E1108 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r3, [r6, 0x4] @@ -294,7 +294,7 @@ _080E1162: _080E1168: .4byte 0x000003ff _080E116C: .4byte 0xfffffc00 _080E1170: .4byte gBattleAnimArgs -_080E1174: .4byte gBattleAnimBankAttacker +_080E1174: .4byte gAnimBankAttacker _080E1178: .4byte sub_80E1198 _080E117C: ldrh r0, [r6, 0x2] @@ -341,7 +341,7 @@ _080E11B6: cmp r0, r1 bge _080E11CE adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E11CE: pop {r0} bx r0 @@ -402,7 +402,7 @@ _080E11FC: cmp r0, 0xA bne _080E123E adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E123E: pop {r0} bx r0 @@ -479,7 +479,7 @@ _080E12C4: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r0, _080E12EC @ =gBattleAnimBankAttacker + ldr r0, _080E12EC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -487,24 +487,24 @@ _080E12C4: strh r0, [r4, 0x1E] cmp r0, 0x1 bne _080E12F8 - ldr r0, _080E12F0 @ =gUnknown_030042C0 + ldr r0, _080E12F0 @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _080E12F4 @ =gUnknown_030041B4 + ldr r0, _080E12F4 @ =gBattle_BG1_Y b _080E1300 .align 2, 0 -_080E12EC: .4byte gBattleAnimBankAttacker -_080E12F0: .4byte gUnknown_030042C0 -_080E12F4: .4byte gUnknown_030041B4 +_080E12EC: .4byte gAnimBankAttacker +_080E12F0: .4byte gBattle_BG1_X +_080E12F4: .4byte gBattle_BG1_Y _080E12F8: - ldr r0, _080E133C @ =gUnknown_03004288 + ldr r0, _080E133C @ =gBattle_BG2_X ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _080E1340 @ =gUnknown_03004280 + ldr r0, _080E1340 @ =gBattle_BG2_Y _080E1300: ldrh r0, [r0] strh r0, [r4, 0x22] - ldr r0, _080E1344 @ =gBattleAnimBankAttacker + ldr r0, _080E1344 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8077FC0 lsls r0, 24 @@ -533,9 +533,9 @@ _080E1322: strb r1, [r0] b _080E1406 .align 2, 0 -_080E133C: .4byte gUnknown_03004288 -_080E1340: .4byte gUnknown_03004280 -_080E1344: .4byte gBattleAnimBankAttacker +_080E133C: .4byte gBattle_BG2_X +_080E1340: .4byte gBattle_BG2_Y +_080E1344: .4byte gAnimBankAttacker _080E1348: .4byte gSprites _080E134C: ldrb r0, [r4, 0x1E] @@ -579,13 +579,13 @@ _080E137E: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _080E13A8 - ldr r1, _080E13A4 @ =gUnknown_030041B4 + ldr r1, _080E13A4 @ =gBattle_BG1_Y b _080E13AA .align 2, 0 _080E13A0: .4byte gSineTable -_080E13A4: .4byte gUnknown_030041B4 +_080E13A4: .4byte gBattle_BG1_Y _080E13A8: - ldr r1, _080E13CC @ =gUnknown_03004280 + ldr r1, _080E13CC @ =gBattle_BG2_Y _080E13AA: ldrh r0, [r4, 0x22] subs r0, r2 @@ -602,13 +602,13 @@ _080E13AA: ldrsh r0, [r4, r3] cmp r0, 0x1 bne _080E13D4 - ldr r1, _080E13D0 @ =gUnknown_030041B4 + ldr r1, _080E13D0 @ =gBattle_BG1_Y b _080E13D6 .align 2, 0 -_080E13CC: .4byte gUnknown_03004280 -_080E13D0: .4byte gUnknown_030041B4 +_080E13CC: .4byte gBattle_BG2_Y +_080E13D0: .4byte gBattle_BG1_Y _080E13D4: - ldr r1, _080E13F8 @ =gUnknown_03004280 + ldr r1, _080E13F8 @ =gBattle_BG2_Y _080E13D6: ldrh r0, [r4, 0x22] subs r0, r2 @@ -628,7 +628,7 @@ _080E13D6: strh r0, [r1, 0x24] b _080E1406 .align 2, 0 -_080E13F8: .4byte gUnknown_03004280 +_080E13F8: .4byte gBattle_BG2_Y _080E13FC: .4byte gSprites _080E1400: ldr r1, _080E1410 @ =gUnknown_03004DC0 @@ -687,21 +687,21 @@ sub_80E143C: @ 80E143C movs r4, 0 strh r4, [r1, 0x24] strh r4, [r1, 0x26] - ldr r0, _080E1480 @ =gBattleAnimBankAttacker + ldr r0, _080E1480 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E1488 - ldr r0, _080E1484 @ =gUnknown_030041B4 + ldr r0, _080E1484 @ =gBattle_BG1_Y b _080E148A .align 2, 0 _080E147C: .4byte gSprites -_080E1480: .4byte gBattleAnimBankAttacker -_080E1484: .4byte gUnknown_030041B4 +_080E1480: .4byte gAnimBankAttacker +_080E1484: .4byte gBattle_BG1_Y _080E1488: - ldr r0, _080E1498 @ =gUnknown_03004280 + ldr r0, _080E1498 @ =gBattle_BG2_Y _080E148A: strh r4, [r0] adds r0, r5, 0 @@ -710,7 +710,7 @@ _080E148A: pop {r0} bx r0 .align 2, 0 -_080E1498: .4byte gUnknown_03004280 +_080E1498: .4byte gBattle_BG2_Y thumb_func_end sub_80E143C thumb_func_start sub_80E149C @@ -852,7 +852,7 @@ _080E15A0: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r0, _080E15C4 @ =gBattleAnimBankAttacker + ldr r0, _080E15C4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 @@ -860,17 +860,17 @@ _080E15A0: strh r0, [r4, 0x1E] cmp r0, 0x1 bne _080E15CC - ldr r0, _080E15C8 @ =gUnknown_030042C0 + ldr r0, _080E15C8 @ =gBattle_BG1_X b _080E15CE .align 2, 0 -_080E15C4: .4byte gBattleAnimBankAttacker -_080E15C8: .4byte gUnknown_030042C0 +_080E15C4: .4byte gAnimBankAttacker +_080E15C8: .4byte gBattle_BG1_X _080E15CC: - ldr r0, _080E15EC @ =gUnknown_03004288 + ldr r0, _080E15EC @ =gBattle_BG2_X _080E15CE: ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _080E15F0 @ =gBattleAnimBankAttacker + ldr r0, _080E15F0 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8077FC0 lsls r0, 24 @@ -882,8 +882,8 @@ _080E15CE: strh r0, [r4, 0x26] b _080E164A .align 2, 0 -_080E15EC: .4byte gUnknown_03004288 -_080E15F0: .4byte gBattleAnimBankAttacker +_080E15EC: .4byte gBattle_BG2_X +_080E15F0: .4byte gAnimBankAttacker _080E15F4: ldrb r0, [r4, 0x1E] movs r1, 0x26 @@ -957,15 +957,15 @@ sub_80E1668: @ 80E1668 lsrs r4, r2, 16 cmp r0, 0x1 bne _080E168C - ldr r0, _080E1684 @ =gUnknown_030042C0 + ldr r0, _080E1684 @ =gBattle_BG1_X ldrh r3, [r0] ldr r0, _080E1688 @ =REG_BG1HOFS b _080E1692 .align 2, 0 -_080E1684: .4byte gUnknown_030042C0 +_080E1684: .4byte gBattle_BG1_X _080E1688: .4byte REG_BG1HOFS _080E168C: - ldr r0, _080E1718 @ =gUnknown_03004288 + ldr r0, _080E1718 @ =gBattle_BG2_X ldrh r3, [r0] ldr r0, _080E171C @ =REG_BG2HOFS _080E1692: @@ -1041,7 +1041,7 @@ _080E16F6: pop {r0} bx r0 .align 2, 0 -_080E1718: .4byte gUnknown_03004288 +_080E1718: .4byte gBattle_BG2_X _080E171C: .4byte REG_BG2HOFS _080E1720: .4byte gUnknown_03004DE0 _080E1724: .4byte 0xa2600001 @@ -1057,13 +1057,13 @@ sub_80E1728: @ 80E1728 adds r7, r0, 0 cmp r1, 0 bne _080E1744 - ldr r0, _080E1740 @ =gBattleAnimBankAttacker + ldr r0, _080E1740 @ =gAnimBankAttacker b _080E1746 .align 2, 0 _080E173C: .4byte gBattleAnimArgs -_080E1740: .4byte gBattleAnimBankAttacker +_080E1740: .4byte gAnimBankAttacker _080E1744: - ldr r0, _080E17A8 @ =gBattleAnimBankTarget + ldr r0, _080E17A8 @ =gAnimBankTarget _080E1746: ldrb r4, [r0] movs r6, 0x18 @@ -1082,7 +1082,7 @@ _080E1746: _080E1762: adds r0, r4, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, r6 @@ -1112,7 +1112,7 @@ _080E1762: pop {r0} bx r0 .align 2, 0 -_080E17A8: .4byte gBattleAnimBankTarget +_080E17A8: .4byte gAnimBankTarget _080E17AC: .4byte sub_80E17B0 thumb_func_end sub_80E1728 @@ -1125,7 +1125,7 @@ sub_80E17B0: @ 80E17B0 cmp r0, 0 beq _080E17C4 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E17C4: pop {r4} pop {r0} @@ -1141,18 +1141,18 @@ sub_80E17CC: @ 80E17CC ldrsh r0, [r0, r1] cmp r0, 0 bne _080E17E8 - ldr r0, _080E17E4 @ =gBattleAnimBankAttacker + ldr r0, _080E17E4 @ =gAnimBankAttacker b _080E17EA .align 2, 0 _080E17E0: .4byte gBattleAnimArgs -_080E17E4: .4byte gBattleAnimBankAttacker +_080E17E4: .4byte gAnimBankAttacker _080E17E8: - ldr r0, _080E1848 @ =gBattleAnimBankTarget + ldr r0, _080E1848 @ =gAnimBankTarget _080E17EA: ldrb r5, [r0] adds r0, r5, 0 movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldr r2, _080E184C @ =0x0000fff0 @@ -1183,7 +1183,7 @@ _080E17EA: ands r0, r2 orrs r0, r1 strh r0, [r6, 0x4] - ldr r1, _080E185C @ =move_anim_8072740 + ldr r1, _080E185C @ =DestroyAnimSprite adds r0, r6, 0 bl StoreSpriteCallbackInData ldrh r0, [r4, 0x4] @@ -1194,12 +1194,12 @@ _080E17EA: pop {r0} bx r0 .align 2, 0 -_080E1848: .4byte gBattleAnimBankTarget +_080E1848: .4byte gAnimBankTarget _080E184C: .4byte 0x0000fff0 _080E1850: .4byte gBattleAnimArgs _080E1854: .4byte 0x000003ff _080E1858: .4byte 0xfffffc00 -_080E185C: .4byte move_anim_8072740 +_080E185C: .4byte DestroyAnimSprite _080E1860: .4byte sub_80782D8 thumb_func_end sub_80E17CC @@ -1226,7 +1226,7 @@ sub_80E1864: @ 80E1864 _080E1888: .4byte gTasks _080E188C: .4byte gBattleAnimArgs _080E1890: - ldr r0, _080E18BC @ =gMovePowerMoveAnim + ldr r0, _080E18BC @ =gAnimMovePower ldrh r0, [r0] movs r1, 0xA bl __udivsi3 @@ -1249,7 +1249,7 @@ _080E189C: ldr r0, _080E18C4 @ =sub_80E1934 b _080E1926 .align 2, 0 -_080E18BC: .4byte gMovePowerMoveAnim +_080E18BC: .4byte gAnimMovePower _080E18C0: .4byte gUnknown_030041B0 _080E18C4: .4byte sub_80E1934 _080E18C8: @@ -1643,7 +1643,7 @@ sub_80E1B88: @ 80E1B88 lsrs r1, r0, 24 ldr r3, _080E1BA8 @ =gBattleAnimArgs movs r2, 0 - ldr r0, _080E1BAC @ =gMovePowerMoveAnim + ldr r0, _080E1BAC @ =gAnimMovePower ldrh r0, [r0] cmp r0, 0x63 bls _080E1B9C @@ -1656,7 +1656,7 @@ _080E1B9C: bx r0 .align 2, 0 _080E1BA8: .4byte gBattleAnimArgs -_080E1BAC: .4byte gMovePowerMoveAnim +_080E1BAC: .4byte gAnimMovePower thumb_func_end sub_80E1B88 thumb_func_start sub_80E1BB0 @@ -1671,13 +1671,13 @@ sub_80E1BB0: @ 80E1BB0 adds r6, r2, 0 cmp r0, 0 beq _080E1BD0 - ldr r0, _080E1BCC @ =gBattleAnimBankTarget + ldr r0, _080E1BCC @ =gAnimBankTarget b _080E1BD2 .align 2, 0 _080E1BC8: .4byte gBattleAnimArgs -_080E1BCC: .4byte gBattleAnimBankTarget +_080E1BCC: .4byte gAnimBankTarget _080E1BD0: - ldr r0, _080E1C40 @ =gBattleAnimBankAttacker + ldr r0, _080E1C40 @ =gAnimBankAttacker _080E1BD2: ldrb r0, [r0] adds r5, r0, 0 @@ -1700,7 +1700,7 @@ _080E1BE2: adds r4, r0 adds r0, r5, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r1, 0x20 @@ -1711,7 +1711,7 @@ _080E1BE2: strh r1, [r4, 0xA] adds r0, r5, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r1, 0x40 @@ -1732,7 +1732,7 @@ _080E1BE2: pop {r0} bx r0 .align 2, 0 -_080E1C40: .4byte gBattleAnimBankAttacker +_080E1C40: .4byte gAnimBankAttacker _080E1C44: .4byte sub_80E1C58 _080E1C48: .4byte gTasks _080E1C4C: .4byte 0x000001ff @@ -62,29 +62,29 @@ sub_80D7704: @ 80D7704 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r4, _080D7814 @ =gBattleAnimBankTarget + ldr r4, _080D7814 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r9, r0 ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _080D7818 @ =gBattleAnimBankAttacker + ldr r4, _080D7818 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r3, r0, 24 ldrb r0, [r4] movs r1, 0x3 str r3, [sp] - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 ldr r1, _080D781C @ =gBattleAnimArgs @@ -176,8 +176,8 @@ _080D77DE: .align 2, 0 _080D780C: .4byte 0x000003ff _080D7810: .4byte 0xfffffc00 -_080D7814: .4byte gBattleAnimBankTarget -_080D7818: .4byte gBattleAnimBankAttacker +_080D7814: .4byte gAnimBankTarget +_080D7818: .4byte gAnimBankAttacker _080D781C: .4byte gBattleAnimArgs _080D7820: lsls r1, r3, 16 @@ -281,7 +281,7 @@ sub_80D7888: @ 80D7888 b _080D78E6 _080D78E0: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D78E6: pop {r4} pop {r0} @@ -304,7 +304,7 @@ sub_80D78EC: @ 80D78EC movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, _080D7924 @ =move_anim_8072740 + ldr r1, _080D7924 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r1, _080D7928 @ =sub_8078174 @@ -316,7 +316,7 @@ sub_80D78EC: @ 80D78EC bx r0 .align 2, 0 _080D7920: .4byte gBattleAnimArgs -_080D7924: .4byte move_anim_8072740 +_080D7924: .4byte DestroyAnimSprite _080D7928: .4byte sub_8078174 thumb_func_end sub_80D78EC @@ -326,14 +326,14 @@ sub_80D792C: @ 80D792C adds r4, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080D7960 @ =gBattleAnimBankTarget + ldr r0, _080D7960 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] - ldr r0, _080D7964 @ =gBattleAnimBankAttacker + ldr r0, _080D7964 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -346,8 +346,8 @@ sub_80D792C: @ 80D792C strh r1, [r4, 0x32] b _080D7976 .align 2, 0 -_080D7960: .4byte gBattleAnimBankTarget -_080D7964: .4byte gBattleAnimBankAttacker +_080D7960: .4byte gAnimBankTarget +_080D7964: .4byte gAnimBankAttacker _080D7968: .4byte gBattleAnimArgs _080D796C: ldr r0, _080D79A4 @ =gBattleAnimArgs @@ -356,10 +356,10 @@ _080D796C: adds r0, r1 strh r0, [r4, 0x32] _080D7976: - ldr r0, _080D79A8 @ =gBattleAnimBankTarget + ldr r0, _080D79A8 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r1, _080D79A4 @ =gBattleAnimArgs lsrs r0, 24 @@ -368,7 +368,7 @@ _080D7976: strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, _080D79AC @ =move_anim_8072740 + ldr r1, _080D79AC @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r0, _080D79B0 @ =sub_8078B34 @@ -378,8 +378,8 @@ _080D7976: bx r0 .align 2, 0 _080D79A4: .4byte gBattleAnimArgs -_080D79A8: .4byte gBattleAnimBankTarget -_080D79AC: .4byte move_anim_8072740 +_080D79A8: .4byte gAnimBankTarget +_080D79AC: .4byte DestroyAnimSprite _080D79B0: .4byte sub_8078B34 thumb_func_end sub_80D792C @@ -399,7 +399,7 @@ sub_80D79B4: @ 80D79B4 .align 2, 0 _080D79CC: .4byte gBattleAnimArgs _080D79D0: - ldr r0, _080D7A18 @ =gBattleAnimBankTarget + ldr r0, _080D7A18 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -407,7 +407,7 @@ _080D79D0: adds r3, 0x22 movs r1, 0x1 bl sub_807A3FC - ldr r0, _080D7A1C @ =gBattleAnimBankAttacker + ldr r0, _080D7A1C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -435,8 +435,8 @@ _080D7A06: pop {r0} bx r0 .align 2, 0 -_080D7A18: .4byte gBattleAnimBankTarget -_080D7A1C: .4byte gBattleAnimBankAttacker +_080D7A18: .4byte gAnimBankTarget +_080D7A1C: .4byte gAnimBankAttacker _080D7A20: .4byte sub_80D7A28 _080D7A24: .4byte sub_80785E4 thumb_func_end sub_80D79B4 @@ -492,16 +492,16 @@ sub_80D7A64: @ 80D7A64 ldrsh r0, [r6, r1] cmp r0, 0 bne _080D7AB4 - ldr r4, _080D7AB0 @ =gBattleAnimBankTarget + ldr r4, _080D7AB0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x6] @@ -510,9 +510,9 @@ sub_80D7A64: @ 80D7A64 b _080D7AC6 .align 2, 0 _080D7AAC: .4byte gBattleAnimArgs -_080D7AB0: .4byte gBattleAnimBankTarget +_080D7AB0: .4byte gAnimBankTarget _080D7AB4: - ldr r0, _080D7AE0 @ =gBattleAnimBankTarget + ldr r0, _080D7AE0 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -521,7 +521,7 @@ _080D7AB4: movs r1, 0x1 bl sub_807A3FC _080D7AC6: - ldr r0, _080D7AE4 @ =gBattleAnimBankAttacker + ldr r0, _080D7AE4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -534,8 +534,8 @@ _080D7AC6: strh r1, [r5, 0x32] b _080D7AF6 .align 2, 0 -_080D7AE0: .4byte gBattleAnimBankTarget -_080D7AE4: .4byte gBattleAnimBankAttacker +_080D7AE0: .4byte gAnimBankTarget +_080D7AE4: .4byte gAnimBankAttacker _080D7AE8: .4byte gBattleAnimArgs _080D7AEC: ldr r0, _080D7B94 @ =gBattleAnimArgs @@ -647,7 +647,7 @@ sub_80D7BA0: @ 80D7BA0 strh r5, [r4, 0x24] movs r0, 0x80 strh r0, [r4, 0x2E] - ldr r0, _080D7BFC @ =gBattleAnimBankAttacker + ldr r0, _080D7BFC @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -676,7 +676,7 @@ _080D7BD0: pop {r0} bx r0 .align 2, 0 -_080D7BFC: .4byte gBattleAnimBankAttacker +_080D7BFC: .4byte gAnimBankAttacker _080D7C00: .4byte 0x0000ffec _080D7C04: .4byte sub_80D7C08 thumb_func_end sub_80D7BA0 @@ -685,7 +685,7 @@ _080D7C04: .4byte sub_80D7C08 sub_80D7C08: @ 80D7C08 push {r4,lr} adds r4, r0, 0 - ldr r0, _080D7C5C @ =gBattleAnimBankAttacker + ldr r0, _080D7C5C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -723,7 +723,7 @@ _080D7C1E: strh r0, [r4, 0x38] b _080D7C82 .align 2, 0 -_080D7C5C: .4byte gBattleAnimBankAttacker +_080D7C5C: .4byte gAnimBankAttacker _080D7C60: .4byte 0x0000ffec _080D7C64: ldrh r0, [r4, 0x24] @@ -782,7 +782,7 @@ sub_80D7C8C: @ 80D7C8C bge _080D7CCE _080D7CC8: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D7CCE: pop {r4} pop {r0} @@ -807,25 +807,25 @@ sub_80D7CD4: @ 80D7CD4 ldrsh r0, [r1, r2] cmp r0, 0 bne _080D7D20 - ldr r4, _080D7D1C @ =gBattleAnimBankTarget + ldr r4, _080D7D1C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] b _080D7D32 .align 2, 0 _080D7D18: .4byte gBattleAnimArgs -_080D7D1C: .4byte gBattleAnimBankTarget +_080D7D1C: .4byte gAnimBankTarget _080D7D20: - ldr r0, _080D7D50 @ =gBattleAnimBankTarget + ldr r0, _080D7D50 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -834,7 +834,7 @@ _080D7D20: movs r1, 0x1 bl sub_807A3FC _080D7D32: - ldr r0, _080D7D54 @ =gBattleAnimBankAttacker + ldr r0, _080D7D54 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -848,8 +848,8 @@ _080D7D32: adds r1, r0, 0 b _080D7D66 .align 2, 0 -_080D7D50: .4byte gBattleAnimBankTarget -_080D7D54: .4byte gBattleAnimBankAttacker +_080D7D50: .4byte gAnimBankTarget +_080D7D54: .4byte gAnimBankAttacker _080D7D58: .4byte gBattleAnimArgs _080D7D5C: ldr r1, _080D7E10 @ =gBattleAnimArgs @@ -1002,7 +1002,7 @@ _080D7E2C: bge _080D7E82 _080D7E7C: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D7E82: pop {r4} pop {r0} @@ -1029,7 +1029,7 @@ sub_80D7E88: @ 80D7E88 .align 2, 0 _080D7EA8: .4byte gBattleAnimArgs _080D7EAC: - ldr r0, _080D7EEC @ =gBattleAnimBankTarget + ldr r0, _080D7EEC @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -1037,7 +1037,7 @@ _080D7EAC: adds r3, 0x22 movs r1, 0 bl sub_807A3FC - ldr r0, _080D7EF0 @ =gBattleAnimBankAttacker + ldr r0, _080D7EF0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1061,8 +1061,8 @@ _080D7EE2: strh r0, [r4, 0x2E] b _080D7F08 .align 2, 0 -_080D7EEC: .4byte gBattleAnimBankTarget -_080D7EF0: .4byte gBattleAnimBankAttacker +_080D7EEC: .4byte gAnimBankTarget +_080D7EF0: .4byte gAnimBankAttacker _080D7EF4: adds r0, r4, 0 adds r0, 0x3F @@ -1072,7 +1072,7 @@ _080D7EF4: cmp r0, 0 beq _080D7F08 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D7F08: pop {r4,r5} pop {r0} @@ -1099,7 +1099,7 @@ sub_80D7F10: @ 80D7F10 .align 2, 0 _080D7F30: .4byte gBattleAnimArgs _080D7F34: - ldr r4, _080D7F5C @ =gBattleAnimBankAttacker + ldr r4, _080D7F5C @ =gAnimBankAttacker ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -1117,7 +1117,7 @@ _080D7F34: subs r0, r1 b _080D7F66 .align 2, 0 -_080D7F5C: .4byte gBattleAnimBankAttacker +_080D7F5C: .4byte gAnimBankAttacker _080D7F60: ldrh r0, [r6] ldrh r1, [r5, 0x20] @@ -1130,11 +1130,11 @@ _080D7F66: adds r0, r1 strh r0, [r5, 0x22] _080D7F72: - ldr r0, _080D7F7C @ =gBattleAnimBankAttacker + ldr r0, _080D7F7C @ =gAnimBankAttacker b _080D7FD0 .align 2, 0 _080D7F78: .4byte gBattleAnimArgs -_080D7F7C: .4byte gBattleAnimBankAttacker +_080D7F7C: .4byte gAnimBankAttacker _080D7F80: movs r1, 0xA ldrsh r0, [r6, r1] @@ -1145,7 +1145,7 @@ _080D7F80: bl sub_8078764 b _080D7FCE _080D7F92: - ldr r4, _080D7FB8 @ =gBattleAnimBankTarget + ldr r4, _080D7FB8 @ =gAnimBankTarget ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -1163,7 +1163,7 @@ _080D7F92: subs r0, r1 b _080D7FC2 .align 2, 0 -_080D7FB8: .4byte gBattleAnimBankTarget +_080D7FB8: .4byte gAnimBankTarget _080D7FBC: ldrh r0, [r6] ldrh r1, [r5, 0x20] @@ -1176,7 +1176,7 @@ _080D7FC2: adds r0, r1 strh r0, [r5, 0x22] _080D7FCE: - ldr r0, _080D7FF0 @ =gBattleAnimBankTarget + ldr r0, _080D7FF0 @ =gAnimBankTarget _080D7FD0: ldrb r0, [r0] strh r0, [r5, 0x3C] @@ -1194,12 +1194,12 @@ _080D7FE8: b _080D7FF6 .align 2, 0 _080D7FEC: .4byte gBattleAnimArgs -_080D7FF0: .4byte gBattleAnimBankTarget +_080D7FF0: .4byte gAnimBankTarget _080D7FF4: movs r0, 0x40 _080D7FF6: strh r0, [r5, 0x3A] - ldr r0, _080D803C @ =gBattleAnimBankTarget + ldr r0, _080D803C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1232,7 +1232,7 @@ _080D800C: pop {r0} bx r0 .align 2, 0 -_080D803C: .4byte gBattleAnimBankTarget +_080D803C: .4byte gAnimBankTarget _080D8040: .4byte gBattleAnimArgs _080D8044: .4byte sub_80D8048 thumb_func_end sub_80D7F10 @@ -1307,7 +1307,7 @@ _080D80C6: b _080D80D8 _080D80D2: adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D80D8: pop {r4} pop {r0} @@ -1341,7 +1341,7 @@ sub_80D80E0: @ 80D80E0 movs r0, 0x3F ands r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D812A @@ -1353,10 +1353,10 @@ sub_80D80E0: @ 80D80E0 orrs r1, r0 strb r1, [r4] _080D812A: - ldr r0, _080D81B4 @ =gUnknown_030042C0 + ldr r0, _080D81B4 @ =gBattle_BG1_X movs r1, 0 strh r1, [r0] - ldr r0, _080D81B8 @ =gUnknown_030041B4 + ldr r0, _080D81B8 @ =gBattle_BG1_Y strh r1, [r0] ldr r0, _080D81BC @ =REG_BG1HOFS strh r1, [r0] @@ -1389,7 +1389,7 @@ _080D812A: lsls r1, 4 movs r2, 0x20 bl LoadPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D8190 @@ -1415,8 +1415,8 @@ _080D8190: _080D81A8: .4byte REG_BLDCNT _080D81AC: .4byte 0x00003f42 _080D81B0: .4byte REG_BG1CNT -_080D81B4: .4byte gUnknown_030042C0 -_080D81B8: .4byte gUnknown_030041B4 +_080D81B4: .4byte gBattle_BG1_X +_080D81B8: .4byte gBattle_BG1_Y _080D81BC: .4byte REG_BG1HOFS _080D81C0: .4byte 0x040000d4 _080D81C4: .4byte 0x85000400 @@ -1438,13 +1438,13 @@ sub_80D81E0: @ 80D81E0 sub sp, 0x10 lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _080D8220 @ =gUnknown_030042C0 + ldr r2, _080D8220 @ =gBattle_BG1_X ldr r1, _080D8224 @ =0x0000ffff adds r0, r1, 0 ldrh r4, [r2] adds r0, r4 strh r0, [r2] - ldr r1, _080D8228 @ =gUnknown_030041B4 + ldr r1, _080D8228 @ =gBattle_BG1_Y ldr r3, _080D822C @ =gTasks lsls r0, r6, 2 adds r0, r6 @@ -1463,9 +1463,9 @@ _080D8214: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D8220: .4byte gUnknown_030042C0 +_080D8220: .4byte gBattle_BG1_X _080D8224: .4byte 0x0000ffff -_080D8228: .4byte gUnknown_030041B4 +_080D8228: .4byte gBattle_BG1_Y _080D822C: .4byte gTasks _080D8230: .4byte _080D8234 .align 2, 0 @@ -1620,7 +1620,7 @@ _080D832A: ldr r1, _080D83C8 @ =0x85000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D8378 @@ -1639,8 +1639,8 @@ _080D8378: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - ldr r2, _080D83D4 @ =gUnknown_030042C0 - ldr r4, _080D83D8 @ =gUnknown_030041B4 + ldr r2, _080D83D4 @ =gBattle_BG1_X + ldr r4, _080D83D8 @ =gBattle_BG1_Y _080D838C: movs r1, 0 strh r1, [r2] @@ -1674,8 +1674,8 @@ _080D83C4: .4byte 0x85000400 _080D83C8: .4byte 0x85000200 _080D83CC: .4byte REG_BG1CNT _080D83D0: .4byte gTasks -_080D83D4: .4byte gUnknown_030042C0 -_080D83D8: .4byte gUnknown_030041B4 +_080D83D4: .4byte gBattle_BG1_X +_080D83D8: .4byte gBattle_BG1_Y _080D83DC: .4byte REG_BLDCNT thumb_func_end sub_80D81E0 @@ -1683,16 +1683,16 @@ _080D83DC: .4byte REG_BLDCNT sub_80D83E0: @ 80D83E0 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080D840C @ =gBattleAnimBankAttacker + ldr r5, _080D840C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -1702,7 +1702,7 @@ sub_80D83E0: @ 80D83E0 pop {r0} bx r0 .align 2, 0 -_080D840C: .4byte gBattleAnimBankAttacker +_080D840C: .4byte gAnimBankAttacker _080D8410: .4byte sub_807941C thumb_func_end sub_80D83E0 @@ -1733,7 +1733,7 @@ sub_80D8414: @ 80D8414 movs r0, 0x3F ands r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D845E @@ -1745,10 +1745,10 @@ sub_80D8414: @ 80D8414 orrs r1, r0 strb r1, [r4] _080D845E: - ldr r0, _080D84EC @ =gUnknown_030042C0 + ldr r0, _080D84EC @ =gBattle_BG1_X movs r1, 0 strh r1, [r0] - ldr r0, _080D84F0 @ =gUnknown_030041B4 + ldr r0, _080D84F0 @ =gBattle_BG1_Y strh r1, [r0] ldr r0, _080D84F4 @ =REG_BG1HOFS strh r1, [r0] @@ -1781,7 +1781,7 @@ _080D845E: lsls r1, 4 movs r2, 0x20 bl LoadPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D84C4 @@ -1809,8 +1809,8 @@ _080D84C4: _080D84E0: .4byte REG_BLDCNT _080D84E4: .4byte 0x00003f42 _080D84E8: .4byte REG_BG1CNT -_080D84EC: .4byte gUnknown_030042C0 -_080D84F0: .4byte gUnknown_030041B4 +_080D84EC: .4byte gBattle_BG1_X +_080D84F0: .4byte gBattle_BG1_Y _080D84F4: .4byte REG_BG1HOFS _080D84F8: .4byte 0x040000d4 _080D84FC: .4byte 0x85000400 @@ -1833,7 +1833,7 @@ sub_80D851C: @ 80D851C sub sp, 0x10 lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _080D8558 @ =gUnknown_030042C0 + ldr r3, _080D8558 @ =gBattle_BG1_X ldr r4, _080D855C @ =gTasks lsls r1, r6, 2 adds r1, r6 @@ -1843,7 +1843,7 @@ sub_80D851C: @ 80D851C ldrh r2, [r3] adds r0, r2 strh r0, [r3] - ldr r2, _080D8560 @ =gUnknown_030041B4 + ldr r2, _080D8560 @ =gBattle_BG1_Y movs r5, 0x20 ldrsh r0, [r1, r5] cmp r0, 0x4 @@ -1856,9 +1856,9 @@ _080D854C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D8558: .4byte gUnknown_030042C0 +_080D8558: .4byte gBattle_BG1_X _080D855C: .4byte gTasks -_080D8560: .4byte gUnknown_030041B4 +_080D8560: .4byte gBattle_BG1_Y _080D8564: .4byte _080D8568 .align 2, 0 _080D8568: @@ -2002,7 +2002,7 @@ _080D864A: ldr r1, _080D86E8 @ =0x85000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D8698 @@ -2021,8 +2021,8 @@ _080D8698: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - ldr r3, _080D86F4 @ =gUnknown_030042C0 - ldr r2, _080D86F8 @ =gUnknown_030041B4 + ldr r3, _080D86F4 @ =gBattle_BG1_X + ldr r2, _080D86F8 @ =gBattle_BG1_Y _080D86AC: movs r1, 0 strh r1, [r3] @@ -2056,8 +2056,8 @@ _080D86E4: .4byte 0x85000400 _080D86E8: .4byte 0x85000200 _080D86EC: .4byte REG_BG1CNT _080D86F0: .4byte gTasks -_080D86F4: .4byte gUnknown_030042C0 -_080D86F8: .4byte gUnknown_030041B4 +_080D86F4: .4byte gBattle_BG1_X +_080D86F8: .4byte gBattle_BG1_Y _080D86FC: .4byte REG_BLDCNT thumb_func_end sub_80D851C @@ -2070,16 +2070,16 @@ sub_80D8700: @ 80D8700 ldr r6, _080D87E8 @ =gBattleAnimArgs ldrh r0, [r6] strh r0, [r5, 0x2E] - ldr r0, _080D87EC @ =gBattleAnimBankAttacker + ldr r0, _080D87EC @ =gAnimBankAttacker mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition adds r4, r0, 0 - ldr r7, _080D87F0 @ =gBattleAnimBankTarget + ldr r7, _080D87F0 @ =gAnimBankTarget ldrb r0, [r7] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -2137,16 +2137,16 @@ _080D8790: movs r0, 0x1 strh r0, [r5, 0x3A] _080D8794: - ldr r4, _080D87EC @ =gBattleAnimBankAttacker + ldr r4, _080D87EC @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2159,10 +2159,10 @@ _080D8794: ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x30] - ldr r4, _080D87F0 @ =gBattleAnimBankTarget + ldr r4, _080D87F0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] @@ -2177,8 +2177,8 @@ _080D8794: b _080D8824 .align 2, 0 _080D87E8: .4byte gBattleAnimArgs -_080D87EC: .4byte gBattleAnimBankAttacker -_080D87F0: .4byte gBattleAnimBankTarget +_080D87EC: .4byte gAnimBankAttacker +_080D87F0: .4byte gAnimBankTarget _080D87F4: .4byte gBanksBySide _080D87F8: .4byte gSprites _080D87FC: @@ -2186,10 +2186,10 @@ _080D87FC: ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x30] - ldr r4, _080D886C @ =gBattleAnimBankTarget + ldr r4, _080D886C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] @@ -2202,7 +2202,7 @@ _080D87FC: ldrb r0, [r4] movs r1, 0x1 _080D8824: - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x8] @@ -2215,7 +2215,7 @@ _080D8824: ldrh r1, [r5, 0x3C] orrs r0, r1 strh r0, [r5, 0x3C] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D8858 @@ -2236,7 +2236,7 @@ _080D8858: pop {r0} bx r0 .align 2, 0 -_080D886C: .4byte gBattleAnimBankTarget +_080D886C: .4byte gAnimBankTarget _080D8870: .4byte sub_80D8874 thumb_func_end sub_80D8700 @@ -2298,10 +2298,10 @@ _080D88C8: _080D88D6: movs r5, 0x50 strh r5, [r4, 0x2E] - ldr r6, _080D8928 @ =gBattleAnimBankTarget + ldr r6, _080D8928 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] @@ -2337,7 +2337,7 @@ _080D88D6: strh r0, [r4, 0x38] b _080D893A .align 2, 0 -_080D8928: .4byte gBattleAnimBankTarget +_080D8928: .4byte gAnimBankTarget _080D892C: .4byte gMain _080D8930: .4byte 0x0000043d _080D8934: .4byte gBanksBySide @@ -2486,7 +2486,7 @@ _080D8A12: cmp r0, 0 beq _080D8A78 ldr r1, _080D8A70 @ =gBanksBySide - ldr r0, _080D8A74 @ =gBattleAnimBankTarget + ldr r0, _080D8A74 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2501,7 +2501,7 @@ _080D8A12: _080D8A68: .4byte gMain _080D8A6C: .4byte 0x0000043d _080D8A70: .4byte gBanksBySide -_080D8A74: .4byte gBattleAnimBankTarget +_080D8A74: .4byte gAnimBankTarget _080D8A78: ldr r0, _080D8A90 @ =0x0000fff0 _080D8A7A: @@ -2713,12 +2713,12 @@ sub_80D8BA8: @ 80D8BA8 str r0, [sp, 0x4] adds r0, r5, 0 movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r7, r0, 24 adds r0, r5, 0 movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 mov r1, r8 @@ -3030,7 +3030,7 @@ _080D8E6A: ldr r6, _080D8ED0 @ =gBattleAnimArgs ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] - ldr r0, _080D8ED4 @ =gBattleAnimBankAttacker + ldr r0, _080D8ED4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3040,10 +3040,10 @@ _080D8E6A: negs r0, r0 strh r0, [r6, 0x4] _080D8E92: - ldr r4, _080D8ED8 @ =gBattleAnimBankTarget + ldr r4, _080D8ED8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x4] @@ -3051,7 +3051,7 @@ _080D8E92: strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] @@ -3069,8 +3069,8 @@ _080D8E92: .align 2, 0 _080D8ECC: .4byte gDisableStructMoveAnim _080D8ED0: .4byte gBattleAnimArgs -_080D8ED4: .4byte gBattleAnimBankAttacker -_080D8ED8: .4byte gBattleAnimBankTarget +_080D8ED4: .4byte gAnimBankAttacker +_080D8ED8: .4byte gAnimBankTarget _080D8EDC: .4byte sub_80D8EE0 thumb_func_end unc_080B06FC @@ -3087,7 +3087,7 @@ sub_80D8EE0: @ 80D8EE0 bl StartSpriteAnim ldr r0, _080D8F08 @ =sub_8078600 str r0, [r4, 0x1C] - ldr r1, _080D8F0C @ =move_anim_8072740 + ldr r1, _080D8F0C @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData _080D8F02: @@ -3096,7 +3096,7 @@ _080D8F02: bx r0 .align 2, 0 _080D8F08: .4byte sub_8078600 -_080D8F0C: .4byte move_anim_8072740 +_080D8F0C: .4byte DestroyAnimSprite thumb_func_end sub_80D8EE0 thumb_func_start sub_80D8F10 @@ -3185,7 +3185,7 @@ _080D8F9C: cmp r0, 0x15 bne _080D8FBA adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D8FBA: pop {r4} pop {r0} diff --git a/asm/normal.s b/asm/normal.s index 2d084dcf1..a800b348a 100755 --- a/asm/normal.s +++ b/asm/normal.s @@ -22,7 +22,7 @@ sub_80E1CB4: @ 80E1CB4 strh r0, [r4, 0x22] ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] - ldr r0, _080E1CF0 @ =gBattleAnimBankAttacker + ldr r0, _080E1CF0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -37,7 +37,7 @@ sub_80E1CB4: @ 80E1CB4 b _080E1D02 .align 2, 0 _080E1CEC: .4byte gBattleAnimArgs -_080E1CF0: .4byte gBattleAnimBankAttacker +_080E1CF0: .4byte gAnimBankAttacker _080E1CF4: ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] @@ -108,7 +108,7 @@ _080E1D5A: cmp r0, r1 bne _080E1D7E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E1D7E: pop {r4} pop {r0} @@ -198,7 +198,7 @@ sub_80E1E0C: @ 80E1E0C cmp r0, 0 bne _080E1E22 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E1E22: pop {r0} bx r0 @@ -338,7 +338,7 @@ sub_80E1F0C: @ 80E1F0C movs r2, 0 bl BlendPalettes adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E1F32: pop {r4} pop {r0} @@ -875,9 +875,9 @@ sub_80E2324: @ 80E2324 lsrs r0, 24 mov r8, r0 movs r2, 0 - ldr r0, _080E239C @ =gBattleAnimBankAttacker + ldr r0, _080E239C @ =gAnimBankAttacker ldrb r6, [r0] - ldr r0, _080E23A0 @ =gBattleAnimBankTarget + ldr r0, _080E23A0 @ =gAnimBankTarget ldrb r7, [r0] ldr r4, _080E23A4 @ =gBattleAnimArgs ldrh r1, [r4] @@ -927,8 +927,8 @@ _080E2382: pop {r0} bx r0 .align 2, 0 -_080E239C: .4byte gBattleAnimBankAttacker -_080E23A0: .4byte gBattleAnimBankTarget +_080E239C: .4byte gAnimBankAttacker +_080E23A0: .4byte gAnimBankTarget _080E23A4: .4byte gBattleAnimArgs thumb_func_end sub_80E2324 @@ -971,10 +971,10 @@ _080E23EA: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _080E24A4 @ =gBattleAnimBankAttacker + ldr r0, _080E24A4 @ =gAnimBankAttacker ldrb r0, [r0] mov r9, r0 - ldr r0, _080E24A8 @ =gBattleAnimBankTarget + ldr r0, _080E24A8 @ =gAnimBankTarget ldrb r0, [r0] mov r10, r0 ldrh r1, [r4, 0xC] @@ -1061,8 +1061,8 @@ _080E248E: .align 2, 0 _080E249C: .4byte gTasks _080E24A0: .4byte gBattleAnimArgs -_080E24A4: .4byte gBattleAnimBankAttacker -_080E24A8: .4byte gBattleAnimBankTarget +_080E24A4: .4byte gAnimBankAttacker +_080E24A8: .4byte gAnimBankTarget _080E24AC: .4byte 0x0000ffff _080E24B0: .4byte gSprites _080E24B4: .4byte gHealthboxIDs @@ -1237,7 +1237,7 @@ _080E25D2: bcc _080E25D2 _080E25F4: adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E25FA: pop {r4-r7} pop {r0} @@ -1253,7 +1253,7 @@ sub_80E260C: @ 80E260C push {r4-r6,lr} ldr r6, _080E2680 @ =gSprites ldr r4, _080E2684 @ =gObjectBankIDs - ldr r5, _080E2688 @ =gBattleAnimBankAttacker + ldr r5, _080E2688 @ =gAnimBankAttacker ldrb r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -1268,7 +1268,7 @@ sub_80E260C: @ 80E260C adds r0, r2, 0 ands r0, r3 strb r0, [r1] - ldr r3, _080E268C @ =gBattleAnimBankTarget + ldr r3, _080E268C @ =gAnimBankTarget ldrb r0, [r3] adds r0, r4 ldrb r1, [r0] @@ -1310,8 +1310,8 @@ sub_80E260C: @ 80E260C .align 2, 0 _080E2680: .4byte gSprites _080E2684: .4byte gObjectBankIDs -_080E2688: .4byte gBattleAnimBankAttacker -_080E268C: .4byte gBattleAnimBankTarget +_080E2688: .4byte gAnimBankAttacker +_080E268C: .4byte gAnimBankTarget _080E2690: .4byte gBattleAnimArgs _080E2694: cmp r0, 0 @@ -1482,7 +1482,7 @@ _080E27C4: _080E27CC: ldr r0, _080E27E0 @ =sub_80785E4 str r0, [r5, 0x1C] - ldr r1, _080E27E4 @ =move_anim_8072740 + ldr r1, _080E27E4 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -1490,7 +1490,7 @@ _080E27CC: bx r0 .align 2, 0 _080E27E0: .4byte sub_80785E4 -_080E27E4: .4byte move_anim_8072740 +_080E27E4: .4byte DestroyAnimSprite thumb_func_end sub_80E27A0 thumb_func_start sub_80E27E8 @@ -1536,13 +1536,13 @@ _080E2834: .4byte sub_80DA48C sub_80E2838: @ 80E2838 push {r4,lr} adds r4, r0, 0 - ldr r0, _080E2868 @ =gBattleAnimBankAttacker + ldr r0, _080E2868 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E285C - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E285C @@ -1557,7 +1557,7 @@ _080E285C: pop {r0} bx r0 .align 2, 0 -_080E2868: .4byte gBattleAnimBankAttacker +_080E2868: .4byte gAnimBankAttacker _080E286C: .4byte gBattleAnimArgs thumb_func_end sub_80E2838 @@ -1706,7 +1706,7 @@ _080E299C: ldr r0, _080E29B4 @ =gBattleAnimArgs ldrh r0, [r0, 0x6] strh r0, [r4, 0x2E] - ldr r1, _080E29B8 @ =move_anim_8072740 + ldr r1, _080E29B8 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData ldr r0, _080E29BC @ =sub_80782D8 @@ -1716,7 +1716,7 @@ _080E299C: bx r0 .align 2, 0 _080E29B4: .4byte gBattleAnimArgs -_080E29B8: .4byte move_anim_8072740 +_080E29B8: .4byte DestroyAnimSprite _080E29BC: .4byte sub_80782D8 thumb_func_end sub_80E2978 @@ -1778,7 +1778,7 @@ sub_80E29FC: @ 80E29FC cmp r0, 0xC ble _080E2A32 adds r0, r3, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080E2A32: pop {r0} bx r0 @@ -1857,33 +1857,33 @@ _080E2AD0: movs r5, 0 _080E2AD2: mov r0, sp - ldr r1, _080E2AD8 @ =gBattleAnimBankAttacker + ldr r1, _080E2AD8 @ =gAnimBankAttacker b _080E2AE2 .align 2, 0 -_080E2AD8: .4byte gBattleAnimBankAttacker +_080E2AD8: .4byte gAnimBankAttacker _080E2ADC: movs r5, 0 _080E2ADE: mov r0, sp - ldr r1, _080E2AE8 @ =gBattleAnimBankTarget + ldr r1, _080E2AE8 @ =gAnimBankTarget _080E2AE2: ldrb r1, [r1] strb r1, [r0] b _080E2B26 .align 2, 0 -_080E2AE8: .4byte gBattleAnimBankTarget +_080E2AE8: .4byte gAnimBankTarget _080E2AEC: mov r1, sp - ldr r0, _080E2AFC @ =gBattleAnimBankAttacker + ldr r0, _080E2AFC @ =gAnimBankAttacker ldrb r0, [r0] strb r0, [r1] - ldr r0, _080E2B00 @ =gBattleAnimBankTarget + ldr r0, _080E2B00 @ =gAnimBankTarget ldrb r0, [r0] strb r0, [r1, 0x1] b _080E2B26 .align 2, 0 -_080E2AFC: .4byte gBattleAnimBankAttacker -_080E2B00: .4byte gBattleAnimBankTarget +_080E2AFC: .4byte gAnimBankAttacker +_080E2B00: .4byte gAnimBankTarget _080E2B04: mov r1, sp movs r0, 0xFF @@ -1892,14 +1892,14 @@ _080E2B04: _080E2B0C: movs r5, 0 mov r2, sp - ldr r0, _080E2B14 @ =gBattleAnimBankAttacker + ldr r0, _080E2B14 @ =gAnimBankAttacker b _080E2B1E .align 2, 0 -_080E2B14: .4byte gBattleAnimBankAttacker +_080E2B14: .4byte gAnimBankAttacker _080E2B18: movs r5, 0 mov r2, sp - ldr r0, _080E2B70 @ =gBattleAnimBankTarget + ldr r0, _080E2B70 @ =gAnimBankTarget _080E2B1E: ldrb r0, [r0] movs r1, 0x2 @@ -1942,7 +1942,7 @@ _080E2B54: pop {r0} bx r0 .align 2, 0 -_080E2B70: .4byte gBattleAnimBankTarget +_080E2B70: .4byte gAnimBankTarget thumb_func_end sub_80E2A7C thumb_func_start sub_80E2B74 @@ -2447,9 +2447,9 @@ sub_80E2F2C: @ 80E2F2C lsrs r0, 24 mov r9, r0 movs r7, 0 - ldr r0, _080E3038 @ =gUnknown_030042C4 + ldr r0, _080E3038 @ =gBattle_WIN0H strh r7, [r0] - ldr r0, _080E303C @ =gUnknown_03004240 + ldr r0, _080E303C @ =gBattle_WIN0V strh r7, [r0] ldr r1, _080E3040 @ =REG_WININ ldr r2, _080E3044 @ =0x00003f3f @@ -2490,7 +2490,7 @@ sub_80E2F2C: @ 80E2F2C movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E2FAC @@ -2506,11 +2506,11 @@ _080E2FAC: lsls r0, 24 cmp r0, 0 beq _080E3028 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3028 - ldr r5, _080E305C @ =gBattleAnimBankAttacker + ldr r5, _080E305C @ =gAnimBankAttacker ldrb r0, [r5] bl GetBankIdentity lsls r0, 24 @@ -2561,7 +2561,7 @@ _080E2FDC: strb r0, [r4] movs r7, 0x1 _080E3028: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E306C @@ -2569,8 +2569,8 @@ _080E3028: ldrh r4, [r0] b _080E30B4 .align 2, 0 -_080E3038: .4byte gUnknown_030042C4 -_080E303C: .4byte gUnknown_03004240 +_080E3038: .4byte gBattle_WIN0H +_080E303C: .4byte gBattle_WIN0V _080E3040: .4byte REG_WININ _080E3044: .4byte 0x00003f3f _080E3048: .4byte 0x00003f3d @@ -2578,12 +2578,12 @@ _080E304C: .4byte REG_BLDCNT _080E3050: .4byte 0x00003f42 _080E3054: .4byte 0x00000c08 _080E3058: .4byte REG_BG1CNT -_080E305C: .4byte gBattleAnimBankAttacker +_080E305C: .4byte gAnimBankAttacker _080E3060: .4byte gSprites _080E3064: .4byte gObjectBankIDs _080E3068: .4byte gSharedMem + 0x19348 _080E306C: - ldr r4, _080E308C @ =gBattleAnimBankAttacker + ldr r4, _080E308C @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -2599,7 +2599,7 @@ _080E306C: ldr r1, _080E3094 @ =gEnemyParty b _080E30A8 .align 2, 0 -_080E308C: .4byte gBattleAnimBankAttacker +_080E308C: .4byte gAnimBankAttacker _080E3090: .4byte gBattlePartyID _080E3094: .4byte gEnemyParty _080E3098: @@ -2622,7 +2622,7 @@ _080E30B4: bl GetAnimBankSpriteId lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080E3168 @ =gBattleAnimBankAttacker + ldr r0, _080E3168 @ =gAnimBankAttacker ldrb r0, [r0] adds r1, r5, 0 adds r2, r4, 0 @@ -2643,7 +2643,7 @@ _080E30B4: ldr r0, [r2, 0x8] ldr r0, _080E3174 @ =gUnknown_08D20A30 bl LZDecompressVram - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E3106 @@ -2664,7 +2664,7 @@ _080E3106: adds r1, 0x1 movs r2, 0x2 bl LoadPalette - ldr r2, _080E3180 @ =gUnknown_030042C0 + ldr r2, _080E3180 @ =gBattle_BG1_X ldr r0, _080E3184 @ =gSprites lsls r1, r5, 4 adds r1, r5 @@ -2674,7 +2674,7 @@ _080E3106: negs r0, r0 adds r0, 0x20 strh r0, [r2] - ldr r2, _080E3188 @ =gUnknown_030041B4 + ldr r2, _080E3188 @ =gBattle_BG1_Y ldrh r0, [r1, 0x22] negs r0, r0 adds r0, 0x20 @@ -2699,15 +2699,15 @@ _080E3106: .align 2, 0 _080E3160: .4byte gBattlePartyID _080E3164: .4byte gPlayerParty -_080E3168: .4byte gBattleAnimBankAttacker +_080E3168: .4byte gAnimBankAttacker _080E316C: .4byte 0x040000d4 _080E3170: .4byte 0x85000400 _080E3174: .4byte gUnknown_08D20A30 _080E3178: .4byte gUnknown_08D20A14 _080E317C: .4byte gUnknown_083DB568 -_080E3180: .4byte gUnknown_030042C0 +_080E3180: .4byte gBattle_BG1_X _080E3184: .4byte gSprites -_080E3188: .4byte gUnknown_030041B4 +_080E3188: .4byte gBattle_BG1_Y _080E318C: .4byte gTasks _080E3190: .4byte sub_80E3194 thumb_func_end sub_80E2F2C @@ -2729,7 +2729,7 @@ sub_80E3194: @ 80E3194 adds r0, 0x4 movs r5, 0 strh r0, [r4, 0x1C] - ldr r7, _080E32B0 @ =gUnknown_030041B4 + ldr r7, _080E32B0 @ =gBattle_BG1_Y ldrh r2, [r7] subs r1, r2, 0x4 strh r1, [r7] @@ -2750,9 +2750,9 @@ sub_80E3194: @ 80E3194 bne _080E329E movs r0, 0 bl sub_8076464 - ldr r0, _080E32B4 @ =gUnknown_030042C4 + ldr r0, _080E32B4 @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _080E32B8 @ =gUnknown_03004240 + ldr r0, _080E32B8 @ =gBattle_WIN0V strh r5, [r0] ldr r0, _080E32BC @ =REG_WININ ldr r2, _080E32C0 @ =0x00003f3f @@ -2760,7 +2760,7 @@ sub_80E3194: @ 80E3194 strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3208 @@ -2810,7 +2810,7 @@ _080E3208: cmp r0, 0x1 bne _080E3288 ldr r2, _080E32D8 @ =gObjectBankIDs - ldr r0, _080E32DC @ =gBattleAnimBankAttacker + ldr r0, _080E32DC @ =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -2852,9 +2852,9 @@ _080E329E: bx r0 .align 2, 0 _080E32AC: .4byte gTasks -_080E32B0: .4byte gUnknown_030041B4 -_080E32B4: .4byte gUnknown_030042C4 -_080E32B8: .4byte gUnknown_03004240 +_080E32B0: .4byte gBattle_BG1_Y +_080E32B4: .4byte gBattle_WIN0H +_080E32B8: .4byte gBattle_WIN0V _080E32BC: .4byte REG_WININ _080E32C0: .4byte 0x00003f3f _080E32C4: .4byte REG_BG1CNT @@ -2863,7 +2863,7 @@ _080E32CC: .4byte gSprites _080E32D0: .4byte 0x040000d4 _080E32D4: .4byte 0x85000200 _080E32D8: .4byte gObjectBankIDs -_080E32DC: .4byte gBattleAnimBankAttacker +_080E32DC: .4byte gAnimBankAttacker thumb_func_end sub_80E3194 thumb_func_start sub_80E32E0 @@ -2954,13 +2954,13 @@ _080E336C: ldrsh r0, [r7, r1] cmp r0, 0 bne _080E3390 - ldr r0, _080E338C @ =gBattleAnimBankAttacker + ldr r0, _080E338C @ =gAnimBankAttacker b _080E3392 .align 2, 0 _080E3388: .4byte gTasks -_080E338C: .4byte gBattleAnimBankAttacker +_080E338C: .4byte gAnimBankAttacker _080E3390: - ldr r0, _080E34B4 @ =gBattleAnimBankTarget + ldr r0, _080E34B4 @ =gAnimBankTarget _080E3392: ldrb r5, [r0] movs r0, 0x2 @@ -2968,7 +2968,7 @@ _080E3392: mov r2, r8 eors r2, r0 mov r8, r2 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E33BC @@ -2985,10 +2985,10 @@ _080E33BC: movs r0, 0 strh r0, [r7, 0x6] _080E33C0: - ldr r0, _080E34B8 @ =gUnknown_030042C4 + ldr r0, _080E34B8 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080E34BC @ =gUnknown_03004240 + ldr r0, _080E34BC @ =gBattle_WIN0V strh r1, [r0] ldr r1, _080E34C0 @ =REG_WININ ldr r2, _080E34C4 @ =0x00003f3f @@ -3030,7 +3030,7 @@ _080E33C0: movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3432 @@ -3097,7 +3097,7 @@ _080E345E: movs r2, 0x1 str r2, [sp, 0x20] _080E34A4: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E34E4 @@ -3105,9 +3105,9 @@ _080E34A4: ldrh r4, [r0] b _080E3522 .align 2, 0 -_080E34B4: .4byte gBattleAnimBankTarget -_080E34B8: .4byte gUnknown_030042C4 -_080E34BC: .4byte gUnknown_03004240 +_080E34B4: .4byte gAnimBankTarget +_080E34B8: .4byte gBattle_WIN0H +_080E34BC: .4byte gBattle_WIN0V _080E34C0: .4byte REG_WININ _080E34C4: .4byte 0x00003f3f _080E34C8: .4byte 0x00003f3d @@ -3191,7 +3191,7 @@ _080E3578: ldr r1, [sp, 0x4] bl LZDecompressVram _080E3580: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E3598 @@ -3272,10 +3272,10 @@ _080E3610: movs r2, 0x20 bl LoadCompressedPalette _080E361E: - ldr r2, _080E3648 @ =gUnknown_030042C0 + ldr r2, _080E3648 @ =gBattle_BG1_X movs r1, 0 strh r1, [r2] - ldr r0, _080E364C @ =gUnknown_030041B4 + ldr r0, _080E364C @ =gBattle_BG1_Y strh r1, [r0] movs r3, 0 ldrsh r0, [r7, r3] @@ -3293,8 +3293,8 @@ _080E361E: b _080E3668 .align 2, 0 _080E3644: .4byte gBattleStatMask5_Pal -_080E3648: .4byte gUnknown_030042C0 -_080E364C: .4byte gUnknown_030041B4 +_080E3648: .4byte gBattle_BG1_X +_080E364C: .4byte gBattle_BG1_Y _080E3650: .4byte gTasks _080E3654: .4byte 0x0000fffd _080E3658: @@ -3356,7 +3356,7 @@ _080E3692: bne _080E36E0 movs r0, 0x40 negs r0, r0 - bl sub_8077094 + bl BattleAnimAdjustPanning2 adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -3369,7 +3369,7 @@ _080E36DC: .4byte sub_80E3704 _080E36E0: movs r0, 0x40 negs r0, r0 - bl sub_8077094 + bl BattleAnimAdjustPanning2 adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -3391,7 +3391,7 @@ sub_80E3704: @ 80E3704 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _080E3730 @ =gUnknown_030041B4 + ldr r2, _080E3730 @ =gBattle_BG1_Y ldr r1, _080E3734 @ =gTasks lsls r0, r6, 2 adds r0, r6 @@ -3411,7 +3411,7 @@ sub_80E3704: @ 80E3704 beq _080E373E b _080E3866 .align 2, 0 -_080E3730: .4byte gUnknown_030041B4 +_080E3730: .4byte gBattle_BG1_Y _080E3734: .4byte gTasks _080E3738: cmp r2, 0x2 @@ -3484,9 +3484,9 @@ _080E378E: bne _080E3866 movs r0, 0 bl sub_8076464 - ldr r0, _080E3870 @ =gUnknown_030042C4 + ldr r0, _080E3870 @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _080E3874 @ =gUnknown_03004240 + ldr r0, _080E3874 @ =gBattle_WIN0V strh r5, [r0] ldr r0, _080E3878 @ =REG_WININ ldr r2, _080E387C @ =0x00003f3f @@ -3494,7 +3494,7 @@ _080E378E: strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E37E8 @@ -3573,8 +3573,8 @@ _080E3866: bx r0 .align 2, 0 _080E386C: .4byte REG_BLDALPHA -_080E3870: .4byte gUnknown_030042C4 -_080E3874: .4byte gUnknown_03004240 +_080E3870: .4byte gBattle_WIN0H +_080E3874: .4byte gBattle_WIN0V _080E3878: .4byte REG_WININ _080E387C: .4byte 0x00003f3f _080E3880: .4byte REG_BG1CNT @@ -3791,7 +3791,7 @@ sub_80E3A08: @ 80E3A08 lsrs r6, r0, 24 movs r4, 0 movs r2, 0 - ldr r0, _080E3A50 @ =gBattleAnimBankAttacker + ldr r0, _080E3A50 @ =gAnimBankAttacker ldrb r3, [r0] movs r5, 0x1 _080E3A18: @@ -3824,7 +3824,7 @@ _080E3A34: pop {r0} bx r0 .align 2, 0 -_080E3A50: .4byte gBattleAnimBankAttacker +_080E3A50: .4byte gAnimBankAttacker _080E3A54: .4byte gBattleAnimArgs thumb_func_end sub_80E3A08 @@ -3845,7 +3845,7 @@ sub_80E3A58: @ 80E3A58 ldrsh r0, [r4, r1] cmp r0, 0 beq _080E3A94 - ldr r0, _080E3AC8 @ =gBattleAnimBankAttacker + ldr r0, _080E3AC8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -3881,7 +3881,7 @@ _080E3A94: .align 2, 0 _080E3AC0: .4byte sub_80E3AD0 _080E3AC4: .4byte gBattleAnimArgs -_080E3AC8: .4byte gBattleAnimBankAttacker +_080E3AC8: .4byte gAnimBankAttacker _080E3ACC: .4byte gTasks thumb_func_end sub_80E3A58 @@ -3953,7 +3953,7 @@ sub_80E3B4C: @ 80E3B4C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E3B70 @ =gBattleAnimBankAttacker + ldr r0, _080E3B70 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide ldr r1, _080E3B74 @ =gBattleAnimArgs @@ -3966,7 +3966,7 @@ sub_80E3B4C: @ 80E3B4C pop {r0} bx r0 .align 2, 0 -_080E3B70: .4byte gBattleAnimBankAttacker +_080E3B70: .4byte gAnimBankAttacker _080E3B74: .4byte gBattleAnimArgs thumb_func_end sub_80E3B4C @@ -3976,7 +3976,7 @@ sub_80E3B78: @ 80E3B78 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E3B9C @ =gBattleAnimBankTarget + ldr r0, _080E3B9C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide ldr r1, _080E3BA0 @ =gBattleAnimArgs @@ -3989,7 +3989,7 @@ sub_80E3B78: @ 80E3B78 pop {r0} bx r0 .align 2, 0 -_080E3B9C: .4byte gBattleAnimBankTarget +_080E3B9C: .4byte gAnimBankTarget _080E3BA0: .4byte gBattleAnimArgs thumb_func_end sub_80E3B78 @@ -4000,10 +4000,10 @@ sub_80E3BA4: @ 80E3BA4 lsrs r3, r0, 24 ldr r5, _080E3BD0 @ =gBattleAnimArgs movs r4, 0 - ldr r0, _080E3BD4 @ =gBattleAnimBankAttacker + ldr r0, _080E3BD4 @ =gAnimBankAttacker ldrb r2, [r0] movs r0, 0x2 - ldr r1, _080E3BD8 @ =gBattleAnimBankTarget + ldr r1, _080E3BD8 @ =gAnimBankTarget eors r0, r2 ldrb r1, [r1] cmp r0, r1 @@ -4018,8 +4018,8 @@ _080E3BC0: bx r0 .align 2, 0 _080E3BD0: .4byte gBattleAnimArgs -_080E3BD4: .4byte gBattleAnimBankAttacker -_080E3BD8: .4byte gBattleAnimBankTarget +_080E3BD4: .4byte gAnimBankAttacker +_080E3BD8: .4byte gAnimBankTarget thumb_func_end sub_80E3BA4 thumb_func_start sub_80E3BDC @@ -4030,7 +4030,7 @@ sub_80E3BDC: @ 80E3BDC movs r4, 0 ldr r6, _080E3C3C @ =gSprites _080E3BE6: - ldr r0, _080E3C40 @ =gBattleAnimBankAttacker + ldr r0, _080E3C40 @ =gAnimBankAttacker ldrb r0, [r0] cmp r4, r0 beq _080E3C24 @@ -4073,7 +4073,7 @@ _080E3C24: bx r0 .align 2, 0 _080E3C3C: .4byte gSprites -_080E3C40: .4byte gBattleAnimBankAttacker +_080E3C40: .4byte gAnimBankAttacker _080E3C44: .4byte gObjectBankIDs _080E3C48: .4byte gBattleAnimArgs thumb_func_end sub_80E3BDC @@ -4115,7 +4115,7 @@ sub_80E3C4C: @ 80E3C4C movs r0, 0x2 adds r6, r7, 0 eors r6, r0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3CAE @@ -4131,10 +4131,10 @@ _080E3CAE: movs r2, 0 mov r8, r2 _080E3CB2: - ldr r0, _080E3D34 @ =gUnknown_030042C4 + ldr r0, _080E3D34 @ =gBattle_WIN0H movs r1, 0 strh r1, [r0] - ldr r0, _080E3D38 @ =gUnknown_03004240 + ldr r0, _080E3D38 @ =gBattle_WIN0V strh r1, [r0] ldr r1, _080E3D3C @ =REG_WININ ldr r3, _080E3D40 @ =0x00003f3f @@ -4175,7 +4175,7 @@ _080E3CB2: movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3D22 @@ -4187,7 +4187,7 @@ _080E3CB2: orrs r1, r0 strb r1, [r4] _080E3D22: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E3D58 @@ -4195,8 +4195,8 @@ _080E3D22: ldrh r4, [r0] b _080E3D96 .align 2, 0 -_080E3D34: .4byte gUnknown_030042C4 -_080E3D38: .4byte gUnknown_03004240 +_080E3D34: .4byte gBattle_WIN0H +_080E3D38: .4byte gBattle_WIN0V _080E3D3C: .4byte REG_WININ _080E3D40: .4byte 0x00003f3f _080E3D44: .4byte 0x00003f3d @@ -4261,7 +4261,7 @@ _080E3DC0: ldr r1, [sp, 0x4] ldr r0, [sp, 0x50] bl LZDecompressVram - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E3DE6 @@ -4281,10 +4281,10 @@ _080E3DE6: ldr r0, [sp, 0x54] movs r2, 0x20 bl LoadCompressedPalette - ldr r0, _080E3E54 @ =gUnknown_030042C0 + ldr r0, _080E3E54 @ =gBattle_BG1_X movs r1, 0 strh r1, [r0] - ldr r0, _080E3E58 @ =gUnknown_030041B4 + ldr r0, _080E3E58 @ =gBattle_BG1_Y strh r1, [r0] ldr r1, _080E3E5C @ =gTasks mov r2, r9 @@ -4323,8 +4323,8 @@ _080E3DE6: _080E3E48: .4byte gBattlePartyID _080E3E4C: .4byte gPlayerParty _080E3E50: .4byte gObjectBankIDs -_080E3E54: .4byte gUnknown_030042C0 -_080E3E58: .4byte gUnknown_030041B4 +_080E3E54: .4byte gBattle_BG1_X +_080E3E58: .4byte gBattle_BG1_Y _080E3E5C: .4byte gTasks _080E3E60: .4byte sub_80E3E64 thumb_func_end sub_80E3C4C @@ -4353,7 +4353,7 @@ _080E3E80: ldrsh r0, [r3, r1] cmp r0, 0 bge _080E3EA4 - ldr r2, _080E3EA0 @ =gUnknown_030041B4 + ldr r2, _080E3EA0 @ =gBattle_BG1_Y lsls r1, r4, 16 asrs r1, 24 ldrh r0, [r2] @@ -4362,9 +4362,9 @@ _080E3E80: b _080E3EB0 .align 2, 0 _080E3E9C: .4byte gTasks -_080E3EA0: .4byte gUnknown_030041B4 +_080E3EA0: .4byte gBattle_BG1_Y _080E3EA4: - ldr r1, _080E3ED4 @ =gUnknown_030041B4 + ldr r1, _080E3ED4 @ =gBattle_BG1_Y lsls r0, r4, 16 asrs r0, 24 ldrh r2, [r1] @@ -4390,7 +4390,7 @@ _080E3EB0: beq _080E3EDE b _080E3FE2 .align 2, 0 -_080E3ED4: .4byte gUnknown_030041B4 +_080E3ED4: .4byte gBattle_BG1_Y _080E3ED8: cmp r0, 0x2 beq _080E3F32 @@ -4465,9 +4465,9 @@ _080E3F32: bne _080E3FE2 movs r0, 0 bl sub_8076464 - ldr r0, _080E3FEC @ =gUnknown_030042C4 + ldr r0, _080E3FEC @ =gBattle_WIN0H strh r5, [r0] - ldr r0, _080E3FF0 @ =gUnknown_03004240 + ldr r0, _080E3FF0 @ =gBattle_WIN0V strh r5, [r0] ldr r0, _080E3FF4 @ =REG_WININ ldr r2, _080E3FF8 @ =0x00003f3f @@ -4475,7 +4475,7 @@ _080E3F32: strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080E3F90 @@ -4531,8 +4531,8 @@ _080E3FE2: bx r0 .align 2, 0 _080E3FE8: .4byte REG_BLDALPHA -_080E3FEC: .4byte gUnknown_030042C4 -_080E3FF0: .4byte gUnknown_03004240 +_080E3FEC: .4byte gBattle_WIN0H +_080E3FF0: .4byte gBattle_WIN0V _080E3FF4: .4byte REG_WININ _080E3FF8: .4byte 0x00003f3f _080E3FFC: .4byte REG_BG1CNT @@ -4596,14 +4596,14 @@ _080E4068: .4byte gBattleAnimArgs _080E406C: cmp r0, 0x1 bne _080E4078 - ldr r0, _080E4074 @ =gBattleAnimBankAttacker + ldr r0, _080E4074 @ =gAnimBankAttacker b _080E407E .align 2, 0 -_080E4074: .4byte gBattleAnimBankAttacker +_080E4074: .4byte gAnimBankAttacker _080E4078: cmp r0, 0x2 bne _080E4084 - ldr r0, _080E409C @ =gBattleAnimBankTarget + ldr r0, _080E409C @ =gAnimBankTarget _080E407E: ldrb r0, [r0] adds r4, r0, 0 @@ -4613,14 +4613,14 @@ _080E4084: movs r1, 0x2 ldrsh r0, [r0, r1] lsls r5, r0, 5 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E40A8 ldr r0, _080E40A4 @ =gSharedMem + 0x14800 b _080E40AA .align 2, 0 -_080E409C: .4byte gBattleAnimBankTarget +_080E409C: .4byte gAnimBankTarget _080E40A0: .4byte gBattleAnimArgs _080E40A4: .4byte gSharedMem + 0x14800 _080E40A8: @@ -4683,14 +4683,14 @@ _080E4110: .4byte gBattleAnimArgs _080E4114: cmp r0, 0x1 bne _080E4120 - ldr r0, _080E411C @ =gBattleAnimBankAttacker + ldr r0, _080E411C @ =gAnimBankAttacker b _080E4126 .align 2, 0 -_080E411C: .4byte gBattleAnimBankAttacker +_080E411C: .4byte gAnimBankAttacker _080E4120: cmp r0, 0x2 bne _080E412C - ldr r0, _080E4148 @ =gBattleAnimBankTarget + ldr r0, _080E4148 @ =gAnimBankTarget _080E4126: ldrb r0, [r0] adds r4, r0, 0 @@ -4703,14 +4703,14 @@ _080E412C: movs r1, 0x2 ldrsh r0, [r0, r1] lsls r4, r0, 5 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E4158 ldr r0, _080E4154 @ =gSharedMem + 0x14800 b _080E415A .align 2, 0 -_080E4148: .4byte gBattleAnimBankTarget +_080E4148: .4byte gAnimBankTarget _080E414C: .4byte gPlttBufferUnfaded _080E4150: .4byte gBattleAnimArgs _080E4154: .4byte gSharedMem + 0x14800 @@ -4770,14 +4770,14 @@ _080E41B8: .4byte gBattleAnimArgs _080E41BC: cmp r0, 0x1 bne _080E41C8 - ldr r0, _080E41C4 @ =gBattleAnimBankAttacker + ldr r0, _080E41C4 @ =gAnimBankAttacker b _080E41CE .align 2, 0 -_080E41C4: .4byte gBattleAnimBankAttacker +_080E41C4: .4byte gAnimBankAttacker _080E41C8: cmp r0, 0x2 bne _080E41D4 - ldr r0, _080E41F4 @ =gBattleAnimBankTarget + ldr r0, _080E41F4 @ =gAnimBankTarget _080E41CE: ldrb r0, [r0] adds r4, r0, 0 @@ -4797,7 +4797,7 @@ _080E41D4: pop {r0} bx r0 .align 2, 0 -_080E41F4: .4byte gBattleAnimBankTarget +_080E41F4: .4byte gAnimBankTarget _080E41F8: .4byte gPlttBufferUnfaded _080E41FC: .4byte gPlttBufferFaded thumb_func_end sub_80E4178 @@ -4807,7 +4807,7 @@ sub_80E4200: @ 80E4200 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -4836,11 +4836,11 @@ sub_80E4234: @ 80E4234 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080E4254 @ =gBattleAnimBankAttacker + ldr r2, _080E4254 @ =gAnimBankAttacker ldr r1, _080E4258 @ =gBankTarget ldrb r1, [r1] strb r1, [r2] - ldr r2, _080E425C @ =gBattleAnimBankTarget + ldr r2, _080E425C @ =gAnimBankTarget ldr r1, _080E4260 @ =gEffectBank ldrb r1, [r1] strb r1, [r2] @@ -4848,9 +4848,9 @@ sub_80E4234: @ 80E4234 pop {r0} bx r0 .align 2, 0 -_080E4254: .4byte gBattleAnimBankAttacker +_080E4254: .4byte gAnimBankAttacker _080E4258: .4byte gBankTarget -_080E425C: .4byte gBattleAnimBankTarget +_080E425C: .4byte gAnimBankTarget _080E4260: .4byte gEffectBank thumb_func_end sub_80E4234 @@ -4859,11 +4859,11 @@ sub_80E4264: @ 80E4264 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080E428C @ =gBattleAnimBankAttacker + ldr r0, _080E428C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide adds r4, r0, 0 - ldr r0, _080E4290 @ =gBattleAnimBankTarget + ldr r0, _080E4290 @ =gAnimBankTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 @@ -4874,8 +4874,8 @@ sub_80E4264: @ 80E4264 movs r0, 0x1 b _080E429C .align 2, 0 -_080E428C: .4byte gBattleAnimBankAttacker -_080E4290: .4byte gBattleAnimBankTarget +_080E428C: .4byte gAnimBankAttacker +_080E4290: .4byte gAnimBankTarget _080E4294: .4byte gBattleAnimArgs _080E4298: ldr r1, _080E42AC @ =gBattleAnimArgs @@ -4896,7 +4896,7 @@ sub_80E42B0: @ 80E42B0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080E42C8 @ =gBattleAnimBankTarget + ldr r2, _080E42C8 @ =gAnimBankTarget ldr r1, _080E42CC @ =gBankTarget ldrb r1, [r1] strb r1, [r2] @@ -4904,7 +4904,7 @@ sub_80E42B0: @ 80E42B0 pop {r0} bx r0 .align 2, 0 -_080E42C8: .4byte gBattleAnimBankTarget +_080E42C8: .4byte gAnimBankTarget _080E42CC: .4byte gBankTarget thumb_func_end sub_80E42B0 @@ -4913,11 +4913,11 @@ sub_80E42D0: @ 80E42D0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080E42F0 @ =gBattleAnimBankAttacker + ldr r2, _080E42F0 @ =gAnimBankAttacker ldr r1, _080E42F4 @ =gBankAttacker ldrb r1, [r1] strb r1, [r2] - ldr r2, _080E42F8 @ =gBattleAnimBankTarget + ldr r2, _080E42F8 @ =gAnimBankTarget ldr r1, _080E42FC @ =gEffectBank ldrb r1, [r1] strb r1, [r2] @@ -4925,9 +4925,9 @@ sub_80E42D0: @ 80E42D0 pop {r0} bx r0 .align 2, 0 -_080E42F0: .4byte gBattleAnimBankAttacker +_080E42F0: .4byte gAnimBankAttacker _080E42F4: .4byte gBankAttacker -_080E42F8: .4byte gBattleAnimBankTarget +_080E42F8: .4byte gAnimBankTarget _080E42FC: .4byte gEffectBank thumb_func_end sub_80E42D0 @@ -4936,7 +4936,7 @@ sub_80E4300: @ 80E4300 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080E4318 @@ -4949,7 +4949,7 @@ _080E4318: adds r3, r4 lsls r3, 3 adds r3, r0 - ldr r1, _080E4358 @ =gBattleAnimBankAttacker + ldr r1, _080E4358 @ =gAnimBankAttacker ldrb r0, [r1] lsls r0, 2 ldr r2, _080E435C @ =gSharedMem + 0x17800 @@ -4977,7 +4977,7 @@ _080E434E: bx r0 .align 2, 0 _080E4354: .4byte gTasks -_080E4358: .4byte gBattleAnimBankAttacker +_080E4358: .4byte gAnimBankAttacker _080E435C: .4byte gSharedMem + 0x17800 _080E4360: .4byte sub_80E4368 _080E4364: .4byte gAnimVisualTaskCount @@ -4995,7 +4995,7 @@ sub_80E4368: @ 80E4368 lsls r0, 5 cmp r1, r0 bne _080E43A8 - ldr r0, _080E43B4 @ =gBattleAnimBankAttacker + ldr r0, _080E43B4 @ =gAnimBankAttacker ldrb r3, [r0] lsls r3, 2 ldr r0, _080E43B8 @ =gSharedMem + 0x17800 @@ -5022,7 +5022,7 @@ _080E43A8: bx r0 .align 2, 0 _080E43B0: .4byte gBattleAnimArgs -_080E43B4: .4byte gBattleAnimBankAttacker +_080E43B4: .4byte gAnimBankAttacker _080E43B8: .4byte gSharedMem + 0x17800 _080E43BC: .4byte gTasks thumb_func_end sub_80E4368 diff --git a/asm/poison.s b/asm/poison.s index 4411027e9..234348df2 100755 --- a/asm/poison.s +++ b/asm/poison.s @@ -25,16 +25,16 @@ _080D9D86: bl sub_80787B0 ldrh r0, [r4, 0x4] strh r0, [r5, 0x2E] - ldr r4, _080D9DC8 @ =gBattleAnimBankTarget + ldr r4, _080D9DC8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -49,7 +49,7 @@ _080D9D86: bx r0 .align 2, 0 _080D9DC4: .4byte gBattleAnimArgs -_080D9DC8: .4byte gBattleAnimBankTarget +_080D9DC8: .4byte gAnimBankTarget _080D9DCC: .4byte 0x0000ffe2 _080D9DD0: .4byte sub_80D9DD4 thumb_func_end sub_80D9D70 @@ -63,7 +63,7 @@ sub_80D9DD4: @ 80D9DD4 cmp r0, 0 beq _080D9DE8 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9DE8: pop {r4} pop {r0} @@ -87,7 +87,7 @@ _080D9E08: adds r0, r4, 0 movs r1, 0x1 bl sub_80787B0 - ldr r0, _080D9E68 @ =gBattleAnimBankTarget + ldr r0, _080D9E68 @ =gAnimBankTarget ldrb r0, [r0] mov r6, sp adds r6, 0x2 @@ -95,7 +95,7 @@ _080D9E08: mov r2, sp adds r3, r6, 0 bl sub_807A3FC - ldr r0, _080D9E6C @ =gBattleAnimBankAttacker + ldr r0, _080D9E6C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -128,8 +128,8 @@ _080D9E36: bx r0 .align 2, 0 _080D9E64: .4byte gBattleAnimArgs -_080D9E68: .4byte gBattleAnimBankTarget -_080D9E6C: .4byte gBattleAnimBankAttacker +_080D9E68: .4byte gAnimBankTarget +_080D9E6C: .4byte gAnimBankAttacker _080D9E70: .4byte 0x0000ffe2 _080D9E74: .4byte sub_80D9E78 thumb_func_end sub_80D9DF0 @@ -143,7 +143,7 @@ sub_80D9E78: @ 80D9E78 cmp r0, 0 beq _080D9E8C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9E8C: pop {r4} pop {r0} @@ -209,7 +209,7 @@ sub_80D9EE8: @ 80D9EE8 cmp r0, 0 bne _080D9F0E adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D9F0E: pop {r4} pop {r0} @@ -220,7 +220,7 @@ _080D9F0E: sub_80D9F14: @ 80D9F14 push {r4,lr} adds r4, r0, 0 - ldr r0, _080D9F74 @ =gBattleAnimBankTarget + ldr r0, _080D9F74 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -228,7 +228,7 @@ sub_80D9F14: @ 80D9F14 adds r3, 0x22 movs r1, 0x1 bl sub_807A3FC - ldr r0, _080D9F78 @ =gBattleAnimBankAttacker + ldr r0, _080D9F78 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -257,18 +257,18 @@ _080D9F40: strh r1, [r4, 0x36] ldr r0, _080D9F80 @ =sub_8078B34 str r0, [r4, 0x1C] - ldr r1, _080D9F84 @ =move_anim_8072740 + ldr r1, _080D9F84 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 .align 2, 0 -_080D9F74: .4byte gBattleAnimBankTarget -_080D9F78: .4byte gBattleAnimBankAttacker +_080D9F74: .4byte gAnimBankTarget +_080D9F78: .4byte gAnimBankAttacker _080D9F7C: .4byte gBattleAnimArgs _080D9F80: .4byte sub_8078B34 -_080D9F84: .4byte move_anim_8072740 +_080D9F84: .4byte DestroyAnimSprite thumb_func_end sub_80D9F14 thumb_func_start sub_80D9F88 @@ -287,7 +287,7 @@ sub_80D9F88: @ 80D9F88 .align 2, 0 _080D9FA0: .4byte gBattleAnimArgs _080D9FA4: - ldr r0, _080D9FE4 @ =gBattleAnimBankTarget + ldr r0, _080D9FE4 @ =gAnimBankTarget ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -295,7 +295,7 @@ _080D9FA4: adds r3, 0x22 movs r1, 0x1 bl sub_807A3FC - ldr r0, _080D9FE8 @ =gBattleAnimBankAttacker + ldr r0, _080D9FE8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -320,8 +320,8 @@ _080D9FDA: pop {r0} bx r0 .align 2, 0 -_080D9FE4: .4byte gBattleAnimBankTarget -_080D9FE8: .4byte gBattleAnimBankAttacker +_080D9FE4: .4byte gAnimBankTarget +_080D9FE8: .4byte gAnimBankAttacker _080D9FEC: .4byte sub_80D9FF0 thumb_func_end sub_80D9F88 @@ -354,7 +354,7 @@ sub_80D9FF0: @ 80D9FF0 cmp r0, 0 beq _080DA02C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DA02C: pop {r4} pop {r0} diff --git a/asm/psychic.s b/asm/psychic.s index fb024a00d..7a6000335 100755 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -11,13 +11,13 @@ sub_80DB74C: @ 80DB74C push {r4-r7,lr} adds r6, r0, 0 - ldr r0, _080DB804 @ =gBattleAnimBankAttacker + ldr r0, _080DB804 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DB768 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DB77E @@ -34,7 +34,7 @@ _080DB768: movs r0, 0xC8 strb r0, [r1] _080DB77E: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DB7DA @@ -75,7 +75,7 @@ _080DB7BC: adds r1, r5, 0 bl sub_8076034 _080DB7DA: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DB810 @@ -83,7 +83,7 @@ _080DB7DA: lsls r0, 24 cmp r0, 0 beq _080DB810 - ldr r0, _080DB804 @ =gBattleAnimBankAttacker + ldr r0, _080DB804 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -94,14 +94,14 @@ _080DB7DA: movs r0, 0x50 b _080DB84A .align 2, 0 -_080DB804: .4byte gBattleAnimBankAttacker +_080DB804: .4byte gAnimBankAttacker _080DB808: movs r0, 0xB0 strh r0, [r6, 0x20] movs r0, 0x28 b _080DB84A _080DB810: - ldr r5, _080DB880 @ =gBattleAnimBankAttacker + ldr r5, _080DB880 @ =gAnimBankAttacker ldrb r0, [r5] bl GetBankSide lsls r0, 24 @@ -114,7 +114,7 @@ _080DB810: _080DB826: ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 ldr r4, _080DB884 @ =gBattleAnimArgs lsrs r0, 24 @@ -123,14 +123,14 @@ _080DB826: strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x2] adds r0, r4 _080DB84A: strh r0, [r6, 0x22] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DB85C @@ -155,7 +155,7 @@ _080DB85C: pop {r0} bx r0 .align 2, 0 -_080DB880: .4byte gBattleAnimBankAttacker +_080DB880: .4byte gAnimBankAttacker _080DB884: .4byte gBattleAnimArgs _080DB888: .4byte sub_80DB88C thumb_func_end sub_80DB74C @@ -269,7 +269,7 @@ sub_80DB92C: @ 80DB92C negs r1, r1 cmp r0, r1 bne _080DB9CC - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DB9BC @@ -344,7 +344,7 @@ _080DB9E0: .4byte sub_80DB9E4 sub_80DB9E4: @ 80DB9E4 push {r4-r6,lr} adds r6, r0, 0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DBA3C @@ -381,13 +381,13 @@ _080DBA22: adds r0, r5, 0 bl sub_8076464 _080DBA3C: - ldr r0, _080DBA48 @ =move_anim_8072740 + ldr r0, _080DBA48 @ =DestroyAnimSprite str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080DBA48: .4byte move_anim_8072740 +_080DBA48: .4byte DestroyAnimSprite thumb_func_end sub_80DB9E4 thumb_func_start sub_80DBA4C @@ -406,7 +406,7 @@ sub_80DBA4C: @ 80DBA4C bne _080DBA66 movs r6, 0x1 _080DBA66: - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DBAAE @@ -414,7 +414,7 @@ _080DBA66: lsls r0, 24 cmp r0, 0 beq _080DBAAE - ldr r0, _080DBA9C @ =gBattleAnimBankAttacker + ldr r0, _080DBA9C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -430,7 +430,7 @@ _080DBA66: b _080DBAD0 .align 2, 0 _080DBA98: .4byte gBattleAnimArgs -_080DBA9C: .4byte gBattleAnimBankAttacker +_080DBA9C: .4byte gAnimBankAttacker _080DBAA0: ldrh r0, [r5] adds r0, 0xB0 @@ -480,16 +480,16 @@ _080DBAEC: sub_80DBAF4: @ 80DBAF4 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080DBB3C @ =gBattleAnimBankAttacker + ldr r4, _080DBB3C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -510,7 +510,7 @@ sub_80DBAF4: @ 80DBAF4 ldr r0, _080DBB40 @ =0x0000ffff b _080DBB52 .align 2, 0 -_080DBB3C: .4byte gBattleAnimBankAttacker +_080DBB3C: .4byte gAnimBankAttacker _080DBB40: .4byte 0x0000ffff _080DBB44: ldrh r0, [r5, 0x20] @@ -522,7 +522,7 @@ _080DBB44: movs r0, 0x1 _080DBB52: strh r0, [r5, 0x30] - ldr r1, _080DBB68 @ =move_anim_8072740 + ldr r1, _080DBB68 @ =DestroyAnimSprite adds r0, r5, 0 bl StoreSpriteCallbackInData ldr r0, _080DBB6C @ =sub_8078600 @@ -531,7 +531,7 @@ _080DBB52: pop {r0} bx r0 .align 2, 0 -_080DBB68: .4byte move_anim_8072740 +_080DBB68: .4byte DestroyAnimSprite _080DBB6C: .4byte sub_8078600 thumb_func_end sub_80DBAF4 @@ -539,7 +539,7 @@ _080DBB6C: .4byte sub_8078600 sub_80DBB70: @ 80DBB70 push {r4-r7,lr} adds r5, r0, 0 - ldr r6, _080DBBF4 @ =gBattleAnimBankAttacker + ldr r6, _080DBBF4 @ =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x1 bl sub_807A100 @@ -572,14 +572,14 @@ sub_80DBB70: @ 80DBB70 _080DBBB6: ldrb r0, [r6] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, r4 strh r0, [r5, 0x20] ldrb r0, [r6] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 adds r0, r7 @@ -600,7 +600,7 @@ _080DBBE2: pop {r0} bx r0 .align 2, 0 -_080DBBF4: .4byte gBattleAnimBankAttacker +_080DBBF4: .4byte gAnimBankAttacker _080DBBF8: .4byte sub_80DBC00 _080DBBFC: .4byte sub_8078600 thumb_func_end sub_80DBB70 @@ -677,7 +677,7 @@ _080DBC74: cmp r0, r1 bne _080DBC8C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DBC8C: pop {r4} pop {r0} @@ -756,7 +756,7 @@ sub_80DBCFC: @ 80DBCFC strh r0, [r4, 0x8] strh r1, [r4, 0xA] strh r1, [r4, 0xC] - ldr r0, _080DBD4C @ =gBattleAnimBankAttacker + ldr r0, _080DBD4C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -777,7 +777,7 @@ _080DBD30: bx r0 .align 2, 0 _080DBD48: .4byte gTasks -_080DBD4C: .4byte gBattleAnimBankAttacker +_080DBD4C: .4byte gAnimBankAttacker _080DBD50: .4byte gUnknown_083DA8C4 _080DBD54: .4byte sub_80DBD58 thumb_func_end sub_80DBCFC @@ -884,16 +884,16 @@ sub_80DBE00: @ 80DBE00 movs r7, 0x10 strh r7, [r5, 0xE] strh r0, [r5, 0x10] - ldr r4, _080DBE88 @ =gBattleAnimBankAttacker + ldr r4, _080DBE88 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x24] @@ -935,7 +935,7 @@ _080DBE6A: bx r0 .align 2, 0 _080DBE84: .4byte gTasks -_080DBE88: .4byte gBattleAnimBankAttacker +_080DBE88: .4byte gAnimBankAttacker _080DBE8C: .4byte REG_BLDCNT _080DBE90: .4byte REG_BLDALPHA _080DBE94: .4byte sub_80DBE98 @@ -1185,7 +1185,7 @@ _080DC04A: cmp r1, r0 bne _080DC05C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DC05C: ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -1204,16 +1204,16 @@ sub_80DC068: @ 80DC068 ldrsh r0, [r6, r1] cmp r0, 0 bne _080DC094 - ldr r4, _080DC0A8 @ =gBattleAnimBankAttacker + ldr r4, _080DC0A8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1227,7 +1227,7 @@ _080DC094: bx r0 .align 2, 0 _080DC0A4: .4byte gBattleAnimArgs -_080DC0A8: .4byte gBattleAnimBankAttacker +_080DC0A8: .4byte gAnimBankAttacker _080DC0AC: .4byte sub_80DC020 thumb_func_end sub_80DC068 @@ -1241,7 +1241,7 @@ sub_80DC0B0: @ 80DC0B0 lsls r1, 3 ldr r0, _080DC10C @ =gTasks adds r5, r1, r0 - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC154 @@ -1252,7 +1252,7 @@ sub_80DC0B0: @ 80DC0B0 bne _080DC120 ldr r0, _080DC114 @ =0x0000fff6 strh r0, [r5, 0x1C] - ldr r4, _080DC118 @ =gBattleAnimBankTarget + ldr r4, _080DC118 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x5 bl sub_807A100 @@ -1263,7 +1263,7 @@ sub_80DC0B0: @ 80DC0B0 bl sub_807A100 adds r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _080DC11C @ =gBattleAnimBankAttacker + ldr r4, _080DC11C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x5 bl sub_807A100 @@ -1278,12 +1278,12 @@ sub_80DC0B0: @ 80DC0B0 _080DC10C: .4byte gTasks _080DC110: .4byte gBattleAnimArgs _080DC114: .4byte 0x0000fff6 -_080DC118: .4byte gBattleAnimBankTarget -_080DC11C: .4byte gBattleAnimBankAttacker +_080DC118: .4byte gAnimBankTarget +_080DC11C: .4byte gAnimBankAttacker _080DC120: movs r0, 0xA strh r0, [r5, 0x1C] - ldr r4, _080DC14C @ =gBattleAnimBankAttacker + ldr r4, _080DC14C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x4 bl sub_807A100 @@ -1294,15 +1294,15 @@ _080DC120: bl sub_807A100 subs r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _080DC150 @ =gBattleAnimBankTarget + ldr r4, _080DC150 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x4 bl sub_807A100 adds r0, 0x8 b _080DC1D2 .align 2, 0 -_080DC14C: .4byte gBattleAnimBankAttacker -_080DC150: .4byte gBattleAnimBankTarget +_080DC14C: .4byte gAnimBankAttacker +_080DC150: .4byte gAnimBankTarget _080DC154: ldr r0, _080DC198 @ =gBattleAnimArgs movs r1, 0 @@ -1311,7 +1311,7 @@ _080DC154: bne _080DC1A8 ldr r0, _080DC19C @ =0x0000fff6 strh r0, [r5, 0x1C] - ldr r4, _080DC1A0 @ =gBattleAnimBankTarget + ldr r4, _080DC1A0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x4 bl sub_807A100 @@ -1322,7 +1322,7 @@ _080DC154: bl sub_807A100 adds r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _080DC1A4 @ =gBattleAnimBankAttacker + ldr r4, _080DC1A4 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x4 bl sub_807A100 @@ -1336,12 +1336,12 @@ _080DC154: .align 2, 0 _080DC198: .4byte gBattleAnimArgs _080DC19C: .4byte 0x0000fff6 -_080DC1A0: .4byte gBattleAnimBankTarget -_080DC1A4: .4byte gBattleAnimBankAttacker +_080DC1A0: .4byte gAnimBankTarget +_080DC1A4: .4byte gAnimBankAttacker _080DC1A8: movs r0, 0xA strh r0, [r5, 0x1C] - ldr r4, _080DC1F0 @ =gBattleAnimBankAttacker + ldr r4, _080DC1F0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x5 bl sub_807A100 @@ -1352,7 +1352,7 @@ _080DC1A8: bl sub_807A100 subs r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _080DC1F4 @ =gBattleAnimBankTarget + ldr r4, _080DC1F4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x5 bl sub_807A100 @@ -1373,8 +1373,8 @@ _080DC1DE: pop {r0} bx r0 .align 2, 0 -_080DC1F0: .4byte gBattleAnimBankAttacker -_080DC1F4: .4byte gBattleAnimBankTarget +_080DC1F0: .4byte gAnimBankAttacker +_080DC1F4: .4byte gAnimBankTarget _080DC1F8: .4byte sub_80DC1FC thumb_func_end sub_80DC0B0 @@ -1499,7 +1499,7 @@ sub_80DC2D4: @ 80DC2D4 lsls r1, 3 ldr r0, _080DC30C @ =gTasks adds r4, r1, r0 - ldr r0, _080DC310 @ =gBattleAnimBankTarget + ldr r0, _080DC310 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8077FC0 lsls r0, 24 @@ -1519,7 +1519,7 @@ sub_80DC2D4: @ 80DC2D4 b _080DC346 .align 2, 0 _080DC30C: .4byte gTasks -_080DC310: .4byte gBattleAnimBankTarget +_080DC310: .4byte gAnimBankTarget _080DC314: .4byte gBattleAnimArgs _080DC318: cmp r0, 0x2 @@ -1557,24 +1557,24 @@ _080DC346: movs r0, 0 strh r0, [r4, 0x24] _080DC352: - ldr r0, _080DC36C @ =gBattleAnimBankTarget + ldr r0, _080DC36C @ =gAnimBankTarget ldrb r0, [r0] bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080DC378 - ldr r0, _080DC370 @ =gUnknown_030042C0 + ldr r0, _080DC370 @ =gBattle_BG1_X ldrh r0, [r0] strh r0, [r4, 0x1C] ldr r0, _080DC374 @ =REG_BG1HOFS b _080DC380 .align 2, 0 -_080DC36C: .4byte gBattleAnimBankTarget -_080DC370: .4byte gUnknown_030042C0 +_080DC36C: .4byte gAnimBankTarget +_080DC370: .4byte gBattle_BG1_X _080DC374: .4byte REG_BG1HOFS _080DC378: - ldr r0, _080DC3E0 @ =gUnknown_03004288 + ldr r0, _080DC3E0 @ =gBattle_BG2_X ldrh r0, [r0] strh r0, [r4, 0x1C] ldr r0, _080DC3E4 @ =REG_BG2HOFS @@ -1629,7 +1629,7 @@ _080DC3BA: pop {r0} bx r0 .align 2, 0 -_080DC3E0: .4byte gUnknown_03004288 +_080DC3E0: .4byte gBattle_BG2_X _080DC3E4: .4byte REG_BG2HOFS _080DC3E8: .4byte gUnknown_03004DE0 _080DC3EC: .4byte 0xa2600001 @@ -2051,20 +2051,20 @@ _080DC716: beq _080DC808 b _080DC818 _080DC720: - ldr r4, _080DC76C @ =gBattleAnimBankAttacker + ldr r4, _080DC76C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DC74E @@ -2088,7 +2088,7 @@ _080DC74E: strh r0, [r2] b _080DC7A2 .align 2, 0 -_080DC76C: .4byte gBattleAnimBankAttacker +_080DC76C: .4byte gAnimBankAttacker _080DC770: .4byte REG_BLDCNT _080DC774: .4byte REG_BLDALPHA _080DC778: @@ -2101,7 +2101,7 @@ _080DC778: beq _080DC818 movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -2171,7 +2171,7 @@ _080DC808: adds r0, 0x2 strh r1, [r0] adds r0, r5, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DC818: pop {r4,r5} pop {r0} diff --git a/asm/rock.s b/asm/rock.s index 66c698577..7942942bc 100755 --- a/asm/rock.s +++ b/asm/rock.s @@ -16,7 +16,7 @@ sub_80DCE9C: @ 80DCE9C ldrsh r0, [r6, r1] cmp r0, 0 beq _080DCEBC - ldr r0, _080DCF0C @ =gBattleAnimBankTarget + ldr r0, _080DCF0C @ =gAnimBankTarget ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x20 @@ -60,7 +60,7 @@ _080DCEBC: bx r0 .align 2, 0 _080DCF08: .4byte gBattleAnimArgs -_080DCF0C: .4byte gBattleAnimBankTarget +_080DCF0C: .4byte gAnimBankTarget _080DCF10: .4byte 0x0000ffba _080DCF14: .4byte sub_80DCF1C _080DCF18: .4byte sub_8078278 @@ -108,7 +108,7 @@ sub_80DCF60: @ 80DCF60 bl StartSpriteAnim adds r0, r5, 0 bl AnimateSprite - ldr r0, _080DCF8C @ =gBattleAnimBankAttacker + ldr r0, _080DCF8C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -120,7 +120,7 @@ sub_80DCF60: @ 80DCF60 b _080DCF96 .align 2, 0 _080DCF88: .4byte gBattleAnimArgs -_080DCF8C: .4byte gBattleAnimBankAttacker +_080DCF8C: .4byte gAnimBankAttacker _080DCF90: ldrh r0, [r4] ldrh r1, [r5, 0x20] @@ -235,7 +235,7 @@ sub_80DD02C: @ 80DD02C cmp r0, r1 bne _080DD072 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DD072: pop {r4} pop {r0} @@ -270,7 +270,7 @@ do_boulder_dust: @ 80DD078 movs r0, 0x3F ands r0, r1 strb r0, [r4, 0x1] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DD0C4 @@ -282,9 +282,9 @@ do_boulder_dust: @ 80DD078 orrs r1, r0 strb r1, [r4] _080DD0C4: - ldr r0, _080DD160 @ =gUnknown_030042C0 + ldr r0, _080DD160 @ =gBattle_BG1_X strh r5, [r0] - ldr r0, _080DD164 @ =gUnknown_030041B4 + ldr r0, _080DD164 @ =gBattle_BG1_Y strh r5, [r0] ldr r0, _080DD168 @ =REG_BG1HOFS strh r5, [r0] @@ -312,7 +312,7 @@ _080DD0C4: lsls r1, 4 movs r2, 0x20 bl LoadCompressedPalette - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080DD120 @@ -328,7 +328,7 @@ _080DD120: ldrsh r0, [r0, r1] cmp r0, 0 beq _080DD13A - ldr r0, _080DD184 @ =gBattleAnimBankAttacker + ldr r0, _080DD184 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -352,8 +352,8 @@ _080DD13A: _080DD154: .4byte REG_BLDCNT _080DD158: .4byte 0x00003f42 _080DD15C: .4byte REG_BG1CNT -_080DD160: .4byte gUnknown_030042C0 -_080DD164: .4byte gUnknown_030041B4 +_080DD160: .4byte gBattle_BG1_X +_080DD164: .4byte gBattle_BG1_Y _080DD168: .4byte REG_BG1HOFS _080DD16C: .4byte 0x040000d4 _080DD170: .4byte 0x85000400 @@ -361,7 +361,7 @@ _080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew _080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew _080DD17C: .4byte gBattleAnimSpritePalette_261 _080DD180: .4byte gBattleAnimArgs -_080DD184: .4byte gBattleAnimBankAttacker +_080DD184: .4byte gAnimBankAttacker _080DD188: .4byte gTasks _080DD18C: .4byte sub_80DD190 thumb_func_end do_boulder_dust @@ -386,7 +386,7 @@ sub_80DD190: @ 80DD190 adds r3, r1, 0 cmp r0, 0 bne _080DD1CC - ldr r1, _080DD1C4 @ =gUnknown_030042C0 + ldr r1, _080DD1C4 @ =gBattle_BG1_X ldr r5, _080DD1C8 @ =0x0000fffa adds r0, r5, 0 ldrh r2, [r1] @@ -394,16 +394,16 @@ sub_80DD190: @ 80DD190 b _080DD1D2 .align 2, 0 _080DD1C0: .4byte gTasks -_080DD1C4: .4byte gUnknown_030042C0 +_080DD1C4: .4byte gBattle_BG1_X _080DD1C8: .4byte 0x0000fffa _080DD1CC: - ldr r1, _080DD204 @ =gUnknown_030042C0 + ldr r1, _080DD204 @ =gBattle_BG1_X ldrh r0, [r1] adds r0, 0x6 _080DD1D2: strh r0, [r1] adds r4, r1, 0 - ldr r1, _080DD208 @ =gUnknown_030041B4 + ldr r1, _080DD208 @ =gBattle_BG1_Y ldr r5, _080DD20C @ =0x0000ffff adds r0, r5, 0 ldrh r2, [r1] @@ -427,8 +427,8 @@ _080DD1F8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DD204: .4byte gUnknown_030042C0 -_080DD208: .4byte gUnknown_030041B4 +_080DD204: .4byte gBattle_BG1_X +_080DD208: .4byte gBattle_BG1_Y _080DD20C: .4byte 0x0000ffff _080DD210: .4byte _080DD214 .align 2, 0 @@ -574,7 +574,7 @@ _080DD2F6: ldr r1, _080DD394 @ =0x85000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080DD344 @@ -593,8 +593,8 @@ _080DD344: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - ldr r4, _080DD3A0 @ =gUnknown_030042C0 - ldr r2, _080DD3A4 @ =gUnknown_030041B4 + ldr r4, _080DD3A0 @ =gBattle_BG1_X + ldr r2, _080DD3A4 @ =gBattle_BG1_Y _080DD358: movs r1, 0 strh r1, [r4] @@ -628,8 +628,8 @@ _080DD390: .4byte 0x85000400 _080DD394: .4byte 0x85000200 _080DD398: .4byte REG_BG1CNT _080DD39C: .4byte gTasks -_080DD3A0: .4byte gUnknown_030042C0 -_080DD3A4: .4byte gUnknown_030041B4 +_080DD3A0: .4byte gBattle_BG1_X +_080DD3A4: .4byte gBattle_BG1_Y _080DD3A8: .4byte REG_BLDCNT thumb_func_end sub_80DD190 @@ -646,7 +646,7 @@ sub_80DD3AC: @ 80DD3AC ldrsh r0, [r4, r2] cmp r0, 0 beq _080DD3F8 - ldr r0, _080DD3F4 @ =gBattleAnimBankAttacker + ldr r0, _080DD3F4 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -669,7 +669,7 @@ sub_80DD3AC: @ 80DD3AC b _080DD3FC .align 2, 0 _080DD3F0: .4byte gBattleAnimArgs -_080DD3F4: .4byte gBattleAnimBankAttacker +_080DD3F4: .4byte gAnimBankAttacker _080DD3F8: ldr r0, _080DD41C @ =0x0000ffc0 strh r0, [r5, 0x20] @@ -739,14 +739,14 @@ _080DD46E: cmp r0, r1 bge _080DD484 _080DD480: - ldr r0, _080DD48C @ =move_anim_8072740 + ldr r0, _080DD48C @ =DestroyAnimSprite str r0, [r5, 0x1C] _080DD484: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080DD48C: .4byte move_anim_8072740 +_080DD48C: .4byte DestroyAnimSprite thumb_func_end sub_80DD3AC thumb_func_start sub_80DD490 @@ -769,7 +769,7 @@ sub_80DD490: @ 80DD490 strh r0, [r4, 0x36] ldr r0, _080DD4CC @ =sub_8078B34 str r0, [r4, 0x1C] - ldr r1, _080DD4D0 @ =move_anim_8072740 + ldr r1, _080DD4D0 @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData pop {r4,r5} @@ -778,7 +778,7 @@ sub_80DD490: @ 80DD490 .align 2, 0 _080DD4C8: .4byte gBattleAnimArgs _080DD4CC: .4byte sub_8078B34 -_080DD4D0: .4byte move_anim_8072740 +_080DD4D0: .4byte DestroyAnimSprite thumb_func_end sub_80DD490 thumb_func_start sub_80DD4D4 @@ -795,32 +795,32 @@ sub_80DD4D4: @ 80DD4D4 lsls r1, 3 ldr r0, _080DD554 @ =gTasks adds r6, r1, r0 - ldr r5, _080DD558 @ =gBattleAnimBankAttacker + ldr r5, _080DD558 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r9, r0 ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r1, 0xC0 lsls r1, 13 adds r0, r1 lsrs r7, r0, 16 - ldr r4, _080DD55C @ =gBattleAnimBankTarget + ldr r4, _080DD55C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r10, r0 ldrb r0, [r4] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 8 movs r2, 0xC0 @@ -845,8 +845,8 @@ _080DD544: b _080DD566 .align 2, 0 _080DD554: .4byte gTasks -_080DD558: .4byte gBattleAnimBankAttacker -_080DD55C: .4byte gBattleAnimBankTarget +_080DD558: .4byte gAnimBankAttacker +_080DD55C: .4byte gAnimBankTarget _080DD560: lsls r1, r5, 3 movs r0, 0x30 @@ -891,13 +891,13 @@ _080DD57E: strh r4, [r6, 0x16] movs r0, 0x40 negs r0, r0 - bl sub_8076F98 + bl BattleAnimAdjustPanning adds r4, r0, 0 lsls r4, 24 asrs r4, 8 lsrs r4, 16 movs r0, 0x3F - bl sub_8076F98 + bl BattleAnimAdjustPanning lsls r0, 24 strh r4, [r6, 0x22] asrs r0, 24 @@ -1379,7 +1379,7 @@ _080DD960: cmp r0, 0 bne _080DD972 adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DD972: pop {r0} bx r0 @@ -1389,7 +1389,7 @@ _080DD972: sub_80DD978: @ 80DD978 push {r4,lr} adds r4, r0, 0 - ldr r0, _080DD9A0 @ =gBattleAnimBankAttacker + ldr r0, _080DD9A0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1406,23 +1406,23 @@ _080DD994: pop {r0} bx r0 .align 2, 0 -_080DD9A0: .4byte gBattleAnimBankAttacker +_080DD9A0: .4byte gAnimBankAttacker thumb_func_end sub_80DD978 thumb_func_start sub_80DD9A4 sub_80DD9A4: @ 80DD9A4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080DD9F0 @ =gBattleAnimBankTarget + ldr r5, _080DD9F0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x1 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 ldr r2, _080DD9F4 @ =gBattleAnimArgs @@ -1446,7 +1446,7 @@ sub_80DD9A4: @ 80DD9A4 pop {r0} bx r0 .align 2, 0 -_080DD9F0: .4byte gBattleAnimBankTarget +_080DD9F0: .4byte gAnimBankTarget _080DD9F4: .4byte gBattleAnimArgs _080DD9F8: .4byte sub_80DD9FC thumb_func_end sub_80DD9A4 @@ -1486,7 +1486,7 @@ sub_80DD9FC: @ 80DD9FC cmp r0, 0x8C ble _080DDA46 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080DDA46: pop {r4} pop {r0} @@ -1498,7 +1498,7 @@ sub_80DDA4C: @ 80DDA4C push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080DDA84 @ =gMoveDmgMoveAnim + ldr r2, _080DDA84 @ =gAnimMoveDmg ldr r0, [r2] cmp r0, 0x20 bgt _080DDA60 @@ -1526,7 +1526,7 @@ _080DDA7A: pop {r0} bx r0 .align 2, 0 -_080DDA84: .4byte gMoveDmgMoveAnim +_080DDA84: .4byte gAnimMoveDmg _080DDA88: .4byte gBattleAnimArgs thumb_func_end sub_80DDA4C diff --git a/asm/water.s b/asm/water.s index 4bf95ab59..d72f9438c 100755 --- a/asm/water.s +++ b/asm/water.s @@ -23,16 +23,16 @@ sub_80D3B60: @ 80D3B60 lsls r4, 3 adds r4, r0 ldrh r0, [r4, 0x8] - ldr r1, _080D3D48 @ =gUnknown_030042C0 + ldr r1, _080D3D48 @ =gBattle_BG1_X ldrh r1, [r1] adds r0, r1 - ldr r2, _080D3D48 @ =gUnknown_030042C0 + ldr r2, _080D3D48 @ =gBattle_BG1_X strh r0, [r2] ldrh r0, [r4, 0xA] - ldr r3, _080D3D4C @ =gUnknown_030041B4 + ldr r3, _080D3D4C @ =gBattle_BG1_Y ldrh r3, [r3] adds r0, r3 - ldr r1, _080D3D4C @ =gUnknown_030041B4 + ldr r1, _080D3D4C @ =gBattle_BG1_Y strh r0, [r1] add r5, sp, 0x4 adds r0, r5, 0 @@ -211,7 +211,7 @@ _080D3CAA: ldr r1, _080D3D58 @ =0x85000400 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 bne _080D3D02 @@ -222,9 +222,9 @@ _080D3CAA: ands r0, r1 strb r0, [r2] _080D3D02: - ldr r0, _080D3D48 @ =gUnknown_030042C0 + ldr r0, _080D3D48 @ =gBattle_BG1_X strh r4, [r0] - ldr r1, _080D3D4C @ =gUnknown_030041B4 + ldr r1, _080D3D4C @ =gBattle_BG1_Y strh r4, [r1] ldr r0, _080D3D60 @ =REG_BLDCNT strh r4, [r0] @@ -256,8 +256,8 @@ _080D3D32: bx r0 .align 2, 0 _080D3D44: .4byte gTasks -_080D3D48: .4byte gUnknown_030042C0 -_080D3D4C: .4byte gUnknown_030041B4 +_080D3D48: .4byte gBattle_BG1_X +_080D3D4C: .4byte gBattle_BG1_Y _080D3D50: .4byte gPlttBufferFaded _080D3D54: .4byte 0x040000d4 _080D3D58: .4byte 0x85000400 @@ -739,7 +739,7 @@ _080D40D0: cmp r0, 0x15 bne _080D40EE adds r0, r2, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D40EE: pop {r4} pop {r0} @@ -1083,7 +1083,7 @@ _080D438A: thumb_func_start sub_80D4394 sub_80D4394: @ 80D4394 push {r4,r5,lr} - ldr r4, _080D43B8 @ =gBattleAnimBankAttacker + ldr r4, _080D43B8 @ =gAnimBankAttacker ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1099,7 +1099,7 @@ sub_80D4394: @ 80D4394 ldr r0, _080D43C0 @ =gPlayerParty b _080D43D8 .align 2, 0 -_080D43B8: .4byte gBattleAnimBankAttacker +_080D43B8: .4byte gAnimBankAttacker _080D43BC: .4byte gBattlePartyID _080D43C0: .4byte gPlayerParty _080D43C4: @@ -1160,16 +1160,16 @@ sub_80D4418: @ 80D4418 lsls r1, 24 lsrs r1, 24 str r1, [sp] - ldr r4, _080D4520 @ =gBattleAnimBankAttacker + ldr r4, _080D4520 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 mov r8, r0 ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r6, r0, 24 movs r5, 0xAC @@ -1280,7 +1280,7 @@ _080D44EA: pop {r0} bx r0 .align 2, 0 -_080D4520: .4byte gBattleAnimBankAttacker +_080D4520: .4byte gAnimBankAttacker _080D4524: .4byte gSpriteTemplate_83D9378 _080D4528: .4byte gSprites thumb_func_end sub_80D4418 @@ -1390,7 +1390,7 @@ sub_80D45D8: @ 80D45D8 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xA] - ldr r0, _080D460C @ =gBattleAnimBankAttacker + ldr r0, _080D460C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -1402,7 +1402,7 @@ sub_80D45D8: @ 80D45D8 b _080D4616 .align 2, 0 _080D4608: .4byte gTasks -_080D460C: .4byte gBattleAnimBankAttacker +_080D460C: .4byte gAnimBankAttacker _080D4610: movs r0, 0x10 strh r0, [r4, 0x10] @@ -1788,17 +1788,17 @@ sub_80D48F4: @ 80D48F4 lsls r1, 3 ldr r0, _080D4978 @ =gTasks adds r5, r1, r0 - ldr r4, _080D497C @ =gBattleAnimBankAttacker + ldr r4, _080D497C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 movs r6, 0 strh r0, [r5, 0xE] ldrb r0, [r4] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x10] @@ -1813,7 +1813,7 @@ sub_80D48F4: @ 80D48F4 movs r1, 0x1 _080D4938: strh r1, [r5, 0x16] - bl NotInBattle + bl IsContest lsls r0, 24 cmp r0, 0 beq _080D494C @@ -1845,7 +1845,7 @@ _080D494C: bx r0 .align 2, 0 _080D4978: .4byte gTasks -_080D497C: .4byte gBattleAnimBankAttacker +_080D497C: .4byte gAnimBankAttacker _080D4980: .4byte 0x0000ffe0 _080D4984: .4byte sub_80D4988 thumb_func_end sub_80D48F4 @@ -2218,7 +2218,7 @@ sub_80D4C18: @ 80D4C18 cmp r0, 0 bne _080D4C5C adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D4C5C: pop {r4} pop {r0} @@ -2265,16 +2265,16 @@ sub_80D4CA4: @ 80D4CA4 adds r4, r0, 0 movs r1, 0x1 bl sub_80787B0 - ldr r5, _080D4CE0 @ =gBattleAnimBankTarget + ldr r5, _080D4CE0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x30] ldrb r0, [r5] movs r1, 0x3 - bl sub_8077ABC + bl GetBankPosition lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -2289,7 +2289,7 @@ sub_80D4CA4: @ 80D4CA4 pop {r0} bx r0 .align 2, 0 -_080D4CE0: .4byte gBattleAnimBankTarget +_080D4CE0: .4byte gAnimBankTarget _080D4CE4: .4byte gBattleAnimArgs _080D4CE8: .4byte sub_80D4CEC thumb_func_end sub_80D4CA4 @@ -2345,7 +2345,7 @@ _080D4D44: cmp r1, r0 bne _080D4D56 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D4D56: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -2443,7 +2443,7 @@ _080D4DF2: strh r0, [r4, 0x2E] mov r0, r9 strh r0, [r4, 0x30] - ldr r0, _080D4E3C @ =gBattleAnimBankAttacker + ldr r0, _080D4E3C @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 subs r0, 0x1 @@ -2459,7 +2459,7 @@ _080D4DF2: .align 2, 0 _080D4E34: .4byte gSpriteTemplate_83D9420 _080D4E38: .4byte gSprites -_080D4E3C: .4byte gBattleAnimBankAttacker +_080D4E3C: .4byte gAnimBankAttacker _080D4E40: strh r7, [r4, 0x32] _080D4E42: @@ -2501,7 +2501,7 @@ _080D4E68: strh r0, [r4, 0x2E] mov r0, r9 strh r0, [r4, 0x30] - ldr r0, _080D4EB4 @ =gBattleAnimBankAttacker + ldr r0, _080D4EB4 @ =gAnimBankAttacker ldrb r0, [r0] bl sub_8079E90 subs r0, 0x1 @@ -2517,7 +2517,7 @@ _080D4E68: .align 2, 0 _080D4EAC: .4byte gSpriteTemplate_83D9420 _080D4EB0: .4byte gSprites -_080D4EB4: .4byte gBattleAnimBankAttacker +_080D4EB4: .4byte gAnimBankAttacker _080D4EB8: strh r7, [r4, 0x32] _080D4EBA: diff --git a/asm/wisp_fire.s b/asm/wisp_fire.s index a22903e6b..a6407589f 100755 --- a/asm/wisp_fire.s +++ b/asm/wisp_fire.s @@ -63,7 +63,7 @@ _080D5CD8: lsrs r0, 16 cmp r0, 0x83 bls _080D5D5C - ldr r0, _080D5D58 @ =gBattleAnimBankTarget + ldr r0, _080D5D58 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 movs r1, 0x3 @@ -80,9 +80,9 @@ _080D5CD8: _080D5D4C: .4byte gBattleAnimArgs _080D5D50: .4byte gMain _080D5D54: .4byte 0x0000043d -_080D5D58: .4byte gBattleAnimBankTarget +_080D5D58: .4byte gAnimBankTarget _080D5D5C: - ldr r0, _080D5D80 @ =gBattleAnimBankTarget + ldr r0, _080D5D80 @ =gAnimBankTarget ldrb r0, [r0] bl sub_8079ED4 lsls r0, 24 @@ -99,7 +99,7 @@ _080D5D5C: strb r1, [r4, 0x5] b _080D5DA0 .align 2, 0 -_080D5D80: .4byte gBattleAnimBankTarget +_080D5D80: .4byte gAnimBankTarget _080D5D84: adds r0, r2, 0 subs r0, 0x40 @@ -144,7 +144,7 @@ _080D5DC8: cmp r0, 0x1E bne _080D5DD6 adds r0, r4, 0 - bl move_anim_8072740 + bl DestroyAnimSprite _080D5DD6: pop {r4} pop {r0} @@ -161,7 +161,7 @@ sub_80D5DDC: @ 80D5DDC lsls r1, 3 ldr r0, _080D5E3C @ =gTasks adds r4, r1, r0 - ldr r0, _080D5E40 @ =gBattleAnimBankAttacker + ldr r0, _080D5E40 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -173,7 +173,7 @@ sub_80D5DDC: @ 80D5DDC movs r1, 0x1 _080D5E02: strh r1, [r4, 0x20] - ldr r0, _080D5E44 @ =gBattleAnimBankTarget + ldr r0, _080D5E44 @ =gAnimBankTarget ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -199,8 +199,8 @@ _080D5E02: bx r0 .align 2, 0 _080D5E3C: .4byte gTasks -_080D5E40: .4byte gBattleAnimBankAttacker -_080D5E44: .4byte gBattleAnimBankTarget +_080D5E40: .4byte gAnimBankAttacker +_080D5E44: .4byte gAnimBankTarget _080D5E48: .4byte sub_80D5E4C thumb_func_end sub_80D5DDC @@ -570,7 +570,7 @@ _080D60EA: adds r0, 0x1 strh r0, [r2, 0x8] ldr r1, _080D6114 @ =gObjectBankIDs - ldr r0, _080D6118 @ =gBattleAnimBankTarget + ldr r0, _080D6118 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 ldrb r6, [r0] @@ -586,7 +586,7 @@ _080D60EA: _080D610C: .4byte gTasks _080D6110: .4byte gBattleAnimArgs _080D6114: .4byte gObjectBankIDs -_080D6118: .4byte gBattleAnimBankTarget +_080D6118: .4byte gAnimBankTarget _080D611C: .4byte gUnknown_083D9794 _080D6120: ldr r4, _080D616C @ =gUnknown_083D97A4 diff --git a/include/battle.h b/include/battle.h index dda71e562..febb5807a 100644 --- a/include/battle.h +++ b/include/battle.h @@ -838,7 +838,7 @@ extern u8 gBattleTextBuff1[]; // asm/battle_1.o void sub_800D6D4(); void sub_800D74C(); -void sub_800D7B8(void); +void DrawMainBattleBackground(void); void sub_800DAB8(); void sub_800DE30(u8); void sub_800E23C(); diff --git a/include/battle_anim.h b/include/battle_anim.h index 9decb8f95..2db27599f 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -9,6 +9,14 @@ #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2) #define REG_BG3CNT_BITFIELD REG_BGnCNT_BITFIELD(3) +enum +{ + ANIM_BANK_ATTACKER, + ANIM_BANK_TARGET, + ANIM_BANK_ATK_PARTNER, + ANIM_BANK_DEF_PARTNER, +}; + struct BattleAnimBackground { void *image; @@ -36,20 +44,20 @@ struct UnknownStruct3 extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; -extern u8 gHappinessMoveAnim; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimFriendship; +extern u8 gAnimMoveTurn; -void ExecuteMoveAnim(u16 move); -void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c); +void DoMoveAnim(u16 move); +void LaunchBattleAnimation(const u8 *const moveAnims[], u16 b, u8 c); bool8 IsAnimBankSpriteVisible(u8 a); void sub_8076034(u8, u8); -bool8 NotInBattle(void); -void battle_anim_clear_some_data(void); -void move_anim_8072740(struct Sprite *sprite); +bool8 IsContest(void); +void ClearBattleAnimationVars(void); +void DestroyAnimSprite(struct Sprite *sprite); void DestroyAnimVisualTask(u8 task); void DestroyAnimVisualTask(u8 task); bool8 IsAnimBankSpriteVisible(u8); -s8 sub_8076F98(s8 a); +s8 BattleAnimAdjustPanning(s8 a); void sub_80763FC(u16 a, u16 *b, u32 c, u8 d); #endif diff --git a/include/battle_interface.h b/include/battle_interface.h index db41ee735..a3e00fd12 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -22,7 +22,7 @@ void sub_8043D84(u8, u8, u32, u32, u32); void sub_8043DB0(u8); void sub_8043DFC(u8); void nullsub_11(); -void sub_8043EB4(u8); +void UpdateOamPriorityInAllHealthboxes(u8); void sub_8043F44(u8); void sub_804454C(void); u8 sub_8044804(u8, const struct BattleInterfaceStruct2 *, u8, u8); diff --git a/include/contest.h b/include/contest.h index ae2767aef..10392c00e 100644 --- a/include/contest.h +++ b/include/contest.h @@ -73,14 +73,14 @@ extern const struct ContestEffect gContestEffects[]; extern const u8 *const gContestEffectStrings[]; void ResetLinkContestBoolean(void); -void sub_80AB2AC(void); +void LoadContestBgAfterMoveAnim(void); void CB2_StartContest(void); void Contest_CreatePlayerMon(u8); void Contest_InitAllPokemon(u8, u8); u8 sub_80AE47C(struct Pokemon *party); u16 sub_80AE770(u8, u8); void sub_80AE82C(u8); -u8 sub_80AEB1C(u16); +u8 IsSpeciesNotUnown(u16); void sub_80AF668(void); void sub_80B0F28(u8); bool8 Contest_SaveWinner(u8); diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 70bd6fe5a..04d996a21 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -4,21 +4,13 @@ #include "sprite.h" #include "task.h" -enum -{ - ANIM_BANK_ATK, - ANIM_BANK_DEF, - ANIM_BANK_ATK_PARTNER, - ANIM_BANK_DEF_PARTNER -}; - struct Struct_sub_8078914 { u8 *field_0; u8 *field_4; u8 field_8; }; -u8 sub_8077ABC(u8, u8); +u8 GetBankPosition(u8, u8); u8 sub_8077E44(u8 slot, u16 species, u8 a3); u8 GetAnimBankSpriteId(u8 side); void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *)); @@ -36,8 +28,7 @@ u8 GetBankIdentity(u8 slot); u8 GetBankByPlayerAI(u8); u8 GetBankByPlayerAI(u8); u8 GetBankByPlayerAI(u8 state); -u8 AnimBankSpriteExists(u8); -bool8 AnimBankSpriteExists(u8); +bool8 IsBankSpritePresent(u8); bool8 IsDoubleBattle(); u8 IsDoubleBattle(void); bool8 IsDoubleBattle(void); diff --git a/include/sprite.h b/include/sprite.h index 9937a0797..13c76c84b 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -246,7 +246,7 @@ void BuildOamBuffer(void); u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)); -u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); +u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); void DestroySprite(struct Sprite *sprite); void ResetOamRange(u8 a, u8 b); void LoadOam(void); diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c index 538008be0..7cd42c17b 100755 --- a/src/battle/anim/alert.c +++ b/src/battle/anim/alert.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // alert (red thunder from the sides of a Pokemon, simulating more alert behavior.) // Used in Kinesis. @@ -16,7 +16,7 @@ void sub_80CF610(struct Sprite* sprite) sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->hFlip = 1; if (gBattleAnimArgs[2] != 0) @@ -29,5 +29,5 @@ void sub_80CF610(struct Sprite* sprite) } sprite->callback = sub_8078600; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c index 916ebfdfd..5ec083887 100755 --- a/src/battle/anim/angel.c +++ b/src/battle/anim/angel.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // angel (a little angel descends from somewhere towards a position) // Used in Sweet Kiss. @@ -33,5 +33,5 @@ void sub_80D2938(struct Sprite* sprite) } if (sprite->data[0] > 0x64) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c index 453c4d802..d5be6e2af 100755 --- a/src/battle/anim/angel_kiss.c +++ b/src/battle/anim/angel_kiss.c @@ -6,8 +6,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // angel_kiss (a different variation of kiss_fountain.) // Used in Sweet Kiss. @@ -22,7 +22,7 @@ void sub_80D29CC(struct Sprite* sprite) sprite->invisible = sprite->data[5] % 2; if (sprite->data[5] > 30) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80D2A38(struct Sprite* sprite) @@ -62,7 +62,7 @@ void sub_80D2A38(struct Sprite* sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1; + sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1; sprite->data[2] = 1; } diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c index 8962e0855..011aa68ce 100755 --- a/src/battle/anim/anger.c +++ b/src/battle/anim/anger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // anger (anger emotes, usually above the Pokemon's head, indicating annoyed emotions.) // Used in Frustration, Rage, Swagger, Torment, and Taunt. @@ -15,17 +15,17 @@ void sub_80D09C0(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; if (GetBankSide(bank) == 1) { gBattleAnimArgs[1] *= -1; } - sprite->pos1.x = sub_8077ABC(bank, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(bank, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[2]; if (sprite->pos1.y <= 7) sprite->pos1.y = 8; diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c index 1ca5e649f..90fa5c879 100644 --- a/src/battle/anim/aurora.c +++ b/src/battle/anim/aurora.c @@ -6,8 +6,8 @@ #include "task.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D344C(struct Sprite *); static void sub_80D34D4(u8); @@ -17,15 +17,15 @@ void sub_80D33B4(struct Sprite *sprite) s16 r6; sub_80787B0(sprite, 1); - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) r6 = -gBattleAnimArgs[2]; else r6 = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r6; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r6; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; obj_translate_based_on_private_1_2_3_4(sprite); sprite->callback = sub_80D344C; sprite->affineAnimPaused = TRUE; @@ -40,7 +40,7 @@ static void sub_80D344C(struct Sprite *sprite) sprite->affineAnimPaused = FALSE; } if (sub_8078B5C(sprite) != 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80D3490(u8 taskId) diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c index 499e52a80..3af6dd926 100644 --- a/src/battle/anim/beta_beat_up.c +++ b/src/battle/anim/beta_beat_up.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D6278(struct Sprite *); @@ -13,7 +13,7 @@ static void sub_80D6278(struct Sprite *); void sub_80D6234(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c index e63f7189d..e7b49471d 100755 --- a/src/battle/anim/blow_kiss.c +++ b/src/battle/anim/blow_kiss.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D1FA4(struct Sprite* sprite); @@ -18,9 +18,9 @@ void sub_80D1F58(struct Sprite* sprite) sub_80787B0(sprite, 1); sprite->data[0] = 0x5F; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); sprite->callback = sub_80D1FA4; } @@ -34,6 +34,6 @@ void sub_80D1FA4(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c index ac5e51881..5485bcf5d 100755 --- a/src/battle/anim/bottle.c +++ b/src/battle/anim/bottle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCF70(struct Sprite* sprite); static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2); @@ -16,8 +16,8 @@ static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2); void sub_80CCF04(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + 0xFFE8; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 0xFFE8; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; @@ -98,7 +98,7 @@ void sub_80CCF70(struct Sprite* sprite) case 4: REG_BLDCNT = 0; REG_BLDALPHA = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); break; } } diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c index 7b084efbb..19ea4297b 100755 --- a/src/battle/anim/brace.c +++ b/src/battle/anim/brace.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CDF70(struct Sprite* sprite); @@ -17,13 +17,13 @@ void sub_80CDF0C(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[2]; } sprite->data[0] = 0; @@ -41,5 +41,5 @@ void sub_80CDF70(struct Sprite* sprite) sprite->pos1.y -= sprite->data[0]; if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c index 0fcc7fa08..831b222ad 100755 --- a/src/battle/anim/breath.c +++ b/src/battle/anim/breath.c @@ -5,32 +5,32 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // breath (a puff of smoke, usually from the mouth or nose of the Pokemon.) // Used in Swagger and Bulk Up. void sub_80D0930(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { StartSpriteAnim(sprite, 0); - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + 32; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + 32; sprite->data[1] = 0x40; } else { StartSpriteAnim(sprite, 1); - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - 32; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - 32; sprite->data[1] = -0x40; } - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = 0x34; sprite->data[2] = 0; sprite->data[3] = 0; sprite->data[4] = 0; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index 5da0d9929..403003ce3 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -5,8 +5,8 @@ #include "util.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D32E8(struct Sprite *sprite); static void sub_80D3370(struct Sprite *sprite); @@ -19,29 +19,29 @@ void sub_80D31C8(struct Sprite* sprite) { u8 newSpriteId; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1]; } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1]; } sprite->animPaused = 1; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[6]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c index 11306873a..90b2021f1 100755 --- a/src/battle/anim/bullet.c +++ b/src/battle/anim/bullet.c @@ -6,8 +6,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D0030(struct Sprite* sprite); static void sub_80D00B4(struct Sprite* sprite); @@ -19,8 +19,8 @@ void sub_80CFFD8(struct Sprite* sprite) { sub_80787B0(sprite, 1); sprite->data[0] = 20; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sprite->callback = sub_8078B34; sprite->affineAnimPaused = 1; StoreSpriteCallbackInData(sprite, sub_80D0030); @@ -31,7 +31,7 @@ void sub_80D0030(struct Sprite* sprite) int i; u16 rand; s16* ptr; - PlaySE12WithPanning(0xA6, sub_8076F98(0x3F)); + PlaySE12WithPanning(0xA6, BattleAnimAdjustPanning(0x3F)); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; @@ -64,6 +64,6 @@ void sub_80D00B4(struct Sprite* sprite) sprite->data[1] = 0; sprite->data[2] /= 2; if (++sprite->data[3] == 1) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c index 96d2910f0..4fa8ea163 100755 --- a/src/battle/anim/copy_orb.c +++ b/src/battle/anim/copy_orb.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // copy_orb // Used in Mimic. @@ -16,14 +16,14 @@ void sub_80CB4CC(struct Sprite* sprite) { case 0: { - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) { s16 a = gBattleAnimArgs[0]; gBattleAnimArgs[0] = -a; } - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[1]; sprite->invisible = 1; sprite->data[0]++; break; @@ -35,10 +35,10 @@ void sub_80CB4CC(struct Sprite* sprite) { ChangeSpriteAffineAnim(sprite, 1); sprite->data[0] = 25; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_8078CC0; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); break; } } diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c index 07b3ea517..9adf46e32 100755 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -6,8 +6,8 @@ #include "constants/songs.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE000(struct Sprite* sprite); @@ -16,14 +16,14 @@ static void sub_80CE000(struct Sprite* sprite); void sub_80CDFB0(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) - 12; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) - 12; sprite->data[0] = 0; sprite->data[1] = 2; sprite->data[2] = 0; sprite->data[3] = 0; sprite->data[4] = 0; - sprite->data[5] = sub_8076F98(-0x40); + sprite->data[5] = BattleAnimAdjustPanning(-0x40); sprite->callback = sub_80CE000; } @@ -48,5 +48,5 @@ void sub_80CE000(struct Sprite* sprite) } if (sprite->animEnded && sprite->data[1] > 16 && sprite->invisible) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/curtain.c b/src/battle/anim/curtain.c index 1f34cb173..3c9e4e84c 100755 --- a/src/battle/anim/curtain.c +++ b/src/battle/anim/curtain.c @@ -6,11 +6,11 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; -extern u16 gUnknown_03004240; -extern u16 gUnknown_030042C4; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN0H; static void sub_80D1D48(u8 taskId); static void sub_80D1D9C(u8 taskId); @@ -21,7 +21,7 @@ static void sub_80D1D9C(u8 taskId); void sub_80D1CD0(u8 taskId) { int zero; - bool8 result = NotInBattle(); + bool8 result = IsContest(); u16 var = 0xF0; if (result) { @@ -33,8 +33,8 @@ void sub_80D1CD0(u8 taskId) zero = 0; } - gUnknown_030042C4 = var; - gUnknown_03004240 = 0xA0; + gBattle_WIN0H = var; + gBattle_WIN0V = 0xA0; REG_WIN0H = var; REG_WIN0V = 0xA0; REG_WININ = 0x3F1F; @@ -52,12 +52,12 @@ void sub_80D1D48(u8 taskId) gTasks[taskId].data[1] -= 13; if (gTasks[taskId].data[0] >= gTasks[taskId].data[1]) { - gUnknown_030042C4 = 0; + gBattle_WIN0H = 0; gTasks[taskId].func = sub_80D1D9C; } else { - gUnknown_030042C4 = gTasks[taskId].data[1] | (gTasks[taskId].data[0] << 8); + gBattle_WIN0H = gTasks[taskId].data[1] | (gTasks[taskId].data[0] << 8); } } @@ -71,8 +71,8 @@ void sub_80D1D9C(u8 taskId) } else if (gTasks[taskId].data[10] > 4) { - gUnknown_030042C4 = 0; - gUnknown_03004240 = 0; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; REG_WININ = 0x3F3F; REG_WINOUT = 0x3F3F; REG_BLDCNT = 0; diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c index 9859497e5..2234ebacb 100755 --- a/src/battle/anim/cutter.c +++ b/src/battle/anim/cutter.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CB09C(struct Sprite* sprite); static void sub_80CB1A4(struct Sprite* sprite); @@ -16,7 +16,7 @@ static void sub_80CB1A4(struct Sprite* sprite); void sub_80CAFD0(struct Sprite* sprite) { sub_80787B0(sprite, 1); - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } @@ -24,19 +24,19 @@ void sub_80CAFD0(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[4]; if (!(gBattleAnimArgs[6])) { - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; } else { - sub_807A3FC(gBattleAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + sub_807A3FC(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); sprite->data[2] += gBattleAnimArgs[2]; sprite->data[4] += gBattleAnimArgs[3]; } sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); - if (GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { sprite->data[0] = 1; } @@ -77,14 +77,14 @@ void sub_80CB09C(struct Sprite* sprite) c = TRUE; if (c) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CB144(struct Sprite* sprite) { - if (!NotInBattle() && IsDoubleBattle() == TRUE) + if (!IsContest() && IsDoubleBattle() == TRUE) { - sub_807A3FC(gBattleAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y); + sub_807A3FC(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y); } sprite->pos1.y += 32; @@ -117,14 +117,14 @@ void sub_80CB1A4(struct Sprite* sprite) sprite->pos2.y = Sin(sprite->data[5], 5); if (sprite->data[5] <= 0x7F) { - sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget) - 1; + sprite->oam.priority = sub_8079ED4(gAnimBankTarget) - 1; } else { - sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget) + 1; + sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; } sprite->data[0]--; if (!sprite->data[0]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index b19304f17..0f83df211 100755 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // cyclone (creates a circling motion like a cyclone, usually a wind sprite.) // Used in Razor Wind. @@ -14,7 +14,7 @@ extern u8 gBattleAnimBankTarget; void sub_80D0118(struct Sprite* sprite) { sub_80787B0(sprite, 0); - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) sprite->pos1.y += 16; sprite->data[0] = gBattleAnimArgs[4]; @@ -23,6 +23,6 @@ void sub_80D0118(struct Sprite* sprite) sprite->data[3] = gBattleAnimArgs[6]; sprite->data[4] = gBattleAnimArgs[3]; sprite->callback = sub_8078114; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback(sprite); } diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index 345ee53ea..c628abfc0 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -5,7 +5,7 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankTarget; void sub_80D2ABC(struct Sprite *sprite) { @@ -14,7 +14,7 @@ void sub_80D2ABC(struct Sprite *sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1; + sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1; sprite->data[2] = 1; } sprite->data[0] += sprite->data[2]; @@ -33,5 +33,5 @@ void sub_80D2ABC(struct Sprite *sprite) else sprite->invisible = FALSE; if (sprite->data[3] > 0x5A) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index c075af097..3adb62e06 100755 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -6,11 +6,11 @@ #include "unknown_task.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; -extern u16 gUnknown_03004288; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG1_X; static void sub_80D0D68(u8 taskId); static void sub_80D0E8C(struct Sprite* sprite); @@ -23,21 +23,21 @@ void sub_80D0C88(u8 taskId) struct Task* task = &gTasks[taskId]; struct UnknownTaskStruct sp; s16 i; - task->data[0] = sub_8077FC0(gBattleAnimBankTarget) + 32; + task->data[0] = sub_8077FC0(gAnimBankTarget) + 32; task->data[1] = 4; task->data[2] = 0; task->data[3] = 0; task->data[4] = 0; task->data[5] = 0; - task->data[15] = sub_807A100(gBattleAnimBankTarget, 0); - if (GetBankIdentity_permutated(gBattleAnimBankTarget) == 1) + task->data[15] = sub_807A100(gAnimBankTarget, 0); + if (GetBankIdentity_permutated(gAnimBankTarget) == 1) { - task->data[6] = gUnknown_030042C0; + task->data[6] = gBattle_BG1_X; sp.dest = (u16 *)REG_ADDR_BG1HOFS; } else { - task->data[6] = gUnknown_03004288; + task->data[6] = gBattle_BG2_X; sp.dest = (u16 *)REG_ADDR_BG2HOFS; } @@ -220,15 +220,15 @@ _080D0E2C: .4byte gUnknown_03004DC0\n\ void sub_80D0E30(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) - 16; - sprite->pos1.y = sub_8077FC0(gBattleAnimBankTarget) + 16; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) - 16; + sprite->pos1.y = sub_8077FC0(gAnimBankTarget) + 16; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; sprite->data[3] = 16; sprite->data[4] = 0; - sprite->data[5] = sub_807A100(gBattleAnimBankTarget, 0) + 2; - sprite->data[6] = sub_8076F98(0x3F); + sprite->data[5] = sub_807A100(gAnimBankTarget, 0) + 2; + sprite->data[6] = BattleAnimAdjustPanning(0x3F); sprite->callback = sub_80D0E8C; } @@ -285,7 +285,7 @@ void sub_80D0E8C(struct Sprite* sprite) if (++sprite->data[1] > 16) { sprite->invisible = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } break; } diff --git a/src/battle/anim/drum.c b/src/battle/anim/drum.c index 60cb2acc1..6306778ae 100755 --- a/src/battle/anim/drum.c +++ b/src/battle/anim/drum.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // drum (using hands to slap the Pokemon's belly in a rhythm.) // Used in Belly Drum. @@ -24,9 +24,9 @@ void sub_80CEDF0(struct Sprite* sprite) a = -16; } - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + a; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + 8; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + a; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 8; sprite->data[0] = 8; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c index a5bcffa6d..8004b3bf5 100755 --- a/src/battle/anim/egg.c +++ b/src/battle/anim/egg.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D13AC(struct Sprite* sprite); static void sub_80D1424(struct Sprite* sprite); @@ -23,7 +23,7 @@ void sub_80D1368(struct Sprite* sprite) { s16 r1; sub_80787B0(sprite, 0); - r1 = (GetBankSide(gBattleAnimBankAttacker)) ? -0xA0 : 0xA0; + r1 = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0; sprite->data[0] = 0x380; sprite->data[1] = r1; sprite->data[7] = gBattleAnimArgs[2]; @@ -36,7 +36,7 @@ void sub_80D13AC(struct Sprite* sprite) sprite->pos2.y -= (sprite->data[0] >> 8); sprite->pos2.x = sprite->data[1] >> 8; sprite->data[0] -= 32; - add = (GetBankSide(gBattleAnimBankAttacker)) ? -0xA0 : 0xA0; + add = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0; sprite->data[1] += add; if (sprite->pos2.y > 0) { @@ -110,7 +110,7 @@ void sub_80D154C(struct Sprite* sprite) if (sprite->data[7] == 0) sprite->callback = sub_80D158C; else - sprite->callback = move_anim_8072740; + sprite->callback = DestroyAnimSprite; } } @@ -118,5 +118,5 @@ void sub_80D158C(struct Sprite* sprite) { REG_BLDCNT = 0; REG_BLDALPHA = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c index ffba5c300..15045f5bd 100644 --- a/src/battle/anim/energy_wave.c +++ b/src/battle/anim/energy_wave.c @@ -6,8 +6,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern const struct SpriteTemplate gSpriteTemplate_83D9130[]; static void sub_80D35DC(struct Sprite *); @@ -24,9 +24,9 @@ void sub_80D3554(struct Sprite *sprite) sprite->data[0] = 30; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); @@ -51,7 +51,7 @@ static void sub_80D35DC(struct Sprite *sprite) { if (sub_8078B5C(sprite)) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } sprite->pos2.y += Sin(sprite->data[6] >> 8, sprite->data[7]); @@ -86,15 +86,15 @@ void sub_80D3698(struct Sprite *sprite) { u8 subpriority; - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1); sprite->pos2.y = -10; - subpriority = sub_8079E90(gBattleAnimBankAttacker); + subpriority = sub_8079E90(gAnimBankAttacker); - if (!NotInBattle()) + if (!IsContest()) { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { sprite->pos2.x = 10; sprite->subpriority = subpriority + 2; @@ -118,7 +118,7 @@ static void sub_80D370C(struct Sprite *sprite) { if (sprite->affineAnimEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -126,11 +126,11 @@ void sub_80D3728(struct Sprite *sprite) { int var1, var2; - if (GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { gBattleAnimArgs[0] *= -1; - if (GetBankIdentity(gBattleAnimBankAttacker) == 0 || GetBankIdentity(gBattleAnimBankAttacker) == 1) + if (GetBankIdentity(gAnimBankAttacker) == 0 || GetBankIdentity(gAnimBankAttacker) == 1) { gBattleAnimArgs[0] *= -1; } @@ -149,14 +149,14 @@ void sub_80D3728(struct Sprite *sprite) sub_80787B0(sprite, var1); - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, var2) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, var2) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index 621d386e1..469522092 100755 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s8 gUnknown_083D7A00[4][2]; @@ -51,7 +51,7 @@ void sub_80D1638(u8 taskId) task->data[2] = 0; task->data[3] = 0; task->data[12] = 3; - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) { task->data[13] = 0xFFFF; task->data[14] = 8; @@ -169,8 +169,8 @@ void sub_80D18D4(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[13] = 0; - task->data[14] = sub_8077ABC(gBattleAnimBankAttacker, 0); - task->data[15] = sub_8077ABC(gBattleAnimBankAttacker, 1); + task->data[14] = GetBankPosition(gAnimBankAttacker, 0); + task->data[15] = GetBankPosition(gAnimBankAttacker, 1); task->func = sub_80D1930; } diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c index b4e81009b..ded8428d4 100755 --- a/src/battle/anim/evasion.c +++ b/src/battle/anim/evasion.c @@ -7,8 +7,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE910(u8 taskId); static void sub_80CE974(struct Sprite* sprite); @@ -47,7 +47,7 @@ void sub_80CE7E0(u8 taskId) } task->func = sub_80CE910; - if (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1) + if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) { REG_DISPCNT &= 0xFDFF; } @@ -62,7 +62,7 @@ void sub_80CE910(u8 taskId) struct Task* task = &gTasks[taskId]; if (!task->data[3]) { - if (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1) + if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) REG_DISPCNT |= 0x200; else REG_DISPCNT |= 0x400; diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c index 4df450691..5ed7372a8 100755 --- a/src/battle/anim/fang.c +++ b/src/battle/anim/fang.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // fang // Used by Super Fang (and probably Hyper Fang, but the actual callbacks are not in this file.) @@ -14,6 +14,6 @@ extern u8 gBattleAnimBankTarget; void sub_80CEA04(struct Sprite* sprite) { - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078600; } diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c index 0e087ec2d..eaa38e5b7 100755 --- a/src/battle/anim/flash.c +++ b/src/battle/anim/flash.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8; extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8; diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c index 5b7d31a51..d2d22602a 100755 --- a/src/battle/anim/flying_hearts.c +++ b/src/battle/anim/flying_hearts.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2094(struct Sprite* sprite); @@ -35,6 +35,6 @@ void sub_80D2094(struct Sprite* sprite) { sprite->invisible = sprite->data[3] % 2; if (y <= 0x40) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c index 017f89858..441ac0e6d 100755 --- a/src/battle/anim/flying_path.c +++ b/src/battle/anim/flying_path.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct SpriteTemplate gSpriteTemplate_83D6884; @@ -22,12 +22,12 @@ void sub_80CBDF4(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[4] = sub_8079E90(gBattleAnimBankTarget) - 1; - task->data[6] = sub_8077ABC(gBattleAnimBankTarget, 2); - task->data[7] = sub_8077ABC(gBattleAnimBankTarget, 3); - task->data[10] = sub_807A100(gBattleAnimBankTarget, 1); - task->data[11] = sub_807A100(gBattleAnimBankTarget, 0); - task->data[5] = (GetBankSide(gBattleAnimBankTarget) == 1) ? 1 : -1; + task->data[4] = sub_8079E90(gAnimBankTarget) - 1; + task->data[6] = GetBankPosition(gAnimBankTarget, 2); + task->data[7] = GetBankPosition(gAnimBankTarget, 3); + task->data[10] = sub_807A100(gAnimBankTarget, 1); + task->data[11] = sub_807A100(gAnimBankTarget, 0); + task->data[5] = (GetBankSide(gAnimBankTarget) == 1) ? 1 : -1; task->data[9] = 0x38 - (task->data[5] * 64); task->data[8] = task->data[7] - task->data[9] + task->data[6]; task->data[2] = CreateSprite(&gSpriteTemplate_83D6884, task->data[8], task->data[9], task->data[4]); diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c index ed6497b7a..4eeaa5215 100755 --- a/src/battle/anim/flying_petals.c +++ b/src/battle/anim/flying_petals.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CC580(struct Sprite* sprite); @@ -17,9 +17,9 @@ void sub_80CC474(struct Sprite* sprite) { u8 bank; if (!gBattleAnimArgs[6]) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; if (GetBankSide(bank) != 0) { @@ -48,11 +48,11 @@ void sub_80CC474(struct Sprite* sprite) sprite->oam.priority = sub_8079ED4(bank) + 1; break; case 2: - sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[0]; sprite->oam.priority = sub_8079ED4(bank); break; case 3: - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[0]; GetAnimBankSpriteId(1); sprite->oam.priority = sub_8079ED4(bank) + 1; break; diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c index 548397932..e4577f1e1 100755 --- a/src/battle/anim/glitter.c +++ b/src/battle/anim/glitter.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // glitter (the sparkling effect seen on Pokemon, usually after healing or a beneficial effect.) // Used by Heal Bell, Cosmic Power, and Aromatherapy. @@ -21,7 +21,7 @@ void sub_80CD140(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } @@ -29,9 +29,9 @@ void sub_80CD190(struct Sprite* sprite) { u8 bank; if (!gBattleAnimArgs[2]) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2)) { @@ -43,13 +43,13 @@ void sub_80CD190(struct Sprite* sprite) { if (!gBattleAnimArgs[6]) { - sprite->pos1.x = sub_8077ABC(bank, 0); - sprite->pos1.y = sub_8077ABC(bank, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(bank, 0); + sprite->pos1.y = GetBankPosition(bank, 1) + gBattleAnimArgs[1]; } else { - sprite->pos1.x = sub_8077ABC(bank, 2); - sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(bank, 2); + sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[1]; } sub_807867C(sprite, gBattleAnimArgs[0]); @@ -58,6 +58,6 @@ void sub_80CD190(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078394; } diff --git a/src/battle/anim/glow.c b/src/battle/anim/glow.c index 6038825af..63466c0ff 100755 --- a/src/battle/anim/glow.c +++ b/src/battle/anim/glow.c @@ -8,8 +8,8 @@ #include "decompress.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D7A5C[5]; @@ -32,11 +32,11 @@ void sub_80D1ADC(u8 taskId) } src = &gBattleAnimSpritePalette_206; - dest = (NotInBattle()) ? gSharedMem + 0x18000 - 0x3800: gSharedMem + 0x18000; + dest = (IsContest()) ? gSharedMem + 0x18000 - 0x3800: gSharedMem + 0x18000; LZDecompressWram(src, dest); for (i = 0; i <= 4; i++) { - what = ((NotInBattle()) ? gSharedMem + 0x14800 : gSharedMem + 0x18000) + (i << 5); + what = ((IsContest()) ? gSharedMem + 0x14800 : gSharedMem + 0x18000) + (i << 5); LoadPalette(what, (u16)((sp[i] << 4) + 0x100), 32); } diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c index 93c3dba96..c4d7b1cef 100755 --- a/src/battle/anim/grip.c +++ b/src/battle/anim/grip.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D020C(struct Sprite* sprite); @@ -31,8 +31,8 @@ void sub_80D0178(struct Sprite* sprite) sprite->pos1.x += r7; sprite->pos1.y += r4; sprite->data[0] = 6; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r8; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r8; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6; sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, sub_80D020C); } @@ -40,5 +40,5 @@ void sub_80D0178(struct Sprite* sprite) void sub_80D020C(struct Sprite* sprite) { if (sprite->animEnded == 1) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/grow.c b/src/battle/anim/grow.c index 35047c8b0..8788b32fe 100755 --- a/src/battle/anim/grow.c +++ b/src/battle/anim/grow.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct AffineAnimFrameCmd gUnknown_083D7714; diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index 4769db2e4..ab093eab1 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; // guard (moves guard rings upwards) @@ -12,17 +12,17 @@ extern u16 gBattleTypeFlags; void sub_80D3014(struct Sprite *sprite) { - if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) + if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { - sub_807A3FC(gBattleAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); + sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); sprite->pos1.y += 40; StartSpriteAffineAnim(sprite, 1); } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + 40; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + 40; } sprite->data[0] = 13; @@ -30,5 +30,5 @@ void sub_80D3014(struct Sprite *sprite) sprite->data[4] = sprite->pos1.y - 72; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index b710f372a..b3d842cdf 100755 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D02D0(struct Sprite* sprite); static void sub_80D0344(struct Sprite* sprite); @@ -34,9 +34,9 @@ void sub_80D0228(struct Sprite* sprite) sprite->pos1.y += r4; sprite->data[0] = 6; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r9; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r9; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6; obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = gBattleAnimArgs[0]; sprite->data[6] = sprite->data[0]; @@ -86,5 +86,5 @@ void sub_80D0344(struct Sprite* sprite) void sub_80D03A8(struct Sprite* sprite) { if (sub_8078B5C(sprite) != 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c index c5950650c..a8c14ea1c 100755 --- a/src/battle/anim/heal.c +++ b/src/battle/anim/heal.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // heal (healing sparkles on a Pokemon) // Used in Present, if the move heals instead of damages. @@ -22,6 +22,6 @@ void sub_80CBAA4(struct Sprite* sprite) sprite->pos2.y = sprite->data[1] * sprite->data[0]; if (sprite->animEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c index 1ab83136c..5df89f929 100755 --- a/src/battle/anim/heart_1.c +++ b/src/battle/anim/heart_1.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // heart_1 (a floating heart in a wave pattern upward.) // Used in Charm, Covet, and when a Pokemon is infatuated. @@ -21,5 +21,5 @@ void sub_80D1C80(struct Sprite* sprite) sprite->data[1] = (sprite->data[1] + 7) & 0xFF; sprite->data[2] -= 0x80; if (sprite->data[0] == 0x3C) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/heated_rock.c b/src/battle/anim/heated_rock.c index 1d59669cf..51cfbd007 100644 --- a/src/battle/anim/heated_rock.c +++ b/src/battle/anim/heated_rock.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; void sub_80D59B0(struct Sprite *); @@ -28,7 +28,7 @@ u16 sub_80D5940(u8 spriteId) { u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY; - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { var1 = ((var1 << 16) + 0x4A0000) >> 16; } @@ -198,7 +198,7 @@ static void sub_80D5A74(struct Sprite *sprite) if (++sprite->data[3] > 16) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } break; } diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c index c5e372d78..6fb4a76d8 100755 --- a/src/battle/anim/homing.c +++ b/src/battle/anim/homing.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CC7D4(struct Sprite* sprite); @@ -23,19 +23,19 @@ void sub_80CC6CC(struct Sprite* sprite) if (gBattleAnimArgs[4] == 0) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } else { if (gBattleAnimArgs[0] == 0) { - a = sub_8077ABC(gBattleAnimBankAttacker, 2); - b = sub_8077ABC(gBattleAnimBankAttacker, 3); + a = GetBankPosition(gAnimBankAttacker, 2); + b = GetBankPosition(gAnimBankAttacker, 3); } else { - a = sub_8077ABC(gBattleAnimBankTarget, 2); - b = sub_8077ABC(gBattleAnimBankTarget, 3); + a = GetBankPosition(gAnimBankTarget, 2); + b = GetBankPosition(gAnimBankTarget, 3); } sprite->data[0] = gBattleAnimArgs[4]; @@ -61,7 +61,7 @@ void sub_80CC6CC(struct Sprite* sprite) sprite->data[3] = (sprite->data[5] - sprite->pos1.x) * 16 / gBattleAnimArgs[4]; sprite->data[4] = (sprite->data[6] - sprite->pos1.y) * 16 / gBattleAnimArgs[4]; c = sub_80790F0(sprite->data[5] - x, sprite->data[6] - y); - if (NotInBattle()) + if (IsContest()) c -= 0x8000; sub_8078FDC(sprite, 0, 0x100, 0x100, c); diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index 60f3b8a48..4006e2d43 100755 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // hop (where a sprite "hops" across the screen) // Used by Present, Trick, and the item knock off effect. @@ -65,7 +65,7 @@ void sub_80CB8B8(struct Sprite* sprite) sprite->data[0]++; if (sprite->data[0] > 50) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -92,9 +92,9 @@ void sub_80CB94C(struct Sprite* sprite) s16 e1; s16 e2; sub_80787B0(sprite, 0); - e1 = sub_8077ABC(gBattleAnimBankTarget, 0); - e2 = sub_8077ABC(gBattleAnimBankTarget, 1); - if ((gBattleAnimBankAttacker ^ 2) == gBattleAnimBankTarget) + e1 = GetBankPosition(gAnimBankTarget, 0); + e2 = GetBankPosition(gAnimBankTarget, 1); + if ((gAnimBankAttacker ^ 2) == gAnimBankTarget) { sprite->data[6] = e1; sprite->data[7] = e2 + 10; @@ -129,14 +129,14 @@ void sub_80CB9C4(struct Sprite* sprite) { sprite->pos2.y = zero; sprite->data[0] = zero; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } void sub_80CBA28(struct Sprite* sprite) { - s16 e = sub_8077ABC(gBattleAnimBankTarget, 1); - if (GetBankSide(gBattleAnimBankTarget) == 0) + s16 e = GetBankPosition(gAnimBankTarget, 1); + if (GetBankSide(gAnimBankTarget) == 0) { sprite->data[6] = 0; sprite->data[7] = e + 10; @@ -149,7 +149,7 @@ void sub_80CBA28(struct Sprite* sprite) { sprite->data[6] = 255; sprite->data[7] = e + 10; - if (NotInBattle()) + if (IsContest()) sprite->data[6] = 0; sub_80CB7EC(sprite, 0x28); diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index 5458c4599..1bc3f46af 100755 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CB7EC(struct Sprite* sprite, s16 c); extern bool8 sub_80CB814(struct Sprite* sprite); @@ -22,9 +22,9 @@ void sub_80CBAE8(struct Sprite* sprite) s16 p1; s16 p2; sub_8078764(sprite, 0); - p1 = sub_8077ABC(gBattleAnimBankAttacker, 0); - p2 = sub_8077ABC(gBattleAnimBankAttacker, 1); - if ((gBattleAnimBankTarget ^ 2) == gBattleAnimBankAttacker) + p1 = GetBankPosition(gAnimBankAttacker, 0); + p2 = GetBankPosition(gAnimBankAttacker, 1); + if ((gAnimBankTarget ^ 2) == gAnimBankAttacker) { sprite->data[6] = p1; sprite->data[7] = p2 + 10; @@ -57,7 +57,7 @@ void sub_80CBB60(struct Sprite* sprite) sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); if (sprite->pos2.y == 0) { - PlaySE12WithPanning(0x7D, sub_8076F98(0x3F)); + PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(0x3F)); } if (sub_80CB814(sprite)) @@ -65,6 +65,6 @@ void sub_80CBB60(struct Sprite* sprite) sprite->pos2.y = 0; sprite->data[0] = 0; sprite->callback = sub_80CB8B8; - PlaySE12WithPanning(0x7D, sub_8076F98(-0x40)); + PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(-0x40)); } } diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c index 2e7f64c11..d3270ee65 100755 --- a/src/battle/anim/kiss_fountain.c +++ b/src/battle/anim/kiss_fountain.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // kiss_fountain (a series of hearts pour out of a target Pokemon.) // Used in Attract and Sweet Kiss. @@ -32,7 +32,7 @@ void sub_80D1FDC(struct Sprite* sprite) if (sprite->data[3] > 0x78) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } } diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index 13d1bc9f5..676734717 100755 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CAF20(struct Sprite* sprite); static void sub_80CAF6C(struct Sprite* sprite); @@ -15,8 +15,8 @@ static void sub_80CAF6C(struct Sprite* sprite); void sub_80CAED8(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[2]; @@ -51,7 +51,7 @@ void sub_80CAF20(struct Sprite* sprite) void sub_80CAF6C(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { sprite->pos2.x = -Sin(sprite->data[0], 0x19); } @@ -69,6 +69,6 @@ void sub_80CAF6C(struct Sprite* sprite) if (sprite->data[1] > 0x50) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c index 1e49b536c..bd3d22ca6 100755 --- a/src/battle/anim/love_bg.c +++ b/src/battle/anim/love_bg.c @@ -7,15 +7,15 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct INCBIN_U8 gAttractTilemap; extern struct INCBIN_U8 gAttractGfx; extern struct INCBIN_U8 gAttractPal; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; static void sub_80D21F0(u8 taskId); @@ -30,11 +30,11 @@ void sub_80D2100(u8 taskId) REG_BLDALPHA = 0x1000; REG_BG1CNT_BITFIELD.priority = 3; REG_BG1CNT_BITFIELD.screenSize = 0; - if (!NotInBattle()) + if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 1; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; REG_BG1HOFS = 0; REG_BG1VOFS = 0; sub_8078914(&subStruct); @@ -43,7 +43,7 @@ void sub_80D2100(u8 taskId) LZDecompressVram(&gAttractTilemap, tempvar); LZDecompressVram(&gAttractGfx, subStruct.field_0); LoadCompressedPalette(&gAttractPal, subStruct.field_8 << 4, 32); - if (NotInBattle()) + if (IsContest()) sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0); gTasks[taskId].func = sub_80D21F0; @@ -106,7 +106,7 @@ void sub_80D21F0(u8 taskId) } } DmaClear32(3, subStruct.field_4, 0x800); - if (!NotInBattle()) + if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 0; gTasks[taskId].data[12]++; diff --git a/src/battle/anim/lunge_1.c b/src/battle/anim/lunge_1.c index f1e1e35b6..d379c8f09 100755 --- a/src/battle/anim/lunge_1.c +++ b/src/battle/anim/lunge_1.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -44,9 +44,9 @@ void sub_80CD774(struct Sprite* sprite) void sub_80CD7CC(struct Sprite* sprite) { sprite->data[0] = 6; - sprite->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? 2 : -2; + sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? 2 : -2; sprite->data[2] = 0; - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; StoreSpriteCallbackInData(sprite, sub_80CD81C); sprite->callback = sub_8078458; } @@ -55,9 +55,9 @@ void sub_80CD81C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; sub_8078E70(sprite->data[3], 0); - sprite->data[4] = (sprite->data[6] = GetBankSide(gBattleAnimBankAttacker)) ? 0x300 : 0xFFFFFD00; + sprite->data[4] = (sprite->data[6] = GetBankSide(gAnimBankAttacker)) ? 0x300 : 0xFFFFFD00; sprite->data[5] = 0; } @@ -74,9 +74,9 @@ void sub_80CD81C(struct Sprite* sprite) void sub_80CD8A8(struct Sprite* sprite) { sprite->data[0] = 4; - sprite->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? -3 : 3; + sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? -3 : 3; sprite->data[2] = 0; - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; StoreSpriteCallbackInData(sprite, sub_80CD9B8); sprite->callback = sub_8078458; } @@ -94,9 +94,9 @@ void sub_80CD91C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; - sprite->data[6] = GetBankSide(gBattleAnimBankAttacker); - if (GetBankSide(gBattleAnimBankAttacker)) + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; + sprite->data[6] = GetBankSide(gAnimBankAttacker); + if (GetBankSide(gAnimBankAttacker)) { sprite->data[4] = 0xFC00; sprite->data[5] = 0xC00; @@ -120,5 +120,5 @@ void sub_80CD91C(struct Sprite* sprite) void sub_80CD9B8(struct Sprite* sprite) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/lunge_2.c b/src/battle/anim/lunge_2.c index 3972bee59..fe2470567 100755 --- a/src/battle/anim/lunge_2.c +++ b/src/battle/anim/lunge_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -20,8 +20,8 @@ void sub_80CDAC8(u8 taskId) { u8 a; - gTasks[taskId].data[0] = gObjectBankIDs[gBattleAnimBankAttacker]; - a = GetBankSide(gBattleAnimBankAttacker); + gTasks[taskId].data[0] = gObjectBankIDs[gAnimBankAttacker]; + a = GetBankSide(gAnimBankAttacker); gTasks[taskId].data[1] = a; gTasks[taskId].data[2] = 0; switch (gBattleAnimArgs[0]) diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c index 91eaf20b1..8358d23db 100755 --- a/src/battle/anim/money.c +++ b/src/battle/anim/money.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CFF68(struct Sprite* sprite); @@ -20,9 +20,9 @@ void sub_80CFE9C(struct Sprite* sprite) u16 var; sub_80787B0(sprite, 1); - r6 = sub_8077ABC(gBattleAnimBankTarget, 2); - r7 = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + r6 = GetBankPosition(gAnimBankTarget, 2); + r7 = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + if (GetBankSide(gAnimBankAttacker) != 0) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; r6 += gBattleAnimArgs[2]; @@ -33,7 +33,7 @@ void sub_80CFE9C(struct Sprite* sprite) sprite->data[2] = r6; sprite->data[4] = r7; sprite->callback = sub_8078C00; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CFF50(struct Sprite* sprite) @@ -47,7 +47,7 @@ void sub_80CFF68(struct Sprite* sprite) { sprite->data[0] += 0x80; sprite->pos2.x = sprite->data[0] >> 8; - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) sprite->pos2.x = -sprite->pos2.x; sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]); @@ -57,6 +57,6 @@ void sub_80CFF68(struct Sprite* sprite) sprite->data[1] = 0; sprite->data[2] /= 2; if (++sprite->data[3] == 2) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c index e2a31d14d..c532e8057 100755 --- a/src/battle/anim/moon.c +++ b/src/battle/anim/moon.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE354(struct Sprite* sprite); @@ -15,7 +15,7 @@ static void sub_80CE354(struct Sprite* sprite); void sub_80CE30C(struct Sprite* sprite) { - if (NotInBattle()) + if (IsContest()) { sprite->pos1.x = 0x30; sprite->pos1.y = 0x28; @@ -35,5 +35,5 @@ void sub_80CE30C(struct Sprite* sprite) void sub_80CE354(struct Sprite* sprite) { if (sprite->data[0]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c index 78953d96a..369650d82 100644 --- a/src/battle/anim/noise.c +++ b/src/battle/anim/noise.c @@ -3,8 +3,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2E30(struct Sprite *); @@ -14,15 +14,15 @@ static void sub_80D2E30(struct Sprite *); void sub_80D2D68(struct Sprite* sprite) { int var1; - u8 slot = gBattleAnimArgs[0] == 0 ? gBattleAnimBankAttacker : gBattleAnimBankTarget; + u8 slot = gBattleAnimArgs[0] == 0 ? gAnimBankAttacker : gAnimBankTarget; if (GetBankSide(slot) == 1) { gBattleAnimArgs[1] *= -1; } - sprite->pos1.x = sub_8077ABC(slot, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(slot, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(slot, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(slot, 3) + gBattleAnimArgs[2]; sprite->data[0] = 0; sprite->data[1] = (u16)sprite->pos1.x << 3; sprite->data[2] = (u16)sprite->pos1.y << 3; @@ -51,6 +51,6 @@ static void sub_80D2E30(struct Sprite *sprite) if (++sprite->data[0] > 16) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c index fd62b7176..715462d73 100755 --- a/src/battle/anim/note_rain.c +++ b/src/battle/anim/note_rain.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D7A5C[5]; @@ -25,13 +25,13 @@ void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b) void sub_80D1C08(struct Sprite* sprite) { sub_80787B0(sprite, 0); - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); } diff --git a/src/battle/anim/note_scatter.c b/src/battle/anim/note_scatter.c index 9ff49ee9d..8564c58fe 100755 --- a/src/battle/anim/note_scatter.c +++ b/src/battle/anim/note_scatter.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CED78(struct Sprite* sprite); @@ -16,14 +16,14 @@ static void sub_80CED78(struct Sprite* sprite); void sub_80CECE8(struct Sprite* sprite) { int a; - if (GetBankSide(gBattleAnimBankAttacker) == 1) + if (GetBankSide(gAnimBankAttacker) == 1) { a = gBattleAnimArgs[1]; (u16)gBattleAnimArgs[1] = -a; } - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; StartSpriteAnim(sprite, gBattleAnimArgs[0]); sprite->data[2] = 0; sprite->data[3] = 0; diff --git a/src/battle/anim/note_scatter_2.c b/src/battle/anim/note_scatter_2.c index a163aa9a5..524c51c08 100755 --- a/src/battle/anim/note_scatter_2.c +++ b/src/battle/anim/note_scatter_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D712C[4][6]; @@ -52,6 +52,6 @@ void sub_80CEEE8(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c index bdc0f4615..026ee1856 100644 --- a/src/battle/anim/note_spin.c +++ b/src/battle/anim/note_spin.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2F80(struct Sprite *); static void sub_80D2FA4(struct Sprite *); @@ -28,7 +28,7 @@ void sub_80D2E68(struct Sprite *sprite) if (sprite->data[0] == sprite->data[1] + 80) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -100,11 +100,11 @@ static void sub_80D2FA4(struct Sprite *sprite) { int var1 = sprite->data[2]; sprite->invisible = var1 - (((s32)(var1 + ((u32)var1 >> 31)) >> 1) << 1); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } if (sprite->data[4] == 4) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/note_wave.c b/src/battle/anim/note_wave.c index 4dc3ceb75..80ed2256f 100755 --- a/src/battle/anim/note_wave.c +++ b/src/battle/anim/note_wave.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D712C[4][6]; @@ -74,15 +74,15 @@ void sub_80CEB0C(struct Sprite* sprite) sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = 0; sprite->data[3] = gBattleAnimArgs[2]; - if (NotInBattle()) + if (IsContest()) { a = 0x30; b = 0x28; } else { - a = sub_8077ABC(gBattleAnimBankTarget, 2); - b = sub_8077ABC(gBattleAnimBankTarget, 3); + a = GetBankPosition(gAnimBankTarget, 2); + b = GetBankPosition(gAnimBankTarget, 3); } sprite->data[4] = sprite->pos1.x << 4; diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index 9b77552fa..c8cf339d2 100755 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CAC44(struct Sprite* sprite); static void sub_80CADA8(struct Sprite* sprite); @@ -37,11 +37,11 @@ void sub_80CAC44(struct Sprite* sprite) sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8); if ((u16)(sprite->data[1] - 0x40) < 0x80) { - sprite->oam.priority = (sub_8079ED4(gBattleAnimBankTarget) & 3); + sprite->oam.priority = (sub_8079ED4(gAnimBankTarget) & 3); } else { - var1 = sub_8079ED4(gBattleAnimBankTarget) + 1; + var1 = sub_8079ED4(gAnimBankTarget) + 1; if (var1 > 3) { var1 = 3; @@ -53,18 +53,18 @@ void sub_80CAC44(struct Sprite* sprite) sprite->data[1] = (sprite->data[1] + 2) & 0xFF; sprite->data[0]--; if (sprite->data[0] == -1) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CACEC(u8 taskId) { - if (NotInBattle() || !IsDoubleBattle()) + if (IsContest() || !IsDoubleBattle()) { DestroyAnimVisualTask(taskId); } else { - if (GetBankIdentity_permutated(gBattleAnimBankTarget) == 1) + if (GetBankIdentity_permutated(gAnimBankTarget) == 1) { REG_BG2CNT_BITFIELD.priority = 3; } @@ -84,7 +84,7 @@ void sub_80CAD54(struct Sprite* sprite) sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CADA8; @@ -99,18 +99,18 @@ void sub_80CADA8(struct Sprite* sprite) sprite->pos2.y += Cos(sprite->data[5], -5); if ((u16)(sprite->data[5] - 0x40) < 0x80) { - sprite->subpriority = sub_8079E90(gBattleAnimBankAttacker) - 1; + sprite->subpriority = sub_8079E90(gAnimBankAttacker) - 1; } else { - sprite->subpriority = sub_8079E90(gBattleAnimBankAttacker) + 1; + sprite->subpriority = sub_8079E90(gAnimBankAttacker) + 1; } sprite->data[5] = (sprite->data[5] + 5) & 0xFF; } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -121,7 +121,7 @@ void sub_80CAE20(struct Sprite* sprite) sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CAE74; @@ -142,6 +142,6 @@ void sub_80CAE74(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/orbit_fast.c b/src/battle/anim/orbit_fast.c index 30396f398..92b67672b 100755 --- a/src/battle/anim/orbit_fast.c +++ b/src/battle/anim/orbit_fast.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2704(struct Sprite* sprite); @@ -15,12 +15,12 @@ static void sub_80D2704(struct Sprite* sprite); void sub_80D26A4(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->affineAnimPaused = 1; sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; - sprite->data[7] = sub_8079E90(gBattleAnimBankAttacker); + sprite->data[7] = sub_8079E90(gAnimBankAttacker); sprite->callback = sub_80D2704; sub_80D2704(sprite); } @@ -58,5 +58,5 @@ void sub_80D2704(struct Sprite* sprite) } if ((u16)gBattleAnimArgs[7] == 0xFFFF) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/orbit_scatter.c b/src/battle/anim/orbit_scatter.c index 6cebc9375..54c157839 100755 --- a/src/battle/anim/orbit_scatter.c +++ b/src/battle/anim/orbit_scatter.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2834(struct Sprite* sprite); @@ -15,8 +15,8 @@ static void sub_80D2834(struct Sprite* sprite); void sub_80D27E0(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->callback = sub_80D2834; @@ -27,5 +27,5 @@ void sub_80D2834(struct Sprite* sprite) sprite->pos2.x += sprite->data[0]; sprite->pos2.y += sprite->data[1]; if (sprite->pos1.x + sprite->pos2.x + 16 > 0x110u || sprite->pos1.y + sprite->pos2.y > 0xA0 || sprite->pos1.y + sprite->pos2.y < -16) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index 22e7d3895..6ca2fa71c 100755 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -5,8 +5,8 @@ #include "random.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CA8B4(struct Sprite* sprite); static void sub_80CA9F8(struct Sprite* sprite); @@ -21,8 +21,8 @@ void sub_80CA7B0(struct Sprite* sprite) { sub_80787B0(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } @@ -32,10 +32,10 @@ void sub_80CA800(struct Sprite* sprite) sub_80787B0(sprite, 1); StartSpriteAnim(sprite, gBattleAnimArgs[3]); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CA858(struct Sprite* sprite) @@ -43,9 +43,9 @@ void sub_80CA858(struct Sprite* sprite) sub_80787B0(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = gBattleAnimArgs[3]; sprite->callback = sub_80CA8B4; @@ -62,11 +62,11 @@ void sub_80CA8B4(struct Sprite* sprite) { if (sprite->data[5] > 0x7F) { - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) + 1; + sprite->subpriority = sub_8079E90(gAnimBankTarget) + 1; } else { - sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) + 6; + sprite->subpriority = sub_8079E90(gAnimBankTarget) + 6; } sprite->pos2.x += Sin(sprite->data[5], 5); sprite->pos2.y += Cos(sprite->data[5], 14); @@ -85,7 +85,7 @@ void sub_80CA928(u8 taskId) gBattleAnimArgs[1] = 0; gBattleAnimArgs[2] = 80; gBattleAnimArgs[3] = 0; - CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gBattleAnimBankTarget) + 1); + CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gAnimBankTarget) + 1); } if (gTasks[taskId].data[1] == 15) @@ -96,8 +96,8 @@ void sub_80CA9A8(struct Sprite* sprite) { sub_8078764(sprite, 1); sprite->data[0] = gBattleAnimArgs[3]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->data[5] = gBattleAnimArgs[2]; sub_80786EC(sprite); sprite->callback = sub_80CA9F8; @@ -106,7 +106,7 @@ void sub_80CA9A8(struct Sprite* sprite) void sub_80CA9F8(struct Sprite* sprite) { if (sub_8078718(sprite)) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CAA14(struct Sprite* sprite) @@ -115,9 +115,9 @@ void sub_80CAA14(struct Sprite* sprite) u16 b; StartSpriteAnim(sprite, a & 7); - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - if (GetBankSide(gBattleAnimBankAttacker)) + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= 20; } @@ -129,9 +129,9 @@ void sub_80CAA14(struct Sprite* sprite) b = Random(); sprite->data[0] = (b & 31) + 64; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sub_8078D60(sprite); sprite->data[5] = Random() & 0xFF; sprite->data[6] = sprite->subpriority; @@ -143,7 +143,7 @@ void sub_80CAACC(struct Sprite* sprite) { if (sub_8078CE8(sprite)) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } else { diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c index f1f1b25ff..1140aa34a 100755 --- a/src/battle/anim/osmose.c +++ b/src/battle/anim/osmose.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // osmose (I didn't want to use "absorb" as thats confusing) // Used by Ingrain. @@ -14,8 +14,8 @@ void sub_80CB768(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; sprite->data[3] = gBattleAnimArgs[4]; @@ -25,5 +25,5 @@ void sub_80CB768(struct Sprite* sprite) sprite->pos2.x = sprite->data[1] * sprite->data[0]; sprite->pos2.y = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]); if (sprite->data[0] > sprite->data[3]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c index 27afcbc0c..3b3153428 100755 --- a/src/battle/anim/perceive.c +++ b/src/battle/anim/perceive.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // perceive (shows a sparkle in a set of eyes, usually for heightened perception.) // Used in Glare, Tickle, and Scary Face. @@ -14,7 +14,7 @@ extern u8 gBattleAnimBankTarget; void sub_80D2904(struct Sprite* sprite) { if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80D2920(struct Sprite* sprite) diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c index 178a61737..a0be20d6f 100755 --- a/src/battle/anim/powder.c +++ b/src/battle/anim/powder.c @@ -4,7 +4,7 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; +extern u8 gAnimBankAttacker; static void sub_80CA768(struct Sprite* sprite); @@ -18,7 +18,7 @@ void sub_80CA710(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { sprite->data[3] = -gBattleAnimArgs[4]; } @@ -43,6 +43,6 @@ void sub_80CA768(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index 0a5816b23..915cadcbc 100755 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -7,8 +7,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -25,18 +25,18 @@ void sub_80D0FD8(struct Sprite* sprite) u8 r4; if (gBattleAnimArgs[2] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; r4 = gBattleAnimArgs[3] ^ 1; if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2)) { sub_807A3FC(bank, r4, &sp0, &sp1); if (r4 == 0) - r4 = sub_8077ABC(bank, 0); + r4 = GetBankPosition(bank, 0); else - r4 = sub_8077ABC(bank, 2); + r4 = GetBankPosition(bank, 2); if (GetBankSide(bank) != 0) gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0]; // This is weird. @@ -53,7 +53,7 @@ void sub_80D1098(struct Sprite* sprite) if (sub_8078B5C(sprite)) { FreeSpriteOamMatrix(sprite); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -70,13 +70,13 @@ void sub_80D10B8(struct Sprite* sprite) if (gBattleAnimArgs[5] == 0) { - bankr7 = gBattleAnimBankAttacker; - bankr8 = gBattleAnimBankTarget; + bankr7 = gAnimBankAttacker; + bankr8 = gAnimBankTarget; } else { - bankr7 = gBattleAnimBankTarget; - bankr8 = gBattleAnimBankAttacker; + bankr7 = gAnimBankTarget; + bankr8 = gAnimBankAttacker; } if (gBattleAnimArgs[6] == 0) @@ -92,7 +92,7 @@ void sub_80D10B8(struct Sprite* sprite) if (GetBankSide(bankr7) != 0) { - r9 = sub_8077ABC(bankr7, r10) + gBattleAnimArgs[0]; + r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0]; if (IsAnimBankSpriteVisible(bankr8 ^ 2)) sprite->subpriority = gSprites[gObjectBankIDs[bankr8 ^ 2]].subpriority - 1; else @@ -100,7 +100,7 @@ void sub_80D10B8(struct Sprite* sprite) } else { - r9 = sub_8077ABC(bankr7, r10) - gBattleAnimArgs[0]; + r9 = GetBankPosition(bankr7, r10) - gBattleAnimArgs[0]; if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2)) { if (gSprites[gObjectBankIDs[bankr7]].pos1.x < gSprites[gObjectBankIDs[bankr7 ^ 2]].pos1.x) @@ -115,15 +115,15 @@ void sub_80D10B8(struct Sprite* sprite) } - r6 = sub_8077ABC(bankr7, sp4) + gBattleAnimArgs[1]; + r6 = GetBankPosition(bankr7, sp4) + gBattleAnimArgs[1]; if (gMain.inBattle && IsAnimBankSpriteVisible(bankr8 ^ 2)) { sub_807A3FC(bankr8, gBattleAnimArgs[6], &sp0, &sp1); } else { - sp0 = sub_8077ABC(bankr8, r10); - sp1 = sub_8077ABC(bankr8, sp4); + sp0 = GetBankPosition(bankr8, r10); + sp1 = GetBankPosition(bankr8, sp4); } if (GetBankSide(bankr8)) diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index 40c51808a..68f8a3e2f 100755 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s16 gUnknown_03000728[]; @@ -18,8 +18,8 @@ void sub_80CB59C(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1); sprite->pos2.x = gBattleAnimArgs[0]; sprite->pos2.y = gBattleAnimArgs[1]; sprite->subpriority = gBattleAnimArgs[2] + 30; @@ -36,10 +36,10 @@ void sub_80CB59C(struct Sprite* sprite) void sub_80CB620(struct Sprite *sprite) { - s16 p1 = sub_8077ABC(gBattleAnimBankAttacker, 2); - s16 p2 = sub_8077ABC(gBattleAnimBankAttacker, 3); - s16 e1 = sub_8077ABC(gBattleAnimBankTarget, 2); - s16 e2 = sub_8077ABC(gBattleAnimBankTarget, 3); + s16 p1 = GetBankPosition(gAnimBankAttacker, 2); + s16 p2 = GetBankPosition(gAnimBankAttacker, 3); + s16 e1 = GetBankPosition(gAnimBankTarget, 2); + s16 e2 = GetBankPosition(gAnimBankTarget, 3); e1 -= p1; e2 -= p2; @@ -63,5 +63,5 @@ void sub_80CB710(struct Sprite* sprite) sprite->invisible = sprite->data[0] % 2; if (sprite->data[0] > sprite->data[2]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 5573758c3..22bb26973 100755 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s8 gUnknown_083D6DDC[4][2]; @@ -50,7 +50,7 @@ void sub_80CD408(struct Sprite* sprite) sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, sub_80CD4B8); sprite->data[5] += 0x100; - PlaySE12WithPanning(0xD2, sub_8076F98(0x3F)); + PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(0x3F)); break; } @@ -110,8 +110,8 @@ void sub_80CD4EC(struct Sprite* sprite) sprite->pos2.y = 0; sprite->pos2.x = 0; sprite->data[0] = 6; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + a; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + b; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + a; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + b; sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, sub_80CD654); } @@ -136,7 +136,7 @@ void sub_80CD5A8(struct Sprite* sprite) sprite->data[2]++; pal = sprite->oam.paletteNum; LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4); - PlaySE12WithPanning(0xC0, sub_8076F98(0x3F)); + PlaySE12WithPanning(0xC0, BattleAnimAdjustPanning(0x3F)); } else if (sprite->data[1] == 0) { @@ -164,7 +164,7 @@ void sub_80CD67C(struct Sprite* sprite) sprite->data[0]++; if (sprite->data[1] == 8) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CD6CC(struct Sprite* sprite) diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c index 0c5056704..47776a3cb 100755 --- a/src/battle/anim/scary_face.c +++ b/src/battle/anim/scary_face.c @@ -7,8 +7,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFaceContest; extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFacePlayer; @@ -16,8 +16,8 @@ extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFaceOpponent; extern struct INCBIN_U8 gBattleAnimBackgroundImage_ScaryFace; extern struct INCBIN_U8 gBattleAnimBackgroundPalette_ScaryFace; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; static void sub_80D24E0(u8 taskId); @@ -32,26 +32,26 @@ void sub_80D23B4(u8 taskId) REG_BLDALPHA = 0x1000; REG_BG1CNT_BITFIELD.priority = 1; REG_BG1CNT_BITFIELD.screenSize = 0; - if (!NotInBattle()) + if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 1; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; REG_BG1HOFS = 0; REG_BG1VOFS = 0; sub_8078914(&subStruct); tempvar = subStruct.field_4; DmaFill32(3, 0x0, tempvar, 0x1000); - if (NotInBattle()) + if (IsContest()) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceContest, subStruct.field_4); - else if (GetBankSide(gBattleAnimBankTarget) == 1) + else if (GetBankSide(gAnimBankTarget) == 1) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFacePlayer, subStruct.field_4); else LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceOpponent, subStruct.field_4); LZDecompressVram(&gBattleAnimBackgroundImage_ScaryFace, subStruct.field_0); LoadCompressedPalette(&gBattleAnimBackgroundPalette_ScaryFace, subStruct.field_8 << 4, 32); - if (NotInBattle()) + if (IsContest()) sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0); gTasks[taskId].func = sub_80D24E0; @@ -114,7 +114,7 @@ void sub_80D24E0(u8 taskId) } } DmaClear32(3, subStruct.field_4, 0x800); - if (!NotInBattle()) + if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 0; gTasks[taskId].data[12]++; diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index bd072849a..be8613a74 100755 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CAB88(struct Sprite* sprite); static void sub_80CABC0(struct Sprite* sprite); @@ -16,14 +16,14 @@ static void sub_80CABC0(struct Sprite* sprite); void sub_80CAB18(struct Sprite* sprite) { sub_80787B0(sprite, 1); - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); sprite->callback = sub_80CAB88; @@ -46,5 +46,5 @@ void sub_80CABC0(struct Sprite* sprite) StartSpriteAnim(sprite, 1); sprite->data[0] = 60; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/shadow_enlarge.c b/src/battle/anim/shadow_enlarge.c index bed6c7ea3..399cf1ba4 100755 --- a/src/battle/anim/shadow_enlarge.c +++ b/src/battle/anim/shadow_enlarge.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D0428(u8 taskId); diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c index 22ebeab7a..94069374f 100755 --- a/src/battle/anim/shadow_minimize.c +++ b/src/battle/anim/shadow_minimize.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D04E0(u8 taskId); void sub_80D0614(struct Task* task, u8 taskId); @@ -27,7 +27,7 @@ void sub_80D0488(u8 taskId) task->data[4] = 0x100; task->data[5] = 0; task->data[6] = 0; - task->data[7] = sub_8079E90(gBattleAnimBankAttacker); + task->data[7] = sub_8079E90(gAnimBankAttacker); task->func = sub_80D04E0; } diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index 8ed4f9796..676318545 100755 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCE0C(struct Sprite* sprite); @@ -16,17 +16,17 @@ static void sub_80CCE0C(struct Sprite* sprite); void sub_80CCD24(struct Sprite* sprite) { - if (NotInBattle() != 0) + if (IsContest() != 0) { gBattleAnimArgs[1] += 8; } - sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; - if (GetBankSide(gBattleAnimBankAttacker) == 0 || NotInBattle()) - sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker) + 1; + sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + if (GetBankSide(gAnimBankAttacker) == 0 || IsContest()) + sprite->oam.priority = sub_8079ED4(gAnimBankAttacker) + 1; else - sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker); + sprite->oam.priority = sub_8079ED4(gAnimBankAttacker); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100; diff --git a/src/battle/anim/shimmer.c b/src/battle/anim/shimmer.c index ecb3dcdf9..9e7bea1e4 100755 --- a/src/battle/anim/shimmer.c +++ b/src/battle/anim/shimmer.c @@ -6,8 +6,8 @@ #include "blend_palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D6984[]; diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c index 35c380f23..16e04c9db 100644 --- a/src/battle/anim/shock.c +++ b/src/battle/anim/shock.c @@ -4,8 +4,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct OamMatrix gOamMatrices[]; extern void sub_80DA48C(struct Sprite *); @@ -15,10 +15,10 @@ extern void sub_80DA48C(struct Sprite *); void sub_80D6294(struct Sprite *sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3); - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y -= gBattleAnimArgs[1]; @@ -47,43 +47,43 @@ void sub_80D6328(struct Sprite *sprite) switch (gBattleAnimArgs[4]) { case 0: - slot = gBattleAnimBankAttacker; + slot = gAnimBankAttacker; break; case 1: default: - slot = gBattleAnimBankTarget; + slot = gAnimBankTarget; break; case 2: - if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) + if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { - slot = gBattleAnimBankAttacker; + slot = gAnimBankAttacker; } else { - slot = gBattleAnimBankAttacker ^ 2; + slot = gAnimBankAttacker ^ 2; } break; case 3: - if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { - slot = gBattleAnimBankTarget ^ 2; + slot = gAnimBankTarget ^ 2; } else { - slot = gBattleAnimBankTarget; + slot = gAnimBankTarget; } break; } if (gBattleAnimArgs[5] == 0) { - sprite->pos1.x = sub_8077ABC(slot, 0); - sprite->pos1.y = sub_8077ABC(slot, 1); + sprite->pos1.x = GetBankPosition(slot, 0); + sprite->pos1.y = GetBankPosition(slot, 1); } else { - sprite->pos1.x = sub_8077ABC(slot, 2); - sprite->pos1.y = sub_8077ABC(slot, 3); + sprite->pos1.x = GetBankPosition(slot, 2); + sprite->pos1.y = GetBankPosition(slot, 3); } sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8; diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c index 71ff3dae2..a3147f598 100755 --- a/src/battle/anim/silhouette.c +++ b/src/battle/anim/silhouette.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CB3A8(u8 taskId); static void sub_80CB438(u8 taskId); @@ -35,7 +35,7 @@ void sub_80CB3A8(u8 taskId) u8 spriteId = GetAnimBankSpriteId(1); gTasks[taskId].data[10] += gTasks[taskId].data[0]; gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8; - if (GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankTarget)) { gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; } diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c index c5869c4ab..6adcaf098 100755 --- a/src/battle/anim/slash.c +++ b/src/battle/anim/slash.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CDE78(struct Sprite* sprite); static void sub_80CDEB0(struct Sprite* sprite); @@ -19,13 +19,13 @@ void sub_80CDD74(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[2]; } sprite->data[0] = 0; @@ -36,16 +36,16 @@ void sub_80CDD74(struct Sprite* sprite) void sub_80CDDDC(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3); StoreSpriteCallbackInData(sprite, sub_80CDE78); sprite->callback = sub_8078600; } void sub_80CDE24(struct Sprite* sprite) { - sprite->pos1.x = sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->pos1.x = sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3); StartSpriteAnim(sprite, 1); sprite->data[0] = 0; sprite->data[1] = 0; @@ -78,6 +78,6 @@ void sub_80CDEC0(struct Sprite* sprite) sprite->data[0] = 0; sprite->invisible = !sprite->invisible; if (++sprite->data[1] > 8) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c index 58ecc702f..0f0e54f80 100755 --- a/src/battle/anim/sleep.c +++ b/src/battle/anim/sleep.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CD394(struct Sprite* sprite); @@ -16,7 +16,7 @@ static void sub_80CD394(struct Sprite* sprite); void sub_80CD328(struct Sprite* sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c index 8e33dcb06..fe8745483 100755 --- a/src/battle/anim/slice.c +++ b/src/battle/anim/slice.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCB00(struct Sprite* sprite); @@ -15,9 +15,9 @@ static void sub_80CCB00(struct Sprite* sprite); void sub_80CC914(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1); - if (GetBankSide(gBattleAnimBankTarget) == 0) + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1); + if (GetBankSide(gAnimBankTarget) == 0) sprite->pos1.y += 8; sprite->callback = sub_80CCB00; @@ -46,28 +46,28 @@ void sub_80CC9BC(struct Sprite* sprite) switch (gBattleAnimArgs[3]) { case 1: - a = sub_8077ABC(gBattleAnimBankTarget ^ 2, 0); - b = sub_8077ABC(gBattleAnimBankTarget ^ 2, 1); + a = GetBankPosition(gAnimBankTarget ^ 2, 0); + b = GetBankPosition(gAnimBankTarget ^ 2, 1); break; case 2: - a = sub_8077ABC(gBattleAnimBankTarget, 0); - b = sub_8077ABC(gBattleAnimBankTarget, 1); - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) + a = GetBankPosition(gAnimBankTarget, 0); + b = GetBankPosition(gAnimBankTarget, 1); + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { - a = (sub_8077ABC(gBattleAnimBankTarget ^ 2, 0) + a) / 2; - b = (sub_8077ABC(gBattleAnimBankTarget ^ 2, 1) + b) / 2; + a = (GetBankPosition(gAnimBankTarget ^ 2, 0) + a) / 2; + b = (GetBankPosition(gAnimBankTarget ^ 2, 1) + b) / 2; } break; case 0: default: - a = sub_8077ABC(gBattleAnimBankTarget, 0); - b = sub_8077ABC(gBattleAnimBankTarget, 1); + a = GetBankPosition(gAnimBankTarget, 0); + b = GetBankPosition(gAnimBankTarget, 1); break; } sprite->pos1.x = a; sprite->pos1.y = b; - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) sprite->pos1.y += 8; sprite->callback = sub_80CCB00; @@ -104,7 +104,7 @@ void sub_80CCB00(struct Sprite* sprite) sprite->data[0]++; if (sprite->data[0] == 20) { - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->data[0] = 3; sprite->callback = sub_80782D8; } diff --git a/src/battle/anim/smoke.c b/src/battle/anim/smoke.c index c6ce91b76..7ab873e63 100755 --- a/src/battle/anim/smoke.c +++ b/src/battle/anim/smoke.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // smoke (smoke on the ground around a sprite.) // Used in Extremespeed. diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 684516ba7..0897ec6e3 100755 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -6,8 +6,8 @@ #include "battle_anim_80CA710.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // sonic (shoots a projectile towards the target.) // Used in Sonic Boom and Air Cutter. @@ -18,11 +18,11 @@ void sub_80CF6DC(struct Sprite* sprite) s16 b; u16 c; - if (NotInBattle()) + if (IsContest()) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - else if (GetBankSide(gBattleAnimBankAttacker) != 0) + else if (GetBankSide(gAnimBankAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -30,11 +30,11 @@ void sub_80CF6DC(struct Sprite* sprite) } sub_80787B0(sprite, 1); - a = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - b = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + a = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + b = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; c = sub_80790F0(a - sprite->pos1.x, b - sprite->pos1.y); c += 0xF000; - if (NotInBattle()) + if (IsContest()) c -= 0x6000; sub_8078FDC(sprite, 0, 0x100, 0x100, c); @@ -42,7 +42,7 @@ void sub_80CF6DC(struct Sprite* sprite) sprite->data[2] = a; sprite->data[4] = b; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CF7E0(struct Sprite* sprite) diff --git a/src/battle/anim/sonic_task.c b/src/battle/anim/sonic_task.c index efd13dff6..924b1b568 100755 --- a/src/battle/anim/sonic_task.c +++ b/src/battle/anim/sonic_task.c @@ -7,8 +7,8 @@ #include "battle.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gBanksBySide[]; extern u16 gBattleTypeFlags; @@ -46,7 +46,7 @@ void sub_80CFA20(u8 taskId) gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId; gTasks[taskId].data[0] = gTasks[taskId].data[3]; gTasks[taskId].data[1]++; - PlaySE12WithPanning(0x9A, sub_8076F98(-0x3F)); + PlaySE12WithPanning(0x9A, BattleAnimAdjustPanning(-0x3F)); if (gTasks[taskId].data[1] > 2) gTasks[taskId].func = sub_80CF9F8; } @@ -60,7 +60,7 @@ void sub_80CFB04(u8 taskId) s16 sp2 = 0; s16 r4; - if (NotInBattle()) + if (IsContest()) { gTasks[taskId].data[4] = 2; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -71,7 +71,7 @@ void sub_80CFB04(u8 taskId) } else { - if ((gBanksBySide[gBattleAnimBankTarget] & 1) == 0) + if ((gBanksBySide[gAnimBankTarget] & 1) == 0) { gTasks[taskId].data[4] = 1; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -82,17 +82,17 @@ void sub_80CFB04(u8 taskId) gBattleAnimArgs[2] |= 1; } } - r6 = gTasks[taskId].data[9] = sub_8077ABC(gBattleAnimBankAttacker, 0); - r9 = gTasks[taskId].data[10] = sub_8077ABC(gBattleAnimBankAttacker, 1); + r6 = gTasks[taskId].data[9] = GetBankPosition(gAnimBankAttacker, 0); + r9 = gTasks[taskId].data[10] = GetBankPosition(gAnimBankAttacker, 1); if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - && IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) + && IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { - sub_807A3FC(gBattleAnimBankTarget, 0, &sp1, &sp2); + sub_807A3FC(gAnimBankTarget, 0, &sp1, &sp2); } else { - sp1 = sub_8077ABC(gBattleAnimBankTarget, 0); - sp2 = sub_8077ABC(gBattleAnimBankTarget, 1); + sp1 = GetBankPosition(gAnimBankTarget, 0); + sp2 = GetBankPosition(gAnimBankTarget, 1); } sp1 = gTasks[taskId].data[11] = sp1 + gBattleAnimArgs[0]; @@ -122,12 +122,12 @@ void sub_80CFB04(u8 taskId) gBattleAnimArgs[4] ^= 0x80; if (gBattleAnimArgs[4] >= 64) { - u16 var = sub_8079E90(gBattleAnimBankTarget) + (gBattleAnimArgs[4] - 64); + u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); gTasks[taskId].data[2] = var; } else { - u16 var = sub_8079E90(gBattleAnimBankTarget) - gBattleAnimArgs[4]; + u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4]; gTasks[taskId].data[2] = var; } } @@ -135,12 +135,12 @@ void sub_80CFB04(u8 taskId) { if (gBattleAnimArgs[4] >= 64) { - u16 var = sub_8079E90(gBattleAnimBankTarget) + (gBattleAnimArgs[4] - 64); + u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); gTasks[taskId].data[2] = var; } else { - u16 var = sub_8079E90(gBattleAnimBankTarget) - gBattleAnimArgs[4]; + u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4]; gTasks[taskId].data[2] = var; } } diff --git a/src/battle/anim/spin_finger.c b/src/battle/anim/spin_finger.c index adf41b261..8eb060358 100755 --- a/src/battle/anim/spin_finger.c +++ b/src/battle/anim/spin_finger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CF088(struct Sprite* sprite); static void sub_80CF138(struct Sprite* sprite); @@ -19,11 +19,11 @@ void sub_80CF0BC(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; - sprite->pos1.x = sub_8077ABC(bank, 0); + sprite->pos1.x = GetBankPosition(bank, 0); sprite->pos1.y = sub_807A100(bank, 2); if (sprite->pos1.y <= 9) sprite->pos1.y = 10; diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c index f9ad462ae..1e65ba53e 100755 --- a/src/battle/anim/spit.c +++ b/src/battle/anim/spit.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // spit (hurls sprites outward from the pokemon. Similar to orbit_fast, but takes another argument.) // Used in Spit Up. @@ -16,13 +16,13 @@ void sub_80D287C(struct Sprite* sprite) sprite->pos2.x += sprite->data[0]; sprite->pos2.y += sprite->data[1]; if (sprite->data[3]++ >= sprite->data[2]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80D28AC(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->data[2] = gBattleAnimArgs[1]; diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c index 1b0ceba93..570ef0dca 100755 --- a/src/battle/anim/splash.c +++ b/src/battle/anim/splash.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct AffineAnimFrameCmd gUnknown_083D76F4; diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c index acbf80fec..50e78af37 100755 --- a/src/battle/anim/startle.c +++ b/src/battle/anim/startle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct AffineAnimFrameCmd gUnknown_083D7A98; diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c index f2fbdb5a4..bfa1dc4f7 100755 --- a/src/battle/anim/strike.c +++ b/src/battle/anim/strike.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE798(struct Sprite* sprite); @@ -23,11 +23,11 @@ void sub_80CE670(struct Sprite* sprite) sprite->data[0] = 0; sprite->data[1] = gBattleAnimArgs[2]; - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[1]; sprite->data[6] = sprite->pos1.x; sprite->data[7] = sprite->pos1.y; - if (NotInBattle() != 0) + if (IsContest() != 0) { sprite->oam.matrixNum = 8; sprite->pos1.x += 40; @@ -37,7 +37,7 @@ void sub_80CE670(struct Sprite* sprite) sprite->data[4] = sprite->pos1.y << 7; sprite->data[5] = -0xA00 / sprite->data[1]; } - else if (GetBankSide(gBattleAnimBankAttacker) == 0) + else if (GetBankSide(gAnimBankAttacker) == 0) { sprite->pos1.x -= 40; sprite->pos1.y += 20; @@ -73,5 +73,5 @@ void sub_80CE798(struct Sprite* sprite) } if (sprite->data[1] == 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c index 63a01a79e..20dbaf2dc 100644 --- a/src/battle/anim/struggle.c +++ b/src/battle/anim/struggle.c @@ -4,8 +4,8 @@ #include "sprite.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D2CC4(struct Sprite *); @@ -13,19 +13,19 @@ void sub_80D2C38(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } else { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); } else { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3); } if (gBattleAnimArgs[1] == 0) @@ -47,6 +47,6 @@ static void sub_80D2CC4(struct Sprite *sprite) if (--sprite->data[0] != 0) StartSpriteAnim(sprite, sprite->data[1]); else - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c index f6cb8a077..e6fd49a11 100644 --- a/src/battle/anim/sunlight.c +++ b/src/battle/anim/sunlight.c @@ -13,5 +13,5 @@ void sub_80D517C(struct Sprite *sprite) sprite->data[2] = 140; sprite->data[4] = 80; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c index 15bee06ee..922b11a5f 100644 --- a/src/battle/anim/swipe.c +++ b/src/battle/anim/swipe.c @@ -15,6 +15,6 @@ void sub_80D2BE8(struct Sprite *sprite) } else if (sprite->animEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c index a1be144df..c4082b6aa 100755 --- a/src/battle/anim/switch.c +++ b/src/battle/anim/switch.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s8 gUnknown_083D680C[11][3]; @@ -24,7 +24,7 @@ void sub_80CBBF0(struct Sprite* sprite) if (sprite->data[0] == 0) { - if (!NotInBattle()) + if (!IsContest()) { sprite->data[1] = gBattleAnimArgs[1]; sprite->pos1.x = 0x78; @@ -101,7 +101,7 @@ void sub_80CBCF8(struct Sprite* sprite) { sprite->data[2]++; sprite->data[1] = (gUnknown_083D680C[sprite->data[0]][0] * gUnknown_083D680C[sprite->data[0]][2] + sprite->data[1]) & 0xFF; - if (!NotInBattle()) + if (!IsContest()) { if ((u16)(sprite->data[1] - 1) <= 0xBE) { @@ -121,7 +121,7 @@ void sub_80CBCF8(struct Sprite* sprite) void sub_80CBDB0(struct Sprite* sprite) { if (sprite->data[0] > 20) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); sprite->invisible = sprite->data[0] % 2; sprite->data[0]++; diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index 536f89b26..b46fe6759 100755 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CF6B4(struct Sprite* sprite); @@ -26,5 +26,5 @@ void sub_80CF6B4(struct Sprite* sprite) sprite->data[2] = sprite->pos1.x; sprite->data[4] = sprite->pos1.y - 32; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/taunt_finger.c b/src/battle/anim/taunt_finger.c index 7024f85a0..023e14e45 100755 --- a/src/battle/anim/taunt_finger.c +++ b/src/battle/anim/taunt_finger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); static void sub_80CF228(struct Sprite* sprite); @@ -19,9 +19,9 @@ void sub_80CF1C8(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); if (GetBankSide(bank) == 0) @@ -52,5 +52,5 @@ void sub_80CF228(struct Sprite* sprite) void sub_80CF264(struct Sprite* sprite) { if (++sprite->data[1] > 5) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c index ba1014d2f..9f57ffd45 100755 --- a/src/battle/anim/tendrils.c +++ b/src/battle/anim/tendrils.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CB298(struct Sprite* sprite); static void sub_80CB2D4(struct Sprite* sprite); @@ -61,7 +61,7 @@ void sub_80CB2D4(struct Sprite* sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } }
\ No newline at end of file diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index 9cffafe14..c3ab6f82c 100755 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CF008(struct Sprite* sprite); @@ -20,7 +20,7 @@ void sub_80CEF44(u8 bank, struct Sprite* sprite) else sprite->pos1.x = sub_807A100(bank, 4) - 8; - sprite->pos1.y = sub_8077ABC(bank, 3) - (s16)sub_807A100(bank, 0) / 4; + sprite->pos1.y = GetBankPosition(bank, 3) - (s16)sub_807A100(bank, 0) / 4; } void sub_80CEF9C(struct Sprite* sprite) @@ -28,9 +28,9 @@ void sub_80CEF9C(struct Sprite* sprite) u8 a; u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); a = (GetBankSide(bank) == 0) ? 0 : 1; @@ -45,7 +45,7 @@ void sub_80CF008(struct Sprite* sprite) { if (--sprite->data[0] == 0) { - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); StartSpriteAnim(sprite, sprite->data[1]); sprite->callback = sub_8078600; } diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c index 9811c546a..3fde815ae 100755 --- a/src/battle/anim/thrashing.c +++ b/src/battle/anim/thrashing.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct AffineAnimFrameCmd gUnknown_083D77B0; @@ -48,7 +48,7 @@ void sub_80D0AB8(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[9] = 2; - if (GetBankSide(gBattleAnimBankAttacker) == 1) + if (GetBankSide(gAnimBankAttacker) == 1) task->data[2] *= -1; task->func = sub_80D0B3C; diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index 5064148ef..2ed073221 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; static void sub_80D6218(struct Sprite *); @@ -14,7 +14,7 @@ static void sub_80D6218(struct Sprite *); void sub_80D61C8(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } @@ -31,6 +31,6 @@ static void sub_80D6218(struct Sprite *sprite) { if (sprite->animEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/tile_in.c b/src/battle/anim/tile_in.c index 5fcbadbb7..a4a544a0c 100755 --- a/src/battle/anim/tile_in.c +++ b/src/battle/anim/tile_in.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // tile_in (flips a white tile from the scene into facing the player.) // Used in Conversion. @@ -15,15 +15,15 @@ void sub_80CE09C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; - if (NotInBattle()) + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + if (IsContest()) sprite->pos1.y += 10; sprite->data[0]++; } if ((u16)gBattleAnimArgs[7] == 0xFFFF) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80CE108(u8 taskId) diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c index 8b710268f..50468a440 100755 --- a/src/battle/anim/tile_out.c +++ b/src/battle/anim/tile_out.c @@ -6,8 +6,8 @@ #include "battle_interface.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gNoOfAllBanks; extern u8 gHealthboxIDs[]; @@ -35,10 +35,10 @@ void sub_80CE1AC(struct Sprite* sprite) { sprite->animPaused = 0; sprite->data[0] = 30; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } } diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c index 56095c29d..e26669f63 100755 --- a/src/battle/anim/twinkle.c +++ b/src/battle/anim/twinkle.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CE3B0(struct Sprite* sprite); @@ -15,7 +15,7 @@ static void sub_80CE3B0(struct Sprite* sprite); void sub_80CE36C(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[1]; sprite->data[0] = 0; sprite->data[1] = 0; @@ -38,5 +38,5 @@ void sub_80CE3B0(struct Sprite* sprite) } if (sprite->data[0]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c index fdcef0de9..d7e5fbfe4 100755 --- a/src/battle/anim/unused_1.c +++ b/src/battle/anim/unused_1.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // unused effect file. // Seems to be a beta effect for Beat Up, possibly. diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index f7f5be88d..122f39e02 100755 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCCB4(struct Sprite* sprite); @@ -42,14 +42,14 @@ void unref_sub_80CCB6C(struct Sprite* sprite) { DestroySprite(&gSprites[sprite->data[0]]); DestroySprite(&gSprites[sprite->data[1]]); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } void sub_80CCC50(struct Sprite* sprite) { sprite->data[0] = gBattleAnimArgs[2]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; @@ -76,5 +76,5 @@ void sub_80CCCB4(struct Sprite* sprite) sprite->pos2.y += sprite->data[5] >> 8; sprite->data[2]++; if (sprite->data[2] == sprite->data[3]) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c index 049e0ca1b..6dbcbfefe 100755 --- a/src/battle/anim/unused_3.c +++ b/src/battle/anim/unused_3.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CD2D4(struct Sprite* sprite); @@ -16,7 +16,7 @@ static void sub_80CD2D4(struct Sprite* sprite); void sub_80CD274(struct Sprite* sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -41,5 +41,5 @@ void sub_80CD2D4(struct Sprite* sprite) } if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/unused_4.c b/src/battle/anim/unused_4.c index 72ecde05c..bda476a0a 100755 --- a/src/battle/anim/unused_4.c +++ b/src/battle/anim/unused_4.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -27,8 +27,8 @@ void sub_80CD9D4(struct Sprite* sprite) { case 0: sprite->data[1] = 0; - sprite->data[2] = gObjectBankIDs[gBattleAnimBankAttacker]; - sprite->data[3] = GetBankSide(gBattleAnimBankAttacker); + sprite->data[2] = gObjectBankIDs[gAnimBankAttacker]; + sprite->data[3] = GetBankSide(gAnimBankAttacker); sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200; sprite->data[5] = 0; sub_8078E70(sprite->data[2], 0); @@ -51,7 +51,7 @@ void sub_80CD9D4(struct Sprite* sprite) if (++sprite->data[1] > 3) { sub_8078F40(sprite->data[2]); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } break; } diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c index 4dc2da70d..421cdd6bf 100755 --- a/src/battle/anim/unused_5.c +++ b/src/battle/anim/unused_5.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // unused_5 diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c index f7c87647f..37e2031b0 100755 --- a/src/battle/anim/unused_6.c +++ b/src/battle/anim/unused_6.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); static void sub_80CF310(struct Sprite* sprite); @@ -17,9 +17,9 @@ void sub_80CF2D0(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); sprite->data[0] = 0; @@ -43,7 +43,7 @@ void sub_80CF310(struct Sprite* sprite) break; case 2: if (++sprite->data[1] == 0x40) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); break; } } diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c index 3a8998f1d..2be6e7633 100755 --- a/src/battle/anim/unused_7.c +++ b/src/battle/anim/unused_7.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -30,10 +30,10 @@ void sub_80CF374(struct Sprite* sprite) void sub_80CF3C4(struct Sprite* sprite) { u8 a; - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - a = gObjectBankIDs[gBattleAnimBankTarget]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + a = gObjectBankIDs[gAnimBankTarget]; + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c index bcebfcd2b..03772f951 100755 --- a/src/battle/anim/unused_8.c +++ b/src/battle/anim/unused_8.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CF490(struct Sprite* sprite); static void sub_80CF4B8(struct Sprite* sprite); @@ -35,7 +35,7 @@ void sub_80CF490(struct Sprite* sprite) void sub_80CF4B8(struct Sprite* sprite) { if (sprite->data[5] == 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); else sprite->data[5]--; } diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c index 579238fbc..cf3ccb0d4 100755 --- a/src/battle/anim/unused_9.c +++ b/src/battle/anim/unused_9.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct SpriteTemplate gSpriteTemplate_83D75AC; @@ -44,7 +44,7 @@ void sub_80CFE2C(struct Sprite* sprite) gPlttBufferFaded[sprite->data[0] + 15] = r7; if (++sprite->data[2] == 0x18) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } #else @@ -101,7 +101,7 @@ _080CFE64:\n\ cmp r0, 0x18\n\ bne _080CFE90\n\ adds r0, r4, 0\n\ - bl move_anim_8072740\n\ + bl DestroyAnimSprite\n\ _080CFE90:\n\ pop {r4-r7}\n\ pop {r0}\n\ diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index 396a4637d..4068cbe78 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -5,8 +5,8 @@ #include "util.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D3874(struct Sprite *); @@ -19,7 +19,7 @@ void sub_80D37FC(struct Sprite *sprite) sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80D3838(struct Sprite *sprite) @@ -47,7 +47,7 @@ static void sub_80D3874(struct Sprite *sprite) if (--sprite->data[7] == -1) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -139,7 +139,7 @@ _080D3920:\n\ ldr r1, _080D399C @ =0x85000400\n\ str r1, [r0, 0x8]\n\ ldr r0, [r0, 0x8]\n\ - bl NotInBattle\n\ + bl IsContest\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _080D39B8\n\ @@ -151,7 +151,7 @@ _080D3920:\n\ movs r1, 0x4\n\ orrs r0, r1\n\ strb r0, [r2]\n\ - ldr r0, _080D39A0 @ =gBattleAnimBankAttacker\n\ + ldr r0, _080D39A0 @ =gAnimBankAttacker\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ @@ -166,7 +166,7 @@ _080D3990: .4byte 0x00003f42\n\ _080D3994: .4byte REG_BG1CNT\n\ _080D3998: .4byte 0x040000d4\n\ _080D399C: .4byte 0x85000400\n\ -_080D39A0: .4byte gBattleAnimBankAttacker\n\ +_080D39A0: .4byte gAnimBankAttacker\n\ _080D39A4: .4byte gUnknown_08E70968\n\ _080D39A8:\n\ ldr r0, _080D39B4 @ =gUnknown_08E70C38\n\ @@ -245,18 +245,18 @@ _080D3A0E:\n\ lsls r0, 5\n\ strh r0, [r7, 0xA]\n\ strh r0, [r7, 0xC]\n\ - bl NotInBattle\n\ + bl IsContest\n\ lsls r0, 24\n\ lsrs r4, r0, 24\n\ cmp r4, 0\n\ beq _080D3A94\n\ ldr r3, _080D3A84 @ =0x0000ffb0\n\ adds r0, r3, 0\n\ - ldr r1, _080D3A88 @ =gUnknown_030042C0\n\ + ldr r1, _080D3A88 @ =gBattle_BG1_X\n\ strh r0, [r1]\n\ ldr r2, _080D3A8C @ =0x0000ffd0\n\ adds r0, r2, 0\n\ - ldr r3, _080D3A90 @ =gUnknown_030041B4\n\ + ldr r3, _080D3A90 @ =gBattle_BG1_Y\n\ strh r0, [r3]\n\ movs r0, 0x2\n\ strh r0, [r6, 0x8]\n\ @@ -270,11 +270,11 @@ _080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal\n\ _080D3A7C: .4byte sub_80D3D68\n\ _080D3A80: .4byte gTasks\n\ _080D3A84: .4byte 0x0000ffb0\n\ -_080D3A88: .4byte gUnknown_030042C0\n\ +_080D3A88: .4byte gBattle_BG1_X\n\ _080D3A8C: .4byte 0x0000ffd0\n\ -_080D3A90: .4byte gUnknown_030041B4\n\ +_080D3A90: .4byte gBattle_BG1_Y\n\ _080D3A94:\n\ - ldr r0, _080D3AC4 @ =gBattleAnimBankAttacker\n\ + ldr r0, _080D3AC4 @ =gAnimBankAttacker\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ @@ -283,12 +283,12 @@ _080D3A94:\n\ bne _080D3AD8\n\ ldr r2, _080D3AC8 @ =0x0000ff20\n\ adds r0, r2, 0\n\ - ldr r3, _080D3ACC @ =gUnknown_030042C0\n\ + ldr r3, _080D3ACC @ =gBattle_BG1_X\n\ strh r0, [r3]\n\ movs r2, 0x80\n\ lsls r2, 1\n\ adds r0, r2, 0\n\ - ldr r3, _080D3AD0 @ =gUnknown_030041B4\n\ + ldr r3, _080D3AD0 @ =gBattle_BG1_Y\n\ strh r0, [r3]\n\ movs r0, 0x2\n\ strh r0, [r6, 0x8]\n\ @@ -297,17 +297,17 @@ _080D3A94:\n\ strh r1, [r7, 0xE]\n\ b _080D3AEE\n\ .align 2, 0\n\ -_080D3AC4: .4byte gBattleAnimBankAttacker\n\ +_080D3AC4: .4byte gAnimBankAttacker\n\ _080D3AC8: .4byte 0x0000ff20\n\ -_080D3ACC: .4byte gUnknown_030042C0\n\ -_080D3AD0: .4byte gUnknown_030041B4\n\ +_080D3ACC: .4byte gBattle_BG1_X\n\ +_080D3AD0: .4byte gBattle_BG1_Y\n\ _080D3AD4: .4byte 0x0000ffff\n\ _080D3AD8:\n\ - ldr r0, _080D3B1C @ =gUnknown_030042C0\n\ + ldr r0, _080D3B1C @ =gBattle_BG1_X\n\ strh r4, [r0]\n\ ldr r1, _080D3B20 @ =0x0000ffd0\n\ adds r0, r1, 0\n\ - ldr r2, _080D3B24 @ =gUnknown_030041B4\n\ + ldr r2, _080D3B24 @ =gBattle_BG1_Y\n\ strh r0, [r2]\n\ ldr r0, _080D3B28 @ =0x0000fffe\n\ strh r0, [r6, 0x8]\n\ @@ -316,11 +316,11 @@ _080D3AD8:\n\ strh r4, [r7, 0xE]\n\ _080D3AEE:\n\ ldr r1, _080D3B2C @ =REG_BG1HOFS\n\ - ldr r3, _080D3B1C @ =gUnknown_030042C0\n\ + ldr r3, _080D3B1C @ =gBattle_BG1_X\n\ ldrh r0, [r3]\n\ strh r0, [r1]\n\ adds r1, 0x2\n\ - ldr r2, _080D3B24 @ =gUnknown_030041B4\n\ + ldr r2, _080D3B24 @ =gBattle_BG1_Y\n\ ldrh r0, [r2]\n\ strh r0, [r1]\n\ ldr r1, _080D3B30 @ =gTasks\n\ @@ -338,9 +338,9 @@ _080D3AEE:\n\ movs r0, 0x70\n\ b _080D3B38\n\ .align 2, 0\n\ -_080D3B1C: .4byte gUnknown_030042C0\n\ +_080D3B1C: .4byte gBattle_BG1_X\n\ _080D3B20: .4byte 0x0000ffd0\n\ -_080D3B24: .4byte gUnknown_030041B4\n\ +_080D3B24: .4byte gBattle_BG1_Y\n\ _080D3B28: .4byte 0x0000fffe\n\ _080D3B2C: .4byte REG_BG1HOFS\n\ _080D3B30: .4byte gTasks\n\ diff --git a/src/battle/anim/wave_finger.c b/src/battle/anim/wave_finger.c index 58f0f8778..2cf68c34c 100755 --- a/src/battle/anim/wave_finger.c +++ b/src/battle/anim/wave_finger.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void sub_80CEF44(u8 bank, struct Sprite* sprite); void sub_80CF088(struct Sprite* sprite); @@ -18,9 +18,9 @@ void sub_80CF040(struct Sprite* sprite) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gBattleAnimBankAttacker; + bank = gAnimBankAttacker; else - bank = gBattleAnimBankTarget; + bank = gAnimBankTarget; sub_80CEF44(bank, sprite); sprite->data[0] = 0; diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index 3aa0758a9..cb3ce327e 100755 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; // whip (does a hitting animation that uses a rotating sprite to invoke the sprite getting hit.) // Used by Slam and Vine Whip. @@ -14,13 +14,13 @@ extern u8 gBattleAnimBankTarget; void sub_80CC810(struct Sprite* sprite) { if (sprite->animEnded) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } // unused, beta effect for diagonal sprite movement? void sub_80CC82C(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -32,12 +32,12 @@ void sub_80CC82C(struct Sprite* sprite) } sprite->callback = sub_8078600; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80CC884(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) StartSpriteAnim(sprite, 1); sprite->callback = sub_80CC810; diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index 0e13fa119..0cbe6eed7 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -6,8 +6,8 @@ #include "trig.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; extern u8 gUnknown_0202F7D2; @@ -25,7 +25,7 @@ void sub_80D5B0C(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[7] = gBattleAnimArgs[2]; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->data[4] = 4; } @@ -34,12 +34,12 @@ void sub_80D5B0C(struct Sprite *sprite) sprite->data[4] = -4; } - sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget); + sprite->oam.priority = sub_8079ED4(gAnimBankTarget); sprite->data[0]++; break; case 1: sprite->data[1] += 192; - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos2.y = -(sprite->data[1] >> 8); } @@ -70,9 +70,9 @@ void sub_80D5B0C(struct Sprite *sprite) sprite->data[0] = 256; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sub_8078BD4(sprite); sprite->callback = sub_80D5C5C; @@ -100,6 +100,6 @@ static void sub_80D5C5C(struct Sprite *sprite) } else { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c index 9abcff32d..e67248b9f 100755 --- a/src/battle/anim/withdraw.c +++ b/src/battle/anim/withdraw.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -17,15 +17,15 @@ static void sub_80CF514(u8 taskId); void sub_80CF4D8(u8 taskId) { - sub_8078E70(gObjectBankIDs[gBattleAnimBankAttacker], 0); + sub_8078E70(gObjectBankIDs[gAnimBankAttacker], 0); gTasks[taskId].func = sub_80CF514; } void sub_80CF514(u8 taskId) { - u8 a = gObjectBankIDs[gBattleAnimBankAttacker]; + u8 a = gObjectBankIDs[gAnimBankAttacker]; s16 b; - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { b = -gTasks[taskId].data[0]; } diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index ff3df7235..b0654950b 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -96,21 +96,21 @@ extern u8 gActionSelectionCursor[]; extern u8 gMoveSelectionCursor[]; extern u8 gUnknown_02038470[]; extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; extern struct Window gUnknown_030041D0; -extern u16 gUnknown_03004200; +extern u16 gBattle_WIN1H; extern struct Window gUnknown_03004210; -extern u16 gUnknown_03004244; +extern u16 gBattle_WIN1V; extern struct Window gUnknown_03004250; -extern u16 gUnknown_03004240; -extern u16 gUnknown_03004280; +extern u16 gBattle_WIN0V; +extern u16 gBattle_BG2_Y; extern u32 gUnknown_03004284; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030042C4; +extern u16 gBattle_BG1_X; +extern u16 gBattle_WIN0H; extern MainCallback gPreBattleCallback1; extern void (*gBattleMainFunc)(void); extern u8 gLeveledUpInBattle; @@ -160,8 +160,8 @@ void InitBattle(void) REG_WIN0V = 0x5051; REG_WININ = 0; REG_WINOUT = 0; - gUnknown_030042C4 = 0xF0; - gUnknown_03004240 = 0x5051; + gBattle_WIN0H = 0xF0; + gBattle_WIN0V = 0x5051; dp12_8087EA4(); for (i = 0; i < 80; i++) @@ -181,10 +181,10 @@ void InitBattle(void) ResetPaletteFade(); gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; gBattleTerrain = BattleSetup_GetTerrain(); @@ -1003,16 +1003,16 @@ void sub_800FCFC(void) Random(); // unused return value REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; - REG_WIN0H = gUnknown_030042C4; - REG_WIN0V = gUnknown_03004240; - REG_WIN1H = gUnknown_03004200; - REG_WIN1V = gUnknown_03004244; + REG_WIN0H = gBattle_WIN0H; + REG_WIN0V = gBattle_WIN0V; + REG_WIN1H = gBattle_WIN1H; + REG_WIN1V = gBattle_WIN1V; LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -1138,8 +1138,8 @@ void c2_8011A1C(void) REG_WIN0V = 0x5051; REG_WININ = 0; REG_WINOUT = 0; - gUnknown_030042C4 = 0xF0; - gUnknown_03004240 = 0x5051; + gBattle_WIN0H = 0xF0; + gBattle_WIN0V = 0x5051; dp12_8087EA4(); for (i = 0; i < 80; i++) @@ -1157,10 +1157,10 @@ void c2_8011A1C(void) ResetPaletteFade(); gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 5a30e012d..22e15d69a 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -39,8 +39,8 @@ extern struct MusicPlayerInfo gMPlay_BGM; extern u32 gBitTable[]; extern u16 gBattleTypeFlags; extern u8 gBattleMonForms[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; extern const u8 *const gBattleAnims_General[]; @@ -66,8 +66,8 @@ extern void c3_0802FDF4(u8); extern void sub_80440EC(); extern void sub_804777C(); extern void sub_8141828(); -extern u8 sub_8077ABC(); -extern u8 AnimBankSpriteExists(u8); +extern u8 GetBankPosition(); +extern u8 IsBankSpritePresent(u8); extern u8 sub_8077F68(u8); extern u8 sub_8077F7C(u8); extern void sub_8094958(void); @@ -174,10 +174,10 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e) sub_80324E0(a); return TRUE; } - gBattleAnimBankAttacker = b; - gBattleAnimBankTarget = c; + gAnimBankAttacker = b; + gAnimBankTarget = c; ewram17840.unk0 = e; - DoMoveAnim(gBattleAnims_General, d, 0); + LaunchBattleAnimation(gBattleAnims_General, d, 0); taskId = CreateTask(sub_80315E8, 10); gTasks[taskId].data[0] = a; ewram17810[gTasks[taskId].data[0]].unk0_5 = 1; @@ -214,9 +214,9 @@ void move_anim_start_t4(u8 a, u8 b, u8 c, u8 d) { u8 taskId; - gBattleAnimBankAttacker = b; - gBattleAnimBankTarget = c; - DoMoveAnim(gBattleAnims_Special, d, 0); + gAnimBankAttacker = b; + gAnimBankTarget = c; + LaunchBattleAnimation(gBattleAnims_Special, d, 0); taskId = CreateTask(sub_80316CC, 10); gTasks[taskId].data[0] = a; ewram17810[gTasks[taskId].data[0]].unk0_6 = 1; @@ -626,7 +626,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) const void *src; void *dst; - if (NotInBattle()) + if (IsContest()) { r10 = 0; species = ewram19348.unk2; @@ -691,7 +691,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) } BlendPalette(paletteOffset, 16, 6, 0x7FFF); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); - if (!NotInBattle()) + if (!IsContest()) { ewram17800[a].transformedSpecies = species; gBattleMonForms[a] = gBattleMonForms[b]; @@ -711,11 +711,11 @@ void BattleLoadSubstituteSprite(u8 a, u8 b) if (b == 0) { - if (NotInBattle()) + if (IsContest()) r4 = 0; else r4 = GetBankIdentity(a); - if (NotInBattle()) + if (IsContest()) LZDecompressVram(gSubstituteDollTilemap, gUnknown_081FAF4C[r4]); else if (GetBankSide(a) != 0) LZDecompressVram(gSubstituteDollGfx, gUnknown_081FAF4C[r4]); @@ -731,7 +731,7 @@ void BattleLoadSubstituteSprite(u8 a, u8 b) } else { - if (!NotInBattle()) + if (!IsContest()) { if (GetBankSide(a) != 0) BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[a]], a); @@ -835,7 +835,7 @@ void sub_80326EC(u8 a) for (i = 0; i < gNoOfAllBanks; i++) { - if (AnimBankSpriteExists(i) != 0) + if (IsBankSpritePresent(i) != 0) { gSprites[gObjectBankIDs[i]].oam.affineMode = a; if (a == 0) @@ -857,12 +857,12 @@ void sub_80327CC(void) LoadCompressedObjectPic(&gUnknown_081FAF24); r5 = GetBankByPlayerAI(1); - ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); + ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8); gSprites[ewram17810[r5].unk7].data[0] = r5; if (IsDoubleBattle()) { r5 = GetBankByPlayerAI(3); - ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); + ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8); gSprites[ewram17810[r5].unk7].data[0] = r5; } } @@ -873,7 +873,7 @@ void sub_80328A4(struct Sprite *sprite) u8 r4 = sprite->data[0]; struct Sprite *r7 = &gSprites[gObjectBankIDs[r4]]; - if (!r7->inUse || AnimBankSpriteExists(r4) == 0) + if (!r7->inUse || IsBankSpritePresent(r4) == 0) { sprite->callback = sub_8032978; return; diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 1a78b2863..8c37e6010 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -17,11 +17,14 @@ // sprites start at 10000 and thus must be subtracted of 10000 to account for the true index. #define GET_TRUE_SPRITE_INDEX(i) (i - 10000) +#define ANIM_SPRITE_INDEX_COUNT 8 +#define ANIM_ARGS_COUNT 8 + extern u16 gBattlePartyID[4]; extern u8 gObjectBankIDs[]; extern u8 gBankAttacker; extern u8 gBankTarget; -EWRAM_DATA const u8 *gBattleAnimScriptPtr = NULL; +EWRAM_DATA const u8 *sBattleAnimScriptPtr = NULL; EWRAM_DATA const u8 *gBattleAnimScriptRetAddr = NULL; EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL; EWRAM_DATA s8 gAnimFramesToWait = 0; @@ -29,30 +32,30 @@ EWRAM_DATA u8 gAnimScriptActive = FALSE; EWRAM_DATA u8 gAnimVisualTaskCount = 0; EWRAM_DATA u8 gAnimSoundTaskCount = 0; EWRAM_DATA u32 gDisableStructMoveAnim = 0; -EWRAM_DATA u32 gMoveDmgMoveAnim = 0; -EWRAM_DATA u16 gMovePowerMoveAnim = 0; -EWRAM_DATA u8 gHappinessMoveAnim = 0; +EWRAM_DATA u32 gAnimMoveDmg = 0; +EWRAM_DATA u16 gAnimMovePower = 0; +EWRAM_DATA u8 gAnimFriendship = 0; EWRAM_DATA u16 gWeatherMoveAnim = 0; EWRAM_DATA u8 gMonAnimTaskIdArray[2] = {0}; -EWRAM_DATA u8 gUnknown_0202F7C4 = 0; -EWRAM_DATA u8 gUnknown_0202F7C5 = 0; -EWRAM_DATA u16 gAnimMoveIndex = 0; // set but unused. -EWRAM_DATA u8 gBattleAnimBankAttacker = 0; -EWRAM_DATA u8 gBattleAnimBankTarget = 0; -EWRAM_DATA u16 gUnknown_0202F7CA[4] = {0}; +EWRAM_DATA u8 gAnimMoveTurn = 0; +EWRAM_DATA u8 sAnimBackgroundFadeState = 0; +EWRAM_DATA u16 sAnimMoveIndex = 0; // set but unused. +EWRAM_DATA u8 gAnimBankAttacker = 0; +EWRAM_DATA u8 gAnimBankTarget = 0; +EWRAM_DATA u16 gAnimSpeciesByBanks[4] = {0}; EWRAM_DATA u8 gUnknown_0202F7D2 = 0; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_03004200; -extern u16 gUnknown_03004240; -extern u16 gUnknown_03004244; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030042C4; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1V; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG1_X; +extern u16 gBattle_WIN0H; u16 gSoundAnimFramesToWait; -s16 gBattleAnimArgs[8]; -u16 gAnimSpriteIndexArray[8]; +s16 gBattleAnimArgs[ANIM_ARGS_COUNT]; +u16 gAnimSpriteIndexArray[ANIM_SPRITE_INDEX_COUNT]; extern struct MusicPlayerInfo gMPlay_BGM; extern struct MusicPlayerInfo gMPlay_SE1; @@ -65,10 +68,10 @@ extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; extern const struct BattleAnimBackground gBattleAnimBackgroundTable[]; static void RunAnimScriptCommand(void); -static void ScriptCmd_loadsprite(void); -static void ScriptCmd_unloadsprite(void); -static void ScriptCmd_sprite(void); -static void ScriptCmd_createtask(void); +static void ScriptCmd_loadspritegfx(void); +static void ScriptCmd_unloadspritegfx(void); +static void ScriptCmd_createsprite(void); +static void ScriptCmd_createvisualtask(void); static void ScriptCmd_delay(void); static void ScriptCmd_waitforvisualfinish(void); static void ScriptCmd_hang1(void); @@ -88,33 +91,33 @@ static void ScriptCmd_setbldcnt(void); static void ScriptCmd_blendoff(void); static void ScriptCmd_call(void); static void ScriptCmd_return(void); -static void ScriptCmd_setvar(void); -static void ScriptCmd_ifelse(void); -static void ScriptCmd_jumpif(void); +static void ScriptCmd_setarg(void); +static void ScriptCmd_choosetwoturnanim(void); +static void ScriptCmd_jumpifmoveturn(void); static void ScriptCmd_jump(void); static void ScriptCmd_fadetobg(void); -static void ScriptCmd_fadetobg_25(void); -static void task_p5_load_battle_screen_elements(u8); -static void sub_8076DB8(u16); -static void dp01t_11_3_message_for_player_only(void); +static void ScriptCmd_fadetobgfromset(void); +static void Task_FadeToBg(u8); +static void LoadMoveBg(u16); +static void LoadDefaultBg(void); static void ScriptCmd_restorebg(void); static void ScriptCmd_waitbgfadeout(void); static void ScriptCmd_waitbgfadein(void); static void ScriptCmd_changebg(void); -static void ScriptCmd_panse_19(void); +static void ScriptCmd_playsewithpan(void); static void ScriptCmd_setpan(void); static void ScriptCmd_panse_1B(void); -static void c3_08073CEC(u8); +static void Task_PanFromInitialToTarget(u8); static void ScriptCmd_panse_26(void); static void ScriptCmd_panse_27(void); -static void ScriptCmd_panse_1C(void); -static void sub_80774FC(u8); -static void ScriptCmd_panse_1D(void); -static void sub_80775CC(u8); -static void ScriptCmd_createtask_1F(void); +static void ScriptCmd_loopsewithpan(void); +static void Task_LoopAndPlaySE(u8); +static void ScriptCmd_waitplaysewithpan(void); +static void Task_WaitAndPlaySE(u8); +static void ScriptCmd_createsoundtask(void); static void ScriptCmd_waitsound(void); -static void ScriptCmd_jumpvareq(void); -static void ScriptCmd_jumpunkcond(void); +static void ScriptCmd_jumpargeq(void); +static void ScriptCmd_jumpifcontest(void); static void ScriptCmd_monbgprio_28(void); static void ScriptCmd_monbgprio_29(void); static void ScriptCmd_monbgprio_2A(void); @@ -125,10 +128,10 @@ static void ScriptCmd_doublebattle_2E(void); static void ScriptCmd_stopsound(void); static void (*const sScriptCmdTable[])(void) = { - ScriptCmd_loadsprite, - ScriptCmd_unloadsprite, - ScriptCmd_sprite, - ScriptCmd_createtask, + ScriptCmd_loadspritegfx, + ScriptCmd_unloadspritegfx, + ScriptCmd_createsprite, + ScriptCmd_createvisualtask, ScriptCmd_delay, ScriptCmd_waitforvisualfinish, ScriptCmd_hang1, @@ -141,28 +144,28 @@ static void (*const sScriptCmdTable[])(void) = { ScriptCmd_blendoff, ScriptCmd_call, ScriptCmd_return, - ScriptCmd_setvar, - ScriptCmd_ifelse, - ScriptCmd_jumpif, + ScriptCmd_setarg, + ScriptCmd_choosetwoturnanim, + ScriptCmd_jumpifmoveturn, ScriptCmd_jump, ScriptCmd_fadetobg, ScriptCmd_restorebg, ScriptCmd_waitbgfadeout, ScriptCmd_waitbgfadein, ScriptCmd_changebg, - ScriptCmd_panse_19, + ScriptCmd_playsewithpan, ScriptCmd_setpan, ScriptCmd_panse_1B, - ScriptCmd_panse_1C, - ScriptCmd_panse_1D, + ScriptCmd_loopsewithpan, + ScriptCmd_waitplaysewithpan, ScriptCmd_setbldcnt, - ScriptCmd_createtask_1F, + ScriptCmd_createsoundtask, ScriptCmd_waitsound, - ScriptCmd_jumpvareq, + ScriptCmd_jumpargeq, ScriptCmd_monbg_22, ScriptCmd_clearmonbg_23, - ScriptCmd_jumpunkcond, - ScriptCmd_fadetobg_25, + ScriptCmd_jumpifcontest, + ScriptCmd_fadetobgfromset, ScriptCmd_panse_26, ScriptCmd_panse_27, ScriptCmd_monbgprio_28, @@ -175,7 +178,7 @@ static void (*const sScriptCmdTable[])(void) = { ScriptCmd_stopsound, }; -void battle_anim_clear_some_data(void) +void ClearBattleAnimationVars(void) { s32 i; @@ -184,76 +187,76 @@ void battle_anim_clear_some_data(void) gAnimVisualTaskCount = 0; gAnimSoundTaskCount = 0; gDisableStructMoveAnim = 0; - gMoveDmgMoveAnim = 0; - gMovePowerMoveAnim = 0; - gHappinessMoveAnim = 0; + gAnimMoveDmg = 0; + gAnimMovePower = 0; + gAnimFriendship = 0; // clear index array. - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) gAnimSpriteIndexArray[i] |= 0xFFFF; // clear anim args. - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; gMonAnimTaskIdArray[0] = 0xFF; gMonAnimTaskIdArray[1] = 0xFF; - gUnknown_0202F7C4 = 0; - gUnknown_0202F7C5 = 0; - gAnimMoveIndex = 0; - gBattleAnimBankAttacker = 0; - gBattleAnimBankTarget = 0; + gAnimMoveTurn = 0; + sAnimBackgroundFadeState = 0; + sAnimMoveIndex = 0; + gAnimBankAttacker = 0; + gAnimBankTarget = 0; gUnknown_0202F7D2 = 0; } -void ExecuteMoveAnim(u16 move) +void DoMoveAnim(u16 move) { - gBattleAnimBankAttacker = gBankAttacker; - gBattleAnimBankTarget = gBankTarget; - DoMoveAnim(gBattleAnims_Moves, move, 1); + gAnimBankAttacker = gBankAttacker; + gAnimBankTarget = gBankTarget; + LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE); } -void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c) +void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim) { s32 i; - if (NotInBattle() == 0) + if (!IsContest()) { sub_8079E24(); - sub_8043EB4(0); + UpdateOamPriorityInAllHealthboxes(0); for (i = 0; i < 4; i++) { if (GetBankSide(i) != 0) - gUnknown_0202F7CA[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES); + gAnimSpeciesByBanks[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES); else - gUnknown_0202F7CA[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES); + gAnimSpeciesByBanks[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES); } } else { for (i = 0; i < 4; i++) - gUnknown_0202F7CA[i] = EWRAM_19348; + gAnimSpeciesByBanks[i] = EWRAM_19348; } - if (c == 0) - gAnimMoveIndex = 0; + if (isMoveAnim == 0) + sAnimMoveIndex = 0; else - gAnimMoveIndex = move; + sAnimMoveIndex = move; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; gMonAnimTaskIdArray[0] = 0xFF; gMonAnimTaskIdArray[1] = 0xFF; - gBattleAnimScriptPtr = moveAnims[move]; + sBattleAnimScriptPtr = moveAnims[move]; gAnimScriptActive = TRUE; gAnimFramesToWait = 0; gAnimScriptCallback = RunAnimScriptCommand; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) gAnimSpriteIndexArray[i] |= 0xFFFF; - if (c != 0) + if (isMoveAnim) { for (i = 0; gUnknown_081C7160[i] != 0xFFFF; i++) { @@ -265,13 +268,13 @@ void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c) } } - gUnknown_030042C4 = 0; - gUnknown_03004240 = 0; - gUnknown_03004200 = 0; - gUnknown_03004244 = 0; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + gBattle_WIN1H = 0; + gBattle_WIN1V = 0; } -void move_anim_8072740(struct Sprite *sprite) +void DestroyAnimSprite(struct Sprite *sprite) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); @@ -294,7 +297,7 @@ static void AddSpriteIndex(u16 index) { s32 i; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { if (gAnimSpriteIndexArray[i] == 0xFFFF) { @@ -308,7 +311,7 @@ static void ClearSpriteIndex(u16 index) { s32 i; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { if (gAnimSpriteIndexArray[i] == index) { @@ -335,222 +338,87 @@ static void RunAnimScriptCommand(void) { do { - sScriptCmdTable[T1_READ_8(gBattleAnimScriptPtr)](); - } while (gAnimFramesToWait == 0 && gAnimScriptActive != FALSE); + sScriptCmdTable[T1_READ_8(sBattleAnimScriptPtr)](); + } while (gAnimFramesToWait == 0 && gAnimScriptActive); } -static void ScriptCmd_loadsprite(void) +static void ScriptCmd_loadspritegfx(void) { u16 index; - gBattleAnimScriptPtr++; - index = T1_READ_16(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + index = T1_READ_16(sBattleAnimScriptPtr); LoadCompressedObjectPic(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]); LoadCompressedObjectPalette(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]); - gBattleAnimScriptPtr += 2; + sBattleAnimScriptPtr += 2; AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index)); gAnimFramesToWait = 1; gAnimScriptCallback = WaitAnimFrameCount; } -static void ScriptCmd_unloadsprite(void) +static void ScriptCmd_unloadspritegfx(void) { u16 index; - gBattleAnimScriptPtr++; - index = T1_READ_16(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + index = T1_READ_16(sBattleAnimScriptPtr); FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag); FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag); - gBattleAnimScriptPtr += 2; + sBattleAnimScriptPtr += 2; ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index)); } -#ifdef NONMATCHING -static void ScriptCmd_sprite(void) +static void ScriptCmd_createsprite(void) { s32 i; - struct SpriteTemplate *r7; - u8 r4; - u8 r0; - u8 _r0; - u16 r6; - u8 r2; - s8 r1; - - gBattleAnimScriptPtr++; - r7 = (struct SpriteTemplate *)(T2_READ_32(gBattleAnimScriptPtr)); - gBattleAnimScriptPtr += 4; - r4 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - r0 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - for (i = 0; i < r0; i++) + const struct SpriteTemplate *template; + u8 argVar; + u8 argsCount; + s16 subpriority; + + sBattleAnimScriptPtr++; + template = (const struct SpriteTemplate *)(T2_READ_32(sBattleAnimScriptPtr)); + sBattleAnimScriptPtr += 4; + + argVar = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + + argsCount = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + for (i = 0; i < argsCount; i++) { - gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 2; + gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 2; } - if (r4 & 0x80) + + if (argVar & 0x80) { - r4 ^= 0x80; - if (r4 > 0x3F) - r4 -= 0x40; + argVar ^= 0x80; + if (argVar >= 0x40) + argVar -= 0x40; else - r4 = -r4; - _r0 = sub_8079E90(gBattleAnimBankTarget); - r1 = r4; + argVar *= -1; + subpriority = sub_8079E90(gAnimBankTarget) + (s8)(argVar); } else { - //_08075B44 - if (r4 > 0x3F) - r4 -= 0x40; + if (argVar >= 0x40) + argVar -= 0x40; else - r4 = -r4; - _r0 = sub_8079E90(gBattleAnimBankAttacker); - r1 = r4; + argVar *= -1; + + subpriority = sub_8079E90(gAnimBankAttacker) + (s8)(argVar); } - r6 = _r0 + r1; - if ((s16)r6 < 3) - r6 = 3; - r4 = sub_8077ABC(gBattleAnimBankTarget, 2); - r2 = sub_8077ABC(gBattleAnimBankTarget, 3); - CreateSpriteAndAnimate(r7, r4, r2, r6); + if (subpriority < 3) + subpriority = 3; + + CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority); gAnimVisualTaskCount++; } -#else -__attribute__((naked)) -static void ScriptCmd_sprite(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - ldr r5, _08075B2C @ =gBattleAnimScriptPtr\n\ - ldr r1, [r5]\n\ - adds r3, r1, 0x1\n\ - str r3, [r5]\n\ - ldrb r2, [r1, 0x1]\n\ - ldrb r0, [r3, 0x1]\n\ - lsls r0, 8\n\ - adds r2, r0\n\ - ldrb r0, [r3, 0x2]\n\ - lsls r0, 16\n\ - adds r2, r0\n\ - ldrb r0, [r3, 0x3]\n\ - lsls r0, 24\n\ - adds r7, r2, r0\n\ - adds r0, r1, 0x5\n\ - str r0, [r5]\n\ - ldrb r4, [r1, 0x5]\n\ - adds r0, r1, 0x6\n\ - str r0, [r5]\n\ - ldrb r0, [r1, 0x6]\n\ - adds r1, 0x7\n\ - str r1, [r5]\n\ - cmp r0, 0\n\ - beq _08075B14\n\ - adds r6, r5, 0\n\ - ldr r5, _08075B30 @ =gBattleAnimArgs\n\ - adds r3, r0, 0\n\ -_08075AFC:\n\ - ldr r2, [r6]\n\ - ldrb r1, [r2]\n\ - ldrb r0, [r2, 0x1]\n\ - lsls r0, 8\n\ - orrs r1, r0\n\ - strh r1, [r5]\n\ - adds r2, 0x2\n\ - str r2, [r6]\n\ - adds r5, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bne _08075AFC\n\ -_08075B14:\n\ - movs r0, 0x80\n\ - ands r0, r4\n\ - cmp r0, 0\n\ - beq _08075B44\n\ - movs r0, 0x80\n\ - eors r4, r0\n\ - cmp r4, 0x3F\n\ - bls _08075B34\n\ - adds r0, r4, 0\n\ - subs r0, 0x40\n\ - b _08075B36\n\ - .align 2, 0\n\ -_08075B2C: .4byte gBattleAnimScriptPtr\n\ -_08075B30: .4byte gBattleAnimArgs\n\ -_08075B34:\n\ - negs r0, r4\n\ -_08075B36:\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - ldr r0, _08075B40 @ =gBattleAnimBankTarget\n\ - b _08075B56\n\ - .align 2, 0\n\ -_08075B40: .4byte gBattleAnimBankTarget\n\ -_08075B44:\n\ - cmp r4, 0x3F\n\ - bls _08075B4E\n\ - adds r0, r4, 0\n\ - subs r0, 0x40\n\ - b _08075B50\n\ -_08075B4E:\n\ - negs r0, r4\n\ -_08075B50:\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - ldr r0, _08075BAC @ =gBattleAnimBankAttacker\n\ -_08075B56:\n\ - ldrb r0, [r0]\n\ - bl sub_8079E90\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - lsls r1, r4, 24\n\ - asrs r1, 24\n\ - adds r0, r1\n\ - lsls r0, 16\n\ - lsrs r6, r0, 16\n\ - lsls r0, r6, 16\n\ - asrs r0, 16\n\ - cmp r0, 0x2\n\ - bgt _08075B74\n\ - movs r6, 0x3\n\ -_08075B74:\n\ - ldr r5, _08075BB0 @ =gBattleAnimBankTarget\n\ - ldrb r0, [r5]\n\ - movs r1, 0x2\n\ - bl sub_8077ABC\n\ - adds r4, r0, 0\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - ldrb r0, [r5]\n\ - movs r1, 0x3\n\ - bl sub_8077ABC\n\ - adds r2, r0, 0\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - lsls r3, r6, 24\n\ - lsrs r3, 24\n\ - adds r0, r7, 0\n\ - adds r1, r4, 0\n\ - bl CreateSpriteAndAnimate\n\ - ldr r1, _08075BB4 @ =gAnimVisualTaskCount\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_08075BAC: .4byte gBattleAnimBankAttacker\n\ -_08075BB0: .4byte gBattleAnimBankTarget\n\ -_08075BB4: .4byte gAnimVisualTaskCount\n\ - .syntax divided\n"); -} -#endif -static void ScriptCmd_createtask(void) +static void ScriptCmd_createvisualtask(void) { TaskFunc taskFunc; u8 taskPriority; @@ -558,18 +426,21 @@ static void ScriptCmd_createtask(void) u8 numArgs; s32 i; - gBattleAnimScriptPtr++; - taskFunc = (TaskFunc)T2_READ_32(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 4; - taskPriority = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - numArgs = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; + + taskFunc = (TaskFunc)T2_READ_32(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 4; + + taskPriority = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + + numArgs = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; for (i = 0; i < numArgs; i++) { - gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 2; + gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 2; } taskId = CreateTask(taskFunc, taskPriority); @@ -579,11 +450,11 @@ static void ScriptCmd_createtask(void) static void ScriptCmd_delay(void) { - gBattleAnimScriptPtr++; - gAnimFramesToWait = T1_READ_8(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + gAnimFramesToWait = T1_READ_8(sBattleAnimScriptPtr); if (gAnimFramesToWait == 0) gAnimFramesToWait = -1; - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimScriptCallback = WaitAnimFrameCount; } @@ -592,7 +463,7 @@ static void ScriptCmd_waitforvisualfinish(void) { if (gAnimVisualTaskCount == 0) { - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimFramesToWait = 0; } else @@ -641,7 +512,7 @@ static void ScriptCmd_end(void) // the SE has halted, so set the SE Frame Counter to 0 and continue. gSoundAnimFramesToWait = 0; - for (i = 0; i < 8; i++) + for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { if (gAnimSpriteIndexArray[i] != 0xFFFF) { @@ -651,13 +522,13 @@ static void ScriptCmd_end(void) } } - if (continuousAnim == FALSE) // may have been used for debug? + if (!continuousAnim) // may have been used for debug? { m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); - if (NotInBattle() == 0) + if (IsContest() == 0) { sub_8079E24(); - sub_8043EB4(1); + UpdateOamPriorityInAllHealthboxes(1); } gAnimScriptActive = FALSE; } @@ -665,178 +536,114 @@ static void ScriptCmd_end(void) static void ScriptCmd_playse(void) { - gBattleAnimScriptPtr++; - PlaySE(T1_READ_16(gBattleAnimScriptPtr)); - gBattleAnimScriptPtr += 2; + sBattleAnimScriptPtr++; + PlaySE(T1_READ_16(sBattleAnimScriptPtr)); + sBattleAnimScriptPtr += 2; } static void ScriptCmd_monbg(void) { - u8 r6; - u8 r5; - u8 r0; - u8 r7; + u8 animBank; + u8 bank; + u8 identity; + bool8 toBG_2; u16 r4; u8 taskId; - gBattleAnimScriptPtr++; - r6 = T1_READ_8(gBattleAnimScriptPtr); - if (r6 == 0) - r6 = 2; - else if (r6 == 1) - r6 = 3; - if (r6 == 0 || r6 == 2) - r5 = gBattleAnimBankAttacker; + sBattleAnimScriptPtr++; + animBank = T1_READ_8(sBattleAnimScriptPtr); + if (animBank == ANIM_BANK_ATTACKER) + animBank = ANIM_BANK_ATK_PARTNER; + else if (animBank == ANIM_BANK_TARGET) + animBank = ANIM_BANK_DEF_PARTNER; + + if (animBank == ANIM_BANK_ATTACKER || animBank == ANIM_BANK_ATK_PARTNER) + bank = gAnimBankAttacker; else - r5 = gBattleAnimBankTarget; - if (IsAnimBankSpriteVisible(r5)) + bank = gAnimBankTarget; + + if (IsAnimBankSpriteVisible(bank)) { - r0 = GetBankIdentity(r5); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) - r7 = 0; + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) + toBG_2 = 0; else - r7 = 1; - sub_8076034(r5, r7); - r4 = gObjectBankIDs[r5]; + toBG_2 = 1; + + sub_8076034(bank, toBG_2); + r4 = gObjectBankIDs[bank]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[0] = r4; gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x; gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y; - if (r7 == 0) + if (toBG_2 == 0) { - gTasks[taskId].data[3] = gUnknown_030042C0; - gTasks[taskId].data[4] = gUnknown_030041B4; + gTasks[taskId].data[3] = gBattle_BG1_X; + gTasks[taskId].data[4] = gBattle_BG1_Y; } else { - gTasks[taskId].data[3] = gUnknown_03004288; - gTasks[taskId].data[4] = gUnknown_03004280; + gTasks[taskId].data[3] = gBattle_BG2_X; + gTasks[taskId].data[4] = gBattle_BG2_Y; } - gTasks[taskId].data[5] = r7; - gTasks[taskId].data[6] = r5; + gTasks[taskId].data[5] = toBG_2; + gTasks[taskId].data[6] = bank; gMonAnimTaskIdArray[0] = taskId; } - r5 ^= 2; - if (r6 > 1 && IsAnimBankSpriteVisible(r5)) + bank ^= 2; + if (animBank > 1 && IsAnimBankSpriteVisible(bank)) { - r0 = GetBankIdentity(r5); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) - r7 = 0; + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) + toBG_2 = 0; else - r7 = 1; - sub_8076034(r5, r7); - r4 = gObjectBankIDs[r5]; + toBG_2 = 1; + sub_8076034(bank, toBG_2); + r4 = gObjectBankIDs[bank]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[0] = r4; gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x; gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y; - if (r7 == 0) + if (toBG_2 == 0) { - gTasks[taskId].data[3] = gUnknown_030042C0; - gTasks[taskId].data[4] = gUnknown_030041B4; + gTasks[taskId].data[3] = gBattle_BG1_X; + gTasks[taskId].data[4] = gBattle_BG1_Y; } else { - gTasks[taskId].data[3] = gUnknown_03004288; - gTasks[taskId].data[4] = gUnknown_03004280; + gTasks[taskId].data[3] = gBattle_BG2_X; + gTasks[taskId].data[4] = gBattle_BG2_Y; } - gTasks[taskId].data[5] = r7; - gTasks[taskId].data[6] = r5; + + gTasks[taskId].data[5] = toBG_2; + gTasks[taskId].data[6] = bank; gMonAnimTaskIdArray[1] = taskId; } - gBattleAnimScriptPtr++; + + sBattleAnimScriptPtr++; } -#ifdef NONMATCHING -bool8 IsAnimBankSpriteVisible(u8 a) +bool8 IsAnimBankSpriteVisible(u8 bank) { - if (NotInBattle()) + if (IsContest()) { - if (a == gBattleAnimBankAttacker) + if (bank == gAnimBankAttacker) return TRUE; else return FALSE; } - if (!AnimBankSpriteExists(a)) + if (!IsBankSpritePresent(bank)) return FALSE; - if (NotInBattle()) + if (IsContest()) return TRUE; // this line wont ever be reached. - if (!(EWRAM_17800[a].unk0 & 1)) + if (!(EWRAM_17800[bank].unk0 & 1) || !gSprites[gObjectBankIDs[bank]].invisible) return TRUE; - if (gSprites[gObjectBankIDs[a]].invisible) - return FALSE; - return TRUE; -} -#else -__attribute__((naked)) -bool8 IsAnimBankSpriteVisible(u8 a) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - adds r5, r4, 0\n\ - bl NotInBattle\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _08075FDC\n\ - ldr r0, _08075FD8 @ =gBattleAnimBankAttacker\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - beq _0807601C\n\ - b _0807602C\n\ - .align 2, 0\n\ -_08075FD8: .4byte gBattleAnimBankAttacker\n\ -_08075FDC:\n\ - adds r0, r4, 0\n\ - bl AnimBankSpriteExists\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _0807602C\n\ - bl NotInBattle\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _0807601C\n\ - lsls r0, r5, 2\n\ - ldr r1, _08076020 @ =gSharedMem + 0x17800\n\ - adds r0, r1\n\ - ldrb r1, [r0]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0807601C\n\ - ldr r2, _08076024 @ =gSprites\n\ - ldr r0, _08076028 @ =gObjectBankIDs\n\ - adds r0, r5, r0\n\ - ldrb r1, [r0]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r2\n\ - adds r0, 0x3E\n\ - ldrb r0, [r0]\n\ - lsls r0, 29\n\ - cmp r0, 0\n\ - blt _0807602C\n\ -_0807601C:\n\ - movs r0, 0x1\n\ - b _0807602E\n\ - .align 2, 0\n\ -_08076020: .4byte gSharedMem + 0x17800\n\ -_08076024: .4byte gSprites\n\ -_08076028: .4byte gObjectBankIDs\n\ -_0807602C:\n\ - movs r0, 0\n\ -_0807602E:\n\ - pop {r4,r5}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided\n"); + + return FALSE; } -#endif void sub_8076034(u8 a, u8 b) { @@ -876,25 +683,25 @@ void sub_8076034(u8 a, u8 b) REG_BG1CNT_BITFIELD.areaOverflowMode = 0; spriteId = gObjectBankIDs[a]; - gUnknown_030042C0 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; - if (NotInBattle() != 0 && sub_80AEB1C(EWRAM_19348) != 0) - gUnknown_030042C0--; - gUnknown_030041B4 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; + gBattle_BG1_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; + if (IsContest() != 0 && IsSpeciesNotUnown(EWRAM_19348) != 0) + gBattle_BG1_X--; + gBattle_BG1_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; gSprites[gObjectBankIDs[a]].invisible = TRUE; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, s.unk8 * 16, 32); addr3 = (u16 *)PLTT + s.unk8 * 16; DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32); - if (NotInBattle() != 0) + if (IsContest() != 0) r2 = 0; else r2 = GetBankIdentity(a); sub_80E4EF8(0, 0, r2, s.unk8, (u32)s.unk0, (((s32)s.unk4 - VRAM) / 2048), REG_BG1CNT_BITFIELD.charBaseBlock); - if (NotInBattle() != 0) + if (IsContest() != 0) sub_8076380(); } else @@ -926,12 +733,12 @@ void sub_8076034(u8 a, u8 b) REG_BG2CNT_BITFIELD.areaOverflowMode = 0; spriteId = gObjectBankIDs[a]; - gUnknown_03004288 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; - gUnknown_03004280 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; + gBattle_BG2_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; + gBattle_BG2_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; gSprites[gObjectBankIDs[a]].invisible = TRUE; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, 0x90, 32); addr3 = (void *)(PLTT + 0x120); @@ -948,7 +755,7 @@ static void sub_8076380(void) struct UnknownStruct2 s; u16 *ptr; - if (sub_80AEB1C(EWRAM_19348) != 0) + if (IsSpeciesNotUnown(EWRAM_19348)) { sub_8078914(&s); ptr = s.unk4; @@ -996,7 +803,7 @@ void sub_8076464(u8 a) struct UnknownStruct2 s; sub_8078914(&s); - if (a == 0 || NotInBattle() != 0) + if (a == 0 || IsContest() != 0) { u16 *addr2; @@ -1017,8 +824,8 @@ void sub_8076464(u8 a) pointlessZero = 0; addr2 = s.unk4; DmaFill32(3, 0, addr2, 0x800); - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; } else { @@ -1041,32 +848,31 @@ void sub_8076464(u8 a) pointlessZero = 0; addr2 = (void *)(VRAM + 0xF000); DmaFill32(3, 0, addr2, 0x800); - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; } } static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) { - u8 r4; - u8 r6; - s16 r3; - s16 r2; + u8 spriteId, palIndex; + s16 x, y; struct UnknownStruct2 s; - r4 = gTasks[taskId].data[0]; - r6 = gTasks[taskId].data[6]; + spriteId = gTasks[taskId].data[0]; + palIndex = gTasks[taskId].data[6]; sub_8078914(&s); - r3 = gTasks[taskId].data[1] - (gSprites[r4].pos1.x + gSprites[r4].pos2.x); - r2 = gTasks[taskId].data[2] - (gSprites[r4].pos1.y + gSprites[r4].pos2.y); + x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x); + y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y); + if (gTasks[taskId].data[5] == 0) { u16 *src; u16 *dst; - gUnknown_030042C0 = r3 + gTasks[taskId].data[3]; - gUnknown_030041B4 = r2 + gTasks[taskId].data[4]; - src = gPlttBufferFaded + 0x100 + r6 * 16; + gBattle_BG1_X = x + gTasks[taskId].data[3]; + gBattle_BG1_Y = y + gTasks[taskId].data[4]; + src = gPlttBufferFaded + 0x100 + palIndex * 16; dst = gPlttBufferFaded + 0x100 + s.unk8 * 16 - 256; DmaCopy32(3, src, dst, 32); } @@ -1075,9 +881,9 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) u16 *src; u16 *dst; - gUnknown_03004288 = r3 + gTasks[taskId].data[3]; - gUnknown_03004280 = r2 + gTasks[taskId].data[4]; - src = gPlttBufferFaded + 0x100 + r6 * 16; + gBattle_BG2_X = x + gTasks[taskId].data[3]; + gBattle_BG2_Y = y + gTasks[taskId].data[4]; + src = gPlttBufferFaded + 0x100 + palIndex * 16; dst = gPlttBufferFaded + 0x100 - 112; DmaCopy32(3, src, dst, 32); } @@ -1085,55 +891,59 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) static void ScriptCmd_clearmonbg(void) { - u8 r4; - u8 r5; + u8 animBankId; + u8 bank; u8 taskId; - gBattleAnimScriptPtr++; - r4 = T1_READ_8(gBattleAnimScriptPtr); - if (r4 == 0) - r4 = 2; - else if (r4 == 1) - r4 = 3; - if (r4 == 0 || r4 == 2) - r5 = gBattleAnimBankAttacker; + sBattleAnimScriptPtr++; + animBankId = T1_READ_8(sBattleAnimScriptPtr); + + if (animBankId == ANIM_BANK_ATTACKER) + animBankId = ANIM_BANK_ATK_PARTNER; + else if (animBankId == ANIM_BANK_TARGET) + animBankId = ANIM_BANK_DEF_PARTNER; + + if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + bank = gAnimBankAttacker; else - r5 = gBattleAnimBankTarget; + bank = gAnimBankTarget; + if (gMonAnimTaskIdArray[0] != 0xFF) - gSprites[gObjectBankIDs[r5]].invisible = FALSE; - if (r4 > 1 && gMonAnimTaskIdArray[1] != 0xFF) - gSprites[gObjectBankIDs[r5 ^ 2]].invisible = FALSE; + gSprites[gObjectBankIDs[bank]].invisible = FALSE; + if (animBankId > 1 && gMonAnimTaskIdArray[1] != 0xFF) + gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE; else - r4 = 0; + animBankId = 0; + taskId = CreateTask(sub_807672C, 5); - gTasks[taskId].data[0] = r4; - gTasks[taskId].data[2] = r5; - gBattleAnimScriptPtr++; + gTasks[taskId].data[0] = animBankId; + gTasks[taskId].data[2] = bank; + sBattleAnimScriptPtr++; } static void sub_807672C(u8 taskId) { - u8 var; - u8 r4; + u8 identity; + u8 to_BG2; gTasks[taskId].data[1]++; if (gTasks[taskId].data[1] != 1) { - var = GetBankIdentity(gTasks[taskId].data[2]); - var += 0xFF; - if (var <= 1 || NotInBattle() != 0) - r4 = 0; + identity = GetBankIdentity(gTasks[taskId].data[2]); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) + to_BG2 = 0; else - r4 = 1; + to_BG2 = 1; if (gMonAnimTaskIdArray[0] != 0xFF) { - sub_8076464(r4); + sub_8076464(to_BG2); DestroyTask(gMonAnimTaskIdArray[0]); gMonAnimTaskIdArray[0] = 0xFF; } if (gTasks[taskId].data[0] > 1) { - sub_8076464(r4 ^ 1); + sub_8076464(to_BG2 ^ 1); DestroyTask(gMonAnimTaskIdArray[1]); gMonAnimTaskIdArray[1] = 0xFF; } @@ -1143,187 +953,195 @@ static void sub_807672C(u8 taskId) static void ScriptCmd_monbg_22(void) { - u8 r5; - u8 r4; - u8 r0; + u8 animBankId; + u8 bank; + u8 identity; u8 r1; - gBattleAnimScriptPtr++; - r5 = T1_READ_8(gBattleAnimScriptPtr); - if (r5 == 0) - r5 = 2; - else if (r5 == 1) - r5 = 3; - if (r5 == 0 || r5 == 2) - r4 = gBattleAnimBankAttacker; + sBattleAnimScriptPtr++; + animBankId = T1_READ_8(sBattleAnimScriptPtr); + + if (animBankId == ANIM_BANK_ATTACKER) + animBankId = ANIM_BANK_ATK_PARTNER; + else if (animBankId == ANIM_BANK_TARGET) + animBankId = ANIM_BANK_DEF_PARTNER; + + if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + bank = gAnimBankAttacker; else - r4 = gBattleAnimBankTarget; - if (IsAnimBankSpriteVisible(r4)) + bank = gAnimBankTarget; + + if (IsAnimBankSpriteVisible(bank)) { - r0 = GetBankIdentity(r4); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) r1 = 0; else r1 = 1; - sub_8076034(r4, r1); - gSprites[gObjectBankIDs[r4]].invisible = FALSE; + sub_8076034(bank, r1); + gSprites[gObjectBankIDs[bank]].invisible = FALSE; } - r4 ^= 2; - if (r5 > 1 && IsAnimBankSpriteVisible(r4)) + + bank ^= 2; + if (animBankId > ANIM_BANK_TARGET && IsAnimBankSpriteVisible(bank)) { - r0 = GetBankIdentity(r4); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) r1 = 0; else r1 = 1; - sub_8076034(r4, r1); - gSprites[gObjectBankIDs[r4]].invisible = FALSE; + sub_8076034(bank, r1); + gSprites[gObjectBankIDs[bank]].invisible = FALSE; } - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; } static void ScriptCmd_clearmonbg_23(void) { - u8 r5; - u8 r6; + u8 animBankId; + u8 bank; u8 taskId; - gBattleAnimScriptPtr++; - r5 = T1_READ_8(gBattleAnimScriptPtr); - if (r5 == 0) - r5 = 2; - else if (r5 == 1) - r5 = 3; - if (r5 == 0 || r5 == 2) - r6 = gBattleAnimBankAttacker; + sBattleAnimScriptPtr++; + animBankId = T1_READ_8(sBattleAnimScriptPtr); + + if (animBankId == ANIM_BANK_ATTACKER) + animBankId = ANIM_BANK_ATK_PARTNER; + else if (animBankId == ANIM_BANK_TARGET) + animBankId = ANIM_BANK_DEF_PARTNER; + + if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + bank = gAnimBankAttacker; else - r6 = gBattleAnimBankTarget; - if (IsAnimBankSpriteVisible(r6)) - gSprites[gObjectBankIDs[r6]].invisible = FALSE; - if (r5 > 1 && IsAnimBankSpriteVisible(r6 ^ 2)) - gSprites[gObjectBankIDs[r6 ^ 2]].invisible = FALSE; + bank = gAnimBankTarget; + + if (IsAnimBankSpriteVisible(bank)) + gSprites[gObjectBankIDs[bank]].invisible = FALSE; + if (animBankId > 1 && IsAnimBankSpriteVisible(bank ^ 2)) + gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE; else - r5 = 0; + animBankId = 0; + taskId = CreateTask(sub_80769A4, 5); - gTasks[taskId].data[0] = r5; - gTasks[taskId].data[2] = r6; - gBattleAnimScriptPtr++; + gTasks[taskId].data[0] = animBankId; + gTasks[taskId].data[2] = bank; + + sBattleAnimScriptPtr++; } static void sub_80769A4(u8 taskId) { - u8 r0; - u8 r4; - u8 r5; + u8 identity; + u8 bank; + u8 toBG_2; gTasks[taskId].data[1]++; if (gTasks[taskId].data[1] != 1) { - r4 = gTasks[taskId].data[2]; - r0 = GetBankIdentity(r4); - r0 += 0xFF; - if (r0 <= 1 || NotInBattle() != 0) - r5 = 0; + bank = gTasks[taskId].data[2]; + identity = GetBankIdentity(bank); + identity += 0xFF; + if (identity <= 1 || IsContest() != 0) + toBG_2 = 0; else - r5 = 1; - if (IsAnimBankSpriteVisible(r4)) - sub_8076464(r5); - if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(r4 ^ 2)) - sub_8076464(r5 ^ 1); + toBG_2 = 1; + if (IsAnimBankSpriteVisible(bank)) + sub_8076464(toBG_2); + if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(bank ^ 2)) + sub_8076464(toBG_2 ^ 1); DestroyTask(taskId); } } static void ScriptCmd_setalpha(void) { - u16 r3; - u16 r1; + u16 half1, half2; - gBattleAnimScriptPtr++; - r3 = *(gBattleAnimScriptPtr++); - r1 = *(gBattleAnimScriptPtr++) << 8; + sBattleAnimScriptPtr++; + half1 = *(sBattleAnimScriptPtr++); + half2 = *(sBattleAnimScriptPtr++) << 8; REG_BLDCNT = 0x3F40; - REG_BLDALPHA = r3 | r1; + REG_BLDALPHA = half1 | half2; } static void ScriptCmd_setbldcnt(void) { - u16 r3; - u16 r1; + u16 half1, half2; - gBattleAnimScriptPtr++; - r3 = *(gBattleAnimScriptPtr++); - r1 = *(gBattleAnimScriptPtr++) << 8; - REG_BLDCNT = r3 | r1; + sBattleAnimScriptPtr++; + half1 = *(sBattleAnimScriptPtr++); + half2 = *(sBattleAnimScriptPtr++) << 8; + REG_BLDCNT = half1 | half2; } static void ScriptCmd_blendoff(void) { - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; REG_BLDCNT = 0; REG_BLDALPHA = 0; } static void ScriptCmd_call(void) { - gBattleAnimScriptPtr++; - gBattleAnimScriptRetAddr = gBattleAnimScriptPtr + 4; - gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + gBattleAnimScriptRetAddr = sBattleAnimScriptPtr + 4; + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } static void ScriptCmd_return(void) { - gBattleAnimScriptPtr = gBattleAnimScriptRetAddr; + sBattleAnimScriptPtr = gBattleAnimScriptRetAddr; } -static void ScriptCmd_setvar(void) +static void ScriptCmd_setarg(void) { - const u8 *addr = gBattleAnimScriptPtr; - u16 r4; - u8 r2; + const u8 *addr = sBattleAnimScriptPtr; + u16 value; + u8 argId; - gBattleAnimScriptPtr++; - r2 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - r4 = T1_READ_16(gBattleAnimScriptPtr); - gBattleAnimScriptPtr = addr + 4; - gBattleAnimArgs[r2] = r4; + sBattleAnimScriptPtr++; + argId = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + value = T1_READ_16(sBattleAnimScriptPtr); + sBattleAnimScriptPtr = addr + 4; + gBattleAnimArgs[argId] = value; } -static void ScriptCmd_ifelse(void) +static void ScriptCmd_choosetwoturnanim(void) { - gBattleAnimScriptPtr++; - if (gUnknown_0202F7C4 & 1) - gBattleAnimScriptPtr += 4; - gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + if (gAnimMoveTurn & 1) + sBattleAnimScriptPtr += 4; + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } -static void ScriptCmd_jumpif(void) +static void ScriptCmd_jumpifmoveturn(void) { - u8 r1; + u8 toCheck; - gBattleAnimScriptPtr++; - r1 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - if (r1 == gUnknown_0202F7C4) + sBattleAnimScriptPtr++; + toCheck = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + + if (toCheck == gAnimMoveTurn) { - gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr); + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } else { - gBattleAnimScriptPtr += 4; + sBattleAnimScriptPtr += 4; } } static void ScriptCmd_jump(void) { - gBattleAnimScriptPtr++; - gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } -bool8 NotInBattle(void) +bool8 IsContest(void) { if (!gMain.inBattle) return TRUE; @@ -1331,124 +1149,131 @@ bool8 NotInBattle(void) return FALSE; } +#define tBackgroundId data[0] +#define tState data[10] + static void ScriptCmd_fadetobg(void) { - u8 r4; + u8 backgroundId; u8 taskId; - gBattleAnimScriptPtr++; - r4 = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; - taskId = CreateTask(task_p5_load_battle_screen_elements, 5); - gTasks[taskId].data[0] = r4; - gUnknown_0202F7C5 = 1; + sBattleAnimScriptPtr++; + backgroundId = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; + taskId = CreateTask(Task_FadeToBg, 5); + gTasks[taskId].tBackgroundId = backgroundId; + sAnimBackgroundFadeState = 1; } -static void ScriptCmd_fadetobg_25(void) +static void ScriptCmd_fadetobgfromset(void) { - u8 r8; - u8 r7; - u8 r6; + u8 bg1, bg2, bg3; u8 taskId; - gBattleAnimScriptPtr++; - r8 = gBattleAnimScriptPtr[0]; - r7 = gBattleAnimScriptPtr[1]; - r6 = gBattleAnimScriptPtr[2]; - gBattleAnimScriptPtr += 3; - taskId = CreateTask(task_p5_load_battle_screen_elements, 5); - if (NotInBattle() != 0) - gTasks[taskId].data[0] = r6; - else if (GetBankSide(gBattleAnimBankTarget) == 0) - gTasks[taskId].data[0] = r7; + sBattleAnimScriptPtr++; + bg1 = sBattleAnimScriptPtr[0]; + bg2 = sBattleAnimScriptPtr[1]; + bg3 = sBattleAnimScriptPtr[2]; + sBattleAnimScriptPtr += 3; + taskId = CreateTask(Task_FadeToBg, 5); + + if (IsContest()) + gTasks[taskId].tBackgroundId = bg3; + else if (GetBankSide(gAnimBankTarget) == 0) + gTasks[taskId].tBackgroundId = bg2; else - gTasks[taskId].data[0] = r8; - gUnknown_0202F7C5 = 1; + gTasks[taskId].tBackgroundId = bg1; + + sAnimBackgroundFadeState = 1; } -static void task_p5_load_battle_screen_elements(u8 taskId) +static void Task_FadeToBg(u8 taskId) { - if (gTasks[taskId].data[10] == 0) + if (gTasks[taskId].tState == 0) { BeginHardwarePaletteFade(0xE8, 0, 0, 16, 0); - gTasks[taskId].data[10]++; + gTasks[taskId].tState++; return; } if (gPaletteFade.active) return; - if (gTasks[taskId].data[10] == 1) + if (gTasks[taskId].tState == 1) { - gTasks[taskId].data[10]++; - gUnknown_0202F7C5 = 2; + gTasks[taskId].tState++; + sAnimBackgroundFadeState = 2; } - else if (gTasks[taskId].data[10] == 2) + else if (gTasks[taskId].tState == 2) { - s16 data0 = (u16)gTasks[taskId].data[0]; + s16 bgId = (u16)gTasks[taskId].tBackgroundId; - if (data0 == -1) - dp01t_11_3_message_for_player_only(); + if (bgId == -1) + LoadDefaultBg(); else - sub_8076DB8(data0); + LoadMoveBg(bgId); + BeginHardwarePaletteFade(0xE8, 0, 16, 0, 1); - gTasks[taskId].data[10]++; + gTasks[taskId].tState++; return; } if (gPaletteFade.active) return; - if (gTasks[taskId].data[10] == 3) + if (gTasks[taskId].tState == 3) { DestroyTask(taskId); - gUnknown_0202F7C5 = 0; + sAnimBackgroundFadeState = 0; } } -static void sub_8076DB8(u16 a) +static void LoadMoveBg(u16 bgId) { - if (NotInBattle()) + if (IsContest()) { - void *tilemap = gBattleAnimBackgroundTable[a].tilemap; + void *tilemap = gBattleAnimBackgroundTable[bgId].tilemap; void *dmaSrc; void *dmaDest; - LZDecompressWram(tilemap, NotInBattle() ? EWRAM_14800 : EWRAM_18000); - sub_80763FC(sub_80789BC(), NotInBattle() ? EWRAM_14800 : EWRAM_18000, 0x100, 0); - dmaSrc = NotInBattle() ? EWRAM_14800 : EWRAM_18000; + LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000); + sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : EWRAM_18000, 0x100, 0); + dmaSrc = IsContest() ? EWRAM_14800 : EWRAM_18000; dmaDest = (void *)(VRAM + 0xD000); DmaCopy32(3, dmaSrc, dmaDest, 0x800); - LZDecompressVram(gBattleAnimBackgroundTable[a].image, (void *)(VRAM + 0x2000)); - LoadCompressedPalette(gBattleAnimBackgroundTable[a].palette, sub_80789BC() * 16, 32); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000)); + LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80789BC() * 16, 32); } else { - LZDecompressVram(gBattleAnimBackgroundTable[a].tilemap, (void *)(VRAM + 0xD000)); - LZDecompressVram(gBattleAnimBackgroundTable[a].image, (void *)(VRAM + 0x8000)); - LoadCompressedPalette(gBattleAnimBackgroundTable[a].palette, 32, 32); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(VRAM + 0xD000)); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x8000)); + LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32); } } -static void dp01t_11_3_message_for_player_only(void) +static void LoadDefaultBg(void) { - if (NotInBattle()) - sub_80AB2AC(); + if (IsContest()) + LoadContestBgAfterMoveAnim(); else - sub_800D7B8(); + DrawMainBattleBackground(); } static void ScriptCmd_restorebg(void) { u8 taskId; - gBattleAnimScriptPtr++; - taskId = CreateTask(task_p5_load_battle_screen_elements, 5); - gTasks[taskId].data[0] = 0xFFFF; - gUnknown_0202F7C5 = 1; + sBattleAnimScriptPtr++; + taskId = CreateTask(Task_FadeToBg, 5); + gTasks[taskId].tBackgroundId = 0xFFFF; + sAnimBackgroundFadeState = 1; } +#undef tBackgroundId +#undef tState + static void ScriptCmd_waitbgfadeout(void) { - if (gUnknown_0202F7C5 == 2) + if (sAnimBackgroundFadeState == 2) { - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimFramesToWait = 0; } else @@ -1459,9 +1284,9 @@ static void ScriptCmd_waitbgfadeout(void) static void ScriptCmd_waitbgfadein(void) { - if (gUnknown_0202F7C5 == 0) + if (sAnimBackgroundFadeState == 0) { - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimFramesToWait = 0; } else @@ -1472,25 +1297,25 @@ static void ScriptCmd_waitbgfadein(void) static void ScriptCmd_changebg(void) { - gBattleAnimScriptPtr++; - sub_8076DB8(T1_READ_8(gBattleAnimScriptPtr)); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; + LoadMoveBg(T1_READ_8(sBattleAnimScriptPtr)); + sBattleAnimScriptPtr++; } //Weird control flow /* -s8 sub_8076F98(s8 a) +s8 BattleAnimAdjustPanning(s8 a) { - if (!NotInBattle() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10)) + if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10)) { - a = GetBankSide(gBattleAnimBankAttacker) ? 0xC0 : 0x3F; + a = GetBankSide(gAnimBankAttacker) ? 0xC0 : 0x3F; } //_08076FDC else { - if (NotInBattle()) + if (IsContest()) { - if (gBattleAnimBankAttacker == gBattleAnimBankTarget && gBattleAnimBankAttacker == 2 + if (gAnimBankAttacker == gAnimBankTarget && gAnimBankAttacker == 2 && a == 0x3F) { //jump to _0807707A @@ -1502,9 +1327,9 @@ s8 sub_8076F98(s8 a) //_08077004 else { - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) } //_08077042 else @@ -1518,17 +1343,17 @@ s8 sub_8076F98(s8 a) } */ __attribute__((naked)) -s8 sub_8076F98(s8 a) +s8 BattleAnimAdjustPanning(s8 a) { asm(".syntax unified\n\ push {r4,lr}\n\ lsls r0, 24\n\ lsrs r4, r0, 24\n\ - bl NotInBattle\n\ + bl IsContest\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _08076FDC\n\ - ldr r0, _08076FD4 @ =gBattleAnimBankAttacker\n\ + ldr r0, _08076FD4 @ =gAnimBankAttacker\n\ ldrb r2, [r0]\n\ lsls r0, r2, 1\n\ adds r0, r2\n\ @@ -1549,15 +1374,15 @@ s8 sub_8076F98(s8 a) movs r4, 0x3F\n\ b _0807706E\n\ .align 2, 0\n\ -_08076FD4: .4byte gBattleAnimBankAttacker\n\ +_08076FD4: .4byte gAnimBankAttacker\n\ _08076FD8: .4byte gSharedMem + 0x17810\n\ _08076FDC:\n\ - bl NotInBattle\n\ + bl IsContest\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _08077004\n\ - ldr r0, _08076FFC @ =gBattleAnimBankAttacker\n\ - ldr r1, _08077000 @ =gBattleAnimBankTarget\n\ + ldr r0, _08076FFC @ =gAnimBankAttacker\n\ + ldr r1, _08077000 @ =gAnimBankTarget\n\ ldrb r0, [r0]\n\ ldrb r1, [r1]\n\ cmp r0, r1\n\ @@ -1568,16 +1393,16 @@ _08076FDC:\n\ beq _0807707A\n\ b _08077068\n\ .align 2, 0\n\ -_08076FFC: .4byte gBattleAnimBankAttacker\n\ -_08077000: .4byte gBattleAnimBankTarget\n\ +_08076FFC: .4byte gAnimBankAttacker\n\ +_08077000: .4byte gAnimBankTarget\n\ _08077004:\n\ - ldr r0, _0807702C @ =gBattleAnimBankAttacker\n\ + ldr r0, _0807702C @ =gAnimBankAttacker\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _08077042\n\ - ldr r0, _08077030 @ =gBattleAnimBankTarget\n\ + ldr r0, _08077030 @ =gAnimBankTarget\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ @@ -1590,8 +1415,8 @@ _08077004:\n\ movs r4, 0xC0\n\ b _0807706E\n\ .align 2, 0\n\ -_0807702C: .4byte gBattleAnimBankAttacker\n\ -_08077030: .4byte gBattleAnimBankTarget\n\ +_0807702C: .4byte gAnimBankAttacker\n\ +_08077030: .4byte gAnimBankTarget\n\ _08077034:\n\ movs r0, 0x40\n\ negs r0, r0\n\ @@ -1601,7 +1426,7 @@ _08077034:\n\ lsls r0, 24\n\ b _0807706C\n\ _08077042:\n\ - ldr r0, _08077064 @ =gBattleAnimBankTarget\n\ + ldr r0, _08077064 @ =gAnimBankTarget\n\ ldrb r0, [r0]\n\ bl GetBankSide\n\ lsls r0, 24\n\ @@ -1617,7 +1442,7 @@ _08077042:\n\ movs r4, 0x3F\n\ b _0807706E\n\ .align 2, 0\n\ -_08077064: .4byte gBattleAnimBankTarget\n\ +_08077064: .4byte gAnimBankTarget\n\ _08077068:\n\ lsls r0, r4, 24\n\ negs r0, r0\n\ @@ -1647,21 +1472,21 @@ _08077088:\n\ .syntax divided\n"); } -s8 sub_8077094(s8 a) +s8 BattleAnimAdjustPanning2(s8 pan) { - if (!NotInBattle() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10)) + if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10)) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) - a = 0x3F; + if (GetBankSide(gAnimBankAttacker) != 0) + pan = 0x3F; else - a = 0xC0; + pan = 0xC0; } else { - if (GetBankSide(gBattleAnimBankAttacker) != 0 || NotInBattle() != 0) - a = -a; + if (GetBankSide(gAnimBankAttacker) != 0 || IsContest() != 0) + pan = -pan; } - return a; + return pan; } s16 sub_8077104(s16 a) @@ -1675,310 +1500,232 @@ s16 sub_8077104(s16 a) return var; } -s16 sub_807712C(s16 a, s16 b, s16 c) +s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan) { - u16 var; + u16 ret; - if (a < b) - var = ((c < 0) ? -c : c); - else if (a > b) - var = -((c < 0) ? -c : c); + if (sourcePan < targetPan) + ret = ((incrementPan < 0) ? -incrementPan : incrementPan); + else if (sourcePan > targetPan) + ret = -((incrementPan < 0) ? -incrementPan : incrementPan); else - var = 0; - return var; + ret = 0; + + return ret; } -static void ScriptCmd_panse_19(void) +static void ScriptCmd_playsewithpan(void) { - u16 r4; - s8 r0; + u16 songId; + s8 pan; - gBattleAnimScriptPtr++; - r4 = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - PlaySE12WithPanning(r4, sub_8076F98(r0)); - gBattleAnimScriptPtr += 3; + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + pan = T1_READ_8(sBattleAnimScriptPtr + 2); + PlaySE12WithPanning(songId, BattleAnimAdjustPanning(pan)); + sBattleAnimScriptPtr += 3; } static void ScriptCmd_setpan(void) { - s8 r0; + s8 pan; - gBattleAnimScriptPtr++; - r0 = T1_READ_8(gBattleAnimScriptPtr); - SE12PanpotControl(sub_8076F98(r0)); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; + pan = T1_READ_8(sBattleAnimScriptPtr); + SE12PanpotControl(BattleAnimAdjustPanning(pan)); + sBattleAnimScriptPtr++; } +#define tInitialPan data[0] +#define tTargetPan data[1] +#define tIncrementPan data[2] +#define tFramesToWait data[3] +#define tCurrentPan data[4] +#define tFrameCounter data[8] + static void ScriptCmd_panse_1B(void) { u16 songNum; - s8 r0; - s8 r4; - s8 r6; - u8 r7; - s8 panning; - s8 r8; + s8 currentPanArg, incrementPan, incrementPanArg, currentPan, targetPan; + u8 framesToWait; u8 taskId; - gBattleAnimScriptPtr++; - songNum = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - r4 = T1_READ_8(gBattleAnimScriptPtr + 3); - r6 = T1_READ_8(gBattleAnimScriptPtr + 4); - r7 = T1_READ_8(gBattleAnimScriptPtr + 5); - panning = sub_8076F98(r0); - r8 = sub_8076F98(r4); - r4 = sub_807712C(panning, r8, r6); - taskId = CreateTask(c3_08073CEC, 1); - gTasks[taskId].data[0] = panning; - gTasks[taskId].data[1] = r8; - gTasks[taskId].data[2] = r4; - gTasks[taskId].data[3] = r7; - gTasks[taskId].data[4] = panning; - PlaySE12WithPanning(songNum, panning); + sBattleAnimScriptPtr++; + songNum = T1_READ_16(sBattleAnimScriptPtr); + currentPanArg = T1_READ_8(sBattleAnimScriptPtr + 2); + incrementPan = T1_READ_8(sBattleAnimScriptPtr + 3); + incrementPanArg = T1_READ_8(sBattleAnimScriptPtr + 4); + framesToWait = T1_READ_8(sBattleAnimScriptPtr + 5); + + currentPan = BattleAnimAdjustPanning(currentPanArg); + targetPan = BattleAnimAdjustPanning(incrementPan); + incrementPan = CalculatePanIncrement(currentPan, targetPan, incrementPanArg); + taskId = CreateTask(Task_PanFromInitialToTarget, 1); + gTasks[taskId].tInitialPan = currentPan; + gTasks[taskId].tTargetPan = targetPan; + gTasks[taskId].tIncrementPan = incrementPan; + gTasks[taskId].tFramesToWait = framesToWait; + gTasks[taskId].tCurrentPan = currentPan; + + PlaySE12WithPanning(songNum, currentPan); + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 6; + sBattleAnimScriptPtr += 6; } -#ifdef NONMATCHING -static void c3_08073CEC(u8 taskId) +void Task_PanFromInitialToTarget(u8 taskId) { - u16 r7 = 0; - s16 r0; - s16 r6; - s16 r3; - s16 r4; - int foo; - - r0 = gTasks[taskId].data[8]; - gTasks[taskId].data[8]++; - if (r0 >= gTasks[taskId].data[3]) + bool32 destroyTask = FALSE; + if (gTasks[taskId].tFrameCounter++ >= gTasks[taskId].tFramesToWait) { - gTasks[taskId].data[8] = r7; - r6 = gTasks[taskId].data[0]; - r3 = gTasks[taskId].data[1]; - foo = gTasks[taskId].data[4] + gTasks[taskId].data[2]; - r4 = foo; - gTasks[taskId].data[4] = r4; - if (gTasks[taskId].data[2] == 0) + s16 pan; + s16 initialPanning, targetPanning, currentPan, incrementPan; + + gTasks[taskId].tFrameCounter = 0; + initialPanning = gTasks[taskId].tInitialPan; + targetPanning = gTasks[taskId].tTargetPan; + currentPan = gTasks[taskId].tCurrentPan; + incrementPan = gTasks[taskId].tIncrementPan; + pan = currentPan + incrementPan; + gTasks[taskId].tCurrentPan = pan; + + if (incrementPan == 0) // If we're not incrementing, just cancel the task immediately { - r4 = r3; - DestroyTask(taskId); - gAnimSoundTaskCount--; + destroyTask = TRUE; } - //_080772D8 - else + else if (initialPanning < targetPanning) // Panning increasing { - if (r6 < r3) - { - if (r4 < r3) - goto check; - DestroyTask(taskId); - gAnimSoundTaskCount--; - } - else - { - if (r4 <= r3) - r7 = 1; - check: - if (r7 != 0) - { - DestroyTask(taskId); - gAnimSoundTaskCount--; - } - } + if (pan >= targetPanning) // Target reached + destroyTask = TRUE; } - //_080772F8 - SE12PanpotControl(r4); + else // Panning decreasing + { + if (pan <= targetPanning) // Target reached + destroyTask = TRUE; + } + + if (destroyTask) + { + pan = targetPanning; + DestroyTask(taskId); + gAnimSoundTaskCount--; + } + + SE12PanpotControl(pan); } - //_08077314 -} -#else -__attribute__((naked)) -static void c3_08073CEC(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - movs r7, 0\n\ - ldr r1, _080772D4 @ =gTasks\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - adds r2, r0, r1\n\ - ldrh r0, [r2, 0x18]\n\ - adds r1, r0, 0x1\n\ - strh r1, [r2, 0x18]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r3, 0xE\n\ - ldrsh r1, [r2, r3]\n\ - cmp r0, r1\n\ - blt _08077314\n\ - strh r7, [r2, 0x18]\n\ - ldrh r6, [r2, 0x8]\n\ - ldrh r3, [r2, 0xA]\n\ - movs r4, 0x10\n\ - ldrsh r0, [r2, r4]\n\ - movs r4, 0xC\n\ - ldrsh r1, [r2, r4]\n\ - adds r0, r1\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - strh r4, [r2, 0x10]\n\ - cmp r1, 0\n\ - bne _080772D8\n\ - lsls r2, r3, 16\n\ - b _080772FC\n\ - .align 2, 0\n\ -_080772D4: .4byte gTasks\n\ -_080772D8:\n\ - lsls r1, r6, 16\n\ - lsls r0, r3, 16\n\ - asrs r3, r0, 16\n\ - adds r2, r0, 0\n\ - cmp r1, r2\n\ - bge _080772EE\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - cmp r0, r3\n\ - blt _080772F8\n\ - b _080772FC\n\ -_080772EE:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - cmp r0, r3\n\ - bgt _080772F8\n\ - movs r7, 0x1\n\ -_080772F8:\n\ - cmp r7, 0\n\ - beq _0807730C\n\ -_080772FC:\n\ - lsrs r4, r2, 16\n\ - adds r0, r5, 0\n\ - bl DestroyTask\n\ - ldr r1, _0807731C @ =gAnimSoundTaskCount\n\ - ldrb r0, [r1]\n\ - subs r0, 0x1\n\ - strb r0, [r1]\n\ -_0807730C:\n\ - lsls r0, r4, 24\n\ - asrs r0, 24\n\ - bl SE12PanpotControl\n\ -_08077314:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_0807731C: .4byte gAnimSoundTaskCount\n\ - .syntax divided\n"); } -#endif static void ScriptCmd_panse_26(void) { - u16 r8; - s8 r4; - s8 r5; - s8 r6; - u8 r10; + u16 songId; + s8 currentPan, targetPan, incrementPan; + u8 framesToWait; u8 taskId; - gBattleAnimScriptPtr++; - r8 = T1_READ_16(gBattleAnimScriptPtr); - r4 = T1_READ_8(gBattleAnimScriptPtr + 2); - r5 = T1_READ_8(gBattleAnimScriptPtr + 3); - r6 = T1_READ_8(gBattleAnimScriptPtr + 4); - r10 = T1_READ_8(gBattleAnimScriptPtr + 5); - taskId = CreateTask(c3_08073CEC, 1); - gTasks[taskId].data[0] = r4; - gTasks[taskId].data[1] = r5; - gTasks[taskId].data[2] = r6; - gTasks[taskId].data[3] = r10; - gTasks[taskId].data[4] = r4; - PlaySE12WithPanning(r8, r4); + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + currentPan = T1_READ_8(sBattleAnimScriptPtr + 2); + targetPan = T1_READ_8(sBattleAnimScriptPtr + 3); + incrementPan = T1_READ_8(sBattleAnimScriptPtr + 4); + framesToWait = T1_READ_8(sBattleAnimScriptPtr + 5); + + taskId = CreateTask(Task_PanFromInitialToTarget, 1); + gTasks[taskId].tInitialPan = currentPan; + gTasks[taskId].tTargetPan = targetPan; + gTasks[taskId].tIncrementPan = incrementPan; + gTasks[taskId].tFramesToWait = framesToWait; + gTasks[taskId].tCurrentPan = currentPan; + + PlaySE12WithPanning(songId, currentPan); + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 6; + sBattleAnimScriptPtr += 6; } static void ScriptCmd_panse_27(void) { - u16 r9; - u8 r4; - u8 r8; - u8 r7; - u8 r0; - s8 r6; - s8 r5; - s8 r4_2; + u16 songId; + u8 targetPanArg, incrementPanArg, currentPan, currentPanArg; + s8 targetPan, incrementPan, framesToWait; u8 taskId; - gBattleAnimScriptPtr++; - r9 = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - r4 = T1_READ_8(gBattleAnimScriptPtr + 3); - r8 = T1_READ_8(gBattleAnimScriptPtr + 4); - r7 = T1_READ_8(gBattleAnimScriptPtr + 5); - r6 = sub_8077094(r0); - r5 = sub_8077094(r4); - r4_2 = sub_8077094(r8); - taskId = CreateTask(c3_08073CEC, 1); - gTasks[taskId].data[0] = r6; - gTasks[taskId].data[1] = r5; - gTasks[taskId].data[2] = r4_2; - gTasks[taskId].data[3] = r7; - gTasks[taskId].data[4] = r6; - PlaySE12WithPanning(r9, r6); + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + currentPanArg = T1_READ_8(sBattleAnimScriptPtr + 2); + targetPanArg = T1_READ_8(sBattleAnimScriptPtr + 3); + incrementPanArg = T1_READ_8(sBattleAnimScriptPtr + 4); + currentPan = T1_READ_8(sBattleAnimScriptPtr + 5); + + targetPan = BattleAnimAdjustPanning2(currentPanArg); + incrementPan = BattleAnimAdjustPanning2(targetPanArg); + framesToWait = BattleAnimAdjustPanning2(incrementPanArg); + + taskId = CreateTask(Task_PanFromInitialToTarget, 1); + gTasks[taskId].data[0] = targetPan; + gTasks[taskId].data[1] = incrementPan; + gTasks[taskId].data[2] = framesToWait; + gTasks[taskId].data[3] = currentPan; + gTasks[taskId].data[4] = targetPan; + + PlaySE12WithPanning(songId, targetPan); + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 6; + sBattleAnimScriptPtr += 6; } -static void ScriptCmd_panse_1C(void) +#undef tInitialPan +#undef tTargetPan +#undef tIncrementPan +#undef tFramesToWait +#undef tCurrentPan +#undef tFrameCounter + +#define tSongId data[0] +#define tPanning data[1] +#define tFramesToWait data[2] +#define tNumberOfPlays data[3] +#define tFrameCounter data[8] + +static void ScriptCmd_loopsewithpan(void) { - u16 r5; - u8 r0; - u8 r8; - u8 r9; - s8 r4; + u16 songId; + s8 panningArg, panning; + u8 framesToWait, numberOfPlays; u8 taskId; - gBattleAnimScriptPtr++; - r5 = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - r8 = T1_READ_8(gBattleAnimScriptPtr + 3); - r9 = T1_READ_8(gBattleAnimScriptPtr + 4); - r4 = sub_8076F98(r0); - taskId = CreateTask(sub_80774FC, 1); - gTasks[taskId].data[0] = r5; - gTasks[taskId].data[1] = r4; - gTasks[taskId].data[2] = r8; - gTasks[taskId].data[3] = r9; - gTasks[taskId].data[8] = r8; + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + panningArg = T1_READ_8(sBattleAnimScriptPtr + 2); + framesToWait = T1_READ_8(sBattleAnimScriptPtr + 3); + numberOfPlays = T1_READ_8(sBattleAnimScriptPtr + 4); + panning = BattleAnimAdjustPanning(panningArg); + + taskId = CreateTask(Task_LoopAndPlaySE, 1); + gTasks[taskId].tSongId = songId; + gTasks[taskId].tPanning = panning; + gTasks[taskId].tFramesToWait = framesToWait; + gTasks[taskId].tNumberOfPlays = numberOfPlays; + gTasks[taskId].tFrameCounter = framesToWait; gTasks[taskId].func(taskId); + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 5; + sBattleAnimScriptPtr += 5; } -static void sub_80774FC(u8 taskId) +static void Task_LoopAndPlaySE(u8 taskId) { - s16 data8; - u16 r0; - s8 r1; - u8 r4; - - data8 = gTasks[taskId].data[8]; - gTasks[taskId].data[8]++; - if (data8 >= gTasks[taskId].data[2]) + if (gTasks[taskId].tFrameCounter++ >= gTasks[taskId].tFramesToWait) { - gTasks[taskId].data[8] = 0; - r0 = gTasks[taskId].data[0]; - r1 = gTasks[taskId].data[1]; - gTasks[taskId].data[3]--; - r4 = gTasks[taskId].data[3]; - PlaySE12WithPanning(r0, r1); - if (r4 == 0) + u16 songId; + s8 panning; + u8 numberOfPlays; + + gTasks[taskId].tFrameCounter = 0; + songId = gTasks[taskId].tSongId; + panning = gTasks[taskId].tPanning; + numberOfPlays = --gTasks[taskId].tNumberOfPlays; + PlaySE12WithPanning(songId, panning); + if (numberOfPlays == 0) { DestroyTask(taskId); gAnimSoundTaskCount--; @@ -1986,57 +1733,67 @@ static void sub_80774FC(u8 taskId) } } -static void ScriptCmd_panse_1D(void) +#undef tSongId +#undef tPanning +#undef tFramesToWait +#undef tNumberOfPlays +#undef tFrameCounter + +#define tSongId data[0] +#define tPanning data[1] +#define tFramesToWait data[2] + +static void ScriptCmd_waitplaysewithpan(void) { - u16 r5; - u8 r0; - u8 r8; - s8 r4; + u16 songId; + s8 panningArg, panning; + u8 framesToWait; u8 taskId; - gBattleAnimScriptPtr++; - r5 = T1_READ_16(gBattleAnimScriptPtr); - r0 = T1_READ_8(gBattleAnimScriptPtr + 2); - r8 = T1_READ_8(gBattleAnimScriptPtr + 3); - r4 = sub_8076F98(r0); - taskId = CreateTask(sub_80775CC, 1); - gTasks[taskId].data[0] = r5; - gTasks[taskId].data[1] = r4; - gTasks[taskId].data[2] = r8; + sBattleAnimScriptPtr++; + songId = T1_READ_16(sBattleAnimScriptPtr); + panningArg = T1_READ_8(sBattleAnimScriptPtr + 2); + framesToWait = T1_READ_8(sBattleAnimScriptPtr + 3); + panning = BattleAnimAdjustPanning(panningArg); + + taskId = CreateTask(Task_WaitAndPlaySE, 1); + gTasks[taskId].tSongId = songId; + gTasks[taskId].tPanning = panning; + gTasks[taskId].tFramesToWait = framesToWait; + gAnimSoundTaskCount++; - gBattleAnimScriptPtr += 4; + sBattleAnimScriptPtr += 4; } -static void sub_80775CC(u8 taskId) +static void Task_WaitAndPlaySE(u8 taskId) { - s16 r0; - - r0 = gTasks[taskId].data[2]; - gTasks[taskId].data[2]--; - if (r0 <= 0) + if (gTasks[taskId].tFramesToWait-- <= 0) { - PlaySE12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]); + PlaySE12WithPanning(gTasks[taskId].tSongId, gTasks[taskId].tPanning); DestroyTask(taskId); gAnimSoundTaskCount--; } } -static void ScriptCmd_createtask_1F(void) +#undef tSongId +#undef tPanning +#undef tFramesToWait + +static void ScriptCmd_createsoundtask(void) { TaskFunc func; - u8 numArgs; - int i; - u8 taskId; + u8 numArgs, taskId; + s32 i; - gBattleAnimScriptPtr++; - func = (TaskFunc)T2_READ_32(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 4; - numArgs = T1_READ_8(gBattleAnimScriptPtr); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; + func = (TaskFunc)T2_READ_32(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 4; + numArgs = T1_READ_8(sBattleAnimScriptPtr); + sBattleAnimScriptPtr++; for (i = 0; i < numArgs; i++) { - gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr); - gBattleAnimScriptPtr += 2; + gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); + sBattleAnimScriptPtr += 2; } taskId = CreateTask(func, 1); func(taskId); @@ -2066,61 +1823,51 @@ static void ScriptCmd_waitsound(void) else { gSoundAnimFramesToWait = 0; - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; gAnimFramesToWait = 0; } } -static void ScriptCmd_jumpvareq(void) +static void ScriptCmd_jumpargeq(void) { - u8 r2; - s16 r1; - u8 *addr; + u8 argId; + s16 valueToCheck; - gBattleAnimScriptPtr++; - r2 = T1_READ_8(gBattleAnimScriptPtr); - r1 = T1_READ_16(gBattleAnimScriptPtr + 1); - if (r1 == gBattleAnimArgs[r2]) - { - addr = T2_READ_PTR(gBattleAnimScriptPtr + 3); - gBattleAnimScriptPtr = addr; - } + sBattleAnimScriptPtr++; + argId = T1_READ_8(sBattleAnimScriptPtr); + valueToCheck = T1_READ_16(sBattleAnimScriptPtr + 1); + + if (valueToCheck == gBattleAnimArgs[argId]) + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr + 3); else - { - gBattleAnimScriptPtr += 7; - } + sBattleAnimScriptPtr += 7; } -static void ScriptCmd_jumpunkcond(void) +static void ScriptCmd_jumpifcontest(void) { - u8 *addr; - - gBattleAnimScriptPtr++; - if (NotInBattle()) - { - addr = T2_READ_PTR(gBattleAnimScriptPtr); - gBattleAnimScriptPtr = addr; - } + sBattleAnimScriptPtr++; + if (IsContest()) + sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); else - { - gBattleAnimScriptPtr += 4; - } + sBattleAnimScriptPtr += 4; } static void ScriptCmd_monbgprio_28(void) { - u8 r2; - u8 r0; - u8 r4; + u8 wantedBank; + u8 bank; + u8 bankIdentity; + + wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); + sBattleAnimScriptPtr += 2; - r2 = T1_READ_8(gBattleAnimScriptPtr + 1); - gBattleAnimScriptPtr += 2; - if (r2 != 0) - r0 = gBattleAnimBankTarget; + if (wantedBank != 0) + bank = gAnimBankTarget; else - r0 = gBattleAnimBankAttacker; - r4 = GetBankIdentity(r0); - if (!NotInBattle() && (r4 == 0 || r4 == 3)) + bank = gAnimBankAttacker; + + bankIdentity = GetBankIdentity(bank); + if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3)) { REG_BG1CNT_BITFIELD.priority = 1; REG_BG2CNT_BITFIELD.priority = 2; @@ -2129,8 +1876,8 @@ static void ScriptCmd_monbgprio_28(void) static void ScriptCmd_monbgprio_29(void) { - gBattleAnimScriptPtr++; - if (!NotInBattle()) + sBattleAnimScriptPtr++; + if (!IsContest()) { REG_BG1CNT_BITFIELD.priority = 1; REG_BG2CNT_BITFIELD.priority = 2; @@ -2139,20 +1886,20 @@ static void ScriptCmd_monbgprio_29(void) static void ScriptCmd_monbgprio_2A(void) { - u8 r6; - u8 r4; - u8 r0; + u8 wantedBank; + u8 bankIdentity; + u8 bank; - r6 = T1_READ_8(gBattleAnimScriptPtr + 1); - gBattleAnimScriptPtr += 2; - if (GetBankSide(gBattleAnimBankAttacker) != GetBankSide(gBattleAnimBankTarget)) + wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); + sBattleAnimScriptPtr += 2; + if (GetBankSide(gAnimBankAttacker) != GetBankSide(gAnimBankTarget)) { - if (r6 != 0) - r0 = gBattleAnimBankTarget; + if (wantedBank != 0) + bank = gAnimBankTarget; else - r0 = gBattleAnimBankAttacker; - r4 = GetBankIdentity(r0); - if (!NotInBattle() && (r4 == 0 || r4 == 3)) + bank = gAnimBankAttacker; + bankIdentity = GetBankIdentity(bank); + if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3)) { REG_BG1CNT_BITFIELD.priority = 1; REG_BG2CNT_BITFIELD.priority = 2; @@ -2162,51 +1909,45 @@ static void ScriptCmd_monbgprio_2A(void) static void ScriptCmd_invisible(void) { - u8 r0; u8 spriteId; - r0 = T1_READ_8(gBattleAnimScriptPtr + 1); - spriteId = GetAnimBankSpriteId(r0); + spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1)); if (spriteId != 0xFF) - { gSprites[spriteId].invisible = TRUE; - } - gBattleAnimScriptPtr += 2; + + sBattleAnimScriptPtr += 2; } static void ScriptCmd_visible(void) { - u8 r0; u8 spriteId; - r0 = T1_READ_8(gBattleAnimScriptPtr + 1); - spriteId = GetAnimBankSpriteId(r0); + spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1)); if (spriteId != 0xFF) - { gSprites[spriteId].invisible = FALSE; - } - gBattleAnimScriptPtr += 2; + + sBattleAnimScriptPtr += 2; } static void ScriptCmd_doublebattle_2D(void) { - u8 r7; + u8 wantedBank; u8 r4; u8 spriteId; - r7 = T1_READ_8(gBattleAnimScriptPtr + 1); - gBattleAnimScriptPtr += 2; - if (!NotInBattle() && IsDoubleBattle() - && GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) + wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); + sBattleAnimScriptPtr += 2; + if (!IsContest() && IsDoubleBattle() + && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { - if (r7 == 0) + if (wantedBank == 0) { - r4 = GetBankIdentity_permutated(gBattleAnimBankAttacker); + r4 = GetBankIdentity_permutated(gAnimBankAttacker); spriteId = GetAnimBankSpriteId(0); } else { - r4 = GetBankIdentity_permutated(gBattleAnimBankTarget); + r4 = GetBankIdentity_permutated(gAnimBankTarget); spriteId = GetAnimBankSpriteId(1); } if (spriteId != 0xFF) @@ -2224,23 +1965,23 @@ static void ScriptCmd_doublebattle_2D(void) static void ScriptCmd_doublebattle_2E(void) { - u8 r7; + u8 wantedBank; u8 r4; u8 spriteId; - r7 = T1_READ_8(gBattleAnimScriptPtr + 1); - gBattleAnimScriptPtr += 2; - if (!NotInBattle() && IsDoubleBattle() - && GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) + wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1); + sBattleAnimScriptPtr += 2; + if (!IsContest() && IsDoubleBattle() + && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { - if (r7 == 0) + if (wantedBank == 0) { - r4 = GetBankIdentity_permutated(gBattleAnimBankAttacker); + r4 = GetBankIdentity_permutated(gAnimBankAttacker); spriteId = GetAnimBankSpriteId(0); } else { - r4 = GetBankIdentity_permutated(gBattleAnimBankTarget); + r4 = GetBankIdentity_permutated(gAnimBankTarget); spriteId = GetAnimBankSpriteId(1); } if (spriteId != 0xFF && r4 == 2) @@ -2254,5 +1995,5 @@ static void ScriptCmd_stopsound(void) { m4aMPlayStop(&gMPlay_SE1); m4aMPlayStop(&gMPlay_SE2); - gBattleAnimScriptPtr++; + sBattleAnimScriptPtr++; } diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c index 6c35a85c9..058a45769 100644 --- a/src/battle/battle_anim_807B69C.c +++ b/src/battle/battle_anim_807B69C.c @@ -9,12 +9,12 @@ #include "trig.h" #include "ewram.h" -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern bool8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; @@ -22,7 +22,7 @@ extern const u8 *const gBattleAnims_StatusConditions[]; extern const struct OamData gOamData_837E05C; extern const struct OamData gOamData_837DF24; -extern u8 sub_8077ABC(u8, u8); +extern u8 GetBankPosition(u8, u8); extern void sub_80E32E0(u8); @@ -180,11 +180,11 @@ static void sub_807B8A4(struct Sprite *sprite) void sub_807B920(u8 taskId) { - s16 x = sub_8077ABC(gBattleAnimBankTarget, 2) - 32; - s16 y = sub_8077ABC(gBattleAnimBankTarget, 3) - 36; + s16 x = GetBankPosition(gAnimBankTarget, 2) - 32; + s16 y = GetBankPosition(gAnimBankTarget, 3) - 36; u8 spriteId; - if (NotInBattle()) + if (IsContest()) x -= 6; REG_BLDCNT = 0x3F40; REG_BLDALPHA = 0x1000; @@ -336,9 +336,9 @@ void move_anim_start_t2(u8 a, u8 b) { u8 taskId; - gBattleAnimBankAttacker = a; - gBattleAnimBankTarget = a; - DoMoveAnim(gBattleAnims_StatusConditions, b, 0); + gAnimBankAttacker = a; + gAnimBankTarget = a; + LaunchBattleAnimation(gBattleAnims_StatusConditions, b, 0); taskId = CreateTask(sub_807BDAC, 10); gTasks[taskId].data[0] = a; } diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c index a1d916f0f..3097f1a0e 100644 --- a/src/battle/battle_anim_80A7E7C.c +++ b/src/battle/battle_anim_80A7E7C.c @@ -10,10 +10,10 @@ extern s16 gBattleAnimArgs[8]; extern u8 gObjectBankIDs[]; -extern s32 gMoveDmgMoveAnim; -extern u16 gMovePowerMoveAnim; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern s32 gAnimMoveDmg; +extern u16 gAnimMovePower; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80A7EF0(u8 taskId); static void sub_80A808C(u8 taskId); @@ -129,7 +129,7 @@ void sub_80A7FA0(u8 taskId) } else { - sprite = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite = gObjectBankIDs[gAnimBankAttacker]; } if (r6) { @@ -328,7 +328,7 @@ static void sub_80A8488(u8 taskId) void sub_80A8500(u8 taskId) { - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -338,7 +338,7 @@ void sub_80A8500(u8 taskId) void sub_80A8530(struct Sprite *sprite) { sprite->invisible = TRUE; - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { sprite->data[1] = -gBattleAnimArgs[1]; } @@ -348,7 +348,7 @@ void sub_80A8530(struct Sprite *sprite) } sprite->data[0] = gBattleAnimArgs[0]; sprite->data[2] = 0; - sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = gObjectBankIDs[gAnimBankAttacker]; sprite->data[4] = gBattleAnimArgs[0]; StoreSpriteCallbackInData(sprite, sub_80A85A4); sprite->callback = sub_8078458; @@ -359,7 +359,7 @@ static void sub_80A85A4(struct Sprite *sprite) sprite->data[0] = sprite->data[4]; sprite->data[1] = -sprite->data[1]; sprite->callback = sub_8078458; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80A85C8(struct Sprite *sprite) @@ -381,7 +381,7 @@ void sub_80A8614(struct Sprite *sprite) sprite->data[0] = sprite->data[4]; sprite->data[2] = -sprite->data[2]; sprite->callback = sub_8078458; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80A8638(struct Sprite *sprite) @@ -390,11 +390,11 @@ void sub_80A8638(struct Sprite *sprite) int spriteId; if (!gBattleAnimArgs[0]) { - spriteId = gObjectBankIDs[gBattleAnimBankAttacker]; + spriteId = gObjectBankIDs[gAnimBankAttacker]; } else { - spriteId = gObjectBankIDs[gBattleAnimBankTarget]; + spriteId = gObjectBankIDs[gAnimBankTarget]; } sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; @@ -439,7 +439,7 @@ static void sub_80A86F4(struct Sprite *sprite) { sprite2->pos2.y = 0; } - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } else { @@ -457,11 +457,11 @@ void sub_80A8764(struct Sprite *sprite) u8 spriteId; if (!gBattleAnimArgs[0]) { - v1 = gBattleAnimBankAttacker; + v1 = gAnimBankAttacker; } else { - v1 = gBattleAnimBankTarget; + v1 = gAnimBankTarget; } spriteId = gObjectBankIDs[v1]; if (GetBankSide(v1)) @@ -482,7 +482,7 @@ void sub_80A8764(struct Sprite *sprite) sprite->data[4] = 0; sprite->data[5] = spriteId; sprite->invisible = TRUE; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_80784A8; } @@ -493,11 +493,11 @@ void sub_80A8818(struct Sprite *sprite) sprite->invisible = TRUE; if (!gBattleAnimArgs[0]) { - v1 = gBattleAnimBankAttacker; + v1 = gAnimBankAttacker; } else { - v1 = gBattleAnimBankTarget; + v1 = gAnimBankTarget; } spriteId = gObjectBankIDs[v1]; if (GetBankSide(v1)) @@ -520,7 +520,7 @@ void sub_80A8818(struct Sprite *sprite) sprite->data[6] = gBattleAnimArgs[5]; if (!gBattleAnimArgs[5]) { - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } else { @@ -534,14 +534,14 @@ static void sub_80A88F0(struct Sprite *sprite) { gSprites[sprite->data[5]].pos2.x = 0; gSprites[sprite->data[5]].pos2.y = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_80A8920(u8 taskId) { s16 r7; r7 = 0x8000 / gBattleAnimArgs[3]; - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[5] = -gBattleAnimArgs[5]; @@ -603,27 +603,27 @@ void sub_80A8A80(u8 taskId) spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]); break; case 2: - if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) + if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { DestroyAnimVisualTask(taskId); return; } - spriteId = gObjectBankIDs[gBattleAnimBankAttacker ^ 2]; + spriteId = gObjectBankIDs[gAnimBankAttacker ^ 2]; break; case 3: - if (!IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) + if (!IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { DestroyAnimVisualTask(taskId); return; } - spriteId = gObjectBankIDs[gBattleAnimBankTarget ^ 2]; + spriteId = gObjectBankIDs[gAnimBankTarget ^ 2]; break; default: DestroyAnimVisualTask(taskId); return; } TASK.data[0] = spriteId; - if (GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankTarget)) { TASK.data[1] = gBattleAnimArgs[1]; } @@ -648,7 +648,7 @@ static void sub_80A8B3C(u8 taskId) void sub_80A8B88(u8 taskId) { u8 spriteId; - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -660,11 +660,11 @@ void sub_80A8B88(u8 taskId) TASK.data[4] = spriteId; if (gBattleAnimArgs[4] == 0) { - TASK.data[5] = gBattleAnimBankAttacker; + TASK.data[5] = gAnimBankAttacker; } else { - TASK.data[5] = gBattleAnimBankTarget; + TASK.data[5] = gAnimBankTarget; } TASK.data[12] = 1; TASK.func = sub_80A8C0C; @@ -769,7 +769,7 @@ void sub_80A8E04(u8 taskId) TASK.data[4] = gBattleAnimArgs[1]; TASK.data[5] = spriteId; TASK.data[6] = gBattleAnimArgs[3]; - if (NotInBattle()) + if (IsContest()) { TASK.data[7] = 1; } @@ -777,16 +777,16 @@ void sub_80A8E04(u8 taskId) { if (gBattleAnimArgs[2] == 0) { - TASK.data[7] = !GetBankSide(gBattleAnimBankAttacker); + TASK.data[7] = !GetBankSide(gAnimBankAttacker); } else { - TASK.data[7] = !GetBankSide(gBattleAnimBankTarget); + TASK.data[7] = !GetBankSide(gAnimBankTarget); } } if (TASK.data[7]) { - if (!NotInBattle()) + if (!IsContest()) { TASK.data[3] *= -1; TASK.data[4] *= -1; @@ -804,14 +804,14 @@ void sub_80A8EFC(u8 taskId) TASK.data[2] = gBattleAnimArgs[0]; if (gBattleAnimArgs[2] == 0) { - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } } else { - if (GetBankSide(gBattleAnimBankTarget)) + if (GetBankSide(gAnimBankTarget)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -864,7 +864,7 @@ void sub_80A9058(u8 taskId) { if (!gBattleAnimArgs[0]) { - TASK.data[15] = gMovePowerMoveAnim / 12; + TASK.data[15] = gAnimMovePower / 12; if (TASK.data[15] < 1) { TASK.data[15] = 1; @@ -876,7 +876,7 @@ void sub_80A9058(u8 taskId) } else { - TASK.data[15] = gMoveDmgMoveAnim / 12; + TASK.data[15] = gAnimMoveDmg / 12; if (TASK.data[15] < 1) { TASK.data[15] = 1; diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 3259fc7ee..a80a07b9f 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -33,9 +33,9 @@ extern u16 gBattleTypeFlags; extern u8 gBattleMonForms[]; extern void (*gBattleBankFunc[])(void); extern u32 *gDisableStructMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u16 gMovePowerMoveAnim; -extern u8 gHappinessMoveAnim; +extern u32 gAnimMoveDmg; +extern u16 gAnimMovePower; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; extern u32 gPID_perBank[]; extern u8 gAnimScriptActive; @@ -46,7 +46,7 @@ extern u8 gBattleOutcome; extern u16 gUnknown_02024DE8; extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; @@ -79,7 +79,7 @@ extern void sub_8010384(struct Sprite *); extern void sub_8037B78(void); extern u8 sub_8031720(); extern bool8 mplay_80342A4(u8); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_80326EC(); extern void sub_8031F24(void); extern void sub_80324BC(); @@ -100,7 +100,7 @@ extern void nullsub_47(void); extern bool8 IsDoubleBattle(void); extern void sub_8037840(void); extern void sub_8031B74(); -extern u8 AnimBankSpriteExists(); +extern u8 IsBankSpritePresent(); extern u8 move_anim_start_t3(); extern void sub_8037FD8(void); extern void sub_8037F34(void); @@ -1157,7 +1157,7 @@ void LinkOpponentHandleLoadPokeSprite(void) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank)); gObjectBankIDs[gActiveBank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(gActiveBank, 2), + GetBankPosition(gActiveBank, 2), sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; @@ -1187,7 +1187,7 @@ void sub_8039430(u8 a, u8 b) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a)); gObjectBankIDs[a] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(a, 2), + GetBankPosition(a, 2), sub_8077F68(a), sub_8079E90(a)); gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a]; @@ -1331,21 +1331,21 @@ void LinkOpponentHandleMoveAnimation(void) u32 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; // Dead code. sub_8031720 always returns 0. - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + if (sub_8031720(r0, gAnimMoveTurn) != 0) { LinkOpponentBufferExecCompleted(); } @@ -1377,7 +1377,7 @@ void sub_8039B64(void) if (!ewram17810[gActiveBank].unk0_6) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -1731,7 +1731,7 @@ void LinkOpponentHandlecmd50(void) void LinkOpponentHandleSpriteInvisibility(void) { - if (AnimBankSpriteExists(gActiveBank) != 0) + if (IsBankSpritePresent(gActiveBank) != 0) { gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; sub_8031F88(gActiveBank); diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index fc3fde661..6e63333d4 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -50,11 +50,11 @@ extern u8 gDoingBattleAnim; extern u32 gPID_perBank[]; extern struct SpriteTemplate gUnknown_02024E8C; extern u32 *gDisableStructMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u16 gMovePowerMoveAnim; -extern u8 gHappinessMoveAnim; +extern u32 gAnimMoveDmg; +extern u16 gAnimMovePower; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; @@ -67,7 +67,7 @@ extern u8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern u8 move_anim_start_t3(); -extern u8 AnimBankSpriteExists(); +extern u8 IsBankSpritePresent(); extern void sub_8044CA0(u8); extern void sub_8030E38(struct Sprite *); extern void sub_80E43C0(); @@ -78,7 +78,7 @@ extern void sub_8043D84(); extern void BufferStringBattle(); extern void sub_8031F24(void); extern void sub_80326EC(); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_80324BC(); extern u8 sub_8031720(); extern u8 mplay_80342A4(); @@ -93,7 +93,7 @@ extern u8 sub_8046400(); extern void sub_80312F0(struct Sprite *); extern u8 CreateInvisibleSpriteWithCallback(); extern void BattleLoadPlayerMonSprite(); -extern u8 sub_8077ABC(); +extern u8 GetBankPosition(); extern u8 sub_8077F68(); extern u8 sub_8079E90(); extern void nullsub_10(); @@ -1114,7 +1114,7 @@ void LinkPartnerHandleLoadPokeSprite(void) GetBankIdentity(gActiveBank)); gObjectBankIDs[gActiveBank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(gActiveBank, 2), + GetBankPosition(gActiveBank, 2), sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; @@ -1144,7 +1144,7 @@ void sub_811F864(u8 a, u8 b) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a)); gObjectBankIDs[a] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(a, 2), + GetBankPosition(a, 2), sub_8077F68(a), sub_8079E90(a)); gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a]; @@ -1287,20 +1287,20 @@ void LinkPartnerHandleMoveAnimation(void) u32 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + if (sub_8031720(r0, gAnimMoveTurn) != 0) LinkPartnerBufferExecCompleted(); else { @@ -1330,7 +1330,7 @@ void sub_811FF30(void) if (!ewram17810[gActiveBank].unk0_6) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -1679,7 +1679,7 @@ void LinkPartnerHandlecmd50(void) void LinkPartnerHandleSpriteInvisibility(void) { - if (AnimBankSpriteExists(gActiveBank) != 0) + if (IsBankSpritePresent(gActiveBank) != 0) { gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; sub_8031F88(gActiveBank); diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index a35687796..7b693a06f 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -41,12 +41,12 @@ extern u8 gHealthboxIDs[]; extern u16 gBattleTypeFlags; extern u16 gTrainerBattleOpponent; extern u32 *gDisableStructMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u16 gMovePowerMoveAnim; -extern u8 gHappinessMoveAnim; +extern u32 gAnimMoveDmg; +extern u16 gAnimMovePower; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; extern u32 gPID_perBank[]; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern u8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern struct Window gUnknown_03004210; @@ -65,7 +65,7 @@ extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlay_BGM; extern u32 gBattleExecBuffer; -extern u8 sub_8077ABC(); +extern u8 GetBankPosition(); extern u8 sub_8077F68(); extern u8 sub_8079E90(); extern void sub_8033018(void); @@ -91,7 +91,7 @@ extern void sub_803311C(void); extern void sub_8010384(struct Sprite *); extern bool8 mplay_80342A4(u8); extern u8 sub_8031720(); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_80326EC(); extern void sub_8031F24(void); extern void sub_80324BC(); @@ -114,7 +114,7 @@ extern void nullsub_45(void); extern void sub_8031B74(); extern bool8 IsDoubleBattle(void); extern void sub_8032E2C(void); -extern u8 AnimBankSpriteExists(); +extern u8 IsBankSpritePresent(); extern u8 move_anim_start_t3(); extern void sub_80334C0(void); @@ -1127,7 +1127,7 @@ void OpponentHandleLoadPokeSprite(void) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank)); gObjectBankIDs[gActiveBank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(gActiveBank, 2), + GetBankPosition(gActiveBank, 2), sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; @@ -1159,7 +1159,7 @@ void sub_803495C(u8 a, u8 b) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a)); gObjectBankIDs[a] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(a, 2), + GetBankPosition(a, 2), sub_8077F68(a), sub_8079E90(a)); gSprites[gObjectBankIDs[a]].data[0] = a; @@ -1325,21 +1325,21 @@ void OpponentHandleMoveAnimation(void) u32 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; // Dead code. sub_8031720 always returns 0. - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + if (sub_8031720(r0, gAnimMoveTurn) != 0) { OpponentBufferExecCompleted(); } @@ -1371,7 +1371,7 @@ void sub_8035238(void) if (!ewram17810[gActiveBank].unk0_6) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -2003,7 +2003,7 @@ void OpponentHandlecmd50(void) void OpponentHandleSpriteInvisibility(void) { - if (AnimBankSpriteExists(gActiveBank) != 0) + if (IsBankSpritePresent(gActiveBank) != 0) { gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; sub_8031F88(gActiveBank); diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index c2d34db0d..cdf8b4c37 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -56,9 +56,9 @@ extern u16 gBattleTypeFlags; extern u8 gBattleOutcome; extern void (*gAnimScriptCallback)(void); extern bool8 gAnimScriptActive; -extern u16 gMovePowerMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u8 gHappinessMoveAnim; +extern u16 gAnimMovePower; +extern u32 gAnimMoveDmg; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; extern u32 *gDisableStructMoveAnim; extern u32 gPID_perBank[]; @@ -66,15 +66,15 @@ extern u8 gBattleMonForms[]; extern u16 gUnknown_02024DE8; extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern u8 gUnknown_02038470[]; extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_X; extern u8 gUnknown_03004344; extern u8 gUnknown_0300434C[]; @@ -106,7 +106,7 @@ extern void StoreSpriteCallbackInData(); extern void BattleLoadPlayerMonSprite(); extern bool8 IsDoubleBattle(void); extern void sub_802D500(void); -extern bool8 AnimBankSpriteExists(u8); +extern bool8 IsBankSpritePresent(u8); extern bool8 move_anim_start_t3(); extern void sub_802E460(void); extern void b_link_standby_message(void); @@ -114,7 +114,7 @@ extern void sub_802D18C(void); extern void sub_802DF18(void); extern void BufferStringBattle(); extern void sub_80326EC(); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_8031F24(void); extern void sub_80324BC(); extern u8 sub_8031720(); @@ -131,7 +131,7 @@ extern void sub_802D204(void); extern u8 sub_8079E90(); extern void sub_802DEAC(void); extern void sub_80312F0(struct Sprite *); -extern u8 sub_8077ABC(); +extern u8 GetBankPosition(); extern u8 sub_8077F68(); extern u8 sub_8046400(); extern void sub_802D798(void); @@ -2321,7 +2321,7 @@ void sub_802F934(u8 bank, u8 b) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank)); gObjectBankIDs[bank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(bank, 2), + GetBankPosition(bank, 2), sub_8077F68(bank), sub_8079E90(bank)); gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank]; @@ -2490,14 +2490,14 @@ void PlayerHandleMoveAnimation(void) { u16 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + if (sub_8031720(r0, gAnimMoveTurn) != 0) { // Dead code. sub_8031720 always returns 0. PlayerBufferExecCompleted(); @@ -2529,7 +2529,7 @@ void sub_8030190(void) if (ewram17810[gActiveBank].unk0_6 == 0) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -2990,7 +2990,7 @@ void PlayerHandlecmd50(void) void PlayerHandleSpriteInvisibility(void) { - if (AnimBankSpriteExists(gActiveBank)) + if (IsBankSpritePresent(gActiveBank)) { gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; sub_8031F88(gActiveBank); diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index d81c43381..e3a45825a 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -37,9 +37,9 @@ extern bool8 gDoingBattleAnim; extern u16 gBattlePartyID[]; extern u8 gHealthboxIDs[]; extern u16 gBattleTypeFlags; -extern u16 gMovePowerMoveAnim; -extern u32 gMoveDmgMoveAnim; -extern u8 gHappinessMoveAnim; +extern u16 gAnimMovePower; +extern u32 gAnimMoveDmg; +extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; extern u32 *gDisableStructMoveAnim; extern u32 gPID_perBank[]; @@ -52,7 +52,7 @@ extern u8 gBattleOutcome; extern u16 gUnknown_02024DE8; extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; -extern u8 gUnknown_0202F7C4; +extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; @@ -78,7 +78,7 @@ extern u8 GetBankIdentity(u8); extern void sub_80313A0(struct Sprite *); extern u8 GetBankByPlayerAI(u8); extern u8 sub_8031720(); -extern void ExecuteMoveAnim(); +extern void DoMoveAnim(); extern void sub_80326EC(); extern void sub_8031F24(void); extern void sub_80324BC(); @@ -92,7 +92,7 @@ extern void sub_8078B34(struct Sprite *); extern void sub_8030E38(struct Sprite *); extern void StoreSpriteCallbackInData(); extern u8 sub_8046400(); -extern u8 sub_8077ABC(); +extern u8 GetBankPosition(); extern u8 sub_8077F68(); extern u8 sub_8079E90(); extern void sub_80312F0(struct Sprite *); @@ -1173,14 +1173,14 @@ void WallyHandleMoveAnimation(void) { u16 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); - gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; - gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); - gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); - gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gAnimMoveTurn = gBattleBufferA[gActiveBank][3]; + gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8); + gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24); + gAnimFriendship = gBattleBufferA[gActiveBank][10]; gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; - if (sub_8031720(r0, gUnknown_0202F7C4) != 0) + if (sub_8031720(r0, gAnimMoveTurn) != 0) { // Dead code. sub_8031720 always returns 0. WallyBufferExecCompleted(); @@ -1211,7 +1211,7 @@ void sub_81390D0(void) if (ewram17810[gActiveBank].unk0_6 == 0) { sub_80326EC(0); - ExecuteMoveAnim(r4); + DoMoveAnim(r4); ewram17810[gActiveBank].unk4 = 2; } break; @@ -1511,7 +1511,7 @@ void sub_81398BC(u8 bank) GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank)); gObjectBankIDs[bank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(bank, 2), + GetBankPosition(bank, 2), sub_8077F68(bank), sub_8079E90(bank)); gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank]; diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index ea393277e..97568d254 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -583,7 +583,7 @@ void nullsub_11() { } -void sub_8043EB4(u8 priority) +void UpdateOamPriorityInAllHealthboxes(u8 priority) { s32 i; diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c index 12fd5e5d9..bcaaebcda 100644 --- a/src/battle/pokeball.c +++ b/src/battle/pokeball.c @@ -376,8 +376,8 @@ static void sub_8046464(u8 taskId) gSprites[spriteId].callback = sub_8047074; break; case 0xFE: - gSprites[spriteId].pos1.x = sub_8077ABC(r5, 0); - gSprites[spriteId].pos1.y = sub_8077ABC(r5, 1) + 24; + gSprites[spriteId].pos1.x = GetBankPosition(r5, 0); + gSprites[spriteId].pos1.y = GetBankPosition(r5, 1) + 24; gBankTarget = r5; gSprites[spriteId].data[0] = 0; gSprites[spriteId].callback = sub_8047254; @@ -394,8 +394,8 @@ static void sub_8046464(u8 taskId) return; } gSprites[spriteId].data[0] = 0x22; - gSprites[spriteId].data[2] = sub_8077ABC(gBankTarget, 0); - gSprites[spriteId].data[4] = sub_8077ABC(gBankTarget, 1) - 16; + gSprites[spriteId].data[2] = GetBankPosition(gBankTarget, 0); + gSprites[spriteId].data[4] = GetBankPosition(gBankTarget, 1) - 16; gSprites[spriteId].data[5] = -40; sub_80786EC(&gSprites[spriteId]); gSprites[spriteId].oam.affineParam = taskId; @@ -830,8 +830,8 @@ static void sub_8046FBC(struct Sprite *sprite) static void sub_8047074(struct Sprite *sprite) { sprite->data[0] = 25; - sprite->data[2] = sub_8077ABC(sprite->data[6], 2); - sprite->data[4] = sub_8077ABC(sprite->data[6], 3) + 24; + sprite->data[2] = GetBankPosition(sprite->data[6], 2); + sprite->data[4] = GetBankPosition(sprite->data[6], 3) + 24; sprite->data[5] = -30; sprite->oam.affineParam = sprite->data[6]; sub_80786EC(sprite); diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 03b5660fe..49b0854cc 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -11,12 +11,12 @@ extern struct SpriteTemplate gUnknown_02024E8C; extern struct Window gUnknown_03004210; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_X; extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; extern u16 gUnknown_030042A0; extern u8 gReservedSpritePaletteCount; @@ -83,10 +83,10 @@ static void CB2_ReshowBattleScreenAfterMenu(void) InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; break; @@ -243,7 +243,7 @@ static void sub_807B184(u8 bank) if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0) return; GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank)); - gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank)); + gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank)); gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; gSprites[gObjectBankIDs[bank]].data[0] = bank; @@ -275,7 +275,7 @@ static void sub_807B184(u8 bank) if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0) return; GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank)); - gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank)); + gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank)); gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; gSprites[gObjectBankIDs[bank]].data[0] = bank; diff --git a/src/contest.c b/src/contest.c index 3aa3c8f59..91fc91b78 100644 --- a/src/contest.c +++ b/src/contest.c @@ -217,18 +217,18 @@ extern u8 gObjectBankIDs[]; extern u8 gIsLinkContest; extern u8 gContestPlayerMonIndex; extern u16 gUnknown_030041B0; -extern s16 gUnknown_030041B4; +extern s16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004200; +extern u16 gBattle_WIN1H; extern struct Window gUnknown_03004210; -extern u16 gUnknown_03004240; -extern u16 gUnknown_03004244; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1V; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030042C4; +extern u16 gBattle_BG1_X; +extern u16 gBattle_WIN0H; extern u32 gUnknown_03005D28; // saved RNG value extern s16 gUnknown_02038680[]; @@ -364,7 +364,7 @@ void sub_80AE6E4(u8, u8); u8 CreateJudgeSprite(void); u8 sub_80AE8B4(void); u8 sub_80AE9FC(u16, u32, u32); -bool8 sub_80AEB1C(u16); +bool8 IsSpeciesNotUnown(u16); void sub_80AEB30(void); void sub_80AEBEC(u16); void sub_80AED58(void); @@ -491,19 +491,19 @@ void ResetContestGpuRegs(void) gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; - gUnknown_030042C4 = 0; - gUnknown_03004240 = 0; - gUnknown_03004200 = 0; - gUnknown_03004244 = 0; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + gBattle_WIN1H = 0; + gBattle_WIN1V = 0; } -void sub_80AB2AC(void) +void LoadContestBgAfterMoveAnim(void) { s32 i; @@ -603,8 +603,8 @@ void CB2_StartContest(void) break; case 3: sub_80B2184(); - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; BeginFastPaletteFade(2); gPaletteFade.bufferTransferDisabled = FALSE; SetVBlankCallback(ContestVBlankCallback); @@ -749,8 +749,8 @@ void sub_80AB9A0(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - gUnknown_030041B4 += 7; - if (gUnknown_030041B4 <= 160) + gBattle_BG1_Y += 7; + if (gBattle_BG1_Y <= 160) break; gTasks[taskId].data[0]++; break; @@ -787,16 +787,16 @@ void ContestVBlankCallback(void) { REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; - REG_WIN0H = gUnknown_030042C4; - REG_WIN0V = gUnknown_03004240; - REG_WIN1H = gUnknown_03004200; - REG_WIN1V = gUnknown_03004244; + REG_WIN0H = gBattle_WIN0H; + REG_WIN0V = gBattle_WIN0V; + REG_WIN1H = gBattle_WIN1H; + REG_WIN1V = gBattle_WIN1V; TransferPlttBuffer(); LoadOam(); ProcessSpriteCopyRequests(); @@ -806,7 +806,7 @@ void ContestVBlankCallback(void) void sub_80ABB70(u8 taskId) { gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; sub_80B0D7C(); DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18204, 0x400); if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex)) @@ -850,7 +850,7 @@ void sub_80ABCDC(u8 taskId) u8 sp8[32]; gUnknown_030042A0 = 0xA0; - gUnknown_03004280 = 0xA0; + gBattle_BG2_Y = 0xA0; FillWindowRect_DefaultPalette( &gUnknown_03004210, 0, @@ -938,7 +938,7 @@ void sub_80ABEA0(u8 taskId) StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); sub_8003460(&gMenuWindow, gStringVar4, 776, 1, 15); gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; gTasks[taskId].func = sub_80ABC70; break; case DPAD_LEFT: @@ -1012,7 +1012,7 @@ void sub_80AC188(u8 taskId) { sub_80AF138(); gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; sub_80AFFE0(FALSE); DmaCopy32Defvars(3, gPlttBufferFaded, shared18000.unk18604, 0x400); LoadPalette(shared18000.unk18204, 0, 0x400); @@ -1159,7 +1159,7 @@ void sub_80AC2CC(u8 taskId) sub_80B2790(sContest.unk19215); sub_80B28F0(sContest.unk19215); SelectContestMoveBankTarget(move); - ExecuteMoveAnim(move); + DoMoveAnim(move); gTasks[taskId].data[0] = 8; } return; @@ -1970,7 +1970,7 @@ void sub_80ADDA4(u8 taskId) s32 i; gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; for (i = 0; i < 4; i++) gUnknown_02038680[i] = sContestantStatus[i].unk4; sub_80AF668(); @@ -1988,8 +1988,8 @@ void sub_80ADE54(u8 taskId) if (sub_80037A0(&gMenuWindow) == 1) { sub_80B2184(); - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 160; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 160; PlaySE12WithPanning(SE_C_MAKU_D, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].func = sub_80ADEAC; @@ -1998,10 +1998,10 @@ void sub_80ADE54(u8 taskId) void sub_80ADEAC(u8 taskId) { - gUnknown_030041B4 -= 7; - if (gUnknown_030041B4 < 0) - gUnknown_030041B4 = 0; - if (*(u16 *)&gUnknown_030041B4 == 0) // Why cast? + gBattle_BG1_Y -= 7; + if (gBattle_BG1_Y < 0) + gBattle_BG1_Y = 0; + if (*(u16 *)&gBattle_BG1_Y == 0) // Why cast? { gTasks[taskId].func = sub_80ADEEC; gTasks[taskId].data[0] = 0; @@ -2491,7 +2491,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality) gSprites[spriteId].callback = SpriteCallbackDummy; gSprites[spriteId].data[0] = gSprites[spriteId].oam.paletteNum; gSprites[spriteId].data[2] = species; - if (sub_80AEB1C(species)) + if (IsSpeciesNotUnown(species)) gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E7C18; else gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E7BEC; @@ -2499,7 +2499,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality) return spriteId; } -bool8 sub_80AEB1C(u16 species) +bool8 IsSpeciesNotUnown(u16 species) { if (species == SPECIES_UNOWN) return FALSE; @@ -3116,7 +3116,7 @@ bool8 sub_80AF828(s32 a, s32 b, struct UnknownContestStruct6 *c) void sub_80AF860(void) { gUnknown_030042A0 = 0; - gUnknown_03004280 = 0; + gBattle_BG2_Y = 0; sub_80AF138(); sub_8003460(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15); } @@ -5113,8 +5113,8 @@ void sub_80B2184(void) ((vBgCnt *)®_BG1CNT)->screenSize = 1; ((vBgCnt *)®_BG1CNT)->areaOverflowMode = 0; - gUnknown_030042C0 = DISPLAY_WIDTH; - gUnknown_030041B4 = DISPLAY_HEIGHT; + gBattle_BG1_X = DISPLAY_WIDTH; + gBattle_BG1_Y = DISPLAY_HEIGHT; REG_BG1HOFS = DISPLAY_WIDTH; REG_BG1VOFS = DISPLAY_HEIGHT; @@ -5141,8 +5141,8 @@ void sub_80B2280(void) DmaClearLarge32(3, (void *)(VRAM + 0x8000), 0x2000, 0x1000); DmaClear32(3, (void *)(VRAM + 0xF000), 0x1000); - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; ((vBgCnt *)®_BG1CNT)->priority = 1; ((vBgCnt *)®_BG1CNT)->screenSize = 0; @@ -5158,18 +5158,18 @@ void sub_80B2280(void) void sub_80B237C(u8 taskId) { - gUnknown_030042C0 = 0; - gUnknown_030041B4 = DISPLAY_HEIGHT; + gBattle_BG1_X = 0; + gBattle_BG1_Y = DISPLAY_HEIGHT; PlaySE12WithPanning(SE_C_MAKU_D, 0); gTasks[taskId].func = sub_80B23BC; } void sub_80B23BC(u8 taskId) { - gUnknown_030041B4 -= 7; - if (gUnknown_030041B4 < 0) - gUnknown_030041B4 = 0; - if (*(u16 *)&gUnknown_030041B4 == 0) // Why cast? + gBattle_BG1_Y -= 7; + if (gBattle_BG1_Y < 0) + gBattle_BG1_Y = 0; + if (*(u16 *)&gBattle_BG1_Y == 0) // Why cast? { gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; @@ -5229,8 +5229,8 @@ void sub_80B2400(u8 taskId) void sub_80B2508(u8 taskId) { - gUnknown_030041B4 += 7; - if (gUnknown_030041B4 > DISPLAY_HEIGHT) + gBattle_BG1_Y += 7; + if (gBattle_BG1_Y > DISPLAY_HEIGHT) gTasks[taskId].func = sub_80ADCDC; } @@ -5340,16 +5340,16 @@ void sub_80B2790(u8 a) u8 r5_2; memset(&shared19348_, 0, sizeof(shared19348_)); - battle_anim_clear_some_data(); + ClearBattleAnimationVars(); for (i = 0; i < 4; i++) gBattleMonForms[i] = 0; switch (move) { case MOVE_CURSE: if (gBaseStats[species].type1 == TYPE_GHOST || gBaseStats[species].type2 == TYPE_GHOST) - gUnknown_0202F7C4 = 0; + gAnimMoveTurn = 0; else - gUnknown_0202F7C4 = 1; + gAnimMoveTurn = 1; break; case MOVE_TRANSFORM: case MOVE_ROLE_PLAY: @@ -5359,10 +5359,10 @@ void sub_80B2790(u8 a) shared19348_.unk4_0 = 1; break; case MOVE_RETURN: - gHappinessMoveAnim = 0xFF; + gAnimFriendship = 0xFF; break; case MOVE_FRUSTRATION: - gHappinessMoveAnim = 0; + gAnimFriendship = 0; break; case MOVE_SOLAR_BEAM: case MOVE_RAZOR_WIND: @@ -5371,11 +5371,11 @@ void sub_80B2790(u8 a) if (sContest.unk1925E == 0) { sContest.unk1925E = 2; - gUnknown_0202F7C4 = 0; + gAnimMoveTurn = 0; } else { - gUnknown_0202F7C4 = 1; + gAnimMoveTurn = 1; } break; } @@ -5410,8 +5410,8 @@ void sub_80B2968(void) sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->pos1.x = sub_8077ABC(3, 0); - sprite->pos1.y = sub_8077ABC(3, 1); + sprite->pos1.x = GetBankPosition(3, 0); + sprite->pos1.y = GetBankPosition(3, 1); sprite->invisible = TRUE; } diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index d797e8850..bb80de6fe 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -31,10 +31,10 @@ extern u16 gSpecialVar_ContestRank; extern u16 gUnknown_030042A4; extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_03004288; -extern u16 gUnknown_03004280; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; extern u16 gUnknown_030041B0; extern u16 gUnknown_030041B8; extern struct Window gUnknown_03004210; @@ -459,10 +459,10 @@ static void sub_80A9F50(void) REG_BG0VOFS = 0; gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; } @@ -507,10 +507,10 @@ static void sub_80AA090(void) { REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; LoadOam(); diff --git a/src/engine/sprite.c b/src/engine/sprite.c index c1bb36917..cf35e12a3 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -598,7 +598,7 @@ static u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, return index; } -u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) { u8 i; diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index 2abbac287..960a163c1 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -29,7 +29,7 @@ struct Struct2000000 }; extern struct Struct2000000 gSharedMem; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; static EWRAM_DATA u8 gUnknown_0203932C = 0; static EWRAM_DATA s16 gUnknown_0203932E[5] = {0}; @@ -77,8 +77,8 @@ static void sub_8146014(void) static void sub_814602C(void) { - REG_BG0VOFS = gUnknown_030041B4; - REG_BG1VOFS = gUnknown_030041B4; + REG_BG0VOFS = gBattle_BG1_Y; + REG_BG1VOFS = gBattle_BG1_Y; LoadOam(); ProcessSpriteCopyRequests(); @@ -183,7 +183,7 @@ static void sub_8146288(void) REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5) | BGCNT_16COLOR | BGCNT_TXT256x256; REG_BG2CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6) | BGCNT_16COLOR | BGCNT_TXT256x256; REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256; - gUnknown_030041B4 = 0; + gBattle_BG1_Y = 0; } bool8 sub_81462B8(void) @@ -394,17 +394,17 @@ static void sub_8146798(u8 taskId) { s16 *taskData = gTasks[taskId].data; - gUnknown_030041B4 = (gUnknown_030041B4 + taskData[0]) & 0xFF; - if ((taskData[0] > 0 && gUnknown_030041B4 == 144) - || (taskData[0] < 0 && gUnknown_030041B4 == 112)) + gBattle_BG1_Y = (gBattle_BG1_Y + taskData[0]) & 0xFF; + if ((taskData[0] > 0 && gBattle_BG1_Y == 144) + || (taskData[0] < 0 && gBattle_BG1_Y == 112)) { sub_8146810(gTasks[taskId].data[1]); sub_81468BC(); } - if (gUnknown_030041B4 == 0) + if (gBattle_BG1_Y == 0) { - gTasks[taskId].data[0] = gUnknown_030041B4; - gTasks[taskId].data[1] = gUnknown_030041B4; + gTasks[taskId].data[0] = gBattle_BG1_Y; + gTasks[taskId].data[1] = gBattle_BG1_Y; gTasks[taskId].func = sub_8146480; } } diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 4e283ffe9..e9b8b24d3 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -153,7 +153,7 @@ static const u8 *sPopupMenuActionList; // common void (*gFieldItemUseCallback)(u8) = NULL; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern struct PocketScrollState gBagPocketScrollStates[]; extern struct ItemSlot *gCurrentBagPocketItemSlots; // selected pocket item slots extern const u8 Event_NoRegisteredItem[]; @@ -4499,7 +4499,7 @@ u8 CreateBerrySprite(u8 berryId, s16 x, s16 y) static void SpriteCB_BerrySprite(struct Sprite *sprite) { - sprite->pos2.y = -gUnknown_030041B4; + sprite->pos2.y = -gBattle_BG1_Y; } void sub_80A7DD4(void) diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index cd3793cb5..9563bc08f 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -124,10 +124,10 @@ extern struct MusicPlayerInfo gMPlay_BGM; extern u8 gUnknown_020384F0; extern u8 gUnknown_08208238[]; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004280; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030041B0; extern TaskFunc gUnknown_03005CF0; extern struct Sprite *gUnknown_020384F4; @@ -582,10 +582,10 @@ void sub_809D844(void) void sub_809D85C(void) { - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; @@ -868,10 +868,10 @@ static void sub_809DE64(void) REG_BG2CNT = 0x4A02; REG_BG3CNT = 0x5C03; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; @@ -1522,7 +1522,7 @@ static void sub_809EBC4(void) if (pssData.page != PSS_PAGE_INFO) { DrawSummaryScreenNavigationDots(); - gUnknown_030042C0 = 0x100; + gBattle_BG1_X = 0x100; if (pssData.page == PSS_PAGE_SKILLS) REG_BG1CNT = (REG_BG1CNT & 0xE0FF) + 0x800; @@ -1547,7 +1547,7 @@ void sub_809EC38(u8 taskId) { if (pssData.page != PSS_PAGE_INFO) { - gUnknown_03004288 = 0x100; + gBattle_BG2_X = 0x100; } if (pssData.page == PSS_PAGE_SKILLS) @@ -1564,7 +1564,7 @@ void sub_809EC38(u8 taskId) { if (pssData.page != PSS_PAGE_INFO) { - gUnknown_030042C0 = 0x100; + gBattle_BG1_X = 0x100; } if (pssData.page == PSS_PAGE_SKILLS) @@ -1583,8 +1583,8 @@ void sub_809EC38(u8 taskId) case 1: if (pssData.bgToggle == 0) { - int var2 = gUnknown_030042C0 - 0x20; - gUnknown_030042C0 = var2; + int var2 = gBattle_BG1_X - 0x20; + gBattle_BG1_X = var2; if (var2 << 16 == 0) { REG_BG1CNT = (REG_BG1CNT & 0xFFFC) + 2; @@ -1594,8 +1594,8 @@ void sub_809EC38(u8 taskId) } else { - int var2 = gUnknown_03004288 - 0x20; - gUnknown_03004288 = var2; + int var2 = gBattle_BG2_X - 0x20; + gBattle_BG2_X = var2; if (var2 << 16 == 0) { REG_BG1CNT = (REG_BG1CNT & 0xFFFC) + 1; @@ -1663,12 +1663,12 @@ void sub_809EE74(u8 taskId) var1 = pssData.bgToggle; if (var1 == 0) { - gUnknown_03004288 = pssData.bgToggle; + gBattle_BG2_X = pssData.bgToggle; taskData[0]++; } else { - gUnknown_030042C0 = 0; + gBattle_BG1_X = 0; taskData[0]++; } break; @@ -1705,8 +1705,8 @@ void sub_809EE74(u8 taskId) case 2: if (pssData.bgToggle == 0) { - int var2 = gUnknown_03004288 + 0x20; - gUnknown_03004288 = var2; + int var2 = gBattle_BG2_X + 0x20; + gBattle_BG2_X = var2; if ((var2 << 16) == 0x1000000) { taskData[0]++; @@ -1714,8 +1714,8 @@ void sub_809EE74(u8 taskId) } else { - int var2 = gUnknown_030042C0 + 0x20; - gUnknown_030042C0 = var2; + int var2 = gBattle_BG1_X + 0x20; + gBattle_BG1_X = var2; if ((var2 << 16) == 0x1000000) { taskData[0]++; diff --git a/src/rom3.c b/src/rom3.c index dd520a839..b29bc7428 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -80,7 +80,7 @@ void setup_poochyena_battle(void) } sub_800B858(); gBattleExecBuffer = 0; - battle_anim_clear_some_data(); + ClearBattleAnimationVars(); ClearBattleMonForms(); BattleAI_HandleItemUseBeforeAISetup(); if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 347f113c3..2070ea991 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -86,16 +86,16 @@ extern u16 gBattleMonPartyPositions[]; extern u16 gBattleTypeFlags; extern u32 gTransformPersonalities[NUM_BATTLE_SLOTS]; extern u8 gBattleMonForms[NUM_BATTLE_SLOTS]; -extern u16 gUnknown_0202F7CA[]; +extern u16 gAnimSpeciesByBanks[]; extern u8 gBattleMonSprites[NUM_BATTLE_SLOTS]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s16 gBattleAnimArgs[8]; extern u8 gBanksBySide[NUM_BATTLE_SLOTS]; extern u8 gNoOfAllBanks; // gNumBattleMons? extern struct OamMatrix gOamMatrices[]; extern struct Struct_2017810 unk_2017810[]; -extern u8 gHappinessMoveAnim; +extern u8 gAnimFriendship; extern u8 UpdateMonIconFrame(struct Sprite *sprite); @@ -168,12 +168,12 @@ const struct SpriteSheet gUnknown_0837F5E0[] = { }; -u8 sub_8077ABC(u8 slot, u8 a2) { +u8 GetBankPosition(u8 slot, u8 a2) { u8 var; u16 species; struct TransformStatus *transform; - if (NotInBattle()) { + if (IsContest()) { if (a2 == 3 && slot == 3) { a2 = 1; } @@ -189,7 +189,7 @@ u8 sub_8077ABC(u8 slot, u8 a2) { case 3: case 4: default: - if (NotInBattle()) { + if (IsContest()) { if (ewram19348.unk4 & 1) { species = ewram19348.unk2; } else { @@ -229,9 +229,9 @@ u8 sub_8077BFC(u8 slot, u16 species) { u8 ret; u16 var; - if (!GetBankSide(slot) || NotInBattle()) { + if (!GetBankSide(slot) || IsContest()) { if (species == SPECIES_UNOWN) { - if (NotInBattle()) { + if (IsContest()) { if (ewram19348.unk4 & 1) { personality = ewram19348.unk10; } else { @@ -288,7 +288,7 @@ u8 sub_8077BFC(u8 slot, u16 species) { u8 sub_8077DD8(u8 slot, u16 species) { u8 ret = 0; if (GetBankSide(slot) == 1) { - if (!NotInBattle()) { + if (!IsContest()) { if (species == SPECIES_CASTFORM) { ret = gCastformElevations[gBattleMonForms[slot]]; } else if (species > NUM_SPECIES) { @@ -304,7 +304,7 @@ u8 sub_8077DD8(u8 slot, u16 species) { u8 sub_8077E44(u8 slot, u16 species, u8 a3) { u16 offset; u8 y; - if (GetBankSide(slot) == 0 || NotInBattle()) { + if (GetBankSide(slot) == 0 || IsContest()) { offset = sub_8077BFC(slot, species); } else { offset = sub_8077BFC(slot, species); @@ -324,7 +324,7 @@ u8 sub_8077EE4(u8 slot, u8 a2) { u16 species; struct TransformStatus *transform; if (a2 == 3 || a2 == 4) { - if (NotInBattle()) { + if (IsContest()) { if (ewram19348.unk4 & 1) { species = ewram19348.unk2; } else { @@ -333,7 +333,7 @@ u8 sub_8077EE4(u8 slot, u8 a2) { } else { transform = &eTransformStatuses[slot]; if (!transform->species) { - species = gUnknown_0202F7CA[slot]; + species = gAnimSpeciesByBanks[slot]; } else { species = transform->species; } @@ -344,20 +344,20 @@ u8 sub_8077EE4(u8 slot, u8 a2) { return sub_8077E44(slot, species, 0); } } else { - return sub_8077ABC(slot, a2); + return GetBankPosition(slot, a2); } } u8 sub_8077F68(u8 slot) { - return sub_8077ABC(slot, 4); + return GetBankPosition(slot, 4); } u8 sub_8077F7C(u8 slot) { u16 var; if (GetBankSide(slot)) { - var = sub_8077ABC(slot, 1) + 16; + var = GetBankPosition(slot, 1) + 16; } else { - var = sub_8077ABC(slot, 1) + 17; + var = GetBankPosition(slot, 1) + 17; } return var; } @@ -366,8 +366,8 @@ u8 sub_8077FC0(u8 slot) { u16 var; u8 r6; struct TransformStatus *transform; - r6 = sub_8077ABC(slot, 1); - if (!NotInBattle()) { + r6 = GetBankPosition(slot, 1); + if (!IsContest()) { if (GetBankSide(slot)) { transform = &eTransformStatuses[slot]; if (!transform->species) { @@ -392,29 +392,29 @@ u8 sub_8077FC0(u8 slot) { u8 GetAnimBankSpriteId(u8 whichBank) { u8 *sprites; - if (whichBank == ANIM_BANK_ATK) { - if (AnimBankSpriteExists(gBattleAnimBankAttacker)) { + if (whichBank == ANIM_BANK_ATTACKER) { + if (IsBankSpritePresent(gAnimBankAttacker)) { sprites = gBattleMonSprites; - return sprites[gBattleAnimBankAttacker]; + return sprites[gAnimBankAttacker]; } else { return 0xff; } - } else if (whichBank == ANIM_BANK_DEF) { - if (AnimBankSpriteExists(gBattleAnimBankTarget)) { + } else if (whichBank == ANIM_BANK_TARGET) { + if (IsBankSpritePresent(gAnimBankTarget)) { sprites = gBattleMonSprites; - return sprites[gBattleAnimBankTarget]; + return sprites[gAnimBankTarget]; } else { return 0xff; } } else if (whichBank == ANIM_BANK_ATK_PARTNER) { - if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) { + if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { return 0xff; } else { - return gBattleMonSprites[gBattleAnimBankAttacker ^ 2]; + return gBattleMonSprites[gAnimBankAttacker ^ 2]; } } else { - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) { - return gBattleMonSprites[gBattleAnimBankTarget ^ 2]; + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + return gBattleMonSprites[gAnimBankTarget ^ 2]; } else { return 0xff; } @@ -567,8 +567,8 @@ void sub_80783D0(struct Sprite *sprite) { void unref_sub_8078414(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sprite->callback = sub_80782F8; } @@ -613,14 +613,14 @@ void sub_8078504(struct Sprite *sprite) { void move_anim_8074EE0(struct Sprite *sprite) { FreeSpriteOamMatrix(sprite); - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void unref_sub_8078588(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_80782F8; } @@ -644,7 +644,7 @@ void sub_8078600(struct Sprite *sprite) { void sub_807861C(struct Sprite *sprite) { REG_BLDCNT = 0; REG_BLDALPHA = 0; - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } void sub_8078634(u8 task) { @@ -654,19 +654,19 @@ void sub_8078634(u8 task) { } void sub_8078650(struct Sprite *sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); } void sub_807867C(struct Sprite *sprite, s16 a2) { - u16 v1 = sub_8077ABC(gBattleAnimBankAttacker, 0); - u16 v2 = sub_8077ABC(gBattleAnimBankTarget, 0); + u16 v1 = GetBankPosition(gAnimBankAttacker, 0); + u16 v2 = GetBankPosition(gAnimBankTarget, 0); if (v1 > v2) { sprite->pos1.x -= a2; } else if (v1 < v2) { sprite->pos1.x += a2; } else { - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= a2; } else { sprite->pos1.x += a2; @@ -700,8 +700,8 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite) { void sub_8078764(struct Sprite *sprite, u8 a2) { if (!a2) { - sprite->pos1.x = sub_8077EE4(gBattleAnimBankTarget, 0); - sprite->pos1.y = sub_8077EE4(gBattleAnimBankTarget, 1); + sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 0); + sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 1); } sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; @@ -709,11 +709,11 @@ void sub_8078764(struct Sprite *sprite, u8 a2) { void sub_80787B0(struct Sprite *sprite, u8 a2) { if (!a2) { - sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 0); - sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 1); + sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0); + sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1); } else { - sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 3); + sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 2); + sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 3); } sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; @@ -737,12 +737,12 @@ u8 GetBankByPlayerAI(u8 slot) { return i; } -bool8 AnimBankSpriteExists(u8 slot) { - if (NotInBattle()) { - if (gBattleAnimBankAttacker == slot) { +bool8 IsBankSpritePresent(u8 slot) { + if (IsContest()) { + if (gAnimBankAttacker == slot) { return TRUE; } - if (gBattleAnimBankTarget == slot) { + if (gAnimBankTarget == slot) { return TRUE; } return FALSE; @@ -768,7 +768,7 @@ bool8 IsDoubleBattle() { } void sub_8078914(struct Struct_sub_8078914 *unk) { - if (NotInBattle()) { + if (IsContest()) { unk->field_0 = (u8 *)0x6008000; unk->field_4 = (u8 *)0x600f000; unk->field_8 = 0xe; @@ -780,11 +780,11 @@ void sub_8078914(struct Struct_sub_8078914 *unk) { } void sub_8078954(struct Struct_sub_8078914 *unk) { - if (NotInBattle()) { + if (IsContest()) { unk->field_0 = (u8 *)0x6008000; unk->field_4 = (u8 *)0x600f000; unk->field_8 = 0xe; - } else if (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1) { + } else if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) { unk->field_0 = (u8 *)0x6004000; unk->field_4 = (u8 *)0x600e000; unk->field_8 = 0x8; @@ -796,7 +796,7 @@ void sub_8078954(struct Struct_sub_8078914 *unk) { } u8 sub_80789BC() { - if (NotInBattle()) { + if (IsContest()) { return 1; } return 2; @@ -806,7 +806,7 @@ void sub_80789D4(bool8 a1) { if (!a1) { BG3CNT.size = 0; BG3CNT.overflow = 1; - } else if (NotInBattle()) { + } else if (IsContest()) { BG3CNT.size = 0; BG3CNT.overflow = 1; } else { @@ -1011,7 +1011,7 @@ void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) { } bool8 sub_8078E38() { - if (NotInBattle()) { + if (IsContest()) { if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */) { return FALSE; } @@ -1022,12 +1022,12 @@ bool8 sub_8078E38() { void sub_8078E70(u8 sprite, u8 a2) { u8 r7 = gSprites[sprite].data[0]; - if (NotInBattle() || IsAnimBankSpriteVisible(r7)) { + if (IsContest() || IsAnimBankSpriteVisible(r7)) { gSprites[sprite].invisible = FALSE; } gSprites[sprite].oam.objMode = a2; gSprites[sprite].affineAnimPaused = TRUE; - if (!NotInBattle() && !gSprites[sprite].oam.affineMode) { + if (!IsContest() && !gSprites[sprite].oam.affineMode) { gSprites[sprite].oam.matrixNum = ewram17810[r7].unk6; } gSprites[sprite].oam.affineMode = 3; @@ -1119,41 +1119,41 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) { u32 var = 0; u32 shift; if (a1) { - if (!NotInBattle()) { + if (!IsContest()) { var = 0xe; } else { var = 1 << sub_80789BC(); } } if (a2) { - shift = gBattleAnimBankAttacker + 16; + shift = gAnimBankAttacker + 16; var |= 1 << shift; } if (a3) { - shift = gBattleAnimBankTarget + 16; + shift = gAnimBankTarget + 16; var |= 1 << shift; } if (a4) { - if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) { - shift = (gBattleAnimBankAttacker ^ 2) + 16; + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { + shift = (gAnimBankAttacker ^ 2) + 16; var |= 1 << shift; } } if (a5) { - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) { - shift = (gBattleAnimBankTarget ^ 2) + 16; + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + shift = (gAnimBankTarget ^ 2) + 16; var |= 1 << shift; } } if (a6) { - if (!NotInBattle()) { + if (!IsContest()) { var |= 0x100; } else { var |= 0x4000; } } if (a7) { - if (!NotInBattle()) { + if (!IsContest()) { var |= 0x200; } } @@ -1163,7 +1163,7 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) { u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) { u32 var = 0; u32 shift; - if (NotInBattle()) { + if (IsContest()) { if (a1) { var |= 1 << 18; return var; @@ -1238,24 +1238,24 @@ void sub_807941C(struct Sprite *sprite) { v2 = 1; } sub_80787B0(sprite, v1); - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, v2) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, v2) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_80794A8(struct Sprite *sprite) { sub_80787B0(sprite, 1); - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); sprite->callback = sub_8079518; @@ -1263,7 +1263,7 @@ void sub_80794A8(struct Sprite *sprite) { void sub_8079518(struct Sprite *sprite) { if (sub_8078718(sprite)) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -1278,20 +1278,20 @@ void sub_8079534(struct Sprite *sprite) { } if (!gBattleAnimArgs[5]) { sub_80787B0(sprite, r4); - slot = gBattleAnimBankAttacker; + slot = gAnimBankAttacker; } else { sub_8078764(sprite, r4); - slot = gBattleAnimBankTarget; + slot = gAnimBankTarget; } - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sub_8078764(sprite, r4); sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = sub_8077ABC(slot, 2) + gBattleAnimArgs[2]; - sprite->data[4] = sub_8077ABC(slot, r7) + gBattleAnimArgs[3]; + sprite->data[2] = GetBankPosition(slot, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(slot, r7) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1) { @@ -1524,7 +1524,7 @@ u16 sub_8079B10(u8 sprite) { u16 i; for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) { if (gBattleMonSprites[i] == sprite) { - if (NotInBattle()) { + if (IsContest()) { species = ewram19348.unk0; return gMonBackPicCoords[species].y_offset; } else { @@ -1596,11 +1596,11 @@ u8 sub_8079C74(struct Task *task) { void sub_8079CEC(u8 task) { u16 v1; - if (gHappinessMoveAnim <= 30) { + if (gAnimFriendship <= 30) { v1 = 0; - } else if (gHappinessMoveAnim <= 100) { + } else if (gAnimFriendship <= 100) { v1 = 1; - } else if (gHappinessMoveAnim <= 200) { + } else if (gAnimFriendship <= 200) { v1 = 2; } else { v1 = 3; @@ -1610,17 +1610,17 @@ void sub_8079CEC(u8 task) { } void unref_sub_8079D20(u8 priority) { - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget)) { - gSprites[gBattleMonSprites[gBattleAnimBankTarget]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gAnimBankTarget)) { + gSprites[gBattleMonSprites[gAnimBankTarget]].oam.priority = priority; } - if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker)) { - gSprites[gBattleMonSprites[gBattleAnimBankAttacker]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gAnimBankAttacker)) { + gSprites[gBattleMonSprites[gAnimBankAttacker]].oam.priority = priority; } - if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) { - gSprites[gBattleMonSprites[gBattleAnimBankTarget ^ 2]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + gSprites[gBattleMonSprites[gAnimBankTarget ^ 2]].oam.priority = priority; } - if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) { - gSprites[gBattleMonSprites[gBattleAnimBankAttacker ^ 2]].oam.priority = priority; + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { + gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority; } } @@ -1637,7 +1637,7 @@ void sub_8079E24() { u8 sub_8079E90(u8 slot) { u8 status; u8 ret; - if (NotInBattle()) { + if (IsContest()) { if (slot == 2) { return 30; } else { @@ -1660,7 +1660,7 @@ u8 sub_8079E90(u8 slot) { u8 sub_8079ED4(u8 slot) { u8 status = GetBankIdentity(slot); - if (NotInBattle()) { + if (IsContest()) { return 2; } if (status == 0 || status == 3) { @@ -1672,7 +1672,7 @@ u8 sub_8079ED4(u8 slot) { u8 GetBankIdentity_permutated(u8 slot) { u8 status; - if (!NotInBattle()) { + if (!IsContest()) { status = GetBankIdentity(slot); if (status == 0 || status == 3) { return 2; @@ -1728,7 +1728,7 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, } else { sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6); } - if (NotInBattle()) { + if (IsContest()) { gSprites[sprite].affineAnims = gSpriteAffineAnimTable_81E7C18; StartSpriteAffineAnim(&gSprites[sprite], 0); } @@ -1747,7 +1747,7 @@ int sub_807A100(u8 slot, u8 a2) { int ret; const struct MonCoords *coords; struct TransformStatus *transform; - if (NotInBattle()) { + if (IsContest()) { if (ewram19348.unk4 & 1) { species = ewram19348.unk2; personality = ewram19348.unk10; @@ -1826,15 +1826,15 @@ int sub_807A100(u8 slot, u8 a2) { case 1: return (coords->coords >> 4) * 8; case 4: - return sub_8077ABC(slot, 2) - ((coords->coords >> 4) * 4); + return GetBankPosition(slot, 2) - ((coords->coords >> 4) * 4); case 5: - return sub_8077ABC(slot, 2) + ((coords->coords >> 4) * 4); + return GetBankPosition(slot, 2) + ((coords->coords >> 4) * 4); case 2: - return sub_8077ABC(slot, 3) - ((coords->coords & 0xf) * 4); + return GetBankPosition(slot, 3) - ((coords->coords & 0xf) * 4); case 3: - return sub_8077ABC(slot, 3) + ((coords->coords & 0xf) * 4); + return GetBankPosition(slot, 3) + ((coords->coords & 0xf) * 4); case 6: - ret = sub_8077ABC(slot, 1) + 0x1f; + ret = GetBankPosition(slot, 1) + 0x1f; return ret - coords->y_offset; default: return 0; @@ -1852,11 +1852,11 @@ void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) { v1 = 2; v2 = 3; } - v3 = sub_8077ABC(slot, v1); - v4 = sub_8077ABC(slot, v2); - if (IsDoubleBattle() && !NotInBattle()) { - v5 = sub_8077ABC(slot ^ 2, v1); - v6 = sub_8077ABC(slot ^ 2, v2); + v3 = GetBankPosition(slot, v1); + v4 = GetBankPosition(slot, v2); + if (IsDoubleBattle() && !IsContest()) { + v5 = GetBankPosition(slot ^ 2, v1); + v6 = GetBankPosition(slot ^ 2, v2); } else { v5 = v3; v6 = v4; @@ -1878,7 +1878,7 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3) { void sub_807A544(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; sprite->hFlip = TRUE; @@ -1895,7 +1895,7 @@ void sub_807A544(struct Sprite *sprite) { } void sub_807A5C4(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] *= -1; } else { @@ -1913,14 +1913,14 @@ void sub_807A5C4(struct Sprite *sprite) { void sub_807A63C(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBankSide(gBattleAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; } else { sprite->pos1.x += gBattleAnimArgs[0]; } sprite->pos1.y += gBattleAnimArgs[1]; sprite->callback = sub_8078600; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } void sub_807A69C(u8 taskId) { @@ -1928,7 +1928,7 @@ void sub_807A69C(u8 taskId) { u16 dest; struct Task *task = &gTasks[taskId]; task->data[0] = GetAnimBankSpriteId(0); - task->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? -8 : 8; + task->data[1] = (GetBankSide(gAnimBankAttacker)) ? -8 : 8; task->data[2] = 0; task->data[3] = 0; gSprites[task->data[0]].pos2.x -= task->data[0]; @@ -1937,7 +1937,7 @@ void sub_807A69C(u8 taskId) { dest = (task->data[4] + 0x10) * 0x10; src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10; - task->data[6] = sub_8079E90(gBattleAnimBankAttacker); + task->data[6] = sub_8079E90(gAnimBankAttacker); if (task->data[6] == 20 || task->data[6] == 40) { task->data[6] = 2; } else { @@ -1998,9 +1998,9 @@ void sub_807A8D4(struct Sprite *sprite) { } void sub_807A908(struct Sprite *sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - if (!GetBankSide(gBattleAnimBankAttacker)) { + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + if (!GetBankSide(gAnimBankAttacker)) { sprite->data[0] = 5; } else { sprite->data[0] = -10; @@ -2018,7 +2018,7 @@ void sub_807A960(struct Sprite *sprite) { sprite->data[1]++; } if ((sprite->pos1.y + sprite->pos2.y) < -32) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } @@ -2027,7 +2027,7 @@ void sub_807A9BC(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4]; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5]; - if (!GetBankSide(gBattleAnimBankTarget)) { + if (!GetBankSide(gAnimBankTarget)) { x = (u16)gBattleAnimArgs[4] + 30; sprite->pos1.x += x; sprite->pos1.y = gBattleAnimArgs[5] - 20; @@ -2037,5 +2037,5 @@ void sub_807A9BC(struct Sprite *sprite) { sprite->pos1.y = gBattleAnimArgs[5] - 80; } sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index e0b42e1c7..f307f5979 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -67,10 +67,10 @@ bool32 IsHMMove2(u16 move); extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A4; extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042C0; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_03004288; -extern u16 gUnknown_03004280; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; extern u16 gUnknown_030041B0; extern u16 gUnknown_030041B8; extern u8 gBattleTerrain; @@ -202,10 +202,10 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; @@ -310,10 +310,10 @@ static void CB2_EvolutionSceneLoadGraphics(void) ResetPaletteFade(); gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; @@ -364,10 +364,10 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gReservedSpritePaletteCount = 4; gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - gUnknown_030042C0 = 0; - gUnknown_030041B4 = 0; - gUnknown_03004288 = 0; - gUnknown_03004280 = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; gMain.state++; @@ -3925,10 +3925,10 @@ static void VBlankCB_EvolutionScene(void) REG_BG0CNT = BGCNT_SCREENBASE(24) | BGCNT_16COLOR | BGCNT_TXT256x256 | BGCNT_AFF512x512 | BGCNT_PRIORITY(3); // 0x9803 REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; LoadOam(); @@ -3941,10 +3941,10 @@ static void VBlankCB_TradeEvolutionScene(void) { REG_BG0HOFS = gUnknown_030042A4; REG_BG0VOFS = gUnknown_030042A0; - REG_BG1HOFS = gUnknown_030042C0; - REG_BG1VOFS = gUnknown_030041B4; - REG_BG2HOFS = gUnknown_03004288; - REG_BG2VOFS = gUnknown_03004280; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; REG_BG3HOFS = gUnknown_030041B0; REG_BG3VOFS = gUnknown_030041B8; LoadOam(); diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index f158500fe..26fe088d5 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -41,8 +41,8 @@ extern u8 gReservedSpritePaletteCount; extern struct MusicPlayerInfo gMPlay_BGM; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; extern const u8 gUnknown_08E9D8CC[]; extern const u16 gUnknown_08E9F624[]; extern const u8 gUnknown_08E9F7E4[]; @@ -602,7 +602,7 @@ static void VBlankCB(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - REG_BG1VOFS = gUnknown_030041B4; + REG_BG1VOFS = gBattle_BG1_Y; } @@ -836,8 +836,8 @@ static void Task_TitleScreenPhase3(u8 taskId) if (gTasks[taskId].tCounter & 1) { gTasks[taskId].data[4]++; - gUnknown_030041B4 = gTasks[taskId].data[4]; - gUnknown_030042C0 = 0; + gBattle_BG1_Y = gTasks[taskId].data[4]; + gBattle_BG1_X = 0; } UpdateLegendaryMarkingColor(gTasks[taskId].tCounter); if ((gMPlay_BGM.status & 0xFFFF) == 0) diff --git a/src/unknown_task.c b/src/unknown_task.c index 0cc59fc66..c9ba95d42 100644 --- a/src/unknown_task.c +++ b/src/unknown_task.c @@ -8,13 +8,13 @@ static void sub_80896F4(void); static void sub_8089714(void); extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_X; extern u8 gUnknown_0202FFA4; @@ -125,16 +125,16 @@ static void task00_for_dp12(u8 taskId) value = gUnknown_030042A0; break; case 0x4: - value = gUnknown_030042C0; + value = gBattle_BG1_X; break; case 0x6: - value = gUnknown_030041B4; + value = gBattle_BG1_Y; break; case 0x8: - value = gUnknown_03004288; + value = gBattle_BG2_X; break; case 0xA: - value = gUnknown_03004280; + value = gBattle_BG2_Y; break; case 0xC: value = gUnknown_030041B0; diff --git a/sym_common.txt b/sym_common.txt index e271074d4..87b411ff4 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -11,7 +11,7 @@ gUnknown_030041B0: @ 30041B0 .space 0x4 -gUnknown_030041B4: @ 30041B4 +gBattle_BG1_Y: @ 30041B4 .space 0x4 gUnknown_030041B8: @ 30041B8 @@ -23,28 +23,28 @@ gBattleTextBuff1: @ 30041C0 gUnknown_030041D0: @ 30041D0 .space 0x30 -gUnknown_03004200: @ 3004200 +gBattle_WIN1H: @ 3004200 .space 0x10 gUnknown_03004210: @ 3004210 .space 0x30 -gUnknown_03004240: @ 3004240 +gBattle_WIN0V: @ 3004240 .space 0x4 -gUnknown_03004244: @ 3004244 +gBattle_WIN1V: @ 3004244 .space 0xC gUnknown_03004250: @ 3004250 .space 0x30 -gUnknown_03004280: @ 3004280 +gBattle_BG2_Y: @ 3004280 .space 0x4 gUnknown_03004284: @ 3004284 .space 0x4 -gUnknown_03004288: @ 3004288 +gBattle_BG2_X: @ 3004288 .space 0x4 gBattleTerrain: @ 300428C @@ -62,10 +62,10 @@ gUnknown_030042A4: @ 30042A4 gBattleTextBuff3: @ 30042B0 .space 0x10 -gUnknown_030042C0: @ 30042C0 +gBattle_BG1_X: @ 30042C0 .space 0x4 -gUnknown_030042C4: @ 30042C4 +gBattle_WIN0H: @ 30042C4 .space 0xC gPreBattleCallback1: @ 30042D0 |