diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_anim_812C144.s | 62 | ||||
| -rw-r--r-- | asm/battle_anim_813F0F4.s | 74 | ||||
| -rw-r--r-- | asm/current.s | 10 | ||||
| -rw-r--r-- | asm/fight.s | 1749 | ||||
| -rw-r--r-- | asm/flying.s | 28 | ||||
| -rw-r--r-- | asm/ghost.s | 12 | ||||
| -rw-r--r-- | asm/ground.s | 20 | ||||
| -rw-r--r-- | asm/ice.s | 46 | ||||
| -rw-r--r-- | asm/normal.s | 46 | ||||
| -rw-r--r-- | asm/unk_text_8095904.s | 256 | ||||
| -rw-r--r-- | asm/water.s | 6 |
11 files changed, 152 insertions, 2157 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 03ffc0eda..dd0e9bac1 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -262,7 +262,7 @@ _0812C31A: strh r0, [r5, 0x2E] strh r7, [r5, 0x32] strh r6, [r5, 0x36] - ldr r0, _0812C350 @ =sub_8078B34 + ldr r0, _0812C350 @ =StartTranslateAnimSpriteByDeltas str r0, [r5, 0x1C] ldr r1, _0812C354 @ =DestroyAnimSprite adds r0, r5, 0 @@ -274,7 +274,7 @@ _0812C31A: .align 2, 0 _0812C348: .4byte gAnimBankTarget _0812C34C: .4byte gBattleAnimArgs -_0812C350: .4byte sub_8078B34 +_0812C350: .4byte StartTranslateAnimSpriteByDeltas _0812C354: .4byte DestroyAnimSprite thumb_func_end sub_812C2BC @@ -795,7 +795,7 @@ sub_812C720: @ 812C720 sub sp, 0x4 adds r4, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r0, _0812C784 @ =gAnimBankTarget ldrb r0, [r0] mov r5, sp @@ -803,7 +803,7 @@ sub_812C720: @ 812C720 movs r1, 0 mov r2, sp adds r3, r5, 0 - bl sub_807A3FC + bl SetAverageBattlerPositions ldr r0, _0812C788 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide @@ -849,7 +849,7 @@ _0812C794: .4byte sub_812C798 sub_812C798: @ 812C798 push {r4,lr} adds r4, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _0812C7BA @@ -2301,7 +2301,7 @@ sub_812D294: @ 812D294 bne _0812D2A8 adds r0, r5, 0 movs r1, 0 - bl sub_80787B0 + bl InitAnimSpritePos _0812D2A8: ldrh r0, [r5, 0x2E] adds r0, 0x1 @@ -2376,7 +2376,7 @@ _0812D2F0: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _0812D34C @ =sub_8078B34 + ldr r0, _0812D34C @ =StartTranslateAnimSpriteByDeltas str r0, [r5, 0x1C] _0812D33C: pop {r4,r5} @@ -2385,7 +2385,7 @@ _0812D33C: .align 2, 0 _0812D344: .4byte DestroyAnimSprite _0812D348: .4byte gAnimBankTarget -_0812D34C: .4byte sub_8078B34 +_0812D34C: .4byte StartTranslateAnimSpriteByDeltas thumb_func_end sub_812D294 thumb_func_start sub_812D350 @@ -2915,7 +2915,7 @@ sub_812D724: @ 812D724 _0812D736: adds r0, r4, 0 movs r1, 0 - bl sub_80787B0 + bl InitAnimSpritePos movs r0, 0x90 lsls r0, 4 strh r0, [r4, 0x30] @@ -3227,7 +3227,7 @@ _0812D9A2: cmp r0, 0 beq _0812D9F0 ldr r3, _0812D9E4 @ =gSprites - ldr r4, _0812D9E8 @ =gObjectBankIDs + ldr r4, _0812D9E8 @ =gBankSpriteIds ldr r2, _0812D9D4 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r4 @@ -3248,11 +3248,11 @@ _0812D9D8: .4byte 0x040000d4 _0812D9DC: .4byte 0x84000200 _0812D9E0: .4byte gSharedMem + 0x19348 _0812D9E4: .4byte gSprites -_0812D9E8: .4byte gObjectBankIDs +_0812D9E8: .4byte gBankSpriteIds _0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18 _0812D9F0: ldr r3, _0812DA34 @ =gSprites - ldr r4, _0812DA38 @ =gObjectBankIDs + ldr r4, _0812DA38 @ =gBankSpriteIds ldr r2, _0812DA3C @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r4 @@ -3288,7 +3288,7 @@ _0812DA2A: b _0812DAFA .align 2, 0 _0812DA34: .4byte gSprites -_0812DA38: .4byte gObjectBankIDs +_0812DA38: .4byte gBankSpriteIds _0812DA3C: .4byte gAnimBankAttacker _0812DA40: .4byte gSpriteAffineAnimTable_81E7BEC _0812DA44: .4byte gTasks @@ -3401,7 +3401,7 @@ c3_80DFBE4: @ 812DB18 lsrs r0, 24 ldr r4, _0812DB48 @ =gBattleAnimArgs ldr r3, _0812DB4C @ =gSprites - ldr r2, _0812DB50 @ =gObjectBankIDs + ldr r2, _0812DB50 @ =gBankSpriteIds ldr r1, _0812DB54 @ =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 @@ -3422,7 +3422,7 @@ c3_80DFBE4: @ 812DB18 .align 2, 0 _0812DB48: .4byte gBattleAnimArgs _0812DB4C: .4byte gSprites -_0812DB50: .4byte gObjectBankIDs +_0812DB50: .4byte gBankSpriteIds _0812DB54: .4byte gAnimBankAttacker thumb_func_end c3_80DFBE4 @@ -4626,7 +4626,7 @@ sub_812E4F0: @ 812E4F0 bne _0812E50E adds r0, r4, 0 movs r1, 0 - bl sub_80787B0 + bl InitAnimSpritePos ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -7672,7 +7672,7 @@ sub_812FC68: @ 812FC68 lsls r0, 3 mov r1, r8 adds r4, r0, r1 - ldr r1, _0812FCCC @ =gObjectBankIDs + ldr r1, _0812FCCC @ =gBankSpriteIds ldr r2, _0812FCD0 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r1 @@ -7709,7 +7709,7 @@ _0812FCAC: b _0812FD4C .align 2, 0 _0812FCC8: .4byte gTasks -_0812FCCC: .4byte gObjectBankIDs +_0812FCCC: .4byte gBankSpriteIds _0812FCD0: .4byte gAnimBankAttacker _0812FCD4: .4byte gBattleAnimArgs _0812FCD8: .4byte 0xffff8000 @@ -9023,7 +9023,7 @@ _081306D6: lsls r0, 2 ldr r1, _08130708 @ =gSprites adds r0, r1 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] @@ -9042,7 +9042,7 @@ _0813070C: lsls r0, 2 ldr r1, _0813072C @ =gSprites adds r0, r1 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _081307AA @@ -10151,7 +10151,7 @@ sub_8130F5C: @ 8130F5C bne _08130F80 adds r0, r4, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r0, _08130F7C @ =gAnimBankAttacker b _08130F82 .align 2, 0 @@ -10356,11 +10356,11 @@ _081310FA: strh r0, [r4, 0x34] strh r1, [r4, 0x36] adds r0, r4, 0 - bl obj_translate_based_on_private_1_2_3_4 + bl InitAnimSpriteTranslationDeltas b _081311CA _08131110: adds r0, r4, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas lsls r0, 24 cmp r0, 0 beq _081311DE @@ -10694,7 +10694,7 @@ _08131384: cmp r0, 0 beq _081313C6 ldr r3, _081313F8 @ =gSprites - ldr r2, _081313FC @ =gObjectBankIDs + ldr r2, _081313FC @ =gBankSpriteIds ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -10744,7 +10744,7 @@ _081313E8: .align 2, 0 _081313F4: .4byte gAnimBankAttacker _081313F8: .4byte gSprites -_081313FC: .4byte gObjectBankIDs +_081313FC: .4byte gBankSpriteIds _08131400: .4byte gSpriteAffineAnimTable_81E7C18 _08131404: .4byte sub_8131408 thumb_func_end sub_81312E4 @@ -12326,7 +12326,7 @@ _08132084: .4byte gAnimBankAttacker _08132088: .4byte gAnimBankTarget _0813208C: .4byte gTasks _08132090: - ldr r1, _081320CC @ =gObjectBankIDs + ldr r1, _081320CC @ =gBankSpriteIds ldr r0, _081320D0 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 @@ -12357,7 +12357,7 @@ _08132090: ldrsh r1, [r2, r3] b _0813215E .align 2, 0 -_081320CC: .4byte gObjectBankIDs +_081320CC: .4byte gBankSpriteIds _081320D0: .4byte gAnimBankAttacker _081320D4: .4byte gSprites _081320D8: @@ -12385,7 +12385,7 @@ _081320EC: strh r1, [r0, 0x26] b _08132188 _08132104: - ldr r1, _08132144 @ =gObjectBankIDs + ldr r1, _08132144 @ =gBankSpriteIds ldr r0, _08132148 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 @@ -12418,7 +12418,7 @@ _08132104: bgt _08132188 b _08132162 .align 2, 0 -_08132144: .4byte gObjectBankIDs +_08132144: .4byte gBankSpriteIds _08132148: .4byte gAnimBankAttacker _0813214C: .4byte gSprites _08132150: @@ -12438,7 +12438,7 @@ _08132162: strh r0, [r2, 0x26] b _08132188 _0813216A: - ldr r1, _08132190 @ =gObjectBankIDs + ldr r1, _08132190 @ =gBankSpriteIds ldr r0, _08132194 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 @@ -12457,7 +12457,7 @@ _08132188: pop {r0} bx r0 .align 2, 0 -_08132190: .4byte gObjectBankIDs +_08132190: .4byte gBankSpriteIds _08132194: .4byte gAnimBankAttacker _08132198: .4byte gSprites thumb_func_end sub_8131FFC diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index ccb4854af..d7172bde6 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -818,7 +818,7 @@ sub_813F798: @ 813F798 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0813F7C4 @ =gObjectBankIDs + ldr r1, _0813F7C4 @ =gBankSpriteIds ldr r0, _0813F7C8 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 @@ -838,7 +838,7 @@ sub_813F798: @ 813F798 beq _0813F7D6 b _0813F838 .align 2, 0 -_0813F7C4: .4byte gObjectBankIDs +_0813F7C4: .4byte gBankSpriteIds _0813F7C8: .4byte gAnimBankAttacker _0813F7CC: .4byte gTasks _0813F7D0: @@ -909,7 +909,7 @@ sub_813F844: @ 813F844 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0813F87C @ =gObjectBankIDs + ldr r1, _0813F87C @ =gBankSpriteIds ldr r4, _0813F880 @ =gAnimBankAttacker ldrb r0, [r4] adds r1, r0, r1 @@ -929,7 +929,7 @@ sub_813F844: @ 813F844 ldr r1, _0813F888 @ =gPlayerParty b _0813F89C .align 2, 0 -_0813F87C: .4byte gObjectBankIDs +_0813F87C: .4byte gBankSpriteIds _0813F880: .4byte gAnimBankAttacker _0813F884: .4byte gBattlePartyID _0813F888: .4byte gPlayerParty @@ -1256,7 +1256,7 @@ sub_813FA94: @ 813FA94 ldr r0, _0813FB68 @ =sub_813FD90 str r0, [r4] ldr r3, _0813FB6C @ =gSharedMem + 0x17840 - ldr r1, _0813FB70 @ =gObjectBankIDs + ldr r1, _0813FB70 @ =gBankSpriteIds mov r2, r8 ldrb r0, [r2] adds r0, r1 @@ -1299,7 +1299,7 @@ _0813FB60: .4byte gSprites _0813FB64: .4byte gAnimBankTarget _0813FB68: .4byte sub_813FD90 _0813FB6C: .4byte gSharedMem + 0x17840 -_0813FB70: .4byte gObjectBankIDs +_0813FB70: .4byte gBankSpriteIds _0813FB74: .4byte gTasks _0813FB78: .4byte sub_813FB7C thumb_func_end sub_813FA94 @@ -1419,7 +1419,7 @@ _0813FBE0: str r0, [r4] movs r0, 0 bl GetBankByIdentity - ldr r1, _0813FCB0 @ =gObjectBankIDs + ldr r1, _0813FCB0 @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -1450,7 +1450,7 @@ _0813FCA0: .4byte gBallSpriteTemplates _0813FCA4: .4byte gSprites _0813FCA8: .4byte gAnimBankTarget _0813FCAC: .4byte SpriteCallbackDummy -_0813FCB0: .4byte gObjectBankIDs +_0813FCB0: .4byte gBankSpriteIds _0813FCB4: .4byte gTasks _0813FCB8: .4byte sub_813FCBC thumb_func_end sub_813FBB8 @@ -1463,7 +1463,7 @@ sub_813FCBC: @ 813FCBC ldr r6, _0813FD1C @ =gSprites movs r0, 0 bl GetBankByIdentity - ldr r1, _0813FD20 @ =gObjectBankIDs + ldr r1, _0813FD20 @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -1505,7 +1505,7 @@ _0813FD16: bx r0 .align 2, 0 _0813FD1C: .4byte gSprites -_0813FD20: .4byte gObjectBankIDs +_0813FD20: .4byte gBankSpriteIds _0813FD24: .4byte gTasks _0813FD28: .4byte sub_813FD90 _0813FD2C: .4byte sub_813FD34 @@ -1520,7 +1520,7 @@ sub_813FD34: @ 813FD34 ldr r6, _0813FD88 @ =gSprites movs r0, 0 bl GetBankByIdentity - ldr r4, _0813FD8C @ =gObjectBankIDs + ldr r4, _0813FD8C @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -1554,7 +1554,7 @@ _0813FD80: bx r0 .align 2, 0 _0813FD88: .4byte gSprites -_0813FD8C: .4byte gObjectBankIDs +_0813FD8C: .4byte gBankSpriteIds thumb_func_end sub_813FD34 thumb_func_start sub_813FD90 @@ -1588,7 +1588,7 @@ sub_813FDC0: @ 813FDC0 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _0813FE5A @@ -1688,7 +1688,7 @@ sub_813FE70: @ 813FE70 ldr r0, _0813FEB8 @ =sub_813FEC8 str r0, [r4, 0x1C] ldr r2, _0813FEBC @ =gSprites - ldr r1, _0813FEC0 @ =gObjectBankIDs + ldr r1, _0813FEC0 @ =gBankSpriteIds ldr r0, _0813FEC4 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 @@ -1707,7 +1707,7 @@ _0813FEAC: _0813FEB4: .4byte TaskDummy _0813FEB8: .4byte sub_813FEC8 _0813FEBC: .4byte gSprites -_0813FEC0: .4byte gObjectBankIDs +_0813FEC0: .4byte gBankSpriteIds _0813FEC4: .4byte gAnimBankTarget thumb_func_end sub_813FE70 @@ -1715,7 +1715,7 @@ _0813FEC4: .4byte gAnimBankTarget sub_813FEC8: @ 813FEC8 push {r4-r7,lr} adds r7, r0, 0 - ldr r1, _0813FF0C @ =gObjectBankIDs + ldr r1, _0813FF0C @ =gBankSpriteIds ldr r0, _0813FF10 @ =gAnimBankTarget ldrb r0, [r0] adds r0, r1 @@ -1748,7 +1748,7 @@ _0813FEFA: beq _0813FF1E b _0813FFDC .align 2, 0 -_0813FF0C: .4byte gObjectBankIDs +_0813FF0C: .4byte gBankSpriteIds _0813FF10: .4byte gAnimBankTarget _0813FF14: .4byte gTasks _0813FF18: @@ -2478,7 +2478,7 @@ _08140490: cmp r1, r0 bne _081404CC ldr r5, _081404D8 @ =gSprites - ldr r4, _081404DC @ =gObjectBankIDs + ldr r4, _081404DC @ =gBankSpriteIds ldrb r0, [r7] adds r0, r4 ldrb r1, [r0] @@ -2509,7 +2509,7 @@ _081404CC: .align 2, 0 _081404D4: .4byte 0x0000013b _081404D8: .4byte gSprites -_081404DC: .4byte gObjectBankIDs +_081404DC: .4byte gBankSpriteIds _081404E0: .4byte sub_81404E4 thumb_func_end sub_8140454 @@ -2697,7 +2697,7 @@ sub_81405F4: @ 81405F4 bl sub_8141314 _08140646: ldr r6, _081406B4 @ =gSprites - ldr r5, _081406B8 @ =gObjectBankIDs + ldr r5, _081406B8 @ =gBankSpriteIds ldr r4, _081406B0 @ =gAnimBankTarget ldrb r0, [r4] adds r0, r5 @@ -2748,7 +2748,7 @@ _081406A8: .4byte sub_81406BC _081406AC: .4byte gLastUsedItem _081406B0: .4byte gAnimBankTarget _081406B4: .4byte gSprites -_081406B8: .4byte gObjectBankIDs +_081406B8: .4byte gBankSpriteIds thumb_func_end sub_81405F4 thumb_func_start sub_81406BC @@ -2770,7 +2770,7 @@ sub_81406BC: @ 81406BC strb r0, [r2] _081406DA: ldr r4, _08140708 @ =gSprites - ldr r3, _0814070C @ =gObjectBankIDs + ldr r3, _0814070C @ =gBankSpriteIds ldr r2, _08140710 @ =gAnimBankTarget ldrb r0, [r2] adds r0, r3 @@ -2792,7 +2792,7 @@ _081406DA: b _08140734 .align 2, 0 _08140708: .4byte gSprites -_0814070C: .4byte gObjectBankIDs +_0814070C: .4byte gBankSpriteIds _08140710: .4byte gAnimBankTarget _08140714: ldr r6, _0814079C @ =0xfffffee0 @@ -2822,7 +2822,7 @@ _08140734: cmp r5, 0 beq _08140796 ldr r4, _081407A0 @ =gSprites - ldr r3, _081407A4 @ =gObjectBankIDs + ldr r3, _081407A4 @ =gBankSpriteIds ldr r2, _081407A8 @ =gAnimBankTarget ldrb r0, [r2] adds r0, r3 @@ -2867,7 +2867,7 @@ _08140796: .align 2, 0 _0814079C: .4byte 0xfffffee0 _081407A0: .4byte gSprites -_081407A4: .4byte gObjectBankIDs +_081407A4: .4byte gBankSpriteIds _081407A8: .4byte gAnimBankTarget _081407AC: .4byte gSharedMem + 0x17840 _081407B0: .4byte sub_81405C8 @@ -4581,7 +4581,7 @@ sub_814151C: @ 814151C lsrs r7, r0, 24 movs r0, 0 mov r8, r0 - ldr r0, _08141550 @ =gObjectBankIDs + ldr r0, _08141550 @ =gBankSpriteIds ldr r3, _08141554 @ =gAnimBankAttacker ldrb r2, [r3] adds r0, r2, r0 @@ -4601,7 +4601,7 @@ sub_814151C: @ 814151C beq _08141562 b _081416B6 .align 2, 0 -_08141550: .4byte gObjectBankIDs +_08141550: .4byte gBankSpriteIds _08141554: .4byte gAnimBankAttacker _08141558: .4byte gTasks _0814155C: @@ -4882,7 +4882,7 @@ _08141744: .align 2, 0 _08141778: .4byte REG_BLDALPHA _0814177C: - ldr r1, _081417C0 @ =gObjectBankIDs + ldr r1, _081417C0 @ =gBankSpriteIds ldr r3, _081417C4 @ =gAnimBankAttacker ldrb r0, [r3] adds r0, r1 @@ -4916,7 +4916,7 @@ _081417B8: pop {r0} bx r0 .align 2, 0 -_081417C0: .4byte gObjectBankIDs +_081417C0: .4byte gBankSpriteIds _081417C4: .4byte gAnimBankAttacker _081417C8: .4byte gSprites _081417CC: .4byte 0x06010000 @@ -5479,7 +5479,7 @@ sub_8141C30: @ 8141C30 push {r4,r5,lr} adds r4, r0, 0 movs r1, 0 - bl sub_80787B0 + bl InitAnimSpritePos movs r0, 0x1E strh r0, [r4, 0x2E] movs r0, 0x1 @@ -5509,7 +5509,7 @@ sub_8141C30: @ 8141C30 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80786EC - ldr r1, _08141CAC @ =gObjectBankIDs + ldr r1, _08141CAC @ =gBankSpriteIds ldr r0, _08141CB0 @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 @@ -5529,7 +5529,7 @@ sub_8141C30: @ 8141C30 .align 2, 0 _08141CA4: .4byte gBattleAnimArgs _08141CA8: .4byte 0x0000ffe0 -_08141CAC: .4byte gObjectBankIDs +_08141CAC: .4byte gBankSpriteIds _08141CB0: .4byte gAnimBankAttacker _08141CB4: .4byte gSprites _08141CB8: .4byte sub_8141CBC @@ -5540,7 +5540,7 @@ sub_8141CBC: @ 8141CBC push {lr} adds r3, r0, 0 ldr r2, _08141CE4 @ =gSprites - ldr r1, _08141CE8 @ =gObjectBankIDs + ldr r1, _08141CE8 @ =gBankSpriteIds ldr r0, _08141CEC @ =gAnimBankAttacker ldrb r0, [r0] adds r0, r1 @@ -5560,7 +5560,7 @@ _08141CE0: bx r0 .align 2, 0 _08141CE4: .4byte gSprites -_08141CE8: .4byte gObjectBankIDs +_08141CE8: .4byte gBankSpriteIds _08141CEC: .4byte gAnimBankAttacker _08141CF0: .4byte sub_8141CF4 thumb_func_end sub_8141CBC @@ -5569,7 +5569,7 @@ _08141CF0: .4byte sub_8141CF4 sub_8141CF4: @ 8141CF4 push {r4,lr} adds r4, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _08141D16 @@ -5596,7 +5596,7 @@ sub_8141D20: @ 8141D20 push {r4,r5,lr} adds r4, r0, 0 ldr r5, _08141D70 @ =gSprites - ldr r3, _08141D74 @ =gObjectBankIDs + ldr r3, _08141D74 @ =gBankSpriteIds ldr r2, _08141D78 @ =gAnimBankAttacker ldrb r0, [r2] adds r0, r3 @@ -5633,7 +5633,7 @@ _08141D68: bx r0 .align 2, 0 _08141D70: .4byte gSprites -_08141D74: .4byte gObjectBankIDs +_08141D74: .4byte gBankSpriteIds _08141D78: .4byte gAnimBankAttacker thumb_func_end sub_8141D20 diff --git a/asm/current.s b/asm/current.s index 4ef537dc3..69927ea23 100644 --- a/asm/current.s +++ b/asm/current.s @@ -12,7 +12,7 @@ sub_80D648C: @ 80D648C push {r4-r6,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r5, _080D6500 @ =gBattleAnimArgs ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] @@ -34,7 +34,7 @@ sub_80D648C: @ 80D648C lsrs r0, 24 strh r0, [r4, 0x36] adds r0, r4, 0 - bl obj_translate_based_on_private_1_2_3_4 + bl InitAnimSpriteTranslationDeltas ldrh r0, [r5, 0x4] strh r0, [r4, 0x38] ldrh r0, [r5, 0xA] @@ -74,7 +74,7 @@ _080D6510: .4byte sub_80D6514 sub_80D6514: @ 80D6514 push {r4,lr} adds r4, r0, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas lsls r0, 24 cmp r0, 0 bne _080D657E @@ -998,7 +998,7 @@ sub_80D6BB8: @ 80D6BB8 strh r0, [r4, 0x36] strh r6, [r4, 0x38] adds r0, r4, 0 - bl obj_translate_based_on_private_1_2_3_4 + bl InitAnimSpriteTranslationDeltas ldr r1, _080D6CB0 @ =sub_80D6D00 adds r0, r4, 0 bl StoreSpriteCallbackInData @@ -1062,7 +1062,7 @@ _080D6CC6: sub_80D6CCC: @ 80D6CCC push {r4,lr} adds r4, r0, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas lsls r0, 24 cmp r0, 0 beq _080D6CF4 diff --git a/asm/fight.s b/asm/fight.s deleted file mode 100644 index e8e3299af..000000000 --- a/asm/fight.s +++ /dev/null @@ -1,1749 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - @ fight - - thumb_func_start unc_080B08A0 -unc_080B08A0: @ 80D8FF0 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, _080D9020 @ =gBattleAnimArgs - movs r0, 0 - ldrsh r1, [r5, r0] - adds r0, r4, 0 - bl sub_807867C - ldrh r0, [r5, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - movs r0, 0xF - strh r0, [r4, 0x2E] - ldr r0, _080D9024 @ =sub_80782D8 - str r0, [r4, 0x1C] - ldr r1, _080D9028 @ =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9020: .4byte gBattleAnimArgs -_080D9024: .4byte sub_80782D8 -_080D9028: .4byte DestroyAnimSprite - thumb_func_end unc_080B08A0 - - thumb_func_start sub_80D902C -sub_80D902C: @ 80D902C - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080D9070 @ =gBattleAnimArgs - movs r1, 0xE - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _080D9054 - ldr r0, _080D9074 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080D9054 - ldrh r0, [r4, 0x2] - negs r0, r0 - strh r0, [r4, 0x2] - ldrh r0, [r4, 0x6] - negs r0, r0 - strh r0, [r4, 0x6] -_080D9054: - ldr r4, _080D9070 @ =gBattleAnimArgs - ldrb r1, [r4, 0xC] - adds r0, r5, 0 - bl StartSpriteAnim - movs r0, 0 - strh r0, [r4, 0xC] - adds r0, r5, 0 - bl sub_8079534 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9070: .4byte gBattleAnimArgs -_080D9074: .4byte gAnimBankAttacker - thumb_func_end sub_80D902C - - thumb_func_start sub_80D9078 -sub_80D9078: @ 80D9078 - push {r4,lr} - adds r4, r0, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080D9094 - ldr r0, _080D90A0 @ =gBattleAnimArgs - ldrh r1, [r0, 0x2] - negs r1, r1 - strh r1, [r0, 0x2] - ldrh r1, [r0, 0x6] - negs r1, r1 - strh r1, [r0, 0x6] -_080D9094: - adds r0, r4, 0 - bl sub_80D902C - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D90A0: .4byte gBattleAnimArgs - thumb_func_end sub_80D9078 - - thumb_func_start sub_80D90A4 -sub_80D90A4: @ 80D90A4 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080D90C4 @ =gBattleAnimArgs - ldrb r1, [r4, 0x8] - bl StartSpriteAnim - movs r1, 0x6 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080D90C8 - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80787B0 - b _080D90D0 - .align 2, 0 -_080D90C4: .4byte gBattleAnimArgs -_080D90C8: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_8078764 -_080D90D0: - ldr r0, _080D90E8 @ =gBattleAnimArgs - ldrh r0, [r0, 0x4] - strh r0, [r5, 0x2E] - ldr r0, _080D90EC @ =sub_80782D8 - str r0, [r5, 0x1C] - ldr r1, _080D90F0 @ =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D90E8: .4byte gBattleAnimArgs -_080D90EC: .4byte sub_80782D8 -_080D90F0: .4byte DestroyAnimSprite - thumb_func_end sub_80D90A4 - - thumb_func_start sub_80D90F4 -sub_80D90F4: @ 80D90F4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r5, r0, 0 - ldr r0, _080D9110 @ =gBattleAnimArgs - movs r2, 0 - ldrsh r1, [r0, r2] - mov r9, r0 - cmp r1, 0 - bne _080D9118 - ldr r0, _080D9114 @ =gAnimBankAttacker - b _080D911A - .align 2, 0 -_080D9110: .4byte gBattleAnimArgs -_080D9114: .4byte gAnimBankAttacker -_080D9118: - ldr r0, _080D9260 @ =gAnimBankTarget -_080D911A: - ldrb r0, [r0] - mov r8, r0 - mov r4, r9 - movs r3, 0x4 - ldrsh r0, [r4, r3] - cmp r0, 0 - bge _080D9138 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x5 - bl __umodsi3 - strh r0, [r4, 0x4] -_080D9138: - ldrb r1, [r4, 0x4] - adds r0, r5, 0 - bl StartSpriteAnim - mov r0, r8 - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - mov r0, r8 - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - mov r0, r8 - movs r1, 0x1 - bl sub_807A100 - lsls r0, 16 - asrs r1, r0, 16 - lsrs r0, 31 - adds r1, r0 - lsls r1, 15 - lsrs r6, r1, 16 - mov r0, r8 - movs r1, 0 - bl sub_807A100 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _080D9182 - adds r0, 0x3 -_080D9182: - lsls r4, r0, 14 - lsrs r4, 16 - bl Random - lsls r0, 16 - lsrs r0, 16 - lsls r1, r6, 16 - asrs r1, 16 - bl __modsi3 - lsls r0, 16 - lsrs r6, r0, 16 - bl Random - lsls r0, 16 - lsrs r0, 16 - lsls r4, 16 - asrs r4, 16 - adds r1, r4, 0 - bl __modsi3 - lsls r0, 16 - lsrs r4, r0, 16 - bl Random - movs r7, 0x1 - adds r1, r7, 0 - ands r1, r0 - cmp r1, 0 - beq _080D91C4 - lsls r0, r6, 16 - negs r0, r0 - lsrs r6, r0, 16 -_080D91C4: - bl Random - adds r1, r7, 0 - ands r1, r0 - cmp r1, 0 - beq _080D91D6 - lsls r0, r4, 16 - negs r0, r0 - lsrs r4, r0, 16 -_080D91D6: - ldr r0, _080D9264 @ =gBanksBySide - add r0, r8 - ldrb r1, [r0] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - bne _080D91EC - lsls r0, r4, 16 - ldr r1, _080D9268 @ =0xfff00000 - adds r0, r1 - lsrs r4, r0, 16 -_080D91EC: - lsls r0, r6, 16 - asrs r0, 16 - ldrh r2, [r5, 0x20] - adds r0, r2 - strh r0, [r5, 0x20] - lsls r0, r4, 16 - asrs r0, 16 - ldrh r3, [r5, 0x22] - adds r0, r3 - strh r0, [r5, 0x22] - mov r1, r9 - ldrh r0, [r1, 0x2] - strh r0, [r5, 0x2E] - ldr r0, _080D926C @ =gBattleAnimSpriteTemplate_83DB4A8 - movs r2, 0x20 - ldrsh r1, [r5, r2] - movs r3, 0x22 - ldrsh r2, [r5, r3] - adds r3, r5, 0 - adds r3, 0x43 - ldrb r3, [r3] - adds r3, 0x1 - lsls r3, 24 - lsrs r3, 24 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x3C] - cmp r0, 0x40 - beq _080D9250 - movs r0, 0x3C - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r4, _080D9270 @ =gSprites - adds r0, r4 - movs r1, 0 - bl StartSpriteAffineAnim - movs r2, 0x3C - ldrsh r1, [r5, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r4, 0x1C - adds r0, r4 - ldr r1, _080D9274 @ =SpriteCallbackDummy - str r1, [r0] -_080D9250: - ldr r0, _080D9278 @ =sub_80D927C - str r0, [r5, 0x1C] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080D9260: .4byte gAnimBankTarget -_080D9264: .4byte gBanksBySide -_080D9268: .4byte 0xfff00000 -_080D926C: .4byte gBattleAnimSpriteTemplate_83DB4A8 -_080D9270: .4byte gSprites -_080D9274: .4byte SpriteCallbackDummy -_080D9278: .4byte sub_80D927C - thumb_func_end sub_80D90F4 - - thumb_func_start sub_80D927C -sub_80D927C: @ 80D927C - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r1, [r5, 0x2E] - movs r2, 0x2E - ldrsh r0, [r5, r2] - cmp r0, 0 - bne _080D92C4 - movs r1, 0x3C - ldrsh r0, [r5, r1] - cmp r0, 0x40 - beq _080D92B8 - ldr r4, _080D92C0 @ =gSprites - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - movs r0, 0x3C - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl DestroySprite -_080D92B8: - adds r0, r5, 0 - bl DestroyAnimSprite - b _080D92C8 - .align 2, 0 -_080D92C0: .4byte gSprites -_080D92C4: - subs r0, r1, 0x1 - strh r0, [r5, 0x2E] -_080D92C8: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80D927C - - thumb_func_start sub_80D92D0 -sub_80D92D0: @ 80D92D0 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_8078764 - movs r0, 0x1E - strh r0, [r4, 0x2E] - ldr r0, _080D92F0 @ =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080D92F4 - ldrh r0, [r4, 0x20] - subs r0, 0x14 - strh r0, [r4, 0x32] - b _080D9306 - .align 2, 0 -_080D92F0: .4byte gBattleAnimArgs -_080D92F4: - ldrh r0, [r4, 0x20] - adds r0, 0x14 - strh r0, [r4, 0x32] - adds r2, r4, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] -_080D9306: - ldrh r0, [r4, 0x22] - subs r0, 0x14 - strh r0, [r4, 0x36] - ldr r0, _080D9320 @ =sub_8078B34 - str r0, [r4, 0x1C] - ldr r1, _080D9324 @ =sub_80D9328 - adds r0, r4, 0 - bl StoreSpriteCallbackInData - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D9320: .4byte sub_8078B34 -_080D9324: .4byte sub_80D9328 - thumb_func_end sub_80D92D0 - - thumb_func_start sub_80D9328 -sub_80D9328: @ 80D9328 - push {r4-r6,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x38] - adds r0, 0x1 - movs r6, 0 - strh r0, [r5, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xB - bne _080D9368 - ldrh r2, [r5, 0x20] - ldrh r4, [r5, 0x24] - subs r0, r2, r4 - strh r0, [r5, 0x32] - ldrh r1, [r5, 0x22] - ldrh r3, [r5, 0x26] - subs r0, r1, r3 - strh r0, [r5, 0x36] - movs r0, 0x8 - strh r0, [r5, 0x2E] - adds r2, r4 - strh r2, [r5, 0x20] - adds r1, r3 - strh r1, [r5, 0x22] - strh r6, [r5, 0x26] - strh r6, [r5, 0x24] - ldr r0, _080D9370 @ =sub_8078B34 - str r0, [r5, 0x1C] - ldr r1, _080D9374 @ =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData -_080D9368: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080D9370: .4byte sub_8078B34 -_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 @ =gAnimBankAttacker - ldrb r1, [r0] - movs r0, 0x2 - ldr r2, _080D93F8 @ =gAnimBankTarget - eors r0, r1 - ldrb r1, [r2] - cmp r0, r1 - bne _080D93A4 - ldrb r0, [r2] - bl GetBankIdentity - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _080D93A4 - ldr r1, _080D93FC @ =gBattleAnimArgs - movs r2, 0 - ldrsh r0, [r1, r2] - negs r0, r0 - strh r0, [r1] -_080D93A4: - adds r0, r6, 0 - movs r1, 0x1 - bl sub_8078764 - ldr r0, _080D93F4 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080D93C2 - ldr r1, _080D93FC @ =gBattleAnimArgs - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] -_080D93C2: - ldr r4, _080D93FC @ =gBattleAnimArgs - ldrh r0, [r4, 0x6] - movs r5, 0 - strh r0, [r6, 0x2E] - ldrh r0, [r6, 0x20] - strh r0, [r6, 0x30] - ldrh r1, [r4, 0x4] - adds r0, r1 - strh r0, [r6, 0x32] - ldrh r0, [r6, 0x22] - strh r0, [r6, 0x34] - strh r0, [r6, 0x36] - adds r0, r6, 0 - bl obj_translate_based_on_private_1_2_3_4 - ldrh r0, [r4, 0xA] - strh r0, [r6, 0x38] - ldrh r0, [r4, 0x8] - strh r0, [r6, 0x3A] - strh r5, [r6, 0x3C] - ldr r0, _080D9400 @ =sub_80D9404 - str r0, [r6, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080D93F4: .4byte gAnimBankAttacker -_080D93F8: .4byte gAnimBankTarget -_080D93FC: .4byte gBattleAnimArgs -_080D9400: .4byte sub_80D9404 - thumb_func_end sub_80D9378 - - thumb_func_start sub_80D9404 -sub_80D9404: @ 80D9404 - push {r4,lr} - adds r4, r0, 0 - bl sub_8078B5C - lsls r0, 24 - cmp r0, 0 - bne _080D9430 - ldrh r0, [r4, 0x3C] - lsls r0, 16 - asrs r0, 24 - movs r2, 0x38 - ldrsh r1, [r4, r2] - bl Sin - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x3A] - ldrh r2, [r4, 0x3C] - adds r0, r2 - strh r0, [r4, 0x3C] - b _080D9436 -_080D9430: - adds r0, r4, 0 - bl DestroyAnimSprite -_080D9436: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D9404 - - thumb_func_start sub_80D943C -sub_80D943C: @ 80D943C - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_8078764 - ldr r5, _080D9468 @ =gBattleAnimArgs - ldrb r1, [r5, 0x4] - adds r0, r4, 0 - bl StartSpriteAnim - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x2E] - ldr r0, _080D946C @ =sub_80782D8 - str r0, [r4, 0x1C] - ldr r1, _080D9470 @ =sub_80D9474 - adds r0, r4, 0 - bl StoreSpriteCallbackInData - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9468: .4byte gBattleAnimArgs -_080D946C: .4byte sub_80782D8 -_080D9470: .4byte sub_80D9474 - thumb_func_end sub_80D943C - - thumb_func_start sub_80D9474 -sub_80D9474: @ 80D9474 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0 - bl StartSpriteAffineAnim - adds r2, r4, 0 - adds r2, 0x2C - ldrb r0, [r2] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x14 - strh r0, [r4, 0x2E] - ldr r0, _080D94A0 @ =sub_80782D8 - str r0, [r4, 0x1C] - ldr r1, _080D94A4 @ =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D94A0: .4byte sub_80782D8 -_080D94A4: .4byte DestroyAnimSprite - thumb_func_end sub_80D9474 - - thumb_func_start sub_80D94A8 -sub_80D94A8: @ 80D94A8 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_8078764 - ldr r0, _080D94C4 @ =gBattleAnimArgs - ldrh r0, [r0, 0x4] - strh r0, [r4, 0x2E] - ldr r0, _080D94C8 @ =sub_80D94CC - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D94C4: .4byte gBattleAnimArgs -_080D94C8: .4byte sub_80D94CC - thumb_func_end sub_80D94A8 - - thumb_func_start sub_80D94CC -sub_80D94CC: @ 80D94CC - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x2E] - subs r0, 0x1 - strh r0, [r5, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080D9510 - movs r0, 0x6 - strh r0, [r5, 0x2E] - ldr r4, _080D9518 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - ldr r0, _080D951C @ =sub_8078B34 - str r0, [r5, 0x1C] - ldr r1, _080D9520 @ =sub_80D9524 - adds r0, r5, 0 - bl StoreSpriteCallbackInData -_080D9510: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9518: .4byte gAnimBankTarget -_080D951C: .4byte sub_8078B34 -_080D9520: .4byte sub_80D9524 - thumb_func_end sub_80D94CC - - thumb_func_start sub_80D9524 -sub_80D9524: @ 80D9524 - push {lr} - movs r1, 0xF - strh r1, [r0, 0x2E] - ldr r1, _080D9538 @ =sub_80782D8 - str r1, [r0, 0x1C] - ldr r1, _080D953C @ =DestroyAnimSprite - bl StoreSpriteCallbackInData - pop {r0} - bx r0 - .align 2, 0 -_080D9538: .4byte sub_80782D8 -_080D953C: .4byte DestroyAnimSprite - thumb_func_end sub_80D9524 - - thumb_func_start sub_80D9540 -sub_80D9540: @ 80D9540 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080D956C - adds r0, r4, 0 - movs r1, 0x1 - bl sub_8078764 - ldr r1, _080D9568 @ =gBattleAnimArgs - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _080D95C8 - .align 2, 0 -_080D9568: .4byte gBattleAnimArgs -_080D956C: - ldrh r0, [r4, 0x30] - ldrh r2, [r4, 0x36] - adds r0, r2 - strh r0, [r4, 0x36] - lsls r0, 16 - asrs r0, 24 - strh r0, [r4, 0x24] - movs r1, 0x34 - ldrsh r0, [r4, r1] - movs r2, 0x32 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x34] - adds r0, 0x3 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x34] - cmp r0, 0x64 - ble _080D95BA - movs r0, 0x34 - ldrsh r1, [r4, r0] - lsrs r0, r1, 31 - adds r0, r1, r0 - asrs r0, 1 - lsls r0, 1 - subs r1, r0 - adds r3, r4, 0 - adds r3, 0x3E - movs r0, 0x1 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r3] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_080D95BA: - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0x78 - ble _080D95C8 - adds r0, r4, 0 - bl DestroyAnimSprite -_080D95C8: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D9540 - - thumb_func_start sub_80D95D0 -sub_80D95D0: @ 80D95D0 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _080D95E4 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080D95EC - ldr r4, _080D95E8 @ =gAnimBankAttacker - b _080D95EE - .align 2, 0 -_080D95E4: .4byte gBattleAnimArgs -_080D95E8: .4byte gAnimBankAttacker -_080D95EC: - ldr r4, _080D9634 @ =gAnimBankTarget -_080D95EE: - ldrb r0, [r4] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldr r1, _080D9638 @ =gBattleAnimArgs - ldrh r0, [r1, 0x2] - ldrh r2, [r5, 0x20] - adds r0, r2 - movs r2, 0 - strh r0, [r5, 0x20] - ldrh r0, [r1, 0x4] - ldrh r3, [r5, 0x22] - adds r0, r3 - strh r0, [r5, 0x22] - strh r2, [r5, 0x2E] - ldrh r0, [r1, 0x6] - strh r0, [r5, 0x30] - ldrh r0, [r1, 0x8] - strh r0, [r5, 0x32] - strh r2, [r5, 0x34] - ldr r0, _080D963C @ =sub_80D9640 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9634: .4byte gAnimBankTarget -_080D9638: .4byte gBattleAnimArgs -_080D963C: .4byte sub_80D9640 - thumb_func_end sub_80D95D0 - - thumb_func_start sub_80D9640 -sub_80D9640: @ 80D9640 - push {lr} - adds r1, r0, 0 - movs r0, 0x2E - ldrsh r2, [r1, r0] - cmp r2, 0 - beq _080D9652 - cmp r2, 0x1 - beq _080D9676 - b _080D96B0 -_080D9652: - ldrh r0, [r1, 0x30] - subs r0, 0x1 - strh r0, [r1, 0x30] - lsls r0, 16 - cmp r0, 0 - bne _080D96B0 - movs r2, 0x32 - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _080D966E - adds r0, r1, 0 - bl DestroyAnimSprite - b _080D96B0 -_080D966E: - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - b _080D96B0 -_080D9676: - ldrh r0, [r1, 0x30] - adds r0, 0x1 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080D969E - movs r0, 0 - strh r0, [r1, 0x30] - ldrh r0, [r1, 0x34] - adds r0, 0x1 - strh r0, [r1, 0x34] - ands r0, r2 - lsls r0, 16 - cmp r0, 0 - beq _080D969A - movs r0, 0x2 - b _080D969C -_080D969A: - ldr r0, _080D96B4 @ =0x0000fffe -_080D969C: - strh r0, [r1, 0x24] -_080D969E: - ldrh r0, [r1, 0x32] - subs r0, 0x1 - strh r0, [r1, 0x32] - lsls r0, 16 - cmp r0, 0 - bne _080D96B0 - adds r0, r1, 0 - bl DestroyAnimSprite -_080D96B0: - pop {r0} - bx r0 - .align 2, 0 -_080D96B4: .4byte 0x0000fffe - thumb_func_end sub_80D9640 - - thumb_func_start sub_80D96B8 -sub_80D96B8: @ 80D96B8 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, _080D96DC @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _080D96E4 - ldr r4, _080D96E0 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r2, [r6, 0x4] - adds r0, r2 - b _080D96F6 - .align 2, 0 -_080D96DC: .4byte gBattleAnimArgs -_080D96E0: .4byte gAnimBankAttacker -_080D96E4: - ldr r4, _080D9740 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r6, 0x4] - adds r0, r1 -_080D96F6: - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r6, [r6, 0x6] - adds r0, r6 - strh r0, [r5, 0x22] - ldrh r2, [r5, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - ldr r3, _080D9744 @ =gBattleAnimArgs - movs r4, 0x2 - ldrsh r0, [r3, r4] - lsls r0, 4 - adds r1, r0 - ldr r4, _080D9748 @ =0x000003ff - adds r0, r4, 0 - ands r1, r0 - ldr r0, _080D974C @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r5, 0x4] - movs r1, 0 - movs r0, 0 - strh r0, [r5, 0x2E] - movs r2, 0x2 - ldrsh r0, [r3, r2] - cmp r0, 0x1 - beq _080D9764 - cmp r0, 0x1 - bgt _080D9750 - cmp r0, 0 - beq _080D975A - b _080D978A - .align 2, 0 -_080D9740: .4byte gAnimBankTarget -_080D9744: .4byte gBattleAnimArgs -_080D9748: .4byte 0x000003ff -_080D974C: .4byte 0xfffffc00 -_080D9750: - cmp r0, 0x2 - beq _080D9774 - cmp r0, 0x3 - beq _080D9784 - b _080D978A -_080D975A: - ldr r0, _080D9760 @ =0x0000fffd - b _080D9784 - .align 2, 0 -_080D9760: .4byte 0x0000fffd -_080D9764: - movs r0, 0x3 - strh r0, [r5, 0x3A] - ldr r0, _080D9770 @ =0x0000fffd - strh r0, [r5, 0x3C] - b _080D9792 - .align 2, 0 -_080D9770: .4byte 0x0000fffd -_080D9774: - ldr r0, _080D9780 @ =0x0000fffd - strh r0, [r5, 0x3A] - movs r0, 0x3 - strh r0, [r5, 0x3C] - b _080D9792 - .align 2, 0 -_080D9780: .4byte 0x0000fffd -_080D9784: - strh r0, [r5, 0x3A] - strh r0, [r5, 0x3C] - b _080D9792 -_080D978A: - adds r0, r5, 0 - bl DestroyAnimSprite - b _080D9796 -_080D9792: - ldr r0, _080D979C @ =sub_80D97A0 - str r0, [r5, 0x1C] -_080D9796: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080D979C: .4byte sub_80D97A0 - thumb_func_end sub_80D96B8 - - thumb_func_start sub_80D97A0 -sub_80D97A0: @ 80D97A0 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x3A] - ldrh r2, [r1, 0x20] - adds r0, r2 - strh r0, [r1, 0x20] - ldrh r0, [r1, 0x3C] - ldrh r2, [r1, 0x22] - adds r0, r2 - strh r0, [r1, 0x22] - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x28 - ble _080D97C8 - adds r0, r1, 0 - bl DestroyAnimSprite -_080D97C8: - pop {r0} - bx r0 - thumb_func_end sub_80D97A0 - - thumb_func_start sub_80D97CC -sub_80D97CC: @ 80D97CC - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _080D9818 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080D9828 - ldr r4, _080D981C @ =gBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldr r0, _080D9820 @ =gAnimBankAttacker - ldrb r0, [r0] - bl sub_8079ED4 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r5, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - ldr r0, _080D9824 @ =gAnimBankTarget - b _080D9844 - .align 2, 0 -_080D9818: .4byte gBattleAnimArgs -_080D981C: .4byte gBankAttacker -_080D9820: .4byte gAnimBankAttacker -_080D9824: .4byte gAnimBankTarget -_080D9828: - ldr r0, _080D9860 @ =gAnimBankTarget - ldrb r0, [r0] - bl sub_8079ED4 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r5, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - ldr r0, _080D9864 @ =gAnimBankAttacker -_080D9844: - ldrb r0, [r0] - strh r0, [r5, 0x3C] - movs r0, 0 - strh r0, [r5, 0x2E] - movs r0, 0xC - strh r0, [r5, 0x30] - movs r0, 0x8 - strh r0, [r5, 0x32] - ldr r0, _080D9868 @ =sub_80D986C - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9860: .4byte gAnimBankTarget -_080D9864: .4byte gAnimBankAttacker -_080D9868: .4byte sub_80D986C - thumb_func_end sub_80D97CC - - thumb_func_start sub_80D986C -sub_80D986C: @ 80D986C - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xB4 - bne _080D98C6 - ldr r1, _080D98CC @ =REG_BLDCNT - movs r0, 0 - strh r0, [r1] - movs r0, 0x10 - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - ldrh r0, [r4, 0x3C] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _080D98D0 @ =move_anim_8074EE0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData - ldr r0, _080D98D4 @ =sub_8078BB8 - str r0, [r4, 0x1C] -_080D98C6: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D98CC: .4byte REG_BLDCNT -_080D98D0: .4byte move_anim_8074EE0 -_080D98D4: .4byte sub_8078BB8 - thumb_func_end sub_80D986C - - thumb_func_start sub_80D98D8 -sub_80D98D8: @ 80D98D8 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080D9924 @ =gBattleAnimArgs - ldrh r0, [r4] - strh r0, [r5, 0x20] - movs r2, 0x78 - strh r2, [r5, 0x22] - ldrh r0, [r4, 0x6] - strh r0, [r5, 0x2E] - adds r0, r5, 0 - adds r0, 0x36 - adds r1, r5, 0 - adds r1, 0x38 - lsls r2, 8 - bl sub_8079BF4 - ldrh r0, [r4, 0x2] - strh r0, [r5, 0x3A] - ldrh r2, [r5, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - movs r3, 0x4 - ldrsh r0, [r4, r3] - lsls r0, 2 - adds r1, r0 - ldr r3, _080D9928 @ =0x000003ff - adds r0, r3, 0 - ands r1, r0 - ldr r0, _080D992C @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r5, 0x4] - ldr r0, _080D9930 @ =sub_80D9934 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9924: .4byte gBattleAnimArgs -_080D9928: .4byte 0x000003ff -_080D992C: .4byte 0xfffffc00 -_080D9930: .4byte sub_80D9934 - thumb_func_end sub_80D98D8 - - thumb_func_start sub_80D9934 -sub_80D9934: @ 80D9934 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - movs r1, 0x2E - ldrsh r0, [r7, r1] - cmp r0, 0 - beq _080D9986 - movs r2, 0x36 - ldrsh r0, [r7, r2] - movs r2, 0x38 - ldrsh r1, [r7, r2] - bl sub_8079BFC - adds r4, r0, 0 - movs r1, 0x3A - ldrsh r0, [r7, r1] - subs r4, r0 - adds r0, r7, 0 - adds r0, 0x36 - adds r1, r7, 0 - adds r1, 0x38 - adds r2, r4, 0 - bl sub_8079BF4 - asrs r4, 8 - strh r4, [r7, 0x22] - lsls r4, 16 - asrs r4, 16 - movs r0, 0x8 - negs r0, r0 - cmp r4, r0 - bge _080D997E - adds r0, r7, 0 - bl DestroyAnimSprite - b _080D99DC -_080D997E: - ldrh r0, [r7, 0x2E] - subs r0, 0x1 - strh r0, [r7, 0x2E] - b _080D99DC -_080D9986: - ldr r4, _080D99E8 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - adds r6, r0, 0 - lsls r6, 24 - lsrs r6, 24 - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r2, _080D99EC @ =gAnimBankTarget - mov r8, r2 - ldrb r0, [r2] - movs r1, 0x2 - bl GetBankPosition - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - mov r1, r8 - ldrb r0, [r1] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - subs r4, r6 - strh r4, [r7, 0x2E] - lsrs r0, 24 - subs r0, r5 - strh r0, [r7, 0x30] - ldrh r0, [r7, 0x20] - lsls r0, 4 - strh r0, [r7, 0x32] - ldrh r0, [r7, 0x22] - lsls r0, 4 - strh r0, [r7, 0x34] - ldr r0, _080D99F0 @ =sub_80D99F4 - str r0, [r7, 0x1C] -_080D99DC: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080D99E8: .4byte gAnimBankAttacker -_080D99EC: .4byte gAnimBankTarget -_080D99F0: .4byte sub_80D99F4 - thumb_func_end sub_80D9934 - - thumb_func_start sub_80D99F4 -sub_80D99F4: @ 80D99F4 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x2E] - ldrh r1, [r2, 0x32] - adds r0, r1 - strh r0, [r2, 0x32] - ldrh r1, [r2, 0x30] - ldrh r3, [r2, 0x34] - adds r1, r3 - strh r1, [r2, 0x34] - lsls r0, 16 - asrs r0, 20 - strh r0, [r2, 0x20] - lsls r1, 16 - asrs r3, r1, 20 - strh r3, [r2, 0x22] - adds r0, 0x8 - lsls r0, 16 - movs r1, 0x80 - lsls r1, 17 - cmp r0, r1 - bhi _080D9A2E - adds r1, r3, 0 - movs r0, 0x8 - negs r0, r0 - cmp r1, r0 - blt _080D9A2E - cmp r1, 0x78 - ble _080D9A34 -_080D9A2E: - adds r0, r2, 0 - bl DestroyAnimSprite -_080D9A34: - pop {r0} - bx r0 - thumb_func_end sub_80D99F4 - - thumb_func_start sub_80D9A38 -sub_80D9A38: @ 80D9A38 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _080D9A6C @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080D9A7C - ldr r4, _080D9A70 @ =gBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldr r0, _080D9A74 @ =gAnimBankTarget - ldrb r4, [r0] - ldr r0, _080D9A78 @ =gAnimBankAttacker - b _080D9A82 - .align 2, 0 -_080D9A6C: .4byte gBattleAnimArgs -_080D9A70: .4byte gBankAttacker -_080D9A74: .4byte gAnimBankTarget -_080D9A78: .4byte gAnimBankAttacker -_080D9A7C: - ldr r0, _080D9AB4 @ =gAnimBankAttacker - ldrb r4, [r0] - ldr r0, _080D9AB8 @ =gAnimBankTarget -_080D9A82: - ldrb r0, [r0] - bl sub_8079ED4 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r5, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080D9ABC - ldrb r2, [r5, 0x3] - lsls r1, r2, 26 - lsrs r1, 27 - movs r0, 0x8 - orrs r1, r0 - lsls r1, 1 - subs r0, 0x47 - b _080D9AD6 - .align 2, 0 -_080D9AB4: .4byte gAnimBankAttacker -_080D9AB8: .4byte gAnimBankTarget -_080D9ABC: - adds r0, r4, 0 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080D9ADC - ldrb r2, [r5, 0x3] - lsls r1, r2, 26 - lsrs r1, 27 - movs r0, 0x18 - orrs r1, r0 - lsls r1, 1 - subs r0, 0x57 -_080D9AD6: - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x3] -_080D9ADC: - movs r0, 0x10 - strh r0, [r5, 0x2E] - ldrh r0, [r5, 0x20] - strh r0, [r5, 0x30] - adds r0, r4, 0 - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x22] - strh r0, [r5, 0x34] - adds r0, r4, 0 - movs r1, 0x3 - 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 @ =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData - ldr r0, _080D9B20 @ =sub_8078BB8 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9B1C: .4byte DestroyAnimSprite -_080D9B20: .4byte sub_8078BB8 - thumb_func_end sub_80D9A38 - - thumb_func_start sub_80D9B24 -sub_80D9B24: @ 80D9B24 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x2E - ldrsh r1, [r4, r0] - movs r2, 0x36 - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _080D9B3A - adds r0, r4, 0 - bl DestroyAnimSprite -_080D9B3A: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D9B24 - - thumb_func_start sub_80D9B48 -sub_80D9B48: @ 80D9B48 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r4, _080D9BC4 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldr r1, _080D9BC8 @ =gBattleAnimArgs - ldrh r0, [r1, 0x6] - strh r0, [r5, 0x30] - ldrh r0, [r1] - strh r0, [r5, 0x32] - ldrh r0, [r1, 0x2] - strh r0, [r5, 0x34] - ldrh r0, [r1, 0x4] - strh r0, [r5, 0x36] - ldr r0, _080D9BCC @ =gAnimMoveTurn - ldrb r6, [r0] - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080D9B92 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 -_080D9B92: - movs r0, 0x1 - ands r6, r0 - cmp r6, 0 - beq _080D9BA6 - ldrh r0, [r5, 0x32] - negs r0, r0 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x30] - adds r0, 0x1 - strh r0, [r5, 0x30] -_080D9BA6: - ldrh r1, [r5, 0x30] - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl StartSpriteAnim - ldrh r0, [r5, 0x32] - strh r0, [r5, 0x24] - ldrh r0, [r5, 0x34] - strh r0, [r5, 0x26] - ldr r0, _080D9BD0 @ =sub_80D9B24 - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080D9BC4: .4byte gAnimBankTarget -_080D9BC8: .4byte gBattleAnimArgs -_080D9BCC: .4byte gAnimMoveTurn -_080D9BD0: .4byte sub_80D9B24 - thumb_func_end sub_80D9B48 - - thumb_func_start sub_80D9BD4 -sub_80D9BD4: @ 80D9BD4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _080D9BEC @ =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080D9BF0 - adds r0, r4, 0 - movs r1, 0 - bl sub_80787B0 - b _080D9BF8 - .align 2, 0 -_080D9BEC: .4byte gBattleAnimArgs -_080D9BF0: - adds r0, r4, 0 - movs r1, 0 - bl sub_8078764 -_080D9BF8: - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080D9C0C - adds r0, r4, 0 - movs r1, 0x2 - bl StartSpriteAnim - b _080D9C22 -_080D9C0C: - ldr r0, _080D9C34 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080D9C22 - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAnim -_080D9C22: - ldr r0, _080D9C38 @ =sub_8078600 - str r0, [r4, 0x1C] - ldr r1, _080D9C3C @ =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D9C34: .4byte gAnimBankAttacker -_080D9C38: .4byte sub_8078600 -_080D9C3C: .4byte DestroyAnimSprite - thumb_func_end sub_80D9BD4 - - thumb_func_start sub_80D9C40 -sub_80D9C40: @ 80D9C40 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080D9C7A - ldrh r0, [r4, 0x30] - adds r0, 0x28 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x30] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x2 - bl Sin - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x28 - ble _080D9C7A - adds r0, r4, 0 - bl DestroyAnimSprite -_080D9C7A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D9C40 - - thumb_func_start sub_80D9C80 -sub_80D9C80: @ 80D9C80 - push {r4-r7,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, _080D9CB0 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080D9CB8 - cmp r0, 0x1 - bgt _080D9CD2 - cmp r0, 0 - bne _080D9CD2 - movs r0, 0 - bl sub_80789D4 - ldr r0, _080D9CB4 @ =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r4, 0x18] - b _080D9CCA - .align 2, 0 -_080D9CB0: .4byte gTasks -_080D9CB4: .4byte gBattleAnimArgs -_080D9CB8: - ldrh r0, [r4, 0x18] - subs r0, 0x1 - strh r0, [r4, 0x18] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080D9CDE -_080D9CCA: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080D9CDE -_080D9CD2: - movs r2, 0xA0 - lsls r2, 3 - adds r0, r2, 0 - ldrh r1, [r4, 0x1A] - adds r0, r1 - strh r0, [r4, 0x1A] -_080D9CDE: - movs r2, 0xB0 - lsls r2, 4 - adds r0, r2, 0 - ldrh r1, [r4, 0x1C] - adds r0, r1 - strh r0, [r4, 0x1C] - ldr r0, _080D9D0C @ =gAnimBankTarget - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080D9D14 - ldr r1, _080D9D10 @ =gBattle_BG3_X - ldrh r0, [r4, 0x1A] - lsls r0, 16 - asrs r0, 24 - ldrh r2, [r1] - adds r0, r2 - strh r0, [r1] - adds r7, r1, 0 - b _080D9D24 - .align 2, 0 -_080D9D0C: .4byte gAnimBankTarget -_080D9D10: .4byte gBattle_BG3_X -_080D9D14: - ldr r2, _080D9D64 @ =gBattle_BG3_X - ldrh r1, [r4, 0x1A] - lsls r1, 16 - asrs r1, 24 - ldrh r0, [r2] - subs r0, r1 - strh r0, [r2] - adds r7, r2, 0 -_080D9D24: - ldr r3, _080D9D68 @ =gBattle_BG3_Y - ldrh r2, [r4, 0x1C] - lsls r0, r2, 16 - asrs r0, 24 - ldrh r1, [r3] - adds r0, r1 - strh r0, [r3] - movs r0, 0xFF - ldrb r1, [r4, 0x1A] - movs r5, 0 - strh r1, [r4, 0x1A] - ands r0, r2 - strh r0, [r4, 0x1C] - ldr r0, _080D9D6C @ =gBattleAnimArgs - movs r2, 0xE - ldrsh r1, [r0, r2] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _080D9D5C - strh r5, [r7] - strh r5, [r3] - movs r0, 0x1 - bl sub_80789D4 - adds r0, r6, 0 - bl DestroyAnimVisualTask -_080D9D5C: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080D9D64: .4byte gBattle_BG3_X -_080D9D68: .4byte gBattle_BG3_Y -_080D9D6C: .4byte gBattleAnimArgs - thumb_func_end sub_80D9C80 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/flying.s b/asm/flying.s index ce3fb050b..a9872c903 100644 --- a/asm/flying.s +++ b/asm/flying.s @@ -174,7 +174,7 @@ sub_80DA16C: @ 80DA16C push {r4-r6,lr} adds r6, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r0, _080DA1D8 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide @@ -211,7 +211,7 @@ _080DA18C: adds r0, r4 strh r0, [r6, 0x36] adds r0, r6, 0 - bl obj_translate_based_on_private_1_2_3_4 + bl InitAnimSpriteTranslationDeltas ldr r0, _080DA1E4 @ =sub_80785E4 str r0, [r6, 0x1C] ldr r1, _080DA1E8 @ =sub_80DA1EC @@ -232,7 +232,7 @@ _080DA1E8: .4byte sub_80DA1EC sub_80DA1EC: @ 80DA1EC push {r4,lr} adds r4, r0, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas lsls r0, 24 cmp r0, 0 beq _080DA200 @@ -331,7 +331,7 @@ _080DA2B0: adds r3, r5, 0 adds r3, 0x36 movs r1, 0x1 - bl sub_807A3FC + bl SetAverageBattlerPositions _080DA2C2: ldr r4, _080DA2F4 @ =gBattleAnimArgs ldrh r0, [r4, 0x4] @@ -342,7 +342,7 @@ _080DA2C2: ldrh r3, [r5, 0x36] adds r0, r3 strh r0, [r5, 0x36] - ldr r0, _080DA2F8 @ =sub_8078B34 + ldr r0, _080DA2F8 @ =StartTranslateAnimSpriteByDeltas str r0, [r5, 0x1C] ldr r1, _080DA2FC @ =DestroyAnimSprite adds r0, r5, 0 @@ -356,7 +356,7 @@ _080DA2C2: .align 2, 0 _080DA2F0: .4byte gAnimBankTarget _080DA2F4: .4byte gBattleAnimArgs -_080DA2F8: .4byte sub_8078B34 +_080DA2F8: .4byte StartTranslateAnimSpriteByDeltas _080DA2FC: .4byte DestroyAnimSprite thumb_func_end sub_80DA208 @@ -365,7 +365,7 @@ sub_80DA300: @ 80DA300 push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r1, _080DA33C @ =gBattleAnimArgs ldrh r0, [r1, 0x4] strh r0, [r4, 0x2E] @@ -483,7 +483,7 @@ _080DA3C2: lsrs r0, 24 strh r0, [r5, 0x36] adds r0, r5, 0 - bl obj_translate_based_on_private_1_2_3_4 + bl InitAnimSpriteTranslationDeltas ldr r0, _080DA40C @ =sub_80DA410 str r0, [r5, 0x1C] pop {r4,r5} @@ -503,7 +503,7 @@ sub_80DA410: @ 80DA410 movs r0, 0x1 strh r0, [r4, 0x2E] adds r0, r4, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas ldrh r1, [r4, 0x34] lsrs r0, r1, 8 cmp r0, 0xC8 @@ -1743,7 +1743,7 @@ sub_80DAD30: @ 80DAD30 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r0, _080DAD80 @ =sub_807941C + ldr r0, _080DAD80 @ =TranslateAnimSpriteToTargetMonLocation str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -1751,7 +1751,7 @@ sub_80DAD30: @ 80DAD30 .align 2, 0 _080DAD78: .4byte gAnimBankTarget _080DAD7C: .4byte gAnimBankAttacker -_080DAD80: .4byte sub_807941C +_080DAD80: .4byte TranslateAnimSpriteToTargetMonLocation thumb_func_end sub_80DAD30 thumb_func_start sub_80DAD84 @@ -2086,7 +2086,7 @@ sub_80DB000: @ 80DB000 bne _080DB01C adds r0, r5, 0 movs r1, 0 - bl sub_80787B0 + bl InitAnimSpritePos b _080DB024 .align 2, 0 _080DB018: .4byte gBattleAnimArgs @@ -2291,7 +2291,7 @@ sub_80DB194: @ 80DB194 _080DB1A6: adds r0, r4, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos movs r0, 0 bl GetAnimBankSpriteId ldr r2, _080DB1D4 @ =gSprites @@ -2414,7 +2414,7 @@ sub_80DB288: @ 80DB288 push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r1, _080DB2C4 @ =gBattleAnimArgs ldrh r0, [r1, 0x4] strh r0, [r4, 0x2E] diff --git a/asm/ghost.s b/asm/ghost.s index 2934f6dbd..df20a7b20 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -12,7 +12,7 @@ sub_80DDB6C: @ 80DDB6C push {r4,r5,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r0, _080DDBC8 @ =gBattleAnimArgs ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] @@ -63,7 +63,7 @@ sub_80DDBD8: @ 80DDBD8 adds r4, r0, 0 bl sub_80DDCC8 adds r0, r4, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas lsls r0, 24 cmp r0, 0 beq _080DDBF8 @@ -123,7 +123,7 @@ sub_80DDC4C: @ 80DDC4C movs r0, 0x1 strh r0, [r4, 0x2E] adds r0, r4, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0xA @@ -2539,7 +2539,7 @@ sub_80DEF3C: @ 80DEF3C push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r0, _080DEF68 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide @@ -3257,7 +3257,7 @@ sub_80DF49C: @ 80DF49C movs r2, 0x4 orrs r1, r2 strb r1, [r3] - ldr r2, _080DF4E0 @ =gObjectBankIDs + ldr r2, _080DF4E0 @ =gBankSpriteIds ldr r1, _080DF4E4 @ =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 @@ -3286,7 +3286,7 @@ sub_80DF49C: @ 80DF49C strh r1, [r0, 0x22] bx lr .align 2, 0 -_080DF4E0: .4byte gObjectBankIDs +_080DF4E0: .4byte gBankSpriteIds _080DF4E4: .4byte gAnimBankAttacker _080DF4E8: .4byte gBattleAnimArgs _080DF4EC: .4byte sub_80DF4F4 diff --git a/asm/ground.s b/asm/ground.s index 3d4b69a9f..607065061 100644 --- a/asm/ground.s +++ b/asm/ground.s @@ -59,7 +59,7 @@ _080E0F80: .4byte sub_80E0F84 sub_80E0F84: @ 80E0F84 push {r4,r5,lr} adds r5, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _080E0FD8 @@ -108,7 +108,7 @@ _080E0FE4: .4byte sub_80E0FE8 sub_80E0FE8: @ 80E0FE8 push {r4,lr} adds r4, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _080E0FFC @@ -157,7 +157,7 @@ _080E1024: ldrh r4, [r4, 0x6] adds r0, r4 strh r0, [r6, 0x36] - ldr r0, _080E1070 @ =sub_8078B34 + ldr r0, _080E1070 @ =StartTranslateAnimSpriteByDeltas str r0, [r6, 0x1C] ldr r1, _080E1074 @ =DestroyAnimSprite adds r0, r6, 0 @@ -169,7 +169,7 @@ _080E1024: _080E1064: .4byte gAnimBankAttacker _080E1068: .4byte gBattleAnimArgs _080E106C: .4byte gAnimBankTarget -_080E1070: .4byte sub_8078B34 +_080E1070: .4byte StartTranslateAnimSpriteByDeltas _080E1074: .4byte DestroyAnimSprite thumb_func_end sub_80E1004 @@ -180,7 +180,7 @@ sub_80E1078: @ 80E1078 push {r7} adds r6, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r4, _080E10F8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 @@ -224,7 +224,7 @@ _080E10D0: strh r0, [r6, 0x32] adds r0, r7, r4 strh r0, [r6, 0x36] - ldr r0, _080E1100 @ =sub_8078B34 + ldr r0, _080E1100 @ =StartTranslateAnimSpriteByDeltas str r0, [r6, 0x1C] ldr r1, _080E1104 @ =move_anim_8074EE0 adds r0, r6, 0 @@ -237,7 +237,7 @@ _080E10D0: .align 2, 0 _080E10F8: .4byte gAnimBankTarget _080E10FC: .4byte gBattleAnimArgs -_080E1100: .4byte sub_8078B34 +_080E1100: .4byte StartTranslateAnimSpriteByDeltas _080E1104: .4byte move_anim_8074EE0 thumb_func_end sub_80E1078 @@ -1120,7 +1120,7 @@ _080E17AC: .4byte sub_80E17B0 sub_80E17B0: @ 80E17B0 push {r4,lr} adds r4, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _080E17C4 @@ -1270,7 +1270,7 @@ _080E18CE: adds r1, r4, 0 adds r1, 0x8 adds r1, r0 - ldr r0, _080E1904 @ =gObjectBankIDs + ldr r0, _080E1904 @ =gBankSpriteIds adds r0, r5, r0 ldrb r0, [r0] strh r0, [r1] @@ -1285,7 +1285,7 @@ _080E18F8: bls _080E18CE b _080E1924 .align 2, 0 -_080E1904: .4byte gObjectBankIDs +_080E1904: .4byte gBankSpriteIds _080E1908: ldrb r0, [r6] bl GetAnimBankSpriteId @@ -325,7 +325,7 @@ sub_80D792C: @ 80D792C push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r0, _080D7960 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 @@ -371,7 +371,7 @@ _080D7976: ldr r1, _080D79AC @ =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData - ldr r0, _080D79B0 @ =sub_8078B34 + ldr r0, _080D79B0 @ =StartTranslateAnimSpriteByDeltas str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -380,7 +380,7 @@ _080D7976: _080D79A4: .4byte gBattleAnimArgs _080D79A8: .4byte gAnimBankTarget _080D79AC: .4byte DestroyAnimSprite -_080D79B0: .4byte sub_8078B34 +_080D79B0: .4byte StartTranslateAnimSpriteByDeltas thumb_func_end sub_80D792C thumb_func_start sub_80D79B4 @@ -406,7 +406,7 @@ _080D79D0: adds r3, r4, 0 adds r3, 0x22 movs r1, 0x1 - bl sub_807A3FC + bl SetAverageBattlerPositions ldr r0, _080D7A1C @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide @@ -480,7 +480,7 @@ sub_80D7A64: @ 80D7A64 sub sp, 0x10 adds r5, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r6, _080D7AAC @ =gBattleAnimArgs ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] @@ -519,7 +519,7 @@ _080D7AB4: adds r3, r5, 0 adds r3, 0x36 movs r1, 0x1 - bl sub_807A3FC + bl SetAverageBattlerPositions _080D7AC6: ldr r0, _080D7AE4 @ =gAnimBankAttacker ldrb r0, [r0] @@ -795,7 +795,7 @@ sub_80D7CD4: @ 80D7CD4 sub sp, 0x10 adds r5, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r1, _080D7D18 @ =gBattleAnimArgs ldrh r0, [r1, 0x8] strh r0, [r5, 0x2E] @@ -832,7 +832,7 @@ _080D7D20: adds r3, r5, 0 adds r3, 0x36 movs r1, 0x1 - bl sub_807A3FC + bl SetAverageBattlerPositions _080D7D32: ldr r0, _080D7D54 @ =gAnimBankAttacker ldrb r0, [r0] @@ -1036,7 +1036,7 @@ _080D7EAC: adds r3, r4, 0 adds r3, 0x22 movs r1, 0 - bl sub_807A3FC + bl SetAverageBattlerPositions ldr r0, _080D7EF0 @ =gAnimBankAttacker ldrb r0, [r0] bl GetBankSide @@ -1094,7 +1094,7 @@ sub_80D7F10: @ 80D7F10 bne _080D7F34 adds r0, r5, 0 movs r1, 0 - bl sub_80787B0 + bl InitAnimSpritePos b _080D7F72 .align 2, 0 _080D7F30: .4byte gBattleAnimArgs @@ -1106,7 +1106,7 @@ _080D7F34: adds r3, r5, 0 adds r3, 0x22 movs r1, 0 - bl sub_807A3FC + bl SetAverageBattlerPositions ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1152,7 +1152,7 @@ _080D7F92: adds r3, r5, 0 adds r3, 0x22 movs r1, 0 - bl sub_807A3FC + bl SetAverageBattlerPositions ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1221,7 +1221,7 @@ _080D800C: adds r0, r1 strh r0, [r5, 0x36] adds r0, r5, 0 - bl obj_translate_based_on_private_1_2_3_4 + bl InitAnimSpriteTranslationDeltas movs r0, 0x40 strh r0, [r5, 0x38] ldr r1, _080D8044 @ =sub_80D8048 @@ -1241,7 +1241,7 @@ _080D8044: .4byte sub_80D8048 sub_80D8048: @ 80D8048 push {r4,lr} adds r4, r0, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas lsls r0, 24 cmp r0, 0 bne _080D80D2 @@ -1696,14 +1696,14 @@ sub_80D83E0: @ 80D83E0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r0, _080D8410 @ =sub_807941C + ldr r0, _080D8410 @ =TranslateAnimSpriteToTargetMonLocation str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 _080D840C: .4byte gAnimBankAttacker -_080D8410: .4byte sub_807941C +_080D8410: .4byte TranslateAnimSpriteToTargetMonLocation thumb_func_end sub_80D83E0 thumb_func_start sub_80D8414 @@ -2227,7 +2227,7 @@ _080D8824: strb r0, [r1] _080D8858: adds r0, r5, 0 - bl obj_translate_based_on_private_1_2_3_4 + bl InitAnimSpriteTranslationDeltas ldr r0, _080D8870 @ =sub_80D8874 str r0, [r5, 0x1C] pop {r3} @@ -2263,7 +2263,7 @@ _080D8894: b _080D8AD0 _080D8896: adds r0, r4, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas ldr r1, _080D88C0 @ =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] @@ -2361,13 +2361,13 @@ _080D893A: ands r0, r1 strh r0, [r4, 0x38] adds r0, r4, 0 - bl obj_translate_based_on_private_1_2_3_4 + bl InitAnimSpriteTranslationDeltas b _080D8AD0 .align 2, 0 _080D8964: .4byte gSineTable _080D8968: adds r0, r4, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas ldr r1, _080D89C8 @ =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] @@ -2519,7 +2519,7 @@ _080D8A7A: _080D8A90: .4byte 0x0000fff0 _080D8A94: adds r0, r4, 0 - bl sub_8078B5C + bl TranslateAnimSpriteByDeltas lsls r0, 24 cmp r0, 0 beq _080D8AD0 @@ -3026,7 +3026,7 @@ _080D8E6A: bl StartSpriteAffineAnim adds r0, r5, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r6, _080D8ED0 @ =gBattleAnimArgs ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] @@ -3078,7 +3078,7 @@ _080D8EDC: .4byte sub_80D8EE0 sub_80D8EE0: @ 80D8EE0 push {r4,lr} adds r4, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _080D8F02 diff --git a/asm/normal.s b/asm/normal.s index fffbc3870..c92b4563c 100644 --- a/asm/normal.s +++ b/asm/normal.s @@ -1214,7 +1214,7 @@ _080E25A0: bcs _080E25F4 ldr r2, _080E2604 @ =gSprites mov r12, r2 - ldr r6, _080E2608 @ =gObjectBankIDs + ldr r6, _080E2608 @ =gBankSpriteIds movs r7, 0x3 negs r7, r7 _080E25D2: @@ -1245,14 +1245,14 @@ _080E25FA: .align 2, 0 _080E2600: .4byte gNoOfAllBanks _080E2604: .4byte gSprites -_080E2608: .4byte gObjectBankIDs +_080E2608: .4byte gBankSpriteIds thumb_func_end sub_80E255C thumb_func_start sub_80E260C sub_80E260C: @ 80E260C push {r4-r6,lr} ldr r6, _080E2680 @ =gSprites - ldr r4, _080E2684 @ =gObjectBankIDs + ldr r4, _080E2684 @ =gBankSpriteIds ldr r5, _080E2688 @ =gAnimBankAttacker ldrb r0, [r5] adds r0, r4 @@ -1309,7 +1309,7 @@ sub_80E260C: @ 80E260C b _080E26B0 .align 2, 0 _080E2680: .4byte gSprites -_080E2684: .4byte gObjectBankIDs +_080E2684: .4byte gBankSpriteIds _080E2688: .4byte gAnimBankAttacker _080E268C: .4byte gAnimBankTarget _080E2690: .4byte gBattleAnimArgs @@ -1471,7 +1471,7 @@ sub_80E27A0: @ 80E27A0 bne _080E27C4 adds r0, r5, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos b _080E27CC .align 2, 0 _080E27C0: .4byte gBattleAnimArgs @@ -1506,7 +1506,7 @@ sub_80E27E8: @ 80E27E8 bne _080E280C adds r0, r5, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos b _080E2814 .align 2, 0 _080E2808: .4byte gBattleAnimArgs @@ -1586,7 +1586,7 @@ _080E288C: bne _080E28AC adds r0, r4, 0 movs r1, 0 - bl sub_80787B0 + bl InitAnimSpritePos b _080E28B4 .align 2, 0 _080E28A8: .4byte gBattleAnimArgs @@ -1694,7 +1694,7 @@ sub_80E2978: @ 80E2978 bne _080E2994 adds r0, r4, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos b _080E299C .align 2, 0 _080E2990: .4byte gBattleAnimArgs @@ -1733,7 +1733,7 @@ sub_80E29C0: @ 80E29C0 bne _080E29E4 adds r0, r5, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos b _080E29EC .align 2, 0 _080E29E0: .4byte gBattleAnimArgs @@ -2532,7 +2532,7 @@ _080E2FDC: cmp r0, 0x1 bne _080E3028 ldr r3, _080E3060 @ =gSprites - ldr r1, _080E3064 @ =gObjectBankIDs + ldr r1, _080E3064 @ =gBankSpriteIds ldrb r0, [r5] eors r0, r6 adds r0, r1 @@ -2580,7 +2580,7 @@ _080E3054: .4byte 0x00000c08 _080E3058: .4byte REG_BG1CNT _080E305C: .4byte gAnimBankAttacker _080E3060: .4byte gSprites -_080E3064: .4byte gObjectBankIDs +_080E3064: .4byte gBankSpriteIds _080E3068: .4byte gSharedMem + 0x19348 _080E306C: ldr r4, _080E308C @ =gAnimBankAttacker @@ -2809,7 +2809,7 @@ _080E3208: ldrsh r0, [r4, r3] cmp r0, 0x1 bne _080E3288 - ldr r2, _080E32D8 @ =gObjectBankIDs + ldr r2, _080E32D8 @ =gBankSpriteIds ldr r0, _080E32DC @ =gAnimBankAttacker ldrb r1, [r0] movs r0, 0x2 @@ -2862,7 +2862,7 @@ _080E32C8: .4byte REG_BLDCNT _080E32CC: .4byte gSprites _080E32D0: .4byte 0x040000d4 _080E32D4: .4byte 0x85000200 -_080E32D8: .4byte gObjectBankIDs +_080E32D8: .4byte gBankSpriteIds _080E32DC: .4byte gAnimBankAttacker thumb_func_end sub_80E3194 @@ -3069,7 +3069,7 @@ _080E345E: cmp r0, 0x1 bne _080E34A4 ldr r1, _080E34D8 @ =gSprites - ldr r0, _080E34DC @ =gObjectBankIDs + ldr r0, _080E34DC @ =gBankSpriteIds add r0, r8 ldrb r0, [r0] lsls r2, r0, 4 @@ -3115,7 +3115,7 @@ _080E34CC: .4byte REG_BLDCNT _080E34D0: .4byte 0x00003f42 _080E34D4: .4byte REG_BG1CNT _080E34D8: .4byte gSprites -_080E34DC: .4byte gObjectBankIDs +_080E34DC: .4byte gBankSpriteIds _080E34E0: .4byte gSharedMem + 0x19348 _080E34E4: adds r0, r5, 0 @@ -3149,7 +3149,7 @@ _080E3516: lsls r0, 16 lsrs r4, r0, 16 _080E3522: - ldr r6, _080E3570 @ =gObjectBankIDs + ldr r6, _080E3570 @ =gBankSpriteIds adds r0, r5, r6 ldrb r1, [r0] adds r0, r5, 0 @@ -3184,7 +3184,7 @@ _080E3550: .align 2, 0 _080E3568: .4byte gBattlePartyID _080E356C: .4byte gPlayerParty -_080E3570: .4byte gObjectBankIDs +_080E3570: .4byte gBankSpriteIds _080E3574: .4byte gBattleStatMask1_Tilemap _080E3578: ldr r0, _080E35B0 @ =gBattleStatMask2_Tilemap @@ -3344,7 +3344,7 @@ _080E3692: mov r3, sp ldrh r3, [r3, 0x20] strh r3, [r1, 0x14] - ldr r0, _080E36D8 @ =gObjectBankIDs + ldr r0, _080E36D8 @ =gBankSpriteIds add r0, r8 ldrb r0, [r0] strh r0, [r1, 0x16] @@ -3364,7 +3364,7 @@ _080E3692: bl PlaySE12WithPanning b _080E36F4 .align 2, 0 -_080E36D8: .4byte gObjectBankIDs +_080E36D8: .4byte gBankSpriteIds _080E36DC: .4byte sub_80E3704 _080E36E0: movs r0, 0x40 @@ -4040,7 +4040,7 @@ _080E3BE6: lsls r0, 24 cmp r0, 0 beq _080E3C24 - ldr r0, _080E3C44 @ =gObjectBankIDs + ldr r0, _080E3C44 @ =gBankSpriteIds adds r0, r4, r0 ldrb r0, [r0] lsls r2, r0, 4 @@ -4074,7 +4074,7 @@ _080E3C24: .align 2, 0 _080E3C3C: .4byte gSprites _080E3C40: .4byte gAnimBankAttacker -_080E3C44: .4byte gObjectBankIDs +_080E3C44: .4byte gBankSpriteIds _080E3C48: .4byte gBattleAnimArgs thumb_func_end sub_80E3BDC @@ -4236,7 +4236,7 @@ _080E3D8A: lsls r0, 16 lsrs r4, r0, 16 _080E3D96: - ldr r5, _080E3E50 @ =gObjectBankIDs + ldr r5, _080E3E50 @ =gBankSpriteIds adds r0, r7, r5 ldrb r1, [r0] adds r0, r7, 0 @@ -4322,7 +4322,7 @@ _080E3DE6: .align 2, 0 _080E3E48: .4byte gBattlePartyID _080E3E4C: .4byte gPlayerParty -_080E3E50: .4byte gObjectBankIDs +_080E3E50: .4byte gBankSpriteIds _080E3E54: .4byte gBattle_BG1_X _080E3E58: .4byte gBattle_BG1_Y _080E3E5C: .4byte gTasks diff --git a/asm/unk_text_8095904.s b/asm/unk_text_8095904.s deleted file mode 100644 index 00c81faca..000000000 --- a/asm/unk_text_8095904.s +++ /dev/null @@ -1,256 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_8095904 -sub_8095904: @ 8095904 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - str r0, [sp] - adds r7, r1, 0 - adds r4, r2, 0 - ldr r0, [sp, 0x3C] - lsls r4, 24 - lsrs r4, 24 - lsls r3, 16 - lsrs r3, 16 - str r3, [sp, 0x4] - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x8] - ldr r0, [sp] - bl StringLength - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - cmp r4, 0 - bne _08095988 - movs r5, 0 - cmp r5, r8 - bcs _08095A2E -_0809593E: - ldr r1, [sp] - adds r0, r1, r5 - ldrb r2, [r0] - ldr r0, _08095980 @ =0x0000fff0 - ands r0, r2 - lsls r0, 6 - movs r1, 0xF - ands r2, r1 - lsls r2, 5 - adds r0, r2 - ldr r1, _08095984 @ =gFont3LatinGlyphs - adds r4, r0, r1 - adds r0, r4, 0 - adds r1, r7, 0 - movs r2, 0x10 - bl CpuSet - movs r2, 0x80 - lsls r2, 2 - adds r0, r4, r2 - ldr r3, [sp, 0x4] - adds r1, r7, r3 - movs r2, 0x10 - bl CpuSet - adds r7, 0x20 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcc _0809593E - b _08095A2E - .align 2, 0 -_08095980: .4byte 0x0000fff0 -_08095984: .4byte gFont3LatinGlyphs -_08095988: - movs r0, 0 - mov r9, r0 - ldr r1, [sp, 0x8] - lsls r0, r1, 28 - lsrs r0, 24 - str r0, [sp, 0xC] - mov r2, r8 - lsls r0, r2, 21 - movs r1, 0 - lsrs r0, 1 - str r0, [sp, 0x10] -_0809599E: - movs r5, 0 - ldr r3, [sp, 0x4] - adds r3, r7, r3 - str r3, [sp, 0x14] - adds r0, r1, 0x1 - str r0, [sp, 0x18] - cmp r5, r8 - bcs _08095A12 - movs r2, 0xF - mov r12, r2 - lsls r1, 9 - ldr r0, _08095A40 @ =gFont3LatinGlyphs - adds r1, r0 - mov r10, r1 -_080959BA: - ldr r3, [sp] - adds r0, r3, r5 - ldrb r1, [r0] - ldr r0, _08095A44 @ =0x0000fff0 - ands r0, r1 - lsls r0, 6 - mov r2, r12 - ands r1, r2 - lsls r1, 5 - adds r0, r1 - mov r3, r10 - adds r4, r0, r3 - movs r6, 0 - adds r5, 0x1 -_080959D6: - ldrb r0, [r4] - movs r3, 0xF0 - ands r3, r0 - mov r2, r12 - ands r2, r0 - cmp r3, 0 - bne _080959E6 - ldr r3, [sp, 0xC] -_080959E6: - cmp r2, 0 - bne _080959EC - ldr r2, [sp, 0x8] -_080959EC: - mov r0, r9 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - ldr r1, [sp, 0x40] - adds r0, r1, r0 - orrs r3, r2 - strb r3, [r0] - adds r4, 0x1 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1F - bls _080959D6 - lsls r0, r5, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcc _080959BA -_08095A12: - ldr r0, [sp, 0x40] - adds r1, r7, 0 - ldr r3, [sp, 0x10] - lsrs r2, r3, 16 - bl CpuSet - ldr r7, [sp, 0x14] - movs r0, 0 - mov r9, r0 - ldr r1, [sp, 0x18] - lsls r0, r1, 16 - lsrs r1, r0, 16 - cmp r1, 0x1 - bls _0809599E -_08095A2E: - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08095A40: .4byte gFont3LatinGlyphs -_08095A44: .4byte 0x0000fff0 - thumb_func_end sub_8095904 - - thumb_func_start unref_sub_8095A48 -unref_sub_8095A48: @ 8095A48 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - adds r4, r0, 0 - adds r5, r1, 0 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - lsls r3, 24 - lsrs r7, r3, 24 - movs r6, 0 -_08095A60: - movs r3, 0 - ldrb r0, [r4] - adds r1, r0, 0 - adds r2, r0, 0 - cmp r1, 0xFF - beq _08095ACE -_08095A6C: - mov r0, sp - adds r0, r3 - adds r0, 0x8 - strb r2, [r0] - adds r4, 0x1 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x3 - bhi _08095AA8 - ldrb r0, [r4] - adds r1, r0, 0 - adds r2, r0, 0 - cmp r1, 0xFF - bne _08095A6C - cmp r3, 0 - beq _08095ACE - movs r6, 0x1 - cmp r3, 0x3 - bhi _08095AA8 - movs r2, 0 -_08095A96: - adds r0, r3, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r3, r1, 16 - add r0, sp - adds r0, 0x8 - strb r2, [r0] - cmp r3, 0x3 - bls _08095A96 -_08095AA8: - mov r1, sp - adds r1, r3 - adds r1, 0x8 - movs r0, 0xFF - strb r0, [r1] - str r7, [sp] - ldr r0, [sp, 0x28] - str r0, [sp, 0x4] - add r0, sp, 0x8 - adds r1, r5, 0 - mov r2, r8 - movs r3, 0x80 - bl sub_8095904 - movs r0, 0x80 - lsls r0, 1 - adds r5, r0 - cmp r6, 0 - beq _08095A60 -_08095ACE: - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end unref_sub_8095A48 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/water.s b/asm/water.s index 45fb7f82a..0bbddd2ca 100644 --- a/asm/water.s +++ b/asm/water.s @@ -2075,7 +2075,7 @@ _080D4B38: .4byte sub_80D4B3C sub_80D4B3C: @ 80D4B3C push {r4-r6,lr} adds r6, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _080D4B96 @@ -2126,7 +2126,7 @@ _080D4BA0: .4byte sub_80D4BA4 sub_80D4BA4: @ 80D4BA4 push {r4-r6,lr} adds r5, r0, 0 - bl sub_8078718 + bl TranslateAnimSpriteLinearAndSine lsls r0, 24 cmp r0, 0 beq _080D4BE0 @@ -2264,7 +2264,7 @@ sub_80D4CA4: @ 80D4CA4 push {r4,r5,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80787B0 + bl InitAnimSpritePos ldr r5, _080D4CE0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 |