mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-30 08:56:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

function renaming

Browse Source
This commit is contained in:
theo
2020-06-12 02:54:00 -07:00
parent d5350cd72b
commit ab1157d869
268 changed files with 1408 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/acroBandits.s
+17 -17
View File
@@ -48,7 +48,7 @@ _0803189C:
adds r0, r5, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
_080318BE:
pop {r4, r5, pc}
.align 2, 0
@@ -179,7 +179,7 @@ _080319A2:
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #0xe
bl UpdateSprite
bl InitializeAnimation
_080319AC:
ldr r1, [sp]
ldrb r0, [r1]
@@ -251,7 +251,7 @@ _08031A1A:
strb r1, [r2]
adds r0, r4, #0
movs r1, #0xe
bl UpdateSprite
bl InitializeAnimation
_08031A36:
adds r0, r4, #0
adds r0, #0x43
@@ -394,7 +394,7 @@ _08031AD8:
strh r4, [r6, #0x32]
adds r0, r6, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_08031B44:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -434,7 +434,7 @@ _08031B6C:
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_08031B90:
pop {r4, pc}
.align 2, 0
@@ -472,7 +472,7 @@ _08031BCE:
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #3
bl UpdateSprite
bl InitializeAnimation
b _08031C1A
_08031BDA:
adds r2, r4, #0
@@ -505,7 +505,7 @@ _08031BFA:
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_08031C1A:
pop {r4, pc}
@@ -651,7 +651,7 @@ sub_08031C58: @ 0x08031C58
strb r0, [r2]
adds r0, r7, #0
movs r1, #7
bl UpdateSprite
bl InitializeAnimation
b _08031D66
.align 2, 0
_08031D50: .4byte gUnk_03003DBC
@@ -875,7 +875,7 @@ sub_08031EA8: @ 0x08031EA8
strb r0, [r1]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
thumb_func_start sub_08031EE8
@@ -927,7 +927,7 @@ _08031F2E:
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
_08031F48:
pop {r4, pc}
.align 2, 0
@@ -977,7 +977,7 @@ sub_08031F54: @ 0x08031F54
_08031FA2:
adds r0, r4, #0
movs r1, #6
bl UpdateSprite
bl InitializeAnimation
_08031FAA:
pop {r4, pc}
.align 2, 0
@@ -1020,12 +1020,12 @@ _08031FD8:
beq _08031FFE
adds r0, r5, #0
movs r1, #9
bl UpdateSprite
bl InitializeAnimation
b _08032006
_08031FFE:
adds r0, r5, #0
movs r1, #8
bl UpdateSprite
bl InitializeAnimation
_08032006:
pop {r4, r5, pc}
@@ -1250,7 +1250,7 @@ _0803219C:
strb r0, [r2]
adds r0, r4, #0
movs r1, #0xc
bl UpdateSprite
bl InitializeAnimation
_080321C2:
ldr r0, [r4, #0x54]
cmp r0, #0
@@ -1323,7 +1323,7 @@ _08032230:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #0xd
bl UpdateSprite
bl InitializeAnimation
_08032244:
pop {r4, pc}
.align 2, 0
@@ -1374,7 +1374,7 @@ sub_08032290: @ 0x08032290
movs r1, #0xc
strb r1, [r0, #0xe]
movs r1, #0xb
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -1402,7 +1402,7 @@ sub_080322A4: @ 0x080322A4
strh r0, [r2, #0x36]
adds r0, r2, #0
movs r1, #0xb
bl UpdateSprite
bl InitializeAnimation
movs r0, #1
b _080322E4
_080322D8:
asm/anju.s
+1 -1
View File
@@ -59,7 +59,7 @@ _0806C2FA:
ands r1, r2
adds r1, r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_0806F118
b _0806C350
asm/archway.s
+1 -1
View File
@@ -29,7 +29,7 @@ sub_08090F70: @ 0x08090F70
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
bl sub_08052660
cmp r0, #0
beq _08090FB4
asm/armos.s
+4 -4
View File
@@ -12,13 +12,13 @@ sub_08030198: @ 0x08030198
push {r4, lr}
adds r4, r0, #0
ldr r1, _080301B8 @ =gUnk_080CE124
bl sub_0800129E
bl EnemyFunctionHandler
movs r3, #0x10
rsbs r3, r3, #0
adds r0, r4, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
adds r0, r4, #0
bl sub_08030150
pop {r4, pc}
@@ -237,7 +237,7 @@ sub_08030338: @ 0x08030338
_0803034C:
adds r0, r4, #0
movs r1, #3
bl UpdateSpriteAnimation
bl InitializeAnimationAnimation
adds r0, r4, #0
adds r0, #0x84
ldr r0, [r0]
@@ -1107,7 +1107,7 @@ _080309C4:
sub_080309C8: @ 0x080309C8
push {r4, lr}
adds r4, r0, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
adds r0, #0x84
ldr r0, [r0]
asm/bakerOven.s
+3 -3
View File
@@ -26,7 +26,7 @@ sub_0809CC74: @ 0x0809CC74
adds r5, r0, #0
movs r4, #1
strb r4, [r5, #0xc]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _0809CCD4
@@ -95,7 +95,7 @@ _0809CD00:
_0809CD02:
adds r0, r5, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0809CD0A:
pop {r4, r5, pc}
@@ -212,7 +212,7 @@ sub_0809CDB4: @ 0x0809CDB4
strh r0, [r3, #0x32]
adds r0, r3, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0809CDEC:
pop {pc}
.align 2, 0
asm/ballChainSoldier.s
+1 -1
View File
@@ -11,7 +11,7 @@
sub_0803E528: @ 0x0803E528
push {lr}
ldr r1, _0803E534 @ =gUnk_080D06E0
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_0803E534: .4byte gUnk_080D06E0
asm/beanstalk.s
+4 -4
View File
@@ -73,7 +73,7 @@ _08089D74:
adds r0, r0, r4
ldrb r1, [r0]
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
ldrb r0, [r5, #0xb]
lsls r0, r0, #2
adds r0, r0, r4
@@ -89,7 +89,7 @@ _08089D90:
adds r1, r1, r0
ldrb r1, [r1]
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
b _08089DC6
.align 2, 0
_08089DA8: .4byte gUnk_08120E14
@@ -658,7 +658,7 @@ _0808A1B0:
ldrb r1, [r3]
adds r1, #1
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
b _0808A1DE
_0808A1DA:
movs r0, #0
@@ -680,7 +680,7 @@ _0808A1DE:
adds r1, r1, r0
adds r1, #1
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
_0808A202:
pop {r3}
mov r8, r3
asm/beedle.s
+4 -4
View File
@@ -49,7 +49,7 @@ sub_080632E0: @ 0x080632E0
beq _0806330E
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08078778
ldrb r1, [r4, #0x18]
@@ -88,7 +88,7 @@ sub_08063314: @ 0x08063314
cmp r0, r1
beq _08063342
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08063342:
adds r0, r4, #0
adds r0, #0x39
@@ -126,7 +126,7 @@ sub_0806336C: @ 0x0806336C
strb r0, [r2, #0xc]
adds r0, r2, #0
movs r1, #8
bl UpdateSprite
bl InitializeAnimation
_0806338A:
pop {pc}
.align 2, 0
@@ -150,7 +150,7 @@ sub_08063390: @ 0x08063390
bl sub_0806EDC4
adds r1, r0, #0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08078778
_080633BE:
asm/beetle.s
+17 -17
View File
@@ -11,7 +11,7 @@
sub_08021758: @ 0x08021758
push {lr}
ldr r1, _08021764 @ =gUnk_080CB590
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_08021764: .4byte gUnk_080CB590
@@ -82,7 +82,7 @@ _080217A8:
strb r0, [r1]
adds r0, r4, #0
movs r1, #6
bl UpdateSprite
bl InitializeAnimation
b _080217FA
.align 2, 0
_080217EC: .4byte gLinkEntity
@@ -158,7 +158,7 @@ _0802186C:
strh r1, [r4, #0x36]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_0802187A:
pop {r4, pc}
@@ -196,7 +196,7 @@ sub_0802189C: @ 0x0802189C
strb r0, [r4, #0x1c]
adds r0, r4, #0
movs r1, #3
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
thumb_func_start sub_080218B4
@@ -296,7 +296,7 @@ _08021948:
strh r0, [r5, #0x24]
adds r0, r5, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0802197C:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -362,9 +362,9 @@ _080219C2:
strb r0, [r1]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08021A04:
pop {r4, pc}
.align 2, 0
@@ -405,7 +405,7 @@ sub_08021A10: @ 0x08021A10
bl sub_08021D44
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_08021A5E:
pop {r4, pc}
.align 2, 0
@@ -434,7 +434,7 @@ sub_08021A64: @ 0x08021A64
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_08021A96:
ldrb r0, [r4, #0xf]
subs r0, #1
@@ -454,7 +454,7 @@ _08021A96:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
b _08021AD4
_08021AC2:
adds r0, r4, #0
@@ -496,7 +496,7 @@ sub_08021AD8: @ 0x08021AD8
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
b _08021B60
_08021B16:
strb r0, [r4, #0x15]
@@ -533,7 +533,7 @@ _08021B3A:
strb r0, [r1]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_08021B60:
pop {r4, pc}
.align 2, 0
@@ -555,7 +555,7 @@ sub_08021B64: @ 0x08021B64
str r1, [r4, #0x34]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
b _08021C4E
.align 2, 0
_08021B88: .4byte gLinkState
@@ -621,7 +621,7 @@ _08021BF6:
strb r0, [r4, #0x15]
adds r0, r4, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
b _08021C4E
_08021C04:
ldrb r1, [r6, #0x1a]
@@ -721,7 +721,7 @@ _08021C8A:
strb r2, [r0]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_08021CCC:
pop {r4, r5, pc}
.align 2, 0
@@ -748,7 +748,7 @@ _08021CE6:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_08021CFE:
pop {r4, pc}
@@ -784,7 +784,7 @@ _08021D28:
str r0, [r4, #0x20]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
movs r0, #1
_08021D40:
pop {r4, pc}
asm/bell.s
+1 -1
View File
@@ -44,7 +44,7 @@ sub_08097D90: @ 0x08097D90
ands r0, r1
strb r0, [r2]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl LoadAnimation
asm/bigBarrel.s
+1 -1
View File
@@ -509,7 +509,7 @@ _08088DEC:
_08088E1E:
strb r1, [r4, #0xb]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
b _08088E6E
_08088E28:
ldrb r0, [r4, #0xb]
asm/bigIceBlock.s
+2 -2
View File
@@ -73,7 +73,7 @@ _08099770:
bl sub_08099910
ldrb r1, [r4, #0xa]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0x85
movs r1, #4
movs r2, #0
@@ -751,7 +751,7 @@ _08099D40:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA6C
asm/bigPushableLever.s
+2 -2
View File
@@ -196,7 +196,7 @@ sub_08098FE0: @ 0x08098FE0
bl SetTile
adds r0, r6, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
b _080990DC
.align 2, 0
_08099060: .4byte gRoomControls
@@ -253,7 +253,7 @@ _0809906C:
bl SetTile
adds r0, r6, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_080990DC:
pop {r4, r5, r6, r7, pc}
.align 2, 0
asm/bird.s
+5 -5
View File
@@ -74,7 +74,7 @@ sub_0809CF54: @ 0x0809CF54
ldr r0, _0809CFE8 @ =0x00000123
bl PlaySFX
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl LoadAnimation
@@ -162,7 +162,7 @@ sub_0809D048: @ 0x0809D048
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
movs r1, #0x17
bl LoadAnimation
@@ -266,7 +266,7 @@ sub_0809D10C: @ 0x0809D10C
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
movs r1, #0x17
bl LoadAnimation
@@ -323,7 +323,7 @@ sub_0809D178: @ 0x0809D178
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r1, r4, #0
adds r1, #0x5a
movs r0, #0x80
@@ -340,7 +340,7 @@ _0809D19C:
movs r1, #3
ands r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
bl Random
movs r1, #0xf
ands r0, r1
asm/bladeBrothers.s
+1 -1
View File
@@ -79,7 +79,7 @@ _08068A38:
_08068A42:
strb r0, [r4, #0xc]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
thumb_func_start sub_08068A4C
asm/bobomb.s
+11 -11
View File
@@ -11,7 +11,7 @@
sub_0802C660: @ 0x0802C660
push {lr}
ldr r1, _0802C66C @ =gUnk_080CD5D4
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_0802C66C: .4byte gUnk_080CD5D4
@@ -149,7 +149,7 @@ _0802C770:
movs r0, #6
orrs r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0802C79E:
ldr r1, _0802C7A8 @ =gUnk_080CD5D4
adds r0, r4, #0
@@ -296,7 +296,7 @@ _0802C88C:
movs r0, #6
orrs r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0802C8A2:
ldrb r1, [r4, #0x10]
movs r0, #0x7f
@@ -365,7 +365,7 @@ sub_0802C8D8: @ 0x0802C8D8
ldrb r1, [r5, #0x15]
lsrs r1, r1, #4
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
pop {r4, r5, pc}
.align 2, 0
@@ -392,7 +392,7 @@ sub_0802C91C: @ 0x0802C91C
movs r0, #2
orrs r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0802C950:
ldrb r0, [r4, #0xe]
subs r1, r0, #1
@@ -424,7 +424,7 @@ _0802C97A:
ldrb r1, [r4, #0x15]
lsrs r1, r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0802C992:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -441,7 +441,7 @@ _0802C992:
strb r1, [r4, #0x15]
lsrs r1, r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0802C9B4:
pop {r4, pc}
.align 2, 0
@@ -486,7 +486,7 @@ sub_0802C9D0: @ 0x0802C9D0
movs r0, #6
orrs r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08004274
pop {r4, pc}
@@ -606,7 +606,7 @@ sub_0802CA94: @ 0x0802CA94
movs r0, #6
orrs r1, r0
adds r0, r3, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_0802CAF4: .4byte gLinkEntity
@@ -706,7 +706,7 @@ sub_0802CB68: @ 0x0802CB68
movs r0, #2
orrs r1, r0
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
b _0802CBC2
_0802CBB2:
movs r0, #0x3c
@@ -715,7 +715,7 @@ _0802CBB2:
strh r0, [r5, #0x24]
lsrs r1, r2, #4
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
_0802CBC2:
pop {r4, r5, pc}
asm/bollard.s
+4 -4
View File
@@ -64,7 +64,7 @@ _0808B2F4:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #3
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
adds r0, #0x72
ldrh r0, [r0]
@@ -126,7 +126,7 @@ _0808B36C:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_0808B3AC
ldr r0, _0808B388 @ =0x000001A5
@@ -215,7 +215,7 @@ sub_0808B41C: @ 0x0808B41C
movs r1, #1
strb r1, [r0, #0xc]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -231,6 +231,6 @@ sub_0808B42C: @ 0x0808B42C
orrs r1, r2
strb r1, [r3]
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
asm/bombPeahat.s
+6 -6
View File
@@ -102,7 +102,7 @@ sub_0802A8AC: @ 0x0802A8AC
bhi _0802A8C6
adds r0, r1, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0802A8C6:
pop {pc}
@@ -229,7 +229,7 @@ sub_0802A924: @ 0x0802A924
ldrb r1, [r7, #0xa]
adds r1, #1
adds r0, r7, #0
bl UpdateSprite
bl InitializeAnimation
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0802A9A0: .4byte gUnk_080CD16C
@@ -450,7 +450,7 @@ _0802AB0E:
strb r0, [r4, #0x15]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0802AB3C:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -558,7 +558,7 @@ _0802ABF2:
ldrb r1, [r4, #0xa]
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0802AC04:
pop {r4, pc}
.align 2, 0
@@ -884,7 +884,7 @@ sub_0802AE24: @ 0x0802AE24
strb r3, [r0]
mov r0, ip
movs r1, #3
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_0802AE64: .4byte gUnk_080CD174
@@ -1346,7 +1346,7 @@ sub_0802B1A0: @ 0x0802B1A0
adds r1, #0x81
strb r2, [r1]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
thumb_func_start sub_0802B1BC
asm/bombarossa.s
+1 -1
View File
@@ -37,7 +37,7 @@ sub_080333D4: @ 0x080333D4
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _0803340E
asm/book.s
+1 -1
View File
@@ -71,7 +71,7 @@ _0809B420:
strb r0, [r4, #0xb]
_0809B424:
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
ldrb r1, [r4, #0xa]
adds r1, #0x39
adds r0, r4, #0
asm/bossDoor.s
+1 -1
View File
@@ -100,7 +100,7 @@ _0808C230:
movs r1, #0x1f
ands r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
ldrb r0, [r4, #0xb]
cmp r0, #1
beq _0808C2F8
asm/bowMoblin.s
+3 -3
View File
@@ -12,13 +12,13 @@ sub_0803C160: @ 0x0803C160
push {r4, lr}
adds r4, r0, #0
ldr r1, _0803C17C @ =gUnk_080CFF78
bl sub_0800129E
bl EnemyFunctionHandler
movs r3, #0x18
rsbs r3, r3, #0
adds r0, r4, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
pop {r4, pc}
.align 2, 0
_0803C17C: .4byte gUnk_080CFF78
@@ -731,7 +731,7 @@ _0803C6D0:
_0803C6D2:
adds r0, r3, #0
adds r1, r2, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
thumb_func_start sub_0803C6DC
asm/bowUse.s
+3 -3
View File
@@ -137,7 +137,7 @@ _0801921A:
ldrb r1, [r0]
adds r1, #0xf
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _080192A2
.align 2, 0
_08019288: .4byte gRoomControls
@@ -149,7 +149,7 @@ _08019294:
ldrb r1, [r0]
adds r1, #2
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_080192A2:
adds r0, r4, #0
bl sub_08017744
@@ -224,7 +224,7 @@ _080192EE:
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #6
bl UpdateSprite
bl InitializeAnimation
b _08019402
_08019336:
ldrb r0, [r4, #0xc]
asm/businessScrub.s
+4 -4
View File
@@ -11,7 +11,7 @@
sub_0802890C: @ 0x0802890C
push {lr}
ldr r1, _08028918 @ =gUnk_080CC9C8
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_08028918: .4byte gUnk_080CC9C8
@@ -955,7 +955,7 @@ sub_08028FFC: @ 0x08028FFC
strh r0, [r4, #0x32]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _08029074 @ =0x00004022
adds r1, r4, #0
adds r1, #0x76
@@ -1029,7 +1029,7 @@ sub_080290E0: @ 0x080290E0
adds r3, r3, r2
ldrb r2, [r3]
orrs r1, r2
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_080290F8: .4byte gUnk_080CCA04
@@ -1271,7 +1271,7 @@ sub_08029270: @ 0x08029270
strb r0, [r2, #0x18]
adds r0, r2, #0
movs r1, #0xe
bl UpdateSprite
bl InitializeAnimation
b _0802929C
_08029296:
adds r0, r2, #0
asm/businessScrubPrologue.s
+3 -3
View File
@@ -11,7 +11,7 @@
sub_08045B88: @ 0x08045B88
push {lr}
ldr r1, _08045B94 @ =gUnk_080D19FC
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_08045B94: .4byte gUnk_080D19FC
@@ -586,7 +586,7 @@ sub_08045FA0: @ 0x08045FA0
strb r1, [r0]
adds r0, r2, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -633,7 +633,7 @@ sub_08046030: @ 0x08046030
adds r3, r3, r2
ldrb r2, [r3]
orrs r1, r2
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_08046048: .4byte gUnk_080D1A38
asm/carpenter.s
+4 -4
View File
@@ -74,7 +74,7 @@ _080671A8:
adds r0, #4
adds r1, r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_0806F118
b _08067224
@@ -101,7 +101,7 @@ _0806720A:
adds r0, #0x69
ldrb r1, [r0]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08067224:
pop {r4, r5, pc}
.align 2, 0
@@ -179,7 +179,7 @@ sub_080672B0: @ 0x080672B0
ldrb r2, [r0, #0xa]
lsls r2, r2, #3
adds r1, r1, r2
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -267,7 +267,7 @@ sub_0806732C: @ 0x0806732C
lsls r1, r1, #3
adds r1, #2
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _0806737E
.align 2, 0
_08067374: .4byte gUnk_08110CA8
asm/castleMaid.s
+1 -1
View File
@@ -148,7 +148,7 @@ _080645EA:
bl sub_0806F5A4
adds r1, r0, #0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, [r4, #0x68]
cmp r0, #0
beq _0806463C
asm/castorWildsStatue.s
+1 -1
View File
@@ -532,7 +532,7 @@ sub_08067750: @ 0x08067750
strh r0, [r4, #0x32]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
ldr r1, _08067784 @ =0x0000017B
adds r0, r4, #0
bl sub_0801D2B4
asm/chaser.s
+4 -4
View File
@@ -57,7 +57,7 @@ sub_0802B530: @ 0x0802B530
movs r1, #1
strb r1, [r0, #0xc]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -113,7 +113,7 @@ _0802B586:
beq _0802B5A2
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_0802B5A2:
ldrh r2, [r4, #0x24]
movs r0, #0x24
@@ -131,7 +131,7 @@ _0802B5B8:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_0802B5C4:
pop {r4, pc}
.align 2, 0
@@ -154,6 +154,6 @@ sub_0802B5C8: @ 0x0802B5C8
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0802B5EE:
pop {r4, pc}
asm/chestSpawner.s
+2 -2
View File
@@ -92,7 +92,7 @@ sub_08083E4C: @ 0x08083E4C
bl sub_080842D8
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
b _08083EAC
.align 2, 0
_08083E80: .4byte gUnk_0811F8B0
@@ -116,7 +116,7 @@ _08083EA0:
_08083EA4:
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_08083EAC:
pop {r4, pc}
.align 2, 0
asm/chuchu.s
+34 -34
View File
@@ -69,7 +69,7 @@ _0801EE6C:
strb r0, [r1]
adds r0, r5, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
b _0801EE9E
_0801EE96:
adds r0, r5, #0
@@ -96,7 +96,7 @@ _0801EE9E:
adds r0, r5, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
b _0801EEE0
.align 2, 0
_0801EED0: .4byte gUnk_080CA21C
@@ -201,7 +201,7 @@ _0801EF68:
bl sub_0804A9FC
adds r0, r4, #0
movs r1, #6
bl UpdateSprite
bl InitializeAnimation
b _0801EFC0
_0801EF94:
adds r0, r4, #0
@@ -214,7 +214,7 @@ _0801EF94:
bl sub_0801FB68
adds r0, r4, #0
movs r1, #6
bl UpdateSprite
bl InitializeAnimation
b _0801EFC4
_0801EFB0:
adds r0, r4, #0
@@ -222,7 +222,7 @@ _0801EFB0:
str r6, [r4, #0x20]
adds r0, r4, #0
movs r1, #9
bl UpdateSprite
bl InitializeAnimation
_0801EFC0:
adds r5, r4, #0
adds r5, #0x80
@@ -253,7 +253,7 @@ sub_0801EFD8: @ 0x0801EFD8
bl sub_0804A9FC
adds r0, r4, #0
movs r1, #6
bl UpdateSprite
bl InitializeAnimation
b _0801F028
_0801F000:
adds r0, r4, #0
@@ -265,7 +265,7 @@ _0801F000:
bl sub_0801FB68
adds r0, r4, #0
movs r1, #8
bl UpdateSprite
bl InitializeAnimation
_0801F018:
movs r1, #0xc0
lsls r1, r1, #5
@@ -410,7 +410,7 @@ sub_0801F0C8: @ 0x0801F0C8
strb r0, [r2]
adds r0, r5, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_0801F12A:
pop {r4, r5, pc}
@@ -617,7 +617,7 @@ _0801F28C:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
b _0801F2CA
_0801F2C6:
movs r0, #8
@@ -645,7 +645,7 @@ sub_0801F2CC: @ 0x0801F2CC
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
_0801F2F6:
pop {r4, pc}
@@ -683,7 +683,7 @@ sub_0801F328: @ 0x0801F328
ands r1, r2
strb r1, [r0, #0x10]
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -701,7 +701,7 @@ sub_0801F340: @ 0x0801F340
movs r1, #0x5c
strb r1, [r2]
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -738,7 +738,7 @@ sub_0801F360: @ 0x0801F360
strb r0, [r2]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
.align 2, 0
@@ -782,7 +782,7 @@ _0801F3DE:
strb r2, [r5]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
b _0801F426
_0801F400:
ldrb r0, [r4, #0xc]
@@ -804,7 +804,7 @@ _0801F416:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #7
bl UpdateSprite
bl InitializeAnimation
_0801F426:
pop {r4, r5, pc}
@@ -854,7 +854,7 @@ sub_0801F428: @ 0x0801F428
strb r0, [r5, #0x18]
adds r0, r5, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_0801F488:
pop {r4, r5, pc}
.align 2, 0
@@ -905,7 +905,7 @@ sub_0801F494: @ 0x0801F494
strb r0, [r2]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_0801F4E8:
pop {r4, pc}
.align 2, 0
@@ -1061,7 +1061,7 @@ _0801F5FC:
strb r0, [r1]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_0801F618:
pop {r4, pc}
.align 2, 0
@@ -1119,7 +1119,7 @@ sub_0801F638: @ 0x0801F638
strb r0, [r2]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_0801F684:
pop {r4, pc}
.align 2, 0
@@ -1180,7 +1180,7 @@ sub_0801F6CC: @ 0x0801F6CC
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
_0801F6F6:
pop {r4, pc}
@@ -1208,7 +1208,7 @@ sub_0801F6F8: @ 0x0801F6F8
bl sub_0804AA1C
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_0801F72E:
pop {r4, pc}
@@ -1222,7 +1222,7 @@ sub_0801F730: @ 0x0801F730
ands r1, r2
strb r1, [r0, #0x10]
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -1238,7 +1238,7 @@ sub_0801F748: @ 0x0801F748
orrs r1, r2
strb r1, [r0, #0x18]
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -1282,7 +1282,7 @@ _0801F79C:
strb r6, [r5]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
b _0801F7D6
_0801F7B8:
ldrb r0, [r4, #0xc]
@@ -1298,7 +1298,7 @@ _0801F7C6:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #7
bl UpdateSprite
bl InitializeAnimation
_0801F7D6:
pop {r4, r5, r6, pc}
@@ -1353,7 +1353,7 @@ _0801F822:
strb r0, [r5]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0801F83E:
pop {r4, r5, pc}
@@ -1548,7 +1548,7 @@ _0801F9AE:
strh r0, [r4, #0x24]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
_0801F9C2:
pop {r4, pc}
@@ -1605,7 +1605,7 @@ sub_0801F9E0: @ 0x0801F9E0
strb r0, [r2]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_0801FA2C:
pop {r4, pc}
.align 2, 0
@@ -1636,7 +1636,7 @@ _0801FA54:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #7
bl UpdateSprite
bl InitializeAnimation
b _0801FA74
_0801FA6E:
adds r0, r4, #0
@@ -1665,7 +1665,7 @@ sub_0801FA78: @ 0x0801FA78
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_0804AA1C
_0801FAA8:
@@ -1708,7 +1708,7 @@ sub_0801FAE0: @ 0x0801FAE0
ands r1, r2
strb r1, [r0, #0x10]
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -1724,7 +1724,7 @@ sub_0801FAF8: @ 0x0801FAF8
orrs r1, r2
strb r1, [r0, #0x18]
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -1742,7 +1742,7 @@ sub_0801FB14: @ 0x0801FB14
strb r0, [r4, #0x15]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
thumb_func_start sub_0801FB34
@@ -1863,5 +1863,5 @@ sub_0801FBE4: @ 0x0801FBE4
strb r0, [r4, #0x15]
adds r0, r4, #0
movs r1, #3
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
asm/chuchuBoss.s
+1 -1
View File
@@ -237,7 +237,7 @@ _08025E4C:
adds r0, r0, r6
ldrb r1, [r0]
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
_08025E58:
ldrb r0, [r5, #0xa]
movs r6, #3
asm/clothesRack.s
+1 -1
View File
@@ -49,7 +49,7 @@ _0806DDB8:
_0806DDC4:
adds r0, r7, #0
adds r1, r4, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0x2e
ldrsh r5, [r7, r0]
movs r1, #0x32
asm/cloudPiranha.s
+11 -11
View File
@@ -12,13 +12,13 @@ sub_08038430: @ 0x08038430
push {r4, lr}
adds r4, r0, #0
ldr r1, _0803844C @ =gUnk_080CF4F0
bl sub_0800129E
bl EnemyFunctionHandler
movs r3, #0x10
rsbs r3, r3, #0
adds r0, r4, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
pop {r4, pc}
.align 2, 0
_0803844C: .4byte gUnk_080CF4F0
@@ -142,7 +142,7 @@ sub_080384E0: @ 0x080384E0
strb r0, [r1]
ldrb r1, [r6, #0x14]
adds r0, r6, #0
bl UpdateSprite
bl InitializeAnimation
pop {r4, r5, r6, pc}
thumb_func_start sub_08038534
@@ -193,7 +193,7 @@ _08038578:
_0803858A:
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _080385C8
_08038594:
ldrb r0, [r4, #0xe]
@@ -218,7 +218,7 @@ _08038594:
strb r0, [r4, #0x15]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_080385C8:
pop {r4, pc}
.align 2, 0
@@ -247,7 +247,7 @@ sub_080385CC: @ 0x080385CC
strb r0, [r4, #0x15]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _08038648
_08038604:
ldrb r0, [r4, #0xf]
@@ -284,7 +284,7 @@ _08038638:
strb r0, [r4, #0x15]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08038648:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -383,7 +383,7 @@ sub_080386B8: @ 0x080386B8
ldrb r1, [r4, #0x15]
lsrs r1, r1, #2
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
movs r1, #2
movs r2, #0
@@ -476,7 +476,7 @@ sub_08038754: @ 0x08038754
lsrs r1, r1, #0x18
adds r1, #9
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _080387D8
.align 2, 0
_080387C0: .4byte 0x0000012B
@@ -489,7 +489,7 @@ _080387C4:
lsrs r1, r1, #0x18
adds r1, #8
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_080387D8:
adds r0, r4, #0
movs r1, #2
@@ -583,7 +583,7 @@ _0803887E:
strb r0, [r4, #0x14]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08038890:
adds r0, r4, #0
bl sub_08004274
asm/code_080011C4.s
+4 -4
View File
@@ -68,7 +68,7 @@ _08001230:
beq _0800123E
strb r1, [r0, #0xe]
movs r1, #4
ldr r3, _0800135C @ =UpdateSpriteAnimation
ldr r3, _0800135C @ =InitializeAnimationAnimation
bx r3
_0800123E:
ldr r3, _08001360 @ =sub_080043B4
@@ -126,8 +126,8 @@ sub_08001290: @ 0x08001290
_0800129C:
bx lr
non_word_aligned_thumb_func_start sub_0800129E
sub_0800129E: @ 0x0800129E
non_word_aligned_thumb_func_start EnemyFunctionHandler
EnemyFunctionHandler: @ 0x0800129E
mov r3, lr
push {r3, r4, r5}
adds r4, r0, #0
@@ -238,7 +238,7 @@ _08001352:
bx lr
.align 2, 0
_08001358: .4byte gEnemyFunctions
_0800135C: .4byte UpdateSpriteAnimation
_0800135C: .4byte InitializeAnimationAnimation
_08001360: .4byte sub_080043B4
_08001364: .4byte 0x00001800
_08001368: .4byte gUnk_080012C8
asm/code_08003FC4.s
+6 -6
View File
@@ -414,8 +414,8 @@ _0800425C:
pop {r4}
bx lr
thumb_func_start UpdateSprite
UpdateSprite: @ 0x08004260
thumb_func_start InitializeAnimation
InitializeAnimation: @ 0x08004260
movs r2, #0x58
strb r1, [r0, r2]
ldrh r3, [r0, #0x12]
@@ -431,8 +431,8 @@ UpdateSprite: @ 0x08004260
sub_08004274: @ 0x08004274
movs r1, #1
non_word_aligned_thumb_func_start UpdateSpriteAnimation
UpdateSpriteAnimation: @ 0x08004276
non_word_aligned_thumb_func_start InitializeAnimationAnimation
InitializeAnimationAnimation: @ 0x08004276
movs r3, #0x59
ldrb r2, [r0, r3]
subs r2, r2, r1
@@ -466,7 +466,7 @@ _0800429C:
thumb_func_start LoadAnimation
LoadAnimation: @ 0x080042AC
push {lr}
bl UpdateSprite
bl InitializeAnimation
movs r2, #0xff
strb r2, [r0, #0x1f]
b _080042C0
@@ -478,7 +478,7 @@ sub_080042B8: @ 0x080042B8
non_word_aligned_thumb_func_start sub_080042BA
sub_080042BA: @ 0x080042BA
push {lr}
bl UpdateSpriteAnimation
bl InitializeAnimationAnimation
_080042C0:
pop {r1}
mov lr, r1
asm/code_080041E8.s
+6 -6
View File
@@ -80,8 +80,8 @@ _0800425C:
pop {r4}
bx lr
thumb_func_start UpdateSprite
UpdateSprite: @ 0x08004260
thumb_func_start InitializeAnimation
InitializeAnimation: @ 0x08004260
movs r2, #0x58
strb r1, [r0, r2]
ldrh r3, [r0, #0x12]
@@ -97,8 +97,8 @@ UpdateSprite: @ 0x08004260
sub_08004274: @ 0x08004274
movs r1, #1
non_word_aligned_thumb_func_start UpdateSpriteAnimation
UpdateSpriteAnimation: @ 0x08004276
non_word_aligned_thumb_func_start InitializeAnimationAnimation
InitializeAnimationAnimation: @ 0x08004276
movs r3, #0x59
ldrb r2, [r0, r3]
subs r2, r2, r1
@@ -132,7 +132,7 @@ _0800429C:
thumb_func_start LoadAnimation
LoadAnimation: @ 0x080042AC
push {lr}
bl UpdateSprite
bl InitializeAnimation
movs r2, #0xff
strb r2, [r0, #0x1f]
b _080042C0
@@ -144,7 +144,7 @@ sub_080042B8: @ 0x080042B8
non_word_aligned_thumb_func_start sub_080042BA
sub_080042BA: @ 0x080042BA
push {lr}
bl UpdateSpriteAnimation
bl InitializeAnimationAnimation
_080042C0:
pop {r1}
mov lr, r1
asm/code_0800857C.s
+5 -5
View File
@@ -387,7 +387,7 @@ _0800882C:
movs r3, #0x38
ldrb r1, [r4, r3]
strb r1, [r0, r3]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_0800883A:
ldr r1, _080088E0 @ =gRoomControls
ldrh r0, [r1, #6]
@@ -4030,8 +4030,8 @@ gUnk_080169A4::
.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
.byte 0x00, 0x00, 0x01, 0x00
thumb_func_start UpdateSpriteOrderAndFlip
UpdateSpriteOrderAndFlip: @ 0x08016A04
thumb_func_start InitializeAnimationOrderAndFlip
InitializeAnimationOrderAndFlip: @ 0x08016A04
movs r1, #0x38
ldrb r1, [r0, r1]
lsls r1, r1, #1
@@ -4083,7 +4083,7 @@ _08016A62:
strb r3, [r4, r5]
_08016A64:
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
pop {r4, r5, pc}
thumb_func_start sub_08016A6C
@@ -4123,6 +4123,6 @@ sub_08016AD2: @ 0x08016AD2
bl sub_08016A6C
push {r0}
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
pop {r0, r4, pc}
asm/code_08016DF8.s
+1 -1
View File
@@ -1567,7 +1567,7 @@ sub_08017940: @ 0x08017940
adds r0, #0x38
strb r1, [r0]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_080179CC:
movs r1, #0
ldr r0, _080179E8 @ =gLinkEntity
asm/code_08018500.s
+2 -2
View File
@@ -1145,7 +1145,7 @@ _08018D64:
ldrb r1, [r4, #0xa]
adds r1, #0xa
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08018FA0
_08018DD2:
@@ -1343,7 +1343,7 @@ _08018F46:
ldrb r1, [r4, #0xa]
adds r1, #0xd
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08018F56:
ldrb r0, [r4, #0xc]
adds r0, #1
asm/code_08019444.s
+4 -4
View File
@@ -155,7 +155,7 @@ _0801954E:
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r5, #0
bl sub_0801766C
adds r0, r5, #0
@@ -4031,14 +4031,14 @@ _0801B29E:
bne _0801B2C0
adds r0, r2, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
b _0801B2C8
.align 2, 0
_0801B2BC: .4byte gUnk_080B77F4
_0801B2C0:
adds r0, r2, #0
movs r1, #0x15
bl UpdateSprite
bl InitializeAnimation
_0801B2C8:
pop {pc}
.align 2, 0
@@ -4548,7 +4548,7 @@ _0801B600:
strh r0, [r6, #0x32]
adds r0, r6, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _0801B67C @ =gLinkState
str r5, [r0, #0x2c]
ldrb r1, [r0, #4]
asm/code_08049CD4.s
+3 -3
View File
@@ -1290,7 +1290,7 @@ _0804A612:
strb r0, [r1]
_0804A638:
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r5, r4, #0
adds r5, #0x6d
ldrb r1, [r5]
@@ -1752,8 +1752,8 @@ _0804A9A8:
adds r0, r4, #0
pop {r4, r5, r6, pc}
thumb_func_start sub_0804A9AC
sub_0804A9AC: @ 0x0804A9AC
thumb_func_start SetChildOffset
SetChildOffset: @ 0x0804A9AC
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r6, r1, #0
asm/code_0805436C.s
+2 -2
View File
@@ -685,7 +685,7 @@ _08054842:
adds r0, #0x38
strb r1, [r0]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_0805486A:
adds r0, r4, #0
_0805486C:
@@ -1551,7 +1551,7 @@ sub_08054EFC: @ 0x08054EFC
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
movs r1, #0x35
movs r2, #0
asm/code_08056418.s
+3 -3
View File
@@ -2578,7 +2578,7 @@ _080577F2:
mov r1, r8
strb r1, [r0]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08057808:
pop {r3}
mov r8, r3
@@ -14218,7 +14218,7 @@ sub_0805D1FC: @ 0x0805D1FC
movs r0, #3
strb r0, [r1]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_0805D236:
adds r0, r4, #0
bl sub_0805E900
@@ -16066,7 +16066,7 @@ sub_0805E000: @ 0x0805E000
movs r5, #1
strb r5, [r0]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
ldr r0, _0805E068 @ =gUnk_030010A0
adds r0, #0x38
ldrb r1, [r0]
asm/code_0805E744.s
+1 -1
View File
@@ -2838,7 +2838,7 @@ _0805FC36:
lsrs r1, r1, #0x19
adds r1, #0xc
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r5, #0
bl sub_0801766C
adds r0, r5, #0
asm/code_0806EC20.s
+1 -1
View File
@@ -163,7 +163,7 @@ _0806ECD0:
strb r1, [r0]
strb r1, [r4, #0x1e]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_0806ED4A:
pop {r4, r5, pc}
.align 2, 0
asm/code_0806ED78.s
+1 -1
View File
@@ -459,7 +459,7 @@ sub_0806F078: @ 0x0806F078
b _0806F09C
_0806F096:
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
_0806F09C:
movs r0, #1
b _0806F0A2
asm/code_0806FA6C.s
+6 -6
View File
@@ -1053,7 +1053,7 @@ _0807018C:
bl sub_0801766C
ldrb r1, [r4]
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080701F4 @ =0x000001DD
bl PlaySFX
pop {r4, r5, pc}
@@ -1209,7 +1209,7 @@ _08070280:
str r0, [r5, #0x7c]
adds r0, r5, #0
movs r1, #0x14
bl UpdateSprite
bl InitializeAnimation
ldr r0, _08070360 @ =0x00004020
movs r3, #0x2e
ldrsh r1, [r5, r3]
@@ -1403,7 +1403,7 @@ sub_08070458: @ 0x08070458
_0807049E:
adds r0, r4, #0
movs r1, #0x13
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08017744
ldr r0, _080704B8 @ =0x00000199
@@ -4884,7 +4884,7 @@ sub_08071F80: @ 0x08071F80
cmp r5, #0
bne _08071FB8
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
ldr r0, _08071FB4 @ =gLinkState
strb r5, [r0, #2]
ldrb r0, [r0, #0x14]
@@ -5180,7 +5180,7 @@ _080721AC:
orrs r0, r1
strb r0, [r4, #0x10]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
bl sub_080791BC
_080721DE:
pop {r4, pc}
@@ -5417,7 +5417,7 @@ sub_08072354: @ 0x08072354
ands r0, r1
str r0, [r2, #0x30]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
movs r1, #0xc
movs r2, #0
asm/code_080732D0.s
+1 -1
View File
@@ -3153,7 +3153,7 @@ sub_08074A48: @ 0x08074A48
movs r0, #1
strb r0, [r1, #0xe]
adds r0, r1, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
ldrh r1, [r5, #0x22]
adds r0, r4, #0
adds r0, #0x38
asm/code_08077B98.s
+1 -1
View File
@@ -3397,7 +3397,7 @@ _080794F4:
bne _080794F4
_08079514:
ldr r0, _0807951C @ =gLinkEntity
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
pop {r4, r5, pc}
.align 2, 0
_0807951C: .4byte gLinkEntity
asm/code_0807B9B8.s
+1 -1
View File
@@ -1807,7 +1807,7 @@ _0807C7C2:
movs r1, #1
strb r1, [r0]
ldr r0, [r4, #0x30]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_0807C7FC:
ldrb r1, [r4, #0xf]
movs r0, #0xfb
asm/code_0807CC3C.s
+3 -3
View File
@@ -5269,7 +5269,7 @@ sub_0807F158: @ 0x0807F158
adds r2, #0x38
movs r1, #1
strb r1, [r2]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
pop {pc}
thumb_func_start sub_0807F168
@@ -5280,7 +5280,7 @@ sub_0807F168: @ 0x0807F168
adds r2, #0x38
movs r1, #1
strb r1, [r2]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
pop {pc}
.align 2, 0
_0807F17C: .4byte gLinkEntity
@@ -5292,7 +5292,7 @@ sub_0807F180: @ 0x0807F180
adds r2, #0x38
movs r1, #2
strb r1, [r2]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
pop {pc}
thumb_func_start sub_0807F190
asm/code_080A29BC.s
+1 -1
View File
@@ -979,7 +979,7 @@ _080A30F8:
_080A30FC:
adds r0, r4, #0
movs r1, #0x18
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080A310C
pop {r4, r5, pc}
asm/code_080A5574.s
+64 -64
View File
@@ -5202,7 +5202,7 @@ _080A7E14:
ldr r0, [r5, #4]
str r0, [r4, #0x48]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_080A7E4A:
movs r0, #1
_080A7E4C:
@@ -5539,7 +5539,7 @@ sub_080A8088: @ 0x080A8088
lsls r1, r1, #8
str r1, [r0, #0x20]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
thumb_func_start sub_080A80A0
@@ -5720,7 +5720,7 @@ sub_080A81E0: @ 0x080A81E0
ldr r1, _080A81F8 @ =0x0000FFFE
strh r1, [r0, #0x36]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_080A81F8: .4byte 0x0000FFFE
@@ -6102,7 +6102,7 @@ _080A8496:
_080A84B8:
adds r0, r4, #0
movs r1, #0x19
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080A86A0
_080A84C6:
@@ -6134,7 +6134,7 @@ _080A84F0:
bl sub_08004488
adds r0, r4, #0
movs r1, #0x18
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
.align 2, 0
_080A8500: .4byte 0x0000018D
@@ -6173,7 +6173,7 @@ _080A853C:
bl sub_08016AD2
adds r0, r4, #0
movs r1, #0x19
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080A86A0
_080A8558:
@@ -6262,7 +6262,7 @@ _080A85F2:
bl sub_08016AD2
adds r0, r4, #0
movs r1, #0x19
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080A86A0
_080A860E:
@@ -6630,7 +6630,7 @@ _080A88A8:
_080A88AE:
adds r0, r3, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
b _080A88C6
_080A88B8:
strb r4, [r3, #0xe]
@@ -6639,7 +6639,7 @@ _080A88B8:
_080A88BE:
adds r0, r3, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
_080A88C6:
pop {r4, pc}
@@ -6824,7 +6824,7 @@ _080A8A10:
_080A8A16:
adds r0, r5, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
movs r0, #0x84
bl sub_08004488
movs r0, #3
@@ -6897,7 +6897,7 @@ sub_080A8A90: @ 0x080A8A90
ldrb r1, [r2, #0x15]
lsrs r1, r1, #3
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
b _080A8AC2
_080A8AAA:
movs r0, #2
@@ -6907,7 +6907,7 @@ _080A8AAA:
movs r0, #4
orrs r1, r0
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080A8AC4 @ =0x0000015F
bl sub_08004488
_080A8AC2:
@@ -6954,7 +6954,7 @@ _080A8AE6:
strb r0, [r4, #0xe]
lsrs r1, r2, #3
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _080A8B2E
_080A8B1A:
lsrs r0, r2, #2
@@ -6965,7 +6965,7 @@ _080A8B1A:
strb r0, [r4, #0x14]
lsrs r1, r2, #3
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_080A8B2E:
adds r0, r4, #0
bl sub_08004274
@@ -7056,7 +7056,7 @@ sub_080A8BC0: @ 0x080A8BC0
ldrb r1, [r2, #0x15]
lsrs r1, r1, #3
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
b _080A8BF4
_080A8BDA:
movs r0, #2
@@ -7066,7 +7066,7 @@ _080A8BDA:
movs r0, #4
orrs r1, r0
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0xaf
lsls r0, r0, #1
bl sub_08004488
@@ -7110,7 +7110,7 @@ _080A8C16:
strb r0, [r4, #0xe]
lsrs r1, r1, #3
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_080A8C42:
adds r0, r4, #0
bl sub_08004274
@@ -7201,7 +7201,7 @@ sub_080A8CD4: @ 0x080A8CD4
ldrb r1, [r2, #0x15]
lsrs r1, r1, #3
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
b _080A8D08
_080A8CEE:
movs r0, #2
@@ -7211,7 +7211,7 @@ _080A8CEE:
movs r0, #4
orrs r1, r0
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0xb0
lsls r0, r0, #1
bl sub_08004488
@@ -7255,7 +7255,7 @@ _080A8D2A:
strb r0, [r4, #0xe]
lsrs r1, r1, #3
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_080A8D56:
adds r0, r4, #0
bl sub_08004274
@@ -7356,7 +7356,7 @@ sub_080A8DDC: @ 0x080A8DDC
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #0x53
bl UpdateSprite
bl InitializeAnimation
_080A8E12:
ldr r0, _080A8E24 @ =gUnk_08129968
ldrb r1, [r4, #0xc]
@@ -7399,7 +7399,7 @@ sub_080A8E28: @ 0x080A8E28
str r0, [r5, #0x30]
adds r0, r5, #0
movs r1, #0x51
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080A8E84 @ =0x000001B5
bl PlaySFX
_080A8E6E:
@@ -7552,7 +7552,7 @@ _080A8F9E:
bl sub_08004168
adds r0, r5, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_080A8FAE:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -7621,14 +7621,14 @@ _080A901C:
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0x54
bl UpdateSprite
bl InitializeAnimation
b _080A9054
.align 2, 0
_080A9048: .4byte gLinkEntity
_080A904C:
adds r0, r4, #0
movs r1, #0x52
bl UpdateSprite
bl InitializeAnimation
_080A9054:
pop {r4, pc}
.align 2, 0
@@ -7656,7 +7656,7 @@ sub_080A9058: @ 0x080A9058
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #0x55
bl UpdateSprite
bl InitializeAnimation
b _080A90BA
_080A908A:
adds r0, r4, #0
@@ -7680,7 +7680,7 @@ _080A9098:
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #0x53
bl UpdateSprite
bl InitializeAnimation
_080A90BA:
pop {r4, pc}
@@ -7942,7 +7942,7 @@ _080A9288:
str r0, [r4, #0x48]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_080A92B0:
adds r0, r4, #0
adds r0, #0x41
@@ -8123,7 +8123,7 @@ sub_080A93DC: @ 0x080A93DC
ldrb r1, [r0]
adds r1, #2
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0xc5
lsls r0, r0, #1
bl sub_08004488
@@ -8250,7 +8250,7 @@ sub_080A94C0: @ 0x080A94C0
ldr r1, [r1, #4]
str r1, [r0, #0x48]
ldrb r1, [r3]
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
.align 2, 0
_080A94FC: .4byte gUnk_081299F8
@@ -8282,7 +8282,7 @@ sub_080A9518: @ 0x080A9518
adds r1, #2
strh r1, [r0, #0x32]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080A953C @ =0x00000149
bl PlaySFX
pop {pc}
@@ -8316,7 +8316,7 @@ sub_080A9540: @ 0x080A9540
strh r0, [r3, #0x32]
adds r0, r3, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
b _080A95B6
_080A9578:
ldrh r1, [r3, #0x36]
@@ -8489,7 +8489,7 @@ _080A9660:
bl sub_0806F62C
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
b _080A9756
.align 2, 0
_080A96C8: .4byte 0x000001FF
@@ -8526,7 +8526,7 @@ _080A96F8:
bl sub_0806F62C
adds r0, r4, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
b _080A9756
_080A9718:
ldr r0, _080A9760 @ =gLinkEntity
@@ -8554,7 +8554,7 @@ _080A9718:
strh r0, [r4, #0x32]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_080A9756:
ldr r0, _080A9768 @ =0x000001B5
bl PlaySFX
@@ -9070,7 +9070,7 @@ _080A9B0A:
bne _080A9B1E
adds r0, r2, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
b _080A9B22
_080A9B1E:
movs r0, #0
@@ -9495,7 +9495,7 @@ sub_080A9DFC: @ 0x080A9DFC
adds r1, #0x45
strb r2, [r1]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
thumb_func_start sub_080A9E14
@@ -10441,7 +10441,7 @@ sub_080AA534: @ 0x080AA534
adds r2, #0x38
movs r1, #3
strb r1, [r2]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
pop {pc}
thumb_func_start sub_080AA544
@@ -11225,7 +11225,7 @@ sub_080AAB24: @ 0x080AAB24
movs r1, #0x1e
strb r1, [r0, #0xe]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -11285,7 +11285,7 @@ sub_080AAB8C: @ 0x080AAB8C
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_080AABA2:
adds r0, r4, #0
bl sub_080AABB0
@@ -11675,7 +11675,7 @@ _080AAE64:
_080AAE7C:
ldrb r1, [r5, #0xa]
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
pop {r4, r5, pc}
.align 2, 0
@@ -12279,7 +12279,7 @@ sub_080AB2DC: @ 0x080AB2DC
strb r0, [r2, #0x10]
adds r0, r2, #0
movs r1, #0x53
bl UpdateSprite
bl InitializeAnimation
ldrb r0, [r5]
ands r4, r0
cmp r4, #0
@@ -12344,7 +12344,7 @@ sub_080AB318: @ 0x080AB318
str r0, [r6, #0x34]
adds r0, r6, #0
movs r1, #0x51
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080AB3E0 @ =0x000001B5
bl PlaySFX
adds r0, r6, #0
@@ -12427,7 +12427,7 @@ sub_080AB414: @ 0x080AB414
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0x54
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080AB4A4
b _080AB458
@@ -12464,7 +12464,7 @@ sub_080AB45C: @ 0x080AB45C
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #0x53
bl UpdateSprite
bl InitializeAnimation
_080AB486:
pop {r4, pc}
@@ -12617,7 +12617,7 @@ sub_080AB580: @ 0x080AB580
ldr r1, _080AB598 @ =0x0000FFFC
strh r1, [r0, #0x36]
ldrb r1, [r0, #0xa]
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_080AB598: .4byte 0x0000FFFC
@@ -12793,7 +12793,7 @@ sub_080AB6B8: @ 0x080AB6B8
str r0, [r2, #0x48]
adds r0, r2, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
b _080AB6F8
.align 2, 0
_080AB6E4: .4byte gUnk_0812A614
@@ -12804,7 +12804,7 @@ _080AB6E8:
strb r0, [r2, #0xf]
ldrb r1, [r2, #0xe]
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
_080AB6F8:
pop {pc}
.align 2, 0
@@ -12825,7 +12825,7 @@ sub_080AB6FC: @ 0x080AB6FC
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080AB758
_080AB724:
@@ -13095,7 +13095,7 @@ sub_080AB8E8: @ 0x080AB8E8
_080AB90E:
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldrb r0, [r4, #0xa]
cmp r0, #3
bhi _080AB936
@@ -13334,7 +13334,7 @@ _080ABACC:
strh r0, [r2, #0x2e]
_080ABAD6:
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -13651,7 +13651,7 @@ sub_080ABCC4: @ 0x080ABCC4
strb r0, [r2]
adds r0, r5, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080ABD40 @ =0x0000014B
bl PlaySFX
pop {r4, r5, pc}
@@ -13673,7 +13673,7 @@ sub_080ABD44: @ 0x080ABD44
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_080ABD60:
adds r0, r4, #0
bl sub_080AF090
@@ -13813,7 +13813,7 @@ _080ABE56:
bl sub_08004168
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080ABE84 @ =0x0000012D
bl PlaySFX
pop {r4, r5, pc}
@@ -13874,7 +13874,7 @@ _080ABEDA:
_080ABEEC:
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080ABF00 @ =0x00000193
bl PlaySFX
pop {r4, pc}
@@ -13928,7 +13928,7 @@ sub_080ABF40: @ 0x080ABF40
strb r0, [r4, #0x15]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080ABFA4 @ =0x00000199
bl PlaySFX
_080ABF66:
@@ -14008,7 +14008,7 @@ sub_080ABFEC: @ 0x080ABFEC
adds r4, r0, #0
ldrb r1, [r4, #0xa]
adds r1, #1
bl UpdateSprite
bl InitializeAnimation
ldrb r1, [r4, #0xa]
cmp r1, #0
beq _080AC030
@@ -15238,7 +15238,7 @@ _080AC8FE:
strh r0, [r4, #0x24]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_080AC920:
adds r0, r4, #0
bl sub_080AC8C4
@@ -15257,10 +15257,10 @@ sub_080AC928: @ 0x080AC928
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080AC954
pop {r4, pc}
@@ -15355,7 +15355,7 @@ _080AC9E8:
strh r0, [r4, #0x24]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_080ACA10:
pop {r4, pc}
.align 2, 0
@@ -15471,7 +15471,7 @@ sub_080ACAC8: @ 0x080ACAC8
strh r1, [r0, #0x36]
str r2, [r0, #0x54]
movs r1, #7
bl UpdateSprite
bl InitializeAnimation
ldr r0, _080ACAEC @ =0x00000199
bl PlaySFX
pop {pc}
@@ -16123,7 +16123,7 @@ _080ACF64:
adds r0, r0, r3
ldrb r1, [r0]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
bl sub_08078D60
_080ACFB6:
ldrb r1, [r5, #8]
@@ -16380,7 +16380,7 @@ _080AD188:
bl PlaySFX
_080AD196:
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
movs r0, #3
strb r0, [r5, #0xd]
ldrb r2, [r4, #0x19]
asm/createBowEntity.s
+1 -1
View File
@@ -145,7 +145,7 @@ _08019062:
_080190E8:
ldrb r1, [r5]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0xfc
bl PlaySFX
b _08019178
asm/crenalBeanSprout.s
+8 -8
View File
@@ -83,7 +83,7 @@ _080963A4:
bne _080963C8
adds r0, r5, #0
movs r1, #0xa
bl UpdateSprite
bl InitializeAnimation
ldrh r0, [r5, #0x32]
adds r0, #4
strh r0, [r5, #0x32]
@@ -114,7 +114,7 @@ _080963DA:
ldrb r1, [r5, #0xa]
adds r1, #3
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
b _0809651A
.align 2, 0
_080963F8: .4byte gRoomControls
@@ -180,7 +180,7 @@ _0809646E:
strb r0, [r5, #0x19]
adds r0, r5, #0
movs r1, #0xc
bl UpdateSprite
bl InitializeAnimation
adds r0, r5, #0
bl sub_0809651C
b _0809651A
@@ -203,7 +203,7 @@ _080964A6:
bne _080964F8
adds r0, r5, #0
movs r1, #0xb
bl UpdateSprite
bl InitializeAnimation
ldrh r0, [r5, #0x32]
adds r0, #4
strh r0, [r5, #0x32]
@@ -247,7 +247,7 @@ _0809650A:
ldrb r1, [r5, #0xa]
adds r1, #3
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r5, #0
bl sub_0809651C
_0809651A:
@@ -298,7 +298,7 @@ _08096564:
_08096570:
adds r0, r6, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
b _08096586
.align 2, 0
_0809657C: .4byte gLinkState
@@ -363,7 +363,7 @@ _080965D6:
lsrs r1, r1, #0x19
adds r1, #3
adds r0, r6, #0
bl UpdateSprite
bl InitializeAnimation
b _08096606
.align 2, 0
_080965FC: .4byte gLinkState
@@ -560,7 +560,7 @@ sub_08096758: @ 0x08096758
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #0xa
bl UpdateSprite
bl InitializeAnimation
_0809677C:
pop {r4, pc}
.align 2, 0
asm/crow.s
+4 -4
View File
@@ -220,7 +220,7 @@ sub_08032928: @ 0x08032928
adds r1, #0x7a
strh r0, [r1]
adds r0, r6, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r6, #0
bl sub_08032AF4
pop {r4, r5, r6, pc}
@@ -368,7 +368,7 @@ sub_08032A48: @ 0x08032A48
movs r0, #3
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
bl sub_08032AF4
_08032AAE:
@@ -423,7 +423,7 @@ sub_08032AF4: @ 0x08032AF4
adds r2, #0x81
ldrb r2, [r2]
adds r1, r1, r2
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -607,7 +607,7 @@ _08032C46:
beq _08032C64
adds r1, r2, #4
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
_08032C64:
adds r0, r5, #0
bl sub_08032B10
asm/cuccoAggr.s
+8 -8
View File
@@ -38,7 +38,7 @@ _08038CC8:
adds r0, r5, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
adds r0, r5, #0
bl sub_080391B4
_08038CF0:
@@ -192,7 +192,7 @@ sub_08038DD8: @ 0x08038DD8
ands r1, r2
strb r1, [r3]
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
ldr r0, _08038E14 @ =0x000001D9
bl sub_08004488
pop {pc}
@@ -240,7 +240,7 @@ sub_08038E18: @ 0x08038E18
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08038E70:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -490,7 +490,7 @@ _08039042:
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
b _080390BC
.align 2, 0
_08039068: .4byte gUnk_080CF7BE
@@ -509,7 +509,7 @@ _0803906C:
bl sub_080390C0
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
bl Random
ands r0, r5
cmp r0, #0
@@ -529,7 +529,7 @@ _080390AA:
ands r1, r0
adds r1, #2
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_080390BC:
pop {r4, r5, pc}
.align 2, 0
@@ -626,7 +626,7 @@ sub_08039140: @ 0x08039140
bl sub_080390F8
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
.align 2, 0
_08039174: .4byte gLinkEntity
@@ -740,7 +740,7 @@ sub_08039218: @ 0x08039218
beq _0803924C
adds r0, r2, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
_0803924C:
ldr r0, _0803925C @ =0x000001D9
bl sub_08004488
asm/curtain.s
+5 -5
View File
@@ -11,7 +11,7 @@
sub_080481C0: @ 0x080481C0
push {lr}
ldr r1, _080481CC @ =gUnk_080D1CC8
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_080481CC: .4byte gUnk_080D1CC8
@@ -57,7 +57,7 @@ _08048212:
strb r0, [r2, #0xe]
ldrb r1, [r2, #0xe]
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -100,7 +100,7 @@ _0804824E:
_0804825E:
ldrb r1, [r4, #0xe]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
thumb_func_start sub_08048268
@@ -123,7 +123,7 @@ sub_08048268: @ 0x08048268
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_08048292:
pop {r4, pc}
@@ -145,7 +145,7 @@ sub_08048294: @ 0x08048294
bl SetLocalFlag
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_080482BC:
pop {r4, pc}
.align 2, 0
asm/darkNut.s
+2 -2
View File
@@ -12,13 +12,13 @@ sub_08020B80: @ 0x08020B80
push {r4, lr}
adds r4, r0, #0
ldr r1, _08020B9C @ =gUnk_080CAA98
bl sub_0800129E
bl EnemyFunctionHandler
movs r3, #0x16
rsbs r3, r3, #0
adds r0, r4, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
pop {r4, pc}
.align 2, 0
_08020B9C: .4byte gUnk_080CAA98
asm/deathFx.s
+3 -3
View File
@@ -42,7 +42,7 @@ sub_08081634: @ 0x08081634
adds r0, #0x38
strb r1, [r0]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
ldrb r0, [r4, #0x19]
movs r1, #3
orrs r0, r1
@@ -87,7 +87,7 @@ _080816B2:
beq _080816C4
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
b _08081702
_080816C4:
adds r2, r4, #0
@@ -120,7 +120,7 @@ _080816C4:
_080816FA:
adds r0, r4, #0
adds r1, r2, #0
bl UpdateSprite
bl InitializeAnimation
_08081702:
movs r0, #1
strb r0, [r4, #0xc]
asm/dog.s
+1 -1
View File
@@ -877,7 +877,7 @@ sub_0806A194: @ 0x0806A194
bl sub_0805E3A0
adds r0, r4, #0
movs r1, #0x23
bl UpdateSprite
bl InitializeAnimation
b _0806A1D4
_0806A1CE:
adds r0, r4, #0
asm/doorMimic.s
+3 -3
View File
@@ -123,7 +123,7 @@ sub_08022034: @ 0x08022034
strh r0, [r1]
ldrb r1, [r4, #0xb]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080221C0
pop {r4, pc}
@@ -155,7 +155,7 @@ sub_0802209C: @ 0x0802209C
ldrb r1, [r4, #0xb]
adds r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _080220D6
_080220D2:
subs r0, #1
@@ -264,7 +264,7 @@ sub_08022174: @ 0x08022174
ldrb r1, [r4, #0xb]
adds r1, #8
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08022196:
pop {r4, pc}
asm/drLeft.s
+3 -3
View File
@@ -69,12 +69,12 @@ _0806BFF0:
ands r1, r5
adds r1, #0xc
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _0806C00A
_0806C002:
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0806C00A:
pop {r4, r5, pc}
@@ -103,7 +103,7 @@ sub_0806C028: @ 0x0806C028
lsrs r2, r2, #1
ldr r1, [r1, #4]
adds r1, r1, r2
bl UpdateSprite
bl InitializeAnimation
pop {pc}
thumb_func_start sub_0806C038
asm/enemy4D.s
+1 -1
View File
@@ -11,7 +11,7 @@
sub_0803EAEC: @ 0x0803EAEC
push {lr}
ldr r1, _0803EAF8 @ =gUnk_080D0880
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_0803EAF8: .4byte gUnk_080D0880
asm/enemy50.s
+12 -12
View File
@@ -44,7 +44,7 @@ _08040B5C:
adds r0, r5, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
pop {r4, r5, pc}
.align 2, 0
_08040B80: .4byte gUnk_080D0DC4
@@ -82,7 +82,7 @@ sub_08040B9C: @ 0x08040B9C
eors r1, r0
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08041134
adds r0, r4, #0
@@ -103,7 +103,7 @@ _08040BD0:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #3
bl UpdateSprite
bl InitializeAnimation
b _08040C9C
_08040BF4:
adds r0, r4, #0
@@ -139,7 +139,7 @@ _08040C1A:
ldrb r1, [r4, #0x14]
adds r1, #7
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
movs r1, #0x1c
bl sub_0804A9FC
@@ -165,7 +165,7 @@ _08040C40:
ldrb r1, [r4, #0x14]
adds r1, #7
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _08040C98
_08040C70:
adds r1, r4, #0
@@ -241,7 +241,7 @@ sub_08040CAC: @ 0x08040CAC
eors r1, r0
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _08040D2C
_08040D04:
ldrb r2, [r4, #0x18]
@@ -282,7 +282,7 @@ sub_08040D30: @ 0x08040D30
ldrb r1, [r4, #0x14]
adds r1, #7
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08040D4C:
adds r0, r4, #0
bl sub_08001242
@@ -304,7 +304,7 @@ _08040D60:
eors r1, r0
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0xff
strb r0, [r4, #0x15]
movs r0, #1
@@ -341,7 +341,7 @@ _08040DB4:
lsrs r1, r1, #4
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08040DC6:
pop {r4, pc}
@@ -356,7 +356,7 @@ sub_08040DC8: @ 0x08040DC8
ldrb r1, [r1, #0x14]
lsrs r1, r1, #2
adds r1, #5
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_08040DE0: .4byte gLinkEntity
@@ -694,7 +694,7 @@ sub_08041044: @ 0x08041044
strh r0, [r1]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
_08041074:
pop {r4, pc}
.align 2, 0
@@ -891,7 +891,7 @@ sub_080411CC: @ 0x080411CC
orrs r1, r2
strb r1, [r0, #0x18]
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
asm/enemy5A.s
+12 -12
View File
@@ -11,7 +11,7 @@
sub_080456D8: @ 0x080456D8
push {lr}
ldr r1, _080456E4 @ =gUnk_080D1888
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_080456E4: .4byte gUnk_080D1888
@@ -68,14 +68,14 @@ _08045728:
adds r0, #2
orrs r1, r0
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, [r5, #0x50]
ldrb r1, [r0, #0xa]
lsls r1, r1, #3
ldrb r2, [r5, #0xe]
adds r2, #2
orrs r1, r2
bl UpdateSprite
bl InitializeAnimation
_0804575C:
ldrb r0, [r5, #0xe]
cmp r0, #0
@@ -127,12 +127,12 @@ _08045778:
movs r4, #6
orrs r1, r4
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, [r5, #0x50]
ldrb r1, [r0, #0xa]
lsls r1, r1, #3
orrs r1, r4
bl UpdateSprite
bl InitializeAnimation
_080457D0:
ldr r1, _080457DC @ =gUnk_080D1888
adds r0, r5, #0
@@ -210,7 +210,7 @@ _0804585A:
movs r0, #1
orrs r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08045868:
pop {r4, pc}
.align 2, 0
@@ -245,7 +245,7 @@ _0804589A:
ldrb r1, [r4, #0xa]
lsls r1, r1, #3
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _080458C2
_080458AA:
subs r0, #1
@@ -300,24 +300,24 @@ _080458D6:
movs r4, #5
orrs r1, r4
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, [r5, #0x50]
ldrb r1, [r0, #0xa]
lsls r1, r1, #3
orrs r1, r4
bl UpdateSprite
bl InitializeAnimation
b _08045934
_0804591C:
ldrb r1, [r5, #0xa]
lsls r1, r1, #3
orrs r1, r4
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, [r5, #0x50]
ldrb r1, [r0, #0xa]
lsls r1, r1, #3
orrs r1, r4
bl UpdateSprite
bl InitializeAnimation
_08045934:
pop {r4, r5, pc}
.align 2, 0
@@ -430,7 +430,7 @@ _080459F0:
movs r0, #1
orrs r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_080459FE:
pop {r4, pc}
asm/enemy5F.s
+7 -7
View File
@@ -44,7 +44,7 @@ sub_080482EC: @ 0x080482EC
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
b _08048326
.align 2, 0
_08048310: .4byte gUnk_030010A0
@@ -52,7 +52,7 @@ _08048314:
strb r2, [r4, #0xc]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0xb3
lsls r0, r0, #1
bl PlaySFX
@@ -80,7 +80,7 @@ sub_08048330: @ 0x08048330
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_08048358:
pop {r4, pc}
.align 2, 0
@@ -184,7 +184,7 @@ sub_080483F8: @ 0x080483F8
bne _08048436
adds r0, r4, #0
movs r1, #3
bl UpdateSprite
bl InitializeAnimation
b _08048436
_0804841C:
adds r0, r4, #0
@@ -226,7 +226,7 @@ _08048456:
str r0, [r4, #0x54]
adds r0, r4, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
ldr r0, _08048474 @ =0x0000019B
bl PlaySFX
_0804846A:
@@ -254,7 +254,7 @@ sub_08048478: @ 0x08048478
bne _080484E6
adds r0, r4, #0
movs r1, #6
bl UpdateSprite
bl InitializeAnimation
b _080484E6
_080484A2:
adds r3, r4, #0
@@ -381,7 +381,7 @@ _08048562:
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_080485FC
movs r0, #0xb3
asm/enemy62.s
+2 -2
View File
@@ -216,7 +216,7 @@ sub_08048F00: @ 0x08048F00
ldrb r1, [r0]
adds r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08048F2E:
pop {r4, pc}
@@ -266,7 +266,7 @@ sub_08048F74: @ 0x08048F74
ldrb r1, [r1]
adds r1, r1, r2
ldrb r1, [r1]
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_08048F88: .4byte gUnk_080D2348
asm/enemy64.s
+2 -2
View File
@@ -570,7 +570,7 @@ _0804948C:
strb r0, [r1]
str r4, [r2, #0x50]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_080494B2:
adds r0, r4, #0
bl sub_08049944
@@ -1414,7 +1414,7 @@ sub_08049AB0: @ 0x08049AB0
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08049B18:
pop {r4, r5, pc}
.align 2, 0
asm/enemyE.s
+1 -1
View File
@@ -11,7 +11,7 @@
sub_08022FA4: @ 0x08022FA4
push {lr}
ldr r1, _08022FB0 @ =gUnk_080CBBC8
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_08022FB0: .4byte gUnk_080CBBC8
asm/evilSpirit.s
+1 -1
View File
@@ -123,7 +123,7 @@ _08086354:
_08086360:
ldrb r1, [r4, #0xa]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08086370
pop {r4, r5, pc}
asm/evilSpirit/sub_080862B8.inc
+1 -1
View File
@@ -93,7 +93,7 @@ _08086354:
_08086360:
ldrb r1, [r4, #0xa]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08086370
pop {r4, r5, pc}
asm/eyeSwitch.s
+4 -4
View File
@@ -64,7 +64,7 @@ sub_080886A4: @ 0x080886A4
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _08088716
.align 2, 0
_08088700: .4byte gUnk_080FD168
@@ -76,7 +76,7 @@ _08088704:
strb r0, [r4, #0x10]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08088716:
pop {r4, r5, r6, pc}
@@ -141,7 +141,7 @@ sub_08088760: @ 0x08088760
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0808878E:
pop {r4, pc}
@@ -204,6 +204,6 @@ sub_080887D8: @ 0x080887D8
strb r0, [r4, #0x10]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08088802:
pop {r4, pc}
asm/eyegore.s
+11 -11
View File
@@ -11,7 +11,7 @@
sub_08030A2C: @ 0x08030A2C
push {lr}
ldr r1, _08030A38 @ =gUnk_080CE288
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_08030A38: .4byte gUnk_080CE288
@@ -236,12 +236,12 @@ sub_08030B78: @ 0x08030B78
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #0xa
bl UpdateSprite
bl InitializeAnimation
b _08030BE8
_08030BE0:
adds r0, r4, #0
movs r1, #0xe
bl UpdateSprite
bl InitializeAnimation
_08030BE8:
pop {r4, pc}
.align 2, 0
@@ -309,7 +309,7 @@ _08030C1C:
strb r0, [r4, #0x15]
adds r0, r4, #0
movs r1, #0xa
bl UpdateSprite
bl InitializeAnimation
_08030C68:
pop {r4, r5, pc}
.align 2, 0
@@ -357,7 +357,7 @@ _08030C98:
bl sub_08030E58
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08030FB4
_08030CCC:
@@ -385,7 +385,7 @@ sub_08030CD0: @ 0x08030CD0
beq _08030D66
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
adds r0, #0x79
ldrb r1, [r0]
@@ -412,7 +412,7 @@ _08030D1A:
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08030D34:
adds r0, r4, #0
adds r0, #0x7a
@@ -461,7 +461,7 @@ sub_08030D68: @ 0x08030D68
beq _08030E1C
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
movs r1, #1
bl sub_08049FDC
@@ -501,7 +501,7 @@ _08030DC4:
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08030DDE:
movs r1, #0xe0
lsls r1, r1, #5
@@ -528,7 +528,7 @@ _08030DFC:
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #0xe
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08030F00
_08030E1C:
@@ -1211,7 +1211,7 @@ sub_08031320: @ 0x08031320
ldr r1, _08031340 @ =gUnk_080FD308
str r1, [r0, #0x48]
movs r1, #0xa
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_08031340: .4byte gUnk_080FD308
asm/fallingBoulder.s
+4 -4
View File
@@ -11,7 +11,7 @@
sub_0802C228: @ 0x0802C228
push {lr}
ldr r1, _0802C234 @ =gUnk_080CD540
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_0802C234: .4byte gUnk_080CD540
@@ -340,7 +340,7 @@ _0802C48C:
orrs r0, r1
strb r0, [r2]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_0802C4AA:
pop {r4, r5, r6, r7, pc}
@@ -441,7 +441,7 @@ _0802C534:
strb r0, [r5, #0xe]
adds r0, r5, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
_0802C55E:
movs r0, #3
ands r4, r0
@@ -469,7 +469,7 @@ _0802C584:
strb r0, [r5, #0xe]
adds r0, r5, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
_0802C596:
movs r2, #3
ands r4, r2
asm/fan.s
+3 -3
View File
@@ -35,7 +35,7 @@ sub_0809ED30: @ 0x0809ED30
bl sub_0809EFB0
ldrb r1, [r4, #0xa]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
pop {r4, pc}
thumb_func_start sub_0809ED54
@@ -147,7 +147,7 @@ sub_0809EE08: @ 0x0809EE08
adds r2, #0x74
strh r1, [r2]
ldrb r1, [r0, #0xa]
bl UpdateSprite
bl InitializeAnimation
pop {pc}
thumb_func_start sub_0809EE24
@@ -157,7 +157,7 @@ sub_0809EE24: @ 0x0809EE24
strb r1, [r0, #0xc]
ldrb r1, [r0, #0xa]
adds r1, #4
bl UpdateSprite
bl InitializeAnimation
pop {pc}
thumb_func_start sub_0809EE34
asm/farmers.s
+1 -1
View File
@@ -113,7 +113,7 @@ sub_0806BC94: @ 0x0806BC94
ldrb r2, [r0, #0x14]
lsrs r2, r2, #1
adds r1, r1, r2
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
asm/figurineDevice.s
+2 -2
View File
@@ -111,7 +111,7 @@ _08087C64:
bl sub_0805E3A0
adds r0, r4, #0
movs r1, #1
bl UpdateSprite
bl InitializeAnimation
b _08087CA6
_08087C7C:
movs r0, #0x1e
@@ -306,7 +306,7 @@ sub_08087DBC: @ 0x08087DBC
bl sub_0801D2B4
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
movs r0, #0x88
lsls r0, r0, #1
bl PlaySFX
asm/fireballGuy.s
+2 -2
View File
@@ -11,7 +11,7 @@
sub_08045394: @ 0x08045394
push {lr}
ldr r1, _080453A0 @ =gUnk_080D17E8
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_080453A0: .4byte gUnk_080D17E8
@@ -89,7 +89,7 @@ sub_080453E8: @ 0x080453E8
bl sub_0804A720
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08045524
pop {r4, pc}
asm/floatingBlock.s
+1 -1
View File
@@ -33,7 +33,7 @@ sub_080A0554: @ 0x080A0554
adds r0, #0x38
strb r2, [r0]
adds r0, r3, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_080A0588:
pop {pc}
.align 2, 0
asm/flyingPot.s
+1 -1
View File
@@ -297,7 +297,7 @@ sub_08037220: @ 0x08037220
bl SetTile
adds r0, r5, #0
movs r1, #5
bl UpdateSprite
bl InitializeAnimation
pop {r4, r5, r6, pc}
.align 2, 0
_0803727C: .4byte gRoomControls
asm/flyingSkull.s
+1 -1
View File
@@ -297,7 +297,7 @@ sub_08039D74: @ 0x08039D74
bl SetTile
adds r0, r5, #0
movs r1, #0
bl UpdateSprite
bl InitializeAnimation
pop {r4, r5, r6, pc}
.align 2, 0
_08039DD0: .4byte gRoomControls
asm/forestMinish.s
+1 -1
View File
@@ -550,7 +550,7 @@ sub_080603B4: @ 0x080603B4
bl sub_0805E3A0
adds r0, r4, #0
movs r1, #6
bl UpdateSprite
bl InitializeAnimation
b _080603FA
.align 2, 0
_080603F0: .4byte gUnk_0810A348
asm/furniture.s
+3 -3
View File
@@ -95,7 +95,7 @@ _08090640:
movs r0, #2
strb r0, [r1]
adds r0, r7, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
b _080906E6
_08090650:
ldrh r1, [r7, #0x32]
@@ -657,7 +657,7 @@ _08090B14:
movs r0, #1
strb r0, [r3]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08090B2C:
adds r0, r5, #0
bl GetTileTypeByEntity
@@ -1095,7 +1095,7 @@ sub_08090E64: @ 0x08090E64
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08090EA0:
pop {r4, r5, pc}
.align 2, 0
asm/gentariCurtains.s
+4 -4
View File
@@ -62,7 +62,7 @@ _0809207A:
adds r0, #2
strh r0, [r6, #0x2e]
adds r0, r6, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
movs r0, #0x2e
ldrsh r2, [r6, r0]
ldr r3, _08092130 @ =gRoomControls
@@ -248,7 +248,7 @@ sub_080921F0: @ 0x080921F0
orrs r0, r1
strb r0, [r3]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08092212:
pop {pc}
@@ -271,7 +271,7 @@ sub_08092214: @ 0x08092214
orrs r0, r1
strb r0, [r3]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_0809223A:
pop {pc}
@@ -290,5 +290,5 @@ sub_0809223C: @ 0x0809223C
movs r2, #3
orrs r1, r2
strb r1, [r3]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
pop {pc}
asm/ghini.s
+15 -15
View File
@@ -23,7 +23,7 @@ sub_0803EFDC: @ 0x0803EFDC
adds r0, r4, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
pop {r4, r5, pc}
.align 2, 0
_0803F004: .4byte gUnk_080D0924
@@ -65,7 +65,7 @@ sub_0803F028: @ 0x0803F028
eors r1, r0
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_0803F630
adds r0, r4, #0
@@ -85,7 +85,7 @@ _0803F05C:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #3
bl UpdateSprite
bl InitializeAnimation
b _0803F0E4
_0803F07E:
ldrb r0, [r1]
@@ -108,7 +108,7 @@ _0803F08A:
ldrb r1, [r4, #0x14]
adds r1, #7
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
movs r1, #0x1c
bl sub_0804A9FC
@@ -137,7 +137,7 @@ _0803F0D4:
lsrs r1, r1, #4
adds r1, #7
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0803F0E4:
ldr r1, _0803F0F0 @ =gUnk_080D0924
adds r0, r4, #0
@@ -184,7 +184,7 @@ sub_0803F0F4: @ 0x0803F0F4
eors r1, r0
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0803F144:
pop {r4, pc}
.align 2, 0
@@ -203,7 +203,7 @@ sub_0803F148: @ 0x0803F148
ldrb r1, [r4, #0x14]
adds r1, #7
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0803F164:
adds r0, r4, #0
bl sub_08001242
@@ -225,7 +225,7 @@ _0803F178:
eors r1, r0
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #0xff
strb r0, [r4, #0x15]
movs r0, #1
@@ -262,7 +262,7 @@ _0803F1CC:
lsrs r1, r1, #4
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0803F1DE:
pop {r4, pc}
@@ -277,7 +277,7 @@ sub_0803F1E0: @ 0x0803F1E0
ldrb r1, [r1, #0x14]
lsrs r1, r1, #2
adds r1, #5
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
_0803F1F8: .4byte gLinkEntity
@@ -363,7 +363,7 @@ _0803F28E:
lsrs r1, r1, #4
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0803F2A0:
pop {r4, pc}
.align 2, 0
@@ -430,7 +430,7 @@ _0803F310:
ldrb r1, [r4, #0x14]
adds r1, #1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0803F322:
pop {r4, pc}
@@ -602,7 +602,7 @@ sub_0803F43C: @ 0x0803F43C
strh r2, [r0]
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
_0803F474:
pop {r4, pc}
.align 2, 0
@@ -689,7 +689,7 @@ sub_0803F50C: @ 0x0803F50C
movs r1, #1
strb r1, [r0, #0xc]
movs r1, #9
bl UpdateSprite
bl InitializeAnimation
pop {pc}
.align 2, 0
@@ -892,7 +892,7 @@ _0803F680:
strb r0, [r2, #0x14]
adds r1, r0, #1
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
_0803F692:
pop {pc}
asm/giantRock.s
+2 -2
View File
@@ -27,7 +27,7 @@ sub_08090FB8: @ 0x08090FB8
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
@@ -37,6 +37,6 @@ sub_08090FB8: @ 0x08090FB8
strb r0, [r2]
ldrb r1, [r4, #0xa]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08090FF6:
pop {r4, pc}
asm/gibdo.s
+2 -2
View File
@@ -12,13 +12,13 @@ sub_0803746C: @ 0x0803746C
push {r4, lr}
adds r4, r0, #0
ldr r1, _08037488 @ =gUnk_080CF294
bl sub_0800129E
bl EnemyFunctionHandler
movs r3, #0x15
rsbs r3, r3, #0
adds r0, r4, #0
movs r1, #0
movs r2, #1
bl sub_0804A9AC
bl SetChildOffset
pop {r4, pc}
.align 2, 0
_08037488: .4byte gUnk_080CF294
asm/gleerok.s
+9 -9
View File
@@ -315,7 +315,7 @@ _0802D276:
bne _0802D288
adds r0, r5, #0
movs r1, #0x4e
bl UpdateSprite
bl InitializeAnimation
_0802D288:
ldrb r0, [r5, #0xe]
cmp r0, #0
@@ -656,7 +656,7 @@ _0802D52E:
strb r1, [r0]
adds r0, r4, #0
movs r1, #0x4c
bl UpdateSprite
bl InitializeAnimation
b _0802D63C
.align 2, 0
_0802D540: .4byte gLinkState
@@ -693,7 +693,7 @@ _0802D55C:
strb r0, [r4, #0xf]
adds r0, r4, #0
movs r1, #0x24
bl UpdateSprite
bl InitializeAnimation
b _0802D63C
.align 2, 0
_0802D588: .4byte gUnk_080CD7C4
@@ -739,7 +739,7 @@ _0802D5A8:
bl CopyPosition
adds r0, r4, #0
movs r1, #0x4f
bl UpdateSprite
bl InitializeAnimation
b _0802D63C
.align 2, 0
_0802D5E8: .4byte gUnk_080CD884
@@ -780,7 +780,7 @@ _0802D61A:
bl CopyPosition
adds r0, r4, #0
movs r1, #0x50
bl UpdateSprite
bl InitializeAnimation
_0802D63C:
ldrb r0, [r4, #0xa]
cmp r0, #0
@@ -934,7 +934,7 @@ _0802D734:
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #0x4d
bl UpdateSprite
bl InitializeAnimation
movs r0, #0x24
movs r1, #5
bl CreateEnemy
@@ -2276,7 +2276,7 @@ _0802E158:
strb r0, [r4, #0xb]
adds r0, r4, #0
movs r1, #0x4e
bl UpdateSprite
bl InitializeAnimation
b _0802E1C4
.align 2, 0
_0802E18C: .4byte 0xFFFF0000
@@ -2587,7 +2587,7 @@ _0802E3CA:
strb r1, [r6]
adds r0, r4, #0
movs r1, #0x4d
bl UpdateSprite
bl InitializeAnimation
movs r0, #0x24
movs r1, #5
bl CreateEnemy
@@ -3033,7 +3033,7 @@ _0802E73E:
beq _0802E756
adds r0, r1, #0
adds r1, r7, #0
bl UpdateSprite
bl InitializeAnimation
_0802E756:
adds r6, r4, #0
cmp r6, #4
asm/gorman.s
+2 -2
View File
@@ -55,7 +55,7 @@ sub_080697C4: @ 0x080697C4
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #2
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08078778
_080697E4:
@@ -84,7 +84,7 @@ sub_080697EC: @ 0x080697EC
cmp r0, r1
beq _0806981E
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _0806981E
_0806981A:
subs r0, #1
asm/greatFairy.s
+1 -1
View File
@@ -90,7 +90,7 @@ sub_08087380: @ 0x08087380
strb r0, [r1]
ldrb r1, [r4, #0xb]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
movs r1, #2
bl sub_0805E3A0
asm/gregal.s
+2 -2
View File
@@ -129,7 +129,7 @@ sub_0806CBB4: @ 0x0806CBB4
bl sub_0805E3A0
adds r0, r4, #0
movs r1, #0x11
bl UpdateSprite
bl InitializeAnimation
_0806CBD6:
adds r0, r4, #0
bl sub_08004274
@@ -274,7 +274,7 @@ sub_0806CCD0: @ 0x0806CCD0
lsrs r1, r1, #1
adds r1, r2, r1
adds r0, r3, #0
bl UpdateSprite
bl InitializeAnimation
movs r0, #1
str r0, [r4, #0x14]
b _0806CCF6
asm/guardWithSpear.s
+12 -12
View File
@@ -72,7 +72,7 @@ sub_08063D44: @ 0x08063D44
beq _08063DC6
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
bl InitializeAnimation
ldr r0, _08063DA8 @ =gUnk_0810F6BC
ldrb r1, [r4, #0xa]
lsls r1, r1, #2
@@ -148,7 +148,7 @@ _08063DF8:
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _08063E1E
_08063E18:
adds r0, r4, #0
@@ -170,7 +170,7 @@ _08063E1E:
bl sub_0806F5A4
adds r1, r0, #0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08064428
_08063E4C:
@@ -208,7 +208,7 @@ sub_08063E6C: @ 0x08063E6C
ldrb r1, [r2, #0x14]
adds r1, #4
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
_08063E8A:
pop {pc}
.align 2, 0
@@ -280,7 +280,7 @@ _08063EFE:
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
bl sub_0807DD64
adds r0, r4, #0
@@ -321,7 +321,7 @@ sub_08063F20: @ 0x08063F20
asrs r0, r0, #0x18
adds r1, r1, r0
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
bl sub_08064428
_08063F72:
@@ -352,7 +352,7 @@ sub_08063F78: @ 0x08063F78
adds r0, #4
adds r1, r1, r0
adds r0, r2, #0
bl UpdateSprite
bl InitializeAnimation
_08063FA6:
pop {pc}
.align 2, 0
@@ -551,7 +551,7 @@ _080640E8:
adds r1, #4
adds r1, r2, r1
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_0806410A:
adds r0, r4, #0
bl sub_080AEF88
@@ -729,7 +729,7 @@ _08064222:
cmp r1, r0
beq _08064256
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
_08064256:
movs r0, #0
ldrsb r0, [r6, r0]
@@ -754,7 +754,7 @@ _08064256:
cmp r1, r0
beq _0806428C
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
_0806428C:
adds r0, r5, #0
bl sub_0806ED78
@@ -874,7 +874,7 @@ _08064342:
cmp r1, r0
beq _08064376
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
_08064376:
movs r0, #0
ldrsb r0, [r6, r0]
@@ -899,7 +899,7 @@ _08064376:
cmp r1, r0
beq _080643AC
adds r0, r5, #0
bl UpdateSprite
bl InitializeAnimation
_080643AC:
adds r0, r5, #0
bl sub_0806ED78
asm/gyorgChild.s
+3 -3
View File
@@ -134,7 +134,7 @@ sub_080486F4: @ 0x080486F4
bne _0804876C
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
strb r5, [r4, #0xc]
ldrb r0, [r4, #0x10]
movs r1, #0x80
@@ -315,7 +315,7 @@ sub_0804882C: @ 0x0804882C
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
adds r0, r4, #0
adds r0, #0x7a
ldrb r0, [r0]
@@ -325,7 +325,7 @@ sub_0804882C: @ 0x0804882C
strb r0, [r4, #0x14]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
ldrb r0, [r4, #0x14]
lsrs r0, r0, #1
cmp r0, #1
asm/gyorgFemale.s
+2 -2
View File
@@ -125,7 +125,7 @@ sub_0804614C: @ 0x0804614C
adds r1, r0, #0
adds r1, #0x38
strb r5, [r1]
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
ldr r1, _08046258 @ =sub_08046498
adds r0, r6, #0
movs r2, #0
@@ -846,7 +846,7 @@ _0804674C:
movs r0, #1
strb r0, [r1]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_080467CC:
adds r1, r4, #0
adds r1, #0x7c
asm/gyorgFemaleEye.s
+9 -9
View File
@@ -308,7 +308,7 @@ sub_08048BB0: @ 0x08048BB0
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _08048CEA
.align 2, 0
_08048BF8: .4byte gUnk_080D2030
@@ -331,7 +331,7 @@ _08048BFC:
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
movs r1, #2
movs r2, #0x40
@@ -363,7 +363,7 @@ _08048C34:
lsrs r1, r1, #6
adds r1, #0x14
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
ldr r0, _08048CB4 @ =0x00000119
bl PlaySFX
_08048C6C:
@@ -388,10 +388,10 @@ _08048C6C:
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
adds r0, r4, #0
movs r1, #7
bl UpdateSpriteAnimation
bl InitializeAnimationAnimation
adds r1, r6, #0
ldrb r4, [r4, #0xa]
lsls r1, r4
@@ -414,12 +414,12 @@ _08048CBC:
ldrb r1, [r4, #0x14]
adds r1, #0x10
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
bl Random
movs r1, #0x1c
ands r1, r0
adds r0, r4, #0
bl UpdateSpriteAnimation
bl InitializeAnimationAnimation
_08048CE4:
adds r0, r4, #0
bl sub_08004274
@@ -448,7 +448,7 @@ sub_08048CEC: @ 0x08048CEC
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08048D1A:
pop {r4, pc}
.align 2, 0
@@ -486,7 +486,7 @@ sub_08048D20: @ 0x08048D20
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
_08048D60:
pop {r4, r5, pc}
.align 2, 0
asm/gyorgFemaleMouth.s
+1 -1
View File
@@ -72,7 +72,7 @@ _08048FD4:
strh r0, [r4, #0x32]
lsrs r1, r6, #0x19
adds r0, r4, #0
bl UpdateSprite
bl InitializeAnimation
b _0804901E
.align 2, 0
_08049010: .4byte gUnk_080D28CC
asm/gyorgMale.s
+3 -3
View File
@@ -997,7 +997,7 @@ _08046F12:
strb r0, [r1]
str r4, [r2, #0x50]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08046F58:
adds r0, r4, #0
bl sub_08047E48
@@ -1052,7 +1052,7 @@ _08046F82:
strb r0, [r1]
str r4, [r2, #0x50]
adds r0, r2, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08046FC8:
ldr r0, [r4, #0x64]
ldr r0, [r0]
@@ -2751,7 +2751,7 @@ sub_08047BF0: @ 0x08047BF0
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteOrderAndFlip
bl InitializeAnimationOrderAndFlip
_08047C74:
adds r0, r5, #0
adds r0, #0x76
asm/hangingSeed.s
+1 -1
View File
@@ -11,7 +11,7 @@
sub_080216D4: @ 0x080216D4
push {lr}
ldr r1, _080216E0 @ =gUnk_080CB570
bl sub_0800129E
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_080216E0: .4byte gUnk_080CB570

Some files were not shown because too many files have changed in this diff Show More