From f499c38032e7922453ee00cd8eba83b826b7c4b7 Mon Sep 17 00:00:00 2001 From: theo3 Date: Sun, 14 Jun 2020 10:33:22 -0700 Subject: [PATCH] function renaming --- asm/anju.s | 2 +- asm/ballChainSoldier.s | 2 +- asm/beanstalk.s | 4 +-- asm/bell.s | 2 +- asm/bigVortex.s | 6 ++-- asm/bird.s | 8 ++--- asm/bladeBrothers.s | 2 +- asm/brocco.s | 6 ++-- asm/cat.s | 16 ++++----- asm/chuchuBoss.s | 2 +- asm/code_08003FC4.s | 4 +-- asm/code_080041E8.s | 4 +-- asm/code_08018500.s | 4 +-- asm/code_0801D79C.s | 12 +++---- asm/code_0804B058.s | 2 +- asm/code_0804B9F8.s | 48 +++++++++++++------------- asm/code_0806ED78.s | 2 +- asm/code_08070698.s | 76 ++++++++++++++++++++--------------------- asm/code_080732D0.s | 42 +++++++++++------------ asm/code_08077B98.s | 12 +++---- asm/code_0807CC3C.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 | 36 +++++++++---------- asm/deathFx.s | 2 +- asm/din.s | 2 +- asm/dog.s | 10 +++--- asm/enemy4D.s | 2 +- asm/enemy64.s | 8 ++--- asm/enemyE.s | 2 +- asm/ezloCap.s | 4 +-- asm/farmers.s | 2 +- asm/farore.s | 2 +- asm/festari.s | 4 +-- asm/figurineDevice.s | 26 +++++++------- asm/forestMinish.s | 2 +- asm/gentari.s | 2 +- asm/gentariCurtains.s | 2 +- asm/ghostBrothers.s | 6 ++-- asm/gibdo.s | 12 +++---- asm/gina.s | 2 +- asm/gleerok.s | 6 ++-- asm/goron.s | 10 +++--- asm/goronMerchant.s | 4 +-- asm/gregal.s | 2 +- asm/gyorgMale.s | 14 ++++---- asm/itemOnGround.s | 4 +-- asm/jarPortal.s | 8 ++--- asm/keaton.s | 10 +++--- asm/kid.s | 4 +-- asm/kingDaltus.s | 4 +-- asm/lakitu.s | 8 ++--- asm/lakituCloud.s | 2 +- asm/lavaPlatform.s | 2 +- asm/librari.s | 4 +-- asm/macroBook.s | 6 ++-- asm/macroLink.s | 14 ++++---- asm/madderpillar.s | 4 +-- asm/malon.s | 4 +-- asm/mayorHagen.s | 4 +-- asm/mazaalBracelet.s | 16 ++++----- asm/minecart.s | 6 ++-- asm/ministerPotho.s | 4 +-- asm/nayru.s | 2 +- asm/npc26.s | 2 +- asm/npc4E.s | 2 +- asm/npc5.s | 20 +++++------ asm/object4.s | 2 +- asm/object48.s | 2 +- asm/object6.s | 10 +++--- asm/object6A.s | 18 +++++----- asm/object79.s | 4 +-- asm/object9.s | 2 +- asm/object97.s | 22 ++++++------ asm/objectC1.s | 4 +-- asm/octorokBoss.s | 2 +- asm/percy.s | 2 +- asm/picolyteBottles.s | 2 +- asm/pina.s | 6 ++-- asm/postman.s | 10 +++--- asm/rem.s | 2 +- asm/scissorsBeetle.s | 6 ++-- asm/smith.s | 8 ++--- asm/stalfos.s | 8 ++--- asm/talon.s | 2 +- asm/tingleSiblings.s | 4 +-- asm/townMinish.s | 2 +- asm/vaatiArm.s | 10 +++--- asm/vaatiBall.s | 10 +++--- asm/vaatiReborn.s | 4 +-- asm/vaatiRebornEnemy.s | 18 +++++----- asm/vaatiTransfigured.s | 22 ++++++------ asm/vaatiWrath.s | 30 ++++++++-------- asm/whirlwind.s | 2 +- asm/zeldaFollower.s | 2 +- include/functions.h | 4 +-- src/bell.c | 4 +-- src/cow.c | 10 +++--- src/epona.c | 10 ++---- src/mailbox.c | 4 +-- src/malon.c | 4 +-- src/milkCart.c | 4 +-- src/stamp.c | 6 ++-- src/zelda.c | 10 +++--- 107 files changed, 432 insertions(+), 436 deletions(-) diff --git a/asm/anju.s b/asm/anju.s index 5a97c2f6..8acda3fe 100644 --- a/asm/anju.s +++ b/asm/anju.s @@ -116,7 +116,7 @@ sub_0806C36C: @ 0x0806C36C b _0806C398 _0806C392: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806C398: pop {pc} .align 2, 0 diff --git a/asm/ballChainSoldier.s b/asm/ballChainSoldier.s index 00a23225..8c5b9cae 100644 --- a/asm/ballChainSoldier.s +++ b/asm/ballChainSoldier.s @@ -323,7 +323,7 @@ sub_0803E75C: @ 0x0803E75C cmp r0, #0 bne _0803E774 adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0803E7B0 _0803E774: ldrb r0, [r2, #0xe] diff --git a/asm/beanstalk.s b/asm/beanstalk.s index 082dee50..9762b265 100644 --- a/asm/beanstalk.s +++ b/asm/beanstalk.s @@ -307,7 +307,7 @@ _08089F34: .4byte gUnk_08120E78 sub_08089F38: @ 0x08089F38 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -352,7 +352,7 @@ sub_08089F70: @ 0x08089F70 bl PlaySFX _08089F8E: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/bell.s b/asm/bell.s index 9da86a8b..a4871ce2 100644 --- a/asm/bell.s +++ b/asm/bell.s @@ -54,5 +54,5 @@ sub_08097D90: @ 0x08097D90 thumb_func_start sub_08097DCC sub_08097DCC: @ 0x08097DCC push {lr} - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {pc} diff --git a/asm/bigVortex.s b/asm/bigVortex.s index 4b317160..cda2af70 100644 --- a/asm/bigVortex.s +++ b/asm/bigVortex.s @@ -165,7 +165,7 @@ _08098E20: bl sub_08077B20 _08098E24: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, r6, pc} .align 2, 0 _08098E2C: .4byte gLinkEntity @@ -174,7 +174,7 @@ _08098E30: .4byte gLinkState thumb_func_start sub_08098E34 sub_08098E34: @ 0x08098E34 push {lr} - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {pc} thumb_func_start sub_08098E3C @@ -210,7 +210,7 @@ _08098E5E: movs r3, #0 bl sub_0805EC9C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08098E84: .4byte gUnk_08123690 diff --git a/asm/bird.s b/asm/bird.s index ed6ec659..25369964 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -133,7 +133,7 @@ _0809D018: bl DeleteThisEntity _0809D026: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 @@ -590,7 +590,7 @@ _0809D3A8: adds r0, r5, #0 bl sub_08003FC4 adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r4, [r5, #0x54] cmp r4, #0 beq _0809D454 @@ -893,7 +893,7 @@ _0809D62E: adds r0, r5, #0 bl sub_08003FC4 adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r5, #0 bl sub_080040A8 cmp r0, #0 @@ -978,7 +978,7 @@ _0809D6A2: bl InitAnimationForceUpdate _0809D6EC: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0809D6FE _0809D6F4: movs r0, #3 diff --git a/asm/bladeBrothers.s b/asm/bladeBrothers.s index 7b03c332..2af68092 100644 --- a/asm/bladeBrothers.s +++ b/asm/bladeBrothers.s @@ -556,7 +556,7 @@ sub_08068F4C: @ 0x08068F4C b _08068F78 _08068F72: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08068F78: adds r2, r4, #0 adds r2, #0x5a diff --git a/asm/brocco.s b/asm/brocco.s index 8bbcfd2d..af1840f2 100644 --- a/asm/brocco.s +++ b/asm/brocco.s @@ -88,7 +88,7 @@ _080635B2: beq _080635D0 _080635B8: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -212,7 +212,7 @@ _080636A4: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _080636D4 _080636BA: adds r0, r4, #0 @@ -282,6 +282,6 @@ sub_0806370C: @ 0x0806370C b _0806373E _08063738: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806373E: pop {pc} diff --git a/asm/cat.s b/asm/cat.s index 06c8e6b4..7725bd74 100644 --- a/asm/cat.s +++ b/asm/cat.s @@ -139,7 +139,7 @@ _080678D0: b _08067900 _080678EA: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r1, [r5] movs r0, #0x80 ands r0, r1 @@ -210,7 +210,7 @@ _0806796C: adds r0, r4, #0 bl sub_0806F69C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08067978: pop {r4, pc} .align 2, 0 @@ -219,7 +219,7 @@ _08067978: sub_0806797C: @ 0x0806797C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -237,7 +237,7 @@ _08067998: sub_0806799C: @ 0x0806799C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, _080679C0 @ =gTextBox ldrb r1, [r0] movs r0, #0x7f @@ -278,7 +278,7 @@ _080679E6: b _08067A0A _080679EE: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08067BD4 adds r0, r4, #0 @@ -294,7 +294,7 @@ _08067A0A: sub_08067A0C: @ 0x08067A0C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -350,7 +350,7 @@ _08067A76: sub_08067A78: @ 0x08067A78 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -851,7 +851,7 @@ sub_08067DFC: @ 0x08067DFC b _08067E28 _08067E22: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08067E28: pop {pc} .align 2, 0 \ No newline at end of file diff --git a/asm/chuchuBoss.s b/asm/chuchuBoss.s index 72ba7a49..467d4267 100644 --- a/asm/chuchuBoss.s +++ b/asm/chuchuBoss.s @@ -3248,7 +3248,7 @@ _08027532: movs r0, #0 strb r0, [r1] adds r0, r6, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, r6, pc} thumb_func_start sub_08027548 diff --git a/asm/code_08003FC4.s b/asm/code_08003FC4.s index a5f8ee79..2c59bdf7 100644 --- a/asm/code_08003FC4.s +++ b/asm/code_08003FC4.s @@ -471,8 +471,8 @@ InitAnimationForceUpdate: @ 0x080042AC strb r2, [r0, #0x1f] b _080042C0 - thumb_func_start sub_080042B8 -sub_080042B8: @ 0x080042B8 + thumb_func_start UpdateAnimationSingleFrame +UpdateAnimationSingleFrame: @ 0x080042B8 movs r1, #1 non_word_aligned_thumb_func_start sub_080042BA diff --git a/asm/code_080041E8.s b/asm/code_080041E8.s index a4aa0baa..ede82720 100644 --- a/asm/code_080041E8.s +++ b/asm/code_080041E8.s @@ -137,8 +137,8 @@ InitAnimationForceUpdate: @ 0x080042AC strb r2, [r0, #0x1f] b _080042C0 - thumb_func_start sub_080042B8 -sub_080042B8: @ 0x080042B8 + thumb_func_start UpdateAnimationSingleFrame +UpdateAnimationSingleFrame: @ 0x080042B8 movs r1, #1 non_word_aligned_thumb_func_start sub_080042BA diff --git a/asm/code_08018500.s b/asm/code_08018500.s index 6445a966..5951e033 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -130,7 +130,7 @@ _080185D4: _080185EC: .4byte gUnk_0811E454 _080185F0: ldrb r0, [r2, #1] - bl sub_0801E7F4 + bl CheckKinstoneFused _080185F6: pop {pc} @@ -326,7 +326,7 @@ sub_08018738: @ 0x08018738 cmp r0, r1 bne _08018760 adds r0, r2, #0 - bl sub_0801E7F4 + bl CheckKinstoneFused adds r1, r0, #0 adds r0, r4, #0 bl sub_0801876C diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index 883b1621..aadd1127 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -2196,8 +2196,8 @@ _0801E7F0: _0801E7F2: pop {pc} - thumb_func_start sub_0801E7F4 -sub_0801E7F4: @ 0x0801E7F4 + thumb_func_start CheckKinstoneFused +CheckKinstoneFused: @ 0x0801E7F4 push {lr} adds r1, r0, #0 subs r0, r1, #1 @@ -2330,7 +2330,7 @@ sub_0801E8D4: @ 0x0801E8D4 movs r5, #0xa _0801E8D8: adds r0, r5, #0 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0801E990 adds r0, r5, #0 @@ -2478,7 +2478,7 @@ _0801E9F6: cmp r5, #0xff beq _0801EA14 adds r0, r5, #0 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0801EA10 _0801EA0A: @@ -2498,7 +2498,7 @@ _0801EA1C: cmp r5, #0xf2 beq _0801E9D6 adds r0, r5, #0 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0801EA34 movs r5, #0xf1 @@ -2552,7 +2552,7 @@ _0801EA84: adds r0, r5, r0 ldrb r4, [r0] adds r0, r4, #0 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _0801EA9C adds r0, r4, #0 diff --git a/asm/code_0804B058.s b/asm/code_0804B058.s index d2787ae5..008d524d 100644 --- a/asm/code_0804B058.s +++ b/asm/code_0804B058.s @@ -862,7 +862,7 @@ sub_0804B5D8: @ 0x0804B5D8 sub_0804B5DC: @ 0x0804B5DC push {r4, r5, r6, lr} movs r0, #0x2c - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804B5EE ldr r0, _0804B618 @ =gUnk_080D6340 diff --git a/asm/code_0804B9F8.s b/asm/code_0804B9F8.s index 2ddb309e..dc8fb1c7 100644 --- a/asm/code_0804B9F8.s +++ b/asm/code_0804B9F8.s @@ -748,7 +748,7 @@ sub_0804BE50: @ 0x0804BE50 bl SetLocalFlag _0804BE62: movs r0, #0x2f - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804BE78 ldr r0, _0804BE74 @ =gUnk_080D8B24 @@ -758,7 +758,7 @@ _0804BE62: _0804BE74: .4byte gUnk_080D8B24 _0804BE78: movs r0, #0x2b - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804BE90 ldr r0, _0804BE8C @ =gUnk_080D8AC4 @@ -768,7 +768,7 @@ _0804BE78: _0804BE8C: .4byte gUnk_080D8AC4 _0804BE90: movs r0, #0x26 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804BEA8 ldr r0, _0804BEA4 @ =gUnk_080D8A74 @@ -778,7 +778,7 @@ _0804BE90: _0804BEA4: .4byte gUnk_080D8A74 _0804BEA8: movs r0, #0x2a - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804BEC0 ldr r0, _0804BEBC @ =gUnk_080D8A34 @@ -788,7 +788,7 @@ _0804BEA8: _0804BEBC: .4byte gUnk_080D8A34 _0804BEC0: movs r0, #0x25 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804BED8 ldr r0, _0804BED4 @ =gUnk_080D8A04 @@ -801,7 +801,7 @@ _0804BED8: bl LoadRoomEntityList _0804BEDE: movs r0, #0x25 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804BEF2 ldr r0, _0804BF20 @ =gUnk_080D8BBC @@ -810,7 +810,7 @@ _0804BEDE: bl sub_0807BB68 _0804BEF2: movs r0, #0x26 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804BF06 ldr r0, _0804BF28 @ =gUnk_080D8BFA @@ -819,7 +819,7 @@ _0804BEF2: bl sub_0807BB68 _0804BF06: movs r0, #0x2f - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804BF1A ldr r0, _0804BF30 @ =gUnk_080D8C68 @@ -1376,7 +1376,7 @@ sub_0804C334: @ 0x0804C334 movs r0, #0x1e bl SetGlobalFlag movs r0, #0x5b - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804C34C ldr r0, _0804C374 @ =gUnk_080D9CC8 @@ -2778,7 +2778,7 @@ sub_0804CB10: @ 0x0804CB10 sub_0804CB14: @ 0x0804CB14 push {lr} movs r0, #0x41 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804CB26 ldr r0, _0804CB28 @ =gUnk_080DDE88 @@ -6471,7 +6471,7 @@ sub_0804DE00: @ 0x0804DE00 push {r4, r5, r6, lr} bl sub_080530C8 movs r0, #0xb - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804DE32 movs r0, #0x19 @@ -6611,14 +6611,14 @@ _0804DF2E: bl LoadRoomEntityList _0804DF48: movs r0, #0x28 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _0804DF58 ldr r0, _0804DF8C @ =gUnk_080EE8FC bl LoadRoomEntityList _0804DF58: movs r0, #0x33 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804DF68 ldr r0, _0804DF90 @ =gUnk_080EE91C @@ -6644,7 +6644,7 @@ _0804DF98: bl LoadRoomEntityList _0804DF9E: movs r0, #0x1b - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804E02A ldr r0, _0804DFF8 @ =gUnk_02002A40 @@ -6741,7 +6741,7 @@ _0804E07A: cmp r0, #4 bls _0804E0B0 movs r0, #0xb - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _0804E0B0 movs r0, #0x2b @@ -7515,7 +7515,7 @@ sub_0804E614: @ 0x0804E614 sub_0804E618: @ 0x0804E618 push {lr} movs r0, #0x21 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804E67A movs r0, #0x42 @@ -8037,7 +8037,7 @@ sub_0804E9D0: @ 0x0804E9D0 bl LoadRoomEntityList _0804E9EC: movs r0, #0x12 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804E9FC ldr r0, _0804EAC8 @ =gUnk_080F3C94 @@ -8401,7 +8401,7 @@ _0804EC5E: bl LoadRoomEntityList _0804EC64: movs r0, #0x4e - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804EC74 ldr r0, _0804EC8C @ =gUnk_080F4F10 @@ -8987,7 +8987,7 @@ sub_0804F0C0: @ 0x0804F0C0 bl SetLocalFlag _0804F0D6: movs r0, #0xf - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804F0E6 ldr r0, _0804F118 @ =gUnk_080F61BC @@ -9465,7 +9465,7 @@ _0804F3EC: bl LoadRoomEntityList _0804F406: movs r0, #0x29 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _0804F42A ldr r0, _0804F44C @ =gUnk_080F7860 @@ -10214,7 +10214,7 @@ sub_0804FA68: @ 0x0804FA68 movs r0, #0 bl sub_0805ADD8 movs r0, #0x21 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804FA8E movs r0, #0x80 @@ -10658,7 +10658,7 @@ nullsub_433: @ 0x0804FC48 sub_0804FC4C: @ 0x0804FC4C push {lr} movs r0, #0xe - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _0804FC5E ldr r1, _0804FC64 @ =gRoomVars @@ -10739,7 +10739,7 @@ sub_0804FCA4: @ 0x0804FCA4 sub_0804FCA8: @ 0x0804FCA8 push {lr} movs r0, #0x14 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0804FCBA ldr r0, _0804FCCC @ =gUnk_080F9FA8 @@ -10926,7 +10926,7 @@ sub_0804FD54: @ 0x0804FD54 sub_0804FD58: @ 0x0804FD58 push {lr} movs r0, #0x21 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _0804FD6A ldr r0, _0804FD6C @ =gUnk_080FA5D0 diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index 9226f2fb..5464aa7a 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -779,7 +779,7 @@ _0806F304: b _0806F320 _0806F30C: adds r0, r4, #0 - bl sub_0801E7F4 + bl CheckKinstoneFused b _0806F320 _0806F314: adds r0, r4, #0 diff --git a/asm/code_08070698.s b/asm/code_08070698.s index f32dbe08..cfe246e3 100644 --- a/asm/code_08070698.s +++ b/asm/code_08070698.s @@ -165,7 +165,7 @@ sub_08070794: @ 0x08070794 cmp r0, #2 bne _080707F8 ldr r0, _080707F4 @ =gLinkEntity - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08070800 .align 2, 0 _080707F0: .4byte gLinkState @@ -495,7 +495,7 @@ _08070A94: b _08070BE4 _08070A9E: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08070BE4 .align 2, 0 _08070AA8: .4byte gLinkState @@ -643,7 +643,7 @@ _08070BBC: cmp r0, #0 bne _08070BC8 adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08070BC8: adds r0, r4, #0 adds r0, #0x26 @@ -770,7 +770,7 @@ _08070C7E: sub_08070CB4: @ 0x08070CB4 push {r4, r5, lr} adds r5, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r5, #0 adds r0, #0x5a ldrb r1, [r0] @@ -907,7 +907,7 @@ _08070DC0: .4byte gLinkState sub_08070DC4: @ 0x08070DC4 push {r4, r5, r6, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080085B0 bl sub_08079E08 @@ -1084,7 +1084,7 @@ _08070F20: .4byte 0x00000C18 sub_08070F24: @ 0x08070F24 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, _08070F4C @ =gTextBox ldrb r1, [r0] movs r0, #0x7f @@ -1211,7 +1211,7 @@ _0807101C: .4byte gLinkState sub_08071020: @ 0x08071020 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r0, [r0] @@ -1226,7 +1226,7 @@ _08071036: sub_08071038: @ 0x08071038 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame bl sub_08078EFC cmp r0, #0 bne _08071078 @@ -1357,7 +1357,7 @@ sub_08071130: @ 0x08071130 cmp r0, #0 bne _08071158 adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r5, #0 adds r0, #0x5a ldrb r1, [r0] @@ -1467,7 +1467,7 @@ sub_08071208: @ 0x08071208 cmp r0, #0 bne _08071228 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08071228: ldrb r0, [r4, #0xe] subs r0, #1 @@ -1576,7 +1576,7 @@ _080712EC: .4byte 0x0000044C sub_080712F0: @ 0x080712F0 push {r4, r5, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r5, #0 ldr r3, _08071314 @ =gLinkState ldr r0, [r3, #0x30] @@ -1750,7 +1750,7 @@ _08071444: adds r0, r4, #0 bl sub_08073904 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r2, _080714A0 @ =gLinkState ldrb r0, [r2, #2] cmp r0, #0 @@ -1885,7 +1885,7 @@ _08071542: cmp r0, #0 bne _08071566 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0807156A .align 2, 0 _0807155C: .4byte gArea @@ -1934,7 +1934,7 @@ sub_080715AC: @ 0x080715AC cmp r0, #0 bne _080715CC adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, _080715D0 @ =gLinkState ldr r0, [r0, #0x30] movs r1, #0x80 @@ -2163,7 +2163,7 @@ _08071754: movs r3, #0 bl sub_0805EC9C adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r3} mov r8, r3 pop {r4, r5, r6, r7, pc} @@ -2408,7 +2408,7 @@ _08071938: sub_0807193C: @ 0x0807193C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -2539,7 +2539,7 @@ _08071A24: _08071A40: .4byte 0x000003C7 _08071A44: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08071A4A: pop {r4, pc} @@ -2547,7 +2547,7 @@ _08071A4A: sub_08071A4C: @ 0x08071A4C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r4, #0x5a ldrb r1, [r4] movs r0, #0x80 @@ -2641,7 +2641,7 @@ sub_08071AF0: @ 0x08071AF0 movs r1, #0 strh r1, [r0] adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xa] cmp r0, #1 bne _08071B44 @@ -2860,7 +2860,7 @@ _08071CA8: .4byte 0xFEDBF2FE sub_08071CAC: @ 0x08071CAC push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -2905,7 +2905,7 @@ _08071D00: .4byte 0x00000C1B sub_08071D04: @ 0x08071D04 push {r4, r5, lr} adds r5, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r5, #0 adds r0, #0x5a ldrb r0, [r0] @@ -2967,7 +2967,7 @@ _08071D7C: .4byte gUnk_030010A0 sub_08071D80: @ 0x08071D80 push {r4, r5, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r5, _08071DB4 @ =gLinkState movs r0, #1 strb r0, [r5, #0x14] @@ -3063,7 +3063,7 @@ sub_08071E04: @ 0x08071E04 _08071E34: .4byte gLinkState _08071E38: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame bl sub_08079B24 cmp r0, #0 bne _08071E4E @@ -3177,7 +3177,7 @@ _08071F12: sub_08071F14: @ 0x08071F14 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r4, #0x5a ldrb r1, [r4] movs r0, #0x80 @@ -3376,7 +3376,7 @@ _08072094: .4byte gLinkState sub_08072098: @ 0x08072098 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] cmp r0, #0 beq _080720B4 @@ -3488,7 +3488,7 @@ _08072158: sub_08072168: @ 0x08072168 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r2, #0xc rsbs r2, r2, #0 adds r0, r4, #0 @@ -3620,7 +3620,7 @@ sub_08072260: @ 0x08072260 strh r0, [r1] bl sub_08079E08 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] @@ -3742,7 +3742,7 @@ sub_08072354: @ 0x08072354 movs r1, #0 bl sub_0806F854 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08079744 movs r1, #0x80 @@ -3793,7 +3793,7 @@ _080723CC: .4byte 0xFFFFFBFF sub_080723D0: @ 0x080723D0 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] @@ -3900,7 +3900,7 @@ sub_08072490: @ 0x08072490 cmp r0, #0xff beq _080724AE adds r0, r1, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame bl sub_08079E08 b _080724C2 _080724AE: @@ -3978,7 +3978,7 @@ _08072538: cmp r0, #0 bne _08072588 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08072588 .align 2, 0 _08072548: .4byte gLinkState @@ -4055,7 +4055,7 @@ _080725D4: .4byte gLinkState _080725D8: .4byte gLinkEntity _080725DC: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08072604 _080725E4: ldr r2, _08072624 @ =gLinkState @@ -4414,7 +4414,7 @@ _08072886: str r1, [r0, #0x30] _0807289A: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080728A0: pop {r4, r5, pc} .align 2, 0 @@ -4692,7 +4692,7 @@ _08072ABC: b _08072ACA _08072AC4: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08072ACA: pop {pc} @@ -4889,7 +4889,7 @@ _08072C44: .4byte gLinkState sub_08072C48: @ 0x08072C48 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806F69C movs r1, #0x80 @@ -5025,7 +5025,7 @@ _08072D50: .4byte gLinkState sub_08072D54: @ 0x08072D54 push {r4, r5, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r2, #0xc rsbs r2, r2, #0 adds r0, r4, #0 @@ -5259,7 +5259,7 @@ sub_08072F14: @ 0x08072F14 b _08072F32 _08072F2C: adds r0, r1, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08072F32: pop {pc} @@ -5547,7 +5547,7 @@ _08073178: b _080731A4 _0807317E: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index f507a8d7..9ebf460f 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -10,7 +10,7 @@ sub_080732D0: @ 0x080732D0 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080002B8 cmp r0, #0x28 @@ -54,7 +54,7 @@ _08073328: sub_0807332C: @ 0x0807332C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, _08073344 @ =gLinkState adds r0, #0x39 ldrb r0, [r0] @@ -130,7 +130,7 @@ _080733B8: .4byte gUnk_03001000 sub_080733BC: @ 0x080733BC push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrh r1, [r4, #0x2e] movs r0, #0xf ands r0, r1 @@ -354,7 +354,7 @@ _08073516: bl PlaySFX _08073576: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08073580: .4byte gLinkState @@ -579,7 +579,7 @@ _0807371C: .4byte gUnk_0811BC28 _08073720: .4byte gArea _08073724: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0807372E _0807372C: strh r0, [r6, #8] @@ -604,7 +604,7 @@ _08073736: cmp r0, r1 bne _08073760 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08073762 .align 2, 0 _0807375C: .4byte gUnk_0811BC30 @@ -665,7 +665,7 @@ _080737BA: sub_080737BC: @ 0x080737BC push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806F69C ldr r0, [r4, #0x34] @@ -759,7 +759,7 @@ _08073860: str r0, [r4, #0x20] _0807387A: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 @@ -820,7 +820,7 @@ _080738F0: adds r0, r4, #0 bl sub_08003FC4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08073900: .4byte 0xFFFFE800 @@ -1188,7 +1188,7 @@ sub_08073B8C: @ 0x08073B8C cmp r0, #0 bne _08073BB8 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08073BB8: ldrb r1, [r4, #0x10] movs r0, #0x7f @@ -1276,7 +1276,7 @@ _08073C58: orrs r0, r1 strb r0, [r2, #0x10] adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08073C66: pop {pc} @@ -1560,7 +1560,7 @@ _08073E90: bl sub_0806F948 _08073E9E: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0807B068 movs r0, #0x10 @@ -1787,7 +1787,7 @@ _08074048: movs r3, #0 bl sub_0805EC9C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} thumb_func_start sub_08074060 @@ -1845,7 +1845,7 @@ _080740C8: .4byte gLinkState _080740CC: .4byte 0x0000080C _080740D0: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080740D6: pop {r4, pc} @@ -1853,7 +1853,7 @@ _080740D6: sub_080740D8: @ 0x080740D8 push {r4, r5, r6, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xf] cmp r0, #0 bne _080740EA @@ -3519,7 +3519,7 @@ _08074D20: adds r0, r5, #0 bl sub_08003FC4 adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, r6, pc} .align 2, 0 @@ -3866,7 +3866,7 @@ _08074F88: .4byte 0x00000737 sub_08074F8C: @ 0x08074F8C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r3, r4, #0 adds r3, #0x5a ldrb r0, [r3] @@ -3918,7 +3918,7 @@ _08074FEA: sub_08074FEC: @ 0x08074FEC push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] @@ -4005,7 +4005,7 @@ _08075088: .4byte 0x0000080C sub_0807508C: @ 0x0807508C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 @@ -4099,7 +4099,7 @@ _08075138: .4byte 0x00000734 sub_0807513C: @ 0x0807513C push {r4, r5, lr} adds r5, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r4, r5, #0 adds r4, #0x5a ldrb r0, [r4] @@ -4164,7 +4164,7 @@ _080751B0: .4byte 0x000003C9 sub_080751B4: @ 0x080751B4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index c2be8ef6..1346db67 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -365,7 +365,7 @@ UpdateItemAnim: @ 0x08077E24 push {r4, lr} adds r4, r0, #0 ldr r0, _08077E38 @ =gLinkEntity - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08077E54 pop {r4, pc} @@ -3951,7 +3951,7 @@ _0807991E: cmp r0, #0 bne _0807992E ldr r0, _08079934 @ =gLinkEntity - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0807992E: pop {r4, r5, pc} .align 2, 0 @@ -4216,7 +4216,7 @@ _08079AF0: cmp r0, r3 bne _08079B10 ldr r0, _08079B1C @ =gLinkEntity - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08079B10: ldr r0, _08079B20 @ =gLinkState strb r4, [r0] @@ -7284,7 +7284,7 @@ _0807B218: .4byte 0x000002C2 sub_0807B21C: @ 0x0807B21C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, [r4, #0x20] cmp r0, #0 bge _0807B236 @@ -7323,7 +7323,7 @@ _0807B260: .4byte 0xFFFF8000 sub_0807B264: @ 0x0807B264 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xf] adds r0, #2 strb r0, [r4, #0xf] @@ -7369,7 +7369,7 @@ sub_0807B2B8: @ 0x0807B2B8 ldr r1, _0807B2F0 @ =0xFFFFE000 bl sub_08003FC4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] cmp r0, #0 beq _0807B2EC diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index 2dd5e599..7e85306b 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -3332,7 +3332,7 @@ sub_0807E40C: @ 0x0807E40C adds r4, r1, #0 ldr r0, [r4] ldrh r0, [r0, #2] - bl sub_0801E7F4 + bl CheckKinstoneFused str r0, [r4, #0x14] ldr r2, _0807E428 @ =gUnk_02033280 ldrb r1, [r2, #7] diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index 7740bca7..a6015e72 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -2367,7 +2367,7 @@ _080A67E6: b _080A6822 _080A67F4: movs r0, #0xe - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _080A6822 movs r5, #0x71 @@ -2527,7 +2527,7 @@ _080A693A: movs r5, #0xa _080A6942: adds r0, r5, #0 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _080A6976 adds r0, r5, #0 @@ -5369,7 +5369,7 @@ _080A7F56: adds r0, #1 strh r0, [r4, #0x32] adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080A7F7A: pop {r4, pc} .align 2, 0 @@ -8683,7 +8683,7 @@ _080A983C: bl sub_080A99F0 _080A9848: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r5, r4, #0 adds r5, #0x78 ldrh r0, [r5] @@ -9429,7 +9429,7 @@ sub_080A9D80: @ 0x080A9D80 ldr r0, _080A9DA0 @ =0x0000FFFE strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _080A9D9C: .4byte 0xFFFF0000 @@ -9607,7 +9607,7 @@ sub_080A9EBC: @ 0x080A9EBC adds r0, r4, #0 bl sub_080AF090 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r5, r4, #0 adds r5, #0x42 b _080A9F4A @@ -9725,14 +9725,14 @@ _080A9FB8: bl sub_080AA320 _080A9FC8: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} thumb_func_start sub_080A9FD0 sub_080A9FD0: @ 0x080A9FD0 push {r4, r5, lr} adds r5, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r2, r5, #0 adds r2, #0x5a ldrb r1, [r2] @@ -9845,7 +9845,7 @@ _080AA0A2: b _080AA108 _080AA0B8: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -9980,7 +9980,7 @@ _080AA1C4: adds r0, r6, #0 bl sub_0806F69C adds r0, r6, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r3, r4} mov r8, r3 mov sb, r4 @@ -10783,7 +10783,7 @@ _080AA7DA: cmp r0, #0 beq _080AA812 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r5, r4, #0 adds r5, #0x5a ldrb r1, [r5] @@ -10869,7 +10869,7 @@ sub_080AA878: @ 0x080AA878 cmp r0, #0 bne _080AA88E adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080AA88E: adds r0, r4, #0 bl sub_080AA9E0 @@ -10979,7 +10979,7 @@ _080AA920: cmp r0, #0 bne _080AA99A adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r1, [r5] movs r0, #1 ands r0, r1 diff --git a/asm/code_080AD90C.s b/asm/code_080AD90C.s index 08a8326d..e111da75 100644 --- a/asm/code_080AD90C.s +++ b/asm/code_080AD90C.s @@ -236,7 +236,7 @@ sub_080ADAA8: @ 0x080ADAA8 b _080ADAD2 _080ADACC: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080ADAD2: pop {r4, pc} @@ -440,7 +440,7 @@ _080ADC48: b _080ADC5C _080ADC56: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080ADC5C: pop {r4, pc} .align 2, 0 @@ -463,7 +463,7 @@ sub_080ADC60: @ 0x080ADC60 b _080ADC82 _080ADC7C: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080ADC82: pop {pc} diff --git a/asm/crenalBeanSprout.s b/asm/crenalBeanSprout.s index 9c4b623f..f8d5f05d 100644 --- a/asm/crenalBeanSprout.s +++ b/asm/crenalBeanSprout.s @@ -547,7 +547,7 @@ sub_08096740: @ 0x08096740 sub_08096758: @ 0x08096758 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/cucco.s b/asm/cucco.s index b3b08003..7760fea2 100644 --- a/asm/cucco.s +++ b/asm/cucco.s @@ -98,7 +98,7 @@ _0806E552: adds r0, r5, #0 bl sub_0806E65C adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 _0806E560: .4byte gUnk_081145C8 @@ -164,7 +164,7 @@ _0806E5D4: adds r0, r4, #0 bl sub_0806E65C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 @@ -215,7 +215,7 @@ _0806E638: adds r0, r4, #0 bl sub_0806E65C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 @@ -321,7 +321,7 @@ sub_0806E6E0: @ 0x0806E6E0 b _0806E70C _0806E706: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806E70C: pop {pc} .align 2, 0 diff --git a/asm/dampe.s b/asm/dampe.s index 1b833ddf..d9b74529 100644 --- a/asm/dampe.s +++ b/asm/dampe.s @@ -68,7 +68,7 @@ _0806BE1C: b _0806BE3A _0806BE26: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl UpdateFuseInteraction cmp r0, #0 @@ -113,7 +113,7 @@ sub_0806BE54: @ 0x0806BE54 b _0806BE80 _0806BE7A: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806BE80: pop {pc} .align 2, 0 diff --git a/asm/darkNut.s b/asm/darkNut.s index 280725c3..28042944 100644 --- a/asm/darkNut.s +++ b/asm/darkNut.s @@ -298,7 +298,7 @@ _08020DB0: sub_08020DB4: @ 0x08020DB4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -351,7 +351,7 @@ _08020E1A: adds r0, r4, #0 bl sub_080AEF88 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08020E26: pop {r4, pc} @@ -359,7 +359,7 @@ _08020E26: sub_08020E28: @ 0x08020E28 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -385,7 +385,7 @@ sub_08020E48: @ 0x08020E48 b _08020E76 _08020E5C: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -402,7 +402,7 @@ _08020E76: sub_08020E78: @ 0x08020E78 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -486,7 +486,7 @@ _08020F26: sub_08020F28: @ 0x08020F28 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -577,7 +577,7 @@ _08020FCC: b _08020FE2 _08020FDC: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08020FE2: pop {pc} @@ -585,7 +585,7 @@ _08020FE2: sub_08020FE4: @ 0x08020FE4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] @@ -608,7 +608,7 @@ _0802100C: sub_08021010: @ 0x08021010 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -673,7 +673,7 @@ _08021088: b _080210A4 _08021090: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r5] cmp r0, #4 bne _080210A4 @@ -690,7 +690,7 @@ _080210A4: sub_080210A8: @ 0x080210A8 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r2, r4, #0 adds r2, #0x5a ldrb r1, [r2] @@ -721,7 +721,7 @@ _080210E2: sub_080210E4: @ 0x080210E4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r2, r4, #0 adds r2, #0x5a ldrb r1, [r2] @@ -812,7 +812,7 @@ _08021190: b _0802119E _08021198: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0802119E: pop {pc} @@ -828,7 +828,7 @@ sub_080211A0: @ 0x080211A0 b _080211CE _080211B4: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -845,7 +845,7 @@ _080211CE: sub_080211D0: @ 0x080211D0 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0802159C adds r0, r4, #0 @@ -864,7 +864,7 @@ _080211F2: sub_080211F4: @ 0x080211F4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08021600 adds r0, r4, #0 @@ -926,7 +926,7 @@ sub_0802124C: @ 0x0802124C b _08021272 _0802126C: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08021272: pop {r4, pc} @@ -1278,7 +1278,7 @@ _080214E8: _080214F0: .4byte gUnk_020000B0 _080214F4: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080214FA: pop {r4, r5, pc} diff --git a/asm/deathFx.s b/asm/deathFx.s index b88f9add..aa2cb1da 100644 --- a/asm/deathFx.s +++ b/asm/deathFx.s @@ -173,7 +173,7 @@ _0808175E: sub_08081760: @ 0x08081760 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/din.s b/asm/din.s index 59a73906..f0c6de2f 100644 --- a/asm/din.s +++ b/asm/din.s @@ -133,7 +133,7 @@ sub_08064860: @ 0x08064860 b _0806488C _08064886: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806488C: pop {pc} .align 2, 0 diff --git a/asm/dog.s b/asm/dog.s index f1448b1b..87b25169 100644 --- a/asm/dog.s +++ b/asm/dog.s @@ -153,7 +153,7 @@ _08069C3C: .4byte gRoomControls sub_08069C40: @ 0x08069C40 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08069F90 cmp r0, #0 @@ -301,7 +301,7 @@ sub_08069D54: @ 0x08069D54 cmp r0, #0 beq _08069DD8 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080AEF88 ldrh r1, [r4, #0x2a] @@ -377,7 +377,7 @@ _08069DF6: sub_08069DF8: @ 0x08069DF8 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08069F90 cmp r0, #0 @@ -435,7 +435,7 @@ sub_08069E50: @ 0x08069E50 adds r0, r4, #0 bl sub_0806A028 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r6, r4, #0 adds r6, #0x58 ldrb r0, [r6] @@ -496,7 +496,7 @@ _08069EDC: thumb_func_start sub_08069EE0 sub_08069EE0: @ 0x08069EE0 push {lr} - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {pc} thumb_func_start sub_08069EE8 diff --git a/asm/enemy4D.s b/asm/enemy4D.s index af5a7156..65d0b4a5 100644 --- a/asm/enemy4D.s +++ b/asm/enemy4D.s @@ -364,7 +364,7 @@ sub_0803ED7C: @ 0x0803ED7C cmp r0, #0 bne _0803ED94 adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0803EDD0 _0803ED94: ldrb r0, [r2, #0xe] diff --git a/asm/enemy64.s b/asm/enemy64.s index fab119ba..acee6c5b 100644 --- a/asm/enemy64.s +++ b/asm/enemy64.s @@ -212,7 +212,7 @@ sub_080491EC: @ 0x080491EC adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08049208: .4byte gUnk_080D2988 @@ -312,7 +312,7 @@ sub_080492A8: @ 0x080492A8 adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _080492C4: .4byte gUnk_080D2990 @@ -685,7 +685,7 @@ sub_08049574: @ 0x08049574 adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08049590: .4byte gUnk_080D29A8 @@ -866,7 +866,7 @@ sub_080496CC: @ 0x080496CC adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _080496E8: .4byte gUnk_080D29C0 diff --git a/asm/enemyE.s b/asm/enemyE.s index 7d0e2887..0717d7a5 100644 --- a/asm/enemyE.s +++ b/asm/enemyE.s @@ -74,7 +74,7 @@ sub_08023000: @ 0x08023000 adds r4, r0, #0 cmp r1, #0x80 bne _0802300E - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08023014 _0802300E: adds r0, r4, #0 diff --git a/asm/ezloCap.s b/asm/ezloCap.s index acfa13f0..3227fc56 100644 --- a/asm/ezloCap.s +++ b/asm/ezloCap.s @@ -28,7 +28,7 @@ _0806D888: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 @@ -316,7 +316,7 @@ sub_0806DAAC: @ 0x0806DAAC bl sub_0806DA3C lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0801E7F4 + bl CheckKinstoneFused str r0, [r4, #0x14] ldr r2, _0806DACC @ =gUnk_02033280 ldrb r1, [r2, #7] diff --git a/asm/farmers.s b/asm/farmers.s index dd871377..2b8c6c88 100644 --- a/asm/farmers.s +++ b/asm/farmers.s @@ -200,6 +200,6 @@ sub_0806BCFC: @ 0x0806BCFC _0806BD48: .4byte gUnk_08113140 _0806BD4C: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806BD52: pop {r4, pc} diff --git a/asm/farore.s b/asm/farore.s index 21ec175d..c1a63c80 100644 --- a/asm/farore.s +++ b/asm/farore.s @@ -133,7 +133,7 @@ sub_08064A60: @ 0x08064A60 b _08064A8C _08064A86: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08064A8C: pop {pc} .align 2, 0 diff --git a/asm/festari.s b/asm/festari.s index c4c4d06d..c2fb5a41 100644 --- a/asm/festari.s +++ b/asm/festari.s @@ -104,7 +104,7 @@ _0805FEC6: bl InitAnimationForceUpdate _0805FED8: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r5, #0 adds r0, #0x5a ldrb r1, [r0] @@ -244,7 +244,7 @@ sub_0805FFA0: @ 0x0805FFA0 b _0805FFD4 _0805FFCE: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0805FFD4: pop {r4, pc} .align 2, 0 \ No newline at end of file diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index 8ba1973a..ff0e7c7e 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -793,7 +793,7 @@ _08088194: b _08088262 _0808819E: ldrh r0, [r1, #4] - bl sub_0801E7F4 + bl CheckKinstoneFused b _08088262 _080881A6: ldrh r0, [r1, #4] @@ -815,16 +815,16 @@ _080881BC: @ jump table .4byte _08088252 @ case 5 _080881D4: movs r0, #0x20 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08088266 movs r0, #0x10 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08088266 movs r0, #0x19 _080881EA: - bl sub_0801E7F4 + bl CheckKinstoneFused b _08088262 _080881F0: adds r0, r2, #0 @@ -836,39 +836,39 @@ _080881F0: b _080881EA _080881FE: movs r0, #0x54 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08088266 movs r0, #0x56 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08088266 movs r0, #0x3d - bl sub_0801E7F4 + bl CheckKinstoneFused b _08088262 _0808821A: movs r0, #0x3b - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08088266 movs r0, #0x4a - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08088266 movs r0, #0xd - bl sub_0801E7F4 + bl CheckKinstoneFused b _08088262 _08088236: movs r0, #0x49 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08088266 movs r0, #0x55 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08088266 movs r0, #0x3c - bl sub_0801E7F4 + bl CheckKinstoneFused b _08088262 _08088252: adds r0, r2, #0 diff --git a/asm/forestMinish.s b/asm/forestMinish.s index 70f02076..e2fcd3c8 100644 --- a/asm/forestMinish.s +++ b/asm/forestMinish.s @@ -284,7 +284,7 @@ sub_080601D4: @ 0x080601D4 b _080601F2 _080601E6: movs r0, #0x17 - bl sub_0801E7F4 + bl CheckKinstoneFused rsbs r1, r0, #0 orrs r1, r0 lsrs r1, r1, #0x1f diff --git a/asm/gentari.s b/asm/gentari.s index 9ce92fd2..35811ad6 100644 --- a/asm/gentari.s +++ b/asm/gentari.s @@ -109,7 +109,7 @@ sub_0805FDC0: @ 0x0805FDC0 b _0805FDF4 _0805FDEE: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0805FDF4: pop {r4, pc} .align 2, 0 diff --git a/asm/gentariCurtains.s b/asm/gentariCurtains.s index 6896823e..93c2cac1 100644 --- a/asm/gentariCurtains.s +++ b/asm/gentariCurtains.s @@ -159,7 +159,7 @@ _08092160: sub_08092164: @ 0x08092164 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/ghostBrothers.s b/asm/ghostBrothers.s index 05b548ee..2df0f99b 100644 --- a/asm/ghostBrothers.s +++ b/asm/ghostBrothers.s @@ -406,7 +406,7 @@ _08065EA4: bl DeleteThisEntity _08065EB0: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08065EB8: .4byte gUnk_02018EB0 @@ -469,7 +469,7 @@ _08065F1C: sub_08065F20: @ 0x08065F20 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r1, r4, #0 adds r1, #0x39 movs r0, #0 @@ -547,7 +547,7 @@ sub_08065F90: @ 0x08065F90 b _08065FBC _08065FB6: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08065FBC: pop {pc} .align 2, 0 diff --git a/asm/gibdo.s b/asm/gibdo.s index 8051da47..ea925090 100644 --- a/asm/gibdo.s +++ b/asm/gibdo.s @@ -194,7 +194,7 @@ sub_080375A4: @ 0x080375A4 b _080375F4 _080375D2: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080AEF88 cmp r0, #0 @@ -259,9 +259,9 @@ sub_08037624: @ 0x08037624 b _0803768E _08037652: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080AEF88 cmp r0, #0 @@ -291,7 +291,7 @@ _0803768E: sub_08037690: @ 0x08037690 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -341,7 +341,7 @@ sub_080376D0: @ 0x080376D0 adds r1, r4, #0 bl sub_0806FA6C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r2, r4, #0 adds r2, #0x5a ldrb r1, [r2] @@ -377,7 +377,7 @@ _0803773A: sub_0803773C: @ 0x0803773C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/gina.s b/asm/gina.s index 02144144..5b211309 100644 --- a/asm/gina.s +++ b/asm/gina.s @@ -104,7 +104,7 @@ sub_0806C1D4: @ 0x0806C1D4 b _0806C200 _0806C1FA: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806C200: pop {pc} .align 2, 0 diff --git a/asm/gleerok.s b/asm/gleerok.s index 8244c15a..5dd1e7bb 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -1193,7 +1193,7 @@ _0802D94C: cmp r0, #0 bne _0802D95E adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0802DB7E _0802D95E: movs r1, #0xc0 @@ -1243,7 +1243,7 @@ _0802D9A2: b _0802DB7E _0802D9B8: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -2977,7 +2977,7 @@ _0802E6CA: b _0802E6E8 _0802E6E2: adds r0, r1, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0802E6E8: movs r6, #0 _0802E6EA: diff --git a/asm/goron.s b/asm/goron.s index c6d27a67..b5b9bfd2 100644 --- a/asm/goron.s +++ b/asm/goron.s @@ -111,7 +111,7 @@ _0806938E: sub_08069390: @ 0x08069390 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, _080693C0 @ =gTextBox ldrb r0, [r0] movs r1, #0x7f @@ -245,7 +245,7 @@ sub_0806948C: @ 0x0806948C bl sub_08069480 lsls r0, r0, #0x18 lsrs r0, r0, #0x18 - bl sub_0801E7F4 + bl CheckKinstoneFused str r0, [r4, #0x14] ldr r2, _080694AC @ =gUnk_02033280 ldrb r1, [r2, #7] @@ -264,7 +264,7 @@ sub_080694B0: @ 0x080694B0 lsls r0, r0, #0x18 lsrs r5, r0, #0x18 adds r0, r5, #0 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _080694CE adds r0, r4, #0 @@ -297,7 +297,7 @@ sub_080694EC: @ 0x080694EC strb r0, [r4, #0x14] movs r5, #2 movs r0, #0x2f - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 bne _08069502 movs r5, #8 @@ -333,7 +333,7 @@ sub_08069514: @ 0x08069514 b _08069540 _0806953A: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08069540: pop {pc} .align 2, 0 diff --git a/asm/goronMerchant.s b/asm/goronMerchant.s index 1e5d2006..3d6ccf15 100644 --- a/asm/goronMerchant.s +++ b/asm/goronMerchant.s @@ -101,7 +101,7 @@ _080695E6: sub_080695E8: @ 0x080695E8 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, _08069618 @ =gTextBox ldrb r0, [r0] movs r1, #0x7f @@ -133,7 +133,7 @@ sub_0806961C: @ 0x0806961C cmp r0, #2 bne _08069630 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08069630: adds r0, r4, #0 bl sub_0806FD3C diff --git a/asm/gregal.s b/asm/gregal.s index f9bec8e4..fe3db83c 100644 --- a/asm/gregal.s +++ b/asm/gregal.s @@ -380,7 +380,7 @@ sub_0806CD70: @ 0x0806CD70 b _0806CDA4 _0806CD9E: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806CDA4: pop {r4, pc} .align 2, 0 diff --git a/asm/gyorgMale.s b/asm/gyorgMale.s index 8eeda1e1..116f2393 100644 --- a/asm/gyorgMale.s +++ b/asm/gyorgMale.s @@ -165,7 +165,7 @@ sub_08046910: @ 0x08046910 adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _0804692C: .4byte gUnk_080D1B1C @@ -397,7 +397,7 @@ _08046ABA: adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x7c ldrb r0, [r0] @@ -704,7 +704,7 @@ _08046D0A: adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, [r4, #0x64] ldr r0, [r0] adds r0, #0x6c @@ -1030,7 +1030,7 @@ _08046F82: adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r1, r4, #0 adds r1, #0x7e ldrh r0, [r1] @@ -1576,7 +1576,7 @@ _0804738A: adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x45 ldrb r1, [r0] @@ -2109,7 +2109,7 @@ sub_08047778: @ 0x08047778 adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08047794: .4byte gUnk_080D1BDC @@ -2644,7 +2644,7 @@ sub_08047B84: @ 0x08047B84 adds r0, r4, #0 bl _call_via_r1 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08047BA0: .4byte gUnk_080D1BF4 diff --git a/asm/itemOnGround.s b/asm/itemOnGround.s index f0d8337d..1fff7d25 100644 --- a/asm/itemOnGround.s +++ b/asm/itemOnGround.s @@ -447,7 +447,7 @@ _08080CD4: _08080CEC: .4byte gUnk_080C9CBC _08080CF0: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0x18] lsls r0, r0, #0x1e cmp r0, #0 @@ -1079,7 +1079,7 @@ _0808126A: sub_0808126C: @ 0x0808126C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0808153C pop {r4, pc} diff --git a/asm/jarPortal.s b/asm/jarPortal.s index 42422e65..0abab156 100644 --- a/asm/jarPortal.s +++ b/asm/jarPortal.s @@ -151,7 +151,7 @@ _0808BF7A: _0808BF90: .4byte 0x00017FFF _0808BF94: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r1, #0x36 ldrsh r0, [r4, r1] cmp r0, #0 @@ -165,7 +165,7 @@ _0808BF94: b _0808BFD6 _0808BFB0: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r0, #0x36 ldrsh r1, [r4, r0] cmp r1, #0 @@ -325,7 +325,7 @@ _0808C0CE: _0808C0E4: .4byte 0x00017FFF _0808C0E8: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r1, #0x36 ldrsh r0, [r4, r1] cmp r0, #0 @@ -339,7 +339,7 @@ _0808C0E8: b _0808C126 _0808C104: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r1, #0x36 ldrsh r0, [r4, r1] cmp r0, #0 diff --git a/asm/keaton.s b/asm/keaton.s index 764e1595..88645811 100644 --- a/asm/keaton.s +++ b/asm/keaton.s @@ -144,7 +144,7 @@ _080324B4: strb r0, [r4, #0xe] _080324C2: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080324C8: pop {r4, pc} .align 2, 0 @@ -157,7 +157,7 @@ sub_080324CC: @ 0x080324CC cmp r0, #0 bne _080324F8 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -196,9 +196,9 @@ sub_080324FC: @ 0x080324FC bl InitAnimationForceUpdate _08032524: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xf] subs r1, r0, #1 strb r1, [r4, #0xf] @@ -266,7 +266,7 @@ _080325A4: b _080325C2 _080325AC: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrh r1, [r5] movs r0, #7 ands r0, r1 diff --git a/asm/kid.s b/asm/kid.s index 853805eb..666b8885 100644 --- a/asm/kid.s +++ b/asm/kid.s @@ -108,7 +108,7 @@ _0806217A: b _0806218A _08062184: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806218A: adds r0, r4, #0 bl sub_0806ED78 @@ -562,7 +562,7 @@ _080624D8: _080624E8: .4byte gLinkEntity _080624EC: adds r0, r7, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080624F2: adds r0, r7, #0 bl sub_0800451C diff --git a/asm/kingDaltus.s b/asm/kingDaltus.s index e564de8d..e835db10 100644 --- a/asm/kingDaltus.s +++ b/asm/kingDaltus.s @@ -117,7 +117,7 @@ _080666B4: cmp r0, #0 bne _080666C4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080666C4: adds r2, r4, #0 adds r2, #0x39 @@ -249,7 +249,7 @@ sub_08066780: @ 0x08066780 b _080667AC _080667A6: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080667AC: pop {pc} .align 2, 0 diff --git a/asm/lakitu.s b/asm/lakitu.s index b8dd08f0..90b969da 100644 --- a/asm/lakitu.s +++ b/asm/lakitu.s @@ -240,7 +240,7 @@ _0803C8E0: sub_0803C8E4: @ 0x0803C8E4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -297,7 +297,7 @@ _0803C94E: sub_0803C950: @ 0x0803C950 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -321,7 +321,7 @@ _0803C97A: sub_0803C97C: @ 0x0803C97C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -420,7 +420,7 @@ sub_0803CA0C: @ 0x0803CA0C strb r0, [r2] _0803CA3E: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0803CC08 pop {r4, pc} diff --git a/asm/lakituCloud.s b/asm/lakituCloud.s index 122b89f2..aa825d4a 100644 --- a/asm/lakituCloud.s +++ b/asm/lakituCloud.s @@ -140,7 +140,7 @@ _0803CDA4: .4byte 0x0000FFFE sub_0803CDA8: @ 0x0803CDA8 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r1, [r4, #0x15] movs r0, #0x80 ands r0, r1 diff --git a/asm/lavaPlatform.s b/asm/lavaPlatform.s index 3e29ee10..947b287c 100644 --- a/asm/lavaPlatform.s +++ b/asm/lavaPlatform.s @@ -124,7 +124,7 @@ _08092322: cmp r0, #0 bne _0809233E adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0809233E: pop {r4, pc} .align 2, 0 diff --git a/asm/librari.s b/asm/librari.s index 6194e7c0..fc696bb8 100644 --- a/asm/librari.s +++ b/asm/librari.s @@ -68,7 +68,7 @@ _0806B238: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0806B25C _0806B24E: adds r0, r4, #0 @@ -203,7 +203,7 @@ sub_0806B32C: @ 0x0806B32C b _0806B358 _0806B352: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806B358: pop {pc} .align 2, 0 diff --git a/asm/macroBook.s b/asm/macroBook.s index baf91023..17eba12c 100644 --- a/asm/macroBook.s +++ b/asm/macroBook.s @@ -75,7 +75,7 @@ sub_0809A78C: @ 0x0809A78C sub_0809A7F4: @ 0x0809A7F4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0809AA00 ldrb r0, [r4, #0xe] @@ -117,7 +117,7 @@ _0809A840: sub_0809A844: @ 0x0809A844 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0809AA00 ldrb r0, [r4, #0xf] @@ -211,7 +211,7 @@ _0809A8E2: bl SetGlobalFlag _0809A8FC: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0809A902: ldrb r0, [r4, #0xe] cmp r0, #0 diff --git a/asm/macroLink.s b/asm/macroLink.s index 8a88464f..78b14581 100644 --- a/asm/macroLink.s +++ b/asm/macroLink.s @@ -296,7 +296,7 @@ sub_0808CD00: @ 0x0808CD00 adds r4, r0, #0 bl sub_0808CC88 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 @@ -331,7 +331,7 @@ sub_0808CD44: @ 0x0808CD44 adds r4, r0, #0 bl sub_0808CC88 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 @@ -372,7 +372,7 @@ sub_0808CD88: @ 0x0808CD88 cmp r0, #0 beq _0808CDB8 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806F69C movs r1, #0x2e @@ -457,7 +457,7 @@ _0808CE34: .4byte gUnk_081216B4 sub_0808CE38: @ 0x0808CE38 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806F69C movs r1, #0x32 @@ -483,7 +483,7 @@ _0808CE64: .4byte gUnk_02018EB0 sub_0808CE68: @ 0x0808CE68 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806F69C movs r1, #0x32 @@ -509,7 +509,7 @@ _0808CE94: .4byte gUnk_02018EB0 sub_0808CE98: @ 0x0808CE98 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806F69C movs r0, #0x32 @@ -530,7 +530,7 @@ _0808CEBC: .4byte gUnk_02018EB0 sub_0808CEC0: @ 0x0808CEC0 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806F69C movs r1, #0x32 diff --git a/asm/madderpillar.s b/asm/madderpillar.s index c538eac4..13745f15 100644 --- a/asm/madderpillar.s +++ b/asm/madderpillar.s @@ -267,7 +267,7 @@ _08029A90: .4byte gUnk_03003DBC sub_08029A94: @ 0x08029A94 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0802A098 pop {r4, pc} @@ -308,7 +308,7 @@ _08029ADC: .4byte 0x0000019D sub_08029AE0: @ 0x08029AE0 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0802A16C adds r0, r4, #0 diff --git a/asm/malon.s b/asm/malon.s index c3525c4a..438dc664 100644 --- a/asm/malon.s +++ b/asm/malon.s @@ -63,7 +63,7 @@ sub_08065864: @ 0x08065864 thumb_func_start sub_08065880 sub_08065880: @ 0x08065880 push {lr} - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {pc} thumb_func_start sub_08065888 @@ -198,7 +198,7 @@ sub_08065960: @ 0x08065960 b _0806598C _08065986: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806598C: pop {pc} .align 2, 0 diff --git a/asm/mayorHagen.s b/asm/mayorHagen.s index d96e15b6..3bbcb620 100644 --- a/asm/mayorHagen.s +++ b/asm/mayorHagen.s @@ -76,7 +76,7 @@ _0806CE28: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0806CE58 _0806CE3E: adds r0, r4, #0 @@ -186,7 +186,7 @@ sub_0806CEE8: @ 0x0806CEE8 b _0806CF14 _0806CF0E: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806CF14: pop {pc} .align 2, 0 diff --git a/asm/mazaalBracelet.s b/asm/mazaalBracelet.s index ee5e74c6..b7cdafcf 100644 --- a/asm/mazaalBracelet.s +++ b/asm/mazaalBracelet.s @@ -516,7 +516,7 @@ sub_0803A548: @ 0x0803A548 adds r4, r0, #0 bl sub_0803B5C0 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r2, _0803A588 @ =gUnk_080CED6C ldr r0, [r4, #0x50] ldrb r0, [r0, #0xf] @@ -1668,7 +1668,7 @@ sub_0803ADF4: @ 0x0803ADF4 adds r0, #4 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08004274 adds r0, r4, #0 @@ -1712,7 +1712,7 @@ sub_0803AE48: @ 0x0803AE48 adds r0, #4 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] cmp r0, #0 beq _0803AE82 @@ -1775,7 +1775,7 @@ sub_0803AEC4: @ 0x0803AEC4 adds r0, #4 strh r0, [r4, #0x36] adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08004274 adds r0, r4, #0 @@ -2050,7 +2050,7 @@ _0803B0D0: .4byte gUnk_080CED6C sub_0803B0D4: @ 0x0803B0D4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08004274 adds r0, r4, #0 @@ -2110,7 +2110,7 @@ sub_0803B144: @ 0x0803B144 push {r4, lr} adds r4, r0, #0 ldr r0, [r4, #0x54] - bl sub_080042B8 + bl UpdateAnimationSingleFrame movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 @@ -2178,7 +2178,7 @@ sub_0803B1B8: @ 0x0803B1B8 adds r0, r5, #0 bl sub_08004274 ldr r0, [r5, #0x54] - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0803B1D4: adds r0, r5, #0 adds r0, #0x45 @@ -2663,7 +2663,7 @@ sub_0803B55C: @ 0x0803B55C ldr r5, [r0, #0x74] ldr r4, [r0, #0x54] adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r4, #0x5a ldrb r1, [r4] movs r0, #0x10 diff --git a/asm/minecart.s b/asm/minecart.s index f963c15f..911db6b6 100644 --- a/asm/minecart.s +++ b/asm/minecart.s @@ -636,7 +636,7 @@ _08091BD8: cmp r1, r0 bne _08091BFC adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08091C04 .align 2, 0 _08091BF8: .4byte gLinkEntity @@ -835,7 +835,7 @@ _08091D5C: .4byte gRoomControls _08091D60: .4byte 0x00004022 _08091D64: adds r0, r6, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r3, _08091D8C @ =gLinkEntity adds r0, r6, #0 adds r0, #0x29 @@ -865,7 +865,7 @@ sub_08091D90: @ 0x08091D90 cmp r0, #0 bge _08091DA0 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08091DA0: adds r0, r4, #0 adds r0, #0x5a diff --git a/asm/ministerPotho.s b/asm/ministerPotho.s index ba0fbed1..f5219a52 100644 --- a/asm/ministerPotho.s +++ b/asm/ministerPotho.s @@ -83,7 +83,7 @@ _08066834: cmp r0, #0 bne _08066844 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08066844: adds r2, r4, #0 adds r2, #0x39 @@ -245,7 +245,7 @@ sub_08066948: @ 0x08066948 b _08066974 _0806696E: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08066974: pop {pc} .align 2, 0 diff --git a/asm/nayru.s b/asm/nayru.s index 8ac6bf6c..210d391b 100644 --- a/asm/nayru.s +++ b/asm/nayru.s @@ -133,7 +133,7 @@ sub_08064960: @ 0x08064960 b _0806498C _08064986: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0806498C: pop {pc} .align 2, 0 diff --git a/asm/npc26.s b/asm/npc26.s index 14c3f4de..61dc0f20 100644 --- a/asm/npc26.s +++ b/asm/npc26.s @@ -91,7 +91,7 @@ _08066A08: cmp r0, #0 bne _08066A18 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08066A18: adds r2, r4, #0 adds r2, #0x39 diff --git a/asm/npc4E.s b/asm/npc4E.s index e1d295ce..4fce9ba7 100644 --- a/asm/npc4E.s +++ b/asm/npc4E.s @@ -20,7 +20,7 @@ sub_0806DD44: @ 0x0806DD44 bl InitAnimationForceUpdate _0806DD5A: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r4, #0x59 ldrb r0, [r4] cmp r0, #0xfe diff --git a/asm/npc5.s b/asm/npc5.s index 74be4262..7a3582a3 100644 --- a/asm/npc5.s +++ b/asm/npc5.s @@ -485,7 +485,7 @@ sub_08060D78: @ 0x08060D78 movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08060DB2: ldrb r1, [r5] movs r0, #0x18 @@ -508,7 +508,7 @@ _08060DCE: sub_08060DD0: @ 0x08060DD0 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -561,7 +561,7 @@ _08060E32: sub_08060E34: @ 0x08060E34 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -640,7 +640,7 @@ _08060ECC: .4byte 0x0080FF00 _08060ED0: .4byte 0x00800100 _08060ED4: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08060EDA: pop {r4, pc} @@ -661,7 +661,7 @@ sub_08060EDC: @ 0x08060EDC cmp r0, #0 bne _08060F00 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08060F7C _08060F00: ldr r1, _08060F30 @ =gLinkEntity @@ -994,7 +994,7 @@ _0806116C: sub_08061170: @ 0x08061170 push {r4, r5, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080AF1EC cmp r0, #0 @@ -1167,7 +1167,7 @@ _080612E8: b _08061356 _08061302: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -1232,7 +1232,7 @@ _0806136C: b _08061460 _08061376: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -1275,7 +1275,7 @@ _0806139C: _080613CC: .4byte gUnk_0810AC5D _080613D0: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -2321,7 +2321,7 @@ _08061B6E: cmp r0, #2 bne _08061B7E adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08061B7E: adds r0, r4, #0 bl sub_0806FD3C diff --git a/asm/object4.s b/asm/object4.s index d1d8af87..757492b3 100644 --- a/asm/object4.s +++ b/asm/object4.s @@ -252,7 +252,7 @@ _080821F2: b _08082208 _08082202: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08082208: pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/object48.s b/asm/object48.s index e6b64255..654603ab 100644 --- a/asm/object48.s +++ b/asm/object48.s @@ -31,7 +31,7 @@ _0808E7B2: cmp r0, #0x3f bhi _0808E7D2 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0808E7D2: pop {r4, pc} .align 2, 0 diff --git a/asm/object6.s b/asm/object6.s index 8ee959d5..c6c841ad 100644 --- a/asm/object6.s +++ b/asm/object6.s @@ -247,7 +247,7 @@ _08082AAA: _08082AAC: strb r0, [r5, #0xe] adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08082AB4: pop {r4, r5, pc} .align 2, 0 @@ -265,7 +265,7 @@ sub_08082AB8: @ 0x08082AB8 bl DeleteThisEntity _08082ACC: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xd] cmp r0, #0 bne _08082B5C @@ -553,7 +553,7 @@ _08082D0C: adds r0, r5, #0 bl sub_08003FC4 adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08082D1C: pop {r4, r5, pc} .align 2, 0 @@ -738,7 +738,7 @@ _08082E44: bl DeleteThisEntity _08082E5E: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08082E68: .4byte gUnk_02033280 @@ -747,7 +747,7 @@ _08082E68: .4byte gUnk_02033280 sub_08082E6C: @ 0x08082E6C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/object6A.s b/asm/object6A.s index 1168f6e6..13e82258 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -82,7 +82,7 @@ _08094ACE: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _08094AE4: .4byte gUnk_08114F30 @@ -303,7 +303,7 @@ _08094C74: adds r1, r4, #0 bl CopyPosition adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 _08094C84: .4byte gUnk_08114F30 @@ -484,7 +484,7 @@ _08094DAC: bl InitAnimationForceUpdate _08094DCE: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08094DD4: pop {r4, pc} .align 2, 0 @@ -937,7 +937,7 @@ _0809514C: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 @@ -1144,7 +1144,7 @@ _080952F0: bl CopyPosition _080952FE: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r3, [r4, #0x50] cmp r3, #0 beq _08095328 @@ -1799,7 +1799,7 @@ _080957F8: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 @@ -1853,7 +1853,7 @@ _0809586C: cmp r0, #0 beq _08095880 ldrb r0, [r5, #0xb] - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _08095880 bl DeleteThisEntity @@ -2042,7 +2042,7 @@ _080959F2: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -2459,7 +2459,7 @@ _08095D06: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/object79.s b/asm/object79.s index b171a709..e4ae6171 100644 --- a/asm/object79.s +++ b/asm/object79.s @@ -107,7 +107,7 @@ sub_0809803C: @ 0x0809803C ldrb r5, [r4, #0xa] cmp r5, #0 bne _08098070 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xb] cmp r0, #0 beq _08098082 @@ -161,7 +161,7 @@ _080980A8: cmp r0, #0 bne _080980D8 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r2, r4, #0 adds r2, #0x7e ldrh r0, [r2] diff --git a/asm/object9.s b/asm/object9.s index dbda458d..55b83e31 100644 --- a/asm/object9.s +++ b/asm/object9.s @@ -36,7 +36,7 @@ _08083894: cmp r0, #0x32 bne _080838AA movs r0, #0x32 - bl sub_0801E7F4 + bl CheckKinstoneFused movs r2, #0 cmp r0, #0 beq _080838AC diff --git a/asm/object97.s b/asm/object97.s index 4906a854..cf96671e 100644 --- a/asm/object97.s +++ b/asm/object97.s @@ -141,7 +141,7 @@ sub_0809DA64: @ 0x0809DA64 bl InitAnimationForceUpdate _0809DAAC: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} thumb_func_start sub_0809DAB4 @@ -186,7 +186,7 @@ _0809DB02: adds r0, r4, #0 bl sub_0809E210 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 _0809DB10: .4byte gRoomControls @@ -208,7 +208,7 @@ sub_0809DB14: @ 0x0809DB14 bl DeleteThisEntity _0809DB36: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 @@ -469,7 +469,7 @@ sub_0809DD0C: @ 0x0809DD0C bl PlaySFX _0809DD2A: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 @@ -504,7 +504,7 @@ _0809DD64: adds r0, r4, #0 bl sub_0809E29C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} thumb_func_start sub_0809DD78 @@ -540,7 +540,7 @@ _0809DDA8: bl sub_0809E29C _0809DDB4: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} thumb_func_start sub_0809DDBC @@ -560,7 +560,7 @@ sub_0809DDBC: @ 0x0809DDBC bl PlaySFX _0809DDD8: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _0809DDE0: .4byte 0x0000015B @@ -597,7 +597,7 @@ sub_0809DDE4: @ 0x0809DDE4 bl DeleteThisEntity _0809DE2A: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 _0809DE34: .4byte gRoomControls @@ -773,7 +773,7 @@ _0809DF96: strb r0, [r4, #0xe] _0809DF98: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} thumb_func_start sub_0809DFA0 @@ -850,7 +850,7 @@ _0809E028: adds r0, r4, #0 bl sub_0809E1F0 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0809E034: pop {r4, pc} .align 2, 0 @@ -905,7 +905,7 @@ sub_0809E088: @ 0x0809E088 adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} thumb_func_start sub_0809E0A0 diff --git a/asm/objectC1.s b/asm/objectC1.s index 7c0ad1d4..c55f0fb8 100644 --- a/asm/objectC1.s +++ b/asm/objectC1.s @@ -169,7 +169,7 @@ _080A2688: _080A2698: .4byte 0x000001B9 _080A269C: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r0, [r0] @@ -181,7 +181,7 @@ _080A269C: b _080A273C _080A26B4: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, _080A2764 @ =gTextBox ldrb r1, [r0] adds r0, r7, #0 diff --git a/asm/octorokBoss.s b/asm/octorokBoss.s index dc9a7ffc..9fc3b463 100644 --- a/asm/octorokBoss.s +++ b/asm/octorokBoss.s @@ -1571,7 +1571,7 @@ _08035DB0: bl DeleteThisEntity _08035DC4: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, [r5, #0x50] adds r0, #0x7c ldrb r1, [r0] diff --git a/asm/percy.s b/asm/percy.s index 218ba436..5bf4bc93 100644 --- a/asm/percy.s +++ b/asm/percy.s @@ -187,7 +187,7 @@ sub_0806B504: @ 0x0806B504 adds r5, r0, #0 movs r4, #1 movs r0, #0x21 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0806B518 movs r4, #3 diff --git a/asm/picolyteBottles.s b/asm/picolyteBottles.s index 1c3132bb..2f90341a 100644 --- a/asm/picolyteBottles.s +++ b/asm/picolyteBottles.s @@ -470,7 +470,7 @@ sub_0806E250: @ 0x0806E250 movs r0, #0 str r0, [r4, #0x14] movs r0, #0x31 - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _0806E266 movs r0, #1 diff --git a/asm/pina.s b/asm/pina.s index 4a3f985b..70492f23 100644 --- a/asm/pina.s +++ b/asm/pina.s @@ -88,7 +88,7 @@ _08063AEE: beq _08063B0C _08063AF4: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -212,7 +212,7 @@ _08063BE0: adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08063C10 _08063BF6: adds r0, r4, #0 @@ -354,6 +354,6 @@ sub_08063CC4: @ 0x08063CC4 b _08063CF6 _08063CF0: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08063CF6: pop {pc} diff --git a/asm/postman.s b/asm/postman.s index c32f4ee5..2355d96a 100644 --- a/asm/postman.s +++ b/asm/postman.s @@ -64,7 +64,7 @@ _08060446: sub_0806045C: @ 0x0806045C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080604DC adds r0, r4, #0 @@ -118,7 +118,7 @@ _080604C0: sub_080604C8: @ 0x080604C8 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080604DC movs r0, #1 @@ -265,7 +265,7 @@ _080605EC: b _08060634 _080605F6: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, _08060614 @ =gTextBox ldrb r1, [r0] movs r0, #0x7f @@ -281,7 +281,7 @@ _080605F6: _08060614: .4byte gTextBox _08060618: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl UpdateFuseInteraction adds r5, r4, #0 @@ -742,7 +742,7 @@ sub_0806097C: @ 0x0806097C b _080609A8 _080609A2: adds r0, r2, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080609A8: pop {pc} .align 2, 0 diff --git a/asm/rem.s b/asm/rem.s index f80d8241..2ac27770 100644 --- a/asm/rem.s +++ b/asm/rem.s @@ -37,7 +37,7 @@ sub_0806A370: @ 0x0806A370 adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806ED78 adds r0, r4, #0 diff --git a/asm/scissorsBeetle.s b/asm/scissorsBeetle.s index 3830cd44..a0b13e00 100644 --- a/asm/scissorsBeetle.s +++ b/asm/scissorsBeetle.s @@ -326,7 +326,7 @@ sub_08038B08: @ 0x08038B08 b _08038B5E _08038B18: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -368,7 +368,7 @@ sub_08038B64: @ 0x08038B64 adds r4, r0, #0 bl sub_080AEF88 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xf] subs r0, #1 strb r0, [r4, #0xf] @@ -390,7 +390,7 @@ _08038B8C: sub_08038B90: @ 0x08038B90 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080AEF88 adds r0, r4, #0 diff --git a/asm/smith.s b/asm/smith.s index 28a19e6d..2a955a16 100644 --- a/asm/smith.s +++ b/asm/smith.s @@ -208,7 +208,7 @@ _08066144: cmp r0, #0 bne _08066154 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08066154: adds r0, r4, #0 adds r0, #0x39 @@ -277,7 +277,7 @@ sub_080661BC: @ 0x080661BC cmp r0, #0xc bne _080661F4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -312,7 +312,7 @@ sub_08066200: @ 0x08066200 adds r0, r4, #0 bl sub_0807DDE4 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} thumb_func_start sub_08066218 @@ -420,6 +420,6 @@ sub_08066298: @ 0x08066298 _080662CC: .4byte gUnk_08110354 _080662D0: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080662D6: pop {r4, pc} diff --git a/asm/stalfos.s b/asm/stalfos.s index 1e9be13b..52d79359 100644 --- a/asm/stalfos.s +++ b/asm/stalfos.s @@ -408,7 +408,7 @@ sub_0803958C: @ 0x0803958C cmp r0, #0 beq _080395C0 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r1, r4, #0 adds r1, #0x78 ldrh r0, [r1] @@ -534,7 +534,7 @@ _08039686: sub_08039688: @ 0x08039688 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] subs r1, r0, #1 strb r1, [r4, #0xe] @@ -585,7 +585,7 @@ sub_080396E4: @ 0x080396E4 adds r4, r0, #0 bl sub_080AEFE0 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r1, r4, #0 adds r1, #0x78 ldrh r0, [r1] @@ -604,7 +604,7 @@ _08039708: sub_0803970C: @ 0x0803970C push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] diff --git a/asm/talon.s b/asm/talon.s index c03b8231..0eb7d667 100644 --- a/asm/talon.s +++ b/asm/talon.s @@ -224,7 +224,7 @@ sub_080656A4: @ 0x080656A4 bl InitAnimationForceUpdate _080656C8: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _080656D0: .4byte gTextBox diff --git a/asm/tingleSiblings.s b/asm/tingleSiblings.s index 5661ba9a..1a59bac7 100644 --- a/asm/tingleSiblings.s +++ b/asm/tingleSiblings.s @@ -203,7 +203,7 @@ _08064EBE: _08064EC2: movs r0, #0x5a _08064EC4: - bl sub_0801E7F4 + bl CheckKinstoneFused cmp r0, #0 beq _08064ED8 movs r0, #0xc @@ -224,7 +224,7 @@ _08064ED8: sub_08064EE8: @ 0x08064EE8 push {r4, r5, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r2, r4, #0 adds r2, #0x5a ldrb r1, [r2] diff --git a/asm/townMinish.s b/asm/townMinish.s index 5b4f4100..0375a822 100644 --- a/asm/townMinish.s +++ b/asm/townMinish.s @@ -135,7 +135,7 @@ _0806AC9A: bl InitializeAnimation _0806ACBA: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 diff --git a/asm/vaatiArm.s b/asm/vaatiArm.s index ed3b7228..c0d10e15 100644 --- a/asm/vaatiArm.s +++ b/asm/vaatiArm.s @@ -1308,7 +1308,7 @@ _08042EE6: strh r0, [r5, #0xa] _08042EEA: adds r0, r6, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08042EF0: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -1319,7 +1319,7 @@ sub_08042EF4: @ 0x08042EF4 mov r7, r8 push {r7} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_08043C98 cmp r0, #0 @@ -1430,7 +1430,7 @@ _08042FD4: .4byte 0x0000019B sub_08042FD8: @ 0x08042FD8 push {r4, r5, r6, lr} adds r5, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r5, #0 bl sub_08043C98 cmp r0, #0 @@ -2140,7 +2140,7 @@ _080434C4: strb r0, [r2, #0x10] _08043514: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 _0804351C: .4byte gUnk_080FD450 @@ -2195,7 +2195,7 @@ sub_0804355C: @ 0x0804355C strb r0, [r4, #0xd] _08043578: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} thumb_func_start sub_08043580 diff --git a/asm/vaatiBall.s b/asm/vaatiBall.s index 54e61ecb..a7809561 100644 --- a/asm/vaatiBall.s +++ b/asm/vaatiBall.s @@ -252,7 +252,7 @@ _080447A8: cmp r0, #1 beq _080447B6 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _080447DC _080447B6: ldrb r0, [r4, #0xe] @@ -272,7 +272,7 @@ _080447D0: adds r0, r4, #0 bl sub_0806F69C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _080447DC: pop {r4, pc} .align 2, 0 @@ -557,7 +557,7 @@ _080449E8: strb r0, [r4, #0x10] _080449EA: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r3} mov r8, r3 pop {r4, r5, r6, r7, pc} @@ -568,7 +568,7 @@ sub_080449F8: @ 0x080449F8 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r4, [r5, #0x50] - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xc] cmp r0, #1 beq _08044A90 @@ -714,7 +714,7 @@ sub_08044B04: @ 0x08044B04 push {r7} adds r4, r0, #0 ldr r6, [r4, #0x50] - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r6, #0xc] cmp r0, #1 bne _08044B26 diff --git a/asm/vaatiReborn.s b/asm/vaatiReborn.s index 835b9602..f15b2d0f 100644 --- a/asm/vaatiReborn.s +++ b/asm/vaatiReborn.s @@ -387,7 +387,7 @@ _0806B94E: beq _0806B962 _0806B95A: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _0806B968 _0806B962: adds r0, r5, #0 @@ -431,7 +431,7 @@ _0806B97E: adds r1, r4, #0 bl PositionRelative adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 _0806B9B8: .4byte gUnk_08112F80 diff --git a/asm/vaatiRebornEnemy.s b/asm/vaatiRebornEnemy.s index b49359dd..3fc73764 100644 --- a/asm/vaatiRebornEnemy.s +++ b/asm/vaatiRebornEnemy.s @@ -435,7 +435,7 @@ _0803D3FA: bl sub_080AEFB4 _0803D400: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, r6, r7, pc} thumb_func_start sub_0803D408 @@ -609,7 +609,7 @@ _0803D54E: bl InitAnimationForceUpdate _0803D558: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} thumb_func_start sub_0803D560 @@ -745,7 +745,7 @@ _0803D64E: strb r0, [r4, #0xe] _0803D650: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} thumb_func_start sub_0803D658 @@ -826,7 +826,7 @@ _0803D6C8: strb r0, [r4, #0xf] _0803D6EE: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 _0803D6F8: .4byte gLinkEntity @@ -984,7 +984,7 @@ _0803D81C: bl sub_080AEFB4 _0803D828: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0803D82E: pop {r4, r5, r6, pc} @@ -1090,7 +1090,7 @@ _0803D8EC: strb r0, [r5, #0xe] _0803D8EE: adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0803D8F4: pop {r4, r5, pc} .align 2, 0 @@ -1313,7 +1313,7 @@ _0803DA72: movs r2, #0 bl PositionRelative adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 @@ -1430,7 +1430,7 @@ _0803DB54: movs r2, #0 bl PositionRelative adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} thumb_func_start sub_0803DB88 @@ -1537,7 +1537,7 @@ sub_0803DC0C: @ 0x0803DC0C adds r1, r4, #0 bl PositionRelative adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 _0803DC54: .4byte gUnk_080D04C8 diff --git a/asm/vaatiTransfigured.s b/asm/vaatiTransfigured.s index a8ada4a9..499c5772 100644 --- a/asm/vaatiTransfigured.s +++ b/asm/vaatiTransfigured.s @@ -442,7 +442,7 @@ _0803FAAC: bl sub_080AEF88 _0803FAB8: adds r0, r7, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame add sp, #4 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -451,7 +451,7 @@ _0803FAC4: .4byte 0x0000FFF9 thumb_func_start sub_0803FAC8 sub_0803FAC8: @ 0x0803FAC8 push {lr} - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {pc} thumb_func_start sub_0803FAD0 @@ -773,7 +773,7 @@ _0803FD32: strb r0, [r1] _0803FD48: adds r0, r7, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _0803FD4E: pop {r4, r5, r6, r7, pc} @@ -942,7 +942,7 @@ _0803FE80: bl sub_08040AD4 _0803FE86: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 @@ -1067,7 +1067,7 @@ _0803FF6E: bl sub_08040AD4 _0803FF74: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} thumb_func_start sub_0803FF7C @@ -1192,7 +1192,7 @@ _0804005C: bl sub_08040AD4 _08040062: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 @@ -1238,7 +1238,7 @@ _080400B4: bl sub_0804A7D4 _080400BA: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _08040126 _080400C2: ldrb r0, [r4, #0xf] @@ -1287,7 +1287,7 @@ _080400C2: bl PlaySFX _08040120: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08040126: pop {r4, r5, r6, pc} .align 2, 0 @@ -1350,7 +1350,7 @@ _0804017C: cmp r0, #0 bne _0804019E adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame b _080401A6 _0804019E: adds r0, r4, #0 @@ -1599,7 +1599,7 @@ _08040366: bl InitAnimationForceUpdate _08040382: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 @@ -1677,7 +1677,7 @@ _0804040A: adds r1, r4, #0 bl CopyPosition adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 diff --git a/asm/vaatiWrath.s b/asm/vaatiWrath.s index d69d4d3b..59d8f022 100644 --- a/asm/vaatiWrath.s +++ b/asm/vaatiWrath.s @@ -187,7 +187,7 @@ _0804148C: .4byte gRoomControls sub_08041490: @ 0x08041490 push {r4, r5, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xd] cmp r0, #5 bls _080414A0 @@ -358,7 +358,7 @@ sub_080415E8: @ 0x080415E8 adds r4, r0, #0 bl sub_08042004 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] @@ -382,7 +382,7 @@ sub_08041618: @ 0x08041618 adds r4, r0, #0 bl sub_08042004 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_080AEF88 ldr r0, _0804165C @ =gRoomControls @@ -455,7 +455,7 @@ sub_080416A4: @ 0x080416A4 adds r4, r0, #0 bl sub_08042004 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] @@ -484,7 +484,7 @@ sub_080416DC: @ 0x080416DC adds r5, r0, #0 bl sub_08042004 adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r5, #0 bl sub_0804212C adds r0, r5, #0 @@ -640,7 +640,7 @@ _0804181A: adds r0, r5, #0 bl sub_08042004 adds r0, r5, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame pop {r4, r5, pc} thumb_func_start sub_08041828 @@ -651,7 +651,7 @@ sub_08041828: @ 0x08041828 adds r0, r4, #0 bl sub_08042004 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r2, _08041868 @ =gRoomControls ldrh r0, [r2, #8] adds r0, #0x48 @@ -693,7 +693,7 @@ sub_08041880: @ 0x08041880 adds r4, r0, #0 bl sub_08042004 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 bl sub_0806F69C ldr r0, _080418D4 @ =gRoomControls @@ -764,7 +764,7 @@ sub_08041904: @ 0x08041904 adds r4, r0, #0 bl sub_08042004 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r3, r4, #0 adds r3, #0x79 ldrb r0, [r3] @@ -826,7 +826,7 @@ sub_0804197C: @ 0x0804197C adds r4, r0, #0 bl sub_08042004 adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame adds r0, r4, #0 adds r0, #0x7b ldrb r0, [r0] @@ -932,7 +932,7 @@ _08041A60: adds r0, r4, #0 bl sub_0806F69C adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, [r4, #0x64] ldr r0, [r0, #4] bl sub_08004274 @@ -969,7 +969,7 @@ _08041A60: b _08041AF0 _08041ABC: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, [r4, #0x64] ldr r0, [r0, #8] bl sub_08004274 @@ -1000,7 +1000,7 @@ _08041AF0: sub_08041AF4: @ 0x08041AF4 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, [r4, #0x64] ldr r0, [r0, #8] bl sub_08004274 @@ -1250,7 +1250,7 @@ _08041CF6: _08041D08: .4byte 0x00001651 _08041D0C: adds r0, r4, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08041D12: pop {r4, pc} @@ -2025,7 +2025,7 @@ sub_080422C0: @ 0x080422C0 push {r7} adds r5, r0, #0 mov r8, r1 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r0, [r5, #0x64] ldr r0, [r0, #8] bl sub_08004274 diff --git a/asm/whirlwind.s b/asm/whirlwind.s index e0d8965b..9ea80eac 100644 --- a/asm/whirlwind.s +++ b/asm/whirlwind.s @@ -252,7 +252,7 @@ _08092E90: .4byte 0x00000153 sub_08092E94: @ 0x08092E94 push {r4, lr} adds r4, r0, #0 - bl sub_080042B8 + bl UpdateAnimationSingleFrame ldr r1, _08092ED0 @ =gLinkEntity adds r0, r4, #0 movs r2, #0xc diff --git a/asm/zeldaFollower.s b/asm/zeldaFollower.s index fe4324ca..813c5e96 100644 --- a/asm/zeldaFollower.s +++ b/asm/zeldaFollower.s @@ -328,7 +328,7 @@ _0806850C: _0806851C: .4byte gLinkEntity _08068520: mov r0, r8 - bl sub_080042B8 + bl UpdateAnimationSingleFrame _08068526: mov r0, r8 bl sub_0800451C diff --git a/include/functions.h b/include/functions.h index 500edf40..79464b11 100644 --- a/include/functions.h +++ b/include/functions.h @@ -18,21 +18,21 @@ extern void InitializeAnimation(Entity*, u32); extern void DeleteEntity(Entity*); extern u32 __modsi3(u32, u32); extern void DoFade(u32, u32); +extern void UpdateAnimationSingleFrame(Entity*); // Unidentified extern void sub_0806ED78(Entity*); extern void sub_0806920C(Entity*); -extern void sub_080042B8(Entity*); extern u32 sub_0805ACC0(Entity*); extern u32 sub_0801E99C(Entity*); extern void sub_0806924C(Entity*); extern void sub_080AEF88(Entity*); +extern Entity* sub_080873AC(Entity*, u32, u32); extern void sub_08078778(Entity*); extern void sub_080787A8(Entity*, u32); extern void sub_0806F118(Entity*); extern void sub_080791D0(); extern void sub_08087380(); -extern Entity* sub_080873AC(Entity*, u32, u32); extern void sub_08004274(); extern void sub_0805EC9C(); extern void sub_0805EC60(); diff --git a/src/bell.c b/src/bell.c index 340149bf..ea8d4628 100644 --- a/src/bell.c +++ b/src/bell.c @@ -1,7 +1,7 @@ #include "entity.h" #include "global.h" -extern void sub_080042B8(); +extern void UpdateAnimationSingleFrame(); extern void (*gUnk_08123384[])(Entity*); extern void UpdateSpriteOrderAndFlip(Entity*); @@ -21,5 +21,5 @@ void sub_08097D90(Entity* ent) { } void sub_08097DCC(Entity* ent) { - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); } diff --git a/src/cow.c b/src/cow.c index 4ee5ca94..80a44ddd 100644 --- a/src/cow.c +++ b/src/cow.c @@ -4,7 +4,7 @@ extern void sub_0806ED78(Entity*); extern void sub_0806920C(Entity*); -extern void sub_080042B8(Entity*); +extern void UpdateAnimationSingleFrame(Entity*); extern u32 sub_0805ACC0(Entity*); extern u32 sub_0801E99C(Entity*); extern void sub_0806924C(Entity*); @@ -67,7 +67,7 @@ void sub_08069018(Entity* ent) { InitAnimationForceUpdate(ent, ent->animationState); } - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); var0 = --ent->field_0xf; if (var0 == 0) { if (ent->parameter3 == 0) { @@ -99,7 +99,7 @@ void sub_08069068(Entity* ent) { } sub_080AEF88(ent); - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); { s32 x = ent->x.HALF.HI; @@ -138,7 +138,7 @@ void sub_08069068(Entity* ent) { } void sub_08069124(Entity* ent) { - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); gUnk_08111928[ent->previousActionFlag](ent); sub_0806924C(ent); } @@ -234,6 +234,6 @@ void sub_080692A0(Entity* ent) { ent->spriteSettings.b.ss0 = 1; InitAnimationForceUpdate(ent, 15); } else { - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); } } diff --git a/src/epona.c b/src/epona.c index 44c9b1bf..dd3a57b1 100644 --- a/src/epona.c +++ b/src/epona.c @@ -4,10 +4,6 @@ #include "link.h" #include "functions.h" -extern TextBox gTextBox; -extern LinkState gLinkState; -extern Entity gLinkEntity; - void sub_08065A64(Entity* this); void sub_08065AA4(Entity*); @@ -30,12 +26,12 @@ void sub_080659B8(Entity* this) { } void sub_080659F0(Entity* this) { - sub_080042B8(this); + UpdateAnimationSingleFrame(this); sub_08065AA4(this); } void sub_08065A00(Entity* this) { - sub_080042B8(this); + UpdateAnimationSingleFrame(this); sub_08065AA4(this); } @@ -98,6 +94,6 @@ void sub_08065B1C(Entity* this) { this->spriteSettings.b.ss0 = 1; InitAnimationForceUpdate(this, 7); } else { - sub_080042B8(this); + UpdateAnimationSingleFrame(this); } } diff --git a/src/mailbox.c b/src/mailbox.c index d395afe8..050cb815 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -5,7 +5,7 @@ extern void sub_0806ED78(Entity*); extern void InitAnimationForceUpdate(); extern void sub_08063280(); extern void TextboxNoOverlapFollow(u32); -extern void sub_080042B8(); +extern void UpdateAnimationSingleFrame(); extern void CreateFx(); extern void (*gMailboxBehaviors[4])(Entity*); @@ -70,7 +70,7 @@ void sub_08063280(Entity* ent) u8 var; // r2@1 e = ent; - sub_080042B8(); + UpdateAnimationSingleFrame(); var = e->frames.all & 0x7F; e->frames.all = e->frames.all ^ var; if (var == 2) diff --git a/src/malon.c b/src/malon.c index 9d6f9994..5727211d 100644 --- a/src/malon.c +++ b/src/malon.c @@ -25,7 +25,7 @@ void sub_08065864(Entity* this) { } void sub_08065880(Entity* this) { - sub_080042B8(this); + UpdateAnimationSingleFrame(this); } void sub_08065888(Entity* this) { @@ -75,6 +75,6 @@ void sub_08065960(Entity* this) { this->spriteSettings.b.ss0 = 1; InitAnimationForceUpdate(this, 0xC); } else { - sub_080042B8(this); + UpdateAnimationSingleFrame(this); } } diff --git a/src/milkCart.c b/src/milkCart.c index 6bca873c..6f9cf30c 100644 --- a/src/milkCart.c +++ b/src/milkCart.c @@ -4,7 +4,7 @@ extern void _call_via_r1(Entity*, u32); extern void sub_0806ED78(); extern void InitAnimationForceUpdate(); -extern void sub_080042B8(); +extern void UpdateAnimationSingleFrame(); extern void (*gMilkCartBehaviors[2])(Entity*); @@ -22,5 +22,5 @@ void sub_08065B6C(Entity* ent) { } void sub_08065B9C(Entity* ent) { - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); } diff --git a/src/stamp.c b/src/stamp.c index 19a95afb..90d5a6e6 100644 --- a/src/stamp.c +++ b/src/stamp.c @@ -14,7 +14,7 @@ extern void CreateFx(); extern void sub_08062CA4(); extern void sub_0807DDAC(); extern void sub_0807DDE4(); -extern u32 sub_0801E7F4(); +extern u32 CheckKinstoneFused(); extern void ShowNPCDialogue(); extern void (*gStampBehaviors1[4])(Entity*); @@ -35,7 +35,7 @@ extern void CreateFx(); extern void sub_08062CA4(); extern void sub_0807DDAC(); extern void sub_0807DDE4(); -extern u32 sub_0801E7F4(); +extern u32 CheckKinstoneFused(); extern void ShowNPCDialogue(); extern void (*gStampBehaviors1[4])(Entity*); @@ -103,7 +103,7 @@ void sub_08062CA4(Entity* ent) { void sub_08062CBC(Entity* ent) { u32 uVar1; - uVar1 = sub_0801E7F4(44); + uVar1 = CheckKinstoneFused(44); ShowNPCDialogue(ent, &gUnk_0810C2E4 + ((-uVar1 | uVar1) >> 31) * 2); } diff --git a/src/zelda.c b/src/zelda.c index f0813614..d96de629 100644 --- a/src/zelda.c +++ b/src/zelda.c @@ -17,7 +17,7 @@ void DeleteThisEntity(void); extern Entity* GetEntityByType(u32, u32); extern void sub_080686C4(Entity*, Entity*); extern void InitAnimationForceUpdate(Entity*, u32); -extern void sub_080042B8(Entity*); +extern void UpdateAnimationSingleFrame(Entity*); extern void sub_0806F62C(Entity*, u32, u32); extern u32 sub_08003FC4(Entity*, u32); extern void PlaySFX(u32); @@ -142,7 +142,7 @@ void sub_08066E80(Entity* ent, u8* param_2) { InitAnimationForceUpdate(ent, 0x16); break; case 1: - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); if (ent->frames.all & 1) { param_2[0x18]++; ent->field_0x20 = 0x20000; @@ -154,7 +154,7 @@ void sub_08066E80(Entity* ent, u8* param_2) { sub_0806F62C(ent, 0x100, 0x80); sub_08003FC4(ent, 0x2000); if (!(ent->frames.all & 1)) { - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); } if (ent->field_0x20 < 0) { param_2[0x18]++; @@ -162,14 +162,14 @@ void sub_08066E80(Entity* ent, u8* param_2) { break; case 3: sub_0806F62C(ent, 0x100, 0x80); - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); if (sub_08003FC4(ent, 0x2000) == 0) { param_2[0x18]++; InitAnimationForceUpdate(ent, 0x1E); } break; case 4: - sub_080042B8(ent); + UpdateAnimationSingleFrame(ent); if (ent->frames.b.f3) { gUnk_02033280[7] |= 1; return;