Merge branch 'master' of github.com:pret/pokeemerald into trade
This commit is contained in:
Diegoisawesome committed
commit
2592803460
59 files changed
+11858
-23135
No files matched your search
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
+6
-6
@@ -447,7 +447,7 @@ sub_8113A58: @ 8113A58
|
||||
cmp r0, 0
|
||||
bne _08113A8A
|
||||
adds r0, r3, 0
|
||||
bl move_anim_8074EE0
|
||||
bl DestroySpriteAndMatrix
|
||||
_08113A8A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -581,7 +581,7 @@ sub_8113B90: @ 8113B90
|
||||
cmp r0, 0
|
||||
beq _08113BA4
|
||||
adds r0, r4, 0
|
||||
bl move_anim_8074EE0
|
||||
bl DestroySpriteAndMatrix
|
||||
_08113BA4:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -1684,7 +1684,7 @@ sub_81144BC: @ 81144BC
|
||||
ldrb r1, [r1, 0x4]
|
||||
adds r0, r4, 0
|
||||
bl StartSpriteAnim
|
||||
ldr r0, =sub_80A67D8
|
||||
ldr r0, =RunStoredCallbackWhenAnimEnds
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
@@ -1895,7 +1895,7 @@ _0811465C:
|
||||
bne _08114708
|
||||
adds r0, r1, 0
|
||||
movs r1, 0
|
||||
bl sub_80A750C
|
||||
bl SetGreyscaleOrOriginalPalette
|
||||
b _08114714
|
||||
.pool
|
||||
_08114708:
|
||||
@@ -1984,7 +1984,7 @@ _08114776:
|
||||
bne _081147B8
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x1
|
||||
bl sub_80A750C
|
||||
bl SetGreyscaleOrOriginalPalette
|
||||
_081147B8:
|
||||
movs r0, 0x8
|
||||
ldrsh r1, [r4, r0]
|
||||
@@ -2159,7 +2159,7 @@ _0811492E:
|
||||
adds r0, 0x10
|
||||
ldr r1, =gBattleAnimArgs
|
||||
ldrb r1, [r1, 0x2]
|
||||
bl sub_80A750C
|
||||
bl SetGreyscaleOrOriginalPalette
|
||||
_0811494A:
|
||||
adds r0, r5, 0
|
||||
bl DestroyAnimVisualTask
|
||||
|
||||
+5
-5
@@ -201,7 +201,7 @@ _0810DFC8:
|
||||
strh r0, [r6, 0x36]
|
||||
adds r0, r6, 0
|
||||
bl InitAnimLinearTranslation
|
||||
ldr r0, =sub_80A67BC
|
||||
ldr r0, =RunStoredCallbackWhenAffineAnimEnds
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, =sub_810E028
|
||||
adds r0, r6, 0
|
||||
@@ -2056,7 +2056,7 @@ _0810EE42:
|
||||
str r0, [sp]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0
|
||||
bl sub_80A73E0
|
||||
bl TrySetSpriteRotScale
|
||||
ldrh r0, [r5, 0x2E]
|
||||
adds r0, 0x1
|
||||
strh r0, [r5, 0x2E]
|
||||
@@ -2085,7 +2085,7 @@ _0810EE92:
|
||||
ldrsh r3, [r5, r0]
|
||||
str r1, [sp]
|
||||
adds r0, r5, 0
|
||||
bl sub_80A73E0
|
||||
bl TrySetSpriteRotScale
|
||||
ldrb r1, [r5, 0x3]
|
||||
lsls r1, 26
|
||||
lsrs r1, 27
|
||||
@@ -2409,7 +2409,7 @@ sub_810F084: @ 810F084
|
||||
mov r0, r8
|
||||
movs r1, 0x1
|
||||
adds r2, r3, 0
|
||||
bl sub_80A73E0
|
||||
bl TrySetSpriteRotScale
|
||||
ldr r0, =sub_810F140
|
||||
mov r2, r8
|
||||
str r0, [r2, 0x1C]
|
||||
@@ -2456,7 +2456,7 @@ sub_810F140: @ 810F140
|
||||
bge _0810F180
|
||||
_0810F17A:
|
||||
adds r0, r2, 0
|
||||
bl move_anim_8074EE0
|
||||
bl DestroySpriteAndMatrix
|
||||
_0810F180:
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
@@ -355,7 +355,7 @@ sub_810B8AC: @ 810B8AC
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r1, =sub_80A634C
|
||||
ldr r1, =TranslateSpriteInGrowingCircleOverDuration
|
||||
str r1, [r4, 0x1C]
|
||||
adds r0, r4, 0
|
||||
bl _call_via_r1
|
||||
@@ -466,7 +466,7 @@ _0810B9C6:
|
||||
ldr r1, =sub_810B9E8
|
||||
adds r0, r4, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, =sub_80A67BC
|
||||
ldr r0, =RunStoredCallbackWhenAffineAnimEnds
|
||||
str r0, [r4, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -501,7 +501,7 @@ sub_810B9E8: @ 810B9E8
|
||||
cmp r0, 0x14
|
||||
bne _0810BA1E
|
||||
adds r0, r3, 0
|
||||
bl move_anim_8074EE0
|
||||
bl DestroySpriteAndMatrix
|
||||
_0810BA1E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -2816,7 +2816,7 @@ sub_810CD1C: @ 810CD1C
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl StartSpriteAnim
|
||||
ldr r0, =sub_80A67D8
|
||||
ldr r0, =RunStoredCallbackWhenAnimEnds
|
||||
str r0, [r4, 0x1C]
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r4, 0
|
||||
|
||||
+14
-14
@@ -535,7 +535,7 @@ _0810F618:
|
||||
cmp r0, 0
|
||||
beq _0810F62C
|
||||
adds r0, r4, 0
|
||||
bl move_anim_8074EE0
|
||||
bl DestroySpriteAndMatrix
|
||||
_0810F62C:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@@ -589,7 +589,7 @@ _0810F692:
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, =sub_80A67D8
|
||||
ldr r0, =RunStoredCallbackWhenAnimEnds
|
||||
str r0, [r5, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@@ -656,7 +656,7 @@ _0810F722:
|
||||
ldr r1, =sub_810F740
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldr r0, =sub_80A67D8
|
||||
ldr r0, =RunStoredCallbackWhenAnimEnds
|
||||
str r0, [r5, 0x1C]
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -760,7 +760,7 @@ sub_810F7D4: @ 810F7D4
|
||||
strh r1, [r4, 0x8]
|
||||
ldr r2, =gUnknown_0859675C
|
||||
adds r0, r4, 0
|
||||
bl sub_80A7CFC
|
||||
bl PrepareAffineAnimInTaskData
|
||||
ldr r0, =sub_810F810
|
||||
str r0, [r4]
|
||||
pop {r4}
|
||||
@@ -779,7 +779,7 @@ sub_810F810: @ 810F810
|
||||
lsls r0, 3
|
||||
ldr r1, =gTasks
|
||||
adds r0, r1
|
||||
bl sub_80A7D34
|
||||
bl RunAffineAnimFromTaskData
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810F830
|
||||
@@ -823,7 +823,7 @@ _0810F870:
|
||||
ldrb r1, [r4, 0x8]
|
||||
ldr r2, =gUnknown_0859677C
|
||||
adds r0, r4, 0
|
||||
bl sub_80A7CFC
|
||||
bl PrepareAffineAnimInTaskData
|
||||
ldr r0, =sub_810F898
|
||||
str r0, [r4]
|
||||
pop {r4}
|
||||
@@ -852,7 +852,7 @@ sub_810F898: @ 810F898
|
||||
.pool
|
||||
_0810F8BC:
|
||||
adds r0, r4, 0
|
||||
bl sub_80A7D34
|
||||
bl RunAffineAnimFromTaskData
|
||||
ldrh r0, [r4, 0xC]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0xC]
|
||||
@@ -907,7 +907,7 @@ _0810F900:
|
||||
lsls r1, 1
|
||||
strh r1, [r0, 0x20]
|
||||
ldrb r0, [r4, 0x8]
|
||||
bl sub_80A7344
|
||||
bl ResetSpriteRotScale
|
||||
adds r0, r5, 0
|
||||
bl DestroyAnimVisualTask
|
||||
_0810F936:
|
||||
@@ -1805,7 +1805,7 @@ sub_8110034: @ 8110034
|
||||
_0811006C:
|
||||
ldr r1, =gBattleAnimArgs
|
||||
ldrb r0, [r1]
|
||||
bl duplicate_obj_of_side_rel2move_in_transparent_mode
|
||||
bl CloneBattlerSpriteWithBlend
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
mov r9, r1
|
||||
@@ -1860,7 +1860,7 @@ _08110094:
|
||||
lsls r2, 1
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrb r3, [r4, 0x1]
|
||||
lsrs r1, r3, 6
|
||||
ldrb r2, [r4, 0x3]
|
||||
@@ -1942,14 +1942,14 @@ _08110166:
|
||||
ldrsh r2, [r4, r1]
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x22]
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
bl sub_80A7EC0
|
||||
bl SetBattlerSpriteYOffsetFromOtherYScale
|
||||
movs r2, 0xA
|
||||
ldrsh r0, [r4, r2]
|
||||
cmp r0, 0x30
|
||||
@@ -1980,14 +1980,14 @@ _081101B8:
|
||||
ldrsh r2, [r4, r1]
|
||||
adds r1, r2, 0
|
||||
movs r3, 0
|
||||
bl obj_id_set_rotscale
|
||||
bl SetSpriteRotScale
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x22]
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
bl sub_80A7EC0
|
||||
bl SetBattlerSpriteYOffsetFromOtherYScale
|
||||
movs r2, 0xA
|
||||
ldrsh r0, [r4, r2]
|
||||
cmp r0, 0
|
||||
|
||||
+9
-9
@@ -315,7 +315,7 @@ sub_8107408: @ 8107408
|
||||
negs r1, r1
|
||||
ands r1, r2
|
||||
strb r1, [r3]
|
||||
ldr r1, =sub_80A67D8
|
||||
ldr r1, =RunStoredCallbackWhenAnimEnds
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, =sub_8107430
|
||||
bl StoreSpriteCallbackInData6
|
||||
@@ -331,7 +331,7 @@ sub_8107430: @ 8107430
|
||||
strh r1, [r0, 0x2E]
|
||||
ldr r1, =WaitAnimForDuration
|
||||
str r1, [r0, 0x1C]
|
||||
ldr r1, =move_anim_8074EE0
|
||||
ldr r1, =DestroySpriteAndMatrix
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -711,7 +711,7 @@ sub_8107730: @ 8107730
|
||||
ldr r6, =0x0000fff6
|
||||
strh r6, [r4, 0x26]
|
||||
ldrb r0, [r7]
|
||||
bl GetBattlerSubpriority
|
||||
bl GetBattlerSpriteSubpriority
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl IsContest
|
||||
@@ -1906,7 +1906,7 @@ sub_81080E4: @ 81080E4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
bl sub_80A7270
|
||||
bl PrepareBattlerSpriteForRotScale
|
||||
ldr r0, =sub_8108140
|
||||
str r0, [r4]
|
||||
pop {r4}
|
||||
@@ -2026,7 +2026,7 @@ _08108222:
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80A7E6C
|
||||
bl SetBattlerSpriteYOffsetFromYScale
|
||||
ldr r2, =gSprites
|
||||
movs r0, 0x26
|
||||
ldrsh r1, [r4, r0]
|
||||
@@ -2166,7 +2166,7 @@ _08108320:
|
||||
ldrh r0, [r4, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80A7344
|
||||
bl ResetSpriteRotScale
|
||||
movs r0, 0x26
|
||||
ldrsh r1, [r4, r0]
|
||||
lsls r0, r1, 4
|
||||
@@ -2286,7 +2286,7 @@ sub_8108408: @ 8108408
|
||||
lsrs r6, r0, 24
|
||||
movs r5, 0xAC
|
||||
ldrb r0, [r4]
|
||||
bl GetBattlerSubpriority
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -3517,7 +3517,7 @@ _08108DE2:
|
||||
strh r0, [r4, 0x30]
|
||||
ldr r0, =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSubpriority
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
adds r1, 0x43
|
||||
@@ -3572,7 +3572,7 @@ _08108E58:
|
||||
strh r0, [r4, 0x30]
|
||||
ldr r0, =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSubpriority
|
||||
bl GetBattlerSpriteSubpriority
|
||||
subs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
adds r1, 0x43
|
||||
|
||||
Reference in new issue
Block a user