falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed naming conflicts

This commit is contained in:
theo 2020-06-12 03:06:40 -07:00
parent d8eb7b1df7
commit a805b6e110
79 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/archway.s
View File

@ -29,7 +29,7 @@ sub_08090F70: @ 0x08090F70
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
bl sub_08052660
cmp r0, #0
beq _08090FB4

2
asm/bakerOven.s
View File

@ -26,7 +26,7 @@ sub_0809CC74: @ 0x0809CC74
adds r5, r0, #0
movs r4, #1
strb r4, [r5, #0xc]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _0809CCD4

2
asm/beetle.s
View File

@ -364,7 +364,7 @@ _080219C2:
movs r1, #0
bl InitializeAnimation
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08021A04:
pop {r4, pc}
.align 2, 0

2
asm/bell.s
View File

@ -44,7 +44,7 @@ sub_08097D90: @ 0x08097D90
ands r0, r1
strb r0, [r2]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl LoadAnimation

2
asm/bigBarrel.s
View File

@ -509,7 +509,7 @@ _08088DEC:
_08088E1E:
strb r1, [r4, #0xb]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
b _08088E6E
_08088E28:
ldrb r0, [r4, #0xb]

8
asm/bird.s
View File

@ -74,7 +74,7 @@ sub_0809CF54: @ 0x0809CF54
ldr r0, _0809CFE8 @ =0x00000123
bl PlaySFX
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r1, r4, #0
adds r1, #0x5a
movs r0, #0x80

2
asm/book.s
View File

@ -71,7 +71,7 @@ _0809B420:
strb r0, [r4, #0xb]
_0809B424:
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldrb r1, [r4, #0xa]
adds r1, #0x39
adds r0, r4, #0

10
asm/code_0800857C.s
View File

@ -387,7 +387,7 @@ _0800882C:
movs r3, #0x38
ldrb r1, [r4, r3]
strb r1, [r0, r3]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_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 InitializeAnimationOrderAndFlip
InitializeAnimationOrderAndFlip: @ 0x08016A04
thumb_func_start UpdateSpriteOrderAndFlip
UpdateSpriteOrderAndFlip: @ 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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {r0, r4, pc}

2
asm/code_08016DF8.s
View File

@ -1567,7 +1567,7 @@ sub_08017940: @ 0x08017940
adds r0, #0x38
strb r1, [r0]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_080179CC:
movs r1, #0
ldr r0, _080179E8 @ =gLinkEntity

2
asm/code_08049CD4.s
View File

@ -1290,7 +1290,7 @@ _0804A612:
strb r0, [r1]
_0804A638:
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r5, r4, #0
adds r5, #0x6d
ldrb r1, [r5]

4
asm/code_0805436C.s
View File

@ -685,7 +685,7 @@ _08054842:
adds r0, #0x38
strb r1, [r0]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0805486A:
adds r0, r4, #0
_0805486C:
@ -1551,7 +1551,7 @@ sub_08054EFC: @ 0x08054EFC
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0x35
movs r2, #0

6
asm/code_08056418.s
View File

@ -2578,7 +2578,7 @@ _080577F2:
mov r1, r8
strb r1, [r0]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08057808:
pop {r3}
mov r8, r3
@ -14218,7 +14218,7 @@ sub_0805D1FC: @ 0x0805D1FC
movs r0, #3
strb r0, [r1]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r0, _0805E068 @ =gUnk_030010A0
adds r0, #0x38
ldrb r1, [r0]

2
asm/code_0806EC20.s
View File

@ -163,7 +163,7 @@ _0806ECD0:
strb r1, [r0]
strb r1, [r4, #0x1e]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0806ED4A:
pop {r4, r5, pc}
.align 2, 0

6
asm/code_0806FA6C.s
View File

@ -4884,7 +4884,7 @@ sub_08071F80: @ 0x08071F80
cmp r5, #0
bne _08071FB8
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0xc
movs r2, #0

2
asm/code_080732D0.s
View File

@ -3153,7 +3153,7 @@ sub_08074A48: @ 0x08074A48
movs r0, #1
strb r0, [r1, #0xe]
adds r0, r1, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldrh r1, [r5, #0x22]
adds r0, r4, #0
adds r0, #0x38

2
asm/code_08077B98.s
View File

@ -3397,7 +3397,7 @@ _080794F4:
bne _080794F4
_08079514:
ldr r0, _0807951C @ =gLinkEntity
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {r4, r5, pc}
.align 2, 0
_0807951C: .4byte gLinkEntity

2
asm/code_0807B9B8.s
View File

@ -1807,7 +1807,7 @@ _0807C7C2:
movs r1, #1
strb r1, [r0]
ldr r0, [r4, #0x30]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0807C7FC:
ldrb r1, [r4, #0xf]
movs r0, #0xfb

6
asm/code_0807CC3C.s
View File

@ -5269,7 +5269,7 @@ sub_0807F158: @ 0x0807F158
adds r2, #0x38
movs r1, #1
strb r1, [r2]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {pc}
thumb_func_start sub_0807F168
@ -5280,7 +5280,7 @@ sub_0807F168: @ 0x0807F168
adds r2, #0x38
movs r1, #1
strb r1, [r2]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {pc}
thumb_func_start sub_0807F190

8
asm/code_080A5574.s
View File

@ -5202,7 +5202,7 @@ _080A7E14:
ldr r0, [r5, #4]
str r0, [r4, #0x48]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_080A7E4A:
movs r0, #1
_080A7E4C:
@ -10441,7 +10441,7 @@ sub_080AA534: @ 0x080AA534
adds r2, #0x38
movs r1, #3
strb r1, [r2]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {pc}
thumb_func_start sub_080AA544
@ -15257,7 +15257,7 @@ sub_080AC928: @ 0x080AC928
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl InitializeAnimation
@ -16380,7 +16380,7 @@ _080AD188:
bl PlaySFX
_080AD196:
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
movs r0, #3
strb r0, [r5, #0xd]
ldrb r2, [r4, #0x19]

4
asm/crow.s
View File

@ -220,7 +220,7 @@ sub_08032928: @ 0x08032928
adds r1, #0x7a
strh r0, [r1]
adds r0, r6, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
bl sub_08032AF4
_08032AAE:

2
asm/cuccoAggr.s
View File

@ -240,7 +240,7 @@ sub_08038E18: @ 0x08038E18
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08038E70:
ldrb r0, [r4, #0xe]
subs r0, #1

2
asm/deathFx.s
View File

@ -42,7 +42,7 @@ sub_08081634: @ 0x08081634
adds r0, #0x38
strb r1, [r0]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldrb r0, [r4, #0x19]
movs r1, #3
orrs r0, r1

4
asm/enemy64.s
View File

@ -570,7 +570,7 @@ _0804948C:
strb r0, [r1]
str r4, [r2, #0x50]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08049B18:
pop {r4, r5, pc}
.align 2, 0

2
asm/fallingBoulder.s
View File

@ -340,7 +340,7 @@ _0802C48C:
orrs r0, r1
strb r0, [r2]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0802C4AA:
pop {r4, r5, r6, r7, pc}

2
asm/floatingBlock.s
View File

@ -33,7 +33,7 @@ sub_080A0554: @ 0x080A0554
adds r0, #0x38
strb r2, [r0]
adds r0, r3, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_080A0588:
pop {pc}
.align 2, 0

6
asm/furniture.s
View File

@ -95,7 +95,7 @@ _08090640:
movs r0, #2
strb r0, [r1]
adds r0, r7, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
b _080906E6
_08090650:
ldrh r1, [r7, #0x32]
@ -657,7 +657,7 @@ _08090B14:
movs r0, #1
strb r0, [r3]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08090EA0:
pop {r4, r5, pc}
.align 2, 0

8
asm/gentariCurtains.s
View File

@ -62,7 +62,7 @@ _0809207A:
adds r0, #2
strh r0, [r6, #0x2e]
adds r0, r6, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08092212:
pop {pc}
@ -271,7 +271,7 @@ sub_08092214: @ 0x08092214
orrs r0, r1
strb r0, [r3]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0809223A:
pop {pc}
@ -290,5 +290,5 @@ sub_0809223C: @ 0x0809223C
movs r2, #3
orrs r1, r2
strb r1, [r3]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {pc}

2
asm/giantRock.s
View File

@ -27,7 +27,7 @@ sub_08090FB8: @ 0x08090FB8
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]

2
asm/guardWithSpear.s
View File

@ -280,7 +280,7 @@ _08063EFE:
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
bl sub_0807DD64
adds r0, r4, #0

2
asm/gyorgChild.s
View File

@ -315,7 +315,7 @@ sub_0804882C: @ 0x0804882C
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
adds r0, #0x7a
ldrb r0, [r0]

4
asm/gyorgFemale.s
View File

@ -125,7 +125,7 @@ sub_0804614C: @ 0x0804614C
adds r1, r0, #0
adds r1, #0x38
strb r5, [r1]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_080467CC:
adds r1, r4, #0
adds r1, #0x7c

6
asm/gyorgMale.s
View File

@ -997,7 +997,7 @@ _08046F12:
strb r0, [r1]
str r4, [r2, #0x50]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_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 InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08047C74:
adds r0, r5, #0
adds r0, #0x76

2
asm/houseDoorExterior.s
View File

@ -108,7 +108,7 @@ _08086718:
ldrb r0, [r5, #5]
strb r0, [r4, #0xd]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r0, [r6, #0x68]
orrs r0, r7
str r0, [r6, #0x68]

2
asm/initializeLink.s
View File

@ -162,7 +162,7 @@ _080525C2:
adds r0, #0x38
strb r1, [r0]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #1
bl sub_0805EA2C

2
asm/itemForSale.s
View File

@ -288,7 +288,7 @@ _080819D4:
orrs r0, r1
strb r0, [r2]
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r5, #0
bl sub_08081A5C
pop {r4, r5, r6, pc}

4
asm/itemOnGround.s
View File

@ -1473,7 +1473,7 @@ _08081522:
ldrb r0, [r4, #0xa]
bl sub_0808148C
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08081532:
adds r0, r4, #0
bl sub_080AEFE0
@ -1510,7 +1510,7 @@ sub_0808153C: @ 0x0808153C
ldrb r0, [r4, #0xa]
bl sub_0808148C
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
b _08081596
_0808157E:
movs r1, #0xa0

2
asm/jailBars.s
View File

@ -54,7 +54,7 @@ _080A08F6:
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {r4, pc}
.align 2, 0

2
asm/keese.s
View File

@ -127,7 +127,7 @@ _08021E14:
movs r0, #3
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
bl sub_08021EF0
pop {r4, pc}

6
asm/ladderHoleInBookshelf.s
View File

@ -29,7 +29,7 @@ sub_08093FCC: @ 0x08093FCC
adds r2, #0x38
movs r1, #2
strb r1, [r2]
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {pc}
thumb_func_start sub_08093FE0
@ -54,7 +54,7 @@ _08094002:
movs r0, #1
strb r0, [r3]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
@ -76,7 +76,7 @@ _08094024:
movs r0, #2
strb r0, [r3]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]

4
asm/lavaPlatform.s
View File

@ -66,7 +66,7 @@ sub_0809229C: @ 0x0809229C
orrs r0, r1
strb r0, [r4, #0x18]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r0, [r4, #0x54]
ldrb r1, [r0, #0x14]
adds r0, r4, #0
@ -502,7 +502,7 @@ _080925B8:
ldr r0, [r5]
str r0, [r4, #0x78]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r1, r4, #0
adds r1, #0x78
adds r2, r4, #0

2
asm/leever.s
View File

@ -143,7 +143,7 @@ sub_0801FCB0: @ 0x0801FCB0
movs r1, #0
bl InitializeAnimation
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
b _0801FD28
.align 2, 0
_0801FD14: .4byte gUnk_020000B0

4
asm/lightableSwitch.s
View File

@ -67,7 +67,7 @@ sub_0809EA34: @ 0x0809EA34
adds r0, r4, #0
bl sub_0809EAD8
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
bl sub_0809EABC
pop {r4, pc}
@ -240,7 +240,7 @@ sub_0809EB80: @ 0x0809EB80
adds r0, r4, #0
bl sub_0809EAD8
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
adds r0, #0x84
ldrh r0, [r0]

2
asm/macroBook.s
View File

@ -62,7 +62,7 @@ sub_0809A78C: @ 0x0809A78C
adds r1, r2, #0
bl sub_0805EC9C
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldrb r1, [r4, #0xf]
adds r0, r4, #0
bl LoadAnimation

2
asm/macroDecorations.s
View File

@ -27,7 +27,7 @@ sub_08097DEC: @ 0x08097DEC
movs r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldrb r0, [r4, #0xa]
cmp r0, #1
beq _08097E46

10
asm/mazaalMacro.s
View File

@ -170,7 +170,7 @@ sub_08034D4C: @ 0x08034D4C
strb r0, [r1]
str r5, [r4, #0x50]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
movs r0, #0x96
lsls r0, r0, #2
strh r0, [r6]
@ -264,7 +264,7 @@ sub_08034E30: @ 0x08034E30
ands r0, r1
strb r0, [r2]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #2
bl InitializeAnimation
@ -385,7 +385,7 @@ sub_08034EE4: @ 0x08034EE4
movs r0, #2
strb r0, [r1]
adds r0, r3, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08034F46:
adds r0, r5, #0
movs r1, #0
@ -553,7 +553,7 @@ sub_08035050: @ 0x08035050
strb r0, [r1]
str r4, [r2, #0x50]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08035082:
pop {r4, pc}
@ -625,7 +625,7 @@ _080350F2:
movs r0, #1
strb r0, [r1]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r5, #1
adds r4, #2
cmp r5, #5

2
asm/minishLight.s
View File

@ -40,7 +40,7 @@ sub_0809F840: @ 0x0809F840
strb r0, [r2, #0x18]
_0809F860:
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {pc}
thumb_func_start sub_0809F868

2
asm/minishSizedArchway.s
View File

@ -23,7 +23,7 @@ sub_080973E4: @ 0x080973E4
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
bl sub_08052660
cmp r0, #0
beq _0809741E

2
asm/moldworm.s
View File

@ -1275,7 +1275,7 @@ sub_08023990: @ 0x08023990
adds r0, #0x38
strb r1, [r0]
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r5, #0
movs r1, #0x16
bl InitializeAnimation

2
asm/npc5.s
View File

@ -550,7 +550,7 @@ sub_08060DFC: @ 0x08060DFC
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0x1c
bl sub_08060E70

2
asm/object21.s
View File

@ -117,7 +117,7 @@ _08087A68:
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_08087A76:
ldrb r1, [r4, #0x10]
movs r0, #0x80

2
asm/object35.s
View File

@ -44,7 +44,7 @@ sub_0808B89C: @ 0x0808B89C
adds r1, #0x38
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]

10
asm/object6A.s
View File

@ -59,7 +59,7 @@ sub_08094A90: @ 0x08094A90
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r1, _08094AE4 @ =gUnk_08114F30
ldrb r2, [r4, #0x19]
lsrs r0, r2, #6
@ -252,7 +252,7 @@ sub_08094BE0: @ 0x08094BE0
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #1
bl LoadAnimation
@ -1209,7 +1209,7 @@ sub_08095364: @ 0x08095364
movs r4, #1
strb r4, [r0]
adds r0, r6, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
str r5, [r6, #0x54]
strb r4, [r6, #0xd]
ldr r0, _080953A0 @ =0x0000FFF0
@ -1868,7 +1868,7 @@ _08095880:
movs r0, #2
strb r0, [r1]
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r1, _080958D4 @ =gUnk_08114F30
ldrb r2, [r5, #0x19]
lsrs r0, r2, #6
@ -2225,7 +2225,7 @@ sub_08095B48: @ 0x08095B48
movs r0, #2
strb r0, [r1]
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r1, _08095BA8 @ =gUnk_08114F30
ldrb r2, [r5, #0x19]
lsrs r0, r2, #6

2
asm/object80.s
View File

@ -83,7 +83,7 @@ sub_08098B28: @ 0x08098B28
adds r7, #0x38
strb r4, [r7]
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r2, r5, #0
adds r2, #0x29
ldrb r1, [r2]

2
asm/object81.s
View File

@ -67,7 +67,7 @@ _08098CD0:
strb r5, [r0]
_08098CD6:
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
adds r0, #0x80
ldrh r1, [r0]

2
asm/object8A.s
View File

@ -47,7 +47,7 @@ sub_0809ADCC: @ 0x0809ADCC
adds r0, #0x38
ldrb r7, [r0]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldrb r0, [r4, #0xa]
cmp r0, #1
beq _0809AEBC

2
asm/object8B.s
View File

@ -72,7 +72,7 @@ _0809AFC4:
adds r0, #0x84
strb r6, [r0]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
movs r0, #0x8b
movs r1, #1
movs r2, #0

2
asm/object93.s
View File

@ -26,7 +26,7 @@ sub_0809CEA8: @ 0x0809CEA8
movs r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl InitializeAnimation

4
asm/object96.s
View File

@ -78,7 +78,7 @@ sub_0809D7A8: @ 0x0809D7A8
strb r1, [r5, #0x15]
_0809D80C:
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldrb r4, [r5, #0xa]
adds r0, r5, #0
bl sub_08080CB4
@ -151,7 +151,7 @@ _0809D888:
adds r0, #0x38
strb r1, [r0]
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r1, [r6]
cmp r1, #0
beq _0809D8AC

8
asm/object97.s
View File

@ -243,7 +243,7 @@ sub_0809DB58: @ 0x0809DB58
orrs r0, r1
strb r0, [r4, #0x19]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0x3c
bl LoadAnimation
@ -357,7 +357,7 @@ _0809DC3C:
adds r0, #0x38
strb r1, [r0]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0809DC54:
movs r0, #0x6e
bl PlaySFX
@ -430,7 +430,7 @@ sub_0809DC80: @ 0x0809DC80
adds r0, #2
strb r2, [r0]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #3
bl LoadAnimation
@ -659,7 +659,7 @@ sub_0809DE50: @ 0x0809DE50
ldr r0, _0809DEF8 @ =0x0000FFC0
strh r0, [r4, #0x36]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r1, _0809DEFC @ =gUnk_08124128
ldrb r0, [r4, #0xb]
adds r0, r0, r1

4
asm/object9E.s
View File

@ -76,7 +76,7 @@ sub_0809EC4C: @ 0x0809EC4C
adds r1, r4, #0
bl SetTile
adds r0, r6, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
movs r0, #0x9e
movs r1, #1
movs r2, #0
@ -100,7 +100,7 @@ _0809ED04:
movs r0, #2
strb r0, [r1]
adds r0, r6, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0809ED14:
pop {r4, r5, r6, pc}
.align 2, 0

4
asm/objectBA.s
View File

@ -1026,7 +1026,7 @@ sub_080A1E54: @ 0x080A1E54
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_080A1ECA:
pop {r4, r5, pc}
.align 2, 0
@ -1241,7 +1241,7 @@ sub_080A1FF0: @ 0x080A1FF0
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_080A2066:
adds r4, r5, #0
adds r4, #0x7b

2
asm/objectOnPillar.s
View File

@ -79,7 +79,7 @@ sub_08096E28: @ 0x08096E28
subs r1, #0x2b
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
bl sub_080970F4
ldr r1, _08096EB8 @ =gUnk_08123264

2
asm/pesto.s
View File

@ -306,7 +306,7 @@ _08024132:
strh r0, [r4, #0x36]
_08024136:
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
bl sub_08052660
cmp r0, #0
beq _08024150

2
asm/picoBloom.s
View File

@ -40,7 +40,7 @@ _08098A9C:
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r1, _08098ACC @ =gUnk_08123574
ldrb r0, [r4, #0xa]
adds r0, r0, r1

4
asm/pullableLever.s
View File

@ -333,7 +333,7 @@ sub_08091444: @ 0x08091444
adds r0, r4, #0
bl InitializeAnimation
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {r4, pc}
thumb_func_start sub_08091470
@ -447,7 +447,7 @@ sub_08091504: @ 0x08091504
adds r0, r4, #0
bl InitializeAnimation
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {r4, pc}
thumb_func_start sub_0809153C

2
asm/rope.s
View File

@ -212,7 +212,7 @@ _080314CC:
orrs r0, r1
strb r0, [r4, #0x18]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
movs r0, #0x84
bl sub_08004488
_080314FA:

2
asm/sluggula.s
View File

@ -291,7 +291,7 @@ _08023D94:
movs r0, #0x84
bl sub_08004488
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
b _08023E0A
_08023DC0:
adds r0, r4, #0

2
asm/spinyChuchu.s
View File

@ -331,7 +331,7 @@ _0802268C:
movs r0, #0x7d
bl sub_08004488
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_080226BE:
adds r0, r4, #0
bl sub_08004274

2
asm/stalfos.s
View File

@ -80,7 +80,7 @@ _0803930C:
b _0803933A
_08039334:
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0803933A:
pop {r4, pc}

2
asm/sub_080A2838.s
View File

@ -20,7 +20,7 @@ sub_080A2838: @ 0x080A2838
cmp r0, #2
bne _080A2856
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_080A2856:
pop {r4, pc}
.align 2, 0

2
asm/swordsmanNewsletter.s
View File

@ -29,7 +29,7 @@ sub_080933D8: @ 0x080933D8
ldrb r0, [r4, #0xa]
strb r0, [r4, #0x1e]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
ldr r0, _080933F8 @ =gUnk_081228A8
str r0, [r4, #0x48]
adds r0, r4, #0

4
asm/takkuri.s
View File

@ -213,7 +213,7 @@ sub_0803BCA4: @ 0x0803BCA4
adds r1, #0x7a
strh r0, [r1]
adds r0, r6, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r6, #0
bl sub_0803BF2C
pop {r4, r5, r6, pc}
@ -459,7 +459,7 @@ sub_0803BE7C: @ 0x0803BE7C
movs r0, #3
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
bl sub_0803BF2C
_0803BEE6:

4
asm/treeHidingPortal.s
View File

@ -40,7 +40,7 @@ _0809E856:
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {r4, pc}
.align 2, 0
@ -162,7 +162,7 @@ _0809E92A:
movs r0, #2
strb r0, [r1]
adds r0, r2, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
_0809E958:
adds r4, #4
movs r1, #0

2
asm/vaatiEyesMacro.s
View File

@ -411,7 +411,7 @@ _0802EF5E:
strb r0, [r1]
str r6, [r4, #0x50]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r6, #0
adds r1, r4, #0
bl CopyPosition

2
asm/wallMaster.s
View File

@ -156,7 +156,7 @@ sub_0802A4E4: @ 0x0802A4E4
adds r1, #0x78
strh r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
bl sub_0802A7D0
pop {r4, pc}

2
asm/wallMaster2.s
View File

@ -135,7 +135,7 @@ sub_0802CCE0: @ 0x0802CCE0
adds r0, #0x7c
strh r5, [r0]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl InitializeAnimation

4
asm/waterDrop.s
View File

@ -52,7 +52,7 @@ sub_0802A250: @ 0x0802A250
movs r1, #0
bl InitializeAnimation
adds r0, r5, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
movs r0, #0x66
movs r1, #0
movs r2, #0
@ -186,7 +186,7 @@ _0802A38C:
_0802A392:
strb r0, [r1]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
pop {r4, r5, pc}
thumb_func_start sub_0802A39C

2
asm/windTribeFlag.s
View File

@ -35,7 +35,7 @@ _0809CEEE:
_0809CEF4:
strb r0, [r4, #0x18]
adds r0, r4, #0
bl InitializeAnimationOrderAndFlip
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl InitializeAnimation

4
src/positionRelative.c
View File

@ -1,7 +1,7 @@
#include "global.h"
#include "entity.h"
extern void InitializeAnimationOrderAndFlip(Entity *);
extern void UpdateSpriteOrderAndFlip(Entity *);
void PositionRelative(Entity *source, Entity *target, s32 offsetX, s32 offsetY) { //r0, r1, r2, r3
s32 x;
@ -15,5 +15,5 @@ void PositionRelative(Entity *source, Entity *target, s32 offsetX, s32 offsetY)
target->height = source->height; //ldr
target->collisionLayer = source->collisionLayer;
InitializeAnimationOrderAndFlip(target);
UpdateSpriteOrderAndFlip(target);
}