From bd307ea8ebc7f200685f037e2c0c9dd4d62b0ca8 Mon Sep 17 00:00:00 2001 From: theo3 Date: Sun, 14 Jun 2020 04:42:46 -0700 Subject: [PATCH] bladeBrother.c start --- asm/anju.s | 2 +- asm/ballChainSoldier.s | 8 +- asm/beanstalk.s | 4 +- asm/beedle.s | 2 +- asm/bell.s | 2 +- asm/bigVortex.s | 4 +- asm/bird.s | 12 +- asm/bladeBrothers.s | 251 +--------------------------------------- asm/book.s | 2 +- asm/brocco.s | 16 +-- asm/businessScrub.s | 8 +- asm/cat.s | 16 +-- asm/chuchuBoss.s | 38 +++--- asm/clothesRack.s | 14 --- asm/code_08003FC4.s | 4 +- asm/code_080041E8.s | 4 +- asm/code_0801D79C.s | 2 +- asm/code_080526F8.s | 4 +- asm/code_0805436C.s | 8 +- asm/code_08056418.s | 2 +- asm/code_0805E744.s | 2 +- asm/code_0806ED78.s | 4 +- asm/code_08070698.s | 4 +- asm/code_080732D0.s | 8 +- asm/code_08076C80.s | 2 +- asm/code_08077B98.s | 4 +- asm/code_0807CC3C.s | 18 +-- asm/code_080A3BD0.s | 2 +- asm/code_080A5574.s | 26 ++--- asm/code_080AD90C.s | 6 +- asm/crenalBeanSprout.s | 2 +- asm/cucco.s | 8 +- asm/dampe.s | 4 +- asm/darkNut.s | 2 +- asm/deathFx.s | 2 +- asm/din.s | 6 +- asm/dog.s | 12 +- asm/enemy4D.s | 4 +- asm/enemy64.s | 2 +- asm/enemyE.s | 2 +- asm/ezloCap.s | 4 +- asm/farmers.s | 2 +- asm/farore.s | 6 +- asm/festari.s | 6 +- asm/figurineDevice.s | 12 +- asm/forestMinish.s | 2 +- asm/gentari.s | 4 +- asm/gentariCurtains.s | 6 +- asm/ghostBrothers.s | 18 +-- asm/gibdo.s | 20 ++-- asm/gina.s | 4 +- asm/gleerok.s | 10 +- asm/goron.s | 14 +-- asm/goronMerchant.s | 6 +- asm/gregal.s | 6 +- asm/guardWithSpear.s | 2 +- asm/gyorgMale.s | 12 +- asm/itemOnGround.s | 2 +- asm/jarPortal.s | 14 +-- asm/keaton.s | 14 +-- asm/kid.s | 10 +- asm/kingDaltus.s | 6 +- asm/lakitu.s | 22 ++-- asm/lakituCloud.s | 4 +- asm/lavaPlatform.s | 2 +- asm/librari.s | 2 +- asm/likeLike.s | 4 +- asm/macroBook.s | 8 +- asm/macroLink.s | 2 +- asm/madderpillar.s | 2 +- asm/malon.s | 6 +- asm/mama.s | 2 +- asm/mayorHagen.s | 6 +- asm/mazaalBracelet.s | 38 +++--- asm/mazaalHand.s | 2 +- asm/melari.s | 2 +- asm/minecart.s | 10 +- asm/minishEzlo.s | 4 +- asm/ministerPotho.s | 6 +- asm/mountainMinish.s | 2 +- asm/mutoh.s | 2 +- asm/nayru.s | 6 +- asm/npc23.s | 2 +- asm/npc26.s | 2 +- asm/npc4E.s | 2 +- asm/npc5.s | 18 +-- asm/npc9.s | 2 +- asm/object4.s | 2 +- asm/object48.s | 6 +- asm/object6.s | 30 ++--- asm/object6A.s | 20 ++-- asm/object79.s | 4 +- asm/object91.s | 2 +- asm/object97.s | 18 +-- asm/objectB.s | 2 +- asm/objectB9.s | 6 +- asm/objectC1.s | 2 +- asm/octorokBoss.s | 6 +- asm/percy.s | 2 +- asm/picolyteBottles.s | 10 +- asm/pina.s | 24 ++-- asm/pita.s | 2 +- asm/postman.s | 12 +- asm/scissorsBeetle.s | 2 +- asm/smith.s | 10 +- asm/stalfos.s | 18 +-- asm/sturgeon.s | 2 +- asm/talon.s | 6 +- asm/tingleSiblings.s | 12 +- asm/townsperson.s | 2 +- asm/vaatiArm.s | 34 +++--- asm/vaatiBall.s | 4 +- asm/vaatiReborn.s | 6 +- asm/vaatiRebornEnemy.s | 46 ++++---- asm/vaatiTransfigured.s | 22 ++-- asm/vaatiWrath.s | 28 ++--- asm/zeldaFollower.s | 6 +- include/functions.h | 2 +- linker.ld | 2 + src/bell.c | 4 +- src/bladeBrothers.c | 155 +++++++++++++++++++++++++ src/clothesRack.c | 8 ++ src/cow.c | 18 +-- src/epona.c | 12 +- src/mailbox.c | 10 +- src/milkCart.c | 4 +- src/stamp.c | 6 +- src/textbox.c | 2 +- src/zelda.c | 16 +-- 129 files changed, 677 insertions(+), 769 deletions(-) create mode 100644 src/bladeBrothers.c create mode 100644 src/clothesRack.c diff --git a/asm/anju.s b/asm/anju.s index 2036e84b..5a97c2f6 100644 --- a/asm/anju.s +++ b/asm/anju.s @@ -112,7 +112,7 @@ sub_0806C36C: @ 0x0806C36C strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806C398 _0806C392: adds r0, r2, #0 diff --git a/asm/ballChainSoldier.s b/asm/ballChainSoldier.s index 6b89fd8e..00a23225 100644 --- a/asm/ballChainSoldier.s +++ b/asm/ballChainSoldier.s @@ -107,7 +107,7 @@ sub_0803E580: @ 0x0803E580 ldrb r1, [r5, #0x14] lsls r1, r1, #2 adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r5, #0 bl sub_0803E86C _0803E5E4: @@ -272,7 +272,7 @@ sub_0803E6E0: @ 0x0803E6E0 ldrb r1, [r4, #0x14] adds r1, #0x20 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803E718: pop {r4, pc} .align 2, 0 @@ -620,7 +620,7 @@ _0803E988: adds r4, r0, r1 adds r0, r3, #0 adds r1, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803E9A2: pop {r4, r5, r6, pc} @@ -647,7 +647,7 @@ sub_0803E9A4: @ 0x0803E9A4 ands r1, r0 adds r1, r4, r1 adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803E9D2: pop {r4, pc} diff --git a/asm/beanstalk.s b/asm/beanstalk.s index e052bd43..082dee50 100644 --- a/asm/beanstalk.s +++ b/asm/beanstalk.s @@ -104,7 +104,7 @@ _08089DAC: adds r1, r1, r0 ldrb r1, [r1] adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08089DC6: ldr r1, _08089E08 @ =gUnk_08120E14 ldrb r0, [r5, #0xa] @@ -324,7 +324,7 @@ sub_08089F38: @ 0x08089F38 _08089F5A: adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0x10 strb r0, [r4, #0xe] ldrb r0, [r4, #0xd] diff --git a/asm/beedle.s b/asm/beedle.s index ab37b2fe..187acbc5 100644 --- a/asm/beedle.s +++ b/asm/beedle.s @@ -100,7 +100,7 @@ _08063342: ldrb r0, [r4, #0xe] ldr r1, _08063368 @ =0x00000A01 adds r0, r0, r1 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldrb r0, [r4, #0xc] adds r0, #1 strb r0, [r4, #0xc] diff --git a/asm/bell.s b/asm/bell.s index f51caaba..9da86a8b 100644 --- a/asm/bell.s +++ b/asm/bell.s @@ -47,7 +47,7 @@ sub_08097D90: @ 0x08097D90 bl UpdateSpriteOrderAndFlip adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 diff --git a/asm/bigVortex.s b/asm/bigVortex.s index 0de7797e..4b317160 100644 --- a/asm/bigVortex.s +++ b/asm/bigVortex.s @@ -67,7 +67,7 @@ _08098D5A: bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, r5, pc} thumb_func_start sub_08098D6C @@ -194,7 +194,7 @@ sub_08098E3C: @ 0x08098E3C strb r0, [r4, #0x18] ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08098E5E: ldrb r1, [r4, #0xa] movs r0, #2 diff --git a/asm/bird.s b/asm/bird.s index bc9edfd2..ed6ec659 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -77,7 +77,7 @@ sub_0809CF54: @ 0x0809CF54 bl UpdateSpriteOrderAndFlip adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0x95 movs r1, #1 movs r2, #0 @@ -165,7 +165,7 @@ sub_0809D048: @ 0x0809D048 bl UpdateSpriteOrderAndFlip adds r0, r4, #0 movs r1, #0x17 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 @@ -269,7 +269,7 @@ sub_0809D10C: @ 0x0809D10C bl UpdateSpriteOrderAndFlip adds r0, r4, #0 movs r1, #0x17 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 @@ -450,7 +450,7 @@ _0809D234: bl sub_0805E3A0 adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0809D2AC @ =0x00000123 bl PlaySFX movs r0, #0x68 @@ -765,7 +765,7 @@ sub_0809D498: @ 0x0809D498 strb r0, [r6] adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate bl sub_08078B48 adds r7, r4, #0 b _0809D62E @@ -975,7 +975,7 @@ _0809D6A2: bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0xe0 - bl LoadAnimation + bl InitAnimationForceUpdate _0809D6EC: adds r0, r4, #0 bl sub_080042B8 diff --git a/asm/bladeBrothers.s b/asm/bladeBrothers.s index 7e1ce944..7b03c332 100644 --- a/asm/bladeBrothers.s +++ b/asm/bladeBrothers.s @@ -6,249 +6,6 @@ .text - - thumb_func_start sub_080689C0 -sub_080689C0: @ 0x080689C0 - push {r4, lr} - adds r4, r0, #0 - ldrb r1, [r4, #0x10] - movs r0, #2 - ands r0, r1 - cmp r0, #0 - beq _080689E4 - ldr r0, _080689E0 @ =gUnk_081115D0 - ldrb r1, [r4, #0xc] - lsls r1, r1, #2 - adds r1, r1, r0 - ldr r1, [r1] - adds r0, r4, #0 - bl _call_via_r1 - b _080689FA - .align 2, 0 -_080689E0: .4byte gUnk_081115D0 -_080689E4: - ldr r0, _08068A18 @ =gUnk_081115C0 - ldrb r1, [r4, #0xc] - lsls r1, r1, #2 - adds r1, r1, r0 - ldr r1, [r1] - adds r0, r4, #0 - bl _call_via_r1 - adds r0, r4, #0 - bl sub_0806ED78 -_080689FA: - adds r2, r4, #0 - adds r2, #0x5a - ldrb r1, [r2] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - beq _08068A16 - movs r0, #0xfe - ands r0, r1 - strb r0, [r2] - adds r0, r4, #0 - movs r1, #0 - bl sub_08068BEC -_08068A16: - pop {r4, pc} - .align 2, 0 -_08068A18: .4byte gUnk_081115C0 - - thumb_func_start sub_08068A1C -sub_08068A1C: @ 0x08068A1C - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0xa] - strb r0, [r4, #0xb] - ldr r0, _08068A34 @ =gUnk_030010A0 - adds r0, #0x2c - ldrb r0, [r0] - cmp r0, #0 - beq _08068A38 - movs r1, #6 - movs r0, #3 - b _08068A42 - .align 2, 0 -_08068A34: .4byte gUnk_030010A0 -_08068A38: - adds r0, r4, #0 - bl sub_08078778 - movs r1, #2 - movs r0, #1 -_08068A42: - strb r0, [r4, #0xc] - adds r0, r4, #0 - bl InitializeAnimation - pop {r4, pc} - - thumb_func_start sub_08068A4C -sub_08068A4C: @ 0x08068A4C - push {r4, lr} - adds r4, r0, #0 - movs r1, #0x28 - movs r2, #0x28 - bl sub_0806ED9C - adds r1, r0, #0 - cmp r1, #0 - bge _08068A62 - movs r1, #2 - b _08068A78 -_08068A62: - ldrb r0, [r4, #0xf] - cmp r0, #0 - bne _08068A6E - movs r0, #0x10 - strb r0, [r4, #0xf] - b _08068A78 -_08068A6E: - subs r0, #1 - strb r0, [r4, #0xf] - adds r0, r4, #0 - adds r0, #0x58 - ldrb r1, [r0] -_08068A78: - adds r0, r4, #0 - bl sub_0806F078 - cmp r0, #0 - bne _08068A88 - adds r0, r4, #0 - bl sub_08004274 -_08068A88: - adds r1, r4, #0 - adds r1, #0x39 - movs r0, #0 - ldrsb r0, [r1, r0] - cmp r0, #0 - beq _08068AA2 - movs r0, #0 - strb r0, [r1] - movs r0, #2 - strb r0, [r4, #0xc] - movs r0, #0 - bl TextboxTryNoOverlap -_08068AA2: - pop {r4, pc} - - thumb_func_start sub_08068AA4 -sub_08068AA4: @ 0x08068AA4 - push {lr} - adds r2, r0, #0 - movs r0, #1 - strb r0, [r2, #0xc] - ldrb r0, [r2, #0xa] - cmp r0, #0 - beq _08068AD4 - ldrb r0, [r2, #0xb] - adds r1, r0, #1 - movs r0, #7 - ands r1, r0 - strb r1, [r2, #0xb] - cmp r1, #0 - bne _08068AC4 - adds r0, r1, #1 - strb r0, [r2, #0xb] -_08068AC4: - ldr r0, _08068AD8 @ =gUnk_081115DC - ldrb r1, [r2, #0xb] - lsls r1, r1, #1 - adds r1, r1, r0 - ldrh r1, [r1] - adds r0, r2, #0 - bl sub_0801D2B4 -_08068AD4: - pop {pc} - .align 2, 0 -_08068AD8: .4byte gUnk_081115DC - - thumb_func_start sub_08068ADC -sub_08068ADC: @ 0x08068ADC - push {r4, lr} - adds r4, r0, #0 - ldr r0, _08068AF8 @ =gUnk_030010A0 - adds r0, #0x2c - ldrb r0, [r0] - cmp r0, #2 - bne _08068AF0 - adds r0, r4, #0 - bl sub_08004274 -_08068AF0: - adds r0, r4, #0 - bl sub_0806FD3C - pop {r4, pc} - .align 2, 0 -_08068AF8: .4byte gUnk_030010A0 - - thumb_func_start sub_08068AFC -sub_08068AFC: @ 0x08068AFC - push {r4, lr} - adds r4, r0, #0 - movs r2, #1 - movs r0, #1 - strb r0, [r4, #0xc] - ldrb r1, [r4, #0x18] - subs r0, #5 - ands r0, r1 - orrs r0, r2 - strb r0, [r4, #0x18] - adds r0, r4, #0 - bl sub_0801E99C - adds r1, r4, #0 - adds r1, #0x68 - strb r0, [r1] - ldrb r1, [r1] - adds r0, r4, #0 - bl sub_08078784 - adds r0, r4, #0 - bl sub_0807DD50 - pop {r4, pc} - - thumb_func_start sub_08068B2C -sub_08068B2C: @ 0x08068B2C - push {r4, lr} - adds r4, r0, #0 - adds r2, r4, #0 - adds r2, #0x39 - movs r1, #0 - ldrsb r1, [r2, r1] - cmp r1, #2 - bne _08068B64 - movs r0, #0 - strb r1, [r4, #0xc] - strb r0, [r2] - ldr r1, _08068B60 @ =gLinkEntity - adds r0, r4, #0 - bl sub_080045C4 - bl sub_0806F5A4 - adds r1, r0, #0 - adds r0, r4, #0 - bl LoadAnimation - adds r0, r4, #0 - bl sub_0806F118 - b _08068B6C - .align 2, 0 -_08068B60: .4byte gLinkEntity -_08068B64: - adds r0, r4, #0 - movs r1, #0 - bl sub_0807DD94 -_08068B6C: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_08068B70 -sub_08068B70: @ 0x08068B70 - push {r4, lr} - adds r4, r0, #0 - bl UpdateFuseInteraction - cmp r0, #0 - beq _08068B80 - movs r0, #1 - strb r0, [r4, #0xc] -_08068B80: - pop {r4, pc} - .align 2, 0 - thumb_func_start sub_08068B84 sub_08068B84: @ 0x08068B84 push {r4, lr} @@ -260,7 +17,7 @@ sub_08068B84: @ 0x08068B84 cmp r0, #0 beq _08068B9A movs r1, #0 - bl sub_08054414 + bl ForceEquipItem _08068B9A: ldr r0, _08068BB0 @ =gUnk_081115EC ldrb r1, [r4, #0xe] @@ -297,11 +54,11 @@ sub_08068BD0: @ 0x08068BD0 adds r0, #0x69 ldrb r0, [r0] movs r1, #0 - bl sub_08054414 + bl ForceEquipItem adds r4, #0x6a ldrb r0, [r4] movs r1, #1 - bl sub_08054414 + bl ForceEquipItem pop {r4, pc} .align 2, 0 @@ -795,7 +552,7 @@ sub_08068F4C: @ 0x08068F4C strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate b _08068F78 _08068F72: adds r0, r4, #0 diff --git a/asm/book.s b/asm/book.s index a220ac9d..01536b69 100644 --- a/asm/book.s +++ b/asm/book.s @@ -75,7 +75,7 @@ _0809B424: ldrb r1, [r4, #0xa] adds r1, #0x39 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r1, [r4, #0xb] cmp r1, #1 beq _0809B46C diff --git a/asm/brocco.s b/asm/brocco.s index 43ac8ca7..8bbcfd2d 100644 --- a/asm/brocco.s +++ b/asm/brocco.s @@ -55,7 +55,7 @@ sub_0806355C: @ 0x0806355C strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08078778 pop {r4, pc} @@ -81,7 +81,7 @@ sub_08063584: @ 0x08063584 strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080635B2: ldrb r0, [r4, #0xf] cmp r0, #0 @@ -113,11 +113,11 @@ _080635D0: adds r1, r0, #0 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r0, [r4, #0xe] ldr r1, _08063604 @ =0x00000A01 adds r0, r0, r1 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _080635FC: adds r0, r4, #0 bl sub_0806ED78 @@ -140,7 +140,7 @@ sub_08063608: @ 0x08063608 strb r1, [r2, #0xf] adds r0, r2, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate _08063626: pop {pc} .align 2, 0 @@ -199,7 +199,7 @@ _08063662: adds r1, r0, #0 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _080636D4 @@ -225,7 +225,7 @@ _080636BA: adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080636D4: pop {r4, pc} .align 2, 0 @@ -278,7 +278,7 @@ sub_0806370C: @ 0x0806370C strh r0, [r2, #0x32] adds r0, r2, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806373E _08063738: adds r0, r2, #0 diff --git a/asm/businessScrub.s b/asm/businessScrub.s index 2bb9fe58..211b0363 100644 --- a/asm/businessScrub.s +++ b/asm/businessScrub.s @@ -535,7 +535,7 @@ sub_08028CE8: @ 0x08028CE8 cmp r0, #0 beq _08028D3C ldr r0, _08028D38 @ =0x00002904 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow movs r0, #0 bl sub_08078A90 b _08028DCC @@ -609,7 +609,7 @@ _08028DB6: b _08028DE2 _08028DC0: ldr r0, _08028DE4 @ =0x00002903 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow movs r0, #0 bl sub_08078A90 _08028DCC: @@ -648,7 +648,7 @@ sub_08028DE8: @ 0x08028DE8 _08028E08: .4byte gLinkEntity _08028E0C: ldr r0, _08028E3C @ =0x00002902 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow movs r1, #0 movs r0, #4 strb r0, [r4, #0xc] @@ -841,7 +841,7 @@ _08028F7A: bl sub_08078A90 _08028F84: adds r0, r4, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _08028F94 @ =gTextBox ldrh r0, [r6, #2] str r0, [r1, #0x10] diff --git a/asm/cat.s b/asm/cat.s index b7da8b30..06c8e6b4 100644 --- a/asm/cat.s +++ b/asm/cat.s @@ -497,7 +497,7 @@ sub_08067B80: @ 0x08067B80 strb r0, [r1] adds r0, r5, #0 adds r1, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r5, #0 bl sub_08067DDC ldr r0, _08067BC4 @ =gLinkEntity @@ -567,7 +567,7 @@ sub_08067C18: @ 0x08067C18 push {lr} movs r1, #6 strb r1, [r0, #0xc] - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} thumb_func_start sub_08067C24 @@ -584,7 +584,7 @@ sub_08067C24: @ 0x08067C24 bl sub_08067DDC adds r0, r4, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} thumb_func_start sub_08067C44 @@ -641,7 +641,7 @@ _08067CA6: bne _08067CDA adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _08067CEC .align 2, 0 _08067CB4: .4byte gLinkEntity @@ -669,12 +669,12 @@ _08067CD6: _08067CDA: adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _08067CEC _08067CE4: adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _08067CEC: movs r0, #0 ldrsb r0, [r5, r0] @@ -806,7 +806,7 @@ sub_08067DCC: @ 0x08067DCC adds r2, r0, #0 adds r2, #0x71 strb r1, [r2] - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 @@ -847,7 +847,7 @@ sub_08067DFC: @ 0x08067DFC strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #5 - bl LoadAnimation + bl InitAnimationForceUpdate b _08067E28 _08067E22: adds r0, r2, #0 diff --git a/asm/chuchuBoss.s b/asm/chuchuBoss.s index 0b6b94b8..72ba7a49 100644 --- a/asm/chuchuBoss.s +++ b/asm/chuchuBoss.s @@ -58,7 +58,7 @@ sub_08025CD4: @ 0x08025CD4 strb r3, [r0, #3] ldr r0, [r4, #0x54] movs r1, #9 - bl LoadAnimation + bl InitAnimationForceUpdate b _08025D9C _08025CFE: adds r5, r4, #0 @@ -228,7 +228,7 @@ _08025DF2: bne _08025E4C adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08025E58 .align 2, 0 _08025E48: .4byte gUnk_080CC1B8 @@ -1095,7 +1095,7 @@ sub_080264AC: @ 0x080264AC beq _080264D2 ldr r0, [r4, #0x54] movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08027D20 _080264D2: @@ -1178,7 +1178,7 @@ sub_0802653C: @ 0x0802653C bl sub_08027548 ldr r0, [r4, #0x54] movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0802657C @ =gUnk_02034490 strb r5, [r0] _08026572: @@ -1488,7 +1488,7 @@ sub_08026774: @ 0x08026774 strb r0, [r1, #3] ldr r0, [r4, #0x54] movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _080267C6: adds r0, r4, #0 bl sub_080277F8 @@ -1519,7 +1519,7 @@ sub_080267D0: @ 0x080267D0 bl sub_08027B98 ldr r0, [r4, #0x54] movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _08026802: add sp, #4 pop {r4, pc} @@ -1611,7 +1611,7 @@ _08026888: bl sub_08027870 ldr r0, [r4, #0x54] movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _080268C4 @ =0x000001A1 bl PlaySFX _080268BE: @@ -1654,7 +1654,7 @@ sub_080268EC: @ 0x080268EC beq _08026912 ldr r0, [r4, #0x54] movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08027D20 _08026912: @@ -1680,7 +1680,7 @@ sub_08026914: @ 0x08026914 bl sub_08027548 ldr r0, [r4, #0x54] movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08026942: adds r0, r4, #0 bl sub_080277F8 @@ -1841,7 +1841,7 @@ _08026A3E: beq _08026A7E adds r0, r5, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _08026A7E _08026A6C: adds r0, r5, #0 @@ -1851,7 +1851,7 @@ _08026A6C: beq _08026A7E adds r0, r5, #0 movs r1, #5 - bl LoadAnimation + bl InitAnimationForceUpdate _08026A7E: lsls r0, r4, #0x18 cmp r0, #0 @@ -2141,7 +2141,7 @@ _08026C9C: beq _08026CCC adds r0, r4, #0 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate b _08026CCC _08026CBA: adds r0, r4, #0 @@ -2151,7 +2151,7 @@ _08026CBA: beq _08026CCC adds r0, r4, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate _08026CCC: adds r0, r5, #0 adds r0, #0x7c @@ -2417,7 +2417,7 @@ _08026EA0: strb r6, [r0, #3] ldr r0, [r4, #0x54] movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate str r6, [sp] adds r0, r4, #0 movs r1, #0x80 @@ -2605,7 +2605,7 @@ _08026FFE: beq _0802705C adds r0, r1, #0 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate b _0802705C .align 2, 0 _08027044: .4byte 0x00000155 @@ -2618,7 +2618,7 @@ _08027048: beq _0802705C adds r0, r1, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate _0802705C: adds r0, r4, #0 bl sub_08027870 @@ -3196,7 +3196,7 @@ _080274AE: beq _08027532 adds r0, r6, #0 movs r1, #0xc - bl LoadAnimation + bl InitAnimationForceUpdate b _08027532 _080274E0: adds r0, r6, #0 @@ -3206,7 +3206,7 @@ _080274E0: beq _08027532 adds r0, r6, #0 movs r1, #0xb - bl LoadAnimation + bl InitAnimationForceUpdate b _08027532 _080274F4: adds r0, r6, #0 @@ -3216,7 +3216,7 @@ _080274F4: beq _08027532 adds r0, r6, #0 movs r1, #0xa - bl LoadAnimation + bl InitAnimationForceUpdate b _08027532 _08027508: ldr r0, [r6, #0x54] diff --git a/asm/clothesRack.s b/asm/clothesRack.s index 900f1bbe..08f19c24 100644 --- a/asm/clothesRack.s +++ b/asm/clothesRack.s @@ -6,20 +6,6 @@ .text - - thumb_func_start sub_0806DD78 -sub_0806DD78: @ 0x0806DD78 - push {lr} - ldr r2, _0806DD8C @ =gUnk_0811423C - ldrb r1, [r0, #0xc] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_0806DD8C: .4byte gUnk_0811423C - thumb_func_start sub_0806DD90 sub_0806DD90: @ 0x0806DD90 push {r4, r5, r6, r7, lr} diff --git a/asm/code_08003FC4.s b/asm/code_08003FC4.s index 52be2f2f..a5f8ee79 100644 --- a/asm/code_08003FC4.s +++ b/asm/code_08003FC4.s @@ -463,8 +463,8 @@ _0800429C: strb r2, [r0, r1] bx r3 - thumb_func_start LoadAnimation -LoadAnimation: @ 0x080042AC + thumb_func_start InitAnimationForceUpdate +InitAnimationForceUpdate: @ 0x080042AC push {lr} bl InitializeAnimation movs r2, #0xff diff --git a/asm/code_080041E8.s b/asm/code_080041E8.s index 9bdf3bfa..a4aa0baa 100644 --- a/asm/code_080041E8.s +++ b/asm/code_080041E8.s @@ -129,8 +129,8 @@ _0800429C: strb r2, [r0, r1] bx r3 - thumb_func_start LoadAnimation -LoadAnimation: @ 0x080042AC + thumb_func_start InitAnimationForceUpdate +InitAnimationForceUpdate: @ 0x080042AC push {lr} bl InitializeAnimation movs r2, #0xff diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index c2b0ca99..883b1621 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -1272,7 +1272,7 @@ sub_0801E0E0: @ 0x0801E0E0 _0801E0F8: .4byte gUnk_02022740 _0801E0FC: adds r0, r2, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0801E102: pop {pc} diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 91c23ed8..34e11b06 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -2467,7 +2467,7 @@ sub_08053A1C: @ 0x08053A1C movs r0, #8 strh r0, [r1, #8] ldr r0, _08053A54 @ =0x00000F07 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _08053A58 @ =gTextBox movs r0, #1 strb r0, [r1, #6] @@ -3519,7 +3519,7 @@ sub_08054288: @ 0x08054288 lsls r0, r0, #3 adds r0, r0, r1 ldrh r0, [r0, #6] - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow pop {pc} .align 2, 0 _08054298: .4byte gUnk_080FD5B4 diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s index 98164dbc..592838bf 100644 --- a/asm/code_0805436C.s +++ b/asm/code_0805436C.s @@ -98,13 +98,13 @@ _08054406: beq _08054410 _0805440A: adds r0, r5, #0 - bl sub_08054414 + bl ForceEquipItem _08054410: pop {r4, r5, pc} .align 2, 0 - thumb_func_start sub_08054414 -sub_08054414: @ 0x08054414 + thumb_func_start ForceEquipItem +ForceEquipItem: @ 0x08054414 push {r4, r5, r6, r7, lr} adds r4, r0, #0 subs r0, r4, #1 @@ -3450,7 +3450,7 @@ sub_08055DC0: @ 0x08055DC0 cmp r0, #0 bne _08055DDC ldr r0, _08055DE4 @ =0x00000A01 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _08055DE8 @ =gUnk_02000080 ldrb r0, [r1, #6] adds r0, #1 diff --git a/asm/code_08056418.s b/asm/code_08056418.s index d7a5b34b..d0499e6d 100644 --- a/asm/code_08056418.s +++ b/asm/code_08056418.s @@ -15981,7 +15981,7 @@ _0805DF78: movs r0, #0x1e strb r0, [r1, #0xe] ldr r0, _0805DF94 @ =0x0000164F - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0805DF92: pop {pc} .align 2, 0 diff --git a/asm/code_0805E744.s b/asm/code_0805E744.s index 8ce676ee..ea3ff74d 100644 --- a/asm/code_0805E744.s +++ b/asm/code_0805E744.s @@ -2695,7 +2695,7 @@ _0805FB28: lsls r0, r0, #8 ldrb r1, [r1, #0x15] adds r0, r0, r1 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow b _0805FBA4 .align 2, 0 _0805FB40: .4byte gUnk_02000080 diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index bf2a09af..9226f2fb 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -455,7 +455,7 @@ sub_0806F078: @ 0x0806F078 cmp r0, #0 beq _0806F096 adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806F09C _0806F096: adds r0, r2, #0 @@ -821,7 +821,7 @@ _0806F34E: bl TextboxNoOverlap b _0806F35E _0806F35A: - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0806F35E: pop {r3} mov r8, r3 diff --git a/asm/code_08070698.s b/asm/code_08070698.s index 2ee6c53b..f32dbe08 100644 --- a/asm/code_08070698.s +++ b/asm/code_08070698.s @@ -67,7 +67,7 @@ sub_08070698: @ 0x08070698 bl sub_080AE008 adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 adds r0, #0x38 ldrb r0, [r0] @@ -2726,7 +2726,7 @@ sub_08071B60: @ 0x08071B60 lsrs r1, r1, #1 adds r1, #0x3c adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08071BA8: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index 271cd020..f507a8d7 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -5273,7 +5273,7 @@ sub_08075A0C: @ 0x08075A0C _08075A3E: movs r0, #0xf adds r1, r6, #0 - bl sub_08054414 + bl ForceEquipItem ldr r0, _08075A64 @ =gLinkState ldr r1, [r0, #0x30] ldr r2, _08075A68 @ =0xFF7FFFFF @@ -5281,7 +5281,7 @@ _08075A3E: str r1, [r0, #0x30] movs r0, #0xf adds r1, r6, #0 - bl sub_08054414 + bl ForceEquipItem adds r0, r4, #0 adds r1, r5, #0 bl sub_08077E78 @@ -5305,7 +5305,7 @@ _08075A6C: movs r0, #0x10 strb r0, [r4, #1] adds r1, r6, #0 - bl sub_08054414 + bl ForceEquipItem ldrb r1, [r5, #0x14] movs r0, #6 ands r0, r1 @@ -5435,7 +5435,7 @@ _08075B86: bne _08075BB8 movs r0, #0xf adds r1, r4, #0 - bl sub_08054414 + bl ForceEquipItem ldr r0, [r5, #0x30] ldr r1, _08075BB4 @ =0xFF7FFFFF ands r0, r1 diff --git a/asm/code_08076C80.s b/asm/code_08076C80.s index d60e633c..1eab3e97 100644 --- a/asm/code_08076C80.s +++ b/asm/code_08076C80.s @@ -1892,7 +1892,7 @@ sub_08077AEC: @ 0x08077AEC cmp r1, #2 beq _08077B12 movs r0, #0xf - bl sub_08054414 + bl ForceEquipItem _08077B12: pop {pc} .align 2, 0 diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index 80f256b9..c2be8ef6 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -353,7 +353,7 @@ _08077E0A: strh r1, [r0, #0x12] lsls r1, r2, #0x18 lsrs r1, r1, #0x18 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08077E54 pop {r4, pc} @@ -2771,7 +2771,7 @@ _08079042: ands r2, r0 adds r0, r4, #0 adds r1, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08079062: pop {r4, r5, r6, pc} diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index 267cb22a..2dd5e599 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -2587,7 +2587,7 @@ _0807DEB0: beq _0807DEC2 adds r0, r4, #0 adds r1, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0807DEC2: adds r0, r4, #0 adds r0, #0x82 @@ -4090,7 +4090,7 @@ sub_0807E930: @ 0x0807E930 adds r1, #0x80 strh r2, [r1] ldrh r1, [r3, #2] - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} thumb_func_start sub_0807E944 @@ -4149,7 +4149,7 @@ _0807E990: strb r0, [r2, #0x18] ldr r0, [r2] ldrh r0, [r0, #2] - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow b _0807E9C2 _0807E9AE: ldr r0, _0807E9CC @ =gTextBox @@ -4304,7 +4304,7 @@ sub_0807EAB4: @ 0x0807EAB4 push {lr} ldr r0, [r1] ldrh r0, [r0, #2] - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow pop {pc} thumb_func_start sub_0807EAC0 @@ -4323,7 +4323,7 @@ sub_0807EAD0: @ 0x0807EAD0 adds r4, r1, #0 ldr r0, [r4] ldrh r0, [r0, #2] - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _0807EAEC @ =gTextBox movs r0, #1 strb r0, [r1, #6] @@ -4346,13 +4346,13 @@ sub_0807EAF0: @ 0x0807EAF0 ldr r1, [r1] adds r1, r1, r0 ldrh r0, [r1, #2] - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow b _0807EB16 .align 2, 0 _0807EB0C: .4byte gUnk_02033280 _0807EB10: movs r0, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0807EB16: pop {pc} @@ -5439,7 +5439,7 @@ _0807F280: _0807F28C: adds r0, r4, #0 adds r1, r5, #0 - bl sub_08054414 + bl ForceEquipItem pop {r4, r5, pc} .align 2, 0 _0807F298: .4byte 0x0000FFFF @@ -5634,7 +5634,7 @@ sub_0807F3D8: @ 0x0807F3D8 ldr r1, [r1, #4] adds r1, r1, r0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 adds r0, #0x58 ldrb r0, [r0] diff --git a/asm/code_080A3BD0.s b/asm/code_080A3BD0.s index 3b5cf987..a97a51ad 100644 --- a/asm/code_080A3BD0.s +++ b/asm/code_080A3BD0.s @@ -2975,7 +2975,7 @@ _080A52EC: orrs r1, r0 lsrs r1, r1, #0x1f ldrb r0, [r2] - bl sub_08054414 + bl ForceEquipItem _080A530A: movs r0, #0x6a bl PlaySFX diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index c6376422..7740bca7 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -3025,7 +3025,7 @@ _080A6D38: strb r0, [r2] bl sub_080A7114 ldr r0, _080A6D48 @ =0x00000704 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow b _080A6D54 .align 2, 0 _080A6D48: .4byte 0x00000704 @@ -5072,7 +5072,7 @@ sub_080A7D44: @ 0x080A7D44 bl sub_08078AA8 b _080A7D56 _080A7D52: - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _080A7D56: pop {pc} @@ -5327,7 +5327,7 @@ sub_080A7F00: @ 0x080A7F00 ldrb r1, [r0, #0x14] adds r1, #0x18 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080A7F26: ldr r0, [r4, #0x50] cmp r0, #0 @@ -8441,7 +8441,7 @@ _080A9632: strh r0, [r1] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _080A9756 _080A9660: ldrb r0, [r4, #0x19] @@ -9414,7 +9414,7 @@ sub_080A9D6C: @ 0x080A9D6C ldrb r1, [r1, #0x14] strb r1, [r0, #0x14] ldrb r1, [r0, #0x14] - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} thumb_func_start sub_080A9D80 @@ -10267,7 +10267,7 @@ sub_080AA3E0: @ 0x080AA3E0 _080AA3F4: adds r0, r3, #0 adds r1, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 @@ -10655,7 +10655,7 @@ sub_080AA6C0: @ 0x080AA6C0 ldrb r1, [r4, #0xa] adds r1, #0x10 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0x2a movs r1, #3 movs r2, #0 @@ -10729,7 +10729,7 @@ _080AA774: ldrb r1, [r4, #0xa] adds r1, #0x10 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _080AA788 @ =0x00000101 bl sub_08004488 _080AA784: @@ -10776,7 +10776,7 @@ _080AA7CC: adds r1, r2, #0 adds r1, #8 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080AA7DA: adds r0, r4, #0 bl sub_0806F520 @@ -10820,7 +10820,7 @@ _080AA828: ldrb r1, [r4, #0xa] adds r1, #0x10 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080AA832: pop {r4, r5, pc} @@ -10851,7 +10851,7 @@ _080AA848: strb r2, [r0] ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_080AAA68 pop {r4, pc} @@ -10945,7 +10945,7 @@ _080AA90A: ldrb r1, [r4, #0xa] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080AA920: ldrb r0, [r7, #0x14] lsrs r0, r0, #1 @@ -11025,7 +11025,7 @@ sub_080AA9AC: @ 0x080AA9AC strb r2, [r1] ldrb r1, [r0, #0xa] adds r1, #0xc - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} thumb_func_start sub_080AA9C4 diff --git a/asm/code_080AD90C.s b/asm/code_080AD90C.s index 226d3a96..08a8326d 100644 --- a/asm/code_080AD90C.s +++ b/asm/code_080AD90C.s @@ -211,7 +211,7 @@ sub_080ADA6C: @ 0x080ADA6C ldrb r1, [r4, #0x14] lsrs r1, r1, #1 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 _080ADAA4: .4byte gUnk_08132B28 @@ -271,7 +271,7 @@ _080ADAFC: adds r1, #4 _080ADB0C: adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _080ADC08 .align 2, 0 _080ADB14: .4byte gLinkEntity @@ -426,7 +426,7 @@ sub_080ADC14: @ 0x080ADC14 lsrs r1, r1, #1 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _080ADC5C .align 2, 0 _080ADC40: .4byte gLinkState diff --git a/asm/crenalBeanSprout.s b/asm/crenalBeanSprout.s index 8e580dbf..9c4b623f 100644 --- a/asm/crenalBeanSprout.s +++ b/asm/crenalBeanSprout.s @@ -962,7 +962,7 @@ sub_08096A78: @ 0x08096A78 lsrs r1, r1, #1 adds r1, #8 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08004168 ldrh r0, [r4, #0x32] diff --git a/asm/cucco.s b/asm/cucco.s index f7b0f206..b3b08003 100644 --- a/asm/cucco.s +++ b/asm/cucco.s @@ -60,7 +60,7 @@ sub_0806E4EC: @ 0x0806E4EC strb r0, [r5, #0xe] adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0806E50E: ldrb r0, [r5, #0xe] subs r0, #1 @@ -137,7 +137,7 @@ _0806E590: str r0, [r4, #0x20] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _0806E5AA: movs r1, #0xa0 lsls r1, r1, #6 @@ -198,7 +198,7 @@ _0806E612: ands r1, r5 adds r1, #2 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0806E622: adds r0, r4, #0 adds r0, #0x5a @@ -317,7 +317,7 @@ sub_0806E6E0: @ 0x0806E6E0 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806E70C _0806E706: adds r0, r2, #0 diff --git a/asm/dampe.s b/asm/dampe.s index a902f945..1b833ddf 100644 --- a/asm/dampe.s +++ b/asm/dampe.s @@ -55,7 +55,7 @@ _0806BDE6: adds r1, r0, #0 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _0806BE3A @@ -109,7 +109,7 @@ sub_0806BE54: @ 0x0806BE54 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806BE80 _0806BE7A: adds r0, r2, #0 diff --git a/asm/darkNut.s b/asm/darkNut.s index 2c7ea30b..280725c3 100644 --- a/asm/darkNut.s +++ b/asm/darkNut.s @@ -902,7 +902,7 @@ _0802122C: ldrb r1, [r0] adds r1, r1, r2 adds r0, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08021244: pop {r4, pc} .align 2, 0 diff --git a/asm/deathFx.s b/asm/deathFx.s index c83517ab..b88f9add 100644 --- a/asm/deathFx.s +++ b/asm/deathFx.s @@ -64,7 +64,7 @@ _08081674: bl sub_080AE008 adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _08081698 @ =0x00000129 bl PlaySFX b _0808170C diff --git a/asm/din.s b/asm/din.s index f7d496d2..59a73906 100644 --- a/asm/din.s +++ b/asm/din.s @@ -58,7 +58,7 @@ _080647C2: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08064824 .align 2, 0 _080647FC: .4byte gLinkEntity @@ -78,7 +78,7 @@ _0806480A: adds r0, #0x68 ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08064824: pop {r4, pc} .align 2, 0 @@ -129,7 +129,7 @@ sub_08064860: @ 0x08064860 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806488C _08064886: adds r0, r2, #0 diff --git a/asm/dog.s b/asm/dog.s index 9d3633b4..f1448b1b 100644 --- a/asm/dog.s +++ b/asm/dog.s @@ -89,7 +89,7 @@ _08069B72: bl sub_0805E3A0 adds r0, r5, #0 movs r1, #0xa - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r0, [r5, #0x10] ands r4, r0 cmp r4, #0 @@ -236,7 +236,7 @@ sub_08069CB8: @ 0x08069CB8 beq _08069CF6 ldrb r1, [r5] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08069CF6: pop {r4, r5, pc} .align 2, 0 @@ -281,7 +281,7 @@ _08069D3C: cmp r2, r1 beq _08069D4E adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08069D4E: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -459,7 +459,7 @@ _08069E88: cmp r2, r1 beq _08069EA0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08069EA0: movs r0, #0x36 bl GetInventoryValue @@ -469,7 +469,7 @@ _08069EA0: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x29 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_080788E0 movs r0, #0xd1 @@ -586,7 +586,7 @@ sub_08069F6C: @ 0x08069F6C cmp r1, r0 beq _08069F8C adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08069F8C: pop {r4, pc} .align 2, 0 diff --git a/asm/enemy4D.s b/asm/enemy4D.s index f20ea8ce..af5a7156 100644 --- a/asm/enemy4D.s +++ b/asm/enemy4D.s @@ -113,7 +113,7 @@ sub_0803EB44: @ 0x0803EB44 ldrb r1, [r4, #0x14] lsls r1, r1, #2 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0803EE8C _0803EBB2: @@ -316,7 +316,7 @@ sub_0803ED04: @ 0x0803ED04 ldrb r1, [r4, #0x14] adds r1, #0x20 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803ED3C: pop {r4, pc} .align 2, 0 diff --git a/asm/enemy64.s b/asm/enemy64.s index 2621c6ba..fab119ba 100644 --- a/asm/enemy64.s +++ b/asm/enemy64.s @@ -194,7 +194,7 @@ _0804916E: strh r1, [r0] adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080491E4: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/enemyE.s b/asm/enemyE.s index 28bf0991..7d0e2887 100644 --- a/asm/enemyE.s +++ b/asm/enemyE.s @@ -78,7 +78,7 @@ sub_08023000: @ 0x08023000 b _08023014 _0802300E: adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08023014: movs r2, #0x80 adds r0, r4, #0 diff --git a/asm/ezloCap.s b/asm/ezloCap.s index 7c941b7a..acfa13f0 100644 --- a/asm/ezloCap.s +++ b/asm/ezloCap.s @@ -533,12 +533,12 @@ sub_0806DC58: @ 0x0806DC58 ldrb r0, [r0] bl sub_0806DBF4 movs r1, #0 - bl sub_08054414 + bl ForceEquipItem adds r4, #0x69 ldrb r0, [r4] bl sub_0806DBF4 movs r1, #1 - bl sub_08054414 + bl ForceEquipItem pop {r4, pc} .align 2, 0 diff --git a/asm/farmers.s b/asm/farmers.s index d7409d82..dd871377 100644 --- a/asm/farmers.s +++ b/asm/farmers.s @@ -194,7 +194,7 @@ sub_0806BCFC: @ 0x0806BCFC bl sub_0806BC58 adds r0, r4, #0 movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806BD52 .align 2, 0 _0806BD48: .4byte gUnk_08113140 diff --git a/asm/farore.s b/asm/farore.s index 08e99e3d..21ec175d 100644 --- a/asm/farore.s +++ b/asm/farore.s @@ -58,7 +58,7 @@ _080649C2: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08064A24 .align 2, 0 _080649FC: .4byte gLinkEntity @@ -78,7 +78,7 @@ _08064A0A: adds r0, #0x68 ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08064A24: pop {r4, pc} .align 2, 0 @@ -129,7 +129,7 @@ sub_08064A60: @ 0x08064A60 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _08064A8C _08064A86: adds r0, r2, #0 diff --git a/asm/festari.s b/asm/festari.s index 842f4659..c4c4d06d 100644 --- a/asm/festari.s +++ b/asm/festari.s @@ -52,7 +52,7 @@ sub_0805FE48: @ 0x0805FE48 bl sub_0806F5A4 adds r1, r0, #0 adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r5, #0 bl sub_0806F118 b _0805FF14 @@ -101,7 +101,7 @@ _0805FEC6: beq _0805FED8 adds r0, r5, #0 adds r1, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0805FED8: adds r0, r5, #0 bl sub_080042B8 @@ -240,7 +240,7 @@ sub_0805FFA0: @ 0x0805FFA0 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate b _0805FFD4 _0805FFCE: adds r0, r4, #0 diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index be97aab2..8ba1973a 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -464,7 +464,7 @@ _08087F24: movs r0, #3 bl SetRoomFlag ldr r0, _08087F50 @ =0x0000431A - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _08087F54 @ =gTextBox movs r0, #1 strb r0, [r1, #6] @@ -1205,7 +1205,7 @@ _080884D0: ldr r1, _080884F8 @ =0x00004327 _080884D2: adds r0, r1, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _080884FC @ =gTextBox movs r0, #1 strb r0, [r1, #6] @@ -1249,7 +1249,7 @@ _08088524: .4byte 0x00004314 _08088528: ldr r0, _0808853C @ =0x00004311 _0808852A: - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r0, _08088540 @ =gTextBox movs r1, #1 strb r1, [r0, #6] @@ -1272,7 +1272,7 @@ sub_08088544: @ 0x08088544 subs r1, #7 _08088554: adds r0, r1, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r0, _08088570 @ =gTextBox movs r1, #1 strb r1, [r0, #6] @@ -1304,7 +1304,7 @@ _08088594: ldr r1, _080885A8 @ =0x0000430B _08088596: adds r0, r1, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r0, _080885AC @ =gTextBox movs r1, #1 strb r1, [r0, #6] @@ -1329,7 +1329,7 @@ sub_080885B0: @ 0x080885B0 movs r0, #5 bl ModRupees ldr r0, _080885E0 @ =0x00004326 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _080885E4 @ =gTextBox movs r0, #1 strb r0, [r1, #6] diff --git a/asm/forestMinish.s b/asm/forestMinish.s index 48da8b55..70f02076 100644 --- a/asm/forestMinish.s +++ b/asm/forestMinish.s @@ -182,7 +182,7 @@ _08060120: beq _08060132 adds r0, r4, #0 adds r1, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08060132: adds r0, r4, #0 adds r0, #0x82 diff --git a/asm/gentari.s b/asm/gentari.s index f9e89c16..9ce92fd2 100644 --- a/asm/gentari.s +++ b/asm/gentari.s @@ -62,7 +62,7 @@ _0805FD72: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _0805FDBC @@ -105,7 +105,7 @@ sub_0805FDC0: @ 0x0805FDC0 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0xa - bl LoadAnimation + bl InitAnimationForceUpdate b _0805FDF4 _0805FDEE: adds r0, r4, #0 diff --git a/asm/gentariCurtains.s b/asm/gentariCurtains.s index 6aad8295..6896823e 100644 --- a/asm/gentariCurtains.s +++ b/asm/gentariCurtains.s @@ -38,7 +38,7 @@ sub_08092050: @ 0x08092050 bl sub_0809223C adds r0, r6, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _08092148 _0809207A: ldrb r0, [r6, #0xd] @@ -124,7 +124,7 @@ _0809207A: bl SetTile adds r0, r6, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08092148 .align 2, 0 _08092130: .4byte gRoomControls @@ -191,7 +191,7 @@ sub_08092164: @ 0x08092164 bl sub_0809223C adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _080921B6: pop {r4, pc} diff --git a/asm/ghostBrothers.s b/asm/ghostBrothers.s index a78b9167..05b548ee 100644 --- a/asm/ghostBrothers.s +++ b/asm/ghostBrothers.s @@ -108,7 +108,7 @@ _08065C42: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _08065CCA @@ -232,7 +232,7 @@ sub_08065D18: @ 0x08065D18 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r1, _08065D70 @ =gScreen adds r2, r1, #0 adds r2, #0x66 @@ -279,7 +279,7 @@ _08065DA8: adds r0, #1 strb r0, [r1, #0xc] movs r0, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _08065DB4: pop {pc} .align 2, 0 @@ -318,7 +318,7 @@ _08065DE4: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate b _08065EB0 .align 2, 0 _08065E04: .4byte gTextBox @@ -340,7 +340,7 @@ _08065E08: strb r0, [r1, #1] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _08065EB0 .align 2, 0 _08065E30: .4byte gUnk_02018EB0 @@ -352,7 +352,7 @@ _08065E34: cmp r0, #0 bne _08065EB0 movs r0, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldrb r0, [r4, #0xd] adds r0, #1 strb r0, [r4, #0xd] @@ -478,7 +478,7 @@ sub_08065F20: @ 0x08065F20 beq _08065F5E movs r0, #0 strb r0, [r1] - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow adds r2, r4, #0 adds r2, #0x58 ldrb r0, [r2] @@ -495,7 +495,7 @@ sub_08065F20: @ 0x08065F20 _08065F56: ldrb r1, [r2] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08065F5E: pop {r4, pc} .align 2, 0 @@ -543,7 +543,7 @@ sub_08065F90: @ 0x08065F90 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _08065FBC _08065FB6: adds r0, r2, #0 diff --git a/asm/gibdo.s b/asm/gibdo.s index ebe08a1a..8051da47 100644 --- a/asm/gibdo.s +++ b/asm/gibdo.s @@ -97,7 +97,7 @@ _080374F2: strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08037810 cmp r0, #0 @@ -231,7 +231,7 @@ sub_080375F8: @ 0x080375F8 ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08037622: pop {r4, pc} @@ -433,7 +433,7 @@ sub_08037794: @ 0x08037794 movs r1, #0x26 strb r1, [r2] ldrb r1, [r0, #0x14] - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} thumb_func_start sub_080377B0 @@ -481,7 +481,7 @@ _080377FE: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, r5, pc} thumb_func_start sub_08037810 @@ -552,7 +552,7 @@ sub_08037810: @ 0x08037810 strh r0, [r3] ldrb r1, [r5, #0x14] adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 b _080378AE .align 2, 0 @@ -603,7 +603,7 @@ sub_080378B0: @ 0x080378B0 ldrb r1, [r4, #0x14] adds r1, #8 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 b _08037912 .align 2, 0 @@ -700,7 +700,7 @@ sub_0803797C: @ 0x0803797C strb r0, [r5, #0x14] adds r1, r0, #4 adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080379BA: pop {r4, r5, pc} @@ -726,7 +726,7 @@ sub_080379BC: @ 0x080379BC ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} thumb_func_start sub_080379EC @@ -783,7 +783,7 @@ sub_08037A14: @ 0x08037A14 ldrb r1, [r4, #0x14] adds r1, #0xc adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 @@ -843,7 +843,7 @@ _08037A84: ldrb r1, [r4, #0x14] adds r1, #0x10 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 diff --git a/asm/gina.s b/asm/gina.s index 9094d4d2..02144144 100644 --- a/asm/gina.s +++ b/asm/gina.s @@ -59,7 +59,7 @@ _0806C182: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _0806C1D2 @@ -100,7 +100,7 @@ sub_0806C1D4: @ 0x0806C1D4 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806C200 _0806C1FA: adds r0, r2, #0 diff --git a/asm/gleerok.s b/asm/gleerok.s index 28224cbf..8244c15a 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -709,7 +709,7 @@ _0802D58C: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0802D63C _0802D5A8: ldr r0, _0802D5E8 @ =gUnk_080CD884 @@ -746,7 +746,7 @@ _0802D5E8: .4byte gUnk_080CD884 _0802D5EC: adds r0, r4, #0 movs r1, #0x2c - bl LoadAnimation + bl InitAnimationForceUpdate b _0802D63C _0802D5F6: adds r2, r4, #0 @@ -763,7 +763,7 @@ _0802D5F6: bl CopyPosition adds r0, r4, #0 movs r1, #0x2d - bl LoadAnimation + bl InitAnimationForceUpdate b _0802D63C _0802D61A: adds r2, r4, #0 @@ -2906,7 +2906,7 @@ _0802E64C: cmp r0, r1 beq _0802E6E8 adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0802E6E8 _0802E662: ldr r2, [sp, #8] @@ -2973,7 +2973,7 @@ _0802E6CA: beq _0802E6E2 adds r0, r1, #0 adds r1, r7, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0802E6E8 _0802E6E2: adds r0, r1, #0 diff --git a/asm/goron.s b/asm/goron.s index 2f2c4bc5..c6d27a67 100644 --- a/asm/goron.s +++ b/asm/goron.s @@ -50,7 +50,7 @@ sub_08069310: @ 0x08069310 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 @@ -83,7 +83,7 @@ _0806934E: beq _08069362 ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08069362: adds r0, r4, #0 adds r0, #0x39 @@ -98,12 +98,12 @@ _08069362: bl sub_0805E47C adds r0, r4, #0 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r0, [r4, #0xe] movs r1, #0x90 lsls r1, r1, #5 adds r0, r0, r1 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0806938E: pop {r4, pc} @@ -127,7 +127,7 @@ sub_08069390: @ 0x08069390 bl sub_0805E584 ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080693BC: pop {r4, pc} .align 2, 0 @@ -304,7 +304,7 @@ sub_080694EC: @ 0x080694EC _08069502: adds r0, r4, #0 adds r1, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 adds r0, #0x80 strh r5, [r0] @@ -329,7 +329,7 @@ sub_08069514: @ 0x08069514 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _08069540 _0806953A: adds r0, r2, #0 diff --git a/asm/goronMerchant.s b/asm/goronMerchant.s index 6fd30c25..1e5d2006 100644 --- a/asm/goronMerchant.s +++ b/asm/goronMerchant.s @@ -60,7 +60,7 @@ _0806959E: strb r0, [r1, #0xc] adds r0, r1, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 @@ -93,7 +93,7 @@ _080695D2: beq _080695E6 ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080695E6: pop {r4, pc} @@ -117,7 +117,7 @@ sub_080695E8: @ 0x080695E8 bl sub_0805E584 ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08069614: pop {r4, pc} .align 2, 0 diff --git a/asm/gregal.s b/asm/gregal.s index 5eda0d6e..f9bec8e4 100644 --- a/asm/gregal.s +++ b/asm/gregal.s @@ -210,7 +210,7 @@ _0806CC40: adds r1, r0, #0 adds r1, #8 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _0806CCB0 @@ -236,7 +236,7 @@ _0806CC96: adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0806CCB0: pop {r4, pc} .align 2, 0 @@ -376,7 +376,7 @@ sub_0806CD70: @ 0x0806CD70 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806CDA4 _0806CD9E: adds r0, r4, #0 diff --git a/asm/guardWithSpear.s b/asm/guardWithSpear.s index 858bedb4..532def17 100644 --- a/asm/guardWithSpear.s +++ b/asm/guardWithSpear.s @@ -131,7 +131,7 @@ sub_08063DC8: @ 0x08063DC8 ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08063E4C .align 2, 0 _08063DF4: .4byte gLinkEntity diff --git a/asm/gyorgMale.s b/asm/gyorgMale.s index e37a12f9..8eeda1e1 100644 --- a/asm/gyorgMale.s +++ b/asm/gyorgMale.s @@ -148,7 +148,7 @@ sub_08046898: @ 0x08046898 strh r4, [r0] adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0804690C: pop {r4, r5, pc} .align 2, 0 @@ -387,7 +387,7 @@ sub_08046A9C: @ 0x08046A9C bne _08046ABA adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08046ABA: ldr r1, _08046AE4 @ =gUnk_080D1B38 ldrb r0, [r4, #0xd] @@ -694,7 +694,7 @@ sub_08046CEC: @ 0x08046CEC bne _08046D0A adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _08046D0A: ldr r1, _08046D40 @ =gUnk_080D1B4C ldrb r0, [r4, #0xd] @@ -1020,7 +1020,7 @@ sub_08046F64: @ 0x08046F64 bne _08046F82 adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _08046F82: ldr r1, _08046FE4 @ =gUnk_080D1B94 ldrb r0, [r4, #0xd] @@ -1566,7 +1566,7 @@ sub_0804736C: @ 0x0804736C bne _0804738A adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0804738A: ldr r0, _080473B4 @ =gUnk_080D1BC0 ldrb r1, [r4, #0xd] @@ -2781,7 +2781,7 @@ _08047C74: bl PlaySFX adds r0, r5, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _08047D10 .align 2, 0 _08047CB8: .4byte gUnk_080D1C00 diff --git a/asm/itemOnGround.s b/asm/itemOnGround.s index 03f00bed..f0d8337d 100644 --- a/asm/itemOnGround.s +++ b/asm/itemOnGround.s @@ -426,7 +426,7 @@ sub_08080CB4: @ 0x08080CB4 beq _08080CF0 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r0, [r4, #0xa] cmp r0, #0x5c beq _08080CD4 diff --git a/asm/jarPortal.s b/asm/jarPortal.s index 993d343e..42422e65 100644 --- a/asm/jarPortal.s +++ b/asm/jarPortal.s @@ -59,7 +59,7 @@ sub_0808BE9C: @ 0x0808BE9C strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _0808BF10 _0808BEEE: adds r0, r4, #0 @@ -71,14 +71,14 @@ _0808BEF8: strb r5, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0808BF10 _0808BF04: movs r0, #3 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _0808BF10: pop {r4, r5, pc} .align 2, 0 @@ -145,7 +145,7 @@ _0808BF7A: strb r0, [r4, #0xd] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _0808BFD6 .align 2, 0 _0808BF90: .4byte 0x00017FFF @@ -176,7 +176,7 @@ _0808BFB0: strb r1, [r4, #0xf] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 movs r1, #1 bl sub_0808C148 @@ -319,7 +319,7 @@ _0808C0CE: strb r0, [r4, #0xd] adds r0, r4, #0 movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate b _0808C126 .align 2, 0 _0808C0E4: .4byte 0x00017FFF @@ -348,7 +348,7 @@ _0808C104: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 movs r1, #1 bl sub_0808C148 diff --git a/asm/keaton.s b/asm/keaton.s index e9895bcd..764e1595 100644 --- a/asm/keaton.s +++ b/asm/keaton.s @@ -61,7 +61,7 @@ sub_080323F4: @ 0x080323F4 strb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r5, r4, #0 adds r5, #0x43 b _08032446 @@ -108,7 +108,7 @@ sub_08032468: @ 0x08032468 strb r0, [r4, #0x14] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_080326FC adds r0, r4, #0 @@ -193,7 +193,7 @@ sub_080324FC: @ 0x080324FC ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08032524: adds r0, r4, #0 bl sub_080042B8 @@ -416,7 +416,7 @@ sub_0803269C: @ 0x0803269C ands r1, r0 adds r1, r1, r2 adds r0, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _080326F8 _080326D6: adds r0, r2, #4 @@ -434,7 +434,7 @@ _080326D6: ands r1, r0 adds r1, r1, r2 adds r0, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080326F8: pop {pc} .align 2, 0 @@ -505,7 +505,7 @@ sub_0803275C: @ 0x0803275C strh r0, [r4, #0x24] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r1, [r4, #0x15] adds r0, r4, #0 bl sub_0803269C @@ -520,7 +520,7 @@ sub_08032784: @ 0x08032784 strb r1, [r0, #0xc] ldrb r1, [r0, #0x14] adds r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} thumb_func_start sub_08032794 diff --git a/asm/kid.s b/asm/kid.s index 22487381..853805eb 100644 --- a/asm/kid.s +++ b/asm/kid.s @@ -55,7 +55,7 @@ sub_080620F4: @ 0x080620F4 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08078778 _0806212A: @@ -79,7 +79,7 @@ sub_08062130: @ 0x08062130 bl sub_0806EDC4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08062152: ldrb r0, [r4, #0xf] adds r1, r0, #1 @@ -104,7 +104,7 @@ _08062152: _0806217A: ldrb r1, [r4, #0xe] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806218A _08062184: adds r0, r4, #0 @@ -120,7 +120,7 @@ sub_08062194: @ 0x08062194 push {r4, lr} adds r4, r0, #0 movs r0, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow movs r1, #0 movs r0, #1 strb r0, [r4, #0xc] @@ -553,7 +553,7 @@ _080624C4: _080624D8: adds r0, r7, #0 mov r1, sb - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0x1e mov r1, r8 strb r0, [r1] diff --git a/asm/kingDaltus.s b/asm/kingDaltus.s index 42e5f635..e564de8d 100644 --- a/asm/kingDaltus.s +++ b/asm/kingDaltus.s @@ -30,7 +30,7 @@ sub_080665E4: @ 0x080665E4 bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 _0806661E: @@ -82,7 +82,7 @@ sub_08066654: @ 0x08066654 bl sub_08078784 adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 @@ -245,7 +245,7 @@ sub_08066780: @ 0x08066780 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _080667AC _080667A6: adds r0, r2, #0 diff --git a/asm/lakitu.s b/asm/lakitu.s index a32076f4..b8dd08f0 100644 --- a/asm/lakitu.s +++ b/asm/lakitu.s @@ -259,7 +259,7 @@ sub_0803C8E4: @ 0x0803C8E4 ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803C914: pop {r4, pc} .align 2, 0 @@ -284,7 +284,7 @@ sub_0803C918: @ 0x0803C918 ldrb r1, [r4, #0x14] adds r1, #0xc adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803C94E _0803C946: adds r0, r4, #0 @@ -313,7 +313,7 @@ sub_0803C950: @ 0x0803C950 strb r0, [r4, #0x18] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803C97A: pop {r4, pc} @@ -358,7 +358,7 @@ _0803C9C2: strb r1, [r2] ldr r0, [r4, #0x54] ldrb r1, [r4, #0x14] - bl LoadAnimation + bl InitAnimationForceUpdate _0803C9D2: pop {r4, pc} @@ -388,7 +388,7 @@ _0803C9F6: ldrb r1, [r2, #0x14] adds r1, #4 adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803CA08: pop {pc} .align 2, 0 @@ -410,7 +410,7 @@ sub_0803CA0C: @ 0x0803CA0C ldrb r1, [r4, #0x14] adds r1, #0x14 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r2, r4, #0 adds r2, #0x29 ldrb r1, [r2] @@ -486,10 +486,10 @@ _0803CAAA: strb r4, [r5, #0x14] adds r1, r4, r6 adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r5, #0x54] adds r1, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803CACA: pop {r4, r5, r6, pc} .align 2, 0 @@ -544,7 +544,7 @@ _0803CB1A: ldr r0, [r4, #0x54] ldrb r1, [r4, #0x14] adds r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 _0803CB32: pop {r4, r5, pc} @@ -568,7 +568,7 @@ sub_0803CB34: @ 0x0803CB34 ldrb r1, [r4, #0x14] adds r1, #8 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 _0803CB60: .4byte gLinkEntity @@ -653,7 +653,7 @@ _0803CBC6: ldrb r1, [r3, #0x14] adds r1, #0x10 adds r0, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 diff --git a/asm/lakituCloud.s b/asm/lakituCloud.s index bb413fad..122b89f2 100644 --- a/asm/lakituCloud.s +++ b/asm/lakituCloud.s @@ -129,7 +129,7 @@ sub_0803CD6C: @ 0x0803CD6C strh r0, [r1] adds r0, r4, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0803CE14 pop {r4, pc} @@ -213,7 +213,7 @@ sub_0803CE14: @ 0x0803CE14 lsrs r1, r1, #3 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803CE38: pop {r4, pc} .align 2, 0 diff --git a/asm/lavaPlatform.s b/asm/lavaPlatform.s index dccbf608..3e29ee10 100644 --- a/asm/lavaPlatform.s +++ b/asm/lavaPlatform.s @@ -70,7 +70,7 @@ sub_0809229C: @ 0x0809229C ldr r0, [r4, #0x54] ldrb r1, [r0, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0xbf lsls r0, r0, #1 bl sub_08004488 diff --git a/asm/librari.s b/asm/librari.s index 71ae8e77..6194e7c0 100644 --- a/asm/librari.s +++ b/asm/librari.s @@ -199,7 +199,7 @@ sub_0806B32C: @ 0x0806B32C strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #9 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806B358 _0806B352: adds r0, r2, #0 diff --git a/asm/likeLike.s b/asm/likeLike.s index c03e5eb7..cd16f8cc 100644 --- a/asm/likeLike.s +++ b/asm/likeLike.s @@ -595,7 +595,7 @@ _080281CA: strb r1, [r0] movs r0, #0xaf lsls r0, r0, #3 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow b _080281DE _080281D6: movs r0, #1 @@ -646,7 +646,7 @@ sub_08028224: @ 0x08028224 movs r2, #1 bl sub_080A7C18 ldr r0, _08028238 @ =0x00000579 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow pop {pc} .align 2, 0 _08028238: .4byte 0x00000579 diff --git a/asm/macroBook.s b/asm/macroBook.s index 4646eaf0..baf91023 100644 --- a/asm/macroBook.s +++ b/asm/macroBook.s @@ -65,7 +65,7 @@ sub_0809A78C: @ 0x0809A78C bl UpdateSpriteOrderAndFlip ldrb r1, [r4, #0xf] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0809A958 pop {r4, r5, pc} @@ -103,12 +103,12 @@ _0809A810: strb r2, [r4, #0xf] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _0809A840 _0809A838: ldrb r1, [r4, #0xf] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0809A840: pop {r4, pc} .align 2, 0 @@ -156,7 +156,7 @@ _0809A87C: strb r2, [r4, #0xe] adds r0, r4, #0 movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 movs r1, #0x78 bl sub_0805E4E0 diff --git a/asm/macroLink.s b/asm/macroLink.s index 0d21e0dc..8a88464f 100644 --- a/asm/macroLink.s +++ b/asm/macroLink.s @@ -144,7 +144,7 @@ _0808CBDA: strh r5, [r3, #0x12] adds r0, r3, #0 adds r1, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0808CBE4: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/madderpillar.s b/asm/madderpillar.s index db39b071..c538eac4 100644 --- a/asm/madderpillar.s +++ b/asm/madderpillar.s @@ -863,7 +863,7 @@ sub_08029EEC: @ 0x08029EEC beq _08029F0A strb r1, [r3, #0x14] adds r0, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08029F0A: pop {pc} diff --git a/asm/malon.s b/asm/malon.s index d9d7fed5..c3525c4a 100644 --- a/asm/malon.s +++ b/asm/malon.s @@ -56,7 +56,7 @@ sub_08065864: @ 0x08065864 orrs r1, r3 strb r1, [r0, #0x18] movs r1, #0xc - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 @@ -111,7 +111,7 @@ sub_080658BC: @ 0x080658BC bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _080658FC @@ -194,7 +194,7 @@ sub_08065960: @ 0x08065960 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #0xc - bl LoadAnimation + bl InitAnimationForceUpdate b _0806598C _08065986: adds r0, r2, #0 diff --git a/asm/mama.s b/asm/mama.s index 084a762f..263ee365 100644 --- a/asm/mama.s +++ b/asm/mama.s @@ -163,7 +163,7 @@ _0806C4CC: lsls r0, r1, #1 strb r0, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 _0806C4D8: str r0, [r5, #0x14] diff --git a/asm/mayorHagen.s b/asm/mayorHagen.s index 5988631c..d96e15b6 100644 --- a/asm/mayorHagen.s +++ b/asm/mayorHagen.s @@ -63,7 +63,7 @@ _0806CDE8: adds r1, r0, #0 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _0806CE58 @@ -89,7 +89,7 @@ _0806CE3E: adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0806CE58: pop {r4, pc} .align 2, 0 @@ -182,7 +182,7 @@ sub_0806CEE8: @ 0x0806CEE8 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806CF14 _0806CF0E: adds r0, r2, #0 diff --git a/asm/mazaalBracelet.s b/asm/mazaalBracelet.s index 07268729..ee5e74c6 100644 --- a/asm/mazaalBracelet.s +++ b/asm/mazaalBracelet.s @@ -126,7 +126,7 @@ _0803A210: bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #9 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0803A248 @ =0x00000127 bl PlaySFX _0803A23E: @@ -415,7 +415,7 @@ _0803A468: strb r0, [r4, #0x18] ldr r0, [r4, #0x54] movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0xb7 lsls r0, r0, #1 bl PlaySFX @@ -443,7 +443,7 @@ _0803A4B2: strb r0, [r4, #0xd] ldr r0, [r4, #0x54] movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803A546 _0803A4CC: adds r0, r4, #0 @@ -647,7 +647,7 @@ sub_0803A60C: @ 0x0803A60C strb r0, [r4, #0x18] ldr r0, [r4, #0x54] movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate _0803A658: pop {r4, pc} .align 2, 0 @@ -883,7 +883,7 @@ sub_0803A7CC: @ 0x0803A7CC strb r0, [r4, #0xc] ldr r0, [r4, #0x54] movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803A812 .align 2, 0 _0803A808: .4byte gUnk_080CED6C @@ -1011,7 +1011,7 @@ sub_0803A8B8: @ 0x0803A8B8 bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0803A908 @ =0x00000153 bl PlaySFX pop {r4, pc} @@ -1065,7 +1065,7 @@ sub_0803A90C: @ 0x0803A90C bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _0803A970: pop {r4, pc} .align 2, 0 @@ -1131,7 +1131,7 @@ _0803A9C2: bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate _0803A9F8: pop {r4, pc} .align 2, 0 @@ -1207,7 +1207,7 @@ _0803AA6E: strh r1, [r0] ldr r0, [r4, #0x54] movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate _0803AA8E: pop {r4, r5, pc} .align 2, 0 @@ -1263,7 +1263,7 @@ sub_0803AA98: @ 0x0803AA98 strb r0, [r1] adds r0, r2, #0 movs r1, #5 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0xb7 lsls r0, r0, #1 bl PlaySFX @@ -1351,7 +1351,7 @@ sub_0803AB5C: @ 0x0803AB5C bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate _0803ABAC: pop {r4, pc} .align 2, 0 @@ -1402,7 +1402,7 @@ sub_0803ABB4: @ 0x0803ABB4 bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803AC14: pop {r4, pc} .align 2, 0 @@ -1638,7 +1638,7 @@ sub_0803ADAC: @ 0x0803ADAC bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate bl sub_0803B798 b _0803ADF2 _0803ADEC: @@ -1845,7 +1845,7 @@ sub_0803AF50: @ 0x0803AF50 strb r0, [r4, #0x18] ldr r0, [r4, #0x54] movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate _0803AF7A: pop {r4, pc} @@ -1993,7 +1993,7 @@ _0803B064: strb r0, [r2, #0xc] ldr r0, [r2, #0x54] movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate _0803B070: pop {pc} .align 2, 0 @@ -2040,7 +2040,7 @@ sub_0803B074: @ 0x0803B074 bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803B0CC: pop {r4, pc} .align 2, 0 @@ -2097,7 +2097,7 @@ _0803B11E: strb r1, [r0] ldr r0, [r2, #0x54] movs r1, #9 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0803B140 @ =0x0000014F bl PlaySFX pop {pc} @@ -2458,7 +2458,7 @@ sub_0803B398: @ 0x0803B398 bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803B3F2 .align 2, 0 _0803B3E8: .4byte gUnk_080CED6C @@ -3120,7 +3120,7 @@ sub_0803B870: @ 0x0803B870 strb r0, [r1] adds r0, r4, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0xb7 lsls r0, r0, #1 bl PlaySFX diff --git a/asm/mazaalHand.s b/asm/mazaalHand.s index 18081b25..71854e87 100644 --- a/asm/mazaalHand.s +++ b/asm/mazaalHand.s @@ -27,7 +27,7 @@ sub_08035164: @ 0x08035164 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803518C: adds r0, r4, #0 bl sub_08035194 diff --git a/asm/melari.s b/asm/melari.s index 1125602e..f32ce956 100644 --- a/asm/melari.s +++ b/asm/melari.s @@ -93,7 +93,7 @@ _08068762: movs r1, #0x90 lsls r1, r1, #5 adds r0, r0, r1 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0806877E: pop {r4, pc} diff --git a/asm/minecart.s b/asm/minecart.s index 5b3b4aee..f963c15f 100644 --- a/asm/minecart.s +++ b/asm/minecart.s @@ -115,7 +115,7 @@ _0809171A: ldrb r0, [r6, #0xb] adds r1, r1, r0 adds r0, r6, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _080917D8 @ =0x00004022 movs r2, #0x2e ldrsh r1, [r6, r2] @@ -163,7 +163,7 @@ sub_080917DC: @ 0x080917DC ldrb r0, [r4, #0xb] adds r1, r1, r0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0809180C @ =0x0000013B bl PlaySFX b _080918A0 @@ -599,7 +599,7 @@ _08091B2C: ldrb r1, [r5, #0x14] adds r1, #0xc adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0x78 bl PlaySFX ldr r0, _08091BB4 @ =0x00000139 @@ -643,7 +643,7 @@ _08091BF8: .4byte gLinkEntity _08091BFC: ldrb r1, [r5, #0x14] adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08091C04: pop {r3} mov r8, r3 @@ -807,7 +807,7 @@ sub_08091CC8: @ 0x08091CC8 ldrb r1, [r6, #0x14] adds r1, #0x10 adds r0, r6, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _08091D60 @ =0x00004022 movs r3, #0x2e ldrsh r1, [r6, r3] diff --git a/asm/minishEzlo.s b/asm/minishEzlo.s index 76f232a2..ecdfe2f9 100644 --- a/asm/minishEzlo.s +++ b/asm/minishEzlo.s @@ -147,7 +147,7 @@ sub_0806305C: @ 0x0806305C bl sub_0805EC9C adds r0, r4, #0 movs r1, #0x10 - bl LoadAnimation + bl InitAnimationForceUpdate adds r4, #0x80 movs r0, #0x10 strh r0, [r4] @@ -295,7 +295,7 @@ _08063186: bl sub_0805EC9C adds r0, r4, #0 movs r1, #0x11 - bl LoadAnimation + bl InitAnimationForceUpdate adds r1, r4, #0 adds r1, #0x80 movs r0, #0x11 diff --git a/asm/ministerPotho.s b/asm/ministerPotho.s index daaddb97..ba0fbed1 100644 --- a/asm/ministerPotho.s +++ b/asm/ministerPotho.s @@ -47,7 +47,7 @@ sub_080667E4: @ 0x080667E4 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08078778 pop {r4, pc} @@ -155,7 +155,7 @@ _080668A2: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _080668EC @@ -241,7 +241,7 @@ sub_08066948: @ 0x08066948 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _08066974 _0806696E: adds r0, r2, #0 diff --git a/asm/mountainMinish.s b/asm/mountainMinish.s index 15bb2333..f5e21073 100644 --- a/asm/mountainMinish.s +++ b/asm/mountainMinish.s @@ -101,7 +101,7 @@ _08067EC4: movs r1, #0x90 lsls r1, r1, #5 adds r0, r0, r1 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _08067EE4: pop {r4, pc} .align 2, 0 diff --git a/asm/mutoh.s b/asm/mutoh.s index 6aaf6e9a..7d3761f2 100644 --- a/asm/mutoh.s +++ b/asm/mutoh.s @@ -68,7 +68,7 @@ _08067030: adds r1, r0, #0 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _0806707C diff --git a/asm/nayru.s b/asm/nayru.s index 8d1fa7cb..8ac6bf6c 100644 --- a/asm/nayru.s +++ b/asm/nayru.s @@ -58,7 +58,7 @@ _080648C2: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08064924 .align 2, 0 _080648FC: .4byte gLinkEntity @@ -78,7 +78,7 @@ _0806490A: adds r0, #0x68 ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08064924: pop {r4, pc} .align 2, 0 @@ -129,7 +129,7 @@ sub_08064960: @ 0x08064960 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806498C _08064986: adds r0, r2, #0 diff --git a/asm/npc23.s b/asm/npc23.s index 105180a0..5e28cd05 100644 --- a/asm/npc23.s +++ b/asm/npc23.s @@ -85,7 +85,7 @@ sub_08066358: @ 0x08066358 movs r5, #0 strb r5, [r1] movs r0, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldrb r1, [r4, #0xb] movs r0, #0x10 ands r0, r1 diff --git a/asm/npc26.s b/asm/npc26.s index fe735a55..14c3f4de 100644 --- a/asm/npc26.s +++ b/asm/npc26.s @@ -55,7 +55,7 @@ sub_080669B8: @ 0x080669B8 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08078778 pop {r4, pc} diff --git a/asm/npc4E.s b/asm/npc4E.s index 0ebcce2e..e1d295ce 100644 --- a/asm/npc4E.s +++ b/asm/npc4E.s @@ -17,7 +17,7 @@ sub_0806DD44: @ 0x0806DD44 strb r0, [r4, #0xc] ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0806DD5A: adds r0, r4, #0 bl sub_080042B8 diff --git a/asm/npc5.s b/asm/npc5.s index 3b38fbb1..74be4262 100644 --- a/asm/npc5.s +++ b/asm/npc5.s @@ -112,7 +112,7 @@ _08060A76: lsls r1, r1, #0x19 lsrs r1, r1, #0x19 adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate bl Random movs r1, #0x7f ands r0, r1 @@ -604,7 +604,7 @@ sub_08060E70: @ 0x08060E70 adds r0, #0x6c strb r3, [r0] adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08060E92: pop {pc} @@ -626,7 +626,7 @@ sub_08060E94: @ 0x08060E94 ldrb r1, [r4, #0x14] lsrs r1, r1, #1 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate bl Random movs r1, #0x7f ands r0, r1 @@ -681,7 +681,7 @@ _08060F00: adds r1, r2, #0 adds r1, #0x20 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r0, [r4, #0x14] adds r0, #1 b _08060F42 @@ -691,7 +691,7 @@ _08060F34: adds r1, r2, #0 adds r1, #0x28 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r0, [r4, #0x14] subs r0, #1 _08060F42: @@ -1162,7 +1162,7 @@ _080612E8: lsrs r1, r1, #1 adds r1, #0x40 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 b _08061356 _08061302: @@ -1190,7 +1190,7 @@ _0806131A: ldrb r0, [r0] adds r1, r1, r0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r2, r4, #0 adds r2, #0x41 _0806133A: @@ -1328,7 +1328,7 @@ _0806141E: _0806143A: ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08061460 .align 2, 0 _08061444: .4byte gUnk_0810AC5D @@ -2313,7 +2313,7 @@ sub_08061B58: @ 0x08061B58 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _08061B6E: ldr r0, _08061B88 @ =gUnk_030010A0 adds r0, #0x2c diff --git a/asm/npc9.s b/asm/npc9.s index 0ee7451a..2f393be9 100644 --- a/asm/npc9.s +++ b/asm/npc9.s @@ -78,7 +78,7 @@ sub_08062B48: @ 0x08062B48 cmp r0, #0 beq _08062B6A ldr r0, _08062B6C @ =0x00000A01 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldrb r0, [r4, #0xc] adds r0, #1 strb r0, [r4, #0xc] diff --git a/asm/object4.s b/asm/object4.s index 89a9e43d..d1d8af87 100644 --- a/asm/object4.s +++ b/asm/object4.s @@ -248,7 +248,7 @@ _080821F2: beq _08082202 adds r0, r4, #0 adds r1, r3, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08082208 _08082202: adds r0, r4, #0 diff --git a/asm/object48.s b/asm/object48.s index fcd1fcd2..e6b64255 100644 --- a/asm/object48.s +++ b/asm/object48.s @@ -222,7 +222,7 @@ _0808E90E: lsls r1, r1, #0x18 lsrs r1, r1, #0x18 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0808E940: ldrb r0, [r4, #0x18] movs r1, #4 @@ -306,7 +306,7 @@ _0808E9BC: beq _0808E9D8 adds r0, r5, #0 adds r1, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0808E9D8: ldrb r0, [r5, #0x18] movs r1, #4 @@ -1239,6 +1239,6 @@ sub_0808EFF0: @ 0x0808EFF0 _0808F094: .4byte gUnk_08121D54 _0808F098: mov r0, ip - bl LoadAnimation + bl InitAnimationForceUpdate _0808F09E: pop {r4, r5, pc} diff --git a/asm/object6.s b/asm/object6.s index 64921fd0..8ee959d5 100644 --- a/asm/object6.s +++ b/asm/object6.s @@ -122,7 +122,7 @@ _080829A4: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0xf3 bl PlaySFX b _080829E2 @@ -138,7 +138,7 @@ _080829CC: strh r0, [r4, #0x32] adds r0, r4, #0 movs r1, #0x14 - bl LoadAnimation + bl InitAnimationForceUpdate _080829E2: pop {r4, r5, pc} @@ -192,7 +192,7 @@ _08082A30: beq _08082A9C adds r0, r5, #0 adds r1, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08082AB4 _08082A4A: movs r0, #0x80 @@ -230,7 +230,7 @@ _08082A78: _08082A8C: ldrb r1, [r5, #0xf] adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08082AB4 .align 2, 0 _08082A98: .4byte gUnk_0811F16C @@ -314,7 +314,7 @@ _08082B18: strb r0, [r1, #0xb] adds r0, r4, #0 movs r1, #0x1c - bl LoadAnimation + bl InitAnimationForceUpdate b _08082B98 _08082B36: ldr r1, _08082B58 @ =gUnk_0811F178 @@ -324,7 +324,7 @@ _08082B36: adds r0, r0, r1 ldr r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r0, [r4, #0xe] cmp r0, #2 bls _08082B98 @@ -362,7 +362,7 @@ _08082B5C: ldrb r1, [r4, #0xe] adds r1, #0x1b adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08082B98: pop {r4, r5, pc} .align 2, 0 @@ -418,7 +418,7 @@ sub_08082B9C: @ 0x08082B9C bl sub_080AE008 adds r0, r6, #0 movs r1, #0xc - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r6, #0 adds r0, #0x82 strh r4, [r0] @@ -491,7 +491,7 @@ _08082C88: beq _08082D0C adds r0, r5, #0 movs r1, #0x17 - bl LoadAnimation + bl InitAnimationForceUpdate b _08082D1C _08082C9C: adds r0, r5, #0 @@ -501,7 +501,7 @@ _08082C9C: beq _08082D0C adds r0, r5, #0 movs r1, #0x18 - bl LoadAnimation + bl InitAnimationForceUpdate b _08082D1C _08082CB0: adds r0, r5, #0 @@ -523,7 +523,7 @@ _08082CB0: ldrb r4, [r4] adds r1, r1, r4 adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08082D1C .align 2, 0 _08082CE0: .4byte gUnk_0811F18C @@ -535,7 +535,7 @@ _08082CE4: beq _08082D0C adds r0, r5, #0 movs r1, #0x13 - bl LoadAnimation + bl InitAnimationForceUpdate b _08082D1C _08082CF8: adds r0, r5, #0 @@ -545,7 +545,7 @@ _08082CF8: beq _08082D0C adds r0, r5, #0 movs r1, #0x1a - bl LoadAnimation + bl InitAnimationForceUpdate b _08082D1C _08082D0C: movs r1, #0x80 @@ -688,7 +688,7 @@ _08082DF2: strb r0, [r1] adds r0, r4, #0 movs r1, #0x1b - bl LoadAnimation + bl InitAnimationForceUpdate b _08082E10 _08082E0A: ldr r0, [r3, #8] @@ -764,7 +764,7 @@ sub_08082E6C: @ 0x08082E6C strb r1, [r0] adds r0, r4, #0 movs r1, #0x17 - bl LoadAnimation + bl InitAnimationForceUpdate _08082E98: pop {r4, pc} .align 2, 0 diff --git a/asm/object6A.s b/asm/object6A.s index fb25573c..1168f6e6 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -72,7 +72,7 @@ sub_08094A90: @ 0x08094A90 strb r0, [r4, #0x19] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0807DD64 _08094ACE: @@ -255,7 +255,7 @@ sub_08094BE0: @ 0x08094BE0 bl UpdateSpriteOrderAndFlip adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _08094C22: add sp, #4 pop {r4, pc} @@ -297,7 +297,7 @@ _08094C44: strb r0, [r4, #0x19] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _08094C74: adds r0, r5, #0 adds r1, r4, #0 @@ -481,7 +481,7 @@ _08094DAC: bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08094DCE: adds r0, r4, #0 bl sub_080042B8 @@ -929,7 +929,7 @@ sub_08095120: @ 0x08095120 bl sub_0807DD64 adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _0809514C: adds r0, r4, #0 movs r1, #0 @@ -955,7 +955,7 @@ sub_08095164: @ 0x08095164 cmp r0, #0 beq _08095182 movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate _08095182: add sp, #4 pop {pc} @@ -980,7 +980,7 @@ sub_08095188: @ 0x08095188 bl sub_0807DD64 adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080951B4: adds r0, r4, #0 movs r1, #0 @@ -1101,7 +1101,7 @@ sub_08095288: @ 0x08095288 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080952AA: ldrb r0, [r4, #0xd] cmp r0, #0 @@ -1223,7 +1223,7 @@ sub_08095364: @ 0x08095364 strh r0, [r6, #0x24] adds r0, r6, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _0809539E: pop {r4, r5, r6, pc} .align 2, 0 @@ -1791,7 +1791,7 @@ sub_080957DC: @ 0x080957DC bl sub_0807DD64 adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080957F8: adds r0, r4, #0 movs r1, #0 diff --git a/asm/object79.s b/asm/object79.s index 2fcf1d0b..b171a709 100644 --- a/asm/object79.s +++ b/asm/object79.s @@ -76,7 +76,7 @@ sub_08097FB4: @ 0x08097FB4 bl sub_080AE008 ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08098032 .align 2, 0 _08098014: .4byte gUnk_0812341C @@ -118,7 +118,7 @@ sub_0809803C: @ 0x0809803C strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0xbc lsls r0, r0, #1 bl PlaySFX diff --git a/asm/object91.s b/asm/object91.s index 89ef9ff5..d4456e13 100644 --- a/asm/object91.s +++ b/asm/object91.s @@ -580,7 +580,7 @@ _0809C82A: cmp r0, #0xff bne _0809C84A ldr r0, _0809C850 @ =0x00000B43 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow movs r0, #1 strb r0, [r5, #0xd] movs r0, #8 diff --git a/asm/object97.s b/asm/object97.s index 04048366..4906a854 100644 --- a/asm/object97.s +++ b/asm/object97.s @@ -59,7 +59,7 @@ sub_0809D9D8: @ 0x0809D9D8 strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 movs r1, #6 bl sub_0805EB64 @@ -100,7 +100,7 @@ sub_0809DA2C: @ 0x0809DA2C str r0, [r1, #0x34] adds r0, r1, #0 movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate _0809DA5C: pop {pc} .align 2, 0 @@ -138,7 +138,7 @@ sub_0809DA64: @ 0x0809DA64 strb r0, [r5, #0xf] adds r0, r5, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _0809DAAC: adds r0, r5, #0 bl sub_080042B8 @@ -246,7 +246,7 @@ sub_0809DB58: @ 0x0809DB58 bl UpdateSpriteOrderAndFlip adds r0, r4, #0 movs r1, #0x3c - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 @@ -433,7 +433,7 @@ sub_0809DC80: @ 0x0809DC80 bl UpdateSpriteOrderAndFlip adds r0, r4, #0 movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 movs r1, #6 bl sub_0805EB64 @@ -665,7 +665,7 @@ sub_0809DE50: @ 0x0809DE50 adds r0, r0, r1 ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0x97 movs r1, #1 movs r2, #0 @@ -722,7 +722,7 @@ _0809DF16: ldrb r1, [r0] adds r1, #2 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0809DF60 @ =0x00000123 bl PlaySFX ldr r5, [r4, #0x54] @@ -758,7 +758,7 @@ _0809DF64: ldrb r1, [r0] adds r1, #2 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0809DF8C @ =0x00000123 bl PlaySFX ldr r0, _0809DF90 @ =0x000001F3 @@ -891,7 +891,7 @@ sub_0809E050: @ 0x0809E050 bl sub_0807DD64 adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 _0809E084: .4byte 0x0000FFF0 diff --git a/asm/objectB.s b/asm/objectB.s index ebe830a5..d09361b8 100644 --- a/asm/objectB.s +++ b/asm/objectB.s @@ -206,7 +206,7 @@ _08083D14: adds r1, #1 _08083D16: adds r0, r1, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _08083D24 @ =gTextBox ldrb r0, [r4, #0xb] str r0, [r1, #0x10] diff --git a/asm/objectB9.s b/asm/objectB9.s index ed569791..e079b21d 100644 --- a/asm/objectB9.s +++ b/asm/objectB9.s @@ -246,14 +246,14 @@ sub_080A13B4: @ 0x080A13B4 cmp r1, r0 blt _080A13D8 ldr r0, _080A13D4 @ =0x0000300C - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow movs r0, #1 b _080A13E0 .align 2, 0 _080A13D4: .4byte 0x0000300C _080A13D8: ldr r0, _080A13E4 @ =0x00003005 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow movs r0, #0 _080A13E0: str r0, [r4, #0x14] @@ -557,7 +557,7 @@ sub_080A1608: @ 0x080A1608 adds r4, #4 _080A1618: adds r0, r4, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r4, _080A1640 @ =gTextBox movs r1, #0 movs r0, #1 diff --git a/asm/objectC1.s b/asm/objectC1.s index 4c58f7b9..7c0ad1d4 100644 --- a/asm/objectC1.s +++ b/asm/objectC1.s @@ -163,7 +163,7 @@ _080A2688: movs r0, #0xff ands r1, r0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _080A273C .align 2, 0 _080A2698: .4byte 0x000001B9 diff --git a/asm/octorokBoss.s b/asm/octorokBoss.s index 07731049..dc9a7ffc 100644 --- a/asm/octorokBoss.s +++ b/asm/octorokBoss.s @@ -384,7 +384,7 @@ _08035456: ldr r0, [r2] ldr r0, [r0, #0xc] movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _080354DC .align 2, 0 _080354AC: .4byte gUnk_030010A0 @@ -406,7 +406,7 @@ _080354B0: ldr r0, [r3] ldr r0, [r0, #0xc] movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _080354DC: adds r0, r5, #0 movs r1, #0x87 @@ -1026,7 +1026,7 @@ _08035990: adds r1, r1, r0 ldrb r1, [r1] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080359A0: adds r0, r4, #0 bl sub_08035B94 diff --git a/asm/percy.s b/asm/percy.s index c2a2d686..218ba436 100644 --- a/asm/percy.s +++ b/asm/percy.s @@ -56,7 +56,7 @@ _0806B3F4: beq _0806B40E movs r0, #0 strb r0, [r1] - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0806B40E: adds r0, r4, #0 bl sub_0806ED78 diff --git a/asm/picolyteBottles.s b/asm/picolyteBottles.s index 84de31aa..1c3132bb 100644 --- a/asm/picolyteBottles.s +++ b/asm/picolyteBottles.s @@ -363,14 +363,14 @@ _0806E172: movs r0, #0 str r0, [r5, #0x14] ldr r0, _0806E190 @ =0x0000421B - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow b _0806E1C0 .align 2, 0 _0806E18C: .4byte 0x000003E7 _0806E190: .4byte 0x0000421B _0806E194: ldr r0, _0806E1A4 @ =0x00004218 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _0806E1A8 @ =gTextBox ldrh r0, [r4] str r0, [r1, #0x10] @@ -387,7 +387,7 @@ _0806E1AC: adds r4, #0x76 strh r1, [r4] ldr r0, _0806E1D4 @ =0x0000421C - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0806E1C0: ldr r1, _0806E1D8 @ =gUnk_030010A0 ldrh r0, [r4] @@ -433,7 +433,7 @@ sub_0806E20C: @ 0x0806E20C cmp r0, #0 beq _0806E230 ldr r0, _0806E228 @ =0x0000421F - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldr r1, _0806E22C @ =gTextBox ldrh r0, [r4, #6] str r0, [r1, #0x10] @@ -444,7 +444,7 @@ _0806E228: .4byte 0x0000421F _0806E22C: .4byte gTextBox _0806E230: ldr r0, _0806E238 @ =0x00004220 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0806E236: pop {r4, pc} .align 2, 0 diff --git a/asm/pina.s b/asm/pina.s index dce75f39..4a3f985b 100644 --- a/asm/pina.s +++ b/asm/pina.s @@ -55,7 +55,7 @@ sub_08063A98: @ 0x08063A98 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_08078778 pop {r4, pc} @@ -79,7 +79,7 @@ sub_08063AC0: @ 0x08063AC0 bne _08063AEE adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 strb r0, [r4, #0xf] _08063AEE: @@ -113,11 +113,11 @@ _08063B0C: adds r1, r0, #0 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldrb r0, [r4, #0xe] ldr r1, _08063B40 @ =0x00000A01 adds r0, r0, r1 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _08063B38: adds r0, r4, #0 bl sub_0806ED78 @@ -140,7 +140,7 @@ sub_08063B44: @ 0x08063B44 strb r1, [r2, #0xf] adds r0, r2, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate _08063B62: pop {pc} .align 2, 0 @@ -199,7 +199,7 @@ _08063B9E: adds r1, r0, #0 adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _08063C10 @@ -225,7 +225,7 @@ _08063BF6: adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08063C10: pop {r4, pc} .align 2, 0 @@ -239,7 +239,7 @@ sub_08063C14: @ 0x08063C14 cmp r0, #0 beq _08063C28 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate _08063C28: pop {pc} .align 2, 0 @@ -253,7 +253,7 @@ sub_08063C2C: @ 0x08063C2C cmp r0, #0 beq _08063C40 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate _08063C40: pop {pc} .align 2, 0 @@ -267,7 +267,7 @@ sub_08063C44: @ 0x08063C44 cmp r0, #0 beq _08063C58 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08063C58: pop {pc} .align 2, 0 @@ -281,7 +281,7 @@ sub_08063C5C: @ 0x08063C5C cmp r0, #0 beq _08063C70 movs r1, #9 - bl LoadAnimation + bl InitAnimationForceUpdate _08063C70: pop {pc} .align 2, 0 @@ -350,7 +350,7 @@ sub_08063CC4: @ 0x08063CC4 strh r0, [r2, #0x32] adds r0, r2, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _08063CF6 _08063CF0: adds r0, r2, #0 diff --git a/asm/pita.s b/asm/pita.s index ad7859fc..392e0afa 100644 --- a/asm/pita.s +++ b/asm/pita.s @@ -40,7 +40,7 @@ _08062E88: ldrb r1, [r4, #0x14] lsrs r1, r1, #1 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 adds r0, #0x58 ldrb r1, [r0] diff --git a/asm/postman.s b/asm/postman.s index aff6f826..c32f4ee5 100644 --- a/asm/postman.s +++ b/asm/postman.s @@ -57,7 +57,7 @@ _08060446: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} thumb_func_start sub_0806045C @@ -79,7 +79,7 @@ sub_0806045C: @ 0x0806045C movs r0, #2 strb r0, [r4, #0xc] movs r0, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow b _080604C0 _08060488: adds r0, r4, #0 @@ -91,7 +91,7 @@ _08060488: strb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0806049E: adds r0, r4, #0 movs r1, #0x18 @@ -230,7 +230,7 @@ _08060582: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _080605EC .align 2, 0 _080605B4: .4byte gLinkEntity @@ -249,7 +249,7 @@ _080605B8: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _080605EC .align 2, 0 _080605E0: .4byte gLinkEntity @@ -738,7 +738,7 @@ sub_0806097C: @ 0x0806097C strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate b _080609A8 _080609A2: adds r0, r2, #0 diff --git a/asm/scissorsBeetle.s b/asm/scissorsBeetle.s index 761e511c..3830cd44 100644 --- a/asm/scissorsBeetle.s +++ b/asm/scissorsBeetle.s @@ -526,6 +526,6 @@ sub_08038C84: @ 0x08038C84 _08038C98: adds r0, r3, #0 adds r1, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 diff --git a/asm/smith.s b/asm/smith.s index e90a8573..28a19e6d 100644 --- a/asm/smith.s +++ b/asm/smith.s @@ -41,7 +41,7 @@ _08065FF0: adds r5, r5, r0 adds r0, r4, #0 adds r1, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 _0806600C: @@ -171,7 +171,7 @@ sub_080660EC: @ 0x080660EC strb r0, [r1] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _08066112: pop {r4, pc} .align 2, 0 @@ -220,7 +220,7 @@ _08066154: movs r0, #2 strb r0, [r4, #0xc] movs r0, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _0806616C: pop {r4, pc} .align 2, 0 @@ -293,7 +293,7 @@ sub_080661BC: @ 0x080661BC strh r0, [r1] ldrh r1, [r1] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _080661FC _080661F4: adds r0, r4, #0 @@ -414,7 +414,7 @@ sub_08066298: @ 0x08066298 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate b _080662D6 .align 2, 0 _080662CC: .4byte gUnk_08110354 diff --git a/asm/stalfos.s b/asm/stalfos.s index a65c90fb..1e9be13b 100644 --- a/asm/stalfos.s +++ b/asm/stalfos.s @@ -727,7 +727,7 @@ _080397DC: ldrb r1, [r4, #0x14] adds r1, #0xc adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 b _0803981A .align 2, 0 @@ -762,7 +762,7 @@ _08039836: ldrb r1, [r2, #0x14] adds r1, #8 adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _08039854 @ =0x0000012B bl sub_08004488 pop {pc} @@ -809,7 +809,7 @@ _0803988C: adds r0, r0, r1 ldrb r1, [r0] adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate lsls r0, r4, #1 ldrb r1, [r5, #0x14] adds r0, r0, r1 @@ -909,7 +909,7 @@ sub_0803992C: @ 0x0803992C beq _08039980 adds r0, r4, #0 adds r1, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08039988 .align 2, 0 _08039978: .4byte gUnk_080CF900 @@ -917,7 +917,7 @@ _0803997C: .4byte gUnk_080CF910 _08039980: adds r1, r2, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08039988: pop {r4, pc} .align 2, 0 @@ -945,7 +945,7 @@ sub_0803998C: @ 0x0803998C strh r1, [r0] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 _080399C0: .4byte gUnk_080CF918 @@ -1041,7 +1041,7 @@ sub_08039A48: @ 0x08039A48 ldrb r1, [r2, #0x14] adds r1, #0x10 adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 @@ -1092,7 +1092,7 @@ _08039AC2: ldrb r1, [r5, #0x14] adds r1, #0x14 adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, r5, pc} thumb_func_start sub_08039AD4 @@ -1118,7 +1118,7 @@ sub_08039AD4: @ 0x08039AD4 ldrb r1, [r4, #0x14] adds r1, #0x18 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _08039B1C @ =0x00004067 adds r1, r4, #0 adds r1, #0x38 diff --git a/asm/sturgeon.s b/asm/sturgeon.s index f70f9c3a..511884f3 100644 --- a/asm/sturgeon.s +++ b/asm/sturgeon.s @@ -77,7 +77,7 @@ _08064B00: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _08064B42 diff --git a/asm/talon.s b/asm/talon.s index de26494a..c03b8231 100644 --- a/asm/talon.s +++ b/asm/talon.s @@ -198,7 +198,7 @@ sub_08065680: @ 0x08065680 adds r0, #0x6a ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080656A0: pop {r4, pc} .align 2, 0 @@ -221,7 +221,7 @@ sub_080656A4: @ 0x080656A4 adds r0, #0x6a ldrb r1, [r0] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080656C8: adds r0, r4, #0 bl sub_080042B8 @@ -307,7 +307,7 @@ sub_0806574C: @ 0x0806574C cmp r2, r1 beq _08065772 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08065772: ldrb r1, [r5] adds r0, r4, #0 diff --git a/asm/tingleSiblings.s b/asm/tingleSiblings.s index 31da5881..5661ba9a 100644 --- a/asm/tingleSiblings.s +++ b/asm/tingleSiblings.s @@ -44,7 +44,7 @@ sub_08064D90: @ 0x08064D90 push {r4, lr} adds r4, r0, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 strb r0, [r4, #0xf] pop {r4, pc} @@ -65,9 +65,9 @@ sub_08064DA0: @ 0x08064DA0 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _08064DC8: pop {r4, pc} .align 2, 0 @@ -79,7 +79,7 @@ sub_08064DCC: @ 0x08064DCC bl sub_08064EE8 adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #1 strb r0, [r4, #0xc] pop {r4, pc} @@ -131,7 +131,7 @@ _08064E1A: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0806F118 b _08064E6A @@ -400,7 +400,7 @@ sub_0806501C: @ 0x0806501C movs r1, #0xa _08065042: adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08065050 _0806504A: adds r0, r2, #0 diff --git a/asm/townsperson.s b/asm/townsperson.s index 7bf9340c..f3c805ea 100644 --- a/asm/townsperson.s +++ b/asm/townsperson.s @@ -112,7 +112,7 @@ _08061C32: ldrb r0, [r4, #0xb] ldr r1, _08061C5C @ =0x00000A01 adds r0, r0, r1 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow _08061C58: pop {r4, pc} .align 2, 0 diff --git a/asm/vaatiArm.s b/asm/vaatiArm.s index 7a639ac8..ed3b7228 100644 --- a/asm/vaatiArm.s +++ b/asm/vaatiArm.s @@ -350,7 +350,7 @@ _08042740: adds r0, r6, #0 movs r1, #7 _080427EE: - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0xaf lsls r0, r0, #1 bl PlaySFX @@ -668,7 +668,7 @@ _08042A2C: bl sub_08043BC8 adds r0, r4, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate _08042A3A: pop {r4, r5, pc} @@ -790,7 +790,7 @@ sub_08042AEC: @ 0x08042AEC strb r4, [r0] adds r0, r5, #0 movs r1, #0xe - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r5, #0x64] ldr r0, [r0, #4] adds r0, #0x3f @@ -1105,7 +1105,7 @@ _08042D5E: str r1, [r4, #0x68] adds r0, r4, #0 movs r1, #0xd - bl LoadAnimation + bl InitAnimationForceUpdate _08042D68: pop {r4, pc} .align 2, 0 @@ -1195,7 +1195,7 @@ _08042DC4: strb r0, [r1] adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r5, #0x64] ldr r0, [r0, #4] adds r0, #0x3f @@ -1352,7 +1352,7 @@ _08042F3C: strb r0, [r4, #0xd] adds r0, r4, #0 movs r1, #0xf - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _08042FD4 @ =0x0000019B bl PlaySFX _08042F4E: @@ -1479,7 +1479,7 @@ _08043036: strb r0, [r5, #0xe] adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08043046: pop {r4, r5, r6, pc} @@ -1600,7 +1600,7 @@ _08043114: strh r0, [r2, #0xa] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08043128: pop {r4, pc} .align 2, 0 @@ -1628,7 +1628,7 @@ sub_08043130: @ 0x08043130 bne _080431E0 adds r0, r6, #0 movs r1, #0xd - bl LoadAnimation + bl InitAnimationForceUpdate b _080431E0 _08043160: ldrb r0, [r6, #0xe] @@ -1756,7 +1756,7 @@ _08043230: strh r0, [r2, #0x20] adds r0, r4, #0 movs r1, #0xe - bl LoadAnimation + bl InitAnimationForceUpdate _0804324E: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -1984,7 +1984,7 @@ _080433E8: bl sub_08043BC8 adds r0, r4, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate adds r1, r4, #0 adds r1, #0x7e ldrb r0, [r1] @@ -2064,7 +2064,7 @@ _08043472: strb r0, [r3, #0xd] adds r0, r3, #0 movs r1, #0x10 - bl LoadAnimation + bl InitAnimationForceUpdate _0804348C: pop {r4, r5, r6, pc} .align 2, 0 @@ -3028,7 +3028,7 @@ sub_08043B9C: @ 0x08043B9C cmp r1, r0 beq _08043BC0 adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08043BC0: pop {pc} .align 2, 0 @@ -3097,7 +3097,7 @@ _08043C2E: cmp r0, r1 beq _08043C3E adds r0, r2, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08043C3E: pop {pc} @@ -3230,7 +3230,7 @@ sub_08043D08: @ 0x08043D08 strb r1, [r5, #0xd] adds r0, r5, #0 movs r1, #0xd - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r5, #0x64] ldr r4, [r0, #0x10] ldrb r1, [r4, #0x10] @@ -3455,7 +3455,7 @@ sub_08043EB8: @ 0x08043EB8 strb r0, [r2] adds r0, r7, #0 movs r1, #0xd - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r7, #0x64] ldr r3, [r0, #4] ldrb r0, [r3, #0x10] @@ -3651,7 +3651,7 @@ _0804401C: bls _0804401C adds r0, r4, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r1, [r4, #0x64] ldr r0, [r1, #0x14] ldr r1, [r1, #0x10] diff --git a/asm/vaatiBall.s b/asm/vaatiBall.s index 7a5e5b59..54e61ecb 100644 --- a/asm/vaatiBall.s +++ b/asm/vaatiBall.s @@ -170,7 +170,7 @@ _080446C8: strh r0, [r4, #0x36] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0804474A .align 2, 0 _08044724: .4byte gUnk_080D1620 @@ -190,7 +190,7 @@ _08044728: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate _0804474A: pop {r4, r5, r6, pc} diff --git a/asm/vaatiReborn.s b/asm/vaatiReborn.s index af387246..835b9602 100644 --- a/asm/vaatiReborn.s +++ b/asm/vaatiReborn.s @@ -169,7 +169,7 @@ _0806B76C: _0806B7A6: adds r0, r6, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806B7B8 _0806B7B0: adds r0, r6, #0 @@ -227,7 +227,7 @@ _0806B80C: adds r1, r4, #0 bl CopyPosition ldr r0, _0806B828 @ =0x00001634 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow ldrb r0, [r5, #0xd] adds r0, #1 strb r0, [r5, #0xd] @@ -343,7 +343,7 @@ _0806B8FA: ldrb r1, [r5, #0xd] subs r1, #1 adds r0, r5, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0806B91E _0806B906: adds r0, r5, #0 diff --git a/asm/vaatiRebornEnemy.s b/asm/vaatiRebornEnemy.s index 60542ae1..b49359dd 100644 --- a/asm/vaatiRebornEnemy.s +++ b/asm/vaatiRebornEnemy.s @@ -206,7 +206,7 @@ _0803D210: ble _0803D210 adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803D25A: pop {r4, r5, r6, pc} .align 2, 0 @@ -306,7 +306,7 @@ _0803D2E4: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803D400 _0803D318: adds r1, r4, #0 @@ -345,7 +345,7 @@ _0803D344: strb r0, [r1] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803D3BA _0803D366: movs r0, #6 @@ -474,7 +474,7 @@ _0803D438: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, _0803D454 @ =0x0000019B bl PlaySFX b _0803D558 @@ -551,7 +551,7 @@ _0803D4D0: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0xf5 bl PlaySFX b _0803D558 @@ -606,7 +606,7 @@ _0803D54E: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803D558: adds r0, r4, #0 bl sub_080042B8 @@ -720,7 +720,7 @@ _0803D5F8: _0803D620: adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803D650 _0803D62A: adds r0, r4, #0 @@ -734,7 +734,7 @@ _0803D62A: strb r0, [r2] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803D650 _0803D646: movs r1, #0 @@ -774,7 +774,7 @@ sub_0803D658: @ 0x0803D658 strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803D6EE _0803D68E: adds r2, r4, #0 @@ -847,7 +847,7 @@ sub_0803D700: @ 0x0803D700 strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803D82E _0803D720: adds r2, r4, #0 @@ -884,7 +884,7 @@ _0803D744: strb r0, [r2] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803D81C _0803D764: adds r0, r4, #0 @@ -955,7 +955,7 @@ _0803D7E4: movs r0, #0x30 strb r0, [r4, #0xf] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803D81C _0803D7FA: ldrb r0, [r4, #0xf] @@ -1188,7 +1188,7 @@ sub_0803D974: @ 0x0803D974 str r1, [r0, #0x54] ldrb r1, [r5] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, r5, pc} .align 2, 0 @@ -1228,7 +1228,7 @@ _0803D9F6: strb r0, [r1] ldrb r1, [r2] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803DA44 _0803DA02: adds r2, r4, #0 @@ -1263,7 +1263,7 @@ _0803DA2E: beq _0803DA44 adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _0803DA44: adds r1, r4, #0 adds r1, #0x75 @@ -1344,7 +1344,7 @@ sub_0803DAA8: @ 0x0803DAA8 bl PositionRelative adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 @@ -1383,7 +1383,7 @@ _0803DB16: strb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803DB54 _0803DB28: adds r1, r4, #0 @@ -1394,7 +1394,7 @@ _0803DB28: strb r2, [r1] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803DB54 _0803DB3E: adds r1, r4, #0 @@ -1406,7 +1406,7 @@ _0803DB3E: strb r0, [r1] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _0803DB54: ldrb r1, [r5, #0x18] lsls r1, r1, #0x1e @@ -1452,7 +1452,7 @@ sub_0803DB88: @ 0x0803DB88 strb r0, [r1] ldrb r1, [r2] adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 bl sub_0803DC0C pop {r4, pc} @@ -1482,7 +1482,7 @@ _0803DBD2: strb r0, [r4, #0x15] lsrs r1, r1, #0x1b adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _0803DC02 _0803DBE8: adds r1, r4, #0 @@ -1496,7 +1496,7 @@ _0803DBE8: strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate _0803DC02: adds r0, r4, #0 bl sub_0803DC0C @@ -1686,7 +1686,7 @@ _0803DD64: strb r0, [r5, #0xe] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803DD74: pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/vaatiTransfigured.s b/asm/vaatiTransfigured.s index adae2fd3..a8ada4a9 100644 --- a/asm/vaatiTransfigured.s +++ b/asm/vaatiTransfigured.s @@ -213,7 +213,7 @@ _0803F902: bls _0803F8E0 adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _0803F910: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -1314,7 +1314,7 @@ sub_08040130: @ 0x08040130 orrs r1, r2 strb r1, [r3] ldrb r1, [r0, #0xe] - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 @@ -1367,7 +1367,7 @@ _080401A6: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate b _080401D2 _080401C0: ldrb r0, [r4, #0xe] @@ -1377,7 +1377,7 @@ _080401C0: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _080401D2: ldrb r0, [r5, #0xc] cmp r0, #3 @@ -1412,7 +1412,7 @@ sub_080401E0: @ 0x080401E0 ldrb r1, [r4, #0xb] adds r1, #4 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08040260 _08040212: adds r2, r4, #0 @@ -1449,7 +1449,7 @@ _08040212: strb r5, [r0] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08040260: pop {r4, r5, pc} .align 2, 0 @@ -1554,7 +1554,7 @@ _08040302: strb r1, [r5] adds r0, r4, #0 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate b _08040382 _0804032E: adds r0, r4, #0 @@ -1572,12 +1572,12 @@ _0804032E: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate b _08040382 _08040354: adds r0, r4, #0 movs r1, #7 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0x11 strb r0, [r5] movs r0, #0x50 @@ -1596,7 +1596,7 @@ _08040366: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate _08040382: adds r0, r4, #0 bl sub_080042B8 @@ -1652,7 +1652,7 @@ sub_080403CC: @ 0x080403CC orrs r1, r2 strb r1, [r3] movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {pc} .align 2, 0 diff --git a/asm/vaatiWrath.s b/asm/vaatiWrath.s index 8df4cfbc..d69d4d3b 100644 --- a/asm/vaatiWrath.s +++ b/asm/vaatiWrath.s @@ -176,7 +176,7 @@ _0804144A: strb r0, [r1] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate _08041486: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -602,7 +602,7 @@ sub_080417AC: @ 0x080417AC strb r0, [r4] adds r0, r5, #0 movs r1, #4 - bl LoadAnimation + bl InitAnimationForceUpdate b _0804181A _080417DA: cmp r0, #2 @@ -859,7 +859,7 @@ _080419A6: bl sub_0801D2B4 adds r0, r4, #0 movs r1, #5 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r4, #0x64] ldr r0, [r0, #4] movs r1, #1 @@ -916,7 +916,7 @@ sub_08041A00: @ 0x08041A00 bl sub_0801D2B4 adds r0, r4, #0 movs r1, #8 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r4, #0x64] ldr r0, [r0, #4] movs r1, #0x10 @@ -961,7 +961,7 @@ _08041A60: bl sub_08080964 adds r0, r4, #0 movs r1, #6 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r4, #0x64] ldr r0, [r0, #8] movs r1, #0x16 @@ -1032,7 +1032,7 @@ _08041B12: strb r0, [r2] adds r0, r4, #0 movs r1, #9 - bl LoadAnimation + bl InitAnimationForceUpdate b _08041BCE _08041B44: ldr r0, [r4, #0x34] @@ -1141,7 +1141,7 @@ sub_08041BE8: @ 0x08041BE8 strb r0, [r6, #0x11] adds r0, r6, #0 movs r1, #0xa - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r6, #0x64] ldr r7, [r0, #4] str r5, [r7, #0x64] @@ -1244,7 +1244,7 @@ _08041CF6: movs r0, #0x3c strb r0, [r4, #0xe] ldr r0, _08041D08 @ =0x00001651 - bl TextboxTryNoOverlap + bl TextboxNoOverlapFollow b _08041D12 .align 2, 0 _08041D08: .4byte 0x00001651 @@ -1375,7 +1375,7 @@ _08041DEC: bl sub_0801D2B4 adds r0, r5, #0 movs r1, #0xb - bl LoadAnimation + bl InitAnimationForceUpdate _08041E0C: ldrb r0, [r5, #0xf] adds r0, #1 @@ -1978,7 +1978,7 @@ sub_08042264: @ 0x08042264 push {r4, lr} adds r4, r0, #0 movs r1, #1 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r4, #0x64] ldr r1, [r0, #4] movs r0, #1 @@ -1998,7 +1998,7 @@ sub_0804228C: @ 0x0804228C push {r4, lr} adds r4, r0, #0 movs r1, #2 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r4, #0x64] ldr r1, [r0, #4] movs r0, #1 @@ -2059,7 +2059,7 @@ _08042306: strb r4, [r6] adds r0, r5, #0 movs r1, #3 - bl LoadAnimation + bl InitAnimationForceUpdate b _08042354 _0804231A: movs r0, #0x80 @@ -2068,7 +2068,7 @@ _0804231A: beq _08042354 adds r0, r5, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0 strb r0, [r7, #0xd] adds r0, r7, #0 @@ -2114,7 +2114,7 @@ sub_0804235C: @ 0x0804235C strh r0, [r1] adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate ldr r0, [r4, #0x64] ldr r0, [r0, #4] strb r5, [r0, #0xd] diff --git a/asm/zeldaFollower.s b/asm/zeldaFollower.s index 6f5924d1..fe4324ca 100644 --- a/asm/zeldaFollower.s +++ b/asm/zeldaFollower.s @@ -36,7 +36,7 @@ sub_080682B0: @ 0x080682B0 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0 - bl LoadAnimation + bl InitAnimationForceUpdate adds r0, r4, #0 movs r1, #0 bl sub_0806854C @@ -320,7 +320,7 @@ _080684EE: _0806850C: mov r0, r8 mov r1, sb - bl LoadAnimation + bl InitAnimationForceUpdate movs r0, #0x1e strb r0, [r4] b _08068526 @@ -534,7 +534,7 @@ sub_08068694: @ 0x08068694 ldrb r1, [r4, #0x14] lsrs r1, r1, #1 adds r0, r4, #0 - bl LoadAnimation + bl InitAnimationForceUpdate pop {r4, pc} .align 2, 0 diff --git a/include/functions.h b/include/functions.h index 02673254..7d24a6cc 100644 --- a/include/functions.h +++ b/include/functions.h @@ -9,7 +9,7 @@ extern u32 Random(void); extern void PlaySFX(u32); extern void UpdateSpriteOrderAndFlip(Entity*); -extern void LoadAnimation(Entity*, u32); +extern void InitAnimationForceUpdate(Entity*, u32); extern void ShowNPCDialogue(); extern u32 UpdateFuseInteraction(); extern void CopyPosition(Entity*, Entity*); diff --git a/linker.ld b/linker.ld index 9f5cbd53..2f21d9b4 100644 --- a/linker.ld +++ b/linker.ld @@ -508,6 +508,7 @@ SECTIONS { asm/mountainMinish.o(.text); asm/zeldaFollower.o(.text); asm/melari.o(.text); + src/bladeBrothers.o(.text); asm/bladeBrothers.o(.text); src/cow.o(.text); asm/goron.o(.text); @@ -540,6 +541,7 @@ SECTIONS { asm/bigGoron.o(.text); asm/ezloCap.o(.text); asm/npc4E.o(.text); + src/clothesRack.o(.text); asm/clothesRack.o(.text); asm/picolyteBottles.o(.text); asm/smallTownMinish.o(.text); diff --git a/src/bell.c b/src/bell.c index 7dc1c864..340149bf 100644 --- a/src/bell.c +++ b/src/bell.c @@ -5,7 +5,7 @@ extern void sub_080042B8(); extern void (*gUnk_08123384[])(Entity*); extern void UpdateSpriteOrderAndFlip(Entity*); -extern void LoadAnimation(); +extern void InitAnimationForceUpdate(); void sub_08097D78(Entity* ent) { gUnk_08123384[ent->action](ent); @@ -17,7 +17,7 @@ void sub_08097D90(Entity* ent) { ent->collisionLayer = 1; ent->ticks.b0 = 0; UpdateSpriteOrderAndFlip(ent); - LoadAnimation(ent, 0); + InitAnimationForceUpdate(ent, 0); } void sub_08097DCC(Entity* ent) { diff --git a/src/bladeBrothers.c b/src/bladeBrothers.c new file mode 100644 index 00000000..7083d684 --- /dev/null +++ b/src/bladeBrothers.c @@ -0,0 +1,155 @@ +#include "global.h" +#include "entity.h" + +typedef struct { + /*0x00*/ u8 filler[0x2C]; + /*0x2C*/ u8 unk; +} struct_030010A0; + +extern void sub_0806ED78(Entity*); +extern void sub_08068BEC(Entity*, u32); +extern void sub_08078778(Entity*); +extern void InitializeAnimation(Entity*, u32); +extern s32 sub_0806ED9C(Entity*, u32, u32); +extern s32 sub_0806F078(Entity*, s32); +extern void sub_08004274(Entity*); +extern void TextboxNoOverlapFollow(u32); +extern void sub_0801D2B4(Entity*, u32); +extern void sub_0806FD3C(Entity*); +extern u32 sub_0801E99C(Entity*); +extern void sub_08078784(Entity*, u8); +extern void sub_0807DD50(Entity*); +extern void sub_080045C4(Entity*, Entity*); +extern u32 sub_0806F5A4(void); +extern void InitAnimationForceUpdate(Entity*, u32); +extern void sub_0806F118(Entity*); +extern void sub_0807DD94(Entity*, u32); +extern u32 UpdateFuseInteraction(); + +extern void (*gUnk_081115C0[])(Entity*); +extern void (*gUnk_081115D0[])(Entity*); + +extern struct_030010A0 gUnk_030010A0; +extern u16 gUnk_081115DC[]; +extern Entity gLinkEntity; + +void sub_080689C0(Entity *this) +{ + + if ((this->flags & 2) != 0) { + gUnk_081115D0[this->action](this); + } + else { + gUnk_081115C0[this->action](this); + sub_0806ED78(this); + } + if ((this->frames.all & 1) != 0) { + this->frames.all &= 0xfe; + sub_08068BEC(this, 0); + } +} + +void sub_08068A1C(Entity *this) +{ + u8 bVar1; + int offset; + + (this->entityType).parameter2 = (this->entityType).parameter1; + if (gUnk_030010A0.unk != 0) { + offset = 6; + bVar1 = 3; + + } + else { + sub_08078778(this); + offset = 2; + bVar1 = 1; + } + this->action = bVar1; + InitializeAnimation(this, offset); +} + +void sub_08068A4C(Entity *this) +{ + s32 uVar1; + s32 iVar2; + + uVar1 = sub_0806ED9C(this, 0x28, 0x28); + if (uVar1 < 0) { + uVar1 = 2; + } + else { + if (this->field_0xf == 0) { + this->field_0xf = 0x10; + } + else { + this->field_0xf--; + uVar1 = (u32)this->field_0x58; + } + } + iVar2 = sub_0806F078(this,uVar1); + if (iVar2 == 0) { + sub_08004274(this); + } + if (this->interactType != 0) { + this->interactType = 0; + this->action = 2; + TextboxNoOverlapFollow(0); + } +} + +void sub_08068AA4(Entity *this) +{ + u8 bVar1; + + this->action = 1; + if (this->entityType.parameter1 != 0) { + this->entityType.parameter2++; + this->entityType.parameter2 &= 7; + if (this->entityType.parameter2 == 0) { + this->entityType.parameter2 += 1; + } + sub_0801D2B4(this, gUnk_081115DC[this->entityType.parameter2]); + } +} + +void sub_08068ADC(Entity *this) +{ + if (gUnk_030010A0.unk == 2) { + sub_08004274(this); + } + sub_0806FD3C(this); +} + +void sub_08068AFC(Entity *this) +{ + this->action = 1; + this->spriteSettings.b.ss0 = 1; + *(u8*)&this->field_0x68 = sub_0801E99C(this); + sub_08078784(this, *(u8*)&this->field_0x68); + sub_0807DD50(this); +} + +void FUN_08068b2c(Entity *this) +{ + u32 uVar1; + + if (this->interactType == '\x02') { + this->action = 2; + this->interactType = '\0'; + sub_080045C4(this,&gLinkEntity); + uVar1 = sub_0806F5A4(); + InitAnimationForceUpdate(this, uVar1); + sub_0806F118(this); + } + else { + sub_0807DD94(this, 0); + } +} + +void sub_08068B70(Entity *this) +{ + if (UpdateFuseInteraction()) { + this->action = 1; + } +} \ No newline at end of file diff --git a/src/clothesRack.c b/src/clothesRack.c new file mode 100644 index 00000000..ca261af9 --- /dev/null +++ b/src/clothesRack.c @@ -0,0 +1,8 @@ +#include "global.h" +#include "entity.h" + +extern void (*gUnk_0811423C[])(Entity*); + +void sub_0806DD78(Entity* this) { + gUnk_0811423C[this->action](this); +} \ No newline at end of file diff --git a/src/cow.c b/src/cow.c index 9dee1303..4ee5ca94 100644 --- a/src/cow.c +++ b/src/cow.c @@ -17,7 +17,7 @@ extern void sub_080791D0(); extern void (*gUnk_08111914[])(Entity*); extern void (*gUnk_08111928[])(Entity*); extern u32 gUnk_08111938[]; -extern void LoadAnimation(); +extern void InitAnimationForceUpdate(); extern void PlaySFX(u32); extern u32 Random(); extern u32 UpdateFuseInteraction(Entity*); @@ -55,7 +55,7 @@ void sub_08068FC0(Entity* ent) { } ent->field_0x6c = sub_0801E99C(ent); - LoadAnimation(ent, ent->animationState + 4); + InitAnimationForceUpdate(ent, ent->animationState + 4); } void sub_08069018(Entity* ent) { @@ -64,7 +64,7 @@ void sub_08069018(Entity* ent) { if (ent->previousActionFlag == 0) { ent->previousActionFlag++; ent->field_0xf = (Random() & 0x3F) + 0x3C; - LoadAnimation(ent, ent->animationState); + InitAnimationForceUpdate(ent, ent->animationState); } sub_080042B8(ent); @@ -95,7 +95,7 @@ void sub_08069068(Entity* ent) { ent->direction = anim <<= 3; ent->field_0xf = (Random() & 0x3F) + 0x3C; - LoadAnimation(ent, ent->animationState + 4); + InitAnimationForceUpdate(ent, ent->animationState + 4); } sub_080AEF88(ent); @@ -148,13 +148,13 @@ void sub_08069148(Entity* ent) { var0 += 3; ent->field_0xf = var0; ent->previousActionFlag = 1; - LoadAnimation(ent, ent->animationState + 8); + InitAnimationForceUpdate(ent, ent->animationState + 8); } void sub_08069168(Entity* ent) { if ((s8)ent->frames.all < 0) { ent->previousActionFlag = 2; - LoadAnimation(ent, ent->animationState + 12); + InitAnimationForceUpdate(ent, ent->animationState + 12); } } @@ -166,14 +166,14 @@ void sub_08069188(Entity* ent) { if (((s8)--ent->field_0xf) != 0) return; ent->previousActionFlag = 3; - LoadAnimation(ent, ent->animationState + 16); + InitAnimationForceUpdate(ent, ent->animationState + 16); } void sub_080691BC(Entity* ent) { if ((s8)ent->frames.all < 0) { ent->action = 1; ent->previousActionFlag = 0; - LoadAnimation(ent, ent->animationState + 4); + InitAnimationForceUpdate(ent, ent->animationState + 4); } } @@ -232,7 +232,7 @@ void sub_080692A0(Entity* ent) { if (ent->action == 0) { ent->action++; ent->spriteSettings.b.ss0 = 1; - LoadAnimation(ent, 15); + InitAnimationForceUpdate(ent, 15); } else { sub_080042B8(ent); } diff --git a/src/epona.c b/src/epona.c index be050c87..949ca685 100644 --- a/src/epona.c +++ b/src/epona.c @@ -5,7 +5,7 @@ extern void sub_0806ED78(Entity*); extern u32 sub_0801E99C(Entity*); -extern void LoadAnimation(Entity*, u32); +extern void InitAnimationForceUpdate(Entity*, u32); extern void sub_080042B8(Entity*); extern void sub_08065AA4(Entity*); extern u32 UpdateFuseInteraction(void); @@ -40,7 +40,7 @@ void sub_080659B8(Entity* this) { this->animationState = 6; this->field_0x69 = -1; this->field_0x68 = sub_0801E99C(this); - LoadAnimation(this, this->animationState / 2); + InitAnimationForceUpdate(this, this->animationState / 2); } void sub_080659F0(Entity* this) { @@ -56,14 +56,14 @@ void sub_08065A00(Entity* this) { void sub_08065A10(Entity* this) { if ((gTextBox.doTextBox & 0x7F) == 0) { this->action = 1; - LoadAnimation(this, this->animationState / 2); + InitAnimationForceUpdate(this, this->animationState / 2); } } void sub_08065A34(Entity* this) { if (UpdateFuseInteraction() != 0) { this->action = 1; - LoadAnimation(this, this->animationState / 2); + InitAnimationForceUpdate(this, this->animationState / 2); } } @@ -97,7 +97,7 @@ void sub_08065AA4(Entity* this) { sub_08065A50(this); } sub_080045C4(this, &gLinkEntity); - LoadAnimation(this, sub_0806F5A4()); + InitAnimationForceUpdate(this, sub_0806F5A4()); } else { sub_08065A50(this); sub_080791D0(); @@ -111,7 +111,7 @@ void sub_08065B1C(Entity* this) { if (this->action == 0) { this->action += 1; this->spriteSettings.b.ss0 = 1; - LoadAnimation(this, 7); + InitAnimationForceUpdate(this, 7); } else { sub_080042B8(this); } diff --git a/src/mailbox.c b/src/mailbox.c index c617a04e..d395afe8 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -2,9 +2,9 @@ #include "entity.h" extern void sub_0806ED78(Entity*); -extern void LoadAnimation(); +extern void InitAnimationForceUpdate(); extern void sub_08063280(); -extern void TextboxTryNoOverlap(u32); +extern void TextboxNoOverlapFollow(u32); extern void sub_080042B8(); extern void CreateFx(); @@ -22,7 +22,7 @@ void sub_08063210(Entity* ent) { ent->action = 1; - LoadAnimation(ent, 0); + InitAnimationForceUpdate(ent, 0); return; } @@ -39,7 +39,7 @@ void sub_08063220(Entity* ent) } if (ent->field_0x58 != bVar1) { - LoadAnimation(ent); + InitAnimationForceUpdate(ent); } else { sub_08063280(ent, bVar1); } @@ -51,7 +51,7 @@ void sub_08063254(Entity* ent) sub_08063280(ent); if ((ent->frames.all & 0x80) != 0) { ent->action = 3; - TextboxTryNoOverlap(0); + TextboxNoOverlapFollow(0); } return; } diff --git a/src/milkCart.c b/src/milkCart.c index 85da0d96..6bca873c 100644 --- a/src/milkCart.c +++ b/src/milkCart.c @@ -3,7 +3,7 @@ extern void _call_via_r1(Entity*, u32); extern void sub_0806ED78(); -extern void LoadAnimation(); +extern void InitAnimationForceUpdate(); extern void sub_080042B8(); extern void (*gMilkCartBehaviors[2])(Entity*); @@ -18,7 +18,7 @@ void sub_08065B6C(Entity* ent) { ent->spriteSettings.b.ss0 = 1; (ent->y).HALF.LO += -32768; ent->animationState = 6; - LoadAnimation(ent, 3); + InitAnimationForceUpdate(ent, 3); } void sub_08065B9C(Entity* ent) { diff --git a/src/stamp.c b/src/stamp.c index 8ac339da..19a95afb 100644 --- a/src/stamp.c +++ b/src/stamp.c @@ -7,7 +7,7 @@ extern void sub_08078778(Entity*); extern void sub_0805E47C(Entity*); extern void sub_08004274(Entity*); extern void sub_0806ED78(Entity*); -extern void TextboxTryNoOverlap(u32); +extern void TextboxNoOverlapFollow(u32); extern void sub_0805E584(); extern void sub_0807DD64(); extern void CreateFx(); @@ -28,7 +28,7 @@ extern void sub_08078778(Entity*); extern void sub_0805E47C(Entity*); extern void sub_08004274(Entity*); extern void sub_0806ED78(Entity*); -extern void TextboxTryNoOverlap(u32); +extern void TextboxNoOverlapFollow(u32); extern void sub_0805E584(); extern void sub_0807DD64(); extern void CreateFx(); @@ -73,7 +73,7 @@ void sub_08062C24(Entity* ent) { sub_08004274(ent); if ((ent->frames.all & 128) != 0) { InitializeAnimation(ent, 4); - TextboxTryNoOverlap(2561); + TextboxNoOverlapFollow(2561); ent->action++; } } diff --git a/src/textbox.c b/src/textbox.c index 37010283..5e557d01 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -24,7 +24,7 @@ void sub_08056360(void) return; } -void TextboxTryNoOverlap(u32 index) +void TextboxNoOverlapFollow(u32 index) { if (gRoomControls.cameraTarget != NULL) { diff --git a/src/zelda.c b/src/zelda.c index 65c72d6c..f0813614 100644 --- a/src/zelda.c +++ b/src/zelda.c @@ -16,7 +16,7 @@ u32 sub_0806EDC4(Entity* ent); void DeleteThisEntity(void); extern Entity* GetEntityByType(u32, u32); extern void sub_080686C4(Entity*, Entity*); -extern void LoadAnimation(Entity*, u32); +extern void InitAnimationForceUpdate(Entity*, u32); extern void sub_080042B8(Entity*); extern void sub_0806F62C(Entity*, u32, u32); extern u32 sub_08003FC4(Entity*, u32); @@ -111,27 +111,27 @@ void sub_08066DE4(Entity* ent) { } void sub_08066E08(Entity* ent) { - LoadAnimation(ent, 0x50); + InitAnimationForceUpdate(ent, 0x50); ent->field_0x80 = ent->field_0x58; } void sub_08066E20(Entity* ent) { - LoadAnimation(ent, 0x44); + InitAnimationForceUpdate(ent, 0x44); ent->field_0x80 = ent->field_0x58; } void sub_08066E38(Entity* ent) { - LoadAnimation(ent, 0x48); + InitAnimationForceUpdate(ent, 0x48); ent->field_0x80 = ent->field_0x58; } void sub_08066E50(Entity* ent) { - LoadAnimation(ent, 0x4C); + InitAnimationForceUpdate(ent, 0x4C); ent->field_0x80 = ent->field_0x58; } void sub_08066E68(Entity* ent) { - LoadAnimation(ent, 0x54); + InitAnimationForceUpdate(ent, 0x54); ent->field_0x80 = ent->field_0x58; } @@ -139,7 +139,7 @@ void sub_08066E80(Entity* ent, u8* param_2) { switch (param_2[0x18]) { case 0: param_2[0x18]++; - LoadAnimation(ent, 0x16); + InitAnimationForceUpdate(ent, 0x16); break; case 1: sub_080042B8(ent); @@ -165,7 +165,7 @@ void sub_08066E80(Entity* ent, u8* param_2) { sub_080042B8(ent); if (sub_08003FC4(ent, 0x2000) == 0) { param_2[0x18]++; - LoadAnimation(ent, 0x1E); + InitAnimationForceUpdate(ent, 0x1E); } break; case 4: