battle_anim_mons

This commit is contained in:
jiangzhengwenjz
2019-10-05 03:06:45 +08:00
parent eef286808a
commit e9cdb63903
44 changed files with 3147 additions and 7178 deletions
+8 -8
View File
@@ -4145,16 +4145,16 @@ _08011F3C:
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
_08011F46: _08011F46:
ldr r1, _08011F4C @ =gUnknown_82349CC ldr r1, _08011F4C @ =gMonFrontPicCoords
lsls r0, 2 lsls r0, 2
b _08011F88 b _08011F88
.align 2, 0 .align 2, 0
_08011F4C: .4byte gUnknown_82349CC _08011F4C: .4byte gMonFrontPicCoords
_08011F50: _08011F50:
ldr r0, _08011F68 @ =0x00000181 ldr r0, _08011F68 @ =0x00000181
cmp r4, r0 cmp r4, r0
bne _08011F74 bne _08011F74
ldr r0, _08011F6C @ =gUnknown_83AE03C ldr r0, _08011F6C @ =gCastformFrontSpriteCoords
ldr r1, _08011F70 @ =gBattleMonForms ldr r1, _08011F70 @ =gBattleMonForms
adds r1, r6, r1 adds r1, r6, r1
ldrb r1, [r1] ldrb r1, [r1]
@@ -4164,19 +4164,19 @@ _08011F50:
b _08011F8C b _08011F8C
.align 2, 0 .align 2, 0
_08011F68: .4byte 0x00000181 _08011F68: .4byte 0x00000181
_08011F6C: .4byte gUnknown_83AE03C _08011F6C: .4byte gCastformFrontSpriteCoords
_08011F70: .4byte gBattleMonForms _08011F70: .4byte gBattleMonForms
_08011F74: _08011F74:
movs r0, 0xCE movs r0, 0xCE
lsls r0, 1 lsls r0, 1
cmp r4, r0 cmp r4, r0
bls _08011F84 bls _08011F84
ldr r0, _08011F80 @ =gUnknown_82349CC ldr r0, _08011F80 @ =gMonFrontPicCoords
b _08011F8A b _08011F8A
.align 2, 0 .align 2, 0
_08011F80: .4byte gUnknown_82349CC _08011F80: .4byte gMonFrontPicCoords
_08011F84: _08011F84:
ldr r1, _08011FAC @ =gUnknown_82349CC ldr r1, _08011FAC @ =gMonFrontPicCoords
lsls r0, r4, 2 lsls r0, r4, 2
_08011F88: _08011F88:
adds r0, r1 adds r0, r1
@@ -4199,7 +4199,7 @@ _08011F8C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08011FAC: .4byte gUnknown_82349CC _08011FAC: .4byte gMonFrontPicCoords
_08011FB0: .4byte sub_8011FB4 _08011FB0: .4byte sub_8011FB4
thumb_func_end SpriteCB_FaintOpponentMon thumb_func_end SpriteCB_FaintOpponentMon
+4 -4
View File
@@ -3960,7 +3960,7 @@ sub_8074320: @ 8074320
cmp r7, 0 cmp r7, 0
bne _08074370 bne _08074370
ldrb r0, [r6] ldrb r0, [r6]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0 movs r0, 0
@@ -3971,7 +3971,7 @@ _08074368: .4byte gBattleAnimAttacker
_0807436C: .4byte gBattleAnimTarget _0807436C: .4byte gBattleAnimTarget
_08074370: _08074370:
ldrb r0, [r5] ldrb r0, [r5]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0x1 movs r0, 0x1
@@ -4042,7 +4042,7 @@ sub_80743C8: @ 80743C8
cmp r7, 0 cmp r7, 0
bne _08074418 bne _08074418
ldrb r0, [r6] ldrb r0, [r6]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0 movs r0, 0
@@ -4053,7 +4053,7 @@ _08074410: .4byte gBattleAnimAttacker
_08074414: .4byte gBattleAnimTarget _08074414: .4byte gBattleAnimTarget
_08074418: _08074418:
ldrb r0, [r5] ldrb r0, [r5]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0x1 movs r0, 0x1
File diff suppressed because it is too large Load Diff
+83 -83
View File
@@ -9,12 +9,12 @@
sub_80A6E48: @ 80A6E48 sub_80A6E48: @ 80A6E48
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_8074FCC bl SetSpriteCoordsToAnimAttackerCoords
ldr r5, _080A6E8C @ =gBattleAnimArgs ldr r5, _080A6E8C @ =gBattleAnimArgs
movs r0, 0 movs r0, 0
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8074FF8 bl SetAnimSpriteInitialXOffset
ldrh r0, [r5, 0x2] ldrh r0, [r5, 0x2]
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
adds r0, r1 adds r0, r1
@@ -27,10 +27,10 @@ sub_80A6E48: @ 80A6E48
strh r0, [r4, 0x34] strh r0, [r4, 0x34]
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
ldr r1, _080A6E90 @ =move_anim_8074EE0 ldr r1, _080A6E90 @ =DestroySpriteAndMatrix
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r1, _080A6E94 @ =sub_8074BE4 ldr r1, _080A6E94 @ =TranslateSpriteInEllipseOverDuration
str r1, [r4, 0x1C] str r1, [r4, 0x1C]
adds r0, r4, 0 adds r0, r4, 0
bl _call_via_r1 bl _call_via_r1
@@ -39,8 +39,8 @@ sub_80A6E48: @ 80A6E48
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A6E8C: .4byte gBattleAnimArgs _080A6E8C: .4byte gBattleAnimArgs
_080A6E90: .4byte move_anim_8074EE0 _080A6E90: .4byte DestroySpriteAndMatrix
_080A6E94: .4byte sub_8074BE4 _080A6E94: .4byte TranslateSpriteInEllipseOverDuration
thumb_func_end sub_80A6E48 thumb_func_end sub_80A6E48
thumb_func_start sub_80A6E98 thumb_func_start sub_80A6E98
@@ -166,7 +166,7 @@ sub_80A6F3C: @ 80A6F3C
adds r0, r3 adds r0, r3
strh r2, [r0, 0x24] strh r2, [r0, 0x24]
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080A6F7A: _080A6F7A:
ldrh r0, [r4, 0x2E] ldrh r0, [r4, 0x2E]
subs r0, 0x1 subs r0, 0x1
@@ -254,7 +254,7 @@ sub_80A7020: @ 80A7020
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r1, _080A704C @ =gBattleAnimArgs ldr r1, _080A704C @ =gBattleAnimArgs
ldrh r0, [r1, 0x4] ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@@ -262,7 +262,7 @@ sub_80A7020: @ 80A7020
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
ldrh r0, [r1, 0x8] ldrh r0, [r1, 0x8]
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
ldr r0, _080A7050 @ =sub_8074C44 ldr r0, _080A7050 @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080A7054 @ =sub_80A7058 ldr r1, _080A7054 @ =sub_80A7058
adds r0, r4, 0 adds r0, r4, 0
@@ -272,7 +272,7 @@ sub_80A7020: @ 80A7020
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A704C: .4byte gBattleAnimArgs _080A704C: .4byte gBattleAnimArgs
_080A7050: .4byte sub_8074C44 _080A7050: .4byte WaitAnimForDuration
_080A7054: .4byte sub_80A7058 _080A7054: .4byte sub_80A7058
thumb_func_end sub_80A7020 thumb_func_end sub_80A7020
@@ -438,7 +438,7 @@ _080A7176:
_080A718A: _080A718A:
strh r1, [r0, 0x26] strh r1, [r0, 0x26]
adds r0, r4, 0 adds r0, r4, 0
bl sub_80759DC bl SetBattlerSpriteYOffsetFromRotation
ldr r0, _080A71C8 @ =gTasks ldr r0, _080A71C8 @ =gTasks
adds r1, r6, r5 adds r1, r6, r5
lsls r1, 3 lsls r1, 3
@@ -479,7 +479,7 @@ _080A71D0:
sub_80A71D8: @ 80A71D8 sub_80A71D8: @ 80A71D8
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_8074FCC bl SetSpriteCoordsToAnimAttackerCoords
ldr r0, _080A71FC @ =gBattleAnimAttacker ldr r0, _080A71FC @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -544,7 +544,7 @@ _080A724C:
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
_080A7260: _080A7260:
ldr r0, _080A7274 @ =sub_8074F6C ldr r0, _080A7274 @ =RunStoredCallbackWhenAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080A7278 @ =DestroyAnimSprite ldr r1, _080A7278 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -553,7 +553,7 @@ _080A7260:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A7274: .4byte sub_8074F6C _080A7274: .4byte RunStoredCallbackWhenAnimEnds
_080A7278: .4byte DestroyAnimSprite _080A7278: .4byte DestroyAnimSprite
thumb_func_end sub_80A71D8 thumb_func_end sub_80A71D8
@@ -562,8 +562,8 @@ sub_80A727C: @ 80A727C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080A7298 @ =sub_8074F50 ldr r0, _080A7298 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080A729C @ =sub_80A72A0 ldr r1, _080A729C @ =sub_80A72A0
adds r0, r4, 0 adds r0, r4, 0
@@ -572,7 +572,7 @@ sub_80A727C: @ 80A727C
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A7298: .4byte sub_8074F50 _080A7298: .4byte RunStoredCallbackWhenAffineAnimEnds
_080A729C: .4byte sub_80A72A0 _080A729C: .4byte sub_80A72A0
thumb_func_end sub_80A727C thumb_func_end sub_80A727C
@@ -635,7 +635,7 @@ _080A72EC:
_080A730E: _080A730E:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r4, _080A73BC @ =gBattleAnimTarget ldr r4, _080A73BC @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -671,7 +671,7 @@ _080A730E:
subs r1, r2 subs r1, r2
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8075B30 bl ArcTan2Neg
lsls r0, 16 lsls r0, 16
movs r1, 0xF0 movs r1, 0xF0
lsls r1, 24 lsls r1, 24
@@ -692,7 +692,7 @@ _080A7380:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
adds r2, r3, 0 adds r2, r3, 0
bl sub_8075A1C bl TrySetSpriteRotScale
ldrh r0, [r6, 0x8] ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
mov r0, r8 mov r0, r8
@@ -1276,7 +1276,7 @@ _080A77B6:
movs r1, 0 movs r1, 0
mov r2, sp mov r2, sp
mov r3, r10 mov r3, r10
bl sub_8076D9C bl SetAverageBattlerPositions
b _080A7842 b _080A7842
.align 2, 0 .align 2, 0
_080A7810: .4byte gBattleAnimAttacker _080A7810: .4byte gBattleAnimAttacker
@@ -1506,7 +1506,7 @@ sub_80A79E8: @ 80A79E8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080A7A10 @ =gUnknown_83E3D18 ldr r0, _080A7A10 @ =gUnknown_83E3D18
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]
bl IndexOfSpritePaletteTag bl IndexOfSpritePaletteTag
@@ -1592,7 +1592,7 @@ sub_80A7A88: @ 80A7A88
sub sp, 0x4 sub sp, 0x4
adds r5, r0, 0 adds r5, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r4, _080A7B28 @ =gBattleAnimTarget ldr r4, _080A7B28 @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -1636,7 +1636,7 @@ _080A7ACC:
subs r1, r2 subs r1, r2
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8075B30 bl ArcTan2Neg
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
lsls r1, 24 lsls r1, 24
@@ -1648,7 +1648,7 @@ _080A7ACC:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
adds r2, r3, 0 adds r2, r3, 0
bl sub_8075A1C bl TrySetSpriteRotScale
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
strh r6, [r5, 0x32] strh r6, [r5, 0x32]
@@ -1748,7 +1748,7 @@ sub_80A7BC4: @ 80A7BC4
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
movs r0, 0x14 movs r0, 0x14
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldr r5, _080A7C10 @ =gBattleAnimTarget ldr r5, _080A7C10 @ =gBattleAnimTarget
@@ -1907,7 +1907,7 @@ sub_80A7D04: @ 80A7D04
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080A7D54 @ =gBattleAnimAttacker ldr r0, _080A7D54 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -1929,7 +1929,7 @@ _080A7D22:
strh r0, [r4, 0x34] strh r0, [r4, 0x34]
ldrh r0, [r1, 0x6] ldrh r0, [r1, 0x6]
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
ldr r0, _080A7D5C @ =sub_8074A80 ldr r0, _080A7D5C @ =TranslateSpriteInCircleOverDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080A7D60 @ =DestroyAnimSprite ldr r1, _080A7D60 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -1943,7 +1943,7 @@ _080A7D22:
.align 2, 0 .align 2, 0
_080A7D54: .4byte gBattleAnimAttacker _080A7D54: .4byte gBattleAnimAttacker
_080A7D58: .4byte gBattleAnimArgs _080A7D58: .4byte gBattleAnimArgs
_080A7D5C: .4byte sub_8074A80 _080A7D5C: .4byte TranslateSpriteInCircleOverDuration
_080A7D60: .4byte DestroyAnimSprite _080A7D60: .4byte DestroyAnimSprite
thumb_func_end sub_80A7D04 thumb_func_end sub_80A7D04
@@ -2094,7 +2094,7 @@ _080A7E48:
adds r0, r6 adds r0, r6
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldrh r0, [r7] ldrh r0, [r7]
strh r0, [r5, 0x38] strh r0, [r5, 0x38]
ldrh r0, [r5, 0x2E] ldrh r0, [r5, 0x2E]
@@ -2119,7 +2119,7 @@ _080A7EB8: .4byte sub_80A7EBC
sub_80A7EBC: @ 80A7EBC sub_80A7EBC: @ 80A7EBC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A7F20 beq _080A7F20
@@ -2233,7 +2233,7 @@ _080A7F90: .4byte sub_80A7F94
sub_80A7F94: @ 80A7F94 sub_80A7F94: @ 80A7F94
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A7FA8 beq _080A7FA8
@@ -2273,7 +2273,7 @@ sub_80A7FB0: @ 80A7FB0
lsrs r0, 4 lsrs r0, 4
adds r0, 0x10 adds r0, 0x10
movs r1, 0 movs r1, 0
bl sub_8075B48 bl SetGreyscaleOrOriginalPalette
ldr r1, _080A800C @ =gTasks ldr r1, _080A800C @ =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -2327,7 +2327,7 @@ sub_80A8014: @ 80A8014
lsrs r0, 4 lsrs r0, 4
adds r0, 0x10 adds r0, 0x10
movs r1, 0x1 movs r1, 0x1
bl sub_8075B48 bl SetGreyscaleOrOriginalPalette
adds r0, r5, 0 adds r0, r5, 0
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
_080A8064: _080A8064:
@@ -2441,7 +2441,7 @@ _080A8128:
movs r3, 0 movs r3, 0
bl SetSpriteRotScale bl SetSpriteRotScale
ldrb r0, [r4, 0x8] ldrb r0, [r4, 0x8]
bl sub_8076440 bl SetBattlerSpriteYOffsetFromYScale
movs r2, 0xC movs r2, 0xC
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
cmp r0, 0x20 cmp r0, 0x20
@@ -2473,7 +2473,7 @@ _080A816E:
movs r3, 0 movs r3, 0
bl SetSpriteRotScale bl SetSpriteRotScale
ldrb r0, [r4, 0x8] ldrb r0, [r4, 0x8]
bl sub_8076440 bl SetBattlerSpriteYOffsetFromYScale
movs r0, 0x2 movs r0, 0x2
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
b _080A81F6 b _080A81F6
@@ -2504,7 +2504,7 @@ _080A81A4:
movs r3, 0 movs r3, 0
bl SetSpriteRotScale bl SetSpriteRotScale
ldrb r0, [r4, 0x8] ldrb r0, [r4, 0x8]
bl sub_8076440 bl SetBattlerSpriteYOffsetFromYScale
movs r2, 0xC movs r2, 0xC
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
cmp r0, 0x20 cmp r0, 0x20
@@ -2733,7 +2733,7 @@ _080A8364:
strh r2, [r4, 0x10] strh r2, [r4, 0x10]
ldr r2, _080A8390 @ =gUnknown_83E3E60 ldr r2, _080A8390 @ =gUnknown_83E3E60
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080A8394 @ =sub_80A8398 ldr r0, _080A8394 @ =sub_80A8398
str r0, [r4] str r0, [r4]
_080A838A: _080A838A:
@@ -2774,7 +2774,7 @@ _080A83C0:
b _080A84A8 b _080A84A8
_080A83CA: _080A83CA:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
ldrh r2, [r4, 0x10] ldrh r2, [r4, 0x10]
adds r2, 0x3 adds r2, 0x3
strh r2, [r4, 0x10] strh r2, [r4, 0x10]
@@ -2801,7 +2801,7 @@ _080A83CA:
_080A83FC: .4byte gSprites _080A83FC: .4byte gSprites
_080A8400: _080A8400:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
ldr r2, _080A8430 @ =gSprites ldr r2, _080A8430 @ =gSprites
movs r0, 0x8 movs r0, 0x8
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
@@ -2853,7 +2853,7 @@ _080A845C:
b _080A84A8 b _080A84A8
_080A8464: _080A8464:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0 cmp r5, 0
@@ -2881,7 +2881,7 @@ _080A849C:
ldrb r1, [r4, 0x8] ldrb r1, [r4, 0x8]
ldr r2, _080A84B0 @ =gUnknown_83E3E60 ldr r2, _080A84B0 @ =gUnknown_83E3E60
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
strh r5, [r4, 0xA] strh r5, [r4, 0xA]
_080A84A8: _080A84A8:
pop {r4-r6} pop {r4-r6}
@@ -2908,7 +2908,7 @@ sub_80A84B4: @ 80A84B4
lsrs r1, 24 lsrs r1, 24
ldr r2, _080A84E8 @ =gUnknown_83E3E80 ldr r2, _080A84E8 @ =gUnknown_83E3E80
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080A84EC @ =sub_80A84F0 ldr r0, _080A84EC @ =sub_80A84F0
str r0, [r4] str r0, [r4]
pop {r4} pop {r4}
@@ -2930,7 +2930,7 @@ sub_80A84F0: @ 80A84F0
lsls r0, 3 lsls r0, 3
ldr r1, _080A8518 @ =gTasks ldr r1, _080A8518 @ =gTasks
adds r0, r1 adds r0, r1
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080A8510 bne _080A8510
@@ -2998,7 +2998,7 @@ _080A856A:
ldr r1, _080A85A4 @ =DestroyAnimSprite ldr r1, _080A85A4 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080A85A8 @ =sub_8074D00 ldr r0, _080A85A8 @ =TranslateSpriteLinearFixedPoint
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -3007,7 +3007,7 @@ _080A856A:
_080A859C: .4byte 0x0000ffc0 _080A859C: .4byte 0x0000ffc0
_080A85A0: .4byte gBattleAnimAttacker _080A85A0: .4byte gBattleAnimAttacker
_080A85A4: .4byte DestroyAnimSprite _080A85A4: .4byte DestroyAnimSprite
_080A85A8: .4byte sub_8074D00 _080A85A8: .4byte TranslateSpriteLinearFixedPoint
thumb_func_end sub_80A851C thumb_func_end sub_80A851C
thumb_func_start sub_80A85AC thumb_func_start sub_80A85AC
@@ -3064,10 +3064,10 @@ _080A85E4:
movs r0, 0x8 movs r0, 0x8
strh r0, [r6, 0x22] strh r0, [r6, 0x22]
_080A8616: _080A8616:
ldr r1, _080A8630 @ =move_anim_8074EE0 ldr r1, _080A8630 @ =DestroySpriteAndMatrix
adds r0, r6, 0 adds r0, r6, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080A8634 @ =sub_8074F50 ldr r0, _080A8634 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r6, 0x1C] str r0, [r6, 0x1C]
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -3075,8 +3075,8 @@ _080A8616:
.align 2, 0 .align 2, 0
_080A8628: .4byte gBattleAnimTarget _080A8628: .4byte gBattleAnimTarget
_080A862C: .4byte gBattleAnimArgs _080A862C: .4byte gBattleAnimArgs
_080A8630: .4byte move_anim_8074EE0 _080A8630: .4byte DestroySpriteAndMatrix
_080A8634: .4byte sub_8074F50 _080A8634: .4byte RunStoredCallbackWhenAffineAnimEnds
thumb_func_end sub_80A85AC thumb_func_end sub_80A85AC
thumb_func_start sub_80A8638 thumb_func_start sub_80A8638
@@ -3099,7 +3099,7 @@ sub_80A8638: @ 80A8638
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
ldr r2, _080A8670 @ =gUnknown_83E3F1C ldr r2, _080A8670 @ =gUnknown_83E3F1C
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080A8674 @ =sub_80A8678 ldr r0, _080A8674 @ =sub_80A8678
str r0, [r4] str r0, [r4]
pop {r4} pop {r4}
@@ -3121,7 +3121,7 @@ sub_80A8678: @ 80A8678
lsls r0, 3 lsls r0, 3
ldr r1, _080A86A0 @ =gTasks ldr r1, _080A86A0 @ =gTasks
adds r0, r1 adds r0, r1
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080A8698 bne _080A8698
@@ -3389,7 +3389,7 @@ sub_80A8874: @ 80A8874
adds r5, r1, r0 adds r5, r1, r0
ldr r4, _080A88C8 @ =gBattleAnimTarget ldr r4, _080A88C8 @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x20 adds r0, 0x20
@@ -3402,10 +3402,10 @@ sub_80A8874: @ 80A8874
strh r1, [r5, 0x10] strh r1, [r5, 0x10]
strh r1, [r5, 0x12] strh r1, [r5, 0x12]
ldrb r0, [r4] ldrb r0, [r4]
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
strh r0, [r5, 0x26] strh r0, [r5, 0x26]
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3609,7 +3609,7 @@ sub_80A8A1C: @ 80A8A1C
movs r5, 0 movs r5, 0
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
ldrb r0, [r6] ldrb r0, [r6]
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x10 adds r0, 0x10
@@ -3622,7 +3622,7 @@ sub_80A8A1C: @ 80A8A1C
strh r5, [r4, 0x36] strh r5, [r4, 0x36]
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x2 adds r0, 0x2
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
movs r0, 0x3F movs r0, 0x3F
@@ -3864,7 +3864,7 @@ _080A8BF2:
adds r1, r4, 0 adds r1, r4, 0
mov r2, sp mov r2, sp
adds r3, r7, 0 adds r3, r7, 0
bl sub_8076D9C bl SetAverageBattlerPositions
cmp r4, 0 cmp r4, 0
bne _080A8C30 bne _080A8C30
adds r0, r5, 0 adds r0, r5, 0
@@ -3919,7 +3919,7 @@ _080A8C80: .4byte sub_8075D9C
sub_80A8C84: @ 80A8C84 sub_80A8C84: @ 80A8C84
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A8C9E beq _080A8C9E
@@ -4128,7 +4128,7 @@ _080A8DFA:
mov r2, sp mov r2, sp
mov r3, sp mov r3, sp
adds r3, 0x2 adds r3, 0x2
bl sub_8076D9C bl SetAverageBattlerPositions
b _080A8E6C b _080A8E6C
.align 2, 0 .align 2, 0
_080A8E40: .4byte gSprites _080A8E40: .4byte gSprites
@@ -4192,7 +4192,7 @@ _080A8E9E:
ldrh r0, [r2] ldrh r0, [r2]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r1, _080A8EE4 @ =sub_80A8C84 ldr r1, _080A8EE4 @ =sub_80A8C84
str r1, [r5, 0x1C] str r1, [r5, 0x1C]
adds r0, r5, 0 adds r0, r5, 0
@@ -4252,7 +4252,7 @@ sub_80A8F38: @ 80A8F38
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080A8F6C @ =gBattleAnimAttacker ldr r0, _080A8F6C @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -4572,7 +4572,7 @@ sub_80A917C: @ 80A917C
strh r1, [r4, 0x8] strh r1, [r4, 0x8]
ldr r2, _080A91B0 @ =gUnknown_83E4128 ldr r2, _080A91B0 @ =gUnknown_83E4128
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080A91B4 @ =sub_80A91B8 ldr r0, _080A91B4 @ =sub_80A91B8
str r0, [r4] str r0, [r4]
pop {r4} pop {r4}
@@ -4595,7 +4595,7 @@ sub_80A91B8: @ 80A91B8
ldr r1, _080A9208 @ =gTasks ldr r1, _080A9208 @ =gTasks
adds r4, r0, r1 adds r4, r0, r1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0 cmp r3, 0
@@ -5411,7 +5411,7 @@ sub_80A97E8: @ 80A97E8
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r6, _080A9850 @ =gBattleAnimAttacker ldr r6, _080A9850 @ =gBattleAnimAttacker
ldrb r0, [r6] ldrb r0, [r6]
bl GetBattlerSide bl GetBattlerSide
@@ -5474,7 +5474,7 @@ sub_80A9860: @ 80A9860
bne _080A987A bne _080A987A
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
_080A987A: _080A987A:
movs r1, 0x30 movs r1, 0x30
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
@@ -5708,7 +5708,7 @@ sub_80A9A20: @ 80A9A20
lsrs r1, 24 lsrs r1, 24
ldr r2, _080A9A74 @ =gUnknown_83E4200 ldr r2, _080A9A74 @ =gUnknown_83E4200
adds r0, r5, 0 adds r0, r5, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r1, _080A9A78 @ =gSprites ldr r1, _080A9A78 @ =gSprites
lsls r0, r4, 4 lsls r0, r4, 4
adds r0, r4 adds r0, r4
@@ -5731,7 +5731,7 @@ _080A9A7C:
negs r0, r0 negs r0, r0
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0 cmp r0, 0
@@ -5777,7 +5777,7 @@ sub_80A9AB0: @ 80A9AB0
lsrs r1, 24 lsrs r1, 24
ldr r2, _080A9B04 @ =gUnknown_83E4200 ldr r2, _080A9B04 @ =gUnknown_83E4200
adds r0, r5, 0 adds r0, r5, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r1, _080A9B08 @ =gSprites ldr r1, _080A9B08 @ =gSprites
lsls r0, r4, 4 lsls r0, r4, 4
adds r0, r4 adds r0, r4
@@ -5800,7 +5800,7 @@ _080A9B0C:
negs r0, r0 negs r0, r0
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0 cmp r0, 0
@@ -5822,7 +5822,7 @@ sub_80A9B40: @ 80A9B40
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
movs r0, 0x5F movs r0, 0x5F
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20] ldrh r0, [r4, 0x20]
@@ -5843,7 +5843,7 @@ sub_80A9B40: @ 80A9B40
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
adds r0, r4, 0 adds r0, r4, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r0, _080A9B88 @ =sub_80A9B8C ldr r0, _080A9B88 @ =sub_80A9B8C
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4,r5} pop {r4,r5}
@@ -5858,7 +5858,7 @@ _080A9B88: .4byte sub_80A9B8C
sub_80A9B8C: @ 80A9B8C sub_80A9B8C: @ 80A9B8C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080A9BB6 bne _080A9BB6
@@ -5967,7 +5967,7 @@ sub_80A9C4C: @ 80A9C4C
strh r1, [r0, 0x2E] strh r1, [r0, 0x2E]
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
strh r1, [r0, 0x30] strh r1, [r0, 0x30]
ldr r1, _080A9C74 @ =sub_8074C44 ldr r1, _080A9C74 @ =WaitAnimForDuration
str r1, [r0, 0x1C] str r1, [r0, 0x1C]
ldr r1, _080A9C78 @ =sub_80A9C7C ldr r1, _080A9C78 @ =sub_80A9C7C
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
@@ -5975,7 +5975,7 @@ sub_80A9C4C: @ 80A9C4C
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A9C70: .4byte gBattleAnimArgs _080A9C70: .4byte gBattleAnimArgs
_080A9C74: .4byte sub_8074C44 _080A9C74: .4byte WaitAnimForDuration
_080A9C78: .4byte sub_80A9C7C _080A9C78: .4byte sub_80A9C7C
thumb_func_end sub_80A9C4C thumb_func_end sub_80A9C4C
@@ -6082,7 +6082,7 @@ _080A9D2A:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080A9DAC @ =gFile_graphics_battle_anims_backgrounds_attract_tilemap ldr r1, _080A9DAC @ =gFile_graphics_battle_anims_backgrounds_attract_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080A9DB0 @ =gFile_graphics_battle_anims_backgrounds_attract_sheet ldr r1, _080A9DB0 @ =gFile_graphics_battle_anims_backgrounds_attract_sheet
@@ -6360,7 +6360,7 @@ _080A9F98:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080A9FB8 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap ldr r1, _080A9FB8 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
b _080A9FC6 b _080A9FC6
.align 2, 0 .align 2, 0
_080A9FB4: .4byte gBattleAnimTarget _080A9FB4: .4byte gBattleAnimTarget
@@ -6369,7 +6369,7 @@ _080A9FBC:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080AA010 @ =gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap ldr r1, _080AA010 @ =gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
_080A9FC6: _080A9FC6:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
@@ -6907,7 +6907,7 @@ sub_80AA3F0: @ 80AA3F0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080AA404 @ =sub_80AA3D4 ldr r0, _080AA404 @ =sub_80AA3D4
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
@@ -7439,7 +7439,7 @@ sub_80AA7C8: @ 80AA7C8
adds r4, r0 adds r4, r0
ldr r2, _080AA804 @ =gUnknown_83E4410 ldr r2, _080AA804 @ =gUnknown_83E4410
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080AA808 @ =sub_80AA80C ldr r0, _080AA808 @ =sub_80AA80C
str r0, [r4] str r0, [r4]
pop {r4,r5} pop {r4,r5}
@@ -7462,7 +7462,7 @@ sub_80AA80C: @ 80AA80C
lsls r0, 3 lsls r0, 3
ldr r1, _080AA834 @ =gTasks ldr r1, _080AA834 @ =gTasks
adds r0, r1 adds r0, r1
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080AA82C bne _080AA82C
@@ -7640,7 +7640,7 @@ _080AA95A:
lsrs r0, 4 lsrs r0, 4
adds r0, 0x10 adds r0, 0x10
movs r1, 0 movs r1, 0
bl sub_8075B48 bl SetGreyscaleOrOriginalPalette
_080AA978: _080AA978:
movs r0, 0x2E movs r0, 0x2E
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
@@ -7857,7 +7857,7 @@ sub_80AAAE4: @ 80AAAE4
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0 movs r1, 0
bl sub_8076D9C bl SetAverageBattlerPositions
ldrh r0, [r5, 0x22] ldrh r0, [r5, 0x22]
adds r0, 0x28 adds r0, 0x28
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
+91 -91
View File
@@ -128,7 +128,7 @@ sub_80DE39C: @ 80DE39C
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x5A movs r0, 0x5A
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldr r0, _080DE3D8 @ =sub_8074C44 ldr r0, _080DE3D8 @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
movs r0, 0x7 movs r0, 0x7
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
@@ -152,7 +152,7 @@ sub_80DE39C: @ 80DE39C
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DE3D8: .4byte sub_8074C44 _080DE3D8: .4byte WaitAnimForDuration
_080DE3DC: .4byte sub_80DE3E0 _080DE3DC: .4byte sub_80DE3E0
thumb_func_end sub_80DE39C thumb_func_end sub_80DE39C
@@ -228,7 +228,7 @@ sub_80DE440: @ 80DE440
adds r6, r0, 0 adds r6, r0, 0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldrh r0, [r5, 0x20] ldrh r0, [r5, 0x20]
subs r0, r7 subs r0, r7
lsls r0, 16 lsls r0, 16
@@ -237,7 +237,7 @@ sub_80DE440: @ 80DE440
subs r1, r6 subs r1, r6
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8075B30 bl ArcTan2Neg
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
lsls r1, 23 lsls r1, 23
@@ -259,7 +259,7 @@ _080DE49E:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
adds r2, r3, 0 adds r2, r3, 0
bl sub_8075A1C bl TrySetSpriteRotScale
ldr r0, _080DE4D0 @ =gBattleAnimArgs ldr r0, _080DE4D0 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
@@ -799,7 +799,7 @@ sub_80DE8B0: @ 80DE8B0
sub sp, 0x4 sub sp, 0x4
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080DE914 @ =gBattleAnimTarget ldr r0, _080DE914 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
mov r5, sp mov r5, sp
@@ -807,7 +807,7 @@ sub_80DE8B0: @ 80DE8B0
movs r1, 0 movs r1, 0
mov r2, sp mov r2, sp
adds r3, r5, 0 adds r3, r5, 0
bl sub_8076D9C bl SetAverageBattlerPositions
ldr r0, _080DE918 @ =gBattleAnimAttacker ldr r0, _080DE918 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -834,7 +834,7 @@ _080DE8E4:
ldr r0, _080DE920 @ =0x0000ffce ldr r0, _080DE920 @ =0x0000ffce
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080DE924 @ =sub_80DE928 ldr r0, _080DE924 @ =sub_80DE928
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
add sp, 0x4 add sp, 0x4
@@ -853,7 +853,7 @@ _080DE924: .4byte sub_80DE928
sub_80DE928: @ 80DE928 sub_80DE928: @ 80DE928
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080DE94A beq _080DE94A
@@ -861,7 +861,7 @@ sub_80DE928: @ 80DE928
movs r0, 0x1E movs r0, 0x1E
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
strh r1, [r4, 0x30] strh r1, [r4, 0x30]
ldr r0, _080DE950 @ =sub_8074C44 ldr r0, _080DE950 @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080DE954 @ =sub_80DE958 ldr r1, _080DE954 @ =sub_80DE958
adds r0, r4, 0 adds r0, r4, 0
@@ -871,7 +871,7 @@ _080DE94A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DE950: .4byte sub_8074C44 _080DE950: .4byte WaitAnimForDuration
_080DE954: .4byte sub_80DE958 _080DE954: .4byte sub_80DE958
thumb_func_end sub_80DE928 thumb_func_end sub_80DE928
@@ -918,17 +918,17 @@ _080DE998:
sub_80DE99C: @ 80DE99C sub_80DE99C: @ 80DE99C
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_8074FCC bl SetSpriteCoordsToAnimAttackerCoords
ldr r5, _080DE9CC @ =gBattleAnimArgs ldr r5, _080DE9CC @ =gBattleAnimArgs
movs r0, 0 movs r0, 0
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8074FF8 bl SetAnimSpriteInitialXOffset
ldrh r0, [r5, 0x2] ldrh r0, [r5, 0x2]
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
adds r0, r1 adds r0, r1
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
ldr r0, _080DE9D0 @ =sub_8074F6C ldr r0, _080DE9D0 @ =RunStoredCallbackWhenAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080DE9D4 @ =DestroyAnimSprite ldr r1, _080DE9D4 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -938,7 +938,7 @@ sub_80DE99C: @ 80DE99C
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DE9CC: .4byte gBattleAnimArgs _080DE9CC: .4byte gBattleAnimArgs
_080DE9D0: .4byte sub_8074F6C _080DE9D0: .4byte RunStoredCallbackWhenAnimEnds
_080DE9D4: .4byte DestroyAnimSprite _080DE9D4: .4byte DestroyAnimSprite
thumb_func_end sub_80DE99C thumb_func_end sub_80DE99C
@@ -951,12 +951,12 @@ sub_80DE9D8: @ 80DE9D8
cmp r0, 0 cmp r0, 0
bne _080DEA38 bne _080DEA38
adds r0, r4, 0 adds r0, r4, 0
bl sub_8074FCC bl SetSpriteCoordsToAnimAttackerCoords
ldr r5, _080DEA14 @ =gBattleAnimArgs ldr r5, _080DEA14 @ =gBattleAnimArgs
movs r2, 0 movs r2, 0
ldrsh r1, [r5, r2] ldrsh r1, [r5, r2]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8074FF8 bl SetAnimSpriteInitialXOffset
bl IsContest bl IsContest
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
@@ -1140,7 +1140,7 @@ sub_80DEB20: @ 80DEB20
bl SetGpuReg bl SetGpuReg
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
ldrb r1, [r5, 0x1] ldrb r1, [r5, 0x1]
movs r0, 0xD movs r0, 0xD
negs r0, r0 negs r0, r0
@@ -1712,11 +1712,11 @@ _080DEFC8:
ldr r4, _080DF010 @ =gBattleAnimTarget ldr r4, _080DF010 @ =gBattleAnimTarget
_080DEFCA: _080DEFCA:
ldrb r0, [r4] ldrb r0, [r4]
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
adds r0, r6, 0 adds r0, r6, 0
@@ -2155,7 +2155,7 @@ _080DF324:
lsrs r1, 24 lsrs r1, 24
ldr r2, _080DF348 @ =gUnknown_83FF080 ldr r2, _080DF348 @ =gUnknown_83FF080
adds r0, r6, 0 adds r0, r6, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldrh r0, [r6, 0xA] ldrh r0, [r6, 0xA]
adds r0, 0x1 adds r0, 0x1
strh r0, [r6, 0xA] strh r0, [r6, 0xA]
@@ -2168,7 +2168,7 @@ _080DF344: .4byte SpriteCallbackDummy
_080DF348: .4byte gUnknown_83FF080 _080DF348: .4byte gUnknown_83FF080
_080DF34C: _080DF34C:
adds r0, r6, 0 adds r0, r6, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0 cmp r0, 0
@@ -2329,7 +2329,7 @@ sub_80DF468: @ 80DF468
bne _080DF47C bne _080DF47C
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
_080DF47C: _080DF47C:
ldrh r0, [r5, 0x2E] ldrh r0, [r5, 0x2E]
adds r0, 0x1 adds r0, 0x1
@@ -2443,7 +2443,7 @@ _080DF548:
lsrs r1, 24 lsrs r1, 24
ldr r2, _080DF564 @ =gUnknown_83FF130 ldr r2, _080DF564 @ =gUnknown_83FF130
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@@ -2452,7 +2452,7 @@ _080DF548:
_080DF564: .4byte gUnknown_83FF130 _080DF564: .4byte gUnknown_83FF130
_080DF568: _080DF568:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080DF57A bne _080DF57A
@@ -2863,7 +2863,7 @@ sub_80DF848: @ 80DF848
lsrs r1, 24 lsrs r1, 24
ldr r2, _080DF884 @ =gUnknown_83FF198 ldr r2, _080DF884 @ =gUnknown_83FF198
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@@ -2873,7 +2873,7 @@ _080DF880: .4byte gTasks
_080DF884: .4byte gUnknown_83FF198 _080DF884: .4byte gUnknown_83FF198
_080DF888: _080DF888:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080DF89A bne _080DF89A
@@ -2907,7 +2907,7 @@ sub_80DF8A0: @ 80DF8A0
lsrs r1, 24 lsrs r1, 24
ldr r2, _080DF8DC @ =gUnknown_83FF1C0 ldr r2, _080DF8DC @ =gUnknown_83FF1C0
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@@ -2917,7 +2917,7 @@ _080DF8D8: .4byte gTasks
_080DF8DC: .4byte gUnknown_83FF1C0 _080DF8DC: .4byte gUnknown_83FF1C0
_080DF8E0: _080DF8E0:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080DF8F2 bne _080DF8F2
@@ -2943,7 +2943,7 @@ sub_80DF8F8: @ 80DF8F8
_080DF90A: _080DF90A:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
movs r0, 0x90 movs r0, 0x90
lsls r0, 4 lsls r0, 4
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
@@ -3008,7 +3008,7 @@ sub_80DF964: @ 80DF964
lsrs r1, 24 lsrs r1, 24
ldr r2, _080DF9A0 @ =gUnknown_83FF210 ldr r2, _080DF9A0 @ =gUnknown_83FF210
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@@ -3018,7 +3018,7 @@ _080DF99C: .4byte gTasks
_080DF9A0: .4byte gUnknown_83FF210 _080DF9A0: .4byte gUnknown_83FF210
_080DF9A4: _080DF9A4:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080DF9B6 bne _080DF9B6
@@ -3069,7 +3069,7 @@ _080DFA00:
bl SetGpuReg bl SetGpuReg
ldr r0, _080DFA24 @ =gBattleAnimAttacker ldr r0, _080DFA24 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3234,7 +3234,7 @@ _080DFB58:
bl SetGpuReg bl SetGpuReg
ldr r0, _080DFB7C @ =gBattleAnimAttacker ldr r0, _080DFB7C @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3411,7 +3411,7 @@ _080DFCCE:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080DFD1C @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap ldr r1, _080DFD1C @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080DFD20 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet ldr r1, _080DFD20 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet
@@ -4053,7 +4053,7 @@ _080E01FC:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080E0250 @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap ldr r1, _080E0250 @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080E0254 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet ldr r1, _080E0254 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet
@@ -4377,7 +4377,7 @@ sub_80E0488: @ 80E0488
lsrs r1, 24 lsrs r1, 24
ldr r2, _080E04C4 @ =gUnknown_83FF290 ldr r2, _080E04C4 @ =gUnknown_83FF290
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@@ -4387,7 +4387,7 @@ _080E04C0: .4byte gTasks
_080E04C4: .4byte gUnknown_83FF290 _080E04C4: .4byte gUnknown_83FF290
_080E04C8: _080E04C8:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E04DA bne _080E04DA
@@ -4410,7 +4410,7 @@ sub_80E04E0: @ 80E04E0
bne _080E04FE bne _080E04FE
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldrh r0, [r4, 0x2E] ldrh r0, [r4, 0x2E]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@@ -4625,7 +4625,7 @@ _080E065C:
ldrh r0, [r4, 0x26] ldrh r0, [r4, 0x26]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80759DC bl SetBattlerSpriteYOffsetFromRotation
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
@@ -4666,7 +4666,7 @@ _080E06B0:
ldrh r0, [r4, 0x26] ldrh r0, [r4, 0x26]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80759DC bl SetBattlerSpriteYOffsetFromRotation
ldrh r1, [r4, 0xA] ldrh r1, [r4, 0xA]
adds r1, 0x1 adds r1, 0x1
strh r1, [r4, 0xA] strh r1, [r4, 0xA]
@@ -4710,7 +4710,7 @@ _080E0708:
ldrh r0, [r4, 0x26] ldrh r0, [r4, 0x26]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80759DC bl SetBattlerSpriteYOffsetFromRotation
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
@@ -5044,7 +5044,7 @@ _080E09BA:
ldrh r0, [r7, 0x26] ldrh r0, [r7, 0x26]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80759DC bl SetBattlerSpriteYOffsetFromRotation
ldr r2, _080E0A28 @ =gSprites ldr r2, _080E0A28 @ =gSprites
movs r0, 0x26 movs r0, 0x26
ldrsh r1, [r7, r0] ldrsh r1, [r7, r0]
@@ -5276,7 +5276,7 @@ _080E0B88:
movs r3, 0 movs r3, 0
bl SetSpriteRotScale bl SetSpriteRotScale
adds r0, r5, 0 adds r0, r5, 0
bl sub_8076440 bl SetBattlerSpriteYOffsetFromYScale
lsls r2, r5, 4 lsls r2, r5, 4
b _080E0BE8 b _080E0BE8
_080E0BA0: _080E0BA0:
@@ -5295,7 +5295,7 @@ _080E0BB2:
movs r1, 0xD0 movs r1, 0xD0
bl SetSpriteRotScale bl SetSpriteRotScale
adds r0, r5, 0 adds r0, r5, 0
bl sub_8076440 bl SetBattlerSpriteYOffsetFromYScale
bl IsContest bl IsContest
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
@@ -5551,7 +5551,7 @@ sub_80E0D74: @ 80E0D74
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
ldrb r1, [r5, 0x1] ldrb r1, [r5, 0x1]
movs r0, 0xD movs r0, 0xD
negs r0, r0 negs r0, r0
@@ -5979,7 +5979,7 @@ _080E110E:
_080E1112: _080E1112:
ldr r0, _080E1200 @ =gBattleAnimAttacker ldr r0, _080E1200 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r5, _080E1200 @ =gBattleAnimAttacker ldr r5, _080E1200 @ =gBattleAnimAttacker
@@ -6186,7 +6186,7 @@ sub_80E1274: @ 80E1274
str r4, [sp] str r4, [sp]
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075A1C bl TrySetSpriteRotScale
ldrh r0, [r5, 0x20] ldrh r0, [r5, 0x20]
adds r0, 0x1 adds r0, 0x1
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
@@ -6197,8 +6197,8 @@ sub_80E1274: @ 80E1274
adds r0, r6, 0 adds r0, r6, 0
bl sub_8075AD8 bl sub_8075AD8
adds r0, r6, 0 adds r0, r6, 0
bl sub_8076B20 bl DestroySpriteAndFreeResources_
ldr r0, _080E12F4 @ =sub_8074FA8 ldr r0, _080E12F4 @ =DestroyAnimVisualTaskAndDisableBlend
str r0, [r5] str r0, [r5]
_080E12E2: _080E12E2:
add sp, 0x4 add sp, 0x4
@@ -6208,7 +6208,7 @@ _080E12E2:
.align 2, 0 .align 2, 0
_080E12EC: .4byte gTasks _080E12EC: .4byte gTasks
_080E12F0: .4byte gSprites _080E12F0: .4byte gSprites
_080E12F4: .4byte sub_8074FA8 _080E12F4: .4byte DestroyAnimVisualTaskAndDisableBlend
thumb_func_end sub_80E1274 thumb_func_end sub_80E1274
thumb_func_start sub_80E12F8 thumb_func_start sub_80E12F8
@@ -6262,7 +6262,7 @@ _080E1326:
strh r0, [r4, 0x18] strh r0, [r4, 0x18]
_080E1358: _080E1358:
adds r0, r5, 0 adds r0, r5, 0
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
subs r0, 0x22 subs r0, 0x22
@@ -6281,7 +6281,7 @@ _080E136C:
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
adds r0, r5, 0 adds r0, r5, 0
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -6389,7 +6389,7 @@ sub_80E1450: @ 80E1450
ldr r1, _080E1484 @ =gTasks ldr r1, _080E1484 @ =gTasks
adds r6, r0, r1 adds r6, r0, r1
ldrb r0, [r6, 0x12] ldrb r0, [r6, 0x12]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -6750,7 +6750,7 @@ sub_80E1704: @ 80E1704
strh r1, [r4, 0x26] strh r1, [r4, 0x26]
ldr r2, _080E1744 @ =gUnknown_83FF3D0 ldr r2, _080E1744 @ =gUnknown_83FF3D0
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080E1748 @ =sub_80E174C ldr r0, _080E1748 @ =sub_80E174C
str r0, [r4] str r0, [r4]
pop {r4} pop {r4}
@@ -6826,7 +6826,7 @@ _080E17C0:
adds r0, r4 adds r0, r4
lsls r0, 3 lsls r0, 3
adds r0, r6 adds r0, r6
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E17D8 bne _080E17D8
@@ -6920,7 +6920,7 @@ sub_80E186C: @ 80E186C
adds r4, r0, 0 adds r4, r0, 0
ldrh r6, [r4, 0x20] ldrh r6, [r4, 0x20]
ldrh r5, [r4, 0x22] ldrh r5, [r4, 0x22]
bl sub_8074FCC bl SetSpriteCoordsToAnimAttackerCoords
ldr r0, _080E18B4 @ =gBattleAnimArgs ldr r0, _080E18B4 @ =gBattleAnimArgs
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
@@ -7001,7 +7001,7 @@ sub_80E18BC: @ 80E18BC
cmp r0, 0x3 cmp r0, 0x3
ble _080E1922 ble _080E1922
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080E1922: _080E1922:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -7626,7 +7626,7 @@ _080E1DA2:
strh r1, [r5, 0x26] strh r1, [r5, 0x26]
ldr r2, _080E1DF8 @ =gUnknown_83FF52C ldr r2, _080E1DF8 @ =gUnknown_83FF52C
adds r0, r5, 0 adds r0, r5, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080E1DFC @ =sub_80E1E00 ldr r0, _080E1DFC @ =sub_80E1E00
str r0, [r5] str r0, [r5]
pop {r4,r5} pop {r4,r5}
@@ -7679,7 +7679,7 @@ _080E1E3A:
bl sub_80E1E98 bl sub_80E1E98
_080E1E4A: _080E1E4A:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -7701,7 +7701,7 @@ _080E1E6C:
lsrs r1, 24 lsrs r1, 24
ldr r2, _080E1E80 @ =gUnknown_83FF52C ldr r2, _080E1E80 @ =gUnknown_83FF52C
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
b _080E1E92 b _080E1E92
.align 2, 0 .align 2, 0
_080E1E80: .4byte gUnknown_83FF52C _080E1E80: .4byte gUnknown_83FF52C
@@ -8168,7 +8168,7 @@ sub_80E21CC: @ 80E21CC
adds r4, r0, 0 adds r4, r0, 0
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
lsls r0, 16 lsls r0, 16
@@ -8190,7 +8190,7 @@ _080E2224:
adds r4, r0, 0 adds r4, r0, 0
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
lsls r0, 16 lsls r0, 16
@@ -8210,7 +8210,7 @@ _080E2248:
adds r4, r0, 0 adds r4, r0, 0
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
lsls r0, 16 lsls r0, 16
@@ -8565,7 +8565,7 @@ sub_80E24E0: @ 80E24E0
ldr r1, _080E2510 @ =DestroyAnimSprite ldr r1, _080E2510 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080E2514 @ =sub_8075764 ldr r0, _080E2514 @ =InitAndRunAnimFastLinearTranslation
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -8573,7 +8573,7 @@ sub_80E24E0: @ 80E24E0
.align 2, 0 .align 2, 0
_080E250C: .4byte gBattleAnimArgs _080E250C: .4byte gBattleAnimArgs
_080E2510: .4byte DestroyAnimSprite _080E2510: .4byte DestroyAnimSprite
_080E2514: .4byte sub_8075764 _080E2514: .4byte InitAndRunAnimFastLinearTranslation
thumb_func_end sub_80E24E0 thumb_func_end sub_80E24E0
thumb_func_start sub_80E2518 thumb_func_start sub_80E2518
@@ -8622,7 +8622,7 @@ sub_80E2518: @ 80E2518
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
lsls r0, 16 lsls r0, 16
@@ -8694,7 +8694,7 @@ _080E258A:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl sub_8075068 bl InitAnimArcTranslation
mov r1, r10 mov r1, r10
ldrb r0, [r1] ldrb r0, [r1]
bl GetBattlerSide bl GetBattlerSide
@@ -8778,7 +8778,7 @@ _080E269A:
lsls r0, 2 lsls r0, 2
ldr r1, _080E26CC @ =gSprites ldr r1, _080E26CC @ =gSprites
adds r0, r1 adds r0, r1
bl AnimateBallThrow bl TranslateAnimHorizontalArc
ldrh r0, [r4, 0xC] ldrh r0, [r4, 0xC]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
@@ -8797,7 +8797,7 @@ _080E26D0:
lsls r0, 2 lsls r0, 2
ldr r1, _080E26F0 @ =gSprites ldr r1, _080E26F0 @ =gSprites
adds r0, r1 adds r0, r1
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080E276E beq _080E276E
@@ -8938,7 +8938,7 @@ _080E27C0:
strb r0, [r4, 0x3] strb r0, [r4, 0x3]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
b _080E280E b _080E280E
.align 2, 0 .align 2, 0
@@ -8948,7 +8948,7 @@ _080E2800: .4byte 0xfffffc00
_080E2804: _080E2804:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
_080E280E: _080E280E:
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
@@ -9098,7 +9098,7 @@ _080E28F8:
strh r1, [r4, 0x26] strh r1, [r4, 0x26]
ldr r2, _080E292C @ =gUnknown_83FF65C ldr r2, _080E292C @ =gUnknown_83FF65C
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080E2930 @ =sub_80E2934 ldr r0, _080E2930 @ =sub_80E2934
str r0, [r4] str r0, [r4]
_080E2920: _080E2920:
@@ -9160,7 +9160,7 @@ _080E298C:
strh r1, [r0, 0x24] strh r1, [r0, 0x24]
_080E298E: _080E298E:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0 cmp r5, 0
@@ -9188,7 +9188,7 @@ _080E298E:
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
ldr r2, _080E29E0 @ =gUnknown_83FF65C ldr r2, _080E29E0 @ =gUnknown_83FF65C
bl sub_80762D0 bl PrepareAffineAnimInTaskData
strh r5, [r4, 0xA] strh r5, [r4, 0xA]
strh r5, [r4, 0xC] strh r5, [r4, 0xC]
b _080E29EA b _080E29EA
@@ -9231,7 +9231,7 @@ _080E2A0E:
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
movs r1, 0x22 movs r1, 0x22
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
@@ -9902,7 +9902,7 @@ sub_80E2F14: @ 80E2F14
bne _080E2F38 bne _080E2F38
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080E2F34 @ =gBattleAnimAttacker ldr r0, _080E2F34 @ =gBattleAnimAttacker
b _080E2F3A b _080E2F3A
.align 2, 0 .align 2, 0
@@ -9932,7 +9932,7 @@ _080E2F5E:
ldrh r0, [r4, 0x3C] ldrh r0, [r4, 0x3C]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r2, 0x3 movs r2, 0x3
ands r2, r0 ands r2, r0
lsls r2, 2 lsls r2, 2
@@ -10010,7 +10010,7 @@ _080E2FFC:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x4 subs r0, 0x4
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
@@ -10024,7 +10024,7 @@ _080E3018:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x4 subs r0, 0x4
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
@@ -10032,7 +10032,7 @@ _080E3018:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x4 adds r0, 0x4
b _080E3076 b _080E3076
_080E303A: _080E303A:
@@ -10040,7 +10040,7 @@ _080E303A:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x4 adds r0, 0x4
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
@@ -10054,7 +10054,7 @@ _080E3056:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x4 adds r0, 0x4
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
@@ -10063,7 +10063,7 @@ _080E3056:
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
_080E3070: _080E3070:
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x4 subs r0, 0x4
_080E3076: _080E3076:
lsls r0, 16 lsls r0, 16
@@ -10107,11 +10107,11 @@ _080E30B2:
strh r0, [r4, 0x34] strh r0, [r4, 0x34]
strh r1, [r4, 0x36] strh r1, [r4, 0x36]
adds r0, r4, 0 adds r0, r4, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
b _080E3188 b _080E3188
_080E30C8: _080E30C8:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080E3196 beq _080E3196
@@ -11699,7 +11699,7 @@ _080E3D0C:
lsls r0, 2 lsls r0, 2
ldr r5, _080E3D5C @ =gSprites ldr r5, _080E3D5C @ =gSprites
adds r0, r5 adds r0, r5
bl sub_8076B20 bl DestroySpriteAndFreeResources_
ldr r0, _080E3D60 @ =gBattleAnimAttacker ldr r0, _080E3D60 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -12532,7 +12532,7 @@ sub_80E43A4: @ 80E43A4
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
@@ -12688,7 +12688,7 @@ _080E44D6:
b _080E44E4 b _080E44E4
_080E44DE: _080E44DE:
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080E44E4: _080E44E4:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -12764,7 +12764,7 @@ sub_80E4540: @ 80E4540
strh r1, [r4, 0x26] strh r1, [r4, 0x26]
ldr r2, _080E4580 @ =gUnknown_83FF7A8 ldr r2, _080E4580 @ =gUnknown_83FF7A8
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080E4584 @ =sub_80E4588 ldr r0, _080E4584 @ =sub_80E4588
str r0, [r4] str r0, [r4]
pop {r4} pop {r4}
@@ -12840,7 +12840,7 @@ _080E45FC:
adds r0, r4 adds r0, r4
lsls r0, 3 lsls r0, 3
adds r0, r6 adds r0, r6
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E4614 bne _080E4614
File diff suppressed because it is too large Load Diff
+13 -13
View File
@@ -155,7 +155,7 @@ sub_80EEC0C: @ 80EEC0C
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080EEDD8 @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap ldr r1, _080EEDD8 @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080EEDDC @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet ldr r1, _080EEDDC @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet
@@ -855,7 +855,7 @@ _080EF2E6:
movs r3, 0 movs r3, 0
bl SetSpriteRotScale bl SetSpriteRotScale
adds r0, r5, 0 adds r0, r5, 0
bl sub_8076440 bl SetBattlerSpriteYOffsetFromYScale
movs r0, 0x1C movs r0, 0x1C
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
ldr r0, _080EF314 @ =0x000002cf ldr r0, _080EF314 @ =0x000002cf
@@ -1585,7 +1585,7 @@ sub_80EF8C0: @ 80EF8C0
ldr r0, _080EF8E8 @ =0x0000ffd8 ldr r0, _080EF8E8 @ =0x0000ffd8
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080EF8EC @ =sub_80EF8F0 ldr r0, _080EF8EC @ =sub_80EF8F0
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
@@ -1601,7 +1601,7 @@ sub_80EF8F0: @ 80EF8F0
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080EF99E beq _080EF99E
@@ -2804,7 +2804,7 @@ _080F01F2:
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
strh r0, [r5, 0x38] strh r0, [r5, 0x38]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075068 bl InitAnimArcTranslation
add r4, r10 add r4, r10
ldr r0, _080F0270 @ =sub_80F0278 ldr r0, _080F0270 @ =sub_80F0278
str r0, [r4] str r0, [r4]
@@ -2849,7 +2849,7 @@ sub_80F0278: @ 80F0278
orrs r0, r1 orrs r0, r1
strb r0, [r3] strb r0, [r3]
adds r0, r4, 0 adds r0, r4, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F02A8 beq _080F02A8
@@ -3204,9 +3204,9 @@ sub_80F052C: @ 80F052C
movs r0, 0x20 movs r0, 0x20
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
adds r0, r4, 0 adds r0, r4, 0
bl sub_80750C8 bl TranslateAnimVerticalArc
ldr r0, _080F0570 @ =sub_80F0574 ldr r0, _080F0570 @ =sub_80F0574
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
@@ -3220,7 +3220,7 @@ _080F0570: .4byte sub_80F0574
sub_80F0574: @ 80F0574 sub_80F0574: @ 80F0574
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80750C8 bl TranslateAnimVerticalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080F0590 bne _080F0590
@@ -5317,7 +5317,7 @@ _080F15F0:
_080F15F6: _080F15F6:
ldr r0, _080F1610 @ =gBattleAnimAttacker ldr r0, _080F1610 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -5982,7 +5982,7 @@ sub_80F1B3C: @ 80F1B3C
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
movs r0, 0x1E movs r0, 0x1E
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
movs r0, 0x1 movs r0, 0x1
@@ -6011,7 +6011,7 @@ sub_80F1B3C: @ 80F1B3C
ldr r0, _080F1BB4 @ =0x0000ffe0 ldr r0, _080F1BB4 @ =0x0000ffe0
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r2, _080F1BB8 @ =gSprites ldr r2, _080F1BB8 @ =gSprites
ldr r1, _080F1BBC @ =gBattlerSpriteIds ldr r1, _080F1BBC @ =gBattlerSpriteIds
ldr r0, _080F1BC0 @ =gBattleAnimAttacker ldr r0, _080F1BC0 @ =gBattleAnimAttacker
@@ -6074,7 +6074,7 @@ _080F1C00: .4byte sub_80F1C04
sub_80F1C04: @ 80F1C04 sub_80F1C04: @ 80F1C04
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F1C26 beq _080F1C26
+21 -21
View File
@@ -53,7 +53,7 @@ _080B4008:
ldr r5, _080B406C @ =gBattleAnimTarget ldr r5, _080B406C @ =gBattleAnimTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_8074844 bl GetBattlerSpriteCoord2
lsls r0, 24 lsls r0, 24
ldr r4, _080B4070 @ =gBattleAnimArgs ldr r4, _080B4070 @ =gBattleAnimArgs
lsrs r0, 24 lsrs r0, 24
@@ -62,7 +62,7 @@ _080B4008:
strh r0, [r6, 0x20] strh r0, [r6, 0x20]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x3 movs r1, 0x3
bl sub_8074844 bl GetBattlerSpriteCoord2
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
@@ -137,7 +137,7 @@ _080B40BC:
ldr r5, _080B4118 @ =gBattleAnimTarget ldr r5, _080B4118 @ =gBattleAnimTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_8074844 bl GetBattlerSpriteCoord2
lsls r0, 24 lsls r0, 24
ldr r4, _080B411C @ =gBattleAnimArgs ldr r4, _080B411C @ =gBattleAnimArgs
lsrs r0, 24 lsrs r0, 24
@@ -146,7 +146,7 @@ _080B40BC:
strh r0, [r6, 0x20] strh r0, [r6, 0x20]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x3 movs r1, 0x3
bl sub_8074844 bl GetBattlerSpriteCoord2
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
@@ -199,7 +199,7 @@ sub_80B4128: @ 80B4128
_080B4144: _080B4144:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r1, _080B4184 @ =gBattleAnimArgs ldr r1, _080B4184 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4] ldrh r0, [r1, 0x4]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
@@ -236,7 +236,7 @@ _080B418C:
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x36 adds r3, 0x36
movs r1, 0x1 movs r1, 0x1
bl sub_8076D9C bl SetAverageBattlerPositions
_080B419E: _080B419E:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075678 bl sub_8075678
@@ -258,7 +258,7 @@ _080B41BC: .4byte sub_80B41C0
sub_80B41C0: @ 80B41C0 sub_80B41C0: @ 80B41C0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B41D6 beq _080B41D6
@@ -296,7 +296,7 @@ sub_80B41F8: @ 80B41F8
adds r3, r4, 0 adds r3, r4, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0 movs r1, 0
bl sub_8076D9C bl SetAverageBattlerPositions
ldr r0, _080B422C @ =gBattleAnimAttacker ldr r0, _080B422C @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -552,7 +552,7 @@ _080B43E4:
_080B43F6: _080B43F6:
adds r0, r7, 0 adds r0, r7, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r5, _080B4488 @ =gBattleAnimTarget ldr r5, _080B4488 @ =gBattleAnimTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
@@ -586,7 +586,7 @@ _080B43F6:
subs r1, r2 subs r1, r2
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8075B30 bl ArcTan2Neg
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
lsls r1, 24 lsls r1, 24
@@ -598,7 +598,7 @@ _080B43F6:
adds r0, r7, 0 adds r0, r7, 0
movs r1, 0 movs r1, 0
adds r2, r3, 0 adds r2, r3, 0
bl sub_8075A1C bl TrySetSpriteRotScale
ldrh r0, [r6, 0x8] ldrh r0, [r6, 0x8]
strh r0, [r7, 0x2E] strh r0, [r7, 0x2E]
strh r4, [r7, 0x32] strh r4, [r7, 0x32]
@@ -625,7 +625,7 @@ sub_80B4494: @ 80B4494
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080B4500 @ =gBattleAnimAttacker ldr r0, _080B4500 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -660,7 +660,7 @@ _080B44B4:
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38] strh r0, [r6, 0x38]
adds r0, r6, 0 adds r0, r6, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080B450C @ =sub_80B4510 ldr r0, _080B450C @ =sub_80B4510
str r0, [r6, 0x1C] str r0, [r6, 0x1C]
adds r2, r6, 0 adds r2, r6, 0
@@ -694,7 +694,7 @@ sub_80B4510: @ 80B4510
ands r1, r0 ands r1, r0
strb r1, [r2] strb r1, [r2]
adds r0, r4, 0 adds r0, r4, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B453C beq _080B453C
@@ -729,7 +729,7 @@ _080B4552:
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
adds r0, r4, 0 adds r0, r4, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080B45CC bne _080B45CC
@@ -749,7 +749,7 @@ _080B4552:
subs r1, r2 subs r1, r2
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8075B30 bl ArcTan2Neg
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
lsls r1, 24 lsls r1, 24
@@ -761,7 +761,7 @@ _080B4552:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
adds r2, r3, 0 adds r2, r3, 0
bl sub_8075A1C bl TrySetSpriteRotScale
add r2, sp, 0x4 add r2, sp, 0x4
mov r1, r8 mov r1, r8
movs r3, 0x7 movs r3, 0x7
@@ -812,18 +812,18 @@ _080B45F6:
lsrs r0, 24 lsrs r0, 24
adds r0, 0x12 adds r0, 0x12
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldr r1, _080B462C @ =move_anim_8074EE0 ldr r1, _080B462C @ =DestroySpriteAndMatrix
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080B4630 @ =sub_8074F50 ldr r0, _080B4630 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B4628: .4byte gBattleAnimTarget _080B4628: .4byte gBattleAnimTarget
_080B462C: .4byte move_anim_8074EE0 _080B462C: .4byte DestroySpriteAndMatrix
_080B4630: .4byte sub_8074F50 _080B4630: .4byte RunStoredCallbackWhenAffineAnimEnds
thumb_func_end sub_80B45D8 thumb_func_end sub_80B45D8
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+26 -26
View File
@@ -25,7 +25,7 @@ sub_80B78E0: @ 80B78E0
movs r0, 0x52 movs r0, 0x52
bl SetGpuReg bl SetGpuReg
adds r0, r4, 0 adds r0, r4, 0
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -223,7 +223,7 @@ sub_80B7A80: @ 80B7A80
bl SetGpuReg bl SetGpuReg
ldr r0, _080B7AAC @ =gBattleAnimAttacker ldr r0, _080B7AAC @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -472,7 +472,7 @@ sub_80B7C50: @ 80B7C50
cmp r0, 0 cmp r0, 0
bne _080B7C82 bne _080B7C82
adds r0, r3, 0 adds r0, r3, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080B7C82: _080B7C82:
pop {r0} pop {r0}
bx r0 bx r0
@@ -531,47 +531,47 @@ _080B7CE0:
_080B7CEA: _080B7CEA:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
b _080B7D58 b _080B7D58
_080B7D04: _080B7D04:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0xE subs r0, 0xE
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x10 adds r0, 0x10
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
b _080B7D58 b _080B7D58
_080B7D1E: _080B7D1E:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
b _080B7D4C b _080B7D4C
_080B7D36: _080B7D36:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0xE adds r0, 0xE
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x10 adds r0, 0x10
_080B7D4C: _080B7D4C:
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
@@ -593,7 +593,7 @@ _080B7D58:
ldr r0, _080B7D80 @ =0x0000fff4 ldr r0, _080B7D80 @ =0x0000fff4
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080B7D84 @ =sub_80B7D88 ldr r0, _080B7D84 @ =sub_80B7D88
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4-r7} pop {r4-r7}
@@ -608,12 +608,12 @@ _080B7D84: .4byte sub_80B7D88
sub_80B7D88: @ 80B7D88 sub_80B7D88: @ 80B7D88
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B7D9C beq _080B7D9C
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080B7D9C: _080B7D9C:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -642,7 +642,7 @@ sub_80B7DA4: @ 80B7DA4
strh r0, [r5, 0x16] strh r0, [r5, 0x16]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x7 subs r0, 0x7
strh r0, [r5, 0x14] strh r0, [r5, 0x14]
ldrh r1, [r5, 0x16] ldrh r1, [r5, 0x16]
@@ -678,7 +678,7 @@ _080B7E16:
strh r0, [r5, 0x18] strh r0, [r5, 0x18]
ldr r0, _080B7E64 @ =gBattleAnimAttacker ldr r0, _080B7E64 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0xE] strh r0, [r5, 0xE]
@@ -1022,7 +1022,7 @@ _080B80EC: .4byte 0x00003f3f
_080B80F0: _080B80F0:
ldr r0, _080B8110 @ =gBattleAnimTarget ldr r0, _080B8110 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0xE] strh r0, [r5, 0xE]
@@ -1095,7 +1095,7 @@ _080B817C:
strh r0, [r5, 0x16] strh r0, [r5, 0x16]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x7 subs r0, 0x7
strh r0, [r5, 0x14] strh r0, [r5, 0x14]
ldrh r1, [r5, 0x16] ldrh r1, [r5, 0x16]
@@ -1653,7 +1653,7 @@ sub_80B85B8: @ 80B85B8
mov r10, r0 mov r10, r0
ldr r6, _080B8658 @ =gBattleAnimAttacker ldr r6, _080B8658 @ =gBattleAnimAttacker
ldrb r0, [r6] ldrb r0, [r6]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
@@ -1731,7 +1731,7 @@ sub_80B8664: @ 80B8664
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r4, _080B86AC @ =gBattleAnimAttacker ldr r4, _080B86AC @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
@@ -1778,7 +1778,7 @@ sub_80B86B0: @ 80B86B0
ldrb r1, [r1, 0x4] ldrb r1, [r1, 0x4]
adds r0, r4, 0 adds r0, r4, 0
bl StartSpriteAnim bl StartSpriteAnim
ldr r0, _080B86E4 @ =sub_8074F6C ldr r0, _080B86E4 @ =RunStoredCallbackWhenAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080B86E8 @ =DestroyAnimSprite ldr r1, _080B86E8 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -1788,7 +1788,7 @@ sub_80B86B0: @ 80B86B0
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B86E0: .4byte gBattleAnimArgs _080B86E0: .4byte gBattleAnimArgs
_080B86E4: .4byte sub_8074F6C _080B86E4: .4byte RunStoredCallbackWhenAnimEnds
_080B86E8: .4byte DestroyAnimSprite _080B86E8: .4byte DestroyAnimSprite
thumb_func_end sub_80B86B0 thumb_func_end sub_80B86B0
@@ -1952,7 +1952,7 @@ _080B8828:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080B88C4 @ =gFile_graphics_battle_anims_masks_metal_shine_tilemap ldr r1, _080B88C4 @ =gFile_graphics_battle_anims_masks_metal_shine_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080B88C8 @ =gFile_graphics_battle_anims_masks_metal_shine_sheet ldr r1, _080B88C8 @ =gFile_graphics_battle_anims_masks_metal_shine_sheet
@@ -1991,7 +1991,7 @@ _080B8828:
bne _080B88E0 bne _080B88E0
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0 movs r1, 0
bl sub_8075B48 bl SetGreyscaleOrOriginalPalette
b _080B88EC b _080B88EC
.align 2, 0 .align 2, 0
_080B88B8: .4byte gBattlerPartyIndexes _080B88B8: .4byte gBattlerPartyIndexes
@@ -2093,7 +2093,7 @@ _080B894E:
bne _080B8990 bne _080B8990
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075B48 bl SetGreyscaleOrOriginalPalette
_080B8990: _080B8990:
movs r0, 0x8 movs r0, 0x8
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
@@ -2279,7 +2279,7 @@ _080B8B06:
adds r0, 0x10 adds r0, 0x10
ldr r1, _080B8B34 @ =gBattleAnimArgs ldr r1, _080B8B34 @ =gBattleAnimArgs
ldrb r1, [r1, 0x2] ldrb r1, [r1, 0x2]
bl sub_8075B48 bl SetGreyscaleOrOriginalPalette
_080B8B22: _080B8B22:
adds r0, r5, 0 adds r0, r5, 0
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
+16 -16
View File
@@ -68,25 +68,25 @@ _080B72B6:
movs r1, 0x4 movs r1, 0x4
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
ldr r1, _080B72F0 @ =move_anim_8074EE0 ldr r1, _080B72F0 @ =DestroySpriteAndMatrix
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080B72F4 @ =sub_8074E70 ldr r0, _080B72F4 @ =TranslateSpriteLinearAndFlicker
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B72EC: .4byte gBattleAnimArgs _080B72EC: .4byte gBattleAnimArgs
_080B72F0: .4byte move_anim_8074EE0 _080B72F0: .4byte DestroySpriteAndMatrix
_080B72F4: .4byte sub_8074E70 _080B72F4: .4byte TranslateSpriteLinearAndFlicker
thumb_func_end sub_80B725C thumb_func_end sub_80B725C
thumb_func_start sub_80B72F8 thumb_func_start sub_80B72F8
sub_80B72F8: @ 80B72F8 sub_80B72F8: @ 80B72F8
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
bl sub_8074FCC bl SetSpriteCoordsToAnimAttackerCoords
ldr r4, _080B7350 @ =gBattleAnimTarget ldr r4, _080B7350 @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -154,7 +154,7 @@ _080B7386:
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
ldr r0, _080B73A4 @ =StartAnimLinearTranslation ldr r0, _080B73A4 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
ldr r1, _080B73A8 @ =move_anim_8074EE0 ldr r1, _080B73A8 @ =DestroySpriteAndMatrix
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r4,r5} pop {r4,r5}
@@ -163,7 +163,7 @@ _080B7386:
.align 2, 0 .align 2, 0
_080B73A0: .4byte gBattleAnimArgs _080B73A0: .4byte gBattleAnimArgs
_080B73A4: .4byte StartAnimLinearTranslation _080B73A4: .4byte StartAnimLinearTranslation
_080B73A8: .4byte move_anim_8074EE0 _080B73A8: .4byte DestroySpriteAndMatrix
thumb_func_end sub_80B72F8 thumb_func_end sub_80B72F8
thumb_func_start sub_80B73AC thumb_func_start sub_80B73AC
@@ -199,14 +199,14 @@ _080B73CA:
movs r0, 0x2 movs r0, 0x2
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8074FF8 bl SetAnimSpriteInitialXOffset
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
ldrh r1, [r5, 0x22] ldrh r1, [r5, 0x22]
adds r0, r1 adds r0, r1
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldr r0, _080B7414 @ =sub_8074F6C ldr r0, _080B7414 @ =RunStoredCallbackWhenAnimEnds
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
ldr r1, _080B7418 @ =move_anim_8074EE0 ldr r1, _080B7418 @ =DestroySpriteAndMatrix
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r4,r5} pop {r4,r5}
@@ -215,8 +215,8 @@ _080B73CA:
.align 2, 0 .align 2, 0
_080B740C: .4byte gBattleAnimTarget _080B740C: .4byte gBattleAnimTarget
_080B7410: .4byte gBattleAnimArgs _080B7410: .4byte gBattleAnimArgs
_080B7414: .4byte sub_8074F6C _080B7414: .4byte RunStoredCallbackWhenAnimEnds
_080B7418: .4byte move_anim_8074EE0 _080B7418: .4byte DestroySpriteAndMatrix
thumb_func_end sub_80B73AC thumb_func_end sub_80B73AC
thumb_func_start sub_80B741C thumb_func_start sub_80B741C
@@ -269,12 +269,12 @@ sub_80B7448: @ 80B7448
ldr r4, _080B74A4 @ =gBattlerAttacker ldr r4, _080B74A4 @ =gBattlerAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r7, r0, 16 lsls r7, r0, 16
lsrs r5, r7, 16 lsrs r5, r7, 16
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r1, r0, 16 lsls r1, r0, 16
lsrs r0, r1, 16 lsrs r0, r1, 16
cmp r5, r0 cmp r5, r0
@@ -460,7 +460,7 @@ sub_80B75E0: @ 80B75E0
adds r4, r1, r0 adds r4, r1, r0
ldr r0, _080B7610 @ =gBattleAnimAttacker ldr r0, _080B7610 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -491,7 +491,7 @@ _080B7622:
strb r5, [r0, 0x9] strb r5, [r0, 0x9]
ldr r0, _080B76A4 @ =gBattleAnimAttacker ldr r0, _080B76A4 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r0, 0 adds r1, r0, 0
+24 -24
View File
@@ -110,7 +110,7 @@ sub_80ADC9C: @ 80ADC9C
cmp r0, 0 cmp r0, 0
beq _080ADCB2 beq _080ADCB2
adds r0, r2, 0 adds r0, r2, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080ADCB2: _080ADCB2:
pop {r0} pop {r0}
bx r0 bx r0
@@ -173,18 +173,18 @@ _080ADD1C:
strh r0, [r5, 0x32] strh r0, [r5, 0x32]
ldrh r0, [r2, 0x8] ldrh r0, [r2, 0x8]
strh r0, [r5, 0x34] strh r0, [r5, 0x34]
ldr r1, _080ADD44 @ =move_anim_8074EE0 ldr r1, _080ADD44 @ =DestroySpriteAndMatrix
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080ADD48 @ =sub_8074A80 ldr r0, _080ADD48 @ =TranslateSpriteInCircleOverDuration
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080ADD40: .4byte gBattleAnimArgs _080ADD40: .4byte gBattleAnimArgs
_080ADD44: .4byte move_anim_8074EE0 _080ADD44: .4byte DestroySpriteAndMatrix
_080ADD48: .4byte sub_8074A80 _080ADD48: .4byte TranslateSpriteInCircleOverDuration
thumb_func_end sub_80ADCB8 thumb_func_end sub_80ADCB8
thumb_func_start sub_80ADD4C thumb_func_start sub_80ADD4C
@@ -315,7 +315,7 @@ _080ADE02:
cmp r0, 0 cmp r0, 0
beq _080ADE66 beq _080ADE66
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076884 bl GetBattlerSpriteBGPriority
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x1 adds r0, 0x1
@@ -370,7 +370,7 @@ sub_80ADEB0: @ 80ADEB0
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r5, _080ADF24 @ =gBattleAnimArgs ldr r5, _080ADF24 @ =gBattleAnimArgs
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@@ -392,7 +392,7 @@ sub_80ADEB0: @ 80ADEB0
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
adds r0, r4, 0 adds r0, r4, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldrh r0, [r5, 0x4] ldrh r0, [r5, 0x4]
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
ldrh r0, [r5, 0xA] ldrh r0, [r5, 0xA]
@@ -432,7 +432,7 @@ _080ADF34: .4byte sub_80ADF38
sub_80ADF38: @ 80ADF38 sub_80ADF38: @ 80ADF38
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080ADFA2 bne _080ADFA2
@@ -743,7 +743,7 @@ sub_80AE1A0: @ 80AE1A0
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
ldrh r2, [r4, 0x4] ldrh r2, [r4, 0x4]
lsls r1, r2, 22 lsls r1, r2, 22
lsrs r1, 22 lsrs r1, 22
@@ -788,7 +788,7 @@ _080AE1FA:
ldr r0, _080AE214 @ =gBattleAnimArgs ldr r0, _080AE214 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldr r0, _080AE218 @ =sub_8074C44 ldr r0, _080AE218 @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080AE21C @ =DestroyAnimSprite ldr r1, _080AE21C @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -798,7 +798,7 @@ _080AE1FA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080AE214: .4byte gBattleAnimArgs _080AE214: .4byte gBattleAnimArgs
_080AE218: .4byte sub_8074C44 _080AE218: .4byte WaitAnimForDuration
_080AE21C: .4byte DestroyAnimSprite _080AE21C: .4byte DestroyAnimSprite
thumb_func_end sub_80AE1A0 thumb_func_end sub_80AE1A0
@@ -1344,11 +1344,11 @@ sub_80AE5BC: @ 80AE5BC
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
strh r6, [r4, 0x38] strh r6, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r1, _080AE6B4 @ =sub_80AE704 ldr r1, _080AE6B4 @ =sub_80AE704
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080AE6B8 @ =sub_8074F6C ldr r0, _080AE6B8 @ =RunStoredCallbackWhenAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldrh r0, [r5, 0x1A] ldrh r0, [r5, 0x1A]
adds r0, 0x1 adds r0, 0x1
@@ -1390,7 +1390,7 @@ _080AE6A8: .4byte gUnknown_83E6120
_080AE6AC: .4byte gSprites _080AE6AC: .4byte gSprites
_080AE6B0: .4byte gUnknown_83E60D0 _080AE6B0: .4byte gUnknown_83E60D0
_080AE6B4: .4byte sub_80AE704 _080AE6B4: .4byte sub_80AE704
_080AE6B8: .4byte sub_8074F6C _080AE6B8: .4byte RunStoredCallbackWhenAnimEnds
_080AE6BC: _080AE6BC:
movs r1, 0x16 movs r1, 0x16
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
@@ -1408,7 +1408,7 @@ _080AE6CA:
sub_80AE6D0: @ 80AE6D0 sub_80AE6D0: @ 80AE6D0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080AE6F8 beq _080AE6F8
@@ -1476,18 +1476,18 @@ _080AE73A:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldr r1, _080AE76C @ =move_anim_8074EE0 ldr r1, _080AE76C @ =DestroySpriteAndMatrix
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080AE770 @ =sub_8074F50 ldr r0, _080AE770 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080AE768: .4byte gBattleAnimTarget _080AE768: .4byte gBattleAnimTarget
_080AE76C: .4byte move_anim_8074EE0 _080AE76C: .4byte DestroySpriteAndMatrix
_080AE770: .4byte sub_8074F50 _080AE770: .4byte RunStoredCallbackWhenAffineAnimEnds
thumb_func_end sub_80AE71C thumb_func_end sub_80AE71C
thumb_func_start sub_80AE774 thumb_func_start sub_80AE774
@@ -1527,7 +1527,7 @@ _080AE792:
ldr r1, _080AE7D4 @ =DestroyAnimSprite ldr r1, _080AE7D4 @ =DestroyAnimSprite
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080AE7D8 @ =sub_8074F6C ldr r0, _080AE7D8 @ =RunStoredCallbackWhenAnimEnds
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -1536,7 +1536,7 @@ _080AE792:
_080AE7CC: .4byte gBattleAnimTarget _080AE7CC: .4byte gBattleAnimTarget
_080AE7D0: .4byte gBattleAnimArgs _080AE7D0: .4byte gBattleAnimArgs
_080AE7D4: .4byte DestroyAnimSprite _080AE7D4: .4byte DestroyAnimSprite
_080AE7D8: .4byte sub_8074F6C _080AE7D8: .4byte RunStoredCallbackWhenAnimEnds
thumb_func_end sub_80AE774 thumb_func_end sub_80AE774
thumb_func_start sub_80AE7DC thumb_func_start sub_80AE7DC
@@ -1632,7 +1632,7 @@ _080AE864:
cmp r0, r1 cmp r0, r1
bls _080AE894 bls _080AE894
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080AE894: _080AE894:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -2203,7 +2203,7 @@ _080AECC4:
cmp r0, 0 cmp r0, 0
beq _080AECD8 beq _080AECD8
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080AECD8: _080AECD8:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
+36 -36
View File
@@ -13,14 +13,14 @@ unc_080B08A0: @ 80B08A0
movs r0, 0 movs r0, 0
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8074FF8 bl SetAnimSpriteInitialXOffset
ldrh r0, [r5, 0x2] ldrh r0, [r5, 0x2]
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
adds r0, r1 adds r0, r1
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
movs r0, 0xF movs r0, 0xF
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldr r0, _080B08D4 @ =sub_8074C44 ldr r0, _080B08D4 @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080B08D8 @ =DestroyAnimSprite ldr r1, _080B08D8 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -30,7 +30,7 @@ unc_080B08A0: @ 80B08A0
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B08D0: .4byte gBattleAnimArgs _080B08D0: .4byte gBattleAnimArgs
_080B08D4: .4byte sub_8074C44 _080B08D4: .4byte WaitAnimForDuration
_080B08D8: .4byte DestroyAnimSprite _080B08D8: .4byte DestroyAnimSprite
thumb_func_end unc_080B08A0 thumb_func_end unc_080B08A0
@@ -110,19 +110,19 @@ sub_80B0954: @ 80B0954
bne _080B0978 bne _080B0978
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080B0980 b _080B0980
.align 2, 0 .align 2, 0
_080B0974: .4byte gBattleAnimArgs _080B0974: .4byte gBattleAnimArgs
_080B0978: _080B0978:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
_080B0980: _080B0980:
ldr r0, _080B0998 @ =gBattleAnimArgs ldr r0, _080B0998 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
ldr r0, _080B099C @ =sub_8074C44 ldr r0, _080B099C @ =WaitAnimForDuration
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
ldr r1, _080B09A0 @ =DestroyAnimSprite ldr r1, _080B09A0 @ =DestroyAnimSprite
adds r0, r5, 0 adds r0, r5, 0
@@ -132,7 +132,7 @@ _080B0980:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B0998: .4byte gBattleAnimArgs _080B0998: .4byte gBattleAnimArgs
_080B099C: .4byte sub_8074C44 _080B099C: .4byte WaitAnimForDuration
_080B09A0: .4byte DestroyAnimSprite _080B09A0: .4byte DestroyAnimSprite
thumb_func_end sub_80B0954 thumb_func_end sub_80B0954
@@ -188,7 +188,7 @@ _080B09E8:
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
mov r0, r8 mov r0, r8
movs r1, 0x1 movs r1, 0x1
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r1, r0, 16 asrs r1, r0, 16
lsrs r0, 31 lsrs r0, 31
@@ -197,7 +197,7 @@ _080B09E8:
lsrs r6, r1, 16 lsrs r6, r1, 16
mov r0, r8 mov r0, r8
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
cmp r0, 0 cmp r0, 0
@@ -371,7 +371,7 @@ sub_80B0B80: @ 80B0B80
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
movs r0, 0x1E movs r0, 0x1E
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldr r0, _080B0BA0 @ =gBattleAnimArgs ldr r0, _080B0BA0 @ =gBattleAnimArgs
@@ -480,7 +480,7 @@ sub_80B0C28: @ 80B0C28
_080B0C54: _080B0C54:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldr r0, _080B0CA4 @ =gBattleAnimAttacker ldr r0, _080B0CA4 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -505,7 +505,7 @@ _080B0C72:
strh r0, [r6, 0x34] strh r0, [r6, 0x34]
strh r0, [r6, 0x36] strh r0, [r6, 0x36]
adds r0, r6, 0 adds r0, r6, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38] strh r0, [r6, 0x38]
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
@@ -527,7 +527,7 @@ _080B0CB0: .4byte sub_80B0CB4
sub_80B0CB4: @ 80B0CB4 sub_80B0CB4: @ 80B0CB4
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080B0CE0 bne _080B0CE0
@@ -559,14 +559,14 @@ sub_80B0CEC: @ 80B0CEC
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldr r5, _080B0D18 @ =gBattleAnimArgs ldr r5, _080B0D18 @ =gBattleAnimArgs
ldrb r1, [r5, 0x4] ldrb r1, [r5, 0x4]
adds r0, r4, 0 adds r0, r4, 0
bl StartSpriteAnim bl StartSpriteAnim
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldr r0, _080B0D1C @ =sub_8074C44 ldr r0, _080B0D1C @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080B0D20 @ =sub_80B0D24 ldr r1, _080B0D20 @ =sub_80B0D24
adds r0, r4, 0 adds r0, r4, 0
@@ -576,7 +576,7 @@ sub_80B0CEC: @ 80B0CEC
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B0D18: .4byte gBattleAnimArgs _080B0D18: .4byte gBattleAnimArgs
_080B0D1C: .4byte sub_8074C44 _080B0D1C: .4byte WaitAnimForDuration
_080B0D20: .4byte sub_80B0D24 _080B0D20: .4byte sub_80B0D24
thumb_func_end sub_80B0CEC thumb_func_end sub_80B0CEC
@@ -594,7 +594,7 @@ sub_80B0D24: @ 80B0D24
strb r0, [r2] strb r0, [r2]
movs r0, 0x14 movs r0, 0x14
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldr r0, _080B0D50 @ =sub_8074C44 ldr r0, _080B0D50 @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080B0D54 @ =DestroyAnimSprite ldr r1, _080B0D54 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -603,7 +603,7 @@ sub_80B0D24: @ 80B0D24
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B0D50: .4byte sub_8074C44 _080B0D50: .4byte WaitAnimForDuration
_080B0D54: .4byte DestroyAnimSprite _080B0D54: .4byte DestroyAnimSprite
thumb_func_end sub_80B0D24 thumb_func_end sub_80B0D24
@@ -612,7 +612,7 @@ sub_80B0D58: @ 80B0D58
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldr r0, _080B0D74 @ =gBattleAnimArgs ldr r0, _080B0D74 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@@ -674,14 +674,14 @@ sub_80B0DD4: @ 80B0DD4
push {lr} push {lr}
movs r1, 0xF movs r1, 0xF
strh r1, [r0, 0x2E] strh r1, [r0, 0x2E]
ldr r1, _080B0DE8 @ =sub_8074C44 ldr r1, _080B0DE8 @ =WaitAnimForDuration
str r1, [r0, 0x1C] str r1, [r0, 0x1C]
ldr r1, _080B0DEC @ =DestroyAnimSprite ldr r1, _080B0DEC @ =DestroyAnimSprite
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B0DE8: .4byte sub_8074C44 _080B0DE8: .4byte WaitAnimForDuration
_080B0DEC: .4byte DestroyAnimSprite _080B0DEC: .4byte DestroyAnimSprite
thumb_func_end sub_80B0DD4 thumb_func_end sub_80B0DD4
@@ -695,7 +695,7 @@ sub_80B0DF0: @ 80B0DF0
bne _080B0E1C bne _080B0E1C
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldr r1, _080B0E18 @ =gBattleAnimArgs ldr r1, _080B0E18 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4] ldrh r0, [r1, 0x4]
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
@@ -1052,7 +1052,7 @@ sub_80B107C: @ 80B107C
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldr r0, _080B10D0 @ =gBattleAnimAttacker ldr r0, _080B10D0 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1072,7 +1072,7 @@ _080B10D4: .4byte gBattleAnimTarget
_080B10D8: _080B10D8:
ldr r0, _080B1110 @ =gBattleAnimTarget ldr r0, _080B1110 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1140,8 +1140,8 @@ sub_80B111C: @ 80B111C
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
adds r0, r4, 0 adds r0, r4, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r1, _080B1180 @ =move_anim_8074EE0 ldr r1, _080B1180 @ =DestroySpriteAndMatrix
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080B1184 @ =sub_807563C ldr r0, _080B1184 @ =sub_807563C
@@ -1151,7 +1151,7 @@ _080B1178:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B1180: .4byte move_anim_8074EE0 _080B1180: .4byte DestroySpriteAndMatrix
_080B1184: .4byte sub_807563C _080B1184: .4byte sub_807563C
thumb_func_end sub_80B111C thumb_func_end sub_80B111C
@@ -1171,7 +1171,7 @@ sub_80B1188: @ 80B1188
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x38 adds r1, 0x38
lsls r2, 8 lsls r2, 8
bl sub_80765C0 bl StorePointerInVars
ldrh r0, [r4, 0x2] ldrh r0, [r4, 0x2]
strh r0, [r5, 0x3A] strh r0, [r5, 0x3A]
ldrh r2, [r5, 0x4] ldrh r2, [r5, 0x4]
@@ -1214,7 +1214,7 @@ sub_80B11E4: @ 80B11E4
ldrsh r0, [r7, r2] ldrsh r0, [r7, r2]
movs r2, 0x38 movs r2, 0x38
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_80765C8 bl LoadPointerFromVars
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x3A movs r1, 0x3A
ldrsh r0, [r7, r1] ldrsh r0, [r7, r1]
@@ -1224,7 +1224,7 @@ sub_80B11E4: @ 80B11E4
adds r1, r7, 0 adds r1, r7, 0
adds r1, 0x38 adds r1, 0x38
adds r2, r4, 0 adds r2, r4, 0
bl sub_80765C0 bl StorePointerInVars
asrs r4, 8 asrs r4, 8
strh r4, [r7, 0x22] strh r4, [r7, 0x22]
lsls r4, 16 lsls r4, 16
@@ -1369,7 +1369,7 @@ _080B132C:
ldr r0, _080B1368 @ =gBattleAnimTarget ldr r0, _080B1368 @ =gBattleAnimTarget
_080B1332: _080B1332:
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1431,7 +1431,7 @@ _080B138C:
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r1, _080B13CC @ =DestroyAnimSprite ldr r1, _080B13CC @ =DestroyAnimSprite
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
@@ -1546,14 +1546,14 @@ sub_80B1484: @ 80B1484
bne _080B14A0 bne _080B14A0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080B14A8 b _080B14A8
.align 2, 0 .align 2, 0
_080B149C: .4byte gBattleAnimArgs _080B149C: .4byte gBattleAnimArgs
_080B14A0: _080B14A0:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
_080B14A8: _080B14A8:
bl IsContest bl IsContest
lsls r0, 24 lsls r0, 24
@@ -1574,7 +1574,7 @@ _080B14BC:
movs r1, 0x1 movs r1, 0x1
bl StartSpriteAnim bl StartSpriteAnim
_080B14D2: _080B14D2:
ldr r0, _080B14E8 @ =sub_8074F6C ldr r0, _080B14E8 @ =RunStoredCallbackWhenAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080B14EC @ =DestroyAnimSprite ldr r1, _080B14EC @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -1584,7 +1584,7 @@ _080B14D2:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B14E4: .4byte gBattleAnimAttacker _080B14E4: .4byte gBattleAnimAttacker
_080B14E8: .4byte sub_8074F6C _080B14E8: .4byte RunStoredCallbackWhenAnimEnds
_080B14EC: .4byte DestroyAnimSprite _080B14EC: .4byte DestroyAnimSprite
thumb_func_end sub_80B1484 thumb_func_end sub_80B1484
+23 -23
View File
@@ -24,7 +24,7 @@ sub_80AC90C: @ 80AC90C
ldr r1, _080AC944 @ =DestroyAnimSprite ldr r1, _080AC944 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r1, _080AC948 @ =sub_8074AE0 ldr r1, _080AC948 @ =TranslateSpriteInGrowingCircleOverDuration
str r1, [r4, 0x1C] str r1, [r4, 0x1C]
adds r0, r4, 0 adds r0, r4, 0
bl _call_via_r1 bl _call_via_r1
@@ -34,7 +34,7 @@ sub_80AC90C: @ 80AC90C
.align 2, 0 .align 2, 0
_080AC940: .4byte gBattleAnimArgs _080AC940: .4byte gBattleAnimArgs
_080AC944: .4byte DestroyAnimSprite _080AC944: .4byte DestroyAnimSprite
_080AC948: .4byte sub_8074AE0 _080AC948: .4byte TranslateSpriteInGrowingCircleOverDuration
thumb_func_end sub_80AC90C thumb_func_end sub_80AC90C
thumb_func_start sub_80AC94C thumb_func_start sub_80AC94C
@@ -45,7 +45,7 @@ sub_80AC94C: @ 80AC94C
movs r0, 0 movs r0, 0
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8074FF8 bl SetAnimSpriteInitialXOffset
ldrh r0, [r5, 0x2] ldrh r0, [r5, 0x2]
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
adds r0, r1 adds r0, r1
@@ -56,7 +56,7 @@ sub_80AC94C: @ 80AC94C
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
ldr r0, _080AC988 @ =sub_8074D00 ldr r0, _080AC988 @ =TranslateSpriteLinearFixedPoint
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080AC98C @ =DestroyAnimSprite ldr r1, _080AC98C @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -66,7 +66,7 @@ sub_80AC94C: @ 80AC94C
bx r0 bx r0
.align 2, 0 .align 2, 0
_080AC984: .4byte gBattleAnimArgs _080AC984: .4byte gBattleAnimArgs
_080AC988: .4byte sub_8074D00 _080AC988: .4byte TranslateSpriteLinearFixedPoint
_080AC98C: .4byte DestroyAnimSprite _080AC98C: .4byte DestroyAnimSprite
thumb_func_end sub_80AC94C thumb_func_end sub_80AC94C
@@ -74,7 +74,7 @@ _080AC98C: .4byte DestroyAnimSprite
sub_80AC990: @ 80AC990 sub_80AC990: @ 80AC990
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_8074FCC bl SetSpriteCoordsToAnimAttackerCoords
ldr r0, _080AC9C4 @ =gBattleAnimAttacker ldr r0, _080AC9C4 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -212,7 +212,7 @@ _080ACA92:
cmp r1, r0 cmp r1, r0
bne _080ACAA4 bne _080ACAA4
adds r0, r2, 0 adds r0, r2, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080ACAA4: _080ACAA4:
pop {r0} pop {r0}
bx r0 bx r0
@@ -222,7 +222,7 @@ _080ACAA4:
sub_80ACAA8: @ 80ACAA8 sub_80ACAA8: @ 80ACAA8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_8074FCC bl SetSpriteCoordsToAnimAttackerCoords
ldr r0, _080ACACC @ =gBattleAnimAttacker ldr r0, _080ACACC @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -348,7 +348,7 @@ _080ACB9C:
b _080ACBAA b _080ACBAA
_080ACBA4: _080ACBA4:
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080ACBAA: _080ACBAA:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -449,7 +449,7 @@ sub_80ACC60: @ 80ACC60
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080ACC80 @ =gBattleAnimArgs ldr r0, _080ACC80 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
movs r1, 0 movs r1, 0
@@ -497,7 +497,7 @@ sub_80ACC88: @ 80ACC88
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r0, _080ACCDC @ =sub_80ACCE0 ldr r0, _080ACCDC @ =sub_80ACCE0
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
_080ACCD2: _080ACCD2:
@@ -513,7 +513,7 @@ _080ACCDC: .4byte sub_80ACCE0
sub_80ACCE0: @ 80ACCE0 sub_80ACCE0: @ 80ACCE0
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080ACD28 beq _080ACD28
@@ -634,7 +634,7 @@ sub_80ACDA8: @ 80ACDA8
ldr r1, _080ACDE0 @ =DestroyAnimSprite ldr r1, _080ACDE0 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080ACDE4 @ =sub_8074CD0 ldr r0, _080ACDE4 @ =TranslateSpriteLinear
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -642,7 +642,7 @@ sub_80ACDA8: @ 80ACDA8
.align 2, 0 .align 2, 0
_080ACDDC: .4byte gBattleAnimArgs _080ACDDC: .4byte gBattleAnimArgs
_080ACDE0: .4byte DestroyAnimSprite _080ACDE0: .4byte DestroyAnimSprite
_080ACDE4: .4byte sub_8074CD0 _080ACDE4: .4byte TranslateSpriteLinear
thumb_func_end sub_80ACDA8 thumb_func_end sub_80ACDA8
thumb_func_start sub_80ACDE8 thumb_func_start sub_80ACDE8
@@ -650,7 +650,7 @@ sub_80ACDE8: @ 80ACDE8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r1, _080ACE1C @ =gBattleAnimArgs ldr r1, _080ACE1C @ =gBattleAnimArgs
ldrh r0, [r1, 0x4] ldrh r0, [r1, 0x4]
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
@@ -662,7 +662,7 @@ sub_80ACDE8: @ 80ACDE8
movs r1, 0x4 movs r1, 0x4
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
ldr r0, _080ACE20 @ =sub_8074C44 ldr r0, _080ACE20 @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080ACE24 @ =sub_80ACE28 ldr r1, _080ACE24 @ =sub_80ACE28
adds r0, r4, 0 adds r0, r4, 0
@@ -672,7 +672,7 @@ sub_80ACDE8: @ 80ACDE8
bx r0 bx r0
.align 2, 0 .align 2, 0
_080ACE1C: .4byte gBattleAnimArgs _080ACE1C: .4byte gBattleAnimArgs
_080ACE20: .4byte sub_8074C44 _080ACE20: .4byte WaitAnimForDuration
_080ACE24: .4byte sub_80ACE28 _080ACE24: .4byte sub_80ACE28
thumb_func_end sub_80ACDE8 thumb_func_end sub_80ACDE8
@@ -923,7 +923,7 @@ _080AD00C:
ldrh r0, [r4, 0x26] ldrh r0, [r4, 0x26]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8076440 bl SetBattlerSpriteYOffsetFromYScale
ldr r2, _080AD030 @ =gSprites ldr r2, _080AD030 @ =gSprites
movs r0, 0x26 movs r0, 0x26
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
@@ -1635,7 +1635,7 @@ _080AD556:
_080AD55C: _080AD55C:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r4, _080AD584 @ =gBattleAnimArgs ldr r4, _080AD584 @ =gBattleAnimArgs
ldrb r1, [r4, 0x4] ldrb r1, [r4, 0x4]
adds r0, r5, 0 adds r0, r5, 0
@@ -1659,7 +1659,7 @@ _080AD58E:
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
ldr r0, _080AD5B0 @ =gBattleAnimTarget ldr r0, _080AD5B0 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1787,7 +1787,7 @@ _080AD68C: .4byte sub_80AD690
sub_80AD690: @ 80AD690 sub_80AD690: @ 80AD690
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080AD6E8 bne _080AD6E8
@@ -1889,7 +1889,7 @@ _080AD70C:
bls _080AD780 bls _080AD780
ldr r0, _080AD77C @ =gBattleAnimTarget ldr r0, _080AD77C @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1906,7 +1906,7 @@ _080AD77C: .4byte gBattleAnimTarget
_080AD780: _080AD780:
ldr r0, _080AD7A4 @ =gBattleAnimTarget ldr r0, _080AD7A4 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x1 adds r0, 0x1
+27 -27
View File
@@ -46,7 +46,7 @@ sub_80B18E4: @ 80B18E4
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
ldrh r0, [r4, 0x22] ldrh r0, [r4, 0x22]
adds r0, 0x14 adds r0, 0x14
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
@@ -208,7 +208,7 @@ sub_80B1A1C: @ 80B1A1C
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080B1A88 @ =gBattleAnimAttacker ldr r0, _080B1A88 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -245,8 +245,8 @@ _080B1A3C:
adds r0, r4 adds r0, r4
strh r0, [r6, 0x36] strh r0, [r6, 0x36]
adds r0, r6, 0 adds r0, r6, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r0, _080B1A94 @ =sub_8074F50 ldr r0, _080B1A94 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r6, 0x1C] str r0, [r6, 0x1C]
ldr r1, _080B1A98 @ =sub_80B1A9C ldr r1, _080B1A98 @ =sub_80B1A9C
adds r0, r6, 0 adds r0, r6, 0
@@ -258,7 +258,7 @@ _080B1A3C:
_080B1A88: .4byte gBattleAnimAttacker _080B1A88: .4byte gBattleAnimAttacker
_080B1A8C: .4byte gBattleAnimArgs _080B1A8C: .4byte gBattleAnimArgs
_080B1A90: .4byte gBattleAnimTarget _080B1A90: .4byte gBattleAnimTarget
_080B1A94: .4byte sub_8074F50 _080B1A94: .4byte RunStoredCallbackWhenAffineAnimEnds
_080B1A98: .4byte sub_80B1A9C _080B1A98: .4byte sub_80B1A9C
thumb_func_end sub_80B1A1C thumb_func_end sub_80B1A1C
@@ -266,7 +266,7 @@ _080B1A98: .4byte sub_80B1A9C
sub_80B1A9C: @ 80B1A9C sub_80B1A9C: @ 80B1A9C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B1AB0 beq _080B1AB0
@@ -365,7 +365,7 @@ _080B1B60:
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x36 adds r3, 0x36
movs r1, 0x1 movs r1, 0x1
bl sub_8076D9C bl SetAverageBattlerPositions
_080B1B72: _080B1B72:
ldr r4, _080B1BA4 @ =gBattleAnimArgs ldr r4, _080B1BA4 @ =gBattleAnimArgs
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
@@ -399,7 +399,7 @@ sub_80B1BB0: @ 80B1BB0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r1, _080B1BEC @ =gBattleAnimArgs ldr r1, _080B1BEC @ =gBattleAnimArgs
ldrh r0, [r1, 0x4] ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@@ -517,7 +517,7 @@ _080B1C72:
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r0, _080B1CBC @ =sub_80B1CC0 ldr r0, _080B1CBC @ =sub_80B1CC0
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4,r5} pop {r4,r5}
@@ -537,7 +537,7 @@ sub_80B1CC0: @ 80B1CC0
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
adds r0, r4, 0 adds r0, r4, 0
bl sub_80755E0 bl AnimTranslateLinear
ldrh r1, [r4, 0x34] ldrh r1, [r4, 0x34]
lsrs r0, r1, 8 lsrs r0, r1, 8
cmp r0, 0xC8 cmp r0, 0xC8
@@ -725,7 +725,7 @@ _080B1DC8:
cmp r0, 0 cmp r0, 0
bne _080B1E64 bne _080B1E64
adds r0, r6, 0 adds r0, r6, 0
bl sub_8076884 bl GetBattlerSpriteBGPriority
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x1 adds r0, 0x1
@@ -744,7 +744,7 @@ _080B1E5C: .4byte gBattleAnimTarget
_080B1E60: .4byte gBattleAnimArgs _080B1E60: .4byte gBattleAnimArgs
_080B1E64: _080B1E64:
adds r0, r6, 0 adds r0, r6, 0
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -790,7 +790,7 @@ _080B1E7C:
b _080B1F16 b _080B1F16
_080B1EBE: _080B1EBE:
adds r0, r6, 0 adds r0, r6, 0
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1614,7 +1614,7 @@ sub_80B24C0: @ 80B24C0
adds r4, r0, 0 adds r4, r0, 0
ldr r0, _080B2508 @ =gBattleAnimTarget ldr r0, _080B2508 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1637,7 +1637,7 @@ sub_80B24C0: @ 80B24C0
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
ldr r0, _080B2510 @ =sub_8075DF4 ldr r0, _080B2510 @ =TranslateAnimSpriteToTargetMonLocation
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -1645,7 +1645,7 @@ sub_80B24C0: @ 80B24C0
.align 2, 0 .align 2, 0
_080B2508: .4byte gBattleAnimTarget _080B2508: .4byte gBattleAnimTarget
_080B250C: .4byte gBattleAnimAttacker _080B250C: .4byte gBattleAnimAttacker
_080B2510: .4byte sub_8075DF4 _080B2510: .4byte TranslateAnimSpriteToTargetMonLocation
thumb_func_end sub_80B24C0 thumb_func_end sub_80B24C0
thumb_func_start sub_80B2514 thumb_func_start sub_80B2514
@@ -1700,7 +1700,7 @@ _080B256E:
beq _080B25A4 beq _080B25A4
ldr r0, _080B25A0 @ =gBattleAnimTarget ldr r0, _080B25A0 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x1 adds r0, 0x1
@@ -1720,7 +1720,7 @@ _080B25A0: .4byte gBattleAnimTarget
_080B25A4: _080B25A4:
ldr r0, _080B25C0 @ =gBattleAnimTarget ldr r0, _080B25C0 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1974,14 +1974,14 @@ sub_80B2780: @ 80B2780
bne _080B279C bne _080B279C
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080B27A4 b _080B27A4
.align 2, 0 .align 2, 0
_080B2798: .4byte gBattleAnimArgs _080B2798: .4byte gBattleAnimArgs
_080B279C: _080B279C:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
_080B27A4: _080B27A4:
ldr r4, _080B280C @ =gBattleAnimArgs ldr r4, _080B280C @ =gBattleAnimArgs
movs r2, 0x4 movs r2, 0x4
@@ -2179,7 +2179,7 @@ sub_80B2914: @ 80B2914
_080B2926: _080B2926:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
movs r0, 0 movs r0, 0
bl GetAnimBattlerSpriteId bl GetAnimBattlerSpriteId
ldr r2, _080B2954 @ =gSprites ldr r2, _080B2954 @ =gSprites
@@ -2302,7 +2302,7 @@ sub_80B2A08: @ 80B2A08
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r1, _080B2A44 @ =gBattleAnimArgs ldr r1, _080B2A44 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4] ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@@ -2473,7 +2473,7 @@ _080B2B22:
str r0, [sp] str r0, [sp]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075A1C bl TrySetSpriteRotScale
ldrh r0, [r5, 0x2E] ldrh r0, [r5, 0x2E]
adds r0, 0x1 adds r0, 0x1
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
@@ -2503,7 +2503,7 @@ _080B2B72:
ldrsh r3, [r5, r0] ldrsh r3, [r5, r0]
str r1, [sp] str r1, [sp]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075A1C bl TrySetSpriteRotScale
ldrb r1, [r5, 0x3] ldrb r1, [r5, 0x3]
lsls r1, 26 lsls r1, 26
lsrs r1, 27 lsrs r1, 27
@@ -2822,7 +2822,7 @@ sub_80B2D64: @ 80B2D64
asrs r5, 16 asrs r5, 16
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_8075B30 bl ArcTan2Neg
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
lsls r1, 24 lsls r1, 24
@@ -2834,7 +2834,7 @@ sub_80B2D64: @ 80B2D64
mov r0, r8 mov r0, r8
movs r1, 0x1 movs r1, 0x1
adds r2, r3, 0 adds r2, r3, 0
bl sub_8075A1C bl TrySetSpriteRotScale
ldr r0, _080B2E1C @ =sub_80B2E20 ldr r0, _080B2E1C @ =sub_80B2E20
mov r2, r8 mov r2, r8
str r0, [r2, 0x1C] str r0, [r2, 0x1C]
@@ -2883,7 +2883,7 @@ sub_80B2E20: @ 80B2E20
bge _080B2E60 bge _080B2E60
_080B2E5A: _080B2E5A:
adds r0, r2, 0 adds r0, r2, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080B2E60: _080B2E60:
pop {r0} pop {r0}
bx r0 bx r0
+23 -23
View File
@@ -10,7 +10,7 @@ sub_80B5268: @ 80B5268
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080B52C4 @ =gBattleAnimArgs ldr r0, _080B52C4 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@@ -59,7 +59,7 @@ sub_80B52D0: @ 80B52D0
adds r4, r0, 0 adds r4, r0, 0
bl sub_80B53C0 bl sub_80B53C0
adds r0, r4, 0 adds r0, r4, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B52F0 beq _080B52F0
@@ -119,7 +119,7 @@ sub_80B5344: @ 80B5344
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
adds r0, r4, 0 adds r0, r4, 0
bl sub_80755E0 bl AnimTranslateLinear
movs r1, 0x38 movs r1, 0x38
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
movs r1, 0xA movs r1, 0xA
@@ -163,11 +163,11 @@ _080B5396:
movs r1, 0x4 movs r1, 0x4
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
ldr r0, _080B53B0 @ =sub_8074F88 ldr r0, _080B53B0 @ =DestroyAnimSpriteAndDisableBlend
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
b _080B53BA b _080B53BA
.align 2, 0 .align 2, 0
_080B53B0: .4byte sub_8074F88 _080B53B0: .4byte DestroyAnimSpriteAndDisableBlend
_080B53B4: _080B53B4:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80B53C0 bl sub_80B53C0
@@ -262,7 +262,7 @@ sub_80B5450: @ 80B5450
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldr r1, _080B546C @ =sub_80B5470 ldr r1, _080B546C @ =sub_80B5470
str r1, [r4, 0x1C] str r1, [r4, 0x1C]
adds r0, r4, 0 adds r0, r4, 0
@@ -719,7 +719,7 @@ _080B57DE:
_080B57E8: .4byte gBattleAnimTarget _080B57E8: .4byte gBattleAnimTarget
_080B57EC: _080B57EC:
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080B57F2: _080B57F2:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -731,7 +731,7 @@ sub_80B57F8: @ 80B57F8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldr r0, _080B580C @ =sub_80B5810 ldr r0, _080B580C @ =sub_80B5810
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
@@ -956,7 +956,7 @@ _080B596E:
lsls r0, 2 lsls r0, 2
adds r4, 0x1C adds r4, 0x1C
adds r0, r4 adds r0, r4
ldr r1, _080B59CC @ =sub_8074D00 ldr r1, _080B59CC @ =TranslateSpriteLinearFixedPoint
str r1, [r0] str r1, [r0]
ldr r0, _080B59D0 @ =sub_80B59D4 ldr r0, _080B59D0 @ =sub_80B59D4
str r0, [r5] str r0, [r5]
@@ -968,7 +968,7 @@ _080B59B8:
_080B59C0: .4byte 0x0000ff90 _080B59C0: .4byte 0x0000ff90
_080B59C4: .4byte gSprites _080B59C4: .4byte gSprites
_080B59C8: .4byte SpriteCallbackDummy _080B59C8: .4byte SpriteCallbackDummy
_080B59CC: .4byte sub_8074D00 _080B59CC: .4byte TranslateSpriteLinearFixedPoint
_080B59D0: .4byte sub_80B59D4 _080B59D0: .4byte sub_80B59D4
thumb_func_end sub_80B58AC thumb_func_end sub_80B58AC
@@ -1120,7 +1120,7 @@ sub_80B5AD4: @ 80B5AD4
adds r5, r0, r1 adds r5, r0, r1
ldr r0, _080B5B10 @ =gBattleAnimTarget ldr r0, _080B5B10 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r1, 0x26 movs r1, 0x26
@@ -1492,7 +1492,7 @@ sub_80B5DCC: @ 80B5DCC
adds r4, r0, r1 adds r4, r0, r1
ldr r0, _080B5E00 @ =gBattleAnimTarget ldr r0, _080B5E00 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
movs r1, 0x26 movs r1, 0x26
@@ -1814,7 +1814,7 @@ sub_80B6020: @ 80B6020
str r0, [sp, 0x4] str r0, [sp, 0x4]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
str r0, [sp, 0x8] str r0, [sp, 0x8]
@@ -1866,7 +1866,7 @@ _080B6092:
mov r10, r0 mov r10, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x3 movs r1, 0x3
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
mov r9, r0 mov r9, r0
@@ -2528,7 +2528,7 @@ sub_80B664C: @ 80B664C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080B6678 @ =gBattleAnimAttacker ldr r0, _080B6678 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -2616,7 +2616,7 @@ _080B66BA:
bne _080B671C bne _080B671C
movs r0, 0x1E movs r0, 0x1E
strh r0, [r3, 0x2E] strh r0, [r3, 0x2E]
ldr r0, _080B6714 @ =sub_8074C44 ldr r0, _080B6714 @ =WaitAnimForDuration
str r0, [r3, 0x1C] str r0, [r3, 0x1C]
ldr r1, _080B6718 @ =sub_80B6728 ldr r1, _080B6718 @ =sub_80B6728
adds r0, r3, 0 adds r0, r3, 0
@@ -2625,7 +2625,7 @@ _080B66BA:
.align 2, 0 .align 2, 0
_080B670C: .4byte 0x000003ff _080B670C: .4byte 0x000003ff
_080B6710: .4byte 0xfffffc00 _080B6710: .4byte 0xfffffc00
_080B6714: .4byte sub_8074C44 _080B6714: .4byte WaitAnimForDuration
_080B6718: .4byte sub_80B6728 _080B6718: .4byte sub_80B6728
_080B671C: _080B671C:
movs r0, 0x28 movs r0, 0x28
@@ -2877,13 +2877,13 @@ sub_80B68C8: @ 80B68C8
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1A] strh r0, [r4, 0x1A]
ldrb r0, [r5] ldrb r0, [r5]
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r1, r0, 16 asrs r1, r0, 16
lsrs r0, 31 lsrs r0, 31
@@ -2893,7 +2893,7 @@ sub_80B68C8: @ 80B68C8
strh r1, [r4, 0x1E] strh r1, [r4, 0x1E]
strh r6, [r4, 0x16] strh r6, [r4, 0x16]
ldrb r0, [r5] ldrb r0, [r5]
bl sub_8076884 bl GetBattlerSpriteBGPriority
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x12] strh r0, [r4, 0x12]
@@ -3272,7 +3272,7 @@ sub_80B6BE4: @ 80B6BE4
adds r6, r1, r0 adds r6, r1, r0
ldr r0, _080B6C1C @ =gBattleAnimAttacker ldr r0, _080B6C1C @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r1, 0x26 movs r1, 0x26
@@ -4040,7 +4040,7 @@ _080B7218:
ldrh r1, [r0, 0x22] ldrh r1, [r0, 0x22]
subs r1, 0x8 subs r1, 0x8
strh r1, [r0, 0x22] strh r1, [r0, 0x22]
ldr r0, _080B7258 @ =move_anim_8074EE0 ldr r0, _080B7258 @ =DestroySpriteAndMatrix
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
_080B724C: _080B724C:
pop {r4,r5} pop {r4,r5}
@@ -4048,7 +4048,7 @@ _080B724C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B7254: .4byte gSprites _080B7254: .4byte gSprites
_080B7258: .4byte move_anim_8074EE0 _080B7258: .4byte DestroySpriteAndMatrix
thumb_func_end sub_80B71B0 thumb_func_end sub_80B71B0
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+21 -21
View File
@@ -40,7 +40,7 @@ sub_80B8B6C: @ 80B8B6C
ldr r0, _080B8BCC @ =0x0000ffd8 ldr r0, _080B8BCC @ =0x0000ffd8
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080B8BD0 @ =sub_80B8BD4 ldr r0, _080B8BD0 @ =sub_80B8BD4
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4,r5} pop {r4,r5}
@@ -57,7 +57,7 @@ _080B8BD0: .4byte sub_80B8BD4
sub_80B8BD4: @ 80B8BD4 sub_80B8BD4: @ 80B8BD4
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B8C28 beq _080B8C28
@@ -90,7 +90,7 @@ sub_80B8BD4: @ 80B8BD4
movs r0, 0x28 movs r0, 0x28
strh r0, [r5, 0x38] strh r0, [r5, 0x38]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080B8C34 @ =sub_80B8C38 ldr r0, _080B8C34 @ =sub_80B8C38
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
_080B8C28: _080B8C28:
@@ -106,7 +106,7 @@ _080B8C34: .4byte sub_80B8C38
sub_80B8C38: @ 80B8C38 sub_80B8C38: @ 80B8C38
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B8C4C beq _080B8C4C
@@ -123,7 +123,7 @@ sub_80B8C54: @ 80B8C54
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldr r0, _080B8CB4 @ =gBattleAnimAttacker ldr r0, _080B8CB4 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -178,17 +178,17 @@ sub_80B8CC8: @ 80B8CC8
push {r7} push {r7}
adds r6, r0, 0 adds r6, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r4, _080B8D48 @ =gBattleAnimTarget ldr r4, _080B8D48 @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8074844 bl GetBattlerSpriteCoord2
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_8074844 bl GetBattlerSpriteCoord2
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
bl Random bl Random
@@ -224,7 +224,7 @@ _080B8D20:
strh r0, [r6, 0x36] strh r0, [r6, 0x36]
ldr r0, _080B8D50 @ =StartAnimLinearTranslation ldr r0, _080B8D50 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C] str r0, [r6, 0x1C]
ldr r1, _080B8D54 @ =move_anim_8074EE0 ldr r1, _080B8D54 @ =DestroySpriteAndMatrix
adds r0, r6, 0 adds r0, r6, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r3} pop {r3}
@@ -236,7 +236,7 @@ _080B8D20:
_080B8D48: .4byte gBattleAnimTarget _080B8D48: .4byte gBattleAnimTarget
_080B8D4C: .4byte gBattleAnimArgs _080B8D4C: .4byte gBattleAnimArgs
_080B8D50: .4byte StartAnimLinearTranslation _080B8D50: .4byte StartAnimLinearTranslation
_080B8D54: .4byte move_anim_8074EE0 _080B8D54: .4byte DestroySpriteAndMatrix
thumb_func_end sub_80B8CC8 thumb_func_end sub_80B8CC8
thumb_func_start sub_80B8D58 thumb_func_start sub_80B8D58
@@ -479,7 +479,7 @@ _080B8F14:
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
ldr r0, _080B8F3C @ =gBattleAnimAttacker ldr r0, _080B8F3C @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1E] strh r0, [r4, 0x1E]
@@ -504,7 +504,7 @@ _080B8F50:
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
ldr r0, _080B8F94 @ =gBattleAnimAttacker ldr r0, _080B8F94 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r0, 0 adds r1, r0, 0
@@ -687,7 +687,7 @@ sub_80B908C: @ 80B908C
strh r4, [r1, 0x26] strh r4, [r1, 0x26]
ldr r0, _080B90D0 @ =gBattleAnimAttacker ldr r0, _080B90D0 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -852,7 +852,7 @@ _080B91F0:
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
ldr r0, _080B9214 @ =gBattleAnimAttacker ldr r0, _080B9214 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1E] strh r0, [r4, 0x1E]
@@ -870,7 +870,7 @@ _080B921E:
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
ldr r0, _080B9240 @ =gBattleAnimAttacker ldr r0, _080B9240 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r0, 0 adds r1, r0, 0
@@ -1086,7 +1086,7 @@ _080B93B2:
adds r0, r6 adds r0, r6
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
adds r0, r4, 0 adds r0, r4, 0
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x1E adds r0, 0x1E
@@ -1103,7 +1103,7 @@ _080B93B2:
ldrh r0, [r7, 0x8] ldrh r0, [r7, 0x8]
strh r0, [r5, 0x38] strh r0, [r5, 0x38]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080B93FC @ =sub_80B9400 ldr r0, _080B93FC @ =sub_80B9400
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4-r7} pop {r4-r7}
@@ -1118,7 +1118,7 @@ _080B93FC: .4byte sub_80B9400
sub_80B9400: @ 80B9400 sub_80B9400: @ 80B9400
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B9414 beq _080B9414
@@ -1162,7 +1162,7 @@ _080B943A:
adds r0, r1 adds r0, r1
strh r0, [r6, 0x20] strh r0, [r6, 0x20]
adds r0, r5, 0 adds r0, r5, 0
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x20 adds r0, 0x20
@@ -1186,7 +1186,7 @@ _080B943A:
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
strh r0, [r6, 0x2E] strh r0, [r6, 0x2E]
ldr r0, _080B94B0 @ =sub_8074C44 ldr r0, _080B94B0 @ =WaitAnimForDuration
str r0, [r6, 0x1C] str r0, [r6, 0x1C]
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -1198,7 +1198,7 @@ _080B94A0: .4byte gBattleAnimArgs
_080B94A4: .4byte 0x000003ff _080B94A4: .4byte 0x000003ff
_080B94A8: .4byte 0xfffffc00 _080B94A8: .4byte 0xfffffc00
_080B94AC: .4byte DestroyAnimSprite _080B94AC: .4byte DestroyAnimSprite
_080B94B0: .4byte sub_8074C44 _080B94B0: .4byte WaitAnimForDuration
thumb_func_end sub_80B941C thumb_func_end sub_80B941C
thumb_func_start sub_80B94B4 thumb_func_start sub_80B94B4
+48 -48
View File
@@ -365,7 +365,7 @@ sub_80AF2F0: @ 80AF2F0
ldr r1, _080AF328 @ =DestroyAnimSprite ldr r1, _080AF328 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r1, _080AF32C @ =sub_8074AE0 ldr r1, _080AF32C @ =TranslateSpriteInGrowingCircleOverDuration
str r1, [r4, 0x1C] str r1, [r4, 0x1C]
adds r0, r4, 0 adds r0, r4, 0
bl _call_via_r1 bl _call_via_r1
@@ -375,7 +375,7 @@ sub_80AF2F0: @ 80AF2F0
.align 2, 0 .align 2, 0
_080AF324: .4byte gBattleAnimArgs _080AF324: .4byte gBattleAnimArgs
_080AF328: .4byte DestroyAnimSprite _080AF328: .4byte DestroyAnimSprite
_080AF32C: .4byte sub_8074AE0 _080AF32C: .4byte TranslateSpriteInGrowingCircleOverDuration
thumb_func_end sub_80AF2F0 thumb_func_end sub_80AF2F0
thumb_func_start sub_80AF330 thumb_func_start sub_80AF330
@@ -383,7 +383,7 @@ sub_80AF330: @ 80AF330
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080AF364 @ =gBattleAnimTarget ldr r0, _080AF364 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x2 movs r1, 0x2
@@ -452,7 +452,7 @@ sub_80AF3B8: @ 80AF3B8
bne _080AF3D4 bne _080AF3D4
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
b _080AF40A b _080AF40A
.align 2, 0 .align 2, 0
_080AF3D0: .4byte gBattleAnimArgs _080AF3D0: .4byte gBattleAnimArgs
@@ -464,7 +464,7 @@ _080AF3D4:
adds r3, r4, 0 adds r3, r4, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0x1 movs r1, 0x1
bl sub_8076D9C bl SetAverageBattlerPositions
ldr r0, _080AF420 @ =gBattleAnimAttacker ldr r0, _080AF420 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -487,7 +487,7 @@ _080AF40A:
ldr r1, _080AF424 @ =sub_80AF42C ldr r1, _080AF424 @ =sub_80AF42C
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080AF428 @ =sub_8074F50 ldr r0, _080AF428 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -496,7 +496,7 @@ _080AF40A:
_080AF41C: .4byte gBattleAnimTarget _080AF41C: .4byte gBattleAnimTarget
_080AF420: .4byte gBattleAnimAttacker _080AF420: .4byte gBattleAnimAttacker
_080AF424: .4byte sub_80AF42C _080AF424: .4byte sub_80AF42C
_080AF428: .4byte sub_8074F50 _080AF428: .4byte RunStoredCallbackWhenAffineAnimEnds
thumb_func_end sub_80AF3B8 thumb_func_end sub_80AF3B8
thumb_func_start sub_80AF42C thumb_func_start sub_80AF42C
@@ -526,7 +526,7 @@ sub_80AF42C: @ 80AF42C
cmp r0, 0x14 cmp r0, 0x14
bne _080AF462 bne _080AF462
adds r0, r3, 0 adds r0, r3, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080AF462: _080AF462:
pop {r0} pop {r0}
bx r0 bx r0
@@ -538,7 +538,7 @@ sub_80AF468: @ 80AF468
sub sp, 0x10 sub sp, 0x10
adds r5, r0, 0 adds r5, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r6, _080AF4B0 @ =gBattleAnimArgs ldr r6, _080AF4B0 @ =gBattleAnimArgs
ldrh r0, [r6, 0x8] ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
@@ -577,7 +577,7 @@ _080AF4B8:
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x36 adds r3, 0x36
movs r1, 0x1 movs r1, 0x1
bl sub_8076D9C bl SetAverageBattlerPositions
_080AF4CA: _080AF4CA:
ldr r0, _080AF4E8 @ =gBattleAnimAttacker ldr r0, _080AF4E8 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
@@ -616,7 +616,7 @@ _080AF504:
cmp r4, 0 cmp r4, 0
bge _080AF504 bge _080AF504
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075804 bl InitAnimFastLinearTranslationWithSpeed
ldrh r0, [r5, 0x30] ldrh r0, [r5, 0x30]
movs r1, 0x1 movs r1, 0x1
eors r0, r1 eors r0, r1
@@ -628,7 +628,7 @@ _080AF526:
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
adds r0, r5, 0 adds r0, r5, 0
bl sub_807578C bl AnimFastTranslateLinear
movs r0, 0x20 movs r0, 0x20
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
movs r2, 0x24 movs r2, 0x24
@@ -814,7 +814,7 @@ sub_80AF690: @ 80AF690
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
adds r0, r4, 0 adds r0, r4, 0
bl sub_807578C bl AnimFastTranslateLinear
movs r1, 0x20 movs r1, 0x20
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
movs r2, 0x24 movs r2, 0x24
@@ -853,7 +853,7 @@ sub_80AF6D8: @ 80AF6D8
sub sp, 0x10 sub sp, 0x10
adds r5, r0, 0 adds r5, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r1, _080AF71C @ =gBattleAnimArgs ldr r1, _080AF71C @ =gBattleAnimArgs
ldrh r0, [r1, 0x8] ldrh r0, [r1, 0x8]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
@@ -890,7 +890,7 @@ _080AF724:
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x36 adds r3, 0x36
movs r1, 0x1 movs r1, 0x1
bl sub_8076D9C bl SetAverageBattlerPositions
_080AF736: _080AF736:
ldr r0, _080AF758 @ =gBattleAnimAttacker ldr r0, _080AF758 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
@@ -921,7 +921,7 @@ _080AF76A:
adds r0, r1 adds r0, r1
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075804 bl InitAnimFastLinearTranslationWithSpeed
adds r7, r5, 0 adds r7, r5, 0
adds r7, 0x2E adds r7, 0x2E
adds r2, r7, 0 adds r2, r7, 0
@@ -946,7 +946,7 @@ _080AF79E:
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
adds r0, r5, 0 adds r0, r5, 0
bl sub_807578C bl AnimFastTranslateLinear
movs r2, 0x20 movs r2, 0x20
ldrsh r1, [r5, r2] ldrsh r1, [r5, r2]
movs r2, 0x24 movs r2, 0x24
@@ -1011,7 +1011,7 @@ _080AF818: .4byte sub_80AF81C
sub_80AF81C: @ 80AF81C sub_80AF81C: @ 80AF81C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_807578C bl AnimFastTranslateLinear
movs r1, 0x2E movs r1, 0x2E
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0 cmp r0, 0
@@ -1082,7 +1082,7 @@ sub_80AF88C: @ 80AF88C
bne _080AF8B0 bne _080AF8B0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
b _080AF8E6 b _080AF8E6
.align 2, 0 .align 2, 0
_080AF8AC: .4byte gBattleAnimArgs _080AF8AC: .4byte gBattleAnimArgs
@@ -1094,7 +1094,7 @@ _080AF8B0:
adds r3, r4, 0 adds r3, r4, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0 movs r1, 0
bl sub_8076D9C bl SetAverageBattlerPositions
ldr r0, _080AF8F4 @ =gBattleAnimAttacker ldr r0, _080AF8F4 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -1152,7 +1152,7 @@ sub_80AF914: @ 80AF914
bne _080AF938 bne _080AF938
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080AF976 b _080AF976
.align 2, 0 .align 2, 0
_080AF934: .4byte gBattleAnimArgs _080AF934: .4byte gBattleAnimArgs
@@ -1164,7 +1164,7 @@ _080AF938:
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0 movs r1, 0
bl sub_8076D9C bl SetAverageBattlerPositions
ldrb r0, [r4] ldrb r0, [r4]
bl GetBattlerSide bl GetBattlerSide
lsls r0, 24 lsls r0, 24
@@ -1200,7 +1200,7 @@ _080AF984:
bne _080AF996 bne _080AF996
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
b _080AF9D2 b _080AF9D2
_080AF996: _080AF996:
ldr r4, _080AF9BC @ =gBattleAnimTarget ldr r4, _080AF9BC @ =gBattleAnimTarget
@@ -1210,7 +1210,7 @@ _080AF996:
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0 movs r1, 0
bl sub_8076D9C bl SetAverageBattlerPositions
ldrb r0, [r4] ldrb r0, [r4]
bl GetBattlerSide bl GetBattlerSide
lsls r0, 24 lsls r0, 24
@@ -1279,7 +1279,7 @@ _080AFA10:
adds r0, r1 adds r0, r1
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
movs r0, 0x40 movs r0, 0x40
strh r0, [r5, 0x38] strh r0, [r5, 0x38]
ldr r1, _080AFA48 @ =sub_80AFA4C ldr r1, _080AFA48 @ =sub_80AFA4C
@@ -1299,7 +1299,7 @@ _080AFA48: .4byte sub_80AFA4C
sub_80AFA4C: @ 80AFA4C sub_80AFA4C: @ 80AFA4C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080AFAD6 bne _080AFAD6
@@ -1328,7 +1328,7 @@ sub_80AFA4C: @ 80AFA4C
ldrh r0, [r4, 0x3C] ldrh r0, [r4, 0x3C]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8076884 bl GetBattlerSpriteBGPriority
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
lsls r1, 2 lsls r1, 2
@@ -1343,7 +1343,7 @@ _080AFAA8:
ldrh r0, [r4, 0x3C] ldrh r0, [r4, 0x3C]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8076884 bl GetBattlerSpriteBGPriority
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x1 adds r0, 0x1
@@ -1426,7 +1426,7 @@ _080AFB26:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080AFBB0 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap ldr r1, _080AFBB0 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
ldr r0, _080AFBB4 @ =gUnknown_83C2CE0 ldr r0, _080AFBB4 @ =gUnknown_83C2CE0
mov r1, sp mov r1, sp
ldrb r1, [r1, 0x8] ldrb r1, [r1, 0x8]
@@ -1673,14 +1673,14 @@ sub_80AFD4C: @ 80AFD4C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
ldr r0, _080AFD7C @ =sub_8075DF4 ldr r0, _080AFD7C @ =TranslateAnimSpriteToTargetMonLocation
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080AFD78: .4byte gBattleAnimAttacker _080AFD78: .4byte gBattleAnimAttacker
_080AFD7C: .4byte sub_8075DF4 _080AFD7C: .4byte TranslateAnimSpriteToTargetMonLocation
thumb_func_end sub_80AFD4C thumb_func_end sub_80AFD4C
thumb_func_start sub_80AFD80 thumb_func_start sub_80AFD80
@@ -1737,7 +1737,7 @@ _080AFDC2:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080AFE50 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap ldr r1, _080AFE50 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
ldr r0, _080AFE54 @ =gUnknown_83C2CE0 ldr r0, _080AFE54 @ =gUnknown_83C2CE0
mov r1, sp mov r1, sp
ldrb r1, [r1, 0x8] ldrb r1, [r1, 0x8]
@@ -2105,7 +2105,7 @@ _080B00F8:
adds r0, r6 adds r0, r6
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
ldrb r0, [r4] ldrb r0, [r4]
bl sub_8076884 bl GetBattlerSpriteBGPriority
lsls r0, 24 lsls r0, 24
lsrs r0, 16 lsrs r0, 16
ldrh r1, [r5, 0x3C] ldrh r1, [r5, 0x3C]
@@ -2123,7 +2123,7 @@ _080B00F8:
strb r0, [r1] strb r0, [r1]
_080B012C: _080B012C:
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r0, _080B0144 @ =sub_80B0148 ldr r0, _080B0144 @ =sub_80B0148
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r3} pop {r3}
@@ -2159,7 +2159,7 @@ _080B0168:
b _080B0380 b _080B0380
_080B016A: _080B016A:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80755E0 bl AnimTranslateLinear
ldr r1, _080B0194 @ =gSineTable ldr r1, _080B0194 @ =gSineTable
movs r2, 0x38 movs r2, 0x38
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
@@ -2251,13 +2251,13 @@ _080B0202:
ands r0, r1 ands r0, r1
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
b _080B0380 b _080B0380
.align 2, 0 .align 2, 0
_080B022C: .4byte gSineTable _080B022C: .4byte gSineTable
_080B0230: _080B0230:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80755E0 bl AnimTranslateLinear
ldr r1, _080B028C @ =gSineTable ldr r1, _080B028C @ =gSineTable
movs r2, 0x38 movs r2, 0x38
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
@@ -2397,7 +2397,7 @@ _080B032A:
_080B0340: .4byte 0x0000fff0 _080B0340: .4byte 0x0000fff0
_080B0344: _080B0344:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B0380 beq _080B0380
@@ -2610,7 +2610,7 @@ _080B04D0: .4byte gUnknown_83E652C
_080B04D4: _080B04D4:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
movs r1, 0x6 movs r1, 0x6
@@ -2622,7 +2622,7 @@ _080B04D4:
lsrs r7, r1, 16 lsrs r7, r1, 16
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
movs r1, 0x6 movs r1, 0x6
@@ -2634,7 +2634,7 @@ _080B04D4:
_080B050A: _080B050A:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
movs r1, 0x6 movs r1, 0x6
@@ -2646,7 +2646,7 @@ _080B050A:
lsrs r7, r1, 16 lsrs r7, r1, 16
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
movs r1, 0x6 movs r1, 0x6
@@ -2904,7 +2904,7 @@ _080B071A:
bl StartSpriteAffineAnim bl StartSpriteAffineAnim
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r6, _080B0780 @ =gBattleAnimArgs ldr r6, _080B0780 @ =gBattleAnimArgs
ldrh r0, [r6, 0x8] ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
@@ -2938,7 +2938,7 @@ _080B0742:
ldrh r0, [r6, 0xA] ldrh r0, [r6, 0xA]
strh r0, [r5, 0x38] strh r0, [r5, 0x38]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080B078C @ =sub_80B0790 ldr r0, _080B078C @ =sub_80B0790
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4-r6} pop {r4-r6}
@@ -2956,14 +2956,14 @@ _080B078C: .4byte sub_80B0790
sub_80B0790: @ 80B0790 sub_80B0790: @ 80B0790
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B07B2 beq _080B07B2
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl StartSpriteAnim bl StartSpriteAnim
ldr r0, _080B07B8 @ =sub_8074F6C ldr r0, _080B07B8 @ =RunStoredCallbackWhenAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r1, _080B07BC @ =DestroyAnimSprite ldr r1, _080B07BC @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
@@ -2973,7 +2973,7 @@ _080B07B2:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B07B8: .4byte sub_8074F6C _080B07B8: .4byte RunStoredCallbackWhenAnimEnds
_080B07BC: .4byte DestroyAnimSprite _080B07BC: .4byte DestroyAnimSprite
thumb_func_end sub_80B0790 thumb_func_end sub_80B0790
@@ -2994,7 +2994,7 @@ sub_80B07C0: @ 80B07C0
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
bl Random bl Random
movs r5, 0xFF movs r5, 0xFF
ands r5, r0 ands r5, r0
+28 -28
View File
@@ -369,10 +369,10 @@ sub_80B9B8C: @ 80B9B8C
movs r0, 0x70 movs r0, 0x70
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
strh r2, [r4, 0x38] strh r2, [r4, 0x38]
ldr r1, _080B9BD4 @ =move_anim_8074EE0 ldr r1, _080B9BD4 @ =DestroySpriteAndMatrix
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r1, _080B9BD8 @ =sub_8074AE0 ldr r1, _080B9BD8 @ =TranslateSpriteInGrowingCircleOverDuration
str r1, [r4, 0x1C] str r1, [r4, 0x1C]
adds r0, r4, 0 adds r0, r4, 0
bl _call_via_r1 bl _call_via_r1
@@ -381,8 +381,8 @@ sub_80B9B8C: @ 80B9B8C
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B9BD0: .4byte gBattleAnimArgs _080B9BD0: .4byte gBattleAnimArgs
_080B9BD4: .4byte move_anim_8074EE0 _080B9BD4: .4byte DestroySpriteAndMatrix
_080B9BD8: .4byte sub_8074AE0 _080B9BD8: .4byte TranslateSpriteInGrowingCircleOverDuration
thumb_func_end sub_80B9B8C thumb_func_end sub_80B9B8C
thumb_func_start sub_80B9BDC thumb_func_start sub_80B9BDC
@@ -1662,16 +1662,16 @@ sub_80BA560: @ 80BA560
bne _080BA584 bne _080BA584
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080BA58C b _080BA58C
.align 2, 0 .align 2, 0
_080BA580: .4byte gBattleAnimArgs _080BA580: .4byte gBattleAnimArgs
_080BA584: _080BA584:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
_080BA58C: _080BA58C:
ldr r0, _080BA5A0 @ =sub_8074F50 ldr r0, _080BA5A0 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
ldr r1, _080BA5A4 @ =DestroyAnimSprite ldr r1, _080BA5A4 @ =DestroyAnimSprite
adds r0, r5, 0 adds r0, r5, 0
@@ -1680,7 +1680,7 @@ _080BA58C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BA5A0: .4byte sub_8074F50 _080BA5A0: .4byte RunStoredCallbackWhenAffineAnimEnds
_080BA5A4: .4byte DestroyAnimSprite _080BA5A4: .4byte DestroyAnimSprite
thumb_func_end sub_80BA560 thumb_func_end sub_80BA560
@@ -1697,19 +1697,19 @@ sub_80BA5A8: @ 80BA5A8
bne _080BA5CC bne _080BA5CC
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080BA5D4 b _080BA5D4
.align 2, 0 .align 2, 0
_080BA5C8: .4byte gBattleAnimArgs _080BA5C8: .4byte gBattleAnimArgs
_080BA5CC: _080BA5CC:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
_080BA5D4: _080BA5D4:
ldr r0, _080BA5EC @ =gBattleAnimArgs ldr r0, _080BA5EC @ =gBattleAnimArgs
ldrh r0, [r0, 0x8] ldrh r0, [r0, 0x8]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
ldr r0, _080BA5F0 @ =sub_8074F50 ldr r0, _080BA5F0 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
ldr r1, _080BA5F4 @ =sub_80B1D3C ldr r1, _080BA5F4 @ =sub_80B1D3C
adds r0, r5, 0 adds r0, r5, 0
@@ -1719,7 +1719,7 @@ _080BA5D4:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BA5EC: .4byte gBattleAnimArgs _080BA5EC: .4byte gBattleAnimArgs
_080BA5F0: .4byte sub_8074F50 _080BA5F0: .4byte RunStoredCallbackWhenAffineAnimEnds
_080BA5F4: .4byte sub_80B1D3C _080BA5F4: .4byte sub_80B1D3C
thumb_func_end sub_80BA5A8 thumb_func_end sub_80BA5A8
@@ -1777,14 +1777,14 @@ _080BA64C:
bne _080BA66C bne _080BA66C
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080BA674 b _080BA674
.align 2, 0 .align 2, 0
_080BA668: .4byte gBattleAnimArgs _080BA668: .4byte gBattleAnimArgs
_080BA66C: _080BA66C:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
_080BA674: _080BA674:
bl Random bl Random
lsls r0, 16 lsls r0, 16
@@ -1806,10 +1806,10 @@ _080BA674:
ldrh r1, [r4, 0x26] ldrh r1, [r4, 0x26]
adds r0, r1 adds r0, r1
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
ldr r1, _080BA6C0 @ =move_anim_8074EE0 ldr r1, _080BA6C0 @ =DestroySpriteAndMatrix
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080BA6C4 @ =sub_8074F50 ldr r0, _080BA6C4 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -1817,8 +1817,8 @@ _080BA674:
.align 2, 0 .align 2, 0
_080BA6B8: .4byte 0x0000ffe8 _080BA6B8: .4byte 0x0000ffe8
_080BA6BC: .4byte 0x0000fff4 _080BA6BC: .4byte 0x0000fff4
_080BA6C0: .4byte move_anim_8074EE0 _080BA6C0: .4byte DestroySpriteAndMatrix
_080BA6C4: .4byte sub_8074F50 _080BA6C4: .4byte RunStoredCallbackWhenAffineAnimEnds
thumb_func_end sub_80BA630 thumb_func_end sub_80BA630
thumb_func_start sub_80BA6C8 thumb_func_start sub_80BA6C8
@@ -1859,10 +1859,10 @@ sub_80BA6C8: @ 80BA6C8
ldrb r1, [r5, 0x6] ldrb r1, [r5, 0x6]
adds r0, r4, 0 adds r0, r4, 0
bl StartSpriteAffineAnim bl StartSpriteAffineAnim
ldr r1, _080BA730 @ =move_anim_8074EE0 ldr r1, _080BA730 @ =DestroySpriteAndMatrix
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080BA734 @ =sub_8074F50 ldr r0, _080BA734 @ =RunStoredCallbackWhenAffineAnimEnds
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -1870,8 +1870,8 @@ sub_80BA6C8: @ 80BA6C8
.align 2, 0 .align 2, 0
_080BA728: .4byte gBattleAnimArgs _080BA728: .4byte gBattleAnimArgs
_080BA72C: .4byte gSprites _080BA72C: .4byte gSprites
_080BA730: .4byte move_anim_8074EE0 _080BA730: .4byte DestroySpriteAndMatrix
_080BA734: .4byte sub_8074F50 _080BA734: .4byte RunStoredCallbackWhenAffineAnimEnds
thumb_func_end sub_80BA6C8 thumb_func_end sub_80BA6C8
thumb_func_start sub_80BA738 thumb_func_start sub_80BA738
@@ -1885,14 +1885,14 @@ sub_80BA738: @ 80BA738
bne _080BA754 bne _080BA754
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080BA75C b _080BA75C
.align 2, 0 .align 2, 0
_080BA750: .4byte gBattleAnimArgs _080BA750: .4byte gBattleAnimArgs
_080BA754: _080BA754:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
_080BA75C: _080BA75C:
ldr r0, _080BA774 @ =gBattleAnimArgs ldr r0, _080BA774 @ =gBattleAnimArgs
ldrh r0, [r0, 0x6] ldrh r0, [r0, 0x6]
@@ -1900,7 +1900,7 @@ _080BA75C:
ldr r1, _080BA778 @ =DestroyAnimSprite ldr r1, _080BA778 @ =DestroyAnimSprite
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080BA77C @ =sub_8074C44 ldr r0, _080BA77C @ =WaitAnimForDuration
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -1908,7 +1908,7 @@ _080BA75C:
.align 2, 0 .align 2, 0
_080BA774: .4byte gBattleAnimArgs _080BA774: .4byte gBattleAnimArgs
_080BA778: .4byte DestroyAnimSprite _080BA778: .4byte DestroyAnimSprite
_080BA77C: .4byte sub_8074C44 _080BA77C: .4byte WaitAnimForDuration
thumb_func_end sub_80BA738 thumb_func_end sub_80BA738
thumb_func_start sub_80BA780 thumb_func_start sub_80BA780
@@ -1924,14 +1924,14 @@ sub_80BA780: @ 80BA780
bne _080BA7A4 bne _080BA7A4
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080BA7AC b _080BA7AC
.align 2, 0 .align 2, 0
_080BA7A0: .4byte gBattleAnimArgs _080BA7A0: .4byte gBattleAnimArgs
_080BA7A4: _080BA7A4:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
_080BA7AC: _080BA7AC:
ldr r0, _080BA7B8 @ =sub_80BA7BC ldr r0, _080BA7B8 @ =sub_80BA7BC
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
+11 -11
View File
@@ -20,7 +20,7 @@ sub_80B1620: @ 80B1620
_080B1636: _080B1636:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
ldr r4, _080B1678 @ =gBattleAnimTarget ldr r4, _080B1678 @ =gBattleAnimTarget
@@ -39,7 +39,7 @@ _080B1636:
ldr r0, _080B167C @ =0x0000ffe2 ldr r0, _080B167C @ =0x0000ffe2
strh r0, [r5, 0x38] strh r0, [r5, 0x38]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080B1680 @ =sub_80B1684 ldr r0, _080B1680 @ =sub_80B1684
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4,r5} pop {r4,r5}
@@ -56,7 +56,7 @@ _080B1680: .4byte sub_80B1684
sub_80B1684: @ 80B1684 sub_80B1684: @ 80B1684
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B1698 beq _080B1698
@@ -84,7 +84,7 @@ sub_80B16A0: @ 80B16A0
_080B16B8: _080B16B8:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080B1718 @ =gBattleAnimTarget ldr r0, _080B1718 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
mov r6, sp mov r6, sp
@@ -92,7 +92,7 @@ _080B16B8:
movs r1, 0x1 movs r1, 0x1
mov r2, sp mov r2, sp
adds r3, r6, 0 adds r3, r6, 0
bl sub_8076D9C bl SetAverageBattlerPositions
ldr r0, _080B171C @ =gBattleAnimAttacker ldr r0, _080B171C @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -117,7 +117,7 @@ _080B16E6:
ldr r0, _080B1720 @ =0x0000ffe2 ldr r0, _080B1720 @ =0x0000ffe2
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080B1724 @ =sub_80B1728 ldr r0, _080B1724 @ =sub_80B1728
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
add sp, 0x4 add sp, 0x4
@@ -136,7 +136,7 @@ _080B1724: .4byte sub_80B1728
sub_80B1728: @ 80B1728 sub_80B1728: @ 80B1728
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B173C beq _080B173C
@@ -193,7 +193,7 @@ _080B1794: .4byte sub_80B1798
sub_80B1798: @ 80B1798 sub_80B1798: @ 80B1798
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_8074D00 bl TranslateSpriteLinearFixedPoint
ldrh r0, [r4, 0x30] ldrh r0, [r4, 0x30]
ldrh r1, [r4, 0x38] ldrh r1, [r4, 0x38]
subs r0, r1 subs r0, r1
@@ -225,7 +225,7 @@ sub_80B17C4: @ 80B17C4
adds r3, r4, 0 adds r3, r4, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0x1 movs r1, 0x1
bl sub_8076D9C bl SetAverageBattlerPositions
ldr r0, _080B1828 @ =gBattleAnimAttacker ldr r0, _080B1828 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -280,7 +280,7 @@ sub_80B1838: @ 80B1838
bne _080B1854 bne _080B1854
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
b _080B188A b _080B188A
.align 2, 0 .align 2, 0
_080B1850: .4byte gBattleAnimArgs _080B1850: .4byte gBattleAnimArgs
@@ -292,7 +292,7 @@ _080B1854:
adds r3, r4, 0 adds r3, r4, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0x1 movs r1, 0x1
bl sub_8076D9C bl SetAverageBattlerPositions
ldr r0, _080B1898 @ =gBattleAnimAttacker ldr r0, _080B1898 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
+8 -8
View File
@@ -290,7 +290,7 @@ _0804AB6C:
ldr r0, _0804ABC8 @ =0x0000ffd8 ldr r0, _0804ABC8 @ =0x0000ffd8
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
mov r0, sp mov r0, sp
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r4, 0x6] strh r0, [r4, 0x6]
@@ -328,7 +328,7 @@ SpriteCB_TestBallThrow: @ 804ABD4
push {r7} push {r7}
sub sp, 0x4 sub sp, 0x4
adds r7, r0, 0 adds r7, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0804AC74 beq _0804AC74
@@ -1692,7 +1692,7 @@ SpriteCB_PlayerMonSendOut_1: @ 804B684
ldrh r0, [r4, 0x3A] ldrh r0, [r4, 0x3A]
strh r0, [r4, 0x6] strh r0, [r4, 0x6]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _0804B6D0 @ =SpriteCB_PlayerMonSendOut_2 ldr r0, _0804B6D0 @ =SpriteCB_PlayerMonSendOut_2
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
@@ -1754,7 +1754,7 @@ SpriteCB_PlayerMonSendOut_2: @ 804B6D4
_0804B736: _0804B736:
ldrh r4, [r5, 0x2E] ldrh r4, [r5, 0x2E]
adds r0, r5, 0 adds r0, r5, 0
bl sub_80755E0 bl AnimTranslateLinear
movs r1, 0x3A movs r1, 0x3A
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
movs r1, 0x3 movs r1, 0x3
@@ -1825,7 +1825,7 @@ _0804B78E:
b _0804B834 b _0804B834
_0804B7C8: _0804B7C8:
adds r0, r5, 0 adds r0, r5, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0804B834 beq _0804B834
@@ -2580,13 +2580,13 @@ _0804BD80:
_0804BD84: .4byte SpriteCallbackDummy _0804BD84: .4byte SpriteCallbackDummy
thumb_func_end sub_804BD6C thumb_func_end sub_804BD6C
thumb_func_start DestroySpriteAndFreeResources_ thumb_func_start DestroySpriteAndFreeResources2
DestroySpriteAndFreeResources_: @ 804BD88 DestroySpriteAndFreeResources2: @ 804BD88
push {lr} push {lr}
bl DestroySpriteAndFreeResources bl DestroySpriteAndFreeResources
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end DestroySpriteAndFreeResources_ thumb_func_end DestroySpriteAndFreeResources2
thumb_func_start sub_804BD94 thumb_func_start sub_804BD94
sub_804BD94: @ 804BD94 sub_804BD94: @ 804BD94
+2 -2
View File
@@ -6157,7 +6157,7 @@ sub_814A8B8: @ 814A8B8
movs r6, 0 movs r6, 0
cmp r6, r10 cmp r6, r10
bge _0814A922 bge _0814A922
ldr r0, _0814A938 @ =gUnknown_82349CC ldr r0, _0814A938 @ =gMonFrontPicCoords
mov r9, r0 mov r9, r0
ldr r1, _0814A93C @ =gUnknown_203F3D8 ldr r1, _0814A93C @ =gUnknown_203F3D8
mov r8, r1 mov r8, r1
@@ -6200,7 +6200,7 @@ _0814A922:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0814A934: .4byte gUnknown_846D9D4 _0814A934: .4byte gUnknown_846D9D4
_0814A938: .4byte gUnknown_82349CC _0814A938: .4byte gMonFrontPicCoords
_0814A93C: .4byte gUnknown_203F3D8 _0814A93C: .4byte gUnknown_203F3D8
thumb_func_end sub_814A8B8 thumb_func_end sub_814A8B8
+1 -1
View File
@@ -10728,7 +10728,7 @@ sub_8139D90: @ 8139D90
lsls r0, 2 lsls r0, 2
ldr r1, _08139DB8 @ =gSprites ldr r1, _08139DB8 @ =gSprites
adds r0, r1 adds r0, r1
bl DestroySpriteAndFreeResources_ bl DestroySpriteAndFreeResources2
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
+38 -38
View File
@@ -42,7 +42,7 @@ _080B2EFE:
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r7, r4, 0 adds r7, r4, 0
adds r0, r4, 0 adds r0, r4, 0
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
@@ -354,7 +354,7 @@ sub_80B3168: @ 80B3168
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r4, r0, 0 adds r4, r0, 0
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
@@ -448,14 +448,14 @@ _080B3232:
bne _080B324C bne _080B324C
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080B3254 b _080B3254
.align 2, 0 .align 2, 0
_080B3248: .4byte gBattleAnimArgs _080B3248: .4byte gBattleAnimArgs
_080B324C: _080B324C:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
_080B3254: _080B3254:
ldrh r0, [r4, 0x2E] ldrh r0, [r4, 0x2E]
adds r0, 0x1 adds r0, 0x1
@@ -470,7 +470,7 @@ _080B325C:
cmp r0, 0 cmp r0, 0
beq _080B3270 beq _080B3270
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8074EE0 bl DestroySpriteAndMatrix
_080B3270: _080B3270:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -526,14 +526,14 @@ _080B32D6:
ldr r1, _080B32EC @ =DestroyAnimSprite ldr r1, _080B32EC @ =DestroyAnimSprite
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080B32F0 @ =sub_8074F6C ldr r0, _080B32F0 @ =RunStoredCallbackWhenAnimEnds
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B32EC: .4byte DestroyAnimSprite _080B32EC: .4byte DestroyAnimSprite
_080B32F0: .4byte sub_8074F6C _080B32F0: .4byte RunStoredCallbackWhenAnimEnds
thumb_func_end sub_80B3278 thumb_func_end sub_80B3278
thumb_func_start sub_80B32F4 thumb_func_start sub_80B32F4
@@ -543,7 +543,7 @@ sub_80B32F4: @ 80B32F4
ldr r6, _080B3378 @ =gBattleAnimAttacker ldr r6, _080B3378 @ =gBattleAnimAttacker
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x1 movs r1, 0x1
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r1, r0, 16 asrs r1, r0, 16
lsrs r0, 31 lsrs r0, 31
@@ -552,7 +552,7 @@ sub_80B32F4: @ 80B32F4
lsrs r4, r1, 16 lsrs r4, r1, 16
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r1, r0, 16 asrs r1, r0, 16
lsrs r0, 31 lsrs r0, 31
@@ -595,7 +595,7 @@ _080B3366:
ldr r1, _080B337C @ =sub_80B3384 ldr r1, _080B337C @ =sub_80B3384
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r0, _080B3380 @ =sub_8074F6C ldr r0, _080B3380 @ =RunStoredCallbackWhenAnimEnds
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -603,7 +603,7 @@ _080B3366:
.align 2, 0 .align 2, 0
_080B3378: .4byte gBattleAnimAttacker _080B3378: .4byte gBattleAnimAttacker
_080B337C: .4byte sub_80B3384 _080B337C: .4byte sub_80B3384
_080B3380: .4byte sub_8074F6C _080B3380: .4byte RunStoredCallbackWhenAnimEnds
thumb_func_end sub_80B32F4 thumb_func_end sub_80B32F4
thumb_func_start sub_80B3384 thumb_func_start sub_80B3384
@@ -703,7 +703,7 @@ sub_80B3418: @ 80B3418
strh r1, [r4, 0x8] strh r1, [r4, 0x8]
ldr r2, _080B344C @ =gUnknown_83E700C ldr r2, _080B344C @ =gUnknown_83E700C
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080B3450 @ =sub_80B3454 ldr r0, _080B3450 @ =sub_80B3454
str r0, [r4] str r0, [r4]
pop {r4} pop {r4}
@@ -725,7 +725,7 @@ sub_80B3454: @ 80B3454
lsls r0, 3 lsls r0, 3
ldr r1, _080B347C @ =gTasks ldr r1, _080B347C @ =gTasks
adds r0, r1 adds r0, r1
bl sub_8076308 bl RunAffineAnimFromTaskData
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080B3474 bne _080B3474
@@ -770,7 +770,7 @@ _080B34B4:
ldrb r1, [r4, 0x8] ldrb r1, [r4, 0x8]
ldr r2, _080B34D4 @ =gUnknown_83E702C ldr r2, _080B34D4 @ =gUnknown_83E702C
adds r0, r4, 0 adds r0, r4, 0
bl sub_80762D0 bl PrepareAffineAnimInTaskData
ldr r0, _080B34D8 @ =sub_80B34DC ldr r0, _080B34D8 @ =sub_80B34DC
str r0, [r4] str r0, [r4]
pop {r4} pop {r4}
@@ -804,7 +804,7 @@ sub_80B34DC: @ 80B34DC
_080B34FC: .4byte gTasks _080B34FC: .4byte gTasks
_080B3500: _080B3500:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076308 bl RunAffineAnimFromTaskData
ldrh r0, [r4, 0xC] ldrh r0, [r4, 0xC]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
@@ -900,7 +900,7 @@ sub_80B3584: @ 80B3584
strh r0, [r5, 0x24] strh r0, [r5, 0x24]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
movs r1, 0x3 movs r1, 0x3
@@ -909,7 +909,7 @@ sub_80B3584: @ 80B3584
lsrs r6, r0, 16 lsrs r6, r0, 16
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
movs r1, 0x3 movs r1, 0x3
@@ -1254,23 +1254,23 @@ sub_80B3834: @ 80B3834
ldr r4, _080B389C @ =gBattleAnimTarget ldr r4, _080B389C @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
strh r0, [r5, 0x1E] strh r0, [r5, 0x1E]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldr r4, _080B38A0 @ =gBattleAnimAttacker ldr r4, _080B38A0 @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
b _080B3962 b _080B3962
.align 2, 0 .align 2, 0
@@ -1285,18 +1285,18 @@ _080B38A4:
ldr r4, _080B38D0 @ =gBattleAnimAttacker ldr r4, _080B38D0 @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
strh r0, [r5, 0x1E] strh r0, [r5, 0x1E]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldr r4, _080B38D4 @ =gBattleAnimTarget ldr r4, _080B38D4 @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
b _080B3956 b _080B3956
.align 2, 0 .align 2, 0
@@ -1313,23 +1313,23 @@ _080B38D8:
ldr r4, _080B3924 @ =gBattleAnimTarget ldr r4, _080B3924 @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
strh r0, [r5, 0x1E] strh r0, [r5, 0x1E]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldr r4, _080B3928 @ =gBattleAnimAttacker ldr r4, _080B3928 @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x4 movs r1, 0x4
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
adds r0, 0x8 adds r0, 0x8
b _080B3962 b _080B3962
.align 2, 0 .align 2, 0
@@ -1343,24 +1343,24 @@ _080B392C:
ldr r4, _080B3974 @ =gBattleAnimAttacker ldr r4, _080B3974 @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
strh r0, [r5, 0x1E] strh r0, [r5, 0x1E]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldr r4, _080B3978 @ =gBattleAnimTarget ldr r4, _080B3978 @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x5 movs r1, 0x5
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
_080B3956: _080B3956:
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_8076B2C bl GetBattlerSpriteCoordAttr
subs r0, 0x8 subs r0, 0x8
_080B3962: _080B3962:
strh r0, [r5, 0x24] strh r0, [r5, 0x24]
@@ -1430,7 +1430,7 @@ _080B39A4:
ldrh r0, [r5, 0x1C] ldrh r0, [r5, 0x1C]
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl InitAnimArcTranslation
ldrb r0, [r5, 0xC] ldrb r0, [r5, 0xC]
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
@@ -1471,7 +1471,7 @@ _080B3A2C:
sub_80B3A34: @ 80B3A34 sub_80B3A34: @ 80B3A34
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B3A52 beq _080B3A52
@@ -1500,7 +1500,7 @@ sub_80B3A58: @ 80B3A58
adds r4, r1, r0 adds r4, r1, r0
ldr r0, _080B3A94 @ =gBattleAnimTarget ldr r0, _080B3A94 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_807492C bl GetBattlerYCoordWithElevation
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
adds r0, r1, 0 adds r0, r1, 0
@@ -1558,7 +1558,7 @@ _080B3ACA:
_080B3AD6: _080B3AD6:
ldr r0, _080B3AF0 @ =gBattleAnimTarget ldr r0, _080B3AF0 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80768B0 bl GetBattlerSpriteBGPriorityRank
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -1954,7 +1954,7 @@ _080B3DAA:
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
bl sub_8076494 bl SetBattlerSpriteYOffsetFromOtherYScale
movs r2, 0xA movs r2, 0xA
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
cmp r0, 0x30 cmp r0, 0x30
@@ -1993,7 +1993,7 @@ _080B3DFC:
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
bl sub_8076494 bl SetBattlerSpriteYOffsetFromOtherYScale
movs r2, 0xA movs r2, 0xA
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
cmp r0, 0 cmp r0, 0
+18 -18
View File
@@ -21,7 +21,7 @@ sub_80B4634: @ 80B4634
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x22 adds r3, 0x22
movs r1, 0 movs r1, 0
bl sub_8076D9C bl SetAverageBattlerPositions
_080B4654: _080B4654:
ldrh r0, [r6] ldrh r0, [r6]
ldrh r1, [r5, 0x20] ldrh r1, [r5, 0x20]
@@ -49,7 +49,7 @@ _080B4654:
ldr r1, _080B46AC @ =sub_80B46B4 ldr r1, _080B46AC @ =sub_80B46B4
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r1, _080B46B0 @ =sub_8074BE4 ldr r1, _080B46B0 @ =TranslateSpriteInEllipseOverDuration
str r1, [r5, 0x1C] str r1, [r5, 0x1C]
adds r0, r5, 0 adds r0, r5, 0
bl _call_via_r1 bl _call_via_r1
@@ -61,7 +61,7 @@ _080B46A0: .4byte gBattleAnimArgs
_080B46A4: .4byte gBattleAnimTarget _080B46A4: .4byte gBattleAnimTarget
_080B46A8: .4byte 0x0000ffba _080B46A8: .4byte 0x0000ffba
_080B46AC: .4byte sub_80B46B4 _080B46AC: .4byte sub_80B46B4
_080B46B0: .4byte sub_8074BE4 _080B46B0: .4byte TranslateSpriteInEllipseOverDuration
thumb_func_end sub_80B4634 thumb_func_end sub_80B4634
thumb_func_start sub_80B46B4 thumb_func_start sub_80B46B4
@@ -81,10 +81,10 @@ sub_80B46B4: @ 80B46B4
strh r0, [r4, 0x34] strh r0, [r4, 0x34]
ldr r0, _080B46EC @ =0x0000ffe8 ldr r0, _080B46EC @ =0x0000ffe8
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
ldr r1, _080B46F0 @ =move_anim_8074EE0 ldr r1, _080B46F0 @ =DestroySpriteAndMatrix
adds r0, r4, 0 adds r0, r4, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
ldr r1, _080B46F4 @ =sub_8074BE4 ldr r1, _080B46F4 @ =TranslateSpriteInEllipseOverDuration
str r1, [r4, 0x1C] str r1, [r4, 0x1C]
adds r0, r4, 0 adds r0, r4, 0
bl _call_via_r1 bl _call_via_r1
@@ -93,8 +93,8 @@ sub_80B46B4: @ 80B46B4
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B46EC: .4byte 0x0000ffe8 _080B46EC: .4byte 0x0000ffe8
_080B46F0: .4byte move_anim_8074EE0 _080B46F0: .4byte DestroySpriteAndMatrix
_080B46F4: .4byte sub_8074BE4 _080B46F4: .4byte TranslateSpriteInEllipseOverDuration
thumb_func_end sub_80B46B4 thumb_func_end sub_80B46B4
thumb_func_start sub_80B46F8 thumb_func_start sub_80B46F8
@@ -146,9 +146,9 @@ _080B472E:
bl InitSpriteDataForLinearTranslation bl InitSpriteDataForLinearTranslation
strh r4, [r5, 0x34] strh r4, [r5, 0x34]
strh r4, [r5, 0x36] strh r4, [r5, 0x36]
ldr r0, _080B4774 @ =sub_8074D00 ldr r0, _080B4774 @ =TranslateSpriteLinearFixedPoint
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
ldr r1, _080B4778 @ =move_anim_8074EE0 ldr r1, _080B4778 @ =DestroySpriteAndMatrix
adds r0, r5, 0 adds r0, r5, 0
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r4,r5} pop {r4,r5}
@@ -156,8 +156,8 @@ _080B472E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B4770: .4byte gBattleAnimArgs _080B4770: .4byte gBattleAnimArgs
_080B4774: .4byte sub_8074D00 _080B4774: .4byte TranslateSpriteLinearFixedPoint
_080B4778: .4byte move_anim_8074EE0 _080B4778: .4byte DestroySpriteAndMatrix
thumb_func_end sub_80B46F8 thumb_func_end sub_80B46F8
thumb_func_start sub_80B477C thumb_func_start sub_80B477C
@@ -171,14 +171,14 @@ sub_80B477C: @ 80B477C
bne _080B4798 bne _080B4798
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
b _080B47A0 b _080B47A0
.align 2, 0 .align 2, 0
_080B4794: .4byte gBattleAnimArgs _080B4794: .4byte gBattleAnimArgs
_080B4798: _080B4798:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075114 bl InitSpritePosToAnimTarget
_080B47A0: _080B47A0:
ldr r1, _080B47BC @ =gBattleAnimArgs ldr r1, _080B47BC @ =gBattleAnimArgs
ldrh r0, [r1, 0x6] ldrh r0, [r1, 0x6]
@@ -286,7 +286,7 @@ _080B4854:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080B48F0 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap ldr r1, _080B48F0 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080B48F4 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet ldr r1, _080B48F4 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet
@@ -673,7 +673,7 @@ sub_80B4B8C: @ 80B4B8C
bl StartSpriteAnim bl StartSpriteAnim
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20] ldrh r0, [r4, 0x20]
@@ -1141,7 +1141,7 @@ _080B4ECC:
ands r1, r3 ands r1, r3
orrs r1, r2 orrs r1, r2
strh r1, [r0, 0x4] strh r1, [r0, 0x4]
bl sub_8075068 bl InitAnimArcTranslation
ldrh r0, [r4, 0x1E] ldrh r0, [r4, 0x1E]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x1E] strh r0, [r4, 0x1E]
@@ -1165,7 +1165,7 @@ _080B4F74: .4byte 0xfffffc00
sub_80B4F78: @ 80B4F78 sub_80B4F78: @ 80B4F78
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B4FAA beq _080B4FAA
@@ -1316,7 +1316,7 @@ sub_80B5074: @ 80B5074
bl StartSpriteAffineAnim bl StartSpriteAffineAnim
_080B5090: _080B5090:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075DF4 bl TranslateAnimSpriteToTargetMonLocation
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
+8 -8
View File
@@ -9300,7 +9300,7 @@ _0805139C:
adds r1, r0 adds r1, r0
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r2, _08051410 @ =gUnknown_82349CC ldr r2, _08051410 @ =gMonFrontPicCoords
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0xF0 adds r0, 0xF0
ldrh r0, [r0] ldrh r0, [r0]
@@ -9324,7 +9324,7 @@ _0805139C:
.align 2, 0 .align 2, 0
_08051408: .4byte gSprites _08051408: .4byte gSprites
_0805140C: .4byte 0x0000ff4c _0805140C: .4byte 0x0000ff4c
_08051410: .4byte gUnknown_82349CC _08051410: .4byte gMonFrontPicCoords
_08051414: _08051414:
ldr r5, [r7] ldr r5, [r7]
adds r6, r5, 0 adds r6, r5, 0
@@ -10839,7 +10839,7 @@ _08052070:
adds r1, r0 adds r1, r0
lsls r1, 2 lsls r1, 2
adds r1, r4 adds r1, r4
ldr r3, _08052120 @ =gUnknown_82349CC ldr r3, _08052120 @ =gMonFrontPicCoords
adds r2, 0xF2 adds r2, 0xF2
ldrh r0, [r2] ldrh r0, [r2]
lsls r0, 2 lsls r0, 2
@@ -10906,7 +10906,7 @@ _08052070:
b _080522AC b _080522AC
.align 2, 0 .align 2, 0
_0805211C: .4byte gSprites _0805211C: .4byte gSprites
_08052120: .4byte gUnknown_82349CC _08052120: .4byte gMonFrontPicCoords
_08052124: .4byte 0x000fffff _08052124: .4byte 0x000fffff
_08052128: _08052128:
movs r1, 0xAA movs r1, 0xAA
@@ -11476,7 +11476,7 @@ _0805278C:
adds r1, r0 adds r1, r0
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r2, _08052800 @ =gUnknown_82349CC ldr r2, _08052800 @ =gMonFrontPicCoords
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0xF0 adds r0, 0xF0
ldrh r0, [r0] ldrh r0, [r0]
@@ -11500,7 +11500,7 @@ _0805278C:
.align 2, 0 .align 2, 0
_080527F8: .4byte gSprites _080527F8: .4byte gSprites
_080527FC: .4byte 0x0000ff4c _080527FC: .4byte 0x0000ff4c
_08052800: .4byte gUnknown_82349CC _08052800: .4byte gMonFrontPicCoords
_08052804: _08052804:
ldr r5, [r7] ldr r5, [r7]
adds r6, r5, 0 adds r6, r5, 0
@@ -13064,7 +13064,7 @@ _080534CC:
adds r1, r0 adds r1, r0
lsls r1, 2 lsls r1, 2
adds r1, r4 adds r1, r4
ldr r3, _0805357C @ =gUnknown_82349CC ldr r3, _0805357C @ =gMonFrontPicCoords
adds r2, 0xF2 adds r2, 0xF2
ldrh r0, [r2] ldrh r0, [r2]
lsls r0, 2 lsls r0, 2
@@ -13131,7 +13131,7 @@ _080534CC:
b _08053708 b _08053708
.align 2, 0 .align 2, 0
_08053578: .4byte gSprites _08053578: .4byte gSprites
_0805357C: .4byte gUnknown_82349CC _0805357C: .4byte gMonFrontPicCoords
_08053580: .4byte 0x000fffff _08053580: .4byte 0x000fffff
_08053584: _08053584:
movs r1, 0xAA movs r1, 0xAA
+27 -27
View File
@@ -197,7 +197,7 @@ _080AAD10:
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x36] strh r0, [r6, 0x36]
adds r0, r6, 0 adds r0, r6, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r0, _080AADAC @ =SpriteCallbackDummy ldr r0, _080AADAC @ =SpriteCallbackDummy
bl CreateInvisibleSpriteWithCallback bl CreateInvisibleSpriteWithCallback
adds r4, r0, 0 adds r4, r0, 0
@@ -273,7 +273,7 @@ sub_80AADB8: @ 80AADB8
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
adds r0, r5, 0 adds r0, r5, 0
bl sub_80755E0 bl AnimTranslateLinear
mov r1, r8 mov r1, r8
lsrs r6, r1, 8 lsrs r6, r1, 8
movs r0, 0x2E movs r0, 0x2E
@@ -329,14 +329,14 @@ sub_80AAE40: @ 80AAE40
negs r1, r1 negs r1, r1
ands r1, r2 ands r1, r2
strb r1, [r3] strb r1, [r3]
ldr r1, _080AAE60 @ =sub_8074F6C ldr r1, _080AAE60 @ =RunStoredCallbackWhenAnimEnds
str r1, [r0, 0x1C] str r1, [r0, 0x1C]
ldr r1, _080AAE64 @ =sub_80AAE68 ldr r1, _080AAE64 @ =sub_80AAE68
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080AAE60: .4byte sub_8074F6C _080AAE60: .4byte RunStoredCallbackWhenAnimEnds
_080AAE64: .4byte sub_80AAE68 _080AAE64: .4byte sub_80AAE68
thumb_func_end sub_80AAE40 thumb_func_end sub_80AAE40
@@ -345,15 +345,15 @@ sub_80AAE68: @ 80AAE68
push {lr} push {lr}
movs r1, 0xA movs r1, 0xA
strh r1, [r0, 0x2E] strh r1, [r0, 0x2E]
ldr r1, _080AAE7C @ =sub_8074C44 ldr r1, _080AAE7C @ =WaitAnimForDuration
str r1, [r0, 0x1C] str r1, [r0, 0x1C]
ldr r1, _080AAE80 @ =move_anim_8074EE0 ldr r1, _080AAE80 @ =DestroySpriteAndMatrix
bl StoreSpriteCallbackInData6 bl StoreSpriteCallbackInData6
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080AAE7C: .4byte sub_8074C44 _080AAE7C: .4byte WaitAnimForDuration
_080AAE80: .4byte move_anim_8074EE0 _080AAE80: .4byte DestroySpriteAndMatrix
thumb_func_end sub_80AAE68 thumb_func_end sub_80AAE68
thumb_func_start sub_80AAE84 thumb_func_start sub_80AAE84
@@ -361,7 +361,7 @@ sub_80AAE84: @ 80AAE84
push {r4-r7,lr} push {r4-r7,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080AAEAC @ =gBattleAnimAttacker ldr r0, _080AAEAC @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -406,7 +406,7 @@ _080AAEBA:
adds r0, r7 adds r0, r7
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
ldr r0, _080AAF18 @ =sub_80AAF1C ldr r0, _080AAF18 @ =sub_80AAF1C
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
adds r2, r5, 0 adds r2, r5, 0
@@ -447,7 +447,7 @@ sub_80AAF1C: @ 80AAF1C
strb r0, [r2] strb r0, [r2]
_080AAF3E: _080AAF3E:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080AAF50 beq _080AAF50
@@ -569,7 +569,7 @@ sub_80AB024: @ 80AB024
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
movs r0, 0x1E movs r0, 0x1E
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20] ldrh r0, [r5, 0x20]
@@ -590,7 +590,7 @@ sub_80AB024: @ 80AB024
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
adds r0, r5, 0 adds r0, r5, 0
bl obj_translate_based_on_private_1_2_3_4 bl InitAnimLinearTranslation
movs r0, 0x2E movs r0, 0x2E
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
movs r0, 0xD2 movs r0, 0xD2
@@ -634,7 +634,7 @@ _080AB0A8: .4byte sub_80AB0AC
sub_80AB0AC: @ 80AB0AC sub_80AB0AC: @ 80AB0AC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80755E0 bl AnimTranslateLinear
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080AB0C0 beq _080AB0C0
@@ -861,7 +861,7 @@ _080AB256:
movs r7, 0x3 movs r7, 0x3
_080AB260: _080AB260:
adds r0, r6, 0 adds r0, r6, 0
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r0, _080AB2B8 @ =gBattleAnimAttacker ldr r0, _080AB2B8 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
bl GetBattlerSide bl GetBattlerSide
@@ -912,7 +912,7 @@ sub_80AB2CC: @ 80AB2CC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
ldr r0, _080AB2FC @ =gBattleAnimArgs ldr r0, _080AB2FC @ =gBattleAnimArgs
ldrh r1, [r0, 0x8] ldrh r1, [r0, 0x8]
strh r1, [r4, 0x2E] strh r1, [r4, 0x2E]
@@ -948,14 +948,14 @@ sub_80AB308: @ 80AB308
beq _080AB324 beq _080AB324
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
b _080AB32C b _080AB32C
.align 2, 0 .align 2, 0
_080AB320: .4byte gBattleAnimArgs _080AB320: .4byte gBattleAnimArgs
_080AB324: _080AB324:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
_080AB32C: _080AB32C:
ldr r0, _080AB33C @ =gBattleAnimArgs ldr r0, _080AB33C @ =gBattleAnimArgs
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
@@ -1054,7 +1054,7 @@ sub_80AB38C: @ 80AB38C
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080AB404 @ =gFile_graphics_unknown_unknown_E81D14_tilemap ldr r1, _080AB404 @ =gFile_graphics_unknown_unknown_E81D14_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
b _080AB42E b _080AB42E
.align 2, 0 .align 2, 0
_080AB3FC: .4byte 0x00003f42 _080AB3FC: .4byte 0x00003f42
@@ -1064,7 +1064,7 @@ _080AB408:
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, _080AB414 @ =gFile_graphics_unknown_unknown_E81FE4_tilemap ldr r1, _080AB414 @ =gFile_graphics_unknown_unknown_E81FE4_tilemap
bl sub_807543C bl AnimLoadCompressedBgTilemap
b _080AB42E b _080AB42E
.align 2, 0 .align 2, 0
_080AB414: .4byte gFile_graphics_unknown_unknown_E81FE4_tilemap _080AB414: .4byte gFile_graphics_unknown_unknown_E81FE4_tilemap
@@ -1904,7 +1904,7 @@ sub_80ABA78: @ 80ABA78
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075114 bl InitSpritePosToAnimTarget
bl Random bl Random
movs r5, 0xFF movs r5, 0xFF
ands r5, r0 ands r5, r0
@@ -2138,7 +2138,7 @@ _080ABC66:
ldrh r0, [r4, 0x26] ldrh r0, [r4, 0x26]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8076440 bl SetBattlerSpriteYOffsetFromYScale
ldr r2, _080ABC84 @ =gSprites ldr r2, _080ABC84 @ =gSprites
movs r0, 0x26 movs r0, 0x26
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
@@ -3287,7 +3287,7 @@ sub_80AC504: @ 80AC504
strh r1, [r0, 0x36] strh r1, [r0, 0x36]
ldrh r1, [r6, 0x1A] ldrh r1, [r6, 0x1A]
strh r1, [r0, 0x38] strh r1, [r0, 0x38]
bl sub_8075068 bl InitAnimArcTranslation
adds r5, 0x1C adds r5, 0x1C
adds r4, r5 adds r4, r5
ldr r0, _080AC56C @ =sub_80AC570 ldr r0, _080AC56C @ =sub_80AC570
@@ -3309,7 +3309,7 @@ _080AC56C: .4byte sub_80AC570
sub_80AC570: @ 80AC570 sub_80AC570: @ 80AC570
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080AC5CA beq _080AC5CA
@@ -3344,7 +3344,7 @@ sub_80AC570: @ 80AC570
mvns r1, r1 mvns r1, r1
strh r1, [r6, 0x38] strh r1, [r6, 0x38]
adds r0, r6, 0 adds r0, r6, 0
bl sub_8075068 bl InitAnimArcTranslation
ldr r0, _080AC5D4 @ =sub_80AC5D8 ldr r0, _080AC5D4 @ =sub_80AC5D8
str r0, [r6, 0x1C] str r0, [r6, 0x1C]
_080AC5CA: _080AC5CA:
@@ -3360,7 +3360,7 @@ _080AC5D4: .4byte sub_80AC5D8
sub_80AC5D8: @ 80AC5D8 sub_80AC5D8: @ 80AC5D8
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
bl AnimateBallThrow bl TranslateAnimHorizontalArc
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080AC614 beq _080AC614
@@ -3498,7 +3498,7 @@ sub_80AC6D8: @ 80AC6D8
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8075160 bl InitSpritePosToAnimAttacker
ldr r5, _080AC714 @ =gBattleAnimTarget ldr r5, _080AC714 @ =gBattleAnimTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
-18
View File
@@ -242,21 +242,3 @@ gUnknown_83ADE18:: @ 83ADE18
gUnknown_83ADF5C:: @ 83ADF5C gUnknown_83ADF5C:: @ 83ADF5C
.incbin "baserom.gba", 0x3ADF5C, 0xC0 .incbin "baserom.gba", 0x3ADF5C, 0xC0
gUnknown_83AE01C:: @ 83AE01C
.incbin "baserom.gba", 0x3AE01C, 0x20
gUnknown_83AE03C:: @ 83AE03C
.incbin "baserom.gba", 0x3AE03C, 0x10
gUnknown_83AE04C:: @ 83AE04C
.incbin "baserom.gba", 0x3AE04C, 0x4
gUnknown_83AE050:: @ 83AE050
.incbin "baserom.gba", 0x3AE050, 0x4
gUnknown_83AE054:: @ 83AE054
.incbin "baserom.gba", 0x3AE054, 0x30
gUnknown_83AE084:: @ 0x83AE084
.incbin "baserom.gba", 0x3AE084, 0x10
+2 -2
View File
@@ -89,7 +89,7 @@ gUnknown_823499C:: @ 823499C
gUnknown_82349BC:: @ 82349BC gUnknown_82349BC:: @ 82349BC
.incbin "baserom.gba", 0x2349BC, 0x10 .incbin "baserom.gba", 0x2349BC, 0x10
gUnknown_82349CC:: @ 82349CC gMonFrontPicCoords:: @ 82349CC
.incbin "baserom.gba", 0x2349CC, 0x6E0 .incbin "baserom.gba", 0x2349CC, 0x6E0
gMonFrontPicTable:: @ 82350AC gMonFrontPicTable:: @ 82350AC
@@ -98,7 +98,7 @@ gMonFrontPicTable:: @ 82350AC
gUnknown_8235194:: @ 8235194 gUnknown_8235194:: @ 8235194
.incbin "baserom.gba", 0x235194, 0xCD8 .incbin "baserom.gba", 0x235194, 0xCD8
gUnknown_8235E6C:: @ 8235E6C gMonBackPicCoords:: @ 8235E6C
.incbin "baserom.gba", 0x235E6C, 0x6E0 .incbin "baserom.gba", 0x235E6C, 0x6E0
gMonBackPicTable:: @ 823654C gMonBackPicTable:: @ 823654C
-3
View File
@@ -820,9 +820,6 @@ extern struct BattleSpriteData *gBattleSpritesDataPtr;
extern u8 *gLinkBattleSendBuffer; extern u8 *gLinkBattleSendBuffer;
extern u8 *gLinkBattleRecvBuffer; extern u8 *gLinkBattleRecvBuffer;
extern u8 *gUnknown_0202305C;
extern u8 *gUnknown_02023060;
// Move this somewhere else // Move this somewhere else
#include "sprite.h" #include "sprite.h"
+102 -26
View File
@@ -1,11 +1,9 @@
#ifndef GUARD_BATTLE_ANIM_H #ifndef GUARD_BATTLE_ANIM_H
#define GUARD_BATTLE_ANIM_H #define GUARD_BATTLE_ANIM_H
#include "global.h" #include "battle.h"
#include "constants/battle_anim.h"
#ifndef BATTLE_BANKS_COUNT #include "task.h"
#define BATTLE_BANKS_COUNT 4
#endif // BATTLE_BANKS_COUNT
enum enum
{ {
@@ -52,7 +50,6 @@ extern s16 gBattleAnimArgs[ANIM_ARGS_COUNT];
extern u8 gAnimMoveTurn; extern u8 gAnimMoveTurn;
extern u8 gBattleAnimAttacker; extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget; extern u8 gBattleAnimTarget;
extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT];
extern u8 gUnknown_02038440; extern u8 gUnknown_02038440;
extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT]; extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
extern u16 gAnimMovePower; extern u16 gAnimMovePower;
@@ -60,6 +57,8 @@ extern s32 gAnimMoveDmg;
extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT]; extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT];
extern u8 gUnknown_2037F24; extern u8 gUnknown_2037F24;
extern struct OamData gOamData_83ACA40;
void ClearBattleAnimationVars(void); void ClearBattleAnimationVars(void);
void DoMoveAnim(u16 move); void DoMoveAnim(u16 move);
void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim); void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim);
@@ -140,32 +139,109 @@ u8 ItemIdToBallId(u16 itemId);
u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId); u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId);
u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId);
// battle_anim_mons.s // battle_anim_mons.c
void TranslateMonSpriteLinear(struct Sprite * sprite); u8 GetBattlerSpriteCoord(u8 battlerId, u8 coordType);
void TranslateMonSpriteLinearFixedPoint(struct Sprite * sprite); u8 GetBattlerSpriteCoord2(u8 battlerId, u8 coordType);
void InitSpriteDataForLinearTranslation(struct Sprite * sprite); u8 GetBattlerSpriteDefault_Y(u8 battlerId);
void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 b); u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
void ResetSpriteRotScale(u8 spriteId); u8 GetGhostSpriteDefault_Y(u8 battlerId);
void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); u8 GetBattlerYCoordWithElevation(u8 battlerId);
bool8 IsContest(void); u8 GetAnimBattlerSpriteId(u8 animBattler);
void sub_80759DC(u8 spriteId); void StoreSpriteCallbackInData6(struct Sprite *sprite, SpriteCallback callback);
void TranslateSpriteInCircleOverDuration(struct Sprite *sprite);
void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *sprite);
void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite);
void WaitAnimForDuration(struct Sprite *sprite);
void sub_8074C80(struct Sprite *sprite);
void TranslateSpriteLinear(struct Sprite *sprite);
void TranslateSpriteLinearFixedPoint(struct Sprite *sprite);
void TranslateMonSpriteLinear(struct Sprite *sprite);
void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite);
void TranslateSpriteLinearAndFlicker(struct Sprite *sprite);
void DestroySpriteAndMatrix(struct Sprite *sprite);
void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite);
void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite);
void DestroyAnimSpriteAndDisableBlend(struct Sprite *sprite);
void DestroyAnimVisualTaskAndDisableBlend(u8 taskId);
void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite);
void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 xOffset);
void InitAnimArcTranslation(struct Sprite *sprite);
bool8 TranslateAnimHorizontalArc(struct Sprite *sprite);
bool8 TranslateAnimVerticalArc(struct Sprite *sprite);
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets);
void InitSpritePosToAnimAttacker(struct Sprite *sprite, bool8 respectMonPicOffsets);
u8 GetBattlerSide(u8 battlerId);
u8 GetBattlerPosition(u8 battlerId);
u8 GetBattlerAtPosition(u8 position);
bool8 IsBattlerSpritePresent(u8 battlerId); bool8 IsBattlerSpritePresent(u8 battlerId);
u8 GetBattlerSpriteSubpriority(u8 battlerId); bool8 IsDoubleBattle(void);
void sub_80752A0(struct BattleAnimBgData *animBgData);
void sub_80752C8(struct BattleAnimBgData *animBgData, u32 arg1);
void sub_8075300(struct BattleAnimBgData *animBgData, u8 unused);
void sub_8075358(u32 bgId);
void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset);
void InitAnimBgTilemapBuffer(u32 bgId, const void *src);
void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src);
u8 sub_8075454(void);
void sub_8075458(bool8 arg0);
void sub_8075490(struct Sprite *sprite);
void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
void InitAnimLinearTranslation(struct Sprite *sprite);
void StartAnimLinearTranslation(struct Sprite *sprite); void StartAnimLinearTranslation(struct Sprite *sprite);
void sub_80755B8(struct Sprite *sprite); void sub_80755B8(struct Sprite *sprite);
u8 sub_80768B0(u8 battlerId); bool8 AnimTranslateLinear(struct Sprite *sprite);
void sub_807563C(struct Sprite *sprite);
void sub_8075678(struct Sprite *sprite);
void sub_80756A4(struct Sprite *sprite);
void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite);
bool8 AnimFastTranslateLinear(struct Sprite *sprite);
void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite);
void sub_8075830(struct Sprite *sprite);
void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode);
void ResetSpriteRotScale(u8 spriteId);
void SetBattlerSpriteYOffsetFromRotation(u8 spriteId);
void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation);
void sub_8075AD8(struct Sprite *sprite);
u16 ArcTan2Neg(s16 a, s16 b);
void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor);
u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7);
u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4); u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4);
u8 sub_8075D80(u8 battlerId); u8 sub_8075D80(u8 a1);
void sub_8075D9C(struct Sprite *sprite);
void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
void sub_8075E80(struct Sprite *sprite);
void sub_8075F0C(struct Sprite *sprite);
s16 CloneBattlerSpriteWithBlend(u8 animBattler); s16 CloneBattlerSpriteWithBlend(u8 animBattler);
void obj_delete_but_dont_free_vram(struct Sprite *sprite); void obj_delete_but_dont_free_vram(struct Sprite *sprite);
void sub_807543C(u8 bgId, const u32 *); void sub_8076048(u8 taskId);
void AnimLoadCompressedBgGfx(u32, const u32 *, u32); void AnimTask_BlendMonInAndOut(u8 task);
void sub_80752A0(struct BattleAnimBgData *); void sub_8076288(u8 taskId);
u8 sub_8076E34(s32, u8, s32); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds);
void sub_8075358(u8 bgId); bool8 RunAffineAnimFromTaskData(struct Task *task);
u32 sub_8075BE8(u8, u8, u8, u8, u8, u8, u8); void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
void sub_8075458(bool8); void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);
bool8 AnimateBallThrow(struct Sprite *sprite); void StorePointerInVars(s16 *lo, s16 *hi, const void *ptr);
void *LoadPointerFromVars(s16 lo, s16 hi);
void sub_80765D4(struct Task *task, u8 spriteId, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7);
u8 sub_8076640(struct Task *task);
void AnimTask_GetFrustrationPowerLevel(u8 taskId);
void sub_80767F0(void);
u8 GetBattlerSpriteSubpriority(u8 battlerId);
u8 GetBattlerSpriteBGPriority(u8 battlerId);
u8 GetBattlerSpriteBGPriorityRank(u8 battlerId);
u8 sub_80768D0(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10);
void DestroySpriteAndFreeResources_(struct Sprite *sprite);
s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr);
void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y);
u8 sub_8076E34(s32 battlerId, u8 spriteId, s32 species);
void sub_8076ED8(struct Sprite *sprite);
void sub_8076F58(struct Sprite *sprite);
void sub_8076FD0(struct Sprite *sprite);
void sub_8077030(u8 taskId);
void sub_807729C(struct Sprite *sprite);
void sub_8077350(struct Sprite *sprite);
// battle_anim_mon_movement.c // battle_anim_mon_movement.c
void AnimTask_ShakeMon(u8 taskId); void AnimTask_ShakeMon(u8 taskId);
+1 -1
View File
@@ -67,7 +67,7 @@ void EndBounceEffect(u8 bank, bool8 b);
void sub_8039E44(struct Sprite *sprite); void sub_8039E44(struct Sprite *sprite);
void sub_8039E60(struct Sprite *sprite); void sub_8039E60(struct Sprite *sprite);
void sub_8039E84(struct Sprite *sprite); void sub_8039E84(struct Sprite *sprite);
void sub_8039E9C(struct Sprite *sprite); void sub_801236C(struct Sprite *sprite);
void BeginBattleIntro(void); void BeginBattleIntro(void);
void SwitchInClearSetData(void); void SwitchInClearSetData(void);
void FaintClearSetData(void); void FaintClearSetData(void);
+2
View File
@@ -31,6 +31,8 @@ extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern const struct MonCoords gMonFrontPicCoords[];
extern const struct MonCoords gMonBackPicCoords[];
extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow; extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow; extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
+24
View File
@@ -76,6 +76,18 @@ extern u8 gStringVar2[];
extern u8 gStringVar3[]; extern u8 gStringVar3[];
extern u8 gStringVar4[]; extern u8 gStringVar4[];
struct Coords8
{
s8 x;
s8 y;
};
struct UCoords8
{
u8 x;
u8 y;
};
struct Coords16 struct Coords16
{ {
s16 x; s16 x;
@@ -88,6 +100,18 @@ struct UCoords16
u16 y; u16 y;
}; };
struct Coords32
{
s32 x;
s32 y;
};
struct UCoords32
{
u32 x;
u32 y;
};
struct Time struct Time
{ {
/*0x00*/ s16 days; /*0x00*/ s16 days;
-5
View File
@@ -18,11 +18,6 @@ struct LinkPlayerMapObject
u8 mode; u8 mode;
}; };
struct UCoords32
{
u32 x, y;
};
struct CreditsOverworldCmd struct CreditsOverworldCmd
{ {
s16 unk_0; s16 unk_0;
+1
View File
@@ -16,5 +16,6 @@ u16 sub_8096FD4(u16);
u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32); u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32);
void sub_8097070(struct Sprite *); void sub_8097070(struct Sprite *);
u16 GetUnownLetterByPersonality(u32 personality); u16 GetUnownLetterByPersonality(u32 personality);
u8 UpdateMonIconFrame(struct Sprite *sprite);
#endif // GUARD_POKEMON_ICON_H #endif // GUARD_POKEMON_ICON_H
-17
View File
@@ -1,17 +0,0 @@
#ifndef GUARD_ROM6_H
#define GUARD_ROM6_H
#include "global.h"
void sub_81357FC(u8, void(void));
u8 GetLeadMonIndex(void);
u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
void sub_813BADC(bool8);
bool8 sub_813B9C0(void);
void UpdateMirageRnd(u16 days);
void UpdateBirchState(u16 days);
void UpdateFrontierManiac(u16 days);
void UpdateFrontierGambler(u16 days);
void SetShoalItemFlag(u16 days);
#endif //GUARD_ROM6_H
+1
View File
@@ -251,6 +251,7 @@ extern s16 gSpriteCoordOffsetX;
extern s16 gSpriteCoordOffsetY; extern s16 gSpriteCoordOffsetY;
extern const struct SpriteTemplate gDummySpriteTemplate; extern const struct SpriteTemplate gDummySpriteTemplate;
extern struct Sprite gSprites[]; extern struct Sprite gSprites[];
extern struct OamMatrix gOamMatrices[];
void ResetSpriteData(void); void ResetSpriteData(void);
void AnimateSprites(void); void AnimateSprites(void);
+2 -1
View File
@@ -111,7 +111,7 @@ SECTIONS {
src/palette.o(.text); src/palette.o(.text);
src/sound.o(.text); src/sound.o(.text);
asm/battle_anim.o(.text); asm/battle_anim.o(.text);
asm/battle_anim_mons.o(.text); src/battle_anim_mons.o(.text);
src/task.o(.text); src/task.o(.text);
src/reshow_battle_screen.o(.text); src/reshow_battle_screen.o(.text);
asm/battle_anim_status_effects.o(.text); asm/battle_anim_status_effects.o(.text);
@@ -412,6 +412,7 @@ SECTIONS {
src/palette.o(.rodata); src/palette.o(.rodata);
src/sound.o(.rodata); src/sound.o(.rodata);
data/battle_anim.o(.rodata); data/battle_anim.o(.rodata);
src/battle_anim_mons.o(.rodata);
data/map_events.o(.rodata); data/map_events.o(.rodata);
data/battle_anim_status_effects.o(.rodata); data/battle_anim_status_effects.o(.rodata);
src/title_screen.o(.rodata); src/title_screen.o(.rodata);
+1 -1
View File
@@ -844,7 +844,7 @@ static void sub_8099B54(u8 taskId)
gTasks[taskId].data[3] += gTasks[taskId].data[4]; gTasks[taskId].data[3] += gTasks[taskId].data[4];
SetSpriteRotScale(gTasks[taskId].data[5], 0x100, 0x100, gTasks[taskId].data[3]); SetSpriteRotScale(gTasks[taskId].data[5], 0x100, 0x100, gTasks[taskId].data[3]);
if (gTasks[taskId].data[7]) if (gTasks[taskId].data[7])
sub_80759DC(gTasks[taskId].data[5]); SetBattlerSpriteYOffsetFromRotation(gTasks[taskId].data[5]);
if (++gTasks[taskId].data[1] >= gTasks[taskId].data[2]) if (++gTasks[taskId].data[1] >= gTasks[taskId].data[2])
{ {
switch (gTasks[taskId].data[6]) switch (gTasks[taskId].data[6])
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -312,7 +312,7 @@ void sub_80BACEC(u8 taskId)
spriteId = GetAnimBattlerSpriteId(0); spriteId = GetAnimBattlerSpriteId(0);
newSpriteId = sub_8076E34(gBattleAnimAttacker, spriteId, species); newSpriteId = sub_8076E34(gBattleAnimAttacker, spriteId, species);
sub_80752A0(&animBgData); sub_80752A0(&animBgData);
sub_807543C(animBgData.bgId, gFile_graphics_battle_anims_masks_curse_tilemap); AnimLoadCompressedBgTilemap(animBgData.bgId, gFile_graphics_battle_anims_masks_curse_tilemap);
if (IsContest()) if (IsContest())
sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0); sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
AnimLoadCompressedBgGfx(animBgData.bgId, gFile_graphics_battle_anims_masks_curse_sheet, animBgData.tilesOffset); AnimLoadCompressedBgGfx(animBgData.bgId, gFile_graphics_battle_anims_masks_curse_sheet, animBgData.tilesOffset);
@@ -434,9 +434,9 @@ static void sub_80BB2A0(u8 taskId)
} }
sub_80752A0(&animBgData); sub_80752A0(&animBgData);
if (sAnimStatsChangeData->data[0] == 0) if (sAnimStatsChangeData->data[0] == 0)
sub_807543C(animBgData.bgId, gBattleStatMask1_Tilemap); AnimLoadCompressedBgTilemap(animBgData.bgId, gBattleStatMask1_Tilemap);
else else
sub_807543C(animBgData.bgId, gBattleStatMask2_Tilemap); AnimLoadCompressedBgTilemap(animBgData.bgId, gBattleStatMask2_Tilemap);
if (IsContest()) if (IsContest())
sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0); sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
AnimLoadCompressedBgGfx(animBgData.bgId, gBattleStatMask_Gfx, animBgData.tilesOffset); AnimLoadCompressedBgGfx(animBgData.bgId, gBattleStatMask_Gfx, animBgData.tilesOffset);
@@ -736,7 +736,7 @@ void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5,
if (arg4) if (arg4)
newSpriteId = sub_8076E34(battler2, gBattlerSpriteIds[battler2], species); newSpriteId = sub_8076E34(battler2, gBattlerSpriteIds[battler2], species);
sub_80752A0(&animBgData); sub_80752A0(&animBgData);
sub_807543C(animBgData.bgId, tilemap); AnimLoadCompressedBgTilemap(animBgData.bgId, tilemap);
if (IsContest()) if (IsContest())
sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0); sub_80730C0(animBgData.paletteId, animBgData.bgTilemap, 0, 0);
AnimLoadCompressedBgGfx(animBgData.bgId, gfx, animBgData.tilesOffset); AnimLoadCompressedBgGfx(animBgData.bgId, gfx, animBgData.tilesOffset);
+1 -1
View File
@@ -1191,7 +1191,7 @@ static void sub_80303A8(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
u8 battlerId = tExpTask_battler; u8 battlerId = tExpTask_battler;
u16 v5 = sub_80768B0(battlerId); u16 v5 = GetBattlerSpriteBGPriorityRank(battlerId);
bool32 v6 = ((v5 ^ BIT_SIDE)) != B_SIDE_PLAYER; bool32 v6 = ((v5 ^ BIT_SIDE)) != B_SIDE_PLAYER;
struct Sprite *sprite = &gSprites[gBattlerSpriteIds[battlerId]]; struct Sprite *sprite = &gSprites[gBattlerSpriteIds[battlerId]];
+2 -2
View File
@@ -2087,7 +2087,7 @@ struct UnkStruct_82349CC
u8 field_3; u8 field_3;
}; };
extern const struct UnkStruct_82349CC gUnknown_82349CC[NUM_SPECIES]; extern const struct UnkStruct_82349CC gMonFrontPicCoords[NUM_SPECIES];
static void SpriteCB_Egg_2(struct Sprite* sprite) static void SpriteCB_Egg_2(struct Sprite* sprite)
{ {
@@ -2101,7 +2101,7 @@ static void SpriteCB_Egg_2(struct Sprite* sprite)
sprite->data[0] = 0; sprite->data[0] = 0;
species = GetMonData(&gPlayerParty[sEggHatchData->eggPartyID], MON_DATA_SPECIES); species = GetMonData(&gPlayerParty[sEggHatchData->eggPartyID], MON_DATA_SPECIES);
gSprites[sEggHatchData->pokeSpriteID].pos2.x = 0; gSprites[sEggHatchData->pokeSpriteID].pos2.x = 0;
gSprites[sEggHatchData->pokeSpriteID].pos2.y = gUnknown_82349CC[species].field_1; gSprites[sEggHatchData->pokeSpriteID].pos2.y = gMonFrontPicCoords[species].field_1;
} }
else else
{ {
+1 -4
View File
@@ -675,10 +675,7 @@ gAnimBattlerSpecies: @ 2037F1C
gUnknown_2037F24: @ 2037F24 gUnknown_2037F24: @ 2037F24
.space 0x4 .space 0x4
gUnknown_2037F28: @ 2037F28 .include "src/battle_anim_mons.o"
.space 0x8
.align 2
.include "src/title_screen.o" .include "src/title_screen.o"
.align 2 .align 2