From ab1157d869a4efc396fe606256c1d466ef9fc879 Mon Sep 17 00:00:00 2001 From: theo Date: Fri, 12 Jun 2020 02:54:00 -0700 Subject: [PATCH] function renaming --- asm/acroBandits.s | 34 +-- asm/anju.s | 2 +- asm/archway.s | 2 +- asm/armos.s | 8 +- asm/bakerOven.s | 6 +- asm/ballChainSoldier.s | 2 +- asm/beanstalk.s | 8 +- asm/beedle.s | 8 +- asm/beetle.s | 34 +-- asm/bell.s | 2 +- asm/bigBarrel.s | 2 +- asm/bigIceBlock.s | 4 +- asm/bigPushableLever.s | 4 +- asm/bird.s | 10 +- asm/bladeBrothers.s | 2 +- asm/bobomb.s | 22 +- asm/bollard.s | 8 +- asm/bombPeahat.s | 12 +- asm/bombarossa.s | 2 +- asm/book.s | 2 +- asm/bossDoor.s | 2 +- asm/bowMoblin.s | 6 +- asm/bowUse.s | 6 +- asm/businessScrub.s | 8 +- asm/businessScrubPrologue.s | 6 +- asm/carpenter.s | 8 +- asm/castleMaid.s | 2 +- asm/castorWildsStatue.s | 2 +- asm/chaser.s | 8 +- asm/chestSpawner.s | 4 +- asm/chuchu.s | 68 +++--- asm/chuchuBoss.s | 2 +- asm/clothesRack.s | 2 +- asm/cloudPiranha.s | 22 +- asm/code_080011C4.s | 8 +- asm/code_08003FC4.s | 12 +- asm/code_080041E8.s | 12 +- asm/code_0800857C.s | 10 +- asm/code_08016DF8.s | 2 +- asm/code_08018500.s | 4 +- asm/code_08019444.s | 8 +- asm/code_08049CD4.s | 6 +- asm/code_0805436C.s | 4 +- asm/code_08056418.s | 6 +- asm/code_0805E744.s | 2 +- asm/code_0806EC20.s | 2 +- asm/code_0806ED78.s | 2 +- asm/code_0806FA6C.s | 12 +- asm/code_080732D0.s | 2 +- asm/code_08077B98.s | 2 +- asm/code_0807B9B8.s | 2 +- asm/code_0807CC3C.s | 6 +- asm/code_080A29BC.s | 2 +- asm/code_080A5574.s | 128 +++++------ asm/createBowEntity.s | 2 +- asm/crenalBeanSprout.s | 16 +- asm/crow.s | 8 +- asm/cuccoAggr.s | 16 +- asm/curtain.s | 10 +- asm/darkNut.s | 4 +- asm/deathFx.s | 6 +- asm/dog.s | 2 +- asm/doorMimic.s | 6 +- asm/drLeft.s | 6 +- asm/enemy4D.s | 2 +- asm/enemy50.s | 24 +- asm/enemy5A.s | 24 +- asm/enemy5F.s | 14 +- asm/enemy62.s | 4 +- asm/enemy64.s | 4 +- asm/enemyE.s | 2 +- asm/evilSpirit.s | 2 +- asm/evilSpirit/sub_080862B8.inc | 2 +- asm/eyeSwitch.s | 8 +- asm/eyegore.s | 22 +- asm/fallingBoulder.s | 8 +- asm/fan.s | 6 +- asm/farmers.s | 2 +- asm/figurineDevice.s | 4 +- asm/fireballGuy.s | 4 +- asm/floatingBlock.s | 2 +- asm/flyingPot.s | 2 +- asm/flyingSkull.s | 2 +- asm/forestMinish.s | 2 +- asm/furniture.s | 6 +- asm/gentariCurtains.s | 8 +- asm/ghini.s | 30 +-- asm/giantRock.s | 4 +- asm/gibdo.s | 4 +- asm/gleerok.s | 18 +- asm/gorman.s | 4 +- asm/greatFairy.s | 2 +- asm/gregal.s | 4 +- asm/guardWithSpear.s | 24 +- asm/gyorgChild.s | 6 +- asm/gyorgFemale.s | 4 +- asm/gyorgFemaleEye.s | 18 +- asm/gyorgFemaleMouth.s | 2 +- asm/gyorgMale.s | 6 +- asm/hangingSeed.s | 2 +- asm/helmasaur.s | 22 +- asm/houseDoorExterior.s | 2 +- asm/hurdyGurdyMan.s | 6 +- asm/initializeLink.s | 2 +- asm/itemForSale.s | 2 +- asm/itemOnGround.s | 4 +- asm/jailBars.s | 6 +- asm/keaton.s | 6 +- asm/keese.s | 8 +- asm/kid.s | 6 +- asm/ladderHoleInBookshelf.s | 6 +- asm/ladderUp.s | 2 +- asm/lakitu.s | 4 +- asm/lavaPlatform.s | 16 +- asm/leever.s | 12 +- asm/librarians.s | 2 +- asm/lightableSwitch.s | 4 +- asm/likeLike.s | 16 +- asm/lilypadLarge.s | 2 +- asm/macroBook.s | 2 +- asm/macroDecorations.s | 2 +- asm/madderpillar.s | 16 +- asm/mama.s | 6 +- asm/mazaalBracelet.s | 54 ++--- asm/mazaalHead.s | 12 +- asm/mazaalMacro.s | 14 +- asm/melari.s | 8 +- asm/miniFireballGuy.s | 4 +- asm/miniSlime.s | 6 +- asm/minishLight.s | 2 +- asm/minishSizedArchway.s | 2 +- asm/moldorm.s | 2 +- asm/moldworm.s | 30 +-- asm/mountainMinish.s | 12 +- asm/mulldozer.s | 16 +- asm/mutoh.s | 2 +- asm/non_matching/slime/sub_080450A8.inc | 109 +++++++++ asm/npc23.s | 12 +- asm/npc5.s | 2 +- asm/npc9.s | 6 +- asm/object10.s | 2 +- asm/object11.s | 2 +- asm/object15.s | 2 +- asm/object17.s | 2 +- asm/object1E.s | 2 +- asm/object1F.s | 2 +- asm/object20.s | 2 +- asm/object21.s | 8 +- asm/object24.s | 12 +- asm/object29.s | 8 +- asm/object2A.s | 4 +- asm/object2B.s | 2 +- asm/object35.s | 6 +- asm/object42.s | 2 +- asm/object43.s | 4 +- asm/object44.s | 2 +- asm/object45.s | 2 +- asm/object49.s | 12 +- asm/object4B.s | 14 +- asm/object53.s | 2 +- asm/object56.s | 2 +- asm/object64.s | 2 +- asm/object66.s | 2 +- asm/object67.s | 4 +- asm/object6A.s | 38 ++-- asm/object80.s | 2 +- asm/object81.s | 2 +- asm/object86.s | 4 +- asm/object87.s | 12 +- asm/object8A.s | 2 +- asm/object8B.s | 2 +- asm/object9.s | 2 +- asm/object91.s | 2 +- asm/object93.s | 4 +- asm/object96.s | 4 +- asm/object97.s | 8 +- asm/object99.s | 2 +- asm/object9B.s | 2 +- asm/object9E.s | 4 +- asm/objectA0.s | 8 +- asm/objectA2.s | 8 +- asm/objectA7.s | 2 +- asm/objectA9.s | 2 +- asm/objectAB.s | 2 +- asm/objectAF.s | 6 +- asm/objectB2.s | 2 +- asm/objectB3.s | 4 +- asm/objectB6.s | 2 +- asm/objectBA.s | 4 +- asm/objectD.s | 4 +- asm/objectOnPillar.s | 2 +- asm/octorok.s | 4 +- asm/octorok/sub_0801EBC8.inc | 2 +- asm/octorokBoss.s | 2 +- asm/octorokGolden.s | 12 +- asm/peahat.s | 26 +-- asm/percy.s | 6 +- asm/pesto.s | 8 +- asm/picoBloom.s | 4 +- asm/pinwheel.s | 2 +- asm/pot.s | 2 +- asm/puffstool.s | 26 +-- asm/pullableLever.s | 12 +- asm/pullableMushroom.s | 12 +- asm/pushableLever.s | 4 +- asm/pushableRock.s | 8 +- asm/pushableStatue.s | 2 +- asm/railtrack.s | 8 +- asm/rem.s | 30 +-- asm/rockChuchu.s | 6 +- asm/rollobite.s | 22 +- asm/rope.s | 14 +- asm/ropeGolden.s | 12 +- asm/rupeeLike.s | 24 +- asm/scissorsBeetle.s | 4 +- asm/sittingPerson.s | 8 +- asm/slime.s | 288 +----------------------- asm/sluggula.s | 16 +- asm/smallIceBlock.s | 4 +- asm/smallPesto.s | 2 +- asm/smoke.s | 2 +- asm/spark.s | 2 +- asm/spearMoblin.s | 6 +- asm/specialFx.s | 2 +- asm/spikedBeetle.s | 16 +- asm/spinyBeetle.s | 20 +- asm/spinyChuchu.s | 42 ++-- asm/stalfos.s | 6 +- asm/stockwell.s | 12 +- asm/sturgeon.s | 14 +- asm/sub_08019410.s | 2 +- asm/sub_080A2838.s | 2 +- asm/swordsmanNewsletter.s | 2 +- asm/syrup.s | 2 +- asm/takkuri.s | 8 +- asm/talon.s | 6 +- asm/teachers.s | 6 +- asm/tektite.s | 22 +- asm/tektiteGolden.s | 26 +-- asm/townMinish.s | 12 +- asm/townsperson.s | 16 +- asm/treeHidingPortal.s | 4 +- asm/vaatiArm.s | 16 +- asm/vaatiEyesMacro.s | 8 +- asm/vaatiProjectile.s | 10 +- asm/vaatiReborn.s | 2 +- asm/vaatiTransfigured.s | 8 +- asm/vaatiWrath.s | 54 ++--- asm/wallMaster.s | 12 +- asm/wallMaster2.s | 8 +- asm/warpPoint.s | 4 +- asm/waterDrop.s | 6 +- asm/whirlwind.s | 4 +- asm/windTribeFlag.s | 4 +- asm/windTribespeople.s | 4 +- asm/wisp.s | 4 +- asm/wizzrobeFire.s | 10 +- asm/wizzrobeIce.s | 10 +- asm/wizzrobeWind.s | 18 +- include/entity.h | 21 +- include/gba/defines.h | 1 + include/greatFairy.h | 2 +- linker.ld | 3 +- src/greatFairy.c | 4 +- src/octorok.c | 18 +- src/positionRelative.c | 4 +- src/slime.c | 178 ++++++++++++++- src/stamp.c | 12 +- 268 files changed, 1408 insertions(+), 1412 deletions(-) create mode 100644 asm/non_matching/slime/sub_080450A8.inc diff --git a/asm/acroBandits.s b/asm/acroBandits.s index 03143223..fbc16fb4 100644 --- a/asm/acroBandits.s +++ b/asm/acroBandits.s @@ -48,7 +48,7 @@ _0803189C: adds r0, r5, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset _080318BE: pop {r4, r5, pc} .align 2, 0 @@ -179,7 +179,7 @@ _080319A2: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0xe - bl UpdateSprite + bl InitializeAnimation _080319AC: ldr r1, [sp] ldrb r0, [r1] @@ -251,7 +251,7 @@ _08031A1A: strb r1, [r2] adds r0, r4, #0 movs r1, #0xe - bl UpdateSprite + bl InitializeAnimation _08031A36: adds r0, r4, #0 adds r0, #0x43 @@ -394,7 +394,7 @@ _08031AD8: strh r4, [r6, #0x32] adds r0, r6, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08031B44: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -434,7 +434,7 @@ _08031B6C: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08031B90: pop {r4, pc} .align 2, 0 @@ -472,7 +472,7 @@ _08031BCE: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation b _08031C1A _08031BDA: adds r2, r4, #0 @@ -505,7 +505,7 @@ _08031BFA: strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _08031C1A: pop {r4, pc} @@ -651,7 +651,7 @@ sub_08031C58: @ 0x08031C58 strb r0, [r2] adds r0, r7, #0 movs r1, #7 - bl UpdateSprite + bl InitializeAnimation b _08031D66 .align 2, 0 _08031D50: .4byte gUnk_03003DBC @@ -875,7 +875,7 @@ sub_08031EA8: @ 0x08031EA8 strb r0, [r1] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08031EE8 @@ -927,7 +927,7 @@ _08031F2E: strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation _08031F48: pop {r4, pc} .align 2, 0 @@ -977,7 +977,7 @@ sub_08031F54: @ 0x08031F54 _08031FA2: adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation _08031FAA: pop {r4, pc} .align 2, 0 @@ -1020,12 +1020,12 @@ _08031FD8: beq _08031FFE adds r0, r5, #0 movs r1, #9 - bl UpdateSprite + bl InitializeAnimation b _08032006 _08031FFE: adds r0, r5, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation _08032006: pop {r4, r5, pc} @@ -1250,7 +1250,7 @@ _0803219C: strb r0, [r2] adds r0, r4, #0 movs r1, #0xc - bl UpdateSprite + bl InitializeAnimation _080321C2: ldr r0, [r4, #0x54] cmp r0, #0 @@ -1323,7 +1323,7 @@ _08032230: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0xd - bl UpdateSprite + bl InitializeAnimation _08032244: pop {r4, pc} .align 2, 0 @@ -1374,7 +1374,7 @@ sub_08032290: @ 0x08032290 movs r1, #0xc strb r1, [r0, #0xe] movs r1, #0xb - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -1402,7 +1402,7 @@ sub_080322A4: @ 0x080322A4 strh r0, [r2, #0x36] adds r0, r2, #0 movs r1, #0xb - bl UpdateSprite + bl InitializeAnimation movs r0, #1 b _080322E4 _080322D8: diff --git a/asm/anju.s b/asm/anju.s index 5362cafa..2036e84b 100644 --- a/asm/anju.s +++ b/asm/anju.s @@ -59,7 +59,7 @@ _0806C2FA: ands r1, r2 adds r1, r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0806F118 b _0806C350 diff --git a/asm/archway.s b/asm/archway.s index a4650d17..f83fcb8d 100644 --- a/asm/archway.s +++ b/asm/archway.s @@ -29,7 +29,7 @@ sub_08090F70: @ 0x08090F70 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip bl sub_08052660 cmp r0, #0 beq _08090FB4 diff --git a/asm/armos.s b/asm/armos.s index 98953126..bd301d2f 100644 --- a/asm/armos.s +++ b/asm/armos.s @@ -12,13 +12,13 @@ sub_08030198: @ 0x08030198 push {r4, lr} adds r4, r0, #0 ldr r1, _080301B8 @ =gUnk_080CE124 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset adds r0, r4, #0 bl sub_08030150 pop {r4, pc} @@ -237,7 +237,7 @@ sub_08030338: @ 0x08030338 _0803034C: adds r0, r4, #0 movs r1, #3 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r0, r4, #0 adds r0, #0x84 ldr r0, [r0] @@ -1107,7 +1107,7 @@ _080309C4: sub_080309C8: @ 0x080309C8 push {r4, lr} adds r4, r0, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 adds r0, #0x84 ldr r0, [r0] diff --git a/asm/bakerOven.s b/asm/bakerOven.s index dc393190..26eb6b9f 100644 --- a/asm/bakerOven.s +++ b/asm/bakerOven.s @@ -26,7 +26,7 @@ sub_0809CC74: @ 0x0809CC74 adds r5, r0, #0 movs r4, #1 strb r4, [r5, #0xc] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldrb r0, [r5, #0xa] cmp r0, #0 bne _0809CCD4 @@ -95,7 +95,7 @@ _0809CD00: _0809CD02: adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0809CD0A: pop {r4, r5, pc} @@ -212,7 +212,7 @@ sub_0809CDB4: @ 0x0809CDB4 strh r0, [r3, #0x32] adds r0, r3, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0809CDEC: pop {pc} .align 2, 0 diff --git a/asm/ballChainSoldier.s b/asm/ballChainSoldier.s index e651c3dc..6b89fd8e 100644 --- a/asm/ballChainSoldier.s +++ b/asm/ballChainSoldier.s @@ -11,7 +11,7 @@ sub_0803E528: @ 0x0803E528 push {lr} ldr r1, _0803E534 @ =gUnk_080D06E0 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _0803E534: .4byte gUnk_080D06E0 diff --git a/asm/beanstalk.s b/asm/beanstalk.s index 0d16237f..e052bd43 100644 --- a/asm/beanstalk.s +++ b/asm/beanstalk.s @@ -73,7 +73,7 @@ _08089D74: adds r0, r0, r4 ldrb r1, [r0] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r5, #0xb] lsls r0, r0, #2 adds r0, r0, r4 @@ -89,7 +89,7 @@ _08089D90: adds r1, r1, r0 ldrb r1, [r1] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _08089DC6 .align 2, 0 _08089DA8: .4byte gUnk_08120E14 @@ -658,7 +658,7 @@ _0808A1B0: ldrb r1, [r3] adds r1, #1 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _0808A1DE _0808A1DA: movs r0, #0 @@ -680,7 +680,7 @@ _0808A1DE: adds r1, r1, r0 adds r1, #1 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0808A202: pop {r3} mov r8, r3 diff --git a/asm/beedle.s b/asm/beedle.s index da9ddb4f..ab37b2fe 100644 --- a/asm/beedle.s +++ b/asm/beedle.s @@ -49,7 +49,7 @@ sub_080632E0: @ 0x080632E0 beq _0806330E adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08078778 ldrb r1, [r4, #0x18] @@ -88,7 +88,7 @@ sub_08063314: @ 0x08063314 cmp r0, r1 beq _08063342 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08063342: adds r0, r4, #0 adds r0, #0x39 @@ -126,7 +126,7 @@ sub_0806336C: @ 0x0806336C strb r0, [r2, #0xc] adds r0, r2, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation _0806338A: pop {pc} .align 2, 0 @@ -150,7 +150,7 @@ sub_08063390: @ 0x08063390 bl sub_0806EDC4 adds r1, r0, #0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08078778 _080633BE: diff --git a/asm/beetle.s b/asm/beetle.s index d500cbae..0d5e2e08 100644 --- a/asm/beetle.s +++ b/asm/beetle.s @@ -11,7 +11,7 @@ sub_08021758: @ 0x08021758 push {lr} ldr r1, _08021764 @ =gUnk_080CB590 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _08021764: .4byte gUnk_080CB590 @@ -82,7 +82,7 @@ _080217A8: strb r0, [r1] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _080217FA .align 2, 0 _080217EC: .4byte gLinkEntity @@ -158,7 +158,7 @@ _0802186C: strh r1, [r4, #0x36] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0802187A: pop {r4, pc} @@ -196,7 +196,7 @@ sub_0802189C: @ 0x0802189C strb r0, [r4, #0x1c] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_080218B4 @@ -296,7 +296,7 @@ _08021948: strh r0, [r5, #0x24] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0802197C: pop {r4, r5, r6, pc} .align 2, 0 @@ -362,9 +362,9 @@ _080219C2: strb r0, [r1] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08021A04: pop {r4, pc} .align 2, 0 @@ -405,7 +405,7 @@ sub_08021A10: @ 0x08021A10 bl sub_08021D44 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _08021A5E: pop {r4, pc} .align 2, 0 @@ -434,7 +434,7 @@ sub_08021A64: @ 0x08021A64 strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08021A96: ldrb r0, [r4, #0xf] subs r0, #1 @@ -454,7 +454,7 @@ _08021A96: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _08021AD4 _08021AC2: adds r0, r4, #0 @@ -496,7 +496,7 @@ sub_08021AD8: @ 0x08021AD8 strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _08021B60 _08021B16: strb r0, [r4, #0x15] @@ -533,7 +533,7 @@ _08021B3A: strb r0, [r1] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08021B60: pop {r4, pc} .align 2, 0 @@ -555,7 +555,7 @@ sub_08021B64: @ 0x08021B64 str r1, [r4, #0x34] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _08021C4E .align 2, 0 _08021B88: .4byte gLinkState @@ -621,7 +621,7 @@ _08021BF6: strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _08021C4E _08021C04: ldrb r1, [r6, #0x1a] @@ -721,7 +721,7 @@ _08021C8A: strb r2, [r0] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08021CCC: pop {r4, r5, pc} .align 2, 0 @@ -748,7 +748,7 @@ _08021CE6: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _08021CFE: pop {r4, pc} @@ -784,7 +784,7 @@ _08021D28: str r0, [r4, #0x20] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation movs r0, #1 _08021D40: pop {r4, pc} diff --git a/asm/bell.s b/asm/bell.s index f51caaba..dfc31dcd 100644 --- a/asm/bell.s +++ b/asm/bell.s @@ -44,7 +44,7 @@ sub_08097D90: @ 0x08097D90 ands r0, r1 strb r0, [r2] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0 bl LoadAnimation diff --git a/asm/bigBarrel.s b/asm/bigBarrel.s index 147dbf73..905cf9b9 100644 --- a/asm/bigBarrel.s +++ b/asm/bigBarrel.s @@ -509,7 +509,7 @@ _08088DEC: _08088E1E: strb r1, [r4, #0xb] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip b _08088E6E _08088E28: ldrb r0, [r4, #0xb] diff --git a/asm/bigIceBlock.s b/asm/bigIceBlock.s index d7a21c50..1247b278 100644 --- a/asm/bigIceBlock.s +++ b/asm/bigIceBlock.s @@ -73,7 +73,7 @@ _08099770: bl sub_08099910 ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x85 movs r1, #4 movs r2, #0 @@ -751,7 +751,7 @@ _08099D40: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x50] adds r1, r4, #0 bl sub_0806FA6C diff --git a/asm/bigPushableLever.s b/asm/bigPushableLever.s index 04c7fdcd..1e2ef61b 100644 --- a/asm/bigPushableLever.s +++ b/asm/bigPushableLever.s @@ -196,7 +196,7 @@ sub_08098FE0: @ 0x08098FE0 bl SetTile adds r0, r6, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _080990DC .align 2, 0 _08099060: .4byte gRoomControls @@ -253,7 +253,7 @@ _0809906C: bl SetTile adds r0, r6, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _080990DC: pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/bird.s b/asm/bird.s index 18b7f9ab..6bac4c13 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -74,7 +74,7 @@ sub_0809CF54: @ 0x0809CF54 ldr r0, _0809CFE8 @ =0x00000123 bl PlaySFX adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0 bl LoadAnimation @@ -162,7 +162,7 @@ sub_0809D048: @ 0x0809D048 movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0x17 bl LoadAnimation @@ -266,7 +266,7 @@ sub_0809D10C: @ 0x0809D10C movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0x17 bl LoadAnimation @@ -323,7 +323,7 @@ sub_0809D178: @ 0x0809D178 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r1, r4, #0 adds r1, #0x5a movs r0, #0x80 @@ -340,7 +340,7 @@ _0809D19C: movs r1, #3 ands r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation bl Random movs r1, #0xf ands r0, r1 diff --git a/asm/bladeBrothers.s b/asm/bladeBrothers.s index e5f82866..7e1ce944 100644 --- a/asm/bladeBrothers.s +++ b/asm/bladeBrothers.s @@ -79,7 +79,7 @@ _08068A38: _08068A42: strb r0, [r4, #0xc] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08068A4C diff --git a/asm/bobomb.s b/asm/bobomb.s index 027cc9ae..22c2b67a 100644 --- a/asm/bobomb.s +++ b/asm/bobomb.s @@ -11,7 +11,7 @@ sub_0802C660: @ 0x0802C660 push {lr} ldr r1, _0802C66C @ =gUnk_080CD5D4 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _0802C66C: .4byte gUnk_080CD5D4 @@ -149,7 +149,7 @@ _0802C770: movs r0, #6 orrs r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802C79E: ldr r1, _0802C7A8 @ =gUnk_080CD5D4 adds r0, r4, #0 @@ -296,7 +296,7 @@ _0802C88C: movs r0, #6 orrs r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802C8A2: ldrb r1, [r4, #0x10] movs r0, #0x7f @@ -365,7 +365,7 @@ sub_0802C8D8: @ 0x0802C8D8 ldrb r1, [r5, #0x15] lsrs r1, r1, #4 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} .align 2, 0 @@ -392,7 +392,7 @@ sub_0802C91C: @ 0x0802C91C movs r0, #2 orrs r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802C950: ldrb r0, [r4, #0xe] subs r1, r0, #1 @@ -424,7 +424,7 @@ _0802C97A: ldrb r1, [r4, #0x15] lsrs r1, r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802C992: ldrb r0, [r4, #0xe] subs r0, #1 @@ -441,7 +441,7 @@ _0802C992: strb r1, [r4, #0x15] lsrs r1, r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802C9B4: pop {r4, pc} .align 2, 0 @@ -486,7 +486,7 @@ sub_0802C9D0: @ 0x0802C9D0 movs r0, #6 orrs r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08004274 pop {r4, pc} @@ -606,7 +606,7 @@ sub_0802CA94: @ 0x0802CA94 movs r0, #6 orrs r1, r0 adds r0, r3, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _0802CAF4: .4byte gLinkEntity @@ -706,7 +706,7 @@ sub_0802CB68: @ 0x0802CB68 movs r0, #2 orrs r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _0802CBC2 _0802CBB2: movs r0, #0x3c @@ -715,7 +715,7 @@ _0802CBB2: strh r0, [r5, #0x24] lsrs r1, r2, #4 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0802CBC2: pop {r4, r5, pc} diff --git a/asm/bollard.s b/asm/bollard.s index cb40d9ed..ffd3c1a5 100644 --- a/asm/bollard.s +++ b/asm/bollard.s @@ -64,7 +64,7 @@ _0808B2F4: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 adds r0, #0x72 ldrh r0, [r0] @@ -126,7 +126,7 @@ _0808B36C: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0808B3AC ldr r0, _0808B388 @ =0x000001A5 @@ -215,7 +215,7 @@ sub_0808B41C: @ 0x0808B41C movs r1, #1 strb r1, [r0, #0xc] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -231,6 +231,6 @@ sub_0808B42C: @ 0x0808B42C orrs r1, r2 strb r1, [r3] movs r1, #1 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/bombPeahat.s b/asm/bombPeahat.s index c15e894a..f69b51a3 100644 --- a/asm/bombPeahat.s +++ b/asm/bombPeahat.s @@ -102,7 +102,7 @@ sub_0802A8AC: @ 0x0802A8AC bhi _0802A8C6 adds r0, r1, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0802A8C6: pop {pc} @@ -229,7 +229,7 @@ sub_0802A924: @ 0x0802A924 ldrb r1, [r7, #0xa] adds r1, #1 adds r0, r7, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, r6, r7, pc} .align 2, 0 _0802A9A0: .4byte gUnk_080CD16C @@ -450,7 +450,7 @@ _0802AB0E: strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0802AB3C: pop {r4, r5, r6, pc} .align 2, 0 @@ -558,7 +558,7 @@ _0802ABF2: ldrb r1, [r4, #0xa] adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802AC04: pop {r4, pc} .align 2, 0 @@ -884,7 +884,7 @@ sub_0802AE24: @ 0x0802AE24 strb r3, [r0] mov r0, ip movs r1, #3 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _0802AE64: .4byte gUnk_080CD174 @@ -1346,7 +1346,7 @@ sub_0802B1A0: @ 0x0802B1A0 adds r1, #0x81 strb r2, [r1] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0802B1BC diff --git a/asm/bombarossa.s b/asm/bombarossa.s index 3aa4e719..ced1ca43 100644 --- a/asm/bombarossa.s +++ b/asm/bombarossa.s @@ -37,7 +37,7 @@ sub_080333D4: @ 0x080333D4 strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0xa] cmp r0, #0 beq _0803340E diff --git a/asm/book.s b/asm/book.s index d0e57eb4..8d9547cf 100644 --- a/asm/book.s +++ b/asm/book.s @@ -71,7 +71,7 @@ _0809B420: strb r0, [r4, #0xb] _0809B424: adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldrb r1, [r4, #0xa] adds r1, #0x39 adds r0, r4, #0 diff --git a/asm/bossDoor.s b/asm/bossDoor.s index 3740d1ba..3a6a2a9e 100644 --- a/asm/bossDoor.s +++ b/asm/bossDoor.s @@ -100,7 +100,7 @@ _0808C230: movs r1, #0x1f ands r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0xb] cmp r0, #1 beq _0808C2F8 diff --git a/asm/bowMoblin.s b/asm/bowMoblin.s index 0ecfad7f..98e25e28 100644 --- a/asm/bowMoblin.s +++ b/asm/bowMoblin.s @@ -12,13 +12,13 @@ sub_0803C160: @ 0x0803C160 push {r4, lr} adds r4, r0, #0 ldr r1, _0803C17C @ =gUnk_080CFF78 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x18 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _0803C17C: .4byte gUnk_080CFF78 @@ -731,7 +731,7 @@ _0803C6D0: _0803C6D2: adds r0, r3, #0 adds r1, r2, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0803C6DC diff --git a/asm/bowUse.s b/asm/bowUse.s index 12724f0e..49f0fbe9 100644 --- a/asm/bowUse.s +++ b/asm/bowUse.s @@ -137,7 +137,7 @@ _0801921A: ldrb r1, [r0] adds r1, #0xf adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080192A2 .align 2, 0 _08019288: .4byte gRoomControls @@ -149,7 +149,7 @@ _08019294: ldrb r1, [r0] adds r1, #2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080192A2: adds r0, r4, #0 bl sub_08017744 @@ -224,7 +224,7 @@ _080192EE: strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _08019402 _08019336: ldrb r0, [r4, #0xc] diff --git a/asm/businessScrub.s b/asm/businessScrub.s index 6ab8b0df..2bb9fe58 100644 --- a/asm/businessScrub.s +++ b/asm/businessScrub.s @@ -11,7 +11,7 @@ sub_0802890C: @ 0x0802890C push {lr} ldr r1, _08028918 @ =gUnk_080CC9C8 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _08028918: .4byte gUnk_080CC9C8 @@ -955,7 +955,7 @@ sub_08028FFC: @ 0x08028FFC strh r0, [r4, #0x32] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08029074 @ =0x00004022 adds r1, r4, #0 adds r1, #0x76 @@ -1029,7 +1029,7 @@ sub_080290E0: @ 0x080290E0 adds r3, r3, r2 ldrb r2, [r3] orrs r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _080290F8: .4byte gUnk_080CCA04 @@ -1271,7 +1271,7 @@ sub_08029270: @ 0x08029270 strb r0, [r2, #0x18] adds r0, r2, #0 movs r1, #0xe - bl UpdateSprite + bl InitializeAnimation b _0802929C _08029296: adds r0, r2, #0 diff --git a/asm/businessScrubPrologue.s b/asm/businessScrubPrologue.s index bafef938..bea97379 100644 --- a/asm/businessScrubPrologue.s +++ b/asm/businessScrubPrologue.s @@ -11,7 +11,7 @@ sub_08045B88: @ 0x08045B88 push {lr} ldr r1, _08045B94 @ =gUnk_080D19FC - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _08045B94: .4byte gUnk_080D19FC @@ -586,7 +586,7 @@ sub_08045FA0: @ 0x08045FA0 strb r1, [r0] adds r0, r2, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -633,7 +633,7 @@ sub_08046030: @ 0x08046030 adds r3, r3, r2 ldrb r2, [r3] orrs r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _08046048: .4byte gUnk_080D1A38 diff --git a/asm/carpenter.s b/asm/carpenter.s index f5946665..f509acf2 100644 --- a/asm/carpenter.s +++ b/asm/carpenter.s @@ -74,7 +74,7 @@ _080671A8: adds r0, #4 adds r1, r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0806F118 b _08067224 @@ -101,7 +101,7 @@ _0806720A: adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08067224: pop {r4, r5, pc} .align 2, 0 @@ -179,7 +179,7 @@ sub_080672B0: @ 0x080672B0 ldrb r2, [r0, #0xa] lsls r2, r2, #3 adds r1, r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -267,7 +267,7 @@ sub_0806732C: @ 0x0806732C lsls r1, r1, #3 adds r1, #2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0806737E .align 2, 0 _08067374: .4byte gUnk_08110CA8 diff --git a/asm/castleMaid.s b/asm/castleMaid.s index 8669d836..8eab991b 100644 --- a/asm/castleMaid.s +++ b/asm/castleMaid.s @@ -148,7 +148,7 @@ _080645EA: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x68] cmp r0, #0 beq _0806463C diff --git a/asm/castorWildsStatue.s b/asm/castorWildsStatue.s index 326cb38e..563508ba 100644 --- a/asm/castorWildsStatue.s +++ b/asm/castorWildsStatue.s @@ -532,7 +532,7 @@ sub_08067750: @ 0x08067750 strh r0, [r4, #0x32] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation ldr r1, _08067784 @ =0x0000017B adds r0, r4, #0 bl sub_0801D2B4 diff --git a/asm/chaser.s b/asm/chaser.s index 5a6694d8..367eb121 100644 --- a/asm/chaser.s +++ b/asm/chaser.s @@ -57,7 +57,7 @@ sub_0802B530: @ 0x0802B530 movs r1, #1 strb r1, [r0, #0xc] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -113,7 +113,7 @@ _0802B586: beq _0802B5A2 adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0802B5A2: ldrh r2, [r4, #0x24] movs r0, #0x24 @@ -131,7 +131,7 @@ _0802B5B8: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0802B5C4: pop {r4, pc} .align 2, 0 @@ -154,6 +154,6 @@ sub_0802B5C8: @ 0x0802B5C8 strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0802B5EE: pop {r4, pc} diff --git a/asm/chestSpawner.s b/asm/chestSpawner.s index 6d210b89..aacf9d0f 100644 --- a/asm/chestSpawner.s +++ b/asm/chestSpawner.s @@ -92,7 +92,7 @@ sub_08083E4C: @ 0x08083E4C bl sub_080842D8 adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _08083EAC .align 2, 0 _08083E80: .4byte gUnk_0811F8B0 @@ -116,7 +116,7 @@ _08083EA0: _08083EA4: adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08083EAC: pop {r4, pc} .align 2, 0 diff --git a/asm/chuchu.s b/asm/chuchu.s index d3c0c198..816d8d85 100644 --- a/asm/chuchu.s +++ b/asm/chuchu.s @@ -69,7 +69,7 @@ _0801EE6C: strb r0, [r1] adds r0, r5, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _0801EE9E _0801EE96: adds r0, r5, #0 @@ -96,7 +96,7 @@ _0801EE9E: adds r0, r5, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset b _0801EEE0 .align 2, 0 _0801EED0: .4byte gUnk_080CA21C @@ -201,7 +201,7 @@ _0801EF68: bl sub_0804A9FC adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _0801EFC0 _0801EF94: adds r0, r4, #0 @@ -214,7 +214,7 @@ _0801EF94: bl sub_0801FB68 adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _0801EFC4 _0801EFB0: adds r0, r4, #0 @@ -222,7 +222,7 @@ _0801EFB0: str r6, [r4, #0x20] adds r0, r4, #0 movs r1, #9 - bl UpdateSprite + bl InitializeAnimation _0801EFC0: adds r5, r4, #0 adds r5, #0x80 @@ -253,7 +253,7 @@ sub_0801EFD8: @ 0x0801EFD8 bl sub_0804A9FC adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _0801F028 _0801F000: adds r0, r4, #0 @@ -265,7 +265,7 @@ _0801F000: bl sub_0801FB68 adds r0, r4, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation _0801F018: movs r1, #0xc0 lsls r1, r1, #5 @@ -410,7 +410,7 @@ sub_0801F0C8: @ 0x0801F0C8 strb r0, [r2] adds r0, r5, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0801F12A: pop {r4, r5, pc} @@ -617,7 +617,7 @@ _0801F28C: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _0801F2CA _0801F2C6: movs r0, #8 @@ -645,7 +645,7 @@ sub_0801F2CC: @ 0x0801F2CC strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _0801F2F6: pop {r4, pc} @@ -683,7 +683,7 @@ sub_0801F328: @ 0x0801F328 ands r1, r2 strb r1, [r0, #0x10] movs r1, #5 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -701,7 +701,7 @@ sub_0801F340: @ 0x0801F340 movs r1, #0x5c strb r1, [r2] movs r1, #2 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -738,7 +738,7 @@ sub_0801F360: @ 0x0801F360 strb r0, [r2] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 @@ -782,7 +782,7 @@ _0801F3DE: strb r2, [r5] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0801F426 _0801F400: ldrb r0, [r4, #0xc] @@ -804,7 +804,7 @@ _0801F416: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #7 - bl UpdateSprite + bl InitializeAnimation _0801F426: pop {r4, r5, pc} @@ -854,7 +854,7 @@ sub_0801F428: @ 0x0801F428 strb r0, [r5, #0x18] adds r0, r5, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0801F488: pop {r4, r5, pc} .align 2, 0 @@ -905,7 +905,7 @@ sub_0801F494: @ 0x0801F494 strb r0, [r2] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0801F4E8: pop {r4, pc} .align 2, 0 @@ -1061,7 +1061,7 @@ _0801F5FC: strb r0, [r1] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0801F618: pop {r4, pc} .align 2, 0 @@ -1119,7 +1119,7 @@ sub_0801F638: @ 0x0801F638 strb r0, [r2] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0801F684: pop {r4, pc} .align 2, 0 @@ -1180,7 +1180,7 @@ sub_0801F6CC: @ 0x0801F6CC strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _0801F6F6: pop {r4, pc} @@ -1208,7 +1208,7 @@ sub_0801F6F8: @ 0x0801F6F8 bl sub_0804AA1C adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0801F72E: pop {r4, pc} @@ -1222,7 +1222,7 @@ sub_0801F730: @ 0x0801F730 ands r1, r2 strb r1, [r0, #0x10] movs r1, #5 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -1238,7 +1238,7 @@ sub_0801F748: @ 0x0801F748 orrs r1, r2 strb r1, [r0, #0x18] movs r1, #4 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -1282,7 +1282,7 @@ _0801F79C: strb r6, [r5] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0801F7D6 _0801F7B8: ldrb r0, [r4, #0xc] @@ -1298,7 +1298,7 @@ _0801F7C6: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #7 - bl UpdateSprite + bl InitializeAnimation _0801F7D6: pop {r4, r5, r6, pc} @@ -1353,7 +1353,7 @@ _0801F822: strb r0, [r5] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0801F83E: pop {r4, r5, pc} @@ -1548,7 +1548,7 @@ _0801F9AE: strh r0, [r4, #0x24] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0801F9C2: pop {r4, pc} @@ -1605,7 +1605,7 @@ sub_0801F9E0: @ 0x0801F9E0 strb r0, [r2] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0801FA2C: pop {r4, pc} .align 2, 0 @@ -1636,7 +1636,7 @@ _0801FA54: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #7 - bl UpdateSprite + bl InitializeAnimation b _0801FA74 _0801FA6E: adds r0, r4, #0 @@ -1665,7 +1665,7 @@ sub_0801FA78: @ 0x0801FA78 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0804AA1C _0801FAA8: @@ -1708,7 +1708,7 @@ sub_0801FAE0: @ 0x0801FAE0 ands r1, r2 strb r1, [r0, #0x10] movs r1, #5 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -1724,7 +1724,7 @@ sub_0801FAF8: @ 0x0801FAF8 orrs r1, r2 strb r1, [r0, #0x18] movs r1, #4 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -1742,7 +1742,7 @@ sub_0801FB14: @ 0x0801FB14 strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_0801FB34 @@ -1863,5 +1863,5 @@ sub_0801FBE4: @ 0x0801FBE4 strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} diff --git a/asm/chuchuBoss.s b/asm/chuchuBoss.s index f79f1e0f..54214b89 100644 --- a/asm/chuchuBoss.s +++ b/asm/chuchuBoss.s @@ -237,7 +237,7 @@ _08025E4C: adds r0, r0, r6 ldrb r1, [r0] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _08025E58: ldrb r0, [r5, #0xa] movs r6, #3 diff --git a/asm/clothesRack.s b/asm/clothesRack.s index d9494c91..900f1bbe 100644 --- a/asm/clothesRack.s +++ b/asm/clothesRack.s @@ -49,7 +49,7 @@ _0806DDB8: _0806DDC4: adds r0, r7, #0 adds r1, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x2e ldrsh r5, [r7, r0] movs r1, #0x32 diff --git a/asm/cloudPiranha.s b/asm/cloudPiranha.s index 8be59e75..91e77567 100644 --- a/asm/cloudPiranha.s +++ b/asm/cloudPiranha.s @@ -12,13 +12,13 @@ sub_08038430: @ 0x08038430 push {r4, lr} adds r4, r0, #0 ldr r1, _0803844C @ =gUnk_080CF4F0 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _0803844C: .4byte gUnk_080CF4F0 @@ -142,7 +142,7 @@ sub_080384E0: @ 0x080384E0 strb r0, [r1] ldrb r1, [r6, #0x14] adds r0, r6, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, r6, pc} thumb_func_start sub_08038534 @@ -193,7 +193,7 @@ _08038578: _0803858A: ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080385C8 _08038594: ldrb r0, [r4, #0xe] @@ -218,7 +218,7 @@ _08038594: strb r0, [r4, #0x15] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080385C8: pop {r4, pc} .align 2, 0 @@ -247,7 +247,7 @@ sub_080385CC: @ 0x080385CC strb r0, [r4, #0x15] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08038648 _08038604: ldrb r0, [r4, #0xf] @@ -284,7 +284,7 @@ _08038638: strb r0, [r4, #0x15] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08038648: pop {r4, r5, r6, pc} .align 2, 0 @@ -383,7 +383,7 @@ sub_080386B8: @ 0x080386B8 ldrb r1, [r4, #0x15] lsrs r1, r1, #2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #2 movs r2, #0 @@ -476,7 +476,7 @@ sub_08038754: @ 0x08038754 lsrs r1, r1, #0x18 adds r1, #9 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080387D8 .align 2, 0 _080387C0: .4byte 0x0000012B @@ -489,7 +489,7 @@ _080387C4: lsrs r1, r1, #0x18 adds r1, #8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080387D8: adds r0, r4, #0 movs r1, #2 @@ -583,7 +583,7 @@ _0803887E: strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08038890: adds r0, r4, #0 bl sub_08004274 diff --git a/asm/code_080011C4.s b/asm/code_080011C4.s index f0625c81..28964d77 100644 --- a/asm/code_080011C4.s +++ b/asm/code_080011C4.s @@ -68,7 +68,7 @@ _08001230: beq _0800123E strb r1, [r0, #0xe] movs r1, #4 - ldr r3, _0800135C @ =UpdateSpriteAnimation + ldr r3, _0800135C @ =InitializeAnimationAnimation bx r3 _0800123E: ldr r3, _08001360 @ =sub_080043B4 @@ -126,8 +126,8 @@ sub_08001290: @ 0x08001290 _0800129C: bx lr - non_word_aligned_thumb_func_start sub_0800129E -sub_0800129E: @ 0x0800129E + non_word_aligned_thumb_func_start EnemyFunctionHandler +EnemyFunctionHandler: @ 0x0800129E mov r3, lr push {r3, r4, r5} adds r4, r0, #0 @@ -238,7 +238,7 @@ _08001352: bx lr .align 2, 0 _08001358: .4byte gEnemyFunctions -_0800135C: .4byte UpdateSpriteAnimation +_0800135C: .4byte InitializeAnimationAnimation _08001360: .4byte sub_080043B4 _08001364: .4byte 0x00001800 _08001368: .4byte gUnk_080012C8 diff --git a/asm/code_08003FC4.s b/asm/code_08003FC4.s index 45d1af2a..52be2f2f 100644 --- a/asm/code_08003FC4.s +++ b/asm/code_08003FC4.s @@ -414,8 +414,8 @@ _0800425C: pop {r4} bx lr - thumb_func_start UpdateSprite -UpdateSprite: @ 0x08004260 + thumb_func_start InitializeAnimation +InitializeAnimation: @ 0x08004260 movs r2, #0x58 strb r1, [r0, r2] ldrh r3, [r0, #0x12] @@ -431,8 +431,8 @@ UpdateSprite: @ 0x08004260 sub_08004274: @ 0x08004274 movs r1, #1 - non_word_aligned_thumb_func_start UpdateSpriteAnimation -UpdateSpriteAnimation: @ 0x08004276 + non_word_aligned_thumb_func_start InitializeAnimationAnimation +InitializeAnimationAnimation: @ 0x08004276 movs r3, #0x59 ldrb r2, [r0, r3] subs r2, r2, r1 @@ -466,7 +466,7 @@ _0800429C: thumb_func_start LoadAnimation LoadAnimation: @ 0x080042AC push {lr} - bl UpdateSprite + bl InitializeAnimation movs r2, #0xff strb r2, [r0, #0x1f] b _080042C0 @@ -478,7 +478,7 @@ sub_080042B8: @ 0x080042B8 non_word_aligned_thumb_func_start sub_080042BA sub_080042BA: @ 0x080042BA push {lr} - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation _080042C0: pop {r1} mov lr, r1 diff --git a/asm/code_080041E8.s b/asm/code_080041E8.s index 32dd6f67..9bdf3bfa 100644 --- a/asm/code_080041E8.s +++ b/asm/code_080041E8.s @@ -80,8 +80,8 @@ _0800425C: pop {r4} bx lr - thumb_func_start UpdateSprite -UpdateSprite: @ 0x08004260 + thumb_func_start InitializeAnimation +InitializeAnimation: @ 0x08004260 movs r2, #0x58 strb r1, [r0, r2] ldrh r3, [r0, #0x12] @@ -97,8 +97,8 @@ UpdateSprite: @ 0x08004260 sub_08004274: @ 0x08004274 movs r1, #1 - non_word_aligned_thumb_func_start UpdateSpriteAnimation -UpdateSpriteAnimation: @ 0x08004276 + non_word_aligned_thumb_func_start InitializeAnimationAnimation +InitializeAnimationAnimation: @ 0x08004276 movs r3, #0x59 ldrb r2, [r0, r3] subs r2, r2, r1 @@ -132,7 +132,7 @@ _0800429C: thumb_func_start LoadAnimation LoadAnimation: @ 0x080042AC push {lr} - bl UpdateSprite + bl InitializeAnimation movs r2, #0xff strb r2, [r0, #0x1f] b _080042C0 @@ -144,7 +144,7 @@ sub_080042B8: @ 0x080042B8 non_word_aligned_thumb_func_start sub_080042BA sub_080042BA: @ 0x080042BA push {lr} - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation _080042C0: pop {r1} mov lr, r1 diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s index 77062154..c810b413 100644 --- a/asm/code_0800857C.s +++ b/asm/code_0800857C.s @@ -387,7 +387,7 @@ _0800882C: movs r3, #0x38 ldrb r1, [r4, r3] strb r1, [r0, r3] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0800883A: ldr r1, _080088E0 @ =gRoomControls ldrh r0, [r1, #6] @@ -4030,8 +4030,8 @@ gUnk_080169A4:: .byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00 .byte 0x00, 0x00, 0x01, 0x00 - thumb_func_start UpdateSpriteOrderAndFlip -UpdateSpriteOrderAndFlip: @ 0x08016A04 + thumb_func_start InitializeAnimationOrderAndFlip +InitializeAnimationOrderAndFlip: @ 0x08016A04 movs r1, #0x38 ldrb r1, [r0, r1] lsls r1, r1, #1 @@ -4083,7 +4083,7 @@ _08016A62: strb r3, [r4, r5] _08016A64: adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {r4, r5, pc} thumb_func_start sub_08016A6C @@ -4123,6 +4123,6 @@ sub_08016AD2: @ 0x08016AD2 bl sub_08016A6C push {r0} adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {r0, r4, pc} diff --git a/asm/code_08016DF8.s b/asm/code_08016DF8.s index 00970659..7ed2ad65 100644 --- a/asm/code_08016DF8.s +++ b/asm/code_08016DF8.s @@ -1567,7 +1567,7 @@ sub_08017940: @ 0x08017940 adds r0, #0x38 strb r1, [r0] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080179CC: movs r1, #0 ldr r0, _080179E8 @ =gLinkEntity diff --git a/asm/code_08018500.s b/asm/code_08018500.s index 07ff741e..e73c6d4e 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -1145,7 +1145,7 @@ _08018D64: ldrb r1, [r4, #0xa] adds r1, #0xa adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08018FA0 _08018DD2: @@ -1343,7 +1343,7 @@ _08018F46: ldrb r1, [r4, #0xa] adds r1, #0xd adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08018F56: ldrb r0, [r4, #0xc] adds r0, #1 diff --git a/asm/code_08019444.s b/asm/code_08019444.s index 72aa683c..258e2c19 100644 --- a/asm/code_08019444.s +++ b/asm/code_08019444.s @@ -155,7 +155,7 @@ _0801954E: adds r0, r0, r1 ldrb r1, [r0] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_0801766C adds r0, r5, #0 @@ -4031,14 +4031,14 @@ _0801B29E: bne _0801B2C0 adds r0, r2, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _0801B2C8 .align 2, 0 _0801B2BC: .4byte gUnk_080B77F4 _0801B2C0: adds r0, r2, #0 movs r1, #0x15 - bl UpdateSprite + bl InitializeAnimation _0801B2C8: pop {pc} .align 2, 0 @@ -4548,7 +4548,7 @@ _0801B600: strh r0, [r6, #0x32] adds r0, r6, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _0801B67C @ =gLinkState str r5, [r0, #0x2c] ldrb r1, [r0, #4] diff --git a/asm/code_08049CD4.s b/asm/code_08049CD4.s index 13797ec9..94497165 100644 --- a/asm/code_08049CD4.s +++ b/asm/code_08049CD4.s @@ -1290,7 +1290,7 @@ _0804A612: strb r0, [r1] _0804A638: adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r5, r4, #0 adds r5, #0x6d ldrb r1, [r5] @@ -1752,8 +1752,8 @@ _0804A9A8: adds r0, r4, #0 pop {r4, r5, r6, pc} - thumb_func_start sub_0804A9AC -sub_0804A9AC: @ 0x0804A9AC + thumb_func_start SetChildOffset +SetChildOffset: @ 0x0804A9AC push {r4, r5, r6, r7, lr} adds r5, r0, #0 adds r6, r1, #0 diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s index 84221cde..daba2a13 100644 --- a/asm/code_0805436C.s +++ b/asm/code_0805436C.s @@ -685,7 +685,7 @@ _08054842: adds r0, #0x38 strb r1, [r0] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0805486A: adds r0, r4, #0 _0805486C: @@ -1551,7 +1551,7 @@ sub_08054EFC: @ 0x08054EFC movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0x35 movs r2, #0 diff --git a/asm/code_08056418.s b/asm/code_08056418.s index bdcf0f6b..641bff29 100644 --- a/asm/code_08056418.s +++ b/asm/code_08056418.s @@ -2578,7 +2578,7 @@ _080577F2: mov r1, r8 strb r1, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08057808: pop {r3} mov r8, r3 @@ -14218,7 +14218,7 @@ sub_0805D1FC: @ 0x0805D1FC movs r0, #3 strb r0, [r1] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0805D236: adds r0, r4, #0 bl sub_0805E900 @@ -16066,7 +16066,7 @@ sub_0805E000: @ 0x0805E000 movs r5, #1 strb r5, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r0, _0805E068 @ =gUnk_030010A0 adds r0, #0x38 ldrb r1, [r0] diff --git a/asm/code_0805E744.s b/asm/code_0805E744.s index 5749b682..4835ccdd 100644 --- a/asm/code_0805E744.s +++ b/asm/code_0805E744.s @@ -2838,7 +2838,7 @@ _0805FC36: lsrs r1, r1, #0x19 adds r1, #0xc adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_0801766C adds r0, r5, #0 diff --git a/asm/code_0806EC20.s b/asm/code_0806EC20.s index d8923c6d..bbc78a17 100644 --- a/asm/code_0806EC20.s +++ b/asm/code_0806EC20.s @@ -163,7 +163,7 @@ _0806ECD0: strb r1, [r0] strb r1, [r4, #0x1e] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0806ED4A: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index 7cbb4aa4..ea448c9b 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -459,7 +459,7 @@ sub_0806F078: @ 0x0806F078 b _0806F09C _0806F096: adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _0806F09C: movs r0, #1 b _0806F0A2 diff --git a/asm/code_0806FA6C.s b/asm/code_0806FA6C.s index 8b6c2065..ecebf1f7 100644 --- a/asm/code_0806FA6C.s +++ b/asm/code_0806FA6C.s @@ -1053,7 +1053,7 @@ _0807018C: bl sub_0801766C ldrb r1, [r4] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080701F4 @ =0x000001DD bl PlaySFX pop {r4, r5, pc} @@ -1209,7 +1209,7 @@ _08070280: str r0, [r5, #0x7c] adds r0, r5, #0 movs r1, #0x14 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08070360 @ =0x00004020 movs r3, #0x2e ldrsh r1, [r5, r3] @@ -1403,7 +1403,7 @@ sub_08070458: @ 0x08070458 _0807049E: adds r0, r4, #0 movs r1, #0x13 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08017744 ldr r0, _080704B8 @ =0x00000199 @@ -4884,7 +4884,7 @@ sub_08071F80: @ 0x08071F80 cmp r5, #0 bne _08071FB8 adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r0, _08071FB4 @ =gLinkState strb r5, [r0, #2] ldrb r0, [r0, #0x14] @@ -5180,7 +5180,7 @@ _080721AC: orrs r0, r1 strb r0, [r4, #0x10] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip bl sub_080791BC _080721DE: pop {r4, pc} @@ -5417,7 +5417,7 @@ sub_08072354: @ 0x08072354 ands r0, r1 str r0, [r2, #0x30] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0xc movs r2, #0 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index 8135e4d6..47ba0110 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -3153,7 +3153,7 @@ sub_08074A48: @ 0x08074A48 movs r0, #1 strb r0, [r1, #0xe] adds r0, r1, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldrh r1, [r5, #0x22] adds r0, r4, #0 adds r0, #0x38 diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index 6f4068e0..3bbaea0d 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -3397,7 +3397,7 @@ _080794F4: bne _080794F4 _08079514: ldr r0, _0807951C @ =gLinkEntity - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {r4, r5, pc} .align 2, 0 _0807951C: .4byte gLinkEntity diff --git a/asm/code_0807B9B8.s b/asm/code_0807B9B8.s index 6fc49a41..2b0266fd 100644 --- a/asm/code_0807B9B8.s +++ b/asm/code_0807B9B8.s @@ -1807,7 +1807,7 @@ _0807C7C2: movs r1, #1 strb r1, [r0] ldr r0, [r4, #0x30] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0807C7FC: ldrb r1, [r4, #0xf] movs r0, #0xfb diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index b7402419..57abc9a3 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -5269,7 +5269,7 @@ sub_0807F158: @ 0x0807F158 adds r2, #0x38 movs r1, #1 strb r1, [r2] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {pc} thumb_func_start sub_0807F168 @@ -5280,7 +5280,7 @@ sub_0807F168: @ 0x0807F168 adds r2, #0x38 movs r1, #1 strb r1, [r2] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {pc} .align 2, 0 _0807F17C: .4byte gLinkEntity @@ -5292,7 +5292,7 @@ sub_0807F180: @ 0x0807F180 adds r2, #0x38 movs r1, #2 strb r1, [r2] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {pc} thumb_func_start sub_0807F190 diff --git a/asm/code_080A29BC.s b/asm/code_080A29BC.s index 0c6c0dc9..e0f8b904 100644 --- a/asm/code_080A29BC.s +++ b/asm/code_080A29BC.s @@ -979,7 +979,7 @@ _080A30F8: _080A30FC: adds r0, r4, #0 movs r1, #0x18 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080A310C pop {r4, r5, pc} diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index a56971c0..217d68a8 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -5202,7 +5202,7 @@ _080A7E14: ldr r0, [r5, #4] str r0, [r4, #0x48] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080A7E4A: movs r0, #1 _080A7E4C: @@ -5539,7 +5539,7 @@ sub_080A8088: @ 0x080A8088 lsls r1, r1, #8 str r1, [r0, #0x20] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_080A80A0 @@ -5720,7 +5720,7 @@ sub_080A81E0: @ 0x080A81E0 ldr r1, _080A81F8 @ =0x0000FFFE strh r1, [r0, #0x36] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _080A81F8: .4byte 0x0000FFFE @@ -6102,7 +6102,7 @@ _080A8496: _080A84B8: adds r0, r4, #0 movs r1, #0x19 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080A86A0 _080A84C6: @@ -6134,7 +6134,7 @@ _080A84F0: bl sub_08004488 adds r0, r4, #0 movs r1, #0x18 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _080A8500: .4byte 0x0000018D @@ -6173,7 +6173,7 @@ _080A853C: bl sub_08016AD2 adds r0, r4, #0 movs r1, #0x19 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080A86A0 _080A8558: @@ -6262,7 +6262,7 @@ _080A85F2: bl sub_08016AD2 adds r0, r4, #0 movs r1, #0x19 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080A86A0 _080A860E: @@ -6630,7 +6630,7 @@ _080A88A8: _080A88AE: adds r0, r3, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _080A88C6 _080A88B8: strb r4, [r3, #0xe] @@ -6639,7 +6639,7 @@ _080A88B8: _080A88BE: adds r0, r3, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation _080A88C6: pop {r4, pc} @@ -6824,7 +6824,7 @@ _080A8A10: _080A8A16: adds r0, r5, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x84 bl sub_08004488 movs r0, #3 @@ -6897,7 +6897,7 @@ sub_080A8A90: @ 0x080A8A90 ldrb r1, [r2, #0x15] lsrs r1, r1, #3 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation b _080A8AC2 _080A8AAA: movs r0, #2 @@ -6907,7 +6907,7 @@ _080A8AAA: movs r0, #4 orrs r1, r0 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080A8AC4 @ =0x0000015F bl sub_08004488 _080A8AC2: @@ -6954,7 +6954,7 @@ _080A8AE6: strb r0, [r4, #0xe] lsrs r1, r2, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080A8B2E _080A8B1A: lsrs r0, r2, #2 @@ -6965,7 +6965,7 @@ _080A8B1A: strb r0, [r4, #0x14] lsrs r1, r2, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080A8B2E: adds r0, r4, #0 bl sub_08004274 @@ -7056,7 +7056,7 @@ sub_080A8BC0: @ 0x080A8BC0 ldrb r1, [r2, #0x15] lsrs r1, r1, #3 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation b _080A8BF4 _080A8BDA: movs r0, #2 @@ -7066,7 +7066,7 @@ _080A8BDA: movs r0, #4 orrs r1, r0 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xaf lsls r0, r0, #1 bl sub_08004488 @@ -7110,7 +7110,7 @@ _080A8C16: strb r0, [r4, #0xe] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080A8C42: adds r0, r4, #0 bl sub_08004274 @@ -7201,7 +7201,7 @@ sub_080A8CD4: @ 0x080A8CD4 ldrb r1, [r2, #0x15] lsrs r1, r1, #3 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation b _080A8D08 _080A8CEE: movs r0, #2 @@ -7211,7 +7211,7 @@ _080A8CEE: movs r0, #4 orrs r1, r0 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xb0 lsls r0, r0, #1 bl sub_08004488 @@ -7255,7 +7255,7 @@ _080A8D2A: strb r0, [r4, #0xe] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080A8D56: adds r0, r4, #0 bl sub_08004274 @@ -7356,7 +7356,7 @@ sub_080A8DDC: @ 0x080A8DDC strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #0x53 - bl UpdateSprite + bl InitializeAnimation _080A8E12: ldr r0, _080A8E24 @ =gUnk_08129968 ldrb r1, [r4, #0xc] @@ -7399,7 +7399,7 @@ sub_080A8E28: @ 0x080A8E28 str r0, [r5, #0x30] adds r0, r5, #0 movs r1, #0x51 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080A8E84 @ =0x000001B5 bl PlaySFX _080A8E6E: @@ -7552,7 +7552,7 @@ _080A8F9E: bl sub_08004168 adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _080A8FAE: pop {r4, r5, r6, pc} .align 2, 0 @@ -7621,14 +7621,14 @@ _080A901C: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0x54 - bl UpdateSprite + bl InitializeAnimation b _080A9054 .align 2, 0 _080A9048: .4byte gLinkEntity _080A904C: adds r0, r4, #0 movs r1, #0x52 - bl UpdateSprite + bl InitializeAnimation _080A9054: pop {r4, pc} .align 2, 0 @@ -7656,7 +7656,7 @@ sub_080A9058: @ 0x080A9058 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x55 - bl UpdateSprite + bl InitializeAnimation b _080A90BA _080A908A: adds r0, r4, #0 @@ -7680,7 +7680,7 @@ _080A9098: strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #0x53 - bl UpdateSprite + bl InitializeAnimation _080A90BA: pop {r4, pc} @@ -7942,7 +7942,7 @@ _080A9288: str r0, [r4, #0x48] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _080A92B0: adds r0, r4, #0 adds r0, #0x41 @@ -8123,7 +8123,7 @@ sub_080A93DC: @ 0x080A93DC ldrb r1, [r0] adds r1, #2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xc5 lsls r0, r0, #1 bl sub_08004488 @@ -8250,7 +8250,7 @@ sub_080A94C0: @ 0x080A94C0 ldr r1, [r1, #4] str r1, [r0, #0x48] ldrb r1, [r3] - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _080A94FC: .4byte gUnk_081299F8 @@ -8282,7 +8282,7 @@ sub_080A9518: @ 0x080A9518 adds r1, #2 strh r1, [r0, #0x32] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080A953C @ =0x00000149 bl PlaySFX pop {pc} @@ -8316,7 +8316,7 @@ sub_080A9540: @ 0x080A9540 strh r0, [r3, #0x32] adds r0, r3, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _080A95B6 _080A9578: ldrh r1, [r3, #0x36] @@ -8489,7 +8489,7 @@ _080A9660: bl sub_0806F62C adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _080A9756 .align 2, 0 _080A96C8: .4byte 0x000001FF @@ -8526,7 +8526,7 @@ _080A96F8: bl sub_0806F62C adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _080A9756 _080A9718: ldr r0, _080A9760 @ =gLinkEntity @@ -8554,7 +8554,7 @@ _080A9718: strh r0, [r4, #0x32] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _080A9756: ldr r0, _080A9768 @ =0x000001B5 bl PlaySFX @@ -9070,7 +9070,7 @@ _080A9B0A: bne _080A9B1E adds r0, r2, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _080A9B22 _080A9B1E: movs r0, #0 @@ -9495,7 +9495,7 @@ sub_080A9DFC: @ 0x080A9DFC adds r1, #0x45 strb r2, [r1] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_080A9E14 @@ -10441,7 +10441,7 @@ sub_080AA534: @ 0x080AA534 adds r2, #0x38 movs r1, #3 strb r1, [r2] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {pc} thumb_func_start sub_080AA544 @@ -11225,7 +11225,7 @@ sub_080AAB24: @ 0x080AAB24 movs r1, #0x1e strb r1, [r0, #0xe] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -11285,7 +11285,7 @@ sub_080AAB8C: @ 0x080AAB8C strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _080AABA2: adds r0, r4, #0 bl sub_080AABB0 @@ -11675,7 +11675,7 @@ _080AAE64: _080AAE7C: ldrb r1, [r5, #0xa] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} .align 2, 0 @@ -12279,7 +12279,7 @@ sub_080AB2DC: @ 0x080AB2DC strb r0, [r2, #0x10] adds r0, r2, #0 movs r1, #0x53 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r5] ands r4, r0 cmp r4, #0 @@ -12344,7 +12344,7 @@ sub_080AB318: @ 0x080AB318 str r0, [r6, #0x34] adds r0, r6, #0 movs r1, #0x51 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080AB3E0 @ =0x000001B5 bl PlaySFX adds r0, r6, #0 @@ -12427,7 +12427,7 @@ sub_080AB414: @ 0x080AB414 strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0x54 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080AB4A4 b _080AB458 @@ -12464,7 +12464,7 @@ sub_080AB45C: @ 0x080AB45C strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #0x53 - bl UpdateSprite + bl InitializeAnimation _080AB486: pop {r4, pc} @@ -12617,7 +12617,7 @@ sub_080AB580: @ 0x080AB580 ldr r1, _080AB598 @ =0x0000FFFC strh r1, [r0, #0x36] ldrb r1, [r0, #0xa] - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _080AB598: .4byte 0x0000FFFC @@ -12793,7 +12793,7 @@ sub_080AB6B8: @ 0x080AB6B8 str r0, [r2, #0x48] adds r0, r2, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _080AB6F8 .align 2, 0 _080AB6E4: .4byte gUnk_0812A614 @@ -12804,7 +12804,7 @@ _080AB6E8: strb r0, [r2, #0xf] ldrb r1, [r2, #0xe] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _080AB6F8: pop {pc} .align 2, 0 @@ -12825,7 +12825,7 @@ sub_080AB6FC: @ 0x080AB6FC strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080AB758 _080AB724: @@ -13095,7 +13095,7 @@ sub_080AB8E8: @ 0x080AB8E8 _080AB90E: adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0xa] cmp r0, #3 bhi _080AB936 @@ -13334,7 +13334,7 @@ _080ABACC: strh r0, [r2, #0x2e] _080ABAD6: adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -13651,7 +13651,7 @@ sub_080ABCC4: @ 0x080ABCC4 strb r0, [r2] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080ABD40 @ =0x0000014B bl PlaySFX pop {r4, r5, pc} @@ -13673,7 +13673,7 @@ sub_080ABD44: @ 0x080ABD44 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _080ABD60: adds r0, r4, #0 bl sub_080AF090 @@ -13813,7 +13813,7 @@ _080ABE56: bl sub_08004168 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080ABE84 @ =0x0000012D bl PlaySFX pop {r4, r5, pc} @@ -13874,7 +13874,7 @@ _080ABEDA: _080ABEEC: adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080ABF00 @ =0x00000193 bl PlaySFX pop {r4, pc} @@ -13928,7 +13928,7 @@ sub_080ABF40: @ 0x080ABF40 strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080ABFA4 @ =0x00000199 bl PlaySFX _080ABF66: @@ -14008,7 +14008,7 @@ sub_080ABFEC: @ 0x080ABFEC adds r4, r0, #0 ldrb r1, [r4, #0xa] adds r1, #1 - bl UpdateSprite + bl InitializeAnimation ldrb r1, [r4, #0xa] cmp r1, #0 beq _080AC030 @@ -15238,7 +15238,7 @@ _080AC8FE: strh r0, [r4, #0x24] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _080AC920: adds r0, r4, #0 bl sub_080AC8C4 @@ -15257,10 +15257,10 @@ sub_080AC928: @ 0x080AC928 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080AC954 pop {r4, pc} @@ -15355,7 +15355,7 @@ _080AC9E8: strh r0, [r4, #0x24] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _080ACA10: pop {r4, pc} .align 2, 0 @@ -15471,7 +15471,7 @@ sub_080ACAC8: @ 0x080ACAC8 strh r1, [r0, #0x36] str r2, [r0, #0x54] movs r1, #7 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080ACAEC @ =0x00000199 bl PlaySFX pop {pc} @@ -16123,7 +16123,7 @@ _080ACF64: adds r0, r0, r3 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation bl sub_08078D60 _080ACFB6: ldrb r1, [r5, #8] @@ -16380,7 +16380,7 @@ _080AD188: bl PlaySFX _080AD196: adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip movs r0, #3 strb r0, [r5, #0xd] ldrb r2, [r4, #0x19] diff --git a/asm/createBowEntity.s b/asm/createBowEntity.s index 35f6f27b..050ae83a 100644 --- a/asm/createBowEntity.s +++ b/asm/createBowEntity.s @@ -145,7 +145,7 @@ _08019062: _080190E8: ldrb r1, [r5] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xfc bl PlaySFX b _08019178 diff --git a/asm/crenalBeanSprout.s b/asm/crenalBeanSprout.s index 87f10173..c444bc9c 100644 --- a/asm/crenalBeanSprout.s +++ b/asm/crenalBeanSprout.s @@ -83,7 +83,7 @@ _080963A4: bne _080963C8 adds r0, r5, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation ldrh r0, [r5, #0x32] adds r0, #4 strh r0, [r5, #0x32] @@ -114,7 +114,7 @@ _080963DA: ldrb r1, [r5, #0xa] adds r1, #3 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _0809651A .align 2, 0 _080963F8: .4byte gRoomControls @@ -180,7 +180,7 @@ _0809646E: strb r0, [r5, #0x19] adds r0, r5, #0 movs r1, #0xc - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_0809651C b _0809651A @@ -203,7 +203,7 @@ _080964A6: bne _080964F8 adds r0, r5, #0 movs r1, #0xb - bl UpdateSprite + bl InitializeAnimation ldrh r0, [r5, #0x32] adds r0, #4 strh r0, [r5, #0x32] @@ -247,7 +247,7 @@ _0809650A: ldrb r1, [r5, #0xa] adds r1, #3 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_0809651C _0809651A: @@ -298,7 +298,7 @@ _08096564: _08096570: adds r0, r6, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _08096586 .align 2, 0 _0809657C: .4byte gLinkState @@ -363,7 +363,7 @@ _080965D6: lsrs r1, r1, #0x19 adds r1, #3 adds r0, r6, #0 - bl UpdateSprite + bl InitializeAnimation b _08096606 .align 2, 0 _080965FC: .4byte gLinkState @@ -560,7 +560,7 @@ sub_08096758: @ 0x08096758 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation _0809677C: pop {r4, pc} .align 2, 0 diff --git a/asm/crow.s b/asm/crow.s index 478b62a4..a7950387 100644 --- a/asm/crow.s +++ b/asm/crow.s @@ -220,7 +220,7 @@ sub_08032928: @ 0x08032928 adds r1, #0x7a strh r0, [r1] adds r0, r6, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r6, #0 bl sub_08032AF4 pop {r4, r5, r6, pc} @@ -368,7 +368,7 @@ sub_08032A48: @ 0x08032A48 movs r0, #3 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 bl sub_08032AF4 _08032AAE: @@ -423,7 +423,7 @@ sub_08032AF4: @ 0x08032AF4 adds r2, #0x81 ldrb r2, [r2] adds r1, r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -607,7 +607,7 @@ _08032C46: beq _08032C64 adds r1, r2, #4 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _08032C64: adds r0, r5, #0 bl sub_08032B10 diff --git a/asm/cuccoAggr.s b/asm/cuccoAggr.s index 4708ab40..93a47bc8 100644 --- a/asm/cuccoAggr.s +++ b/asm/cuccoAggr.s @@ -38,7 +38,7 @@ _08038CC8: adds r0, r5, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset adds r0, r5, #0 bl sub_080391B4 _08038CF0: @@ -192,7 +192,7 @@ sub_08038DD8: @ 0x08038DD8 ands r1, r2 strb r1, [r3] movs r1, #4 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08038E14 @ =0x000001D9 bl sub_08004488 pop {pc} @@ -240,7 +240,7 @@ sub_08038E18: @ 0x08038E18 adds r0, r4, #0 bl sub_080AEF88 adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08038E70: ldrb r0, [r4, #0xe] subs r0, #1 @@ -490,7 +490,7 @@ _08039042: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _080390BC .align 2, 0 _08039068: .4byte gUnk_080CF7BE @@ -509,7 +509,7 @@ _0803906C: bl sub_080390C0 adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation bl Random ands r0, r5 cmp r0, #0 @@ -529,7 +529,7 @@ _080390AA: ands r1, r0 adds r1, #2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080390BC: pop {r4, r5, pc} .align 2, 0 @@ -626,7 +626,7 @@ sub_08039140: @ 0x08039140 bl sub_080390F8 adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _08039174: .4byte gLinkEntity @@ -740,7 +740,7 @@ sub_08039218: @ 0x08039218 beq _0803924C adds r0, r2, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _0803924C: ldr r0, _0803925C @ =0x000001D9 bl sub_08004488 diff --git a/asm/curtain.s b/asm/curtain.s index 902ff2b3..298737e7 100644 --- a/asm/curtain.s +++ b/asm/curtain.s @@ -11,7 +11,7 @@ sub_080481C0: @ 0x080481C0 push {lr} ldr r1, _080481CC @ =gUnk_080D1CC8 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _080481CC: .4byte gUnk_080D1CC8 @@ -57,7 +57,7 @@ _08048212: strb r0, [r2, #0xe] ldrb r1, [r2, #0xe] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -100,7 +100,7 @@ _0804824E: _0804825E: ldrb r1, [r4, #0xe] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08048268 @@ -123,7 +123,7 @@ sub_08048268: @ 0x08048268 strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08048292: pop {r4, pc} @@ -145,7 +145,7 @@ sub_08048294: @ 0x08048294 bl SetLocalFlag adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _080482BC: pop {r4, pc} .align 2, 0 diff --git a/asm/darkNut.s b/asm/darkNut.s index 025c6fd7..2c7ea30b 100644 --- a/asm/darkNut.s +++ b/asm/darkNut.s @@ -12,13 +12,13 @@ sub_08020B80: @ 0x08020B80 push {r4, lr} adds r4, r0, #0 ldr r1, _08020B9C @ =gUnk_080CAA98 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x16 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _08020B9C: .4byte gUnk_080CAA98 diff --git a/asm/deathFx.s b/asm/deathFx.s index b010cc90..029f54f8 100644 --- a/asm/deathFx.s +++ b/asm/deathFx.s @@ -42,7 +42,7 @@ sub_08081634: @ 0x08081634 adds r0, #0x38 strb r1, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldrb r0, [r4, #0x19] movs r1, #3 orrs r0, r1 @@ -87,7 +87,7 @@ _080816B2: beq _080816C4 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _08081702 _080816C4: adds r2, r4, #0 @@ -120,7 +120,7 @@ _080816C4: _080816FA: adds r0, r4, #0 adds r1, r2, #0 - bl UpdateSprite + bl InitializeAnimation _08081702: movs r0, #1 strb r0, [r4, #0xc] diff --git a/asm/dog.s b/asm/dog.s index a4232899..64acf7d9 100644 --- a/asm/dog.s +++ b/asm/dog.s @@ -877,7 +877,7 @@ sub_0806A194: @ 0x0806A194 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0x23 - bl UpdateSprite + bl InitializeAnimation b _0806A1D4 _0806A1CE: adds r0, r4, #0 diff --git a/asm/doorMimic.s b/asm/doorMimic.s index 5d6220dd..83c86cf1 100644 --- a/asm/doorMimic.s +++ b/asm/doorMimic.s @@ -123,7 +123,7 @@ sub_08022034: @ 0x08022034 strh r0, [r1] ldrb r1, [r4, #0xb] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080221C0 pop {r4, pc} @@ -155,7 +155,7 @@ sub_0802209C: @ 0x0802209C ldrb r1, [r4, #0xb] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080220D6 _080220D2: subs r0, #1 @@ -264,7 +264,7 @@ sub_08022174: @ 0x08022174 ldrb r1, [r4, #0xb] adds r1, #8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08022196: pop {r4, pc} diff --git a/asm/drLeft.s b/asm/drLeft.s index d28c8727..20507cf1 100644 --- a/asm/drLeft.s +++ b/asm/drLeft.s @@ -69,12 +69,12 @@ _0806BFF0: ands r1, r5 adds r1, #0xc adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0806C00A _0806C002: adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0806C00A: pop {r4, r5, pc} @@ -103,7 +103,7 @@ sub_0806C028: @ 0x0806C028 lsrs r2, r2, #1 ldr r1, [r1, #4] adds r1, r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0806C038 diff --git a/asm/enemy4D.s b/asm/enemy4D.s index 3fe5541b..f20ea8ce 100644 --- a/asm/enemy4D.s +++ b/asm/enemy4D.s @@ -11,7 +11,7 @@ sub_0803EAEC: @ 0x0803EAEC push {lr} ldr r1, _0803EAF8 @ =gUnk_080D0880 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _0803EAF8: .4byte gUnk_080D0880 diff --git a/asm/enemy50.s b/asm/enemy50.s index 7a75db73..9dcff950 100644 --- a/asm/enemy50.s +++ b/asm/enemy50.s @@ -44,7 +44,7 @@ _08040B5C: adds r0, r5, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, r5, pc} .align 2, 0 _08040B80: .4byte gUnk_080D0DC4 @@ -82,7 +82,7 @@ sub_08040B9C: @ 0x08040B9C eors r1, r0 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08041134 adds r0, r4, #0 @@ -103,7 +103,7 @@ _08040BD0: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation b _08040C9C _08040BF4: adds r0, r4, #0 @@ -139,7 +139,7 @@ _08040C1A: ldrb r1, [r4, #0x14] adds r1, #7 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #0x1c bl sub_0804A9FC @@ -165,7 +165,7 @@ _08040C40: ldrb r1, [r4, #0x14] adds r1, #7 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08040C98 _08040C70: adds r1, r4, #0 @@ -241,7 +241,7 @@ sub_08040CAC: @ 0x08040CAC eors r1, r0 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08040D2C _08040D04: ldrb r2, [r4, #0x18] @@ -282,7 +282,7 @@ sub_08040D30: @ 0x08040D30 ldrb r1, [r4, #0x14] adds r1, #7 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08040D4C: adds r0, r4, #0 bl sub_08001242 @@ -304,7 +304,7 @@ _08040D60: eors r1, r0 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xff strb r0, [r4, #0x15] movs r0, #1 @@ -341,7 +341,7 @@ _08040DB4: lsrs r1, r1, #4 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08040DC6: pop {r4, pc} @@ -356,7 +356,7 @@ sub_08040DC8: @ 0x08040DC8 ldrb r1, [r1, #0x14] lsrs r1, r1, #2 adds r1, #5 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _08040DE0: .4byte gLinkEntity @@ -694,7 +694,7 @@ sub_08041044: @ 0x08041044 strh r0, [r1] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _08041074: pop {r4, pc} .align 2, 0 @@ -891,7 +891,7 @@ sub_080411CC: @ 0x080411CC orrs r1, r2 strb r1, [r0, #0x18] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/enemy5A.s b/asm/enemy5A.s index d789b675..0ea8544a 100644 --- a/asm/enemy5A.s +++ b/asm/enemy5A.s @@ -11,7 +11,7 @@ sub_080456D8: @ 0x080456D8 push {lr} ldr r1, _080456E4 @ =gUnk_080D1888 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _080456E4: .4byte gUnk_080D1888 @@ -68,14 +68,14 @@ _08045728: adds r0, #2 orrs r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r5, #0x50] ldrb r1, [r0, #0xa] lsls r1, r1, #3 ldrb r2, [r5, #0xe] adds r2, #2 orrs r1, r2 - bl UpdateSprite + bl InitializeAnimation _0804575C: ldrb r0, [r5, #0xe] cmp r0, #0 @@ -127,12 +127,12 @@ _08045778: movs r4, #6 orrs r1, r4 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r5, #0x50] ldrb r1, [r0, #0xa] lsls r1, r1, #3 orrs r1, r4 - bl UpdateSprite + bl InitializeAnimation _080457D0: ldr r1, _080457DC @ =gUnk_080D1888 adds r0, r5, #0 @@ -210,7 +210,7 @@ _0804585A: movs r0, #1 orrs r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08045868: pop {r4, pc} .align 2, 0 @@ -245,7 +245,7 @@ _0804589A: ldrb r1, [r4, #0xa] lsls r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080458C2 _080458AA: subs r0, #1 @@ -300,24 +300,24 @@ _080458D6: movs r4, #5 orrs r1, r4 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r5, #0x50] ldrb r1, [r0, #0xa] lsls r1, r1, #3 orrs r1, r4 - bl UpdateSprite + bl InitializeAnimation b _08045934 _0804591C: ldrb r1, [r5, #0xa] lsls r1, r1, #3 orrs r1, r4 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r5, #0x50] ldrb r1, [r0, #0xa] lsls r1, r1, #3 orrs r1, r4 - bl UpdateSprite + bl InitializeAnimation _08045934: pop {r4, r5, pc} .align 2, 0 @@ -430,7 +430,7 @@ _080459F0: movs r0, #1 orrs r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080459FE: pop {r4, pc} diff --git a/asm/enemy5F.s b/asm/enemy5F.s index 51b43129..06f8a28e 100644 --- a/asm/enemy5F.s +++ b/asm/enemy5F.s @@ -44,7 +44,7 @@ sub_080482EC: @ 0x080482EC strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _08048326 .align 2, 0 _08048310: .4byte gUnk_030010A0 @@ -52,7 +52,7 @@ _08048314: strb r2, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xb3 lsls r0, r0, #1 bl PlaySFX @@ -80,7 +80,7 @@ sub_08048330: @ 0x08048330 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08048358: pop {r4, pc} .align 2, 0 @@ -184,7 +184,7 @@ sub_080483F8: @ 0x080483F8 bne _08048436 adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation b _08048436 _0804841C: adds r0, r4, #0 @@ -226,7 +226,7 @@ _08048456: str r0, [r4, #0x54] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08048474 @ =0x0000019B bl PlaySFX _0804846A: @@ -254,7 +254,7 @@ sub_08048478: @ 0x08048478 bne _080484E6 adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _080484E6 _080484A2: adds r3, r4, #0 @@ -381,7 +381,7 @@ _08048562: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080485FC movs r0, #0xb3 diff --git a/asm/enemy62.s b/asm/enemy62.s index b8c2eb79..62554c03 100644 --- a/asm/enemy62.s +++ b/asm/enemy62.s @@ -216,7 +216,7 @@ sub_08048F00: @ 0x08048F00 ldrb r1, [r0] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08048F2E: pop {r4, pc} @@ -266,7 +266,7 @@ sub_08048F74: @ 0x08048F74 ldrb r1, [r1] adds r1, r1, r2 ldrb r1, [r1] - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _08048F88: .4byte gUnk_080D2348 diff --git a/asm/enemy64.s b/asm/enemy64.s index 4e7665bd..1d155a7a 100644 --- a/asm/enemy64.s +++ b/asm/enemy64.s @@ -570,7 +570,7 @@ _0804948C: strb r0, [r1] str r4, [r2, #0x50] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080494B2: adds r0, r4, #0 bl sub_08049944 @@ -1414,7 +1414,7 @@ sub_08049AB0: @ 0x08049AB0 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08049B18: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/enemyE.s b/asm/enemyE.s index d38a5bd0..28bf0991 100644 --- a/asm/enemyE.s +++ b/asm/enemyE.s @@ -11,7 +11,7 @@ sub_08022FA4: @ 0x08022FA4 push {lr} ldr r1, _08022FB0 @ =gUnk_080CBBC8 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _08022FB0: .4byte gUnk_080CBBC8 diff --git a/asm/evilSpirit.s b/asm/evilSpirit.s index 660d17b2..9bfd5342 100644 --- a/asm/evilSpirit.s +++ b/asm/evilSpirit.s @@ -123,7 +123,7 @@ _08086354: _08086360: ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08086370 pop {r4, r5, pc} diff --git a/asm/evilSpirit/sub_080862B8.inc b/asm/evilSpirit/sub_080862B8.inc index 30dcad89..20b42f61 100644 --- a/asm/evilSpirit/sub_080862B8.inc +++ b/asm/evilSpirit/sub_080862B8.inc @@ -93,7 +93,7 @@ _08086354: _08086360: ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08086370 pop {r4, r5, pc} diff --git a/asm/eyeSwitch.s b/asm/eyeSwitch.s index 56420a21..05e41fc1 100644 --- a/asm/eyeSwitch.s +++ b/asm/eyeSwitch.s @@ -64,7 +64,7 @@ sub_080886A4: @ 0x080886A4 ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08088716 .align 2, 0 _08088700: .4byte gUnk_080FD168 @@ -76,7 +76,7 @@ _08088704: strb r0, [r4, #0x10] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08088716: pop {r4, r5, r6, pc} @@ -141,7 +141,7 @@ sub_08088760: @ 0x08088760 ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0808878E: pop {r4, pc} @@ -204,6 +204,6 @@ sub_080887D8: @ 0x080887D8 strb r0, [r4, #0x10] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08088802: pop {r4, pc} diff --git a/asm/eyegore.s b/asm/eyegore.s index 0949b2ec..8ae08d4f 100644 --- a/asm/eyegore.s +++ b/asm/eyegore.s @@ -11,7 +11,7 @@ sub_08030A2C: @ 0x08030A2C push {lr} ldr r1, _08030A38 @ =gUnk_080CE288 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _08030A38: .4byte gUnk_080CE288 @@ -236,12 +236,12 @@ sub_08030B78: @ 0x08030B78 strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation b _08030BE8 _08030BE0: adds r0, r4, #0 movs r1, #0xe - bl UpdateSprite + bl InitializeAnimation _08030BE8: pop {r4, pc} .align 2, 0 @@ -309,7 +309,7 @@ _08030C1C: strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation _08030C68: pop {r4, r5, pc} .align 2, 0 @@ -357,7 +357,7 @@ _08030C98: bl sub_08030E58 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08030FB4 _08030CCC: @@ -385,7 +385,7 @@ sub_08030CD0: @ 0x08030CD0 beq _08030D66 ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 adds r0, #0x79 ldrb r1, [r0] @@ -412,7 +412,7 @@ _08030D1A: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08030D34: adds r0, r4, #0 adds r0, #0x7a @@ -461,7 +461,7 @@ sub_08030D68: @ 0x08030D68 beq _08030E1C ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #1 bl sub_08049FDC @@ -501,7 +501,7 @@ _08030DC4: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08030DDE: movs r1, #0xe0 lsls r1, r1, #5 @@ -528,7 +528,7 @@ _08030DFC: strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #0xe - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08030F00 _08030E1C: @@ -1211,7 +1211,7 @@ sub_08031320: @ 0x08031320 ldr r1, _08031340 @ =gUnk_080FD308 str r1, [r0, #0x48] movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _08031340: .4byte gUnk_080FD308 diff --git a/asm/fallingBoulder.s b/asm/fallingBoulder.s index af033d9a..7c7e7a8f 100644 --- a/asm/fallingBoulder.s +++ b/asm/fallingBoulder.s @@ -11,7 +11,7 @@ sub_0802C228: @ 0x0802C228 push {lr} ldr r1, _0802C234 @ =gUnk_080CD540 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _0802C234: .4byte gUnk_080CD540 @@ -340,7 +340,7 @@ _0802C48C: orrs r0, r1 strb r0, [r2] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0802C4AA: pop {r4, r5, r6, r7, pc} @@ -441,7 +441,7 @@ _0802C534: strb r0, [r5, #0xe] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0802C55E: movs r0, #3 ands r4, r0 @@ -469,7 +469,7 @@ _0802C584: strb r0, [r5, #0xe] adds r0, r5, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0802C596: movs r2, #3 ands r4, r2 diff --git a/asm/fan.s b/asm/fan.s index 35a64229..40e16f02 100644 --- a/asm/fan.s +++ b/asm/fan.s @@ -35,7 +35,7 @@ sub_0809ED30: @ 0x0809ED30 bl sub_0809EFB0 ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_0809ED54 @@ -147,7 +147,7 @@ sub_0809EE08: @ 0x0809EE08 adds r2, #0x74 strh r1, [r2] ldrb r1, [r0, #0xa] - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0809EE24 @@ -157,7 +157,7 @@ sub_0809EE24: @ 0x0809EE24 strb r1, [r0, #0xc] ldrb r1, [r0, #0xa] adds r1, #4 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0809EE34 diff --git a/asm/farmers.s b/asm/farmers.s index 0458bff4..37db69dc 100644 --- a/asm/farmers.s +++ b/asm/farmers.s @@ -113,7 +113,7 @@ sub_0806BC94: @ 0x0806BC94 ldrb r2, [r0, #0x14] lsrs r2, r2, #1 adds r1, r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index 5d89bae8..d729b98e 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -111,7 +111,7 @@ _08087C64: bl sub_0805E3A0 adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _08087CA6 _08087C7C: movs r0, #0x1e @@ -306,7 +306,7 @@ sub_08087DBC: @ 0x08087DBC bl sub_0801D2B4 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x88 lsls r0, r0, #1 bl PlaySFX diff --git a/asm/fireballGuy.s b/asm/fireballGuy.s index 16bae6f8..f49e0ff9 100644 --- a/asm/fireballGuy.s +++ b/asm/fireballGuy.s @@ -11,7 +11,7 @@ sub_08045394: @ 0x08045394 push {lr} ldr r1, _080453A0 @ =gUnk_080D17E8 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _080453A0: .4byte gUnk_080D17E8 @@ -89,7 +89,7 @@ sub_080453E8: @ 0x080453E8 bl sub_0804A720 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08045524 pop {r4, pc} diff --git a/asm/floatingBlock.s b/asm/floatingBlock.s index 593e97eb..4be5e6a3 100644 --- a/asm/floatingBlock.s +++ b/asm/floatingBlock.s @@ -33,7 +33,7 @@ sub_080A0554: @ 0x080A0554 adds r0, #0x38 strb r2, [r0] adds r0, r3, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080A0588: pop {pc} .align 2, 0 diff --git a/asm/flyingPot.s b/asm/flyingPot.s index ebd40631..596f20a0 100644 --- a/asm/flyingPot.s +++ b/asm/flyingPot.s @@ -297,7 +297,7 @@ sub_08037220: @ 0x08037220 bl SetTile adds r0, r5, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, r6, pc} .align 2, 0 _0803727C: .4byte gRoomControls diff --git a/asm/flyingSkull.s b/asm/flyingSkull.s index c8c50a22..b2bf22c9 100644 --- a/asm/flyingSkull.s +++ b/asm/flyingSkull.s @@ -297,7 +297,7 @@ sub_08039D74: @ 0x08039D74 bl SetTile adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, r6, pc} .align 2, 0 _08039DD0: .4byte gRoomControls diff --git a/asm/forestMinish.s b/asm/forestMinish.s index 084ca011..2009ad27 100644 --- a/asm/forestMinish.s +++ b/asm/forestMinish.s @@ -550,7 +550,7 @@ sub_080603B4: @ 0x080603B4 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _080603FA .align 2, 0 _080603F0: .4byte gUnk_0810A348 diff --git a/asm/furniture.s b/asm/furniture.s index c1971ae7..dab644df 100644 --- a/asm/furniture.s +++ b/asm/furniture.s @@ -95,7 +95,7 @@ _08090640: movs r0, #2 strb r0, [r1] adds r0, r7, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip b _080906E6 _08090650: ldrh r1, [r7, #0x32] @@ -657,7 +657,7 @@ _08090B14: movs r0, #1 strb r0, [r3] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08090B2C: adds r0, r5, #0 bl GetTileTypeByEntity @@ -1095,7 +1095,7 @@ sub_08090E64: @ 0x08090E64 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08090EA0: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/gentariCurtains.s b/asm/gentariCurtains.s index 6aad8295..65b2c6e5 100644 --- a/asm/gentariCurtains.s +++ b/asm/gentariCurtains.s @@ -62,7 +62,7 @@ _0809207A: adds r0, #2 strh r0, [r6, #0x2e] adds r0, r6, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip movs r0, #0x2e ldrsh r2, [r6, r0] ldr r3, _08092130 @ =gRoomControls @@ -248,7 +248,7 @@ sub_080921F0: @ 0x080921F0 orrs r0, r1 strb r0, [r3] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08092212: pop {pc} @@ -271,7 +271,7 @@ sub_08092214: @ 0x08092214 orrs r0, r1 strb r0, [r3] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0809223A: pop {pc} @@ -290,5 +290,5 @@ sub_0809223C: @ 0x0809223C movs r2, #3 orrs r1, r2 strb r1, [r3] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {pc} diff --git a/asm/ghini.s b/asm/ghini.s index 27ee50b9..fc68181b 100644 --- a/asm/ghini.s +++ b/asm/ghini.s @@ -23,7 +23,7 @@ sub_0803EFDC: @ 0x0803EFDC adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, r5, pc} .align 2, 0 _0803F004: .4byte gUnk_080D0924 @@ -65,7 +65,7 @@ sub_0803F028: @ 0x0803F028 eors r1, r0 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0803F630 adds r0, r4, #0 @@ -85,7 +85,7 @@ _0803F05C: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation b _0803F0E4 _0803F07E: ldrb r0, [r1] @@ -108,7 +108,7 @@ _0803F08A: ldrb r1, [r4, #0x14] adds r1, #7 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #0x1c bl sub_0804A9FC @@ -137,7 +137,7 @@ _0803F0D4: lsrs r1, r1, #4 adds r1, #7 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0803F0E4: ldr r1, _0803F0F0 @ =gUnk_080D0924 adds r0, r4, #0 @@ -184,7 +184,7 @@ sub_0803F0F4: @ 0x0803F0F4 eors r1, r0 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0803F144: pop {r4, pc} .align 2, 0 @@ -203,7 +203,7 @@ sub_0803F148: @ 0x0803F148 ldrb r1, [r4, #0x14] adds r1, #7 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0803F164: adds r0, r4, #0 bl sub_08001242 @@ -225,7 +225,7 @@ _0803F178: eors r1, r0 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xff strb r0, [r4, #0x15] movs r0, #1 @@ -262,7 +262,7 @@ _0803F1CC: lsrs r1, r1, #4 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0803F1DE: pop {r4, pc} @@ -277,7 +277,7 @@ sub_0803F1E0: @ 0x0803F1E0 ldrb r1, [r1, #0x14] lsrs r1, r1, #2 adds r1, #5 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _0803F1F8: .4byte gLinkEntity @@ -363,7 +363,7 @@ _0803F28E: lsrs r1, r1, #4 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0803F2A0: pop {r4, pc} .align 2, 0 @@ -430,7 +430,7 @@ _0803F310: ldrb r1, [r4, #0x14] adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0803F322: pop {r4, pc} @@ -602,7 +602,7 @@ sub_0803F43C: @ 0x0803F43C strh r2, [r0] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _0803F474: pop {r4, pc} .align 2, 0 @@ -689,7 +689,7 @@ sub_0803F50C: @ 0x0803F50C movs r1, #1 strb r1, [r0, #0xc] movs r1, #9 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -892,7 +892,7 @@ _0803F680: strb r0, [r2, #0x14] adds r1, r0, #1 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _0803F692: pop {pc} diff --git a/asm/giantRock.s b/asm/giantRock.s index b1bea17f..ec77785c 100644 --- a/asm/giantRock.s +++ b/asm/giantRock.s @@ -27,7 +27,7 @@ sub_08090FB8: @ 0x08090FB8 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r2, r4, #0 adds r2, #0x29 ldrb r1, [r2] @@ -37,6 +37,6 @@ sub_08090FB8: @ 0x08090FB8 strb r0, [r2] ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08090FF6: pop {r4, pc} diff --git a/asm/gibdo.s b/asm/gibdo.s index dde0d14e..ebe08a1a 100644 --- a/asm/gibdo.s +++ b/asm/gibdo.s @@ -12,13 +12,13 @@ sub_0803746C: @ 0x0803746C push {r4, lr} adds r4, r0, #0 ldr r1, _08037488 @ =gUnk_080CF294 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x15 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _08037488: .4byte gUnk_080CF294 diff --git a/asm/gleerok.s b/asm/gleerok.s index 57d9869d..348ac9ca 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -315,7 +315,7 @@ _0802D276: bne _0802D288 adds r0, r5, #0 movs r1, #0x4e - bl UpdateSprite + bl InitializeAnimation _0802D288: ldrb r0, [r5, #0xe] cmp r0, #0 @@ -656,7 +656,7 @@ _0802D52E: strb r1, [r0] adds r0, r4, #0 movs r1, #0x4c - bl UpdateSprite + bl InitializeAnimation b _0802D63C .align 2, 0 _0802D540: .4byte gLinkState @@ -693,7 +693,7 @@ _0802D55C: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #0x24 - bl UpdateSprite + bl InitializeAnimation b _0802D63C .align 2, 0 _0802D588: .4byte gUnk_080CD7C4 @@ -739,7 +739,7 @@ _0802D5A8: bl CopyPosition adds r0, r4, #0 movs r1, #0x4f - bl UpdateSprite + bl InitializeAnimation b _0802D63C .align 2, 0 _0802D5E8: .4byte gUnk_080CD884 @@ -780,7 +780,7 @@ _0802D61A: bl CopyPosition adds r0, r4, #0 movs r1, #0x50 - bl UpdateSprite + bl InitializeAnimation _0802D63C: ldrb r0, [r4, #0xa] cmp r0, #0 @@ -934,7 +934,7 @@ _0802D734: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0x4d - bl UpdateSprite + bl InitializeAnimation movs r0, #0x24 movs r1, #5 bl CreateEnemy @@ -2276,7 +2276,7 @@ _0802E158: strb r0, [r4, #0xb] adds r0, r4, #0 movs r1, #0x4e - bl UpdateSprite + bl InitializeAnimation b _0802E1C4 .align 2, 0 _0802E18C: .4byte 0xFFFF0000 @@ -2587,7 +2587,7 @@ _0802E3CA: strb r1, [r6] adds r0, r4, #0 movs r1, #0x4d - bl UpdateSprite + bl InitializeAnimation movs r0, #0x24 movs r1, #5 bl CreateEnemy @@ -3033,7 +3033,7 @@ _0802E73E: beq _0802E756 adds r0, r1, #0 adds r1, r7, #0 - bl UpdateSprite + bl InitializeAnimation _0802E756: adds r6, r4, #0 cmp r6, #4 diff --git a/asm/gorman.s b/asm/gorman.s index 4dd9950c..fceb812b 100644 --- a/asm/gorman.s +++ b/asm/gorman.s @@ -55,7 +55,7 @@ sub_080697C4: @ 0x080697C4 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08078778 _080697E4: @@ -84,7 +84,7 @@ sub_080697EC: @ 0x080697EC cmp r0, r1 beq _0806981E adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0806981E _0806981A: subs r0, #1 diff --git a/asm/greatFairy.s b/asm/greatFairy.s index 5529f75f..89288ffb 100644 --- a/asm/greatFairy.s +++ b/asm/greatFairy.s @@ -90,7 +90,7 @@ sub_08087380: @ 0x08087380 strb r0, [r1] ldrb r1, [r4, #0xb] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #2 bl sub_0805E3A0 diff --git a/asm/gregal.s b/asm/gregal.s index 40abb6b3..5eda0d6e 100644 --- a/asm/gregal.s +++ b/asm/gregal.s @@ -129,7 +129,7 @@ sub_0806CBB4: @ 0x0806CBB4 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0x11 - bl UpdateSprite + bl InitializeAnimation _0806CBD6: adds r0, r4, #0 bl sub_08004274 @@ -274,7 +274,7 @@ sub_0806CCD0: @ 0x0806CCD0 lsrs r1, r1, #1 adds r1, r2, r1 adds r0, r3, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #1 str r0, [r4, #0x14] b _0806CCF6 diff --git a/asm/guardWithSpear.s b/asm/guardWithSpear.s index 8f6c996a..132d0123 100644 --- a/asm/guardWithSpear.s +++ b/asm/guardWithSpear.s @@ -72,7 +72,7 @@ sub_08063D44: @ 0x08063D44 beq _08063DC6 adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08063DA8 @ =gUnk_0810F6BC ldrb r1, [r4, #0xa] lsls r1, r1, #2 @@ -148,7 +148,7 @@ _08063DF8: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08063E1E _08063E18: adds r0, r4, #0 @@ -170,7 +170,7 @@ _08063E1E: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08064428 _08063E4C: @@ -208,7 +208,7 @@ sub_08063E6C: @ 0x08063E6C ldrb r1, [r2, #0x14] adds r1, #4 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _08063E8A: pop {pc} .align 2, 0 @@ -280,7 +280,7 @@ _08063EFE: movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 bl sub_0807DD64 adds r0, r4, #0 @@ -321,7 +321,7 @@ sub_08063F20: @ 0x08063F20 asrs r0, r0, #0x18 adds r1, r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08064428 _08063F72: @@ -352,7 +352,7 @@ sub_08063F78: @ 0x08063F78 adds r0, #4 adds r1, r1, r0 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _08063FA6: pop {pc} .align 2, 0 @@ -551,7 +551,7 @@ _080640E8: adds r1, #4 adds r1, r2, r1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0806410A: adds r0, r4, #0 bl sub_080AEF88 @@ -729,7 +729,7 @@ _08064222: cmp r1, r0 beq _08064256 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _08064256: movs r0, #0 ldrsb r0, [r6, r0] @@ -754,7 +754,7 @@ _08064256: cmp r1, r0 beq _0806428C adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0806428C: adds r0, r5, #0 bl sub_0806ED78 @@ -874,7 +874,7 @@ _08064342: cmp r1, r0 beq _08064376 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _08064376: movs r0, #0 ldrsb r0, [r6, r0] @@ -899,7 +899,7 @@ _08064376: cmp r1, r0 beq _080643AC adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _080643AC: adds r0, r5, #0 bl sub_0806ED78 diff --git a/asm/gyorgChild.s b/asm/gyorgChild.s index c7aba41a..ec79d1ff 100644 --- a/asm/gyorgChild.s +++ b/asm/gyorgChild.s @@ -134,7 +134,7 @@ sub_080486F4: @ 0x080486F4 bne _0804876C ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation strb r5, [r4, #0xc] ldrb r0, [r4, #0x10] movs r1, #0x80 @@ -315,7 +315,7 @@ sub_0804882C: @ 0x0804882C movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 adds r0, #0x7a ldrb r0, [r0] @@ -325,7 +325,7 @@ sub_0804882C: @ 0x0804882C strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0x14] lsrs r0, r0, #1 cmp r0, #1 diff --git a/asm/gyorgFemale.s b/asm/gyorgFemale.s index 7c2e9aaf..cd457c48 100644 --- a/asm/gyorgFemale.s +++ b/asm/gyorgFemale.s @@ -125,7 +125,7 @@ sub_0804614C: @ 0x0804614C adds r1, r0, #0 adds r1, #0x38 strb r5, [r1] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r1, _08046258 @ =sub_08046498 adds r0, r6, #0 movs r2, #0 @@ -846,7 +846,7 @@ _0804674C: movs r0, #1 strb r0, [r1] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080467CC: adds r1, r4, #0 adds r1, #0x7c diff --git a/asm/gyorgFemaleEye.s b/asm/gyorgFemaleEye.s index 1a8987ee..764f3981 100644 --- a/asm/gyorgFemaleEye.s +++ b/asm/gyorgFemaleEye.s @@ -308,7 +308,7 @@ sub_08048BB0: @ 0x08048BB0 adds r0, r0, r1 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08048CEA .align 2, 0 _08048BF8: .4byte gUnk_080D2030 @@ -331,7 +331,7 @@ _08048BFC: adds r0, r0, r1 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #2 movs r2, #0x40 @@ -363,7 +363,7 @@ _08048C34: lsrs r1, r1, #6 adds r1, #0x14 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08048CB4 @ =0x00000119 bl PlaySFX _08048C6C: @@ -388,10 +388,10 @@ _08048C6C: adds r0, r0, r1 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #7 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r1, r6, #0 ldrb r4, [r4, #0xa] lsls r1, r4 @@ -414,12 +414,12 @@ _08048CBC: ldrb r1, [r4, #0x14] adds r1, #0x10 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation bl Random movs r1, #0x1c ands r1, r0 adds r0, r4, #0 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation _08048CE4: adds r0, r4, #0 bl sub_08004274 @@ -448,7 +448,7 @@ sub_08048CEC: @ 0x08048CEC adds r0, r0, r1 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08048D1A: pop {r4, pc} .align 2, 0 @@ -486,7 +486,7 @@ sub_08048D20: @ 0x08048D20 adds r0, r0, r1 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08048D60: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/gyorgFemaleMouth.s b/asm/gyorgFemaleMouth.s index 505c1f6d..457176ec 100644 --- a/asm/gyorgFemaleMouth.s +++ b/asm/gyorgFemaleMouth.s @@ -72,7 +72,7 @@ _08048FD4: strh r0, [r4, #0x32] lsrs r1, r6, #0x19 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0804901E .align 2, 0 _08049010: .4byte gUnk_080D28CC diff --git a/asm/gyorgMale.s b/asm/gyorgMale.s index 661d0538..c51dd020 100644 --- a/asm/gyorgMale.s +++ b/asm/gyorgMale.s @@ -997,7 +997,7 @@ _08046F12: strb r0, [r1] str r4, [r2, #0x50] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08046F58: adds r0, r4, #0 bl sub_08047E48 @@ -1052,7 +1052,7 @@ _08046F82: strb r0, [r1] str r4, [r2, #0x50] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08046FC8: ldr r0, [r4, #0x64] ldr r0, [r0] @@ -2751,7 +2751,7 @@ sub_08047BF0: @ 0x08047BF0 movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08047C74: adds r0, r5, #0 adds r0, #0x76 diff --git a/asm/hangingSeed.s b/asm/hangingSeed.s index a6e53193..b3f80161 100644 --- a/asm/hangingSeed.s +++ b/asm/hangingSeed.s @@ -11,7 +11,7 @@ sub_080216D4: @ 0x080216D4 push {lr} ldr r1, _080216E0 @ =gUnk_080CB570 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _080216E0: .4byte gUnk_080CB570 diff --git a/asm/helmasaur.s b/asm/helmasaur.s index 29b759cd..aee0479a 100644 --- a/asm/helmasaur.s +++ b/asm/helmasaur.s @@ -16,13 +16,13 @@ sub_0802BB6C: @ 0x0802BB6C bne _0802BB94 ldr r1, _0802BB90 @ =gUnk_080CD3E4 adds r0, r4, #0 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset b _0802BBA4 .align 2, 0 _0802BB90: .4byte gUnk_080CD3E4 @@ -160,7 +160,7 @@ sub_0802BC74: @ 0x0802BC74 strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _0802BC9C: .4byte gLinkEntity @@ -211,7 +211,7 @@ _0802BCF0: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802BCFA: pop {r4, pc} @@ -238,7 +238,7 @@ sub_0802BD10: @ 0x0802BD10 ands r1, r2 strb r1, [r0, #0x10] movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation pop {pc} .align 2, 0 @@ -298,7 +298,7 @@ sub_0802BD54: @ 0x0802BD54 strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_0802BD8C @@ -380,7 +380,7 @@ sub_0802BE18: @ 0x0802BE18 push {r4, lr} adds r4, r0, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] @@ -510,7 +510,7 @@ sub_0802BEEC: @ 0x0802BEEC ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0802BF3A _0802BF1E: movs r1, #0xe0 @@ -555,7 +555,7 @@ sub_0802BF3C: @ 0x0802BF3C strb r0, [r4, #0x14] adds r1, r0, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802BF76: pop {r4, pc} @@ -574,7 +574,7 @@ sub_0802BF78: @ 0x0802BF78 strb r1, [r0, #0x15] ldrb r1, [r0, #0x14] adds r1, #8 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0802BF98 @@ -697,7 +697,7 @@ sub_0802C058: @ 0x0802C058 lsrs r1, r1, #3 strb r1, [r0, #0x14] ldrb r1, [r0, #0x14] - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0802C06C diff --git a/asm/houseDoorExterior.s b/asm/houseDoorExterior.s index 38d694a6..d4235d99 100644 --- a/asm/houseDoorExterior.s +++ b/asm/houseDoorExterior.s @@ -108,7 +108,7 @@ _08086718: ldrb r0, [r5, #5] strb r0, [r4, #0xd] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r0, [r6, #0x68] orrs r0, r7 str r0, [r6, #0x68] diff --git a/asm/hurdyGurdyMan.s b/asm/hurdyGurdyMan.s index c8995a07..a75cc0a0 100644 --- a/asm/hurdyGurdyMan.s +++ b/asm/hurdyGurdyMan.s @@ -63,7 +63,7 @@ _0806E34C: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08002632 ldr r1, _0806E3B4 @ =gUnk_08001A7C @@ -107,7 +107,7 @@ _0806E3C6: adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0806E3E0: pop {r4, r5, pc} .align 2, 0 @@ -198,7 +198,7 @@ sub_0806E458: @ 0x0806E458 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation b _0806E49E .align 2, 0 _0806E494: .4byte gUnk_081144F0 diff --git a/asm/initializeLink.s b/asm/initializeLink.s index 8968f0ef..0412a013 100644 --- a/asm/initializeLink.s +++ b/asm/initializeLink.s @@ -162,7 +162,7 @@ _080525C2: adds r0, #0x38 strb r1, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #1 bl sub_0805EA2C diff --git a/asm/itemForSale.s b/asm/itemForSale.s index 2f387cd0..832af69e 100644 --- a/asm/itemForSale.s +++ b/asm/itemForSale.s @@ -288,7 +288,7 @@ _080819D4: orrs r0, r1 strb r0, [r2] adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r5, #0 bl sub_08081A5C pop {r4, r5, r6, pc} diff --git a/asm/itemOnGround.s b/asm/itemOnGround.s index 232cedc9..f24f9523 100644 --- a/asm/itemOnGround.s +++ b/asm/itemOnGround.s @@ -1473,7 +1473,7 @@ _08081522: ldrb r0, [r4, #0xa] bl sub_0808148C adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08081532: adds r0, r4, #0 bl sub_080AEFE0 @@ -1510,7 +1510,7 @@ sub_0808153C: @ 0x0808153C ldrb r0, [r4, #0xa] bl sub_0808148C adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip b _08081596 _0808157E: movs r1, #0xa0 diff --git a/asm/jailBars.s b/asm/jailBars.s index e3c96e05..fb703275 100644 --- a/asm/jailBars.s +++ b/asm/jailBars.s @@ -40,7 +40,7 @@ _080A08E2: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #1 bl sub_080A0960 @@ -54,7 +54,7 @@ _080A08F6: movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {r4, pc} .align 2, 0 @@ -95,7 +95,7 @@ sub_080A0938: @ 0x080A0938 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _080A095A: pop {r4, pc} diff --git a/asm/keaton.s b/asm/keaton.s index 1fe420c1..e9895bcd 100644 --- a/asm/keaton.s +++ b/asm/keaton.s @@ -12,13 +12,13 @@ sub_080323BC: @ 0x080323BC push {r4, lr} adds r4, r0, #0 ldr r1, _080323D8 @ =gUnk_080CE7B0 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x12 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _080323D8: .4byte gUnk_080CE7B0 @@ -488,7 +488,7 @@ sub_08032740: @ 0x08032740 strh r0, [r4, #0x24] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08032650 pop {r4, pc} diff --git a/asm/keese.s b/asm/keese.s index c0106f8b..e5ed7d02 100644 --- a/asm/keese.s +++ b/asm/keese.s @@ -127,7 +127,7 @@ _08021E14: movs r0, #3 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 bl sub_08021EF0 pop {r4, pc} @@ -247,7 +247,7 @@ sub_08021EF0: @ 0x08021EF0 strh r0, [r1] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _08021F20: .4byte gUnk_080CB6D6 @@ -294,7 +294,7 @@ _08021F6E: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _08021FA4 .align 2, 0 _08021F7C: .4byte gLinkEntity @@ -314,7 +314,7 @@ _08021F9A: strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08021FA4: pop {r4, pc} .align 2, 0 diff --git a/asm/kid.s b/asm/kid.s index 3f1027ea..ded40ea9 100644 --- a/asm/kid.s +++ b/asm/kid.s @@ -273,7 +273,7 @@ _0806229A: ands r1, r2 adds r1, r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080622F2 .align 2, 0 _080622C8: .4byte gLinkEntity @@ -1166,7 +1166,7 @@ _080629B4: cmp r1, r0 beq _080629D2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r1, [r5] adds r0, r4, #0 adds r0, #0x80 @@ -1285,7 +1285,7 @@ sub_08062A60: @ 0x08062A60 movs r1, #0x16 _08062AA2: adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08062AB6 .align 2, 0 _08062AAC: .4byte gUnk_0810BDC4 diff --git a/asm/ladderHoleInBookshelf.s b/asm/ladderHoleInBookshelf.s index 874bfe56..12d008b3 100644 --- a/asm/ladderHoleInBookshelf.s +++ b/asm/ladderHoleInBookshelf.s @@ -29,7 +29,7 @@ sub_08093FCC: @ 0x08093FCC adds r2, #0x38 movs r1, #2 strb r1, [r2] - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {pc} thumb_func_start sub_08093FE0 @@ -54,7 +54,7 @@ _08094002: movs r0, #1 strb r0, [r3] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r2, r4, #0 adds r2, #0x29 ldrb r1, [r2] @@ -76,7 +76,7 @@ _08094024: movs r0, #2 strb r0, [r3] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r2, r4, #0 adds r2, #0x29 ldrb r1, [r2] diff --git a/asm/ladderUp.s b/asm/ladderUp.s index e8e27a4b..428fe13d 100644 --- a/asm/ladderUp.s +++ b/asm/ladderUp.s @@ -40,7 +40,7 @@ _0808DB7C: strb r0, [r1] adds r0, r7, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r7, #0xc] cmp r0, #1 bne _0808DB9A diff --git a/asm/lakitu.s b/asm/lakitu.s index 862aebdf..a32076f4 100644 --- a/asm/lakitu.s +++ b/asm/lakitu.s @@ -12,13 +12,13 @@ sub_0803C738: @ 0x0803C738 push {r4, lr} adds r4, r0, #0 ldr r1, _0803C754 @ =gUnk_080D0110 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _0803C754: .4byte gUnk_080D0110 diff --git a/asm/lavaPlatform.s b/asm/lavaPlatform.s index 6c95b7c0..edda6ed9 100644 --- a/asm/lavaPlatform.s +++ b/asm/lavaPlatform.s @@ -66,7 +66,7 @@ sub_0809229C: @ 0x0809229C orrs r0, r1 strb r0, [r4, #0x18] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r0, [r4, #0x54] ldrb r1, [r0, #0x14] adds r0, r4, #0 @@ -76,7 +76,7 @@ sub_0809229C: @ 0x0809229C bl sub_08004488 ldr r0, [r4, #0x54] movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _080922E0: pop {r4, pc} .align 2, 0 @@ -105,7 +105,7 @@ sub_080922E4: @ 0x080922E4 strb r2, [r0] ldr r0, [r4, #0x54] ldrb r1, [r0, #0x14] - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #0x36 movs r2, #0 @@ -198,7 +198,7 @@ sub_080923A0: @ 0x080923A0 strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080923C6: adds r1, r4, #0 adds r1, #0x63 @@ -279,7 +279,7 @@ _08092434: strb r2, [r0] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08092468 @ =0x0000017B bl sub_08004488 _08092462: @@ -380,7 +380,7 @@ sub_080924E4: @ 0x080924E4 ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0x14] cmp r0, #0 bne _0809252C @@ -502,7 +502,7 @@ _080925B8: ldr r0, [r5] str r0, [r4, #0x78] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r1, r4, #0 adds r1, #0x78 adds r2, r4, #0 @@ -585,7 +585,7 @@ _08092674: strb r0, [r1] ldrb r1, [r2, #0x14] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0809269C diff --git a/asm/leever.s b/asm/leever.s index 13ca027a..3e1a14c3 100644 --- a/asm/leever.s +++ b/asm/leever.s @@ -12,13 +12,13 @@ sub_0801FC08: @ 0x0801FC08 push {r4, lr} adds r4, r0, #0 ldr r1, _0801FC24 @ =gUnk_080CA49C - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _0801FC24: .4byte gUnk_080CA49C @@ -141,9 +141,9 @@ sub_0801FCB0: @ 0x0801FCB0 strb r0, [r5, #0x15] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip b _0801FD28 .align 2, 0 _0801FD14: .4byte gUnk_020000B0 @@ -187,7 +187,7 @@ _0801FD5A: strh r0, [r1] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0801FD7C _0801FD66: movs r0, #1 @@ -228,7 +228,7 @@ sub_0801FD80: @ 0x0801FD80 strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0801FDB2: pop {r4, pc} diff --git a/asm/librarians.s b/asm/librarians.s index feb666de..ea13b711 100644 --- a/asm/librarians.s +++ b/asm/librarians.s @@ -193,7 +193,7 @@ _0806BB52: bl sub_08095BE0 adds r0, r5, #0 movs r1, #0xc - bl UpdateSprite + bl InitializeAnimation movs r0, #0xcd bl PlaySFX b _0806BB78 diff --git a/asm/lightableSwitch.s b/asm/lightableSwitch.s index 3239e101..89361df6 100644 --- a/asm/lightableSwitch.s +++ b/asm/lightableSwitch.s @@ -67,7 +67,7 @@ sub_0809EA34: @ 0x0809EA34 adds r0, r4, #0 bl sub_0809EAD8 adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 bl sub_0809EABC pop {r4, pc} @@ -240,7 +240,7 @@ sub_0809EB80: @ 0x0809EB80 adds r0, r4, #0 bl sub_0809EAD8 adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 adds r0, #0x84 ldrh r0, [r0] diff --git a/asm/likeLike.s b/asm/likeLike.s index 15f6b066..c03e5eb7 100644 --- a/asm/likeLike.s +++ b/asm/likeLike.s @@ -12,13 +12,13 @@ sub_08027D6C: @ 0x08027D6C push {r4, lr} adds r4, r0, #0 ldr r1, _08027D88 @ =gUnk_080CC6FC - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _08027D88: .4byte gUnk_080CC6FC @@ -189,7 +189,7 @@ _08027EA6: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _08027EE4 _08027EC4: movs r3, #0 @@ -206,7 +206,7 @@ _08027EC4: strb r2, [r0] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08027EE4: movs r0, #0 strb r0, [r4, #0x15] @@ -282,7 +282,7 @@ _08027F68: strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _08027F7C: pop {r4, pc} .align 2, 0 @@ -310,7 +310,7 @@ sub_08027F84: @ 0x08027F84 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080A29BC _08027FB0: @@ -376,7 +376,7 @@ sub_08027FE0: @ 0x08027FE0 strb r0, [r3] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08028028: pop {r4, pc} .align 2, 0 @@ -412,7 +412,7 @@ sub_0802805C: @ 0x0802805C push {r4, r5, lr} adds r5, r0, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation bl sub_0807953C cmp r0, #0 beq _0802807E diff --git a/asm/lilypadLarge.s b/asm/lilypadLarge.s index 7ffba32e..8bc889fd 100644 --- a/asm/lilypadLarge.s +++ b/asm/lilypadLarge.s @@ -125,7 +125,7 @@ _0808557A: strb r3, [r0] adds r0, r4, #0 movs r1, #9 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080855E8 _080855E2: diff --git a/asm/macroBook.s b/asm/macroBook.s index febe12aa..96e1e537 100644 --- a/asm/macroBook.s +++ b/asm/macroBook.s @@ -62,7 +62,7 @@ sub_0809A78C: @ 0x0809A78C adds r1, r2, #0 bl sub_0805EC9C adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldrb r1, [r4, #0xf] adds r0, r4, #0 bl LoadAnimation diff --git a/asm/macroDecorations.s b/asm/macroDecorations.s index a6612c5d..575375e3 100644 --- a/asm/macroDecorations.s +++ b/asm/macroDecorations.s @@ -27,7 +27,7 @@ sub_08097DEC: @ 0x08097DEC movs r0, #1 strb r0, [r4, #0xc] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldrb r0, [r4, #0xa] cmp r0, #1 beq _08097E46 diff --git a/asm/madderpillar.s b/asm/madderpillar.s index 9905f2c8..db39b071 100644 --- a/asm/madderpillar.s +++ b/asm/madderpillar.s @@ -411,12 +411,12 @@ sub_08029B90: @ 0x08029B90 bhi _08029BBA adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _08029BC2 _08029BBA: adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _08029BC2: pop {r4, pc} @@ -442,7 +442,7 @@ _08029BE8: ldrb r1, [r4, #0x14] adds r1, r1, r2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08029BF2: movs r0, #0x2e ldrsh r1, [r4, r0] @@ -579,7 +579,7 @@ sub_08029CCC: @ 0x08029CCC bl sub_0802A058 adds r0, r4, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08029CF0 @@ -592,7 +592,7 @@ sub_08029CF0: @ 0x08029CF0 ldrb r1, [r4, #0x14] adds r1, #8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08029D06: pop {r4, pc} @@ -620,7 +620,7 @@ sub_08029D14: @ 0x08029D14 ldrb r1, [r4, #0x14] adds r1, #0xc adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #0x7f bl sub_0801D2B4 @@ -676,7 +676,7 @@ sub_08029D78: @ 0x08029D78 ldrb r1, [r4, #0x14] adds r1, #0x10 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08029DA6: pop {r4, pc} .align 2, 0 @@ -703,7 +703,7 @@ sub_08029DAC: @ 0x08029DAC ldrb r1, [r4, #0x14] adds r1, #8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08029DD8: pop {r4, pc} .align 2, 0 diff --git a/asm/mama.s b/asm/mama.s index ae19799f..b47765ca 100644 --- a/asm/mama.s +++ b/asm/mama.s @@ -66,7 +66,7 @@ _0806C3E2: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0806F118 b _0806C450 @@ -92,7 +92,7 @@ _0806C436: adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0806C450: pop {r4, r5, pc} .align 2, 0 @@ -222,7 +222,7 @@ sub_0806C510: @ 0x0806C510 strh r0, [r4, #0x32] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0806C54E _0806C548: adds r0, r4, #0 diff --git a/asm/mazaalBracelet.s b/asm/mazaalBracelet.s index 0722854c..07268729 100644 --- a/asm/mazaalBracelet.s +++ b/asm/mazaalBracelet.s @@ -123,7 +123,7 @@ _0803A210: strb r1, [r0] adds r0, r4, #0 movs r1, #0x18 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #9 bl LoadAnimation @@ -259,7 +259,7 @@ _0803A310: strb r1, [r2, #0x18] adds r0, r4, #0 movs r1, #0x10 - bl UpdateSprite + bl InitializeAnimation b _0803A360 .align 2, 0 _0803A34C: .4byte 0xFFF00000 @@ -269,7 +269,7 @@ _0803A354: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _0803A360: pop {r4, pc} .align 2, 0 @@ -395,7 +395,7 @@ _0803A44E: strb r0, [r4, #0xd] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _0803A546 _0803A468: adds r0, r4, #0 @@ -465,7 +465,7 @@ _0803A4CC: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _0803A546 _0803A4FA: adds r0, r4, #0 @@ -605,7 +605,7 @@ sub_0803A5D0: @ 0x0803A5D0 adds r1, #4 strh r1, [r0, #0x36] movs r1, #5 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _0803A608: .4byte gUnk_080CED6C @@ -932,7 +932,7 @@ sub_0803A814: @ 0x0803A814 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _0803A864: pop {r4, pc} .align 2, 0 @@ -1008,7 +1008,7 @@ sub_0803A8B8: @ 0x0803A8B8 strh r0, [r4, #0x36] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #1 bl LoadAnimation @@ -1062,7 +1062,7 @@ sub_0803A90C: @ 0x0803A90C strh r0, [r4, #0x24] adds r0, r4, #0 movs r1, #7 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #2 bl LoadAnimation @@ -1128,7 +1128,7 @@ _0803A9C2: strb r1, [r2, #0x10] adds r0, r4, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #3 bl LoadAnimation @@ -1250,7 +1250,7 @@ sub_0803AA98: @ 0x0803AA98 strh r0, [r4, #0x24] adds r0, r4, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation ldr r2, [r4, #0x74] ldrb r1, [r2, #0x10] movs r0, #0x80 @@ -1348,7 +1348,7 @@ sub_0803AB5C: @ 0x0803AB5C strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0xb - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #6 bl LoadAnimation @@ -1399,7 +1399,7 @@ sub_0803ABB4: @ 0x0803ABB4 strh r0, [r4, #0x24] adds r0, r4, #0 movs r1, #0x10 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #0 bl LoadAnimation @@ -1635,7 +1635,7 @@ sub_0803ADAC: @ 0x0803ADAC strb r0, [r2, #0x10] adds r0, r4, #0 movs r1, #0xb - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #6 bl LoadAnimation @@ -1739,7 +1739,7 @@ _0803AE82: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _0803AEC0 .align 2, 0 _0803AEAC: .4byte gUnk_080CED6C @@ -1808,7 +1808,7 @@ sub_0803AF18: @ 0x0803AF18 strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation ldr r2, _0803AF4C @ =gUnk_080CED6C ldr r0, [r4, #0x50] ldrb r0, [r0, #0xf] @@ -2037,7 +2037,7 @@ sub_0803B074: @ 0x0803B074 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #0 bl LoadAnimation @@ -2121,7 +2121,7 @@ sub_0803B144: @ 0x0803B144 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x16 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #0x14 bl sub_0803B8E8 @@ -2337,7 +2337,7 @@ sub_0803B2D0: @ 0x0803B2D0 adds r1, #4 strh r2, [r1] movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _0803B30A: pop {r4, pc} @@ -2360,7 +2360,7 @@ sub_0803B30C: @ 0x0803B30C bl sub_0803B8E8 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0803B334: pop {r4, pc} .align 2, 0 @@ -2455,7 +2455,7 @@ sub_0803B398: @ 0x0803B398 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #0 bl LoadAnimation @@ -2591,7 +2591,7 @@ sub_0803B4D4: @ 0x0803B4D4 movs r1, #3 strb r1, [r0, #0xc] movs r1, #0x10 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -2677,7 +2677,7 @@ sub_0803B55C: @ 0x0803B55C beq _0803B59A adds r0, r5, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _0803B59A _0803B588: adds r0, r5, #0 @@ -2687,7 +2687,7 @@ _0803B588: beq _0803B59A adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0803B59A: pop {r4, r5, pc} @@ -2752,7 +2752,7 @@ _0803B5F6: cmp r0, r1 beq _0803B60A adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0803B60A: pop {r4, pc} .align 2, 0 @@ -2878,7 +2878,7 @@ _0803B6E4: strb r0, [r4] adds r0, r2, #0 movs r1, #0x17 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 @@ -3210,7 +3210,7 @@ _0803B950: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x50] adds r1, r4, #0 bl sub_0806FA6C diff --git a/asm/mazaalHead.s b/asm/mazaalHead.s index 749f6e01..7d23f080 100644 --- a/asm/mazaalHead.s +++ b/asm/mazaalHead.s @@ -111,7 +111,7 @@ _08033F70: strb r2, [r0] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x36 movs r1, #1 bl CreateEnemy @@ -1446,7 +1446,7 @@ _0803496C: strb r0, [r3, #0x10] adds r0, r3, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _08034996 _08034982: ldrb r0, [r3, #0xa] @@ -1627,7 +1627,7 @@ _08034A98: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08034ABA: ldr r0, [r4, #0x50] adds r1, r4, #0 @@ -1665,7 +1665,7 @@ sub_08034AEC: @ 0x08034AEC strb r1, [r0, #0xe] ldrb r1, [r0, #0xa] adds r1, #1 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08034B08 @ =0x00000151 bl PlaySFX pop {pc} @@ -1714,7 +1714,7 @@ sub_08034B38: @ 0x08034B38 ldrb r1, [r4, #0xa] adds r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08034B9A _08034B58: movs r0, #0xe @@ -1788,7 +1788,7 @@ sub_08034BC8: @ 0x08034BC8 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08034BDE: ldr r0, [r4, #0x50] adds r1, r4, #0 diff --git a/asm/mazaalMacro.s b/asm/mazaalMacro.s index 35f71543..a03f6e41 100644 --- a/asm/mazaalMacro.s +++ b/asm/mazaalMacro.s @@ -90,7 +90,7 @@ sub_08034CC4: @ 0x08034CC4 bl sub_08034F70 ldrb r1, [r5, #0xa] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08034D44 @ =0x00004022 movs r2, #0x2e ldrsh r1, [r5, r2] @@ -170,7 +170,7 @@ sub_08034D4C: @ 0x08034D4C strb r0, [r1] str r5, [r4, #0x50] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip movs r0, #0x96 lsls r0, r0, #2 strh r0, [r6] @@ -264,10 +264,10 @@ sub_08034E30: @ 0x08034E30 ands r0, r1 strb r0, [r2] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 @@ -385,7 +385,7 @@ sub_08034EE4: @ 0x08034EE4 movs r0, #2 strb r0, [r1] adds r0, r3, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08034F46: adds r0, r5, #0 movs r1, #0 @@ -553,7 +553,7 @@ sub_08035050: @ 0x08035050 strb r0, [r1] str r4, [r2, #0x50] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08035082: pop {r4, pc} @@ -625,7 +625,7 @@ _080350F2: movs r0, #1 strb r0, [r1] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r5, #1 adds r4, #2 cmp r5, #5 diff --git a/asm/melari.s b/asm/melari.s index e64fb09c..1125602e 100644 --- a/asm/melari.s +++ b/asm/melari.s @@ -46,7 +46,7 @@ sub_08068708: @ 0x08068708 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08078778 _08068728: @@ -75,7 +75,7 @@ sub_08068730: @ 0x08068730 cmp r0, r1 beq _08068762 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08068762 _0806875E: subs r0, #1 @@ -328,7 +328,7 @@ _08068944: ands r1, r0 adds r1, r1, r2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08068960: pop {r4, pc} .align 2, 0 @@ -370,7 +370,7 @@ sub_0806897C: @ 0x0806897C strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _080689BA .align 2, 0 _080689B0: .4byte gUnk_08111520 diff --git a/asm/miniFireballGuy.s b/asm/miniFireballGuy.s index 5d7c517d..c443e42e 100644 --- a/asm/miniFireballGuy.s +++ b/asm/miniFireballGuy.s @@ -11,7 +11,7 @@ sub_080455AC: @ 0x080455AC push {lr} ldr r1, _080455B8 @ =gUnk_080D1868 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _080455B8: .4byte gUnk_080D1868 @@ -94,7 +94,7 @@ sub_08045618: @ 0x08045618 bl sub_0804A720 adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08045678 pop {r4, pc} diff --git a/asm/miniSlime.s b/asm/miniSlime.s index d17242be..d45966f9 100644 --- a/asm/miniSlime.s +++ b/asm/miniSlime.s @@ -12,13 +12,13 @@ sub_08045200: @ 0x08045200 push {r4, lr} adds r4, r0, #0 ldr r1, _0804521C @ =gUnk_080D17C0 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #8 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _0804521C: .4byte gUnk_080D17C0 @@ -116,7 +116,7 @@ sub_080452A4: @ 0x080452A4 bl sub_0804A720 adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0xb] cmp r0, #0 beq _080452DC diff --git a/asm/minishLight.s b/asm/minishLight.s index 6cac3ab8..46425675 100644 --- a/asm/minishLight.s +++ b/asm/minishLight.s @@ -40,7 +40,7 @@ sub_0809F840: @ 0x0809F840 strb r0, [r2, #0x18] _0809F860: adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {pc} thumb_func_start sub_0809F868 diff --git a/asm/minishSizedArchway.s b/asm/minishSizedArchway.s index 57c3e5c5..312e730f 100644 --- a/asm/minishSizedArchway.s +++ b/asm/minishSizedArchway.s @@ -23,7 +23,7 @@ sub_080973E4: @ 0x080973E4 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip bl sub_08052660 cmp r0, #0 beq _0809741E diff --git a/asm/moldorm.s b/asm/moldorm.s index 915e3b03..057c63eb 100644 --- a/asm/moldorm.s +++ b/asm/moldorm.s @@ -39,7 +39,7 @@ sub_08022BA0: @ 0x08022BA0 strh r0, [r1] ldr r1, _08022BD0 @ =gUnk_080CBBA0 adds r0, r4, #0 - bl sub_0800129E + bl EnemyFunctionHandler adds r0, r4, #0 bl sub_08022EAC pop {r4, pc} diff --git a/asm/moldworm.s b/asm/moldworm.s index e005244d..e2f197e3 100644 --- a/asm/moldworm.s +++ b/asm/moldworm.s @@ -30,7 +30,7 @@ _08023052: strb r0, [r1] ldr r1, _08023068 @ =gUnk_080CBC38 adds r0, r4, #0 - bl sub_0800129E + bl EnemyFunctionHandler b _08023090 .align 2, 0 _08023068: .4byte gUnk_080CBC38 @@ -304,7 +304,7 @@ sub_080231BC: @ 0x080231BC strb r0, [r6, #0x14] ldrb r1, [r6, #0x14] adds r0, r6, #0 - bl UpdateSprite + bl InitializeAnimation _0802327E: pop {r4, r5, r6, pc} .align 2, 0 @@ -575,7 +575,7 @@ _08023460: ldrb r1, [r1] adds r1, r0, r1 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0802349C: pop {r4, r5, r6, pc} .align 2, 0 @@ -674,10 +674,10 @@ _08023534: ldr r0, [r7, #0x54] ldrb r1, [r0, #0x14] adds r1, #1 - bl UpdateSprite + bl InitializeAnimation ldrb r1, [r7, #0x14] adds r0, r7, #0 - bl UpdateSprite + bl InitializeAnimation _0802355A: adds r0, r7, #0 adds r0, #0x7f @@ -764,7 +764,7 @@ _080235F8: strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08023604 @@ -919,10 +919,10 @@ sub_080236F8: @ 0x080236F8 ldr r0, [r4, #0x54] ldrb r1, [r0, #0x14] adds r1, #1 - bl UpdateSprite + bl InitializeAnimation ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802372E: pop {r4, pc} @@ -1129,7 +1129,7 @@ sub_08023894: @ 0x08023894 strb r1, [r0] ldrb r1, [r5, #0x14] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r5, #0x50] ldrb r0, [r0, #0xb] cmp r0, #0 @@ -1275,10 +1275,10 @@ sub_08023990: @ 0x08023990 adds r0, #0x38 strb r1, [r0] adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r5, #0 movs r1, #0x16 - bl UpdateSprite + bl InitializeAnimation ldr r4, [r5, #0x54] _080239D4: adds r0, r4, #0 @@ -1375,7 +1375,7 @@ sub_08023A68: @ 0x08023A68 strb r0, [r2] adds r0, r4, #0 movs r1, #0x17 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08023A88 @@ -1396,7 +1396,7 @@ sub_08023A88: @ 0x08023A88 strb r0, [r2] adds r0, r4, #0 adds r1, r5, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} thumb_func_start sub_08023AB0 @@ -1433,7 +1433,7 @@ _08023ADE: strb r0, [r5] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08023B34 _08023AF6: adds r5, r4, #0 @@ -1466,7 +1466,7 @@ _08023B06: ldrb r1, [r4, #0x14] adds r1, #8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08023B34: pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/mountainMinish.s b/asm/mountainMinish.s index 26df1e04..15bb2333 100644 --- a/asm/mountainMinish.s +++ b/asm/mountainMinish.s @@ -48,7 +48,7 @@ sub_08067E60: @ 0x08067E60 bl sub_08078778 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _08067E80: pop {r4, pc} .align 2, 0 @@ -190,7 +190,7 @@ _08067F58: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_0806F118 b _0806801A @@ -219,7 +219,7 @@ _08067F98: bl sub_0806F5A4 adds r1, r0, #0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_08068190 b _0806801A @@ -239,7 +239,7 @@ _08067FDC: adds r1, #4 _08067FF2: adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _0806801A .align 2, 0 _08067FFC: .4byte gTextBox @@ -254,7 +254,7 @@ _08068000: adds r0, #0x69 ldrb r1, [r0] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0806801A: adds r0, r5, #0 adds r0, #0x59 @@ -576,7 +576,7 @@ sub_08068270: @ 0x08068270 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _080682AE .align 2, 0 _080682A4: .4byte gUnk_08111358 diff --git a/asm/mulldozer.s b/asm/mulldozer.s index b5876501..e4c25900 100644 --- a/asm/mulldozer.s +++ b/asm/mulldozer.s @@ -12,13 +12,13 @@ sub_08032C74: @ 0x08032C74 push {r4, lr} adds r4, r0, #0 ldr r1, _08032C90 @ =gUnk_080CEA1C - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _08032C90: .4byte gUnk_080CEA1C @@ -252,7 +252,7 @@ _08032E28: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08032E4E _08032E3C: adds r0, r4, #0 @@ -389,7 +389,7 @@ _08032F38: _08032F3C: adds r1, r1, r0 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -489,7 +489,7 @@ _08032FE8: ldrb r1, [r2, #0x14] adds r1, #4 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _08032FFE: pop {pc} @@ -538,7 +538,7 @@ _08033044: ldrb r1, [r2, #0x14] adds r1, #4 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _08033056: pop {pc} @@ -849,7 +849,7 @@ sub_08033280: @ 0x08033280 strb r0, [r4, #0x14] adds r1, r0, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080332A4: pop {r4, pc} .align 2, 0 @@ -917,7 +917,7 @@ _08033312: strb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08033320 diff --git a/asm/mutoh.s b/asm/mutoh.s index 5f07e875..471debb5 100644 --- a/asm/mutoh.s +++ b/asm/mutoh.s @@ -191,7 +191,7 @@ sub_08067118: @ 0x08067118 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _08067156 .align 2, 0 _0806714C: .4byte gUnk_08110C00 diff --git a/asm/non_matching/slime/sub_080450A8.inc b/asm/non_matching/slime/sub_080450A8.inc new file mode 100644 index 00000000..d8226a90 --- /dev/null +++ b/asm/non_matching/slime/sub_080450A8.inc @@ -0,0 +1,109 @@ + .include "asm/macros.inc" + + .include "constants/constants.inc" + + .syntax unified + + .text + + push {r4, r5, r6, r7, lr} + mov r7, sb + mov r6, r8 + push {r6, r7} + sub sp, #0x10 + mov r8, r0 + ldr r1, _0804516C @ =gUnk_080D16D0 + ldrb r0, [r0, #0xa] + adds r0, r0, r1 + ldrb r7, [r0] + movs r0, #0x48 + subs r0, r0, r7 + ldr r1, _08045170 @ =gUnk_03003DBC + ldrb r1, [r1] + cmp r0, r1 + ble _08045160 + cmp r7, #0 + beq _080450E2 + mov r4, sp + adds r5, r7, #0 +_080450D0: + mov r0, r8 + ldrb r1, [r0, #0xa] + movs r0, #0x57 + bl CreateEnemy + stm r4!, {r0} + subs r5, #1 + cmp r5, #0 + bne _080450D0 +_080450E2: + ldr r2, _08045174 @ =gUnk_080D16D4 + mov sb, r2 + movs r5, #0 + cmp r5, r7 + bge _08045142 +_080450EC: + lsls r0, r5, #2 + add r0, sp + ldr r6, [r0] + adds r4, r5, #1 + adds r0, r4, #0 + adds r1, r7, #0 + bl __modsi3 + lsls r0, r0, #2 + add r0, sp + ldr r0, [r0] + str r0, [r6, #0x54] + adds r0, r5, r7 + subs r0, #1 + adds r1, r7, #0 + bl __modsi3 + lsls r0, r0, #2 + add r0, sp + ldr r0, [r0] + str r0, [r6, #0x50] + movs r1, #0 + movs r0, #1 + strb r0, [r6, #0xb] + strh r1, [r6, #0x36] + adds r1, r6, #0 + adds r1, #0x3d + movs r0, #0xf0 + strb r0, [r1] + mov r0, sb + movs r2, #0 + ldrsb r2, [r0, r2] + movs r3, #1 + ldrsb r3, [r0, r3] + mov r0, r8 + adds r1, r6, #0 + bl sub_08045178 + movs r2, #2 + add sb, r2 + adds r5, r4, #0 + cmp r5, r7 + blt _080450EC +_08045142: + mov r0, r8 + movs r1, #2 + movs r2, #0 + bl CreateFx + adds r6, r0, #0 + cmp r6, #0 + beq _0804515A + mov r0, r8 + adds r1, r6, #0 + bl CopyPosition +_0804515A: + mov r0, r8 + bl DeleteEntity +_08045160: + add sp, #0x10 + pop {r3, r4} + mov r8, r3 + mov sb, r4 + pop {r4, r5, r6, r7, pc} + .align 2, 0 +_0804516C: .4byte gUnk_080D16D0 +_08045170: .4byte gUnk_03003DBC +_08045174: .4byte gUnk_080D16D4 + .syntax divided \ No newline at end of file diff --git a/asm/npc23.s b/asm/npc23.s index 74468b34..105180a0 100644 --- a/asm/npc23.s +++ b/asm/npc23.s @@ -43,7 +43,7 @@ sub_080662F8: @ 0x080662F8 strb r0, [r5, #0x14] ldrb r1, [r5, #0xa] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldrh r0, [r5, #0x2e] adds r1, r5, #0 adds r1, #0x7e @@ -165,7 +165,7 @@ sub_080663D4: @ 0x080663D4 strh r0, [r1] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0806642E .align 2, 0 _0806640C: .4byte gLinkEntity @@ -177,7 +177,7 @@ _08066410: lsrs r1, r1, #3 adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0xd] adds r0, #1 strb r0, [r4, #0xd] @@ -283,7 +283,7 @@ _080664D2: strh r0, [r1] mov r0, ip movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0806650A _080664F0: mov r6, ip @@ -297,7 +297,7 @@ _080664F0: strh r0, [r1] mov r0, ip movs r1, #6 - bl UpdateSprite + bl InitializeAnimation _0806650A: pop {r4, r5, r6, pc} @@ -413,7 +413,7 @@ _080665C8: lsrs r3, r3, #3 adds r0, r5, #0 adds r1, r3, #0 - bl UpdateSprite + bl InitializeAnimation _080665DE: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/npc5.s b/asm/npc5.s index 032c3414..7eba343f 100644 --- a/asm/npc5.s +++ b/asm/npc5.s @@ -550,7 +550,7 @@ sub_08060DFC: @ 0x08060DFC movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0x1c bl sub_08060E70 diff --git a/asm/npc9.s b/asm/npc9.s index f5242446..0ee7451a 100644 --- a/asm/npc9.s +++ b/asm/npc9.s @@ -34,7 +34,7 @@ sub_08062AF0: @ 0x08062AF0 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08078778 pop {r4, pc} @@ -57,7 +57,7 @@ sub_08062B14: @ 0x08062B14 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0805E47C _08062B40: @@ -99,7 +99,7 @@ sub_08062B70: @ 0x08062B70 bne _08062B92 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation movs r0, #1 strb r0, [r4, #0xc] adds r0, r4, #0 diff --git a/asm/object10.s b/asm/object10.s index cc5fff31..98b84c4d 100644 --- a/asm/object10.s +++ b/asm/object10.s @@ -74,7 +74,7 @@ sub_0808483C: @ 0x0808483C strh r1, [r5] adds r0, r4, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation ldr r0, _080848C4 @ =0x00004016 ldrh r1, [r5] adds r4, #0x38 diff --git a/asm/object11.s b/asm/object11.s index ecc27bce..cba689c9 100644 --- a/asm/object11.s +++ b/asm/object11.s @@ -139,7 +139,7 @@ _08084D7E: add r0, r8 ldrb r1, [r0] adds r0, r7, #0 - bl UpdateSprite + bl InitializeAnimation pop {r3} mov r8, r3 pop {r4, r5, r6, r7, pc} diff --git a/asm/object15.s b/asm/object15.s index 3e21e256..a50d995b 100644 --- a/asm/object15.s +++ b/asm/object15.s @@ -34,7 +34,7 @@ sub_08086034: @ 0x08086034 adds r1, r0, #0 adds r1, #0x58 ldrb r1, [r1] - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/object17.s b/asm/object17.s index 291caae2..90021a8e 100644 --- a/asm/object17.s +++ b/asm/object17.s @@ -72,7 +72,7 @@ sub_080861C4: @ 0x080861C4 strb r0, [r4, #0xa] adds r0, r4, #0 movs r1, #0x11 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, r6, pc} .align 2, 0 _08086230: .4byte gLinkEntity diff --git a/asm/object1E.s b/asm/object1E.s index a512240c..021d220c 100644 --- a/asm/object1E.s +++ b/asm/object1E.s @@ -131,7 +131,7 @@ _080875DC: ldrb r0, [r4, #0x14] adds r1, r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_080875F4 diff --git a/asm/object1F.s b/asm/object1F.s index 6d613755..f3e1f504 100644 --- a/asm/object1F.s +++ b/asm/object1F.s @@ -111,7 +111,7 @@ _080876E2: adds r0, r0, r3 ldrb r1, [r0] mov r0, ip - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 _08087760: .4byte gUnk_08120A20 diff --git a/asm/object20.s b/asm/object20.s index 1f2dcd58..0e1a062a 100644 --- a/asm/object20.s +++ b/asm/object20.s @@ -60,7 +60,7 @@ _08087836: bl sub_080878CC adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0801766C movs r0, #0xfd diff --git a/asm/object21.s b/asm/object21.s index d7fcf8f7..2dfeb2ad 100644 --- a/asm/object21.s +++ b/asm/object21.s @@ -36,7 +36,7 @@ _080879C4: bne _080879D8 adds r0, r4, #0 movs r1, #0xd - bl UpdateSprite + bl InitializeAnimation b _080879EA _080879D8: adds r0, r4, #0 @@ -117,7 +117,7 @@ _08087A68: movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _08087A76: ldrb r1, [r4, #0x10] movs r0, #0x80 @@ -171,7 +171,7 @@ _08087AC0: strb r1, [r0] adds r0, r4, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation b _08087AF8 .align 2, 0 _08087AE4: .4byte gUnk_08120A8C @@ -180,7 +180,7 @@ _08087AEC: .4byte gLinkEntity _08087AF0: adds r0, r4, #0 movs r1, #0x10 - bl UpdateSprite + bl InitializeAnimation _08087AF8: pop {r4, pc} .align 2, 0 diff --git a/asm/object24.s b/asm/object24.s index af7343da..1a2f9355 100644 --- a/asm/object24.s +++ b/asm/object24.s @@ -25,7 +25,7 @@ sub_08088804: @ 0x08088804 strb r0, [r1] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08088828: ldr r0, _0808883C @ =gUnk_08120BE0 ldrb r1, [r4, #0xc] @@ -87,7 +87,7 @@ sub_0808886C: @ 0x0808886C strh r1, [r5, #0x36] adds r0, r5, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] @@ -108,12 +108,12 @@ _080888B8: strb r0, [r5, #0xf] adds r1, r4, #1 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _080888DA _080888D2: adds r0, r5, #0 adds r1, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080888DA: movs r0, #0x86 lsls r0, r0, #1 @@ -124,7 +124,7 @@ _080888E4: bhs _080888F0 adds r0, r5, #0 adds r1, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080888F0: strb r4, [r5, #0x14] _080888F2: @@ -159,7 +159,7 @@ sub_080888F4: @ 0x080888F4 bl ClearFlag adds r0, r5, #0 adds r1, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08088934: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/object29.s b/asm/object29.s index ac42d90d..4013bbd9 100644 --- a/asm/object29.s +++ b/asm/object29.s @@ -23,7 +23,7 @@ sub_08089848: @ 0x08089848 ands r1, r0 adds r1, #1 adds r0, r4, #0 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation pop {r4, pc} .align 2, 0 _08089870: .4byte gUnk_08120D90 @@ -56,7 +56,7 @@ sub_08089874: @ 0x08089874 strb r0, [r4, #0x19] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08089AE0 b _08089940 @@ -107,12 +107,12 @@ _08089900: bne _08089912 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0808991A _08089912: adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0808991A: ldrb r0, [r4, #0xb] cmp r0, #0xff diff --git a/asm/object2A.s b/asm/object2A.s index c7a2f5fa..8afc4dc2 100644 --- a/asm/object2A.s +++ b/asm/object2A.s @@ -41,7 +41,7 @@ sub_08089B18: @ 0x08089B18 _08089B38: adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0xa] cmp r0, #2 beq _08089B66 @@ -224,7 +224,7 @@ _08089C96: strb r0, [r5, #0x18] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x92 lsls r0, r0, #1 bl sub_08004488 diff --git a/asm/object2B.s b/asm/object2B.s index fddfb91d..79263e11 100644 --- a/asm/object2B.s +++ b/asm/object2B.s @@ -23,7 +23,7 @@ sub_08089CBC: @ 0x08089CBC strb r0, [r4, #0x19] adds r0, r4, #0 movs r1, #9 - bl UpdateSprite + bl InitializeAnimation _08089CDC: ldr r1, [r4, #0x50] ldr r0, [r1, #0x34] diff --git a/asm/object35.s b/asm/object35.s index 452fdf92..99f6aaa9 100644 --- a/asm/object35.s +++ b/asm/object35.s @@ -44,7 +44,7 @@ sub_0808B89C: @ 0x0808B89C adds r1, #0x38 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r2, r4, #0 adds r2, #0x29 ldrb r1, [r2] @@ -58,7 +58,7 @@ sub_0808B89C: @ 0x0808B89C strb r0, [r4, #0xe] ldrb r1, [r4, #0xb] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 @@ -84,7 +84,7 @@ sub_0808B8D4: @ 0x0808B8D4 strb r0, [r4, #0xb] ldrb r1, [r4, #0xb] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0808B904: pop {r4, pc} .align 2, 0 diff --git a/asm/object42.s b/asm/object42.s index 5df8b9d5..9e94dc46 100644 --- a/asm/object42.s +++ b/asm/object42.s @@ -54,7 +54,7 @@ sub_0808DDB4: @ 0x0808DDB4 strh r0, [r1] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0808DDE8 _0808DDDC: diff --git a/asm/object43.s b/asm/object43.s index 02c0b333..ff1086c6 100644 --- a/asm/object43.s +++ b/asm/object43.s @@ -84,7 +84,7 @@ sub_0808DEE8: @ 0x0808DEE8 strb r2, [r5, #0x11] adds r0, r5, #0 movs r1, #7 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r5, #0xb] cmp r0, #0 beq _0808DF78 @@ -430,7 +430,7 @@ sub_0808E1BC: @ 0x0808E1BC ldrb r1, [r4, #0x14] lsrs r1, r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _0808E204: .4byte gLinkEntity diff --git a/asm/object44.s b/asm/object44.s index 51c42bf3..40140e15 100644 --- a/asm/object44.s +++ b/asm/object44.s @@ -78,7 +78,7 @@ _0808E2E6: strh r0, [r4, #0x32] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r1, _0808E314 @ =0x00000347 adds r0, r4, #0 bl sub_0808E354 diff --git a/asm/object45.s b/asm/object45.s index 5c7563dc..3219080d 100644 --- a/asm/object45.s +++ b/asm/object45.s @@ -32,7 +32,7 @@ sub_0808E42C: @ 0x0808E42C orrs r1, r2 strb r1, [r0, #0x11] ldrb r1, [r0, #0xa] - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/object49.s b/asm/object49.s index cce01564..d0831df1 100644 --- a/asm/object49.s +++ b/asm/object49.s @@ -86,7 +86,7 @@ _0808F124: str r0, [r5, #0x78] adds r0, r5, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_0808F14C pop {r4, r5, r6, pc} @@ -218,7 +218,7 @@ sub_0808F1F8: @ 0x0808F1F8 strb r0, [r2] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0808F244 pop {r4, pc} @@ -338,7 +338,7 @@ sub_0808F2C0: @ 0x0808F2C0 strh r0, [r5, #0x2e] adds r0, r5, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _0808F322: ldr r2, [r5, #0x50] movs r1, #0x36 @@ -460,7 +460,7 @@ sub_0808F3DC: @ 0x0808F3DC ldrb r1, [r4, #0xa] adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0xa] cmp r0, #8 beq _0808F41A @@ -621,7 +621,7 @@ _0808F4FE: bl sub_0801D2B4 adds r0, r5, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _0808F550: pop {r4, r5, r6, pc} .align 2, 0 @@ -700,7 +700,7 @@ _0808F5AC: strb r0, [r2] adds r0, r5, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _0808F5E8: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/object4B.s b/asm/object4B.s index be39ff3c..c58d5fda 100644 --- a/asm/object4B.s +++ b/asm/object4B.s @@ -28,7 +28,7 @@ sub_0808F794: @ 0x0808F794 movs r1, #0x3c strb r1, [r0, #0xe] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -84,7 +84,7 @@ sub_0808F7D4: @ 0x0808F7D4 strb r0, [r2] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0808F80A: pop {r4, pc} @@ -118,7 +118,7 @@ sub_0808F80C: @ 0x0808F80C strb r2, [r4, #0xe] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation ldr r0, _0808F854 @ =0x0000012B bl PlaySFX _0808F850: @@ -176,7 +176,7 @@ _0808F88A: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0808F8EA .align 2, 0 _0808F8C4: .4byte gRoomControls @@ -193,7 +193,7 @@ _0808F8C8: str r0, [r4, #0x20] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation ldr r0, _0808F8EC @ =0x0000012B bl PlaySFX _0808F8EA: @@ -217,7 +217,7 @@ sub_0808F8F0: @ 0x0808F8F0 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation _0808F912: pop {r4, pc} @@ -240,7 +240,7 @@ sub_0808F914: @ 0x0808F914 strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0808F93C: pop {r4, pc} .align 2, 0 diff --git a/asm/object53.s b/asm/object53.s index 2f7d936c..c5875868 100644 --- a/asm/object53.s +++ b/asm/object53.s @@ -73,7 +73,7 @@ sub_08091120: @ 0x08091120 adds r0, r0, r3 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08004168 pop {r4, pc} diff --git a/asm/object56.s b/asm/object56.s index 41f527d7..e602a6cd 100644 --- a/asm/object56.s +++ b/asm/object56.s @@ -46,7 +46,7 @@ _08091E96: strb r0, [r4, #0x1b] ldrb r1, [r4, #0xb] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldr r1, _08091EBC @ =gUnk_08122590 ldrb r0, [r4, #0xb] lsls r0, r0, #1 diff --git a/asm/object64.s b/asm/object64.s index c1b7d357..b0f914a8 100644 --- a/asm/object64.s +++ b/asm/object64.s @@ -47,7 +47,7 @@ sub_08093E3C: @ 0x08093E3C _08093E6A: ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0xa] lsls r0, r0, #2 ldr r1, _08093EA8 @ =gUnk_08122950 diff --git a/asm/object66.s b/asm/object66.s index b30793f0..d03b69ef 100644 --- a/asm/object66.s +++ b/asm/object66.s @@ -42,7 +42,7 @@ sub_08094084: @ 0x08094084 strb r0, [r1] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _080940CA: ldrh r0, [r5, #0x2e] strh r0, [r4, #0x2e] diff --git a/asm/object67.s b/asm/object67.s index 2171ba16..f2f420ed 100644 --- a/asm/object67.s +++ b/asm/object67.s @@ -132,7 +132,7 @@ _08094200: strh r0, [r4, #0x24] adds r0, r4, #0 movs r1, #0x56 - bl UpdateSprite + bl InitializeAnimation b _0809438A .align 2, 0 _08094228: .4byte gUnk_081229D0 @@ -152,7 +152,7 @@ _08094230: strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #0x57 - bl UpdateSprite + bl InitializeAnimation b _0809438A _08094254: ldrb r0, [r4, #0xb] diff --git a/asm/object6A.s b/asm/object6A.s index 2da7c46a..1880e53d 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -33,7 +33,7 @@ sub_08094A5C: @ 0x08094A5C bl sub_0807DD64 adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _08094A78: adds r0, r4, #0 movs r1, #0 @@ -59,7 +59,7 @@ sub_08094A90: @ 0x08094A90 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r1, _08094AE4 @ =gUnk_08114F30 ldrb r2, [r4, #0x19] lsrs r0, r2, #6 @@ -252,7 +252,7 @@ sub_08094BE0: @ 0x08094BE0 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #1 bl LoadAnimation @@ -606,7 +606,7 @@ _08094EA6: bl sub_0805E3A0 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080002B8 cmp r0, #0xd @@ -634,7 +634,7 @@ _08094ED4: str r1, [r4, #0x20] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xbf lsls r0, r0, #1 bl sub_08004488 @@ -692,7 +692,7 @@ _08094F5E: _08094F68: adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _08094F94 _08094F72: ldrb r0, [r4, #0x18] @@ -702,7 +702,7 @@ _08094F72: _08094F7A: adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _08094F94 _08094F84: ldrb r0, [r4, #0x18] @@ -711,7 +711,7 @@ _08094F84: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _08094F94: pop {r4, r5, pc} .align 2, 0 @@ -1006,7 +1006,7 @@ sub_080951C4: @ 0x080951C4 bl sub_0807DD64 adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _080951E8: adds r0, r4, #0 movs r1, #0 @@ -1209,7 +1209,7 @@ sub_08095364: @ 0x08095364 movs r4, #1 strb r4, [r0] adds r0, r6, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip str r5, [r6, #0x54] strb r4, [r6, #0xd] ldr r0, _080953A0 @ =0x0000FFF0 @@ -1462,7 +1462,7 @@ _0809550A: ldrb r1, [r4, #0xb] adds r1, #2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08095754 bl Random @@ -1636,7 +1636,7 @@ sub_080956B4: @ 0x080956B4 strb r0, [r5, #0xc] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r4, r5, #0 adds r4, #0x68 ldrh r2, [r5, #0x2e] @@ -1740,7 +1740,7 @@ sub_0809577C: @ 0x0809577C strh r0, [r4, #0x36] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08095796: adds r0, r4, #0 bl sub_08004274 @@ -1868,7 +1868,7 @@ _08095880: movs r0, #2 strb r0, [r1] adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r1, _080958D4 @ =gUnk_08114F30 ldrb r2, [r5, #0x19] lsrs r0, r2, #6 @@ -1946,7 +1946,7 @@ sub_08095918: @ 0x08095918 bl sub_0807DD64 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0809593C: adds r0, r4, #0 movs r1, #0 @@ -2225,7 +2225,7 @@ sub_08095B48: @ 0x08095B48 movs r0, #2 strb r0, [r1] adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r1, _08095BA8 @ =gUnk_08114F30 ldrb r2, [r5, #0x19] lsrs r0, r2, #6 @@ -2590,7 +2590,7 @@ _08095DF4: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0x4b - bl UpdateSprite + bl InitializeAnimation ldr r1, _08095E78 @ =gUnk_08114F30 ldrb r2, [r4, #0x19] lsrs r0, r2, #6 @@ -2925,7 +2925,7 @@ sub_08096084: @ 0x08096084 bl sub_0807DD64 ldrb r1, [r4, #0xb] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080960A0: adds r0, r4, #0 movs r1, #0 @@ -3039,7 +3039,7 @@ sub_08096168: @ 0x08096168 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0x4b - bl UpdateSprite + bl InitializeAnimation _0809618C: adds r0, r4, #0 bl sub_08004274 diff --git a/asm/object80.s b/asm/object80.s index 7a5b3a28..c68d7842 100644 --- a/asm/object80.s +++ b/asm/object80.s @@ -83,7 +83,7 @@ sub_08098B28: @ 0x08098B28 adds r7, #0x38 strb r4, [r7] adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r2, r5, #0 adds r2, #0x29 ldrb r1, [r2] diff --git a/asm/object81.s b/asm/object81.s index 56c14f38..fdb188cb 100644 --- a/asm/object81.s +++ b/asm/object81.s @@ -67,7 +67,7 @@ _08098CD0: strb r5, [r0] _08098CD6: adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 adds r0, #0x80 ldrh r1, [r0] diff --git a/asm/object86.s b/asm/object86.s index 46e63124..c3bca41e 100644 --- a/asm/object86.s +++ b/asm/object86.s @@ -51,7 +51,7 @@ _08099E04: strb r5, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08099E0E: pop {r4, r5, r6, pc} @@ -87,7 +87,7 @@ _08099E3E: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08099E54: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/object87.s b/asm/object87.s index 33a039c5..70c8ff1e 100644 --- a/asm/object87.s +++ b/asm/object87.s @@ -64,7 +64,7 @@ _08099F60: _08099F70: adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x92 lsls r0, r0, #1 bl sub_08004488 @@ -133,7 +133,7 @@ _08099FCE: bl sub_0806F62C adds r0, r5, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xa6 lsls r0, r0, #1 bl PlaySFX @@ -172,7 +172,7 @@ _0809A040: _0809A04E: adds r0, r5, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _0809A1B6 _0809A058: bl Random @@ -209,7 +209,7 @@ _0809A092: _0809A0A0: adds r0, r5, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _0809A1B6 _0809A0AA: movs r0, #0xc3 @@ -263,7 +263,7 @@ _0809A0B0: bl sub_0805EC9C adds r0, r5, #0 movs r1, #7 - bl UpdateSprite + bl InitializeAnimation b _0809A1B6 .align 2, 0 _0809A118: .4byte gUnk_0812388C @@ -272,7 +272,7 @@ _0809A11C: strb r0, [r5, #0xe] adds r0, r5, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r5, #0x50] adds r1, r5, #0 bl CopyPosition diff --git a/asm/object8A.s b/asm/object8A.s index e41de6bc..d00d4316 100644 --- a/asm/object8A.s +++ b/asm/object8A.s @@ -47,7 +47,7 @@ sub_0809ADCC: @ 0x0809ADCC adds r0, #0x38 ldrb r7, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldrb r0, [r4, #0xa] cmp r0, #1 beq _0809AEBC diff --git a/asm/object8B.s b/asm/object8B.s index 72eafa19..c6133eef 100644 --- a/asm/object8B.s +++ b/asm/object8B.s @@ -72,7 +72,7 @@ _0809AFC4: adds r0, #0x84 strb r6, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip movs r0, #0x8b movs r1, #1 movs r2, #0 diff --git a/asm/object9.s b/asm/object9.s index ba7d712f..dbda458d 100644 --- a/asm/object9.s +++ b/asm/object9.s @@ -290,7 +290,7 @@ _08083A7C: movs r0, #0xee strb r0, [r2] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08083998 pop {r4, pc} diff --git a/asm/object91.s b/asm/object91.s index 972a1712..52037929 100644 --- a/asm/object91.s +++ b/asm/object91.s @@ -253,7 +253,7 @@ _0809C5A4: adds r1, r1, r0 ldrb r1, [r1] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0809C5C4 _0809C5BA: diff --git a/asm/object93.s b/asm/object93.s index 84351102..8945d24d 100644 --- a/asm/object93.s +++ b/asm/object93.s @@ -26,10 +26,10 @@ sub_0809CEA8: @ 0x0809CEA8 movs r0, #1 strb r0, [r4, #0xc] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_0809CEC0 diff --git a/asm/object96.s b/asm/object96.s index 205d6a42..9279e8ff 100644 --- a/asm/object96.s +++ b/asm/object96.s @@ -78,7 +78,7 @@ sub_0809D7A8: @ 0x0809D7A8 strb r1, [r5, #0x15] _0809D80C: adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldrb r4, [r5, #0xa] adds r0, r5, #0 bl sub_08080CB4 @@ -151,7 +151,7 @@ _0809D888: adds r0, #0x38 strb r1, [r0] adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r1, [r6] cmp r1, #0 beq _0809D8AC diff --git a/asm/object97.s b/asm/object97.s index 5be7d62c..91ca71ce 100644 --- a/asm/object97.s +++ b/asm/object97.s @@ -243,7 +243,7 @@ sub_0809DB58: @ 0x0809DB58 orrs r0, r1 strb r0, [r4, #0x19] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0x3c bl LoadAnimation @@ -357,7 +357,7 @@ _0809DC3C: adds r0, #0x38 strb r1, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0809DC54: movs r0, #0x6e bl PlaySFX @@ -430,7 +430,7 @@ sub_0809DC80: @ 0x0809DC80 adds r0, #2 strb r2, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #3 bl LoadAnimation @@ -659,7 +659,7 @@ sub_0809DE50: @ 0x0809DE50 ldr r0, _0809DEF8 @ =0x0000FFC0 strh r0, [r4, #0x36] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r1, _0809DEFC @ =gUnk_08124128 ldrb r0, [r4, #0xb] adds r0, r0, r1 diff --git a/asm/object99.s b/asm/object99.s index 6f71334c..2b1cad0b 100644 --- a/asm/object99.s +++ b/asm/object99.s @@ -50,7 +50,7 @@ _0809E444: strb r0, [r2] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0809E482: ldrb r0, [r6, #0x14] mov r1, r8 diff --git a/asm/object9B.s b/asm/object9B.s index 6fd7e6a1..4eaf28ea 100644 --- a/asm/object9B.s +++ b/asm/object9B.s @@ -34,7 +34,7 @@ sub_0809E7C0: @ 0x0809E7C0 _0809E7D4: ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 diff --git a/asm/object9E.s b/asm/object9E.s index 29f548f4..4a2d9207 100644 --- a/asm/object9E.s +++ b/asm/object9E.s @@ -76,7 +76,7 @@ sub_0809EC4C: @ 0x0809EC4C adds r1, r4, #0 bl SetTile adds r0, r6, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip movs r0, #0x9e movs r1, #1 movs r2, #0 @@ -100,7 +100,7 @@ _0809ED04: movs r0, #2 strb r0, [r1] adds r0, r6, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0809ED14: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/objectA0.s b/asm/objectA0.s index 208933ba..71be7119 100644 --- a/asm/objectA0.s +++ b/asm/objectA0.s @@ -51,7 +51,7 @@ sub_0809F144: @ 0x0809F144 bl SetTile ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, r6, pc} .align 2, 0 _0809F188: .4byte gUnk_080FD178 @@ -71,7 +71,7 @@ sub_0809F194: @ 0x0809F194 ldrb r1, [r2, #0xa] adds r1, #4 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _0809F1AE: pop {pc} @@ -126,7 +126,7 @@ _0809F20C: strb r3, [r4, #0xc] ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0809F21E: pop {r4, r5, pc} @@ -146,7 +146,7 @@ sub_0809F220: @ 0x0809F220 strb r0, [r2, #0xe] ldrb r1, [r2, #0xa] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation b _0809F252 _0809F242: ldr r0, [r2, #0x50] diff --git a/asm/objectA2.s b/asm/objectA2.s index 49064fc1..c91bfa3f 100644 --- a/asm/objectA2.s +++ b/asm/objectA2.s @@ -29,7 +29,7 @@ sub_0809F318: @ 0x0809F318 push {r4, lr} adds r4, r0, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation bl Random movs r1, #0x10 ands r1, r0 @@ -90,7 +90,7 @@ sub_0809F374: @ 0x0809F374 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xc3 lsls r0, r0, #1 bl PlaySFX @@ -114,7 +114,7 @@ _0809F3C8: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0809F3D4: movs r0, #0 strb r0, [r4, #0xe] @@ -140,7 +140,7 @@ sub_0809F3E8: @ 0x0809F3E8 strb r0, [r2, #0xc] adds r0, r2, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0809F404: pop {pc} .align 2, 0 diff --git a/asm/objectA7.s b/asm/objectA7.s index 1ef5e732..d2f4e515 100644 --- a/asm/objectA7.s +++ b/asm/objectA7.s @@ -26,7 +26,7 @@ sub_0809F9AC: @ 0x0809F9AC strb r0, [r2] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0809F9D2: adds r0, r4, #0 bl sub_08004274 diff --git a/asm/objectA9.s b/asm/objectA9.s index 400e0851..861c3dcc 100644 --- a/asm/objectA9.s +++ b/asm/objectA9.s @@ -31,7 +31,7 @@ sub_0809FEF8: @ 0x0809FEF8 adds r0, r0, r1 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldr r1, _0809FF24 @ =gUnk_08124860 ldrb r0, [r4, #0xa] lsls r0, r0, #1 diff --git a/asm/objectAB.s b/asm/objectAB.s index 3c7a9554..be814f0a 100644 --- a/asm/objectAB.s +++ b/asm/objectAB.s @@ -45,7 +45,7 @@ sub_080A00F8: @ 0x080A00F8 strb r1, [r2] strb r3, [r0, #0xd] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_080A012C diff --git a/asm/objectAF.s b/asm/objectAF.s index 652185dc..551ee788 100644 --- a/asm/objectAF.s +++ b/asm/objectAF.s @@ -41,7 +41,7 @@ sub_080A05A4: @ 0x080A05A4 bl sub_080A0640 adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _080A05F0 _080A05D2: movs r0, #0 @@ -57,7 +57,7 @@ _080A05D2: strb r0, [r1] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _080A05F0: pop {r4, pc} .align 2, 0 @@ -73,7 +73,7 @@ sub_080A05F4: @ 0x080A05F4 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _080A0622 _080A060C: ldr r0, [r0, #4] diff --git a/asm/objectB2.s b/asm/objectB2.s index 1f4119cb..be3d9421 100644 --- a/asm/objectB2.s +++ b/asm/objectB2.s @@ -32,7 +32,7 @@ _080A09CA: str r1, [r4, #0x54] ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080A09D4: ldr r0, [r4, #0x50] ldrh r0, [r0, #0x24] diff --git a/asm/objectB3.s b/asm/objectB3.s index 9aa76dee..f9c2ab9d 100644 --- a/asm/objectB3.s +++ b/asm/objectB3.s @@ -84,7 +84,7 @@ _080A0AC0: .4byte gUnk_02022740 sub_080A0AC4: @ 0x080A0AC4 push {lr} ldrb r1, [r0, #0xa] - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -163,7 +163,7 @@ sub_080A0B4C: @ 0x080A0B4C movs r1, #0x50 strh r1, [r0, #0x32] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/objectB6.s b/asm/objectB6.s index 37145de9..0c85be7d 100644 --- a/asm/objectB6.s +++ b/asm/objectB6.s @@ -23,7 +23,7 @@ _080A0E64: strb r0, [r4, #0xc] ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080A0E76: ldr r0, [r4, #0x50] ldrb r3, [r4, #0xa] diff --git a/asm/objectBA.s b/asm/objectBA.s index 7b612c7f..d896b928 100644 --- a/asm/objectBA.s +++ b/asm/objectBA.s @@ -1026,7 +1026,7 @@ sub_080A1E54: @ 0x080A1E54 movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080A1ECA: pop {r4, r5, pc} .align 2, 0 @@ -1241,7 +1241,7 @@ sub_080A1FF0: @ 0x080A1FF0 movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080A2066: adds r4, r5, #0 adds r4, #0x7b diff --git a/asm/objectD.s b/asm/objectD.s index 6727028f..fd16afec 100644 --- a/asm/objectD.s +++ b/asm/objectD.s @@ -91,7 +91,7 @@ _080843C8: bl SetFlag adds r0, r5, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _080843F4 .align 2, 0 _080843E0: .4byte gUnk_080FD188 @@ -100,7 +100,7 @@ _080843E8: .4byte gRoomControls _080843EC: ldrb r1, [r5, #0xa] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _080843F4: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/objectOnPillar.s b/asm/objectOnPillar.s index f618a8fb..01d052b1 100644 --- a/asm/objectOnPillar.s +++ b/asm/objectOnPillar.s @@ -79,7 +79,7 @@ sub_08096E28: @ 0x08096E28 subs r1, #0x2b strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 bl sub_080970F4 ldr r1, _08096EB8 @ =gUnk_08123264 diff --git a/asm/octorok.s b/asm/octorok.s index 41b9f72d..5996b13f 100644 --- a/asm/octorok.s +++ b/asm/octorok.s @@ -36,7 +36,7 @@ sub_0801EC2C: @ 0x0801EC2C ldrb r1, [r5, #0x14] adds r1, #4 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _0801EC7E .align 2, 0 _0801EC74: .4byte gUnk_080CA174 @@ -215,7 +215,7 @@ _0801EDD0: strb r0, [r5, #0x14] ldrb r1, [r5, #0x14] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} .align 2, 0 _0801EDE8: .4byte gUnk_020000B0 diff --git a/asm/octorok/sub_0801EBC8.inc b/asm/octorok/sub_0801EBC8.inc index 75fbd75a..f0b3286c 100644 --- a/asm/octorok/sub_0801EBC8.inc +++ b/asm/octorok/sub_0801EBC8.inc @@ -22,7 +22,7 @@ _0801EBDE: bl sub_0801ECFC ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .syntax divided \ No newline at end of file diff --git a/asm/octorokBoss.s b/asm/octorokBoss.s index 912337f6..9fc2cdb9 100644 --- a/asm/octorokBoss.s +++ b/asm/octorokBoss.s @@ -1015,7 +1015,7 @@ _08035974: adds r1, r1, r0 ldrb r1, [r1] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080359A0 .align 2, 0 _0803598C: .4byte gUnk_080CF08C diff --git a/asm/octorokGolden.s b/asm/octorokGolden.s index a4db8824..84f52b9f 100644 --- a/asm/octorokGolden.s +++ b/asm/octorokGolden.s @@ -37,7 +37,7 @@ _08037C5C: adds r0, r5, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset _08037C7E: pop {r4, r5, pc} .align 2, 0 @@ -133,7 +133,7 @@ _08037D1C: _08037D26: adds r0, r4, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r0, r4, #0 bl sub_080AEF88 cmp r0, #0 @@ -158,7 +158,7 @@ sub_08037D54: @ 0x08037D54 push {r4, lr} adds r4, r0, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r2, r4, #0 adds r2, #0x5a ldrb r1, [r2] @@ -240,7 +240,7 @@ _08037DEE: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08037E0C: pop {r4, pc} .align 2, 0 @@ -302,7 +302,7 @@ _08037E7A: strb r4, [r5, #0x14] adds r0, r5, #0 adds r1, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08037E8E: pop {r4, r5, r6, pc} @@ -331,7 +331,7 @@ _08037EAC: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #1 _08037EC6: pop {r4, pc} diff --git a/asm/peahat.s b/asm/peahat.s index bdf6728b..64b5028c 100644 --- a/asm/peahat.s +++ b/asm/peahat.s @@ -16,13 +16,13 @@ sub_0801FF5C: @ 0x0801FF5C bne _0801FF84 ldr r1, _0801FF80 @ =gUnk_080CA570 adds r0, r4, #0 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset b _0801FF94 .align 2, 0 _0801FF80: .4byte gUnk_080CA570 @@ -124,7 +124,7 @@ _0802001E: strb r1, [r0] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08020068 _08020042: cmp r1, #0x80 @@ -209,7 +209,7 @@ sub_080200B4: @ 0x080200B4 strb r3, [r0] ldrb r1, [r2, #0x14] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _080200E2: pop {pc} @@ -301,7 +301,7 @@ _08020162: strb r0, [r4, #0x14] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} .align 2, 0 @@ -403,7 +403,7 @@ sub_08020220: @ 0x08020220 movs r1, #4 subs r1, r1, r0 adds r0, r5, #0 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation b _08020292 _0802024C: movs r0, #3 @@ -437,7 +437,7 @@ _08020284: _0802028A: adds r0, r5, #0 movs r1, #4 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation _08020292: pop {r4, r5, pc} @@ -495,7 +495,7 @@ _080202F8: _080202FE: adds r0, r4, #0 movs r1, #4 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation pop {r4, pc} thumb_func_start sub_08020308 @@ -533,7 +533,7 @@ _08020340: bl sub_080AEFE0 adds r0, r4, #0 movs r1, #4 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation _0802034E: pop {r4, pc} @@ -638,7 +638,7 @@ _080203F2: strb r0, [r4, #0x14] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation _08020418: pop {r4, pc} .align 2, 0 @@ -710,7 +710,7 @@ sub_08020468: @ 0x08020468 strb r0, [r4, #0x14] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _080204A6 _080204A2: movs r0, #1 @@ -773,7 +773,7 @@ sub_080204E0: @ 0x080204E0 strb r2, [r4, #0x14] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0802053A _0802051A: movs r0, #1 @@ -833,7 +833,7 @@ sub_0802053C: @ 0x0802053C strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08020590 diff --git a/asm/percy.s b/asm/percy.s index 47ee13f6..c201c4e5 100644 --- a/asm/percy.s +++ b/asm/percy.s @@ -42,7 +42,7 @@ sub_0806B3CC: @ 0x0806B3CC strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08078778 _0806B3F4: @@ -125,7 +125,7 @@ _0806B470: adds r1, r0, #0 adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08002632 ldr r1, _0806B4CC @ =gUnk_08001A7C @@ -350,7 +350,7 @@ sub_0806B624: @ 0x0806B624 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0806B662 .align 2, 0 _0806B658: .4byte gUnk_08112E1C diff --git a/asm/pesto.s b/asm/pesto.s index 647ba4e1..09e6f86a 100644 --- a/asm/pesto.s +++ b/asm/pesto.s @@ -227,7 +227,7 @@ sub_0802409C: @ 0x0802409C strb r0, [r1] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080A29BC pop {r4, pc} @@ -306,7 +306,7 @@ _08024132: strh r0, [r4, #0x36] _08024136: adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip bl sub_08052660 cmp r0, #0 beq _08024150 @@ -1439,7 +1439,7 @@ sub_080249DC: @ 0x080249DC lsrs r1, r1, #2 strb r1, [r0, #0x14] ldrb r1, [r0, #0x14] - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -1458,7 +1458,7 @@ sub_080249F4: @ 0x080249F4 strb r1, [r2, #0x14] ldrb r1, [r2, #0x14] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _08024A12: pop {pc} diff --git a/asm/picoBloom.s b/asm/picoBloom.s index 747ef3a2..cfdc54cf 100644 --- a/asm/picoBloom.s +++ b/asm/picoBloom.s @@ -40,7 +40,7 @@ _08098A9C: movs r0, #1 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r1, _08098ACC @ =gUnk_08123574 ldrb r0, [r4, #0xa] adds r0, r0, r1 @@ -48,7 +48,7 @@ _08098A9C: ldrb r0, [r4, #0xb] adds r1, r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _08098ACC: .4byte gUnk_08123574 diff --git a/asm/pinwheel.s b/asm/pinwheel.s index d5c0f046..fd1b7f90 100644 --- a/asm/pinwheel.s +++ b/asm/pinwheel.s @@ -68,7 +68,7 @@ _080A2412: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 diff --git a/asm/pot.s b/asm/pot.s index 226f3f89..79744cd4 100644 --- a/asm/pot.s +++ b/asm/pot.s @@ -129,7 +129,7 @@ _080822D6: bl SetTile adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation pop {r3} mov r8, r3 pop {r4, r5, r6, r7, pc} diff --git a/asm/puffstool.s b/asm/puffstool.s index 6b422401..6b7580a6 100644 --- a/asm/puffstool.s +++ b/asm/puffstool.s @@ -12,13 +12,13 @@ sub_08024FE8: @ 0x08024FE8 push {r4, lr} adds r4, r0, #0 ldr r1, _08025004 @ =gUnk_080CBF9C - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _08025004: .4byte gUnk_080CBF9C @@ -111,7 +111,7 @@ _0802508A: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r1, r4, #0 adds r1, #0x59 movs r0, #6 @@ -233,7 +233,7 @@ sub_08025180: @ 0x08025180 ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0804AA1C pop {r4, pc} @@ -301,7 +301,7 @@ sub_080251FC: @ 0x080251FC bl sub_080256B4 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} .align 2, 0 @@ -478,7 +478,7 @@ _08025352: str r0, [r4, #0x20] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08025388: pop {r4, r5, pc} .align 2, 0 @@ -515,7 +515,7 @@ _080253AE: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _080253CC: pop {r4, pc} .align 2, 0 @@ -539,7 +539,7 @@ sub_080253D4: @ 0x080253D4 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation b _0802541A _080253FE: movs r0, #6 @@ -548,7 +548,7 @@ _080253FE: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08025A54 adds r0, r4, #0 @@ -577,7 +577,7 @@ sub_0802541C: @ 0x0802541C str r0, [r4, #0x20] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08025448: pop {r4, pc} .align 2, 0 @@ -604,7 +604,7 @@ _08025460: bl sub_080256B4 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0802547A: pop {r4, pc} @@ -679,7 +679,7 @@ _080254F6: _08025502: adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _08025512 _0802550C: adds r0, r4, #0 @@ -1626,7 +1626,7 @@ sub_08025C2C: @ 0x08025C2C adds r1, #0x80 strb r2, [r1] movs r1, #8 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/pullableLever.s b/asm/pullableLever.s index cb6d0594..247abc20 100644 --- a/asm/pullableLever.s +++ b/asm/pullableLever.s @@ -166,7 +166,7 @@ _080912CE: strb r1, [r0] ldrb r1, [r6, #0xb] adds r0, r6, #0 - bl UpdateSprite + bl InitializeAnimation _0809132C: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -331,9 +331,9 @@ sub_08091444: @ 0x08091444 ldrb r1, [r0, #0xb] adds r1, #8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {r4, pc} thumb_func_start sub_08091470 @@ -417,7 +417,7 @@ _080914E2: adds r1, r1, r3 adds r1, #8 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _08091502: pop {r4, pc} @@ -445,9 +445,9 @@ sub_08091504: @ 0x08091504 ldrb r1, [r4, #0xb] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {r4, pc} thumb_func_start sub_0809153C diff --git a/asm/pullableMushroom.s b/asm/pullableMushroom.s index bf528359..f1067e5e 100644 --- a/asm/pullableMushroom.s +++ b/asm/pullableMushroom.s @@ -151,7 +151,7 @@ _0808AB10: ldrb r1, [r5, #0x14] adds r1, #9 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _0808AB5E .align 2, 0 _0808AB1C: .4byte gUnk_080FD224 @@ -411,7 +411,7 @@ sub_0808ACEC: @ 0x0808ACEC beq _0808AD00 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0808AD00: adds r0, r4, #0 adds r0, #0x41 @@ -555,7 +555,7 @@ _0808AE26: cmp r1, r0 beq _0808AE54 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r4, #0x14] cmp r0, #3 bne _0808AE42 @@ -594,7 +594,7 @@ _0808AE54: ldrb r1, [r4, #0x14] adds r1, #0xd adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0808AE80: pop {r4, pc} .align 2, 0 @@ -738,7 +738,7 @@ _0808AF68: ldrb r1, [r4, #0x14] adds r1, #5 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #0 bl sub_0808B21C @@ -867,7 +867,7 @@ sub_0808B05C: @ 0x0808B05C ldrb r1, [r4, #0x14] adds r1, #5 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #1 bl sub_0808B21C diff --git a/asm/pushableLever.s b/asm/pushableLever.s index 868009fd..b2673b5a 100644 --- a/asm/pushableLever.s +++ b/asm/pushableLever.s @@ -178,7 +178,7 @@ sub_08098354: @ 0x08098354 bl SetTile adds r0, r6, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _0809840C .align 2, 0 _080983B4: .4byte gRoomControls @@ -220,7 +220,7 @@ _080983BC: bl SetTile adds r0, r6, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0809840C: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/pushableRock.s b/asm/pushableRock.s index c18890e0..a52dd455 100644 --- a/asm/pushableRock.s +++ b/asm/pushableRock.s @@ -112,7 +112,7 @@ _0808A598: lsrs r1, r1, #1 adds r1, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _0808A5C8 @ =0x0000010F bl sub_08004488 b _0808A5DE @@ -126,7 +126,7 @@ _0808A5CC: beq _0808A5DE adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0808A5DE: pop {r4, pc} @@ -248,7 +248,7 @@ _0808A69E: bl PlaySFX adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation b _0808A6EC .align 2, 0 _0808A6D0: .4byte gRoomControls @@ -256,7 +256,7 @@ _0808A6D4: .4byte 0x00004015 _0808A6D8: adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _0808A6EC _0808A6E2: ldr r0, _0808A6F0 @ =0x0000401B diff --git a/asm/pushableStatue.s b/asm/pushableStatue.s index c4035f10..2da31883 100644 --- a/asm/pushableStatue.s +++ b/asm/pushableStatue.s @@ -50,7 +50,7 @@ sub_080891F4: @ 0x080891F4 bl sub_080894C8 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08089236: pop {r4, pc} .align 2, 0 diff --git a/asm/railtrack.s b/asm/railtrack.s index f54a95ab..ef39b49c 100644 --- a/asm/railtrack.s +++ b/asm/railtrack.s @@ -82,7 +82,7 @@ _080851EE: _0808521E: ldrb r1, [r5, #0x14] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 adds r0, #0x38 ldrb r0, [r0] @@ -143,7 +143,7 @@ _0808528A: strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0808543C ldr r0, _080852B0 @ =0x00000151 @@ -184,7 +184,7 @@ sub_080852B4: @ 0x080852B4 strb r0, [r5, #0x14] ldrb r1, [r5, #0x14] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_08085394 ldr r0, _08085304 @ =0x00000151 @@ -256,7 +256,7 @@ _08085354: strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0808543C ldr r0, _08085390 @ =0x00000151 diff --git a/asm/rem.s b/asm/rem.s index 7f16cffc..3319cf7f 100644 --- a/asm/rem.s +++ b/asm/rem.s @@ -116,7 +116,7 @@ _0806A420: strb r0, [r2, #0xd] adds r0, r2, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation b _0806A456 _0806A43C: adds r0, r2, #0 @@ -173,7 +173,7 @@ _0806A486: strb r0, [r2, #0xd] adds r0, r2, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation movs r0, #0x62 bl ClearLocalFlag b _0806A4CA @@ -193,7 +193,7 @@ _0806A4A8: strb r0, [r2, #0xe] adds r0, r2, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0806A4CA: pop {pc} @@ -232,7 +232,7 @@ _0806A4E0: strh r0, [r1] adds r0, r4, #0 movs r1, #0xa - bl UpdateSprite + bl InitializeAnimation b _0806A54C _0806A512: movs r0, #2 @@ -244,7 +244,7 @@ _0806A512: bl sub_0806EDC4 adds r1, r0, #0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0806A54C _0806A52C: adds r0, r4, #0 @@ -260,7 +260,7 @@ _0806A52C: bl sub_0806EDC4 adds r1, r0, #0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0806A54C: pop {r4, pc} .align 2, 0 @@ -276,7 +276,7 @@ sub_0806A550: @ 0x0806A550 strb r0, [r4, #0xd] adds r0, r4, #0 movs r1, #0xc - bl UpdateSprite + bl InitializeAnimation b _0806A5B0 _0806A568: adds r5, r4, #0 @@ -309,7 +309,7 @@ _0806A590: strb r1, [r4, #0xd] adds r0, r4, #0 movs r1, #0xd - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0806A914 _0806A5B0: @@ -340,7 +340,7 @@ sub_0806A5C0: @ 0x0806A5C0 ands r1, r0 adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0806A5E6: pop {r4, pc} @@ -355,7 +355,7 @@ sub_0806A5E8: @ 0x0806A5E8 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x10 - bl UpdateSprite + bl InitializeAnimation bl Random movs r1, #0x3f ands r0, r1 @@ -391,7 +391,7 @@ sub_0806A630: @ 0x0806A630 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x12 - bl UpdateSprite + bl InitializeAnimation _0806A646: ldr r0, _0806A670 @ =gUnk_02033280 ldr r0, [r0] @@ -455,7 +455,7 @@ _0806A6A0: strb r0, [r2] adds r0, r4, #0 movs r1, #0x13 - bl UpdateSprite + bl InitializeAnimation b _0806A82A _0806A6BE: ldr r0, _0806A6E0 @ =gUnk_02033280 @@ -664,7 +664,7 @@ sub_0806A830: @ 0x0806A830 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x14 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #2 bl sub_0805E3A0 @@ -712,7 +712,7 @@ sub_0806A890: @ 0x0806A890 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x15 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 movs r1, #2 bl sub_0805E3A0 @@ -876,7 +876,7 @@ sub_0806A9B0: @ 0x0806A9B0 strh r0, [r1] adds r0, r4, #0 movs r1, #9 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x62 bl SetLocalFlag pop {r4, pc} diff --git a/asm/rockChuchu.s b/asm/rockChuchu.s index f556d332..7ab0d557 100644 --- a/asm/rockChuchu.s +++ b/asm/rockChuchu.s @@ -11,7 +11,7 @@ sub_0802222C: @ 0x0802222C push {lr} ldr r1, _08022238 @ =gUnk_080CB948 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _08022238: .4byte gUnk_080CB948 @@ -133,7 +133,7 @@ _08022344: beq _08022356 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _08022356: ldr r1, _08022360 @ =gUnk_080CB948 adds r0, r4, #0 @@ -162,7 +162,7 @@ sub_08022368: @ 0x08022368 strb r0, [r4, #0x15] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 diff --git a/asm/rollobite.s b/asm/rollobite.s index dac7964a..faf065e9 100644 --- a/asm/rollobite.s +++ b/asm/rollobite.s @@ -11,7 +11,7 @@ sub_08020638: @ 0x08020638 push {lr} ldr r1, _08020644 @ =gUnk_080CA66C - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _08020644: .4byte gUnk_080CA66C @@ -61,7 +61,7 @@ sub_08020668: @ 0x08020668 ldrb r1, [r4, #0x14] adds r1, #8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080206A2: adds r0, r4, #0 adds r0, #0x41 @@ -84,7 +84,7 @@ _080206A2: ldrb r1, [r4, #0x14] adds r1, #0x10 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080206D0: ldrb r0, [r5] cmp r0, #0x93 @@ -160,7 +160,7 @@ sub_08020734: @ 0x08020734 ldrb r1, [r4, #0x14] adds r1, #0x10 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08020774 _08020764: ldr r0, _08020778 @ =gUnk_080CA6A4 @@ -247,7 +247,7 @@ sub_080207A8: @ 0x080207A8 strh r1, [r0, #0x24] ldrb r1, [r0, #0x14] adds r1, #0x10 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_080207F4 @@ -378,7 +378,7 @@ sub_080208B4: @ 0x080208B4 ldrb r1, [r2, #0x14] adds r1, #0x10 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _080208E6: ldrb r0, [r5, #0x14] strb r0, [r4] @@ -412,7 +412,7 @@ sub_08020904: @ 0x08020904 strb r1, [r0, #0x15] ldrb r1, [r0, #0x14] adds r1, #0x10 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_08020920 @@ -461,7 +461,7 @@ _08020950: ldrb r1, [r4, #0x14] adds r1, #0xc adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08020978: adds r0, r4, #0 bl sub_08078930 @@ -514,7 +514,7 @@ sub_080209A0: @ 0x080209A0 strb r0, [r4, #0x15] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080209F0 _080209E2: movs r0, #1 @@ -637,7 +637,7 @@ _08020ABA: strb r0, [r6, #0x14] ldrb r1, [r6, #0x14] adds r0, r6, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, r6, pc} .align 2, 0 _08020ACC: .4byte gUnk_080CA6D4 @@ -703,7 +703,7 @@ sub_08020AD0: @ 0x08020AD0 ldrb r1, [r4, #0x14] adds r1, #0x14 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _08020B64 @ =0x00004034 ldrb r2, [r6] adds r1, r5, #0 diff --git a/asm/rope.s b/asm/rope.s index 67179d34..ed685175 100644 --- a/asm/rope.s +++ b/asm/rope.s @@ -12,13 +12,13 @@ sub_08031374: @ 0x08031374 push {r4, lr} adds r4, r0, #0 ldr r1, _08031390 @ =gUnk_080CE448 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _08031390: .4byte gUnk_080CE448 @@ -212,7 +212,7 @@ _080314CC: orrs r0, r1 strb r0, [r4, #0x18] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip movs r0, #0x84 bl sub_08004488 _080314FA: @@ -275,7 +275,7 @@ _0803151E: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080315BA .align 2, 0 _08031574: .4byte gUnk_020000B0 @@ -297,7 +297,7 @@ _08031578: beq _080315A2 strb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080315A2: ldrb r0, [r4, #0xe] subs r0, #1 @@ -324,7 +324,7 @@ sub_080315BC: @ 0x080315BC strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation b _080315FC _080315D4: adds r0, r4, #0 @@ -374,7 +374,7 @@ sub_08031600: @ 0x08031600 beq _08031638 strb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08031638: pop {r4, pc} .align 2, 0 diff --git a/asm/ropeGolden.s b/asm/ropeGolden.s index 3bb80994..7a00bf00 100644 --- a/asm/ropeGolden.s +++ b/asm/ropeGolden.s @@ -38,7 +38,7 @@ _080381D0: adds r0, r5, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset _080381F2: pop {r4, r5, pc} .align 2, 0 @@ -150,7 +150,7 @@ _080382B8: .4byte gLinkEntity _080382BC: adds r0, r4, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r0, r4, #0 bl sub_080AEF88 cmp r0, #0 @@ -192,7 +192,7 @@ sub_08038304: @ 0x08038304 push {r4, r5, r6, lr} adds r4, r0, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r0, r4, #0 bl sub_080AEF88 cmp r0, #0 @@ -269,7 +269,7 @@ _08038398: ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080383AA: pop {r4, r5, r6, pc} @@ -296,7 +296,7 @@ sub_080383AC: @ 0x080383AC beq _080383DC strb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080383DC: pop {r4, pc} .align 2, 0 @@ -336,7 +336,7 @@ sub_080383E4: @ 0x080383E4 ldrb r1, [r4, #0x14] adds r1, #4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _0803842C: .4byte gLinkEntity diff --git a/asm/rupeeLike.s b/asm/rupeeLike.s index 814a4c7f..c08d83c7 100644 --- a/asm/rupeeLike.s +++ b/asm/rupeeLike.s @@ -44,7 +44,7 @@ _080292CE: adds r0, r5, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset b _080292FE .align 2, 0 _080292F4: .4byte gUnk_080CCC00 @@ -94,10 +94,10 @@ _08029338: bne _08029356 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _08029356: movs r1, #0 movs r0, #4 @@ -275,11 +275,11 @@ sub_08029474: @ 0x08029474 strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] ldrb r1, [r4, #0x14] adds r1, #4 - bl UpdateSprite + bl InitializeAnimation b _080294D2 .align 2, 0 _080294BC: .4byte gLinkEntity @@ -337,10 +337,10 @@ _0802951C: strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x54] movs r1, #7 - bl UpdateSprite + bl InitializeAnimation _08029538: pop {r4, pc} .align 2, 0 @@ -544,10 +544,10 @@ sub_0802969C: @ 0x0802969C strb r4, [r5, #0x14] adds r0, r5, #0 adds r1, r4, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r5, #0x54] adds r1, r4, #4 - bl UpdateSprite + bl InitializeAnimation _080296C4: pop {r4, r5, pc} .align 2, 0 @@ -683,7 +683,7 @@ sub_08029770: @ 0x08029770 str r0, [r4, #0x48] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation ldr r2, [r4, #0x54] ldrb r1, [r2, #0x18] movs r0, #4 @@ -694,7 +694,7 @@ sub_08029770: @ 0x08029770 strb r0, [r2, #0x18] ldr r0, [r4, #0x54] movs r1, #6 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_080A29BC _080297E8: @@ -747,7 +747,7 @@ sub_080297F0: @ 0x080297F0 strh r0, [r1] adds r0, r4, #0 movs r1, #0x54 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 _08029850: .4byte 0x00000143 diff --git a/asm/scissorsBeetle.s b/asm/scissorsBeetle.s index c68987e8..761e511c 100644 --- a/asm/scissorsBeetle.s +++ b/asm/scissorsBeetle.s @@ -12,13 +12,13 @@ sub_080388B4: @ 0x080388B4 push {r4, lr} adds r4, r0, #0 ldr r1, _080388D0 @ =gUnk_080CF600 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _080388D0: .4byte gUnk_080CF600 diff --git a/asm/sittingPerson.s b/asm/sittingPerson.s index 1e943866..8e6acead 100644 --- a/asm/sittingPerson.s +++ b/asm/sittingPerson.s @@ -101,7 +101,7 @@ sub_080637B8: @ 0x080637B8 adds r1, #4 _080637F2: adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0806F118 b _0806382E @@ -142,7 +142,7 @@ sub_08063830: @ 0x08063830 adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0806384C: pop {r4, pc} .align 2, 0 @@ -163,7 +163,7 @@ sub_08063850: @ 0x08063850 ldrb r2, [r0, #0x14] lsrs r2, r2, #1 adds r1, r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -386,7 +386,7 @@ sub_080639E8: @ 0x080639E8 strh r0, [r4, #0x32] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation ldrb r1, [r4, #0xa] adds r0, r4, #0 bl sub_08096208 diff --git a/asm/slime.s b/asm/slime.s index c8d9fc1f..472b54d6 100644 --- a/asm/slime.s +++ b/asm/slime.s @@ -5,293 +5,7 @@ .syntax unified .text - - - thumb_func_start sub_08044F50 -sub_08044F50: @ 0x08044F50 - push {r4, lr} - adds r4, r0, #0 - ldr r1, _08044F6C @ =gUnk_080D16A4 - bl sub_0800129E - movs r3, #0xc - rsbs r3, r3, #0 - adds r0, r4, #0 - movs r1, #0 - movs r2, #1 - bl sub_0804A9AC - pop {r4, pc} - .align 2, 0 -_08044F6C: .4byte gUnk_080D16A4 - - thumb_func_start sub_08044F70 -sub_08044F70: @ 0x08044F70 - push {lr} - ldr r2, _08044F84 @ =gUnk_080D16BC - ldrb r1, [r0, #0xc] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_08044F84: .4byte gUnk_080D16BC - - thumb_func_start sub_08044F88 -sub_08044F88: @ 0x08044F88 - push {r4, lr} - adds r4, r0, #0 - adds r0, #0x45 - ldrb r1, [r0] - cmp r1, #0 - beq _08044FA2 - adds r0, #0x3f - ldrb r0, [r0] - cmp r0, r1 - beq _08044FA2 - movs r0, #4 - strb r0, [r4, #0xc] - b _08044FAA -_08044FA2: - ldr r1, _08044FC0 @ =gUnk_080D16A4 - adds r0, r4, #0 - bl sub_0804AA30 -_08044FAA: - adds r0, r4, #0 - adds r0, #0x43 - ldrb r0, [r0] - cmp r0, #0 - beq _08044FBC - adds r0, r4, #0 - movs r1, #0x1c - bl sub_0804A9FC -_08044FBC: - pop {r4, pc} - .align 2, 0 -_08044FC0: .4byte gUnk_080D16A4 - - thumb_func_start nullsub_171 -nullsub_171: @ 0x08044FC4 - bx lr - .align 2, 0 - - thumb_func_start sub_08044FC8 -sub_08044FC8: @ 0x08044FC8 - push {r4, lr} - adds r4, r0, #0 - movs r2, #1 - movs r0, #1 - strb r0, [r4, #0xc] - ldrb r1, [r4, #0x18] - subs r0, #5 - ands r0, r1 - orrs r0, r2 - strb r0, [r4, #0x18] - movs r0, #0x80 - strh r0, [r4, #0x24] - adds r0, r4, #0 - bl sub_0804A720 - adds r0, r4, #0 - movs r1, #0 - bl UpdateSprite - adds r0, r4, #0 - bl sub_08044FF8 - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_08044FF8 -sub_08044FF8: @ 0x08044FF8 - push {r4, lr} - adds r4, r0, #0 - movs r0, #2 - strb r0, [r4, #0xc] - bl Random - movs r1, #0x1f - ands r0, r1 - adds r0, #0x1e - strb r0, [r4, #0xe] - adds r0, r4, #0 - adds r0, #0x45 - ldrb r0, [r0] - adds r4, #0x84 - strb r0, [r4] - pop {r4, pc} - - thumb_func_start sub_08045018 -sub_08045018: @ 0x08045018 - push {r4, r5, lr} - adds r5, r0, #0 - bl sub_08004274 - ldrb r0, [r5, #0xe] - subs r0, #1 - strb r0, [r5, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _08045086 - movs r4, #3 - strb r4, [r5, #0xc] - movs r0, #1 - strb r0, [r5, #0xe] - movs r1, #0x24 - ldrsh r0, [r5, r1] - cmp r0, #0 - ble _0804504C - movs r0, #0x80 - lsls r0, r0, #5 - movs r2, #0x24 - ldrsh r1, [r5, r2] - bl sub_0806FA04 - lsrs r0, r0, #8 - strb r0, [r5, #0xe] -_0804504C: - adds r0, r5, #0 - bl sub_08049FA0 - cmp r0, #0 - bne _0804507C - bl Random - ands r0, r4 - cmp r0, #0 - beq _0804507C - adds r0, r5, #0 - bl sub_08049EE4 - adds r4, r0, #0 - bl Random - movs r1, #8 - ands r0, r1 - adds r0, #0xfc - adds r4, r4, r0 - movs r0, #0x18 - ands r4, r0 - strb r4, [r5, #0x15] - b _08045086 -_0804507C: - bl Random - movs r1, #0x18 - ands r0, r1 - strb r0, [r5, #0x15] -_08045086: - pop {r4, r5, pc} - - thumb_func_start sub_08045088 -sub_08045088: @ 0x08045088 - push {r4, lr} - adds r4, r0, #0 - bl sub_080AEF88 - adds r0, r4, #0 - bl sub_08004274 - ldrb r0, [r4, #0xe] - subs r0, #1 - strb r0, [r4, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _080450A6 - movs r0, #1 - strb r0, [r4, #0xc] -_080450A6: - pop {r4, pc} - - thumb_func_start sub_080450A8 -sub_080450A8: @ 0x080450A8 - push {r4, r5, r6, r7, lr} - mov r7, sb - mov r6, r8 - push {r6, r7} - sub sp, #0x10 - mov r8, r0 - ldr r1, _0804516C @ =gUnk_080D16D0 - ldrb r0, [r0, #0xa] - adds r0, r0, r1 - ldrb r7, [r0] - movs r0, #0x48 - subs r0, r0, r7 - ldr r1, _08045170 @ =gUnk_03003DBC - ldrb r1, [r1] - cmp r0, r1 - ble _08045160 - cmp r7, #0 - beq _080450E2 - mov r4, sp - adds r5, r7, #0 -_080450D0: - mov r0, r8 - ldrb r1, [r0, #0xa] - movs r0, #0x57 - bl CreateEnemy - stm r4!, {r0} - subs r5, #1 - cmp r5, #0 - bne _080450D0 -_080450E2: - ldr r2, _08045174 @ =gUnk_080D16D4 - mov sb, r2 - movs r5, #0 - cmp r5, r7 - bge _08045142 -_080450EC: - lsls r0, r5, #2 - add r0, sp - ldr r6, [r0] - adds r4, r5, #1 - adds r0, r4, #0 - adds r1, r7, #0 - bl __modsi3 - lsls r0, r0, #2 - add r0, sp - ldr r0, [r0] - str r0, [r6, #0x54] - adds r0, r5, r7 - subs r0, #1 - adds r1, r7, #0 - bl __modsi3 - lsls r0, r0, #2 - add r0, sp - ldr r0, [r0] - str r0, [r6, #0x50] - movs r1, #0 - movs r0, #1 - strb r0, [r6, #0xb] - strh r1, [r6, #0x36] - adds r1, r6, #0 - adds r1, #0x3d - movs r0, #0xf0 - strb r0, [r1] - mov r0, sb - movs r2, #0 - ldrsb r2, [r0, r2] - movs r3, #1 - ldrsb r3, [r0, r3] - mov r0, r8 - adds r1, r6, #0 - bl sub_08045178 - movs r2, #2 - add sb, r2 - adds r5, r4, #0 - cmp r5, r7 - blt _080450EC -_08045142: - mov r0, r8 - movs r1, #2 - movs r2, #0 - bl CreateFx - adds r6, r0, #0 - cmp r6, #0 - beq _0804515A - mov r0, r8 - adds r1, r6, #0 - bl CopyPosition -_0804515A: - mov r0, r8 - bl DeleteEntity -_08045160: - add sp, #0x10 - pop {r3, r4} - mov r8, r3 - mov sb, r4 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_0804516C: .4byte gUnk_080D16D0 -_08045170: .4byte gUnk_03003DBC -_08045174: .4byte gUnk_080D16D4 - + thumb_func_start sub_08045178 sub_08045178: @ 0x08045178 push {r4, r5, r6, lr} diff --git a/asm/sluggula.s b/asm/sluggula.s index 7555fc20..31fcc5d7 100644 --- a/asm/sluggula.s +++ b/asm/sluggula.s @@ -16,7 +16,7 @@ sub_08023B94: @ 0x08023B94 bne _08023BAC ldr r1, _08023BA8 @ =gUnk_080CBDBC adds r0, r5, #0 - bl sub_0800129E + bl EnemyFunctionHandler b _08023BEC .align 2, 0 _08023BA8: .4byte gUnk_080CBDBC @@ -56,7 +56,7 @@ _08023BEC: adds r0, r5, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset b _08023C06 .align 2, 0 _08023BFC: .4byte gUnk_080CBDD4 @@ -134,7 +134,7 @@ sub_08023C5C: @ 0x08023C5C strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_08023C8C @@ -173,7 +173,7 @@ _08023CBC: strb r0, [r4, #0x14] ldrb r1, [r4, #0x14] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08023CDC: pop {r4, pc} .align 2, 0 @@ -232,7 +232,7 @@ _08023D20: strb r1, [r4, #0x1b] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _08023E0A .align 2, 0 _08023D44: .4byte 0x0000FF80 @@ -269,7 +269,7 @@ _08023D6E: bl sub_08004488 adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _08023E0A .align 2, 0 _08023D90: .4byte 0x0000012D @@ -291,7 +291,7 @@ _08023D94: movs r0, #0x84 bl sub_08004488 adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip b _08023E0A _08023DC0: adds r0, r4, #0 @@ -352,7 +352,7 @@ sub_08023E10: @ 0x08023E10 strb r0, [r2] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation _08023E36: adds r0, r4, #0 bl sub_08004274 diff --git a/asm/smallIceBlock.s b/asm/smallIceBlock.s index fe5e4c28..1f1a97c2 100644 --- a/asm/smallIceBlock.s +++ b/asm/smallIceBlock.s @@ -79,7 +79,7 @@ _080991EC: bl sub_08099468 ldrb r1, [r4, #0xa] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x84 movs r1, #3 movs r2, #0 @@ -687,7 +687,7 @@ _080996BC: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _080996CE: ldr r0, [r4, #0x50] ldrb r0, [r0, #0xc] diff --git a/asm/smallPesto.s b/asm/smallPesto.s index 20b05a18..a32f79a5 100644 --- a/asm/smallPesto.s +++ b/asm/smallPesto.s @@ -226,7 +226,7 @@ sub_080317E0: @ 0x080317E0 lsrs r1, r1, #2 strb r1, [r0, #0x14] ldrb r1, [r0, #0x14] - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/smoke.s b/asm/smoke.s index 5ce1db70..a7403879 100644 --- a/asm/smoke.s +++ b/asm/smoke.s @@ -118,7 +118,7 @@ sub_0808A484: @ 0x0808A484 orrs r2, r4 strb r2, [r0, #0x1b] movs r1, #0x28 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 diff --git a/asm/spark.s b/asm/spark.s index cfbe1bc2..080da51b 100644 --- a/asm/spark.s +++ b/asm/spark.s @@ -99,7 +99,7 @@ sub_0802B33C: @ 0x0802B33C strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 diff --git a/asm/spearMoblin.s b/asm/spearMoblin.s index 552187d5..d3dc639e 100644 --- a/asm/spearMoblin.s +++ b/asm/spearMoblin.s @@ -12,13 +12,13 @@ sub_0802823C: @ 0x0802823C push {r4, lr} adds r4, r0, #0 ldr r1, _08028268 @ =gUnk_080CC790 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x20 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset ldr r1, [r4, #0x54] cmp r1, #0 beq _08028266 @@ -791,7 +791,7 @@ _0802881C: _0802881E: adds r0, r3, #0 adds r1, r2, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_08028828 diff --git a/asm/specialFx.s b/asm/specialFx.s index ff7a93d7..d0811f93 100644 --- a/asm/specialFx.s +++ b/asm/specialFx.s @@ -79,7 +79,7 @@ _08084538: _0808454E: ldrb r1, [r5, #0xa] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r5, #0xa] lsls r0, r0, #2 ldr r1, _080845B4 @ =gUnk_0811F960 diff --git a/asm/spikedBeetle.s b/asm/spikedBeetle.s index 7658ca18..6b2ec913 100644 --- a/asm/spikedBeetle.s +++ b/asm/spikedBeetle.s @@ -12,13 +12,13 @@ sub_0802B5F0: @ 0x0802B5F0 push {r4, lr} adds r4, r0, #0 ldr r1, _0802B60C @ =gUnk_080CD2D8 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _0802B60C: .4byte gUnk_080CD2D8 @@ -119,7 +119,7 @@ _0802B6CC: strb r0, [r1] adds r0, r4, #0 movs r1, #9 - bl UpdateSprite + bl InitializeAnimation _0802B706: adds r0, r4, #0 adds r0, #0x43 @@ -181,7 +181,7 @@ sub_0802B744: @ 0x0802B744 strb r1, [r4, #0x15] adds r0, r4, #0 movs r1, #8 - bl UpdateSprite + bl InitializeAnimation b _0802B7A2 _0802B780: ldrb r0, [r4, #0xe] @@ -243,7 +243,7 @@ sub_0802B7A4: @ 0x0802B7A4 strb r0, [r4, #0x14] adds r0, r4, #0 adds r1, r2, #0 - bl UpdateSprite + bl InitializeAnimation _0802B7F4: pop {r4, pc} .align 2, 0 @@ -340,7 +340,7 @@ sub_0802B880: @ 0x0802B880 strb r0, [r2, #0x14] ldrb r1, [r2, #0x14] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _0802B8AC: pop {pc} .align 2, 0 @@ -417,7 +417,7 @@ _0802B91C: strb r0, [r1] ldrb r1, [r3, #0x14] adds r0, r3, #0 - bl UpdateSprite + bl InitializeAnimation ldr r0, _0802B944 @ =0x0000012B bl sub_08004488 _0802B940: @@ -495,6 +495,6 @@ sub_0802B9B4: @ 0x0802B9B4 strb r1, [r0, #0x14] ldrb r1, [r0, #0x14] adds r1, #4 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/spinyBeetle.s b/asm/spinyBeetle.s index 58b11b85..945c6b0a 100644 --- a/asm/spinyBeetle.s +++ b/asm/spinyBeetle.s @@ -12,13 +12,13 @@ sub_0803379C: @ 0x0803379C push {r4, lr} adds r4, r0, #0 ldr r1, _080337B8 @ =gUnk_080CEBEC - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _080337B8: .4byte gUnk_080CEBEC @@ -105,7 +105,7 @@ _0803381A: bl sub_08033D78 adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _08033864: pop {r4, r5, pc} .align 2, 0 @@ -221,7 +221,7 @@ _08033928: _08033940: adds r0, r6, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, r6, pc} .align 2, 0 _0803394C: .4byte 0xFFF00000 @@ -374,7 +374,7 @@ _08033A2C: bl sub_0807B9B8 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _08033A72: pop {r4, r5, pc} .align 2, 0 @@ -417,7 +417,7 @@ _08033A90: strb r0, [r2] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation _08033AC8: pop {r4, pc} .align 2, 0 @@ -473,7 +473,7 @@ _08033AF8: str r0, [r1] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _08033B42 .align 2, 0 _08033B38: .4byte 0xFFF00000 @@ -646,7 +646,7 @@ _08033C68: bl SetTile adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08033C82: add sp, #0xc pop {r3, r4, r5} @@ -662,7 +662,7 @@ sub_08033C94: @ 0x08033C94 push {r4, lr} adds r4, r0, #0 movs r1, #3 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r1, r4, #0 adds r1, #0x79 ldrb r0, [r1] @@ -928,7 +928,7 @@ sub_08033E1C: @ 0x08033E1C str r2, [r4, #0x54] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation movs r2, #0xc rsbs r2, r2, #0 adds r0, r4, #0 diff --git a/asm/spinyChuchu.s b/asm/spinyChuchu.s index d30dafc6..d19d86a0 100644 --- a/asm/spinyChuchu.s +++ b/asm/spinyChuchu.s @@ -12,13 +12,13 @@ sub_08022414: @ 0x08022414 push {r4, lr} adds r4, r0, #0 ldr r1, _08022430 @ =gUnk_080CBA28 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _08022430: .4byte gUnk_080CBA28 @@ -104,7 +104,7 @@ _080224E8: str r0, [r4, #0x48] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _08022540 .align 2, 0 _08022504: .4byte gUnk_080FD468 @@ -118,7 +118,7 @@ _08022508: strb r0, [r6] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _08022540 _08022522: adds r0, r4, #0 @@ -133,7 +133,7 @@ _08022522: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08022540: adds r0, r4, #0 adds r0, #0x80 @@ -151,7 +151,7 @@ _08022540: strb r0, [r6] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _0802258E _08022566: ldrb r0, [r4, #0xc] @@ -161,7 +161,7 @@ _08022566: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xca lsls r0, r0, #1 bl sub_08004488 @@ -169,7 +169,7 @@ _08022566: _08022582: adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation adds r7, r4, #0 adds r7, #0x80 _0802258E: @@ -248,7 +248,7 @@ sub_080225EC: @ 0x080225EC strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0802264C _0802261A: movs r0, #1 @@ -274,7 +274,7 @@ _0802261A: strh r0, [r4, #0x36] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation _0802264C: pop {r4, pc} .align 2, 0 @@ -309,7 +309,7 @@ _0802266E: bl PlaySFX adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0802268C: movs r1, #0xc0 lsls r1, r1, #5 @@ -327,11 +327,11 @@ _0802268C: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x7d bl sub_08004488 adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080226BE: adds r0, r4, #0 bl sub_08004274 @@ -349,7 +349,7 @@ _080226BE: strb r0, [r1] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _080226E4: pop {r4, pc} .align 2, 0 @@ -375,7 +375,7 @@ sub_080226EC: @ 0x080226EC strb r0, [r1] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0802277C _0802271A: adds r0, r4, #0 @@ -401,7 +401,7 @@ _0802271A: strb r0, [r1] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation b _0802277C .align 2, 0 _08022754: .4byte gUnk_020000B0 @@ -443,7 +443,7 @@ sub_08022780: @ 0x08022780 strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation movs r0, #0xca lsls r0, r0, #1 bl sub_08004488 @@ -501,7 +501,7 @@ _080227EE: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08022812: pop {r4, pc} .align 2, 0 @@ -530,7 +530,7 @@ sub_0802281C: @ 0x0802281C strh r0, [r4, #0x24] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0804AA1C _08022852: @@ -564,7 +564,7 @@ sub_08022854: @ 0x08022854 strb r0, [r1] adds r0, r4, #0 movs r1, #5 - bl UpdateSprite + bl InitializeAnimation movs r0, #0x7d bl sub_08004488 _08022898: @@ -593,7 +593,7 @@ sub_0802289C: @ 0x0802289C strb r0, [r1] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _080228CA: pop {r4, pc} diff --git a/asm/stalfos.s b/asm/stalfos.s index 03ccf219..5b18c8a0 100644 --- a/asm/stalfos.s +++ b/asm/stalfos.s @@ -12,13 +12,13 @@ sub_080392AC: @ 0x080392AC push {r4, lr} adds r4, r0, #0 ldr r1, _080392C8 @ =gUnk_080CF8A4 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x12 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _080392C8: .4byte gUnk_080CF8A4 @@ -80,7 +80,7 @@ _0803930C: b _0803933A _08039334: adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0803933A: pop {r4, pc} diff --git a/asm/stockwell.s b/asm/stockwell.s index 648300e9..ad2b1fa7 100644 --- a/asm/stockwell.s +++ b/asm/stockwell.s @@ -46,7 +46,7 @@ sub_08065080: @ 0x08065080 bl sub_0805E3A0 adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08078778 ldr r3, _080650C4 @ =gUnk_0810FDA0 @@ -111,7 +111,7 @@ _08065100: strb r0, [r5, #0xc] adds r0, r5, #0 movs r1, #7 - bl UpdateSprite + bl InitializeAnimation ldrb r0, [r6, #6] cmp r0, #0 bne _0806513C @@ -160,7 +160,7 @@ _0806517C: adds r1, r1, r4 ldrb r1, [r1] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _080651A6 .align 2, 0 _0806519C: .4byte gUnk_0810FDB8 @@ -190,7 +190,7 @@ sub_080651AC: @ 0x080651AC strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _080651D2: pop {r4, pc} .align 2, 0 @@ -228,7 +228,7 @@ sub_080651F8: @ 0x080651F8 strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation movs r2, #0x18 rsbs r2, r2, #0 adds r0, r4, #0 @@ -406,7 +406,7 @@ sub_08065338: @ 0x08065338 str r0, [r1, #0x68] adds r0, r2, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation _0806535C: pop {pc} .align 2, 0 diff --git a/asm/sturgeon.s b/asm/sturgeon.s index fa0783c2..f70f9c3a 100644 --- a/asm/sturgeon.s +++ b/asm/sturgeon.s @@ -102,7 +102,7 @@ sub_08064B44: @ 0x08064B44 beq _08064B7E adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation ldr r1, _08064B84 @ =gUnk_0810FA5A adds r0, r4, #0 movs r2, #0 @@ -157,7 +157,7 @@ _08064BA8: movs r1, #0x7f ands r1, r2 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08064BC6: adds r0, r4, #0 bl sub_08004274 @@ -177,7 +177,7 @@ _08064BE0: ldrb r0, [r0] strb r0, [r4, #0xf] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation movs r0, #0 strb r0, [r5] adds r0, r4, #0 @@ -198,7 +198,7 @@ _08064C0C: ldrb r0, [r0] strb r0, [r4, #0xf] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r1, r4, #0 adds r1, #0x39 movs r0, #0 @@ -223,7 +223,7 @@ sub_08064C2C: @ 0x08064C2C strb r0, [r2, #0xc] ldrb r1, [r2, #0xf] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _08064C48: pop {pc} .align 2, 0 @@ -240,7 +240,7 @@ sub_08064C50: @ 0x08064C50 strb r0, [r4, #0xc] ldrb r1, [r4, #0xf] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08064C68: pop {r4, pc} .align 2, 0 @@ -364,7 +364,7 @@ sub_08064D18: @ 0x08064D18 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _08064D56 .align 2, 0 _08064D4C: .4byte gUnk_0810FA38 diff --git a/asm/sub_08019410.s b/asm/sub_08019410.s index ca62e427..b5798a5e 100644 --- a/asm/sub_08019410.s +++ b/asm/sub_08019410.s @@ -17,7 +17,7 @@ sub_08019410: @ 0x08019410 adds r0, #0x58 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0801942E _08019428: adds r0, r4, #0 diff --git a/asm/sub_080A2838.s b/asm/sub_080A2838.s index d6c6f06c..8fdcf25b 100644 --- a/asm/sub_080A2838.s +++ b/asm/sub_080A2838.s @@ -20,7 +20,7 @@ sub_080A2838: @ 0x080A2838 cmp r0, #2 bne _080A2856 adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _080A2856: pop {r4, pc} .align 2, 0 diff --git a/asm/swordsmanNewsletter.s b/asm/swordsmanNewsletter.s index 1cec84de..67cb68c8 100644 --- a/asm/swordsmanNewsletter.s +++ b/asm/swordsmanNewsletter.s @@ -29,7 +29,7 @@ sub_080933D8: @ 0x080933D8 ldrb r0, [r4, #0xa] strb r0, [r4, #0x1e] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip ldr r0, _080933F8 @ =gUnk_081228A8 str r0, [r4, #0x48] adds r0, r4, #0 diff --git a/asm/syrup.s b/asm/syrup.s index d2555065..d405f903 100644 --- a/asm/syrup.s +++ b/asm/syrup.s @@ -47,7 +47,7 @@ _0806A206: bl sub_0807DD50 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0806A22A: pop {r4, pc} .align 2, 0 diff --git a/asm/takkuri.s b/asm/takkuri.s index 07bc3b31..c89c7216 100644 --- a/asm/takkuri.s +++ b/asm/takkuri.s @@ -213,7 +213,7 @@ sub_0803BCA4: @ 0x0803BCA4 adds r1, #0x7a strh r0, [r1] adds r0, r6, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r6, #0 bl sub_0803BF2C pop {r4, r5, r6, pc} @@ -459,7 +459,7 @@ sub_0803BE7C: @ 0x0803BE7C movs r0, #3 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 bl sub_0803BF2C _0803BEE6: @@ -514,7 +514,7 @@ sub_0803BF2C: @ 0x0803BF2C adds r2, #0x81 ldrb r2, [r2] adds r1, r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -698,7 +698,7 @@ _0803C07E: beq _0803C09C adds r1, r2, #4 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0803C09C: adds r0, r5, #0 bl sub_0803BF48 diff --git a/asm/talon.s b/asm/talon.s index a7362fe4..de26494a 100644 --- a/asm/talon.s +++ b/asm/talon.s @@ -49,7 +49,7 @@ sub_08065570: @ 0x08065570 beq _08065596 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_08078778 movs r0, #1 @@ -100,7 +100,7 @@ _080655D6: cmp r0, r1 beq _080655E4 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080655EA _080655E4: adds r0, r4, #0 @@ -387,7 +387,7 @@ sub_080657DC: @ 0x080657DC strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _0806581A .align 2, 0 _08065810: .4byte gUnk_0810FEB0 diff --git a/asm/teachers.s b/asm/teachers.s index a7db4037..73a88f4b 100644 --- a/asm/teachers.s +++ b/asm/teachers.s @@ -79,7 +79,7 @@ _0806C604: ands r1, r2 adds r1, r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 bl sub_0806F118 b _0806C670 @@ -101,7 +101,7 @@ _0806C656: adds r0, #0x69 ldrb r1, [r0] adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0806C670: pop {r4, r5, pc} .align 2, 0 @@ -229,7 +229,7 @@ sub_0806C738: @ 0x0806C738 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0806C77E .align 2, 0 _0806C774: .4byte gUnk_08113910 diff --git a/asm/tektite.s b/asm/tektite.s index f3266fce..ecf879d1 100644 --- a/asm/tektite.s +++ b/asm/tektite.s @@ -12,13 +12,13 @@ sub_0802F118: @ 0x0802F118 push {r4, lr} adds r4, r0, #0 ldr r1, _0802F134 @ =gUnk_080CDED0 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _0802F134: .4byte gUnk_080CDED0 @@ -107,7 +107,7 @@ _0802F1CE: str r0, [r4, #0x20] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0802F1E8 .align 2, 0 _0802F1DC: .4byte gUnk_080CDEF8 @@ -197,7 +197,7 @@ _0802F270: strh r1, [r0] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} .align 2, 0 _0802F280: .4byte gUnk_080CDEF8 @@ -211,7 +211,7 @@ sub_0802F284: @ 0x0802F284 bls _0802F298 adds r0, r4, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation b _0802F29E _0802F298: adds r0, r4, #0 @@ -249,7 +249,7 @@ _0802F2AA: bl sub_0802F45C adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0802F2FE _0802F2E4: adds r0, r4, #0 @@ -263,7 +263,7 @@ _0802F2E4: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0802F2FE: pop {r4, pc} @@ -313,7 +313,7 @@ _0802F350: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation b _0802F3F0 .align 2, 0 _0802F360: .4byte gUnk_080CDEF8 @@ -363,7 +363,7 @@ _0802F3AC: bge _0802F3C6 adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation movs r0, #1 strb r0, [r4, #0xd] _0802F3C6: @@ -435,7 +435,7 @@ sub_0802F3F4: @ 0x0802F3F4 bl sub_0802F45C adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0802F45A _0802F44C: movs r1, #0 @@ -443,7 +443,7 @@ _0802F44C: strb r0, [r4, #0xc] strb r1, [r2] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802F45A: pop {r4, pc} diff --git a/asm/tektiteGolden.s b/asm/tektiteGolden.s index 63b0d36a..ffc33e17 100644 --- a/asm/tektiteGolden.s +++ b/asm/tektiteGolden.s @@ -12,13 +12,13 @@ sub_08037EC8: @ 0x08037EC8 push {r4, lr} adds r4, r0, #0 ldr r1, _08037EE4 @ =gUnk_080CF4A0 - bl sub_0800129E + bl EnemyFunctionHandler movs r3, #0x10 rsbs r3, r3, #0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, pc} .align 2, 0 _08037EE4: .4byte gUnk_080CF4A0 @@ -76,7 +76,7 @@ _08037F46: str r0, [r4, #0x20] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08037F50: pop {r4, pc} .align 2, 0 @@ -150,7 +150,7 @@ _08037FB2: strb r4, [r0] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} .align 2, 0 @@ -159,7 +159,7 @@ sub_08037FE0: @ 0x08037FE0 push {r4, lr} adds r4, r0, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation ldrb r0, [r4, #0xe] adds r2, r0, #0 cmp r2, #0 @@ -190,7 +190,7 @@ _08037FF8: bl sub_08038168 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _08038046 _0803802C: adds r0, r4, #0 @@ -204,7 +204,7 @@ _0803802C: strb r0, [r4, #0xf] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08038046: pop {r4, pc} @@ -213,7 +213,7 @@ sub_08038048: @ 0x08038048 push {r4, r5, r6, lr} adds r4, r0, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r0, r4, #0 bl sub_080AEF88 movs r0, #0x36 @@ -235,7 +235,7 @@ sub_08038048: @ 0x08038048 movs r0, #0x14 strb r0, [r4, #0xe] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0803810C _08038088: ldrh r0, [r4, #0x2a] @@ -279,7 +279,7 @@ _080380C8: bge _080380E2 adds r0, r4, #0 movs r1, #4 - bl UpdateSprite + bl InitializeAnimation movs r0, #1 strb r0, [r4, #0xd] _080380E2: @@ -315,7 +315,7 @@ sub_08038110: @ 0x08038110 push {r4, lr} adds r4, r0, #0 movs r1, #2 - bl UpdateSpriteAnimation + bl InitializeAnimationAnimation adds r0, r4, #0 adds r0, #0x5a ldrb r1, [r0] @@ -339,7 +339,7 @@ sub_08038110: @ 0x08038110 bl sub_08038168 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _08038164 _08038150: movs r0, #0 @@ -350,7 +350,7 @@ _08038150: strb r0, [r4, #0xe] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _08038164: pop {r4, pc} .align 2, 0 diff --git a/asm/townMinish.s b/asm/townMinish.s index 98abbecf..cfac1130 100644 --- a/asm/townMinish.s +++ b/asm/townMinish.s @@ -48,7 +48,7 @@ sub_0806ABFC: @ 0x0806ABFC beq _0806AC36 adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation movs r1, #0 movs r0, #1 strb r0, [r4, #0xc] @@ -132,7 +132,7 @@ _0806AC9A: movs r0, #2 eors r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0806ACBA: adds r0, r5, #0 bl sub_080042B8 @@ -230,7 +230,7 @@ _0806AD44: adds r1, r0, #0 adds r1, #8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 adds r0, #0x84 ldr r1, [r0] @@ -271,7 +271,7 @@ _0806ADB8: adds r1, #4 _0806ADCE: adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0806ADEA .align 2, 0 _0806ADD8: .4byte gTextBox @@ -489,7 +489,7 @@ sub_0806AF60: @ 0x0806AF60 lsrs r2, r2, #1 ldr r1, [r1, #4] adds r1, r1, r2 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_0806AF70 @@ -791,7 +791,7 @@ sub_0806B184: @ 0x0806B184 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _0806B1CA .align 2, 0 _0806B1C0: .4byte gUnk_08112674 diff --git a/asm/townsperson.s b/asm/townsperson.s index 7f61ff10..edfe63e9 100644 --- a/asm/townsperson.s +++ b/asm/townsperson.s @@ -167,7 +167,7 @@ sub_08061CB4: @ 0x08061CB4 cmp r0, r1 beq _08061CC8 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _08061CCE _08061CC8: adds r0, r4, #0 @@ -281,7 +281,7 @@ sub_08061D64: @ 0x08061D64 ands r1, r2 adds r1, r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation b _08061E18 .align 2, 0 _08061DAC: .4byte gLinkEntity @@ -331,7 +331,7 @@ _08061DD4: ands r1, r2 adds r1, r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _08061E18: pop {r4, r5, pc} .align 2, 0 @@ -355,7 +355,7 @@ sub_08061E24: @ 0x08061E24 adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08061E48: pop {r4, pc} .align 2, 0 @@ -374,7 +374,7 @@ sub_08061E50: @ 0x08061E50 adds r0, #0x69 ldrb r1, [r0] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08061E6C: pop {r4, pc} .align 2, 0 @@ -471,7 +471,7 @@ _08061F04: cmp r1, r0 beq _08061F1A adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _08061F1A: adds r0, r4, #0 bl sub_080AEF88 @@ -583,7 +583,7 @@ sub_08061FD8: @ 0x08061FD8 push {lr} ldrb r1, [r0, #0x14] lsrs r1, r1, #1 - bl UpdateSprite + bl InitializeAnimation pop {pc} thumb_func_start sub_08061FE4 @@ -592,7 +592,7 @@ sub_08061FE4: @ 0x08061FE4 ldrb r1, [r0, #0x14] lsrs r1, r1, #1 adds r1, #4 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 diff --git a/asm/treeHidingPortal.s b/asm/treeHidingPortal.s index ef03e6d2..2eee8933 100644 --- a/asm/treeHidingPortal.s +++ b/asm/treeHidingPortal.s @@ -40,7 +40,7 @@ _0809E856: movs r0, #2 strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {r4, pc} .align 2, 0 @@ -162,7 +162,7 @@ _0809E92A: movs r0, #2 strb r0, [r1] adds r0, r2, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip _0809E958: adds r4, #4 movs r1, #0 diff --git a/asm/vaatiArm.s b/asm/vaatiArm.s index 00f029ff..c83d826b 100644 --- a/asm/vaatiArm.s +++ b/asm/vaatiArm.s @@ -1053,7 +1053,7 @@ _08042CC8: adds r0, r2, #0 movs r1, #0x12 str r3, [sp] - bl UpdateSprite + bl InitializeAnimation ldr r3, [sp] _08042D04: adds r3, #0x10 @@ -1741,7 +1741,7 @@ _08043206: ldr r0, [r4, #0x64] ldr r0, [r0, #0xc] movs r1, #0x11 - bl UpdateSprite + bl InitializeAnimation _08043230: adds r6, #0x10 adds r5, #1 @@ -2321,7 +2321,7 @@ _08043660: adds r0, r5, r0 ldrb r1, [r0] adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _0804366C: adds r6, #0x10 adds r5, #1 @@ -3244,7 +3244,7 @@ sub_08043D08: @ 0x08043D08 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #0x13 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0804AA1C adds r0, r4, #0 @@ -3692,14 +3692,14 @@ sub_08044078: @ 0x08044078 _080440AC: adds r0, r4, #0 movs r1, #0x12 - bl UpdateSprite + bl InitializeAnimation b _080440C4 .align 2, 0 _080440B8: .4byte gUnk_030010A0 _080440BC: adds r0, r4, #0 movs r1, #0x11 - bl UpdateSprite + bl InitializeAnimation _080440C4: adds r0, r4, #0 bl sub_08004274 @@ -3731,14 +3731,14 @@ sub_080440CC: @ 0x080440CC bne _08044108 adds r0, r4, #0 movs r1, #0x13 - bl UpdateSprite + bl InitializeAnimation b _08044110 .align 2, 0 _08044104: .4byte gUnk_030010A0 _08044108: adds r0, r4, #0 movs r1, #0x11 - bl UpdateSprite + bl InitializeAnimation _08044110: adds r0, r4, #0 bl sub_08004274 diff --git a/asm/vaatiEyesMacro.s b/asm/vaatiEyesMacro.s index c93f9180..9ef5c941 100644 --- a/asm/vaatiEyesMacro.s +++ b/asm/vaatiEyesMacro.s @@ -23,7 +23,7 @@ sub_0802EC6C: @ 0x0802EC6C adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, r5, pc} .align 2, 0 _0802EC94: .4byte gUnk_080CDE34 @@ -212,7 +212,7 @@ _0802EDE0: bl sub_0802EFB8 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0802EF58 _0802EE0A: @@ -276,7 +276,7 @@ sub_0802EE38: @ 0x0802EE38 strb r0, [r5, #0x15] adds r0, r5, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0802EE82: pop {r4, r5, pc} .align 2, 0 @@ -411,7 +411,7 @@ _0802EF5E: strb r0, [r1] str r6, [r4, #0x50] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r6, #0 adds r1, r4, #0 bl CopyPosition diff --git a/asm/vaatiProjectile.s b/asm/vaatiProjectile.s index 39fafd0e..572dfff3 100644 --- a/asm/vaatiProjectile.s +++ b/asm/vaatiProjectile.s @@ -191,7 +191,7 @@ _0803E1D8: _0803E1E8: adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0803E250 .align 2, 0 _0803E1F4: .4byte 0x0000FF80 @@ -237,7 +237,7 @@ _0803E1F8: bl PositionRelative adds r0, r5, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0803E250: pop {r4, r5, pc} .align 2, 0 @@ -260,7 +260,7 @@ sub_0803E258: @ 0x0803E258 strb r0, [r4, #0xe] ldr r0, [r4, #0x54] movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _0803E29C _0803E280: ldr r0, _0803E2A4 @ =gUnk_020000B0 @@ -334,7 +334,7 @@ sub_0803E2D0: @ 0x0803E2D0 strb r0, [r4, #0xe] ldr r0, [r4, #0x54] movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0803E30C: adds r0, r4, #0 bl sub_08004274 @@ -489,7 +489,7 @@ sub_0803E3FC: @ 0x0803E3FC strb r0, [r4, #0xe] ldr r0, [r4, #0x54] movs r1, #2 - bl UpdateSprite + bl InitializeAnimation _0803E42E: adds r0, r4, #0 bl sub_0803E2A8 diff --git a/asm/vaatiReborn.s b/asm/vaatiReborn.s index faf1766a..ea886b00 100644 --- a/asm/vaatiReborn.s +++ b/asm/vaatiReborn.s @@ -174,7 +174,7 @@ _0806B7A6: _0806B7B0: adds r0, r6, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation _0806B7B8: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/vaatiTransfigured.s b/asm/vaatiTransfigured.s index 784571c1..52138fb8 100644 --- a/asm/vaatiTransfigured.s +++ b/asm/vaatiTransfigured.s @@ -1703,7 +1703,7 @@ sub_0804041C: @ 0x0804041C orrs r1, r2 strb r1, [r3] movs r1, #0 - bl UpdateSprite + bl InitializeAnimation pop {pc} .align 2, 0 @@ -1797,7 +1797,7 @@ sub_080404D0: @ 0x080404D0 strb r0, [r3] adds r0, r2, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation b _08040518 _080404FC: movs r0, #1 @@ -1858,7 +1858,7 @@ _0804054A: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _080405C4 _0804056C: ldr r0, [r4, #0x50] @@ -1953,7 +1953,7 @@ _080405F6: strb r0, [r3] adds r0, r4, #0 movs r1, #3 - bl UpdateSprite + bl InitializeAnimation b _08040638 _08040626: adds r0, r4, #0 diff --git a/asm/vaatiWrath.s b/asm/vaatiWrath.s index 8f0064fc..ca2f8149 100644 --- a/asm/vaatiWrath.s +++ b/asm/vaatiWrath.s @@ -569,7 +569,7 @@ _08041748: ldr r0, [r5, #0x64] ldr r0, [r0, #4] movs r1, #0xe - bl UpdateSprite + bl InitializeAnimation b _080417AA .align 2, 0 _0804179C: .4byte gUnk_030010A0 @@ -619,7 +619,7 @@ _080417DA: str r1, [r0, #0xc] ldr r0, [r0, #8] movs r1, #0x14 - bl UpdateSprite + bl InitializeAnimation ldrb r1, [r4] movs r0, #0xfd ands r0, r1 @@ -865,15 +865,15 @@ _080419A6: movs r1, #1 strb r1, [r0, #0xd] movs r1, #0xf - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #8] movs r1, #0x15 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #0xc] movs r1, #0x1e - bl UpdateSprite + bl InitializeAnimation ldr r0, _080419FC @ =0x00000127 bl PlaySFX _080419F6: @@ -920,11 +920,11 @@ sub_08041A00: @ 0x08041A00 ldr r0, [r4, #0x64] ldr r0, [r0, #4] movs r1, #0x10 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #8] movs r1, #0x18 - bl UpdateSprite + bl InitializeAnimation b _08041AF0 .align 2, 0 _08041A5C: .4byte gUnk_080D0E64 @@ -965,7 +965,7 @@ _08041A60: ldr r0, [r4, #0x64] ldr r0, [r0, #8] movs r1, #0x16 - bl UpdateSprite + bl InitializeAnimation b _08041AF0 _08041ABC: adds r0, r4, #0 @@ -1080,15 +1080,15 @@ _08041B82: ldr r0, [r4, #0x64] ldr r0, [r0, #4] movs r1, #0x11 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #8] movs r1, #0x19 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #0xc] movs r1, #0x1f - bl UpdateSprite + bl InitializeAnimation b _08041BCE .align 2, 0 _08041BBC: .4byte gRoomControls @@ -1165,7 +1165,7 @@ sub_08041BE8: @ 0x08041BE8 bl sub_0801D2B4 adds r0, r7, #0 movs r1, #0x1a - bl UpdateSprite + bl InitializeAnimation ldr r0, [r6, #0x64] ldr r7, [r0, #0xc] str r5, [r7, #0x64] @@ -1986,11 +1986,11 @@ sub_08042264: @ 0x08042264 ldr r0, [r4, #0x64] ldr r0, [r0, #4] movs r1, #0xd - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #8] movs r1, #0x13 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_0804228C @@ -2006,15 +2006,15 @@ sub_0804228C: @ 0x0804228C ldr r0, [r4, #0x64] ldr r0, [r0, #4] movs r1, #0xd - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #8] movs r1, #0x13 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #0xc] movs r1, #0x1d - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 @@ -2073,18 +2073,18 @@ _0804231A: strb r0, [r7, #0xd] adds r0, r7, #0 movs r1, #0xc - bl UpdateSprite + bl InitializeAnimation ldr r0, [r5, #0x64] ldr r0, [r0, #8] movs r1, #0x12 - bl UpdateSprite + bl InitializeAnimation mov r0, r8 cmp r0, #1 bne _08042350 ldr r0, [r5, #0x64] ldr r0, [r0, #0xc] movs r1, #0x1b - bl UpdateSprite + bl InitializeAnimation _08042350: movs r0, #1 b _08042356 @@ -2119,15 +2119,15 @@ sub_0804235C: @ 0x0804235C ldr r0, [r0, #4] strb r5, [r0, #0xd] movs r1, #0xc - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #8] movs r1, #0x12 - bl UpdateSprite + bl InitializeAnimation ldr r0, [r4, #0x64] ldr r0, [r0, #0xc] movs r1, #0x1b - bl UpdateSprite + bl InitializeAnimation pop {r4, r5, pc} thumb_func_start sub_080423A4 @@ -2217,7 +2217,7 @@ _0804243C: strb r1, [r4, #0xd] adds r0, r4, #0 movs r1, #0xc - bl UpdateSprite + bl InitializeAnimation _08042450: ldrb r0, [r4, #0xd] cmp r0, #0 @@ -2233,7 +2233,7 @@ _0804245C: bne _08042480 adds r0, r4, #0 movs r1, #0xc - bl UpdateSprite + bl InitializeAnimation bl Random movs r1, #0x78 ands r0, r1 @@ -2276,7 +2276,7 @@ _080424B4: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x12 - bl UpdateSprite + bl InitializeAnimation _080424C6: ldr r0, [r4, #0x64] ldr r0, [r0] @@ -2331,7 +2331,7 @@ _08042520: strb r0, [r4, #0xc] adds r0, r4, #0 movs r1, #0x1c - bl UpdateSprite + bl InitializeAnimation _08042532: ldr r0, [r4, #0x64] ldr r0, [r0] diff --git a/asm/wallMaster.s b/asm/wallMaster.s index baab521b..c392bf7f 100644 --- a/asm/wallMaster.s +++ b/asm/wallMaster.s @@ -23,7 +23,7 @@ sub_0802A408: @ 0x0802A408 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, r5, pc} .align 2, 0 _0802A430: .4byte gUnk_080CD07C @@ -87,7 +87,7 @@ _0802A474: beq _0802A4A8 adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0802A4A8: adds r2, r4, #0 adds r2, #0x42 @@ -156,7 +156,7 @@ sub_0802A4E4: @ 0x0802A4E4 adds r1, #0x78 strh r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 bl sub_0802A7D0 pop {r4, pc} @@ -220,7 +220,7 @@ _0802A548: strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #2 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0802A7D0 _0802A5B0: @@ -246,7 +246,7 @@ sub_0802A5B8: @ 0x0802A5B8 bl sub_08004488 adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0802A60E .align 2, 0 _0802A5E4: .4byte 0x0000012D @@ -268,7 +268,7 @@ _0802A5E8: strh r2, [r4, #0x36] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0802A60E: pop {r4, pc} diff --git a/asm/wallMaster2.s b/asm/wallMaster2.s index 90557a5a..c5697fdf 100644 --- a/asm/wallMaster2.s +++ b/asm/wallMaster2.s @@ -23,7 +23,7 @@ sub_0802CC3C: @ 0x0802CC3C adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, r5, pc} .align 2, 0 _0802CC64: .4byte gUnk_080CD6FC @@ -65,7 +65,7 @@ _0802CC9A: strb r0, [r4, #0x10] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation ldr r2, _0802CCD4 @ =gLinkEntity ldrb r1, [r2, #0x10] adds r0, r5, #0 @@ -135,10 +135,10 @@ sub_0802CCE0: @ 0x0802CCE0 adds r0, #0x7c strh r5, [r0] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 bl sub_0802CF64 adds r0, r4, #0 diff --git a/asm/warpPoint.s b/asm/warpPoint.s index 571c4a48..e36b43fe 100644 --- a/asm/warpPoint.s +++ b/asm/warpPoint.s @@ -70,7 +70,7 @@ sub_0808B474: @ 0x0808B474 strb r2, [r4, #0x11] adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] @@ -429,7 +429,7 @@ sub_0808B73C: @ 0x0808B73C strb r0, [r4, #0x1a] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _0808B766: ldr r5, _0808B78C @ =gLinkEntity movs r0, #0x2e diff --git a/asm/waterDrop.s b/asm/waterDrop.s index e9a670ed..de47f180 100644 --- a/asm/waterDrop.s +++ b/asm/waterDrop.s @@ -50,9 +50,9 @@ sub_0802A250: @ 0x0802A250 strb r0, [r1] adds r0, r5, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation adds r0, r5, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip movs r0, #0x66 movs r1, #0 movs r2, #0 @@ -186,7 +186,7 @@ _0802A38C: _0802A392: strb r0, [r1] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip pop {r4, r5, pc} thumb_func_start sub_0802A39C diff --git a/asm/whirlwind.s b/asm/whirlwind.s index 0bb93227..4722b237 100644 --- a/asm/whirlwind.s +++ b/asm/whirlwind.s @@ -87,7 +87,7 @@ sub_08092CDC: @ 0x08092CDC bl sub_0801D2B4 adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation b _08092D5C .align 2, 0 _08092D48: .4byte gUnk_080FD320 @@ -97,7 +97,7 @@ _08092D50: strh r0, [r4, #0x36] adds r0, r4, #0 movs r1, #1 - bl UpdateSprite + bl InitializeAnimation _08092D5C: ldrb r1, [r4, #0x10] movs r0, #2 diff --git a/asm/windTribeFlag.s b/asm/windTribeFlag.s index 1aafab84..75d97e82 100644 --- a/asm/windTribeFlag.s +++ b/asm/windTribeFlag.s @@ -35,10 +35,10 @@ _0809CEEE: _0809CEF4: strb r0, [r4, #0x18] adds r0, r4, #0 - bl UpdateSpriteOrderAndFlip + bl InitializeAnimationOrderAndFlip adds r0, r4, #0 movs r1, #0 - bl UpdateSprite + bl InitializeAnimation b _0809CF0C _0809CF06: adds r0, r4, #0 diff --git a/asm/windTribespeople.s b/asm/windTribespeople.s index b9a8c71f..922b48c6 100644 --- a/asm/windTribespeople.s +++ b/asm/windTribespeople.s @@ -114,7 +114,7 @@ sub_0806C834: @ 0x0806C834 lsrs r1, r1, #1 adds r1, #4 adds r0, r2, #0 - bl UpdateSprite + bl InitializeAnimation _0806C856: pop {pc} .align 2, 0 @@ -448,7 +448,7 @@ sub_0806CA94: @ 0x0806CA94 strb r0, [r4, #0x18] adds r0, r4, #0 movs r1, #6 - bl UpdateSprite + bl InitializeAnimation b _0806CADA .align 2, 0 _0806CAD0: .4byte gUnk_08113A1C diff --git a/asm/wisp.s b/asm/wisp.s index 6d304d97..b26bfad1 100644 --- a/asm/wisp.s +++ b/asm/wisp.s @@ -11,7 +11,7 @@ sub_0803353C: @ 0x0803353C push {lr} ldr r1, _08033548 @ =gUnk_080CEB74 - bl sub_0800129E + bl EnemyFunctionHandler pop {pc} .align 2, 0 _08033548: .4byte gUnk_080CEB74 @@ -198,7 +198,7 @@ sub_08033674: @ 0x08033674 bl sub_08033744 ldrb r1, [r4, #0xb] adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 diff --git a/asm/wizzrobeFire.s b/asm/wizzrobeFire.s index 427dc1f5..5371a4f4 100644 --- a/asm/wizzrobeFire.s +++ b/asm/wizzrobeFire.s @@ -23,7 +23,7 @@ sub_0802FB30: @ 0x0802FB30 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, r5, pc} .align 2, 0 _0802FB58: .4byte gUnk_080CDFC4 @@ -110,7 +110,7 @@ _0802FBF6: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 @@ -183,7 +183,7 @@ _0802FC52: movs r0, #4 orrs r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0802FC88: adds r0, r5, #0 bl sub_0802F9C8 @@ -296,7 +296,7 @@ _0802FD18: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0802FDCA _0802FD6A: ldrb r0, [r4, #0xe] @@ -343,7 +343,7 @@ _0802FD94: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802FDCA: adds r0, r4, #0 bl sub_0802F9C8 diff --git a/asm/wizzrobeIce.s b/asm/wizzrobeIce.s index e208540f..e69f88e7 100644 --- a/asm/wizzrobeIce.s +++ b/asm/wizzrobeIce.s @@ -23,7 +23,7 @@ sub_0802FDD4: @ 0x0802FDD4 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, r5, pc} .align 2, 0 _0802FDFC: .4byte gUnk_080CE074 @@ -137,7 +137,7 @@ _0802FECE: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} .align 2, 0 @@ -210,7 +210,7 @@ _0802FF2A: movs r0, #4 orrs r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0802FF60: adds r0, r5, #0 bl sub_0802F9C8 @@ -323,7 +323,7 @@ _0802FFF0: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _080300A2 _08030042: ldrb r0, [r4, #0xe] @@ -370,7 +370,7 @@ _0803006C: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _080300A2: adds r0, r4, #0 bl sub_0802F9C8 diff --git a/asm/wizzrobeWind.s b/asm/wizzrobeWind.s index be8f25bf..c7ff1648 100644 --- a/asm/wizzrobeWind.s +++ b/asm/wizzrobeWind.s @@ -23,7 +23,7 @@ sub_0802F4A0: @ 0x0802F4A0 adds r0, r4, #0 movs r1, #0 movs r2, #1 - bl sub_0804A9AC + bl SetChildOffset pop {r4, r5, pc} .align 2, 0 _0802F4C8: .4byte gUnk_080CDF50 @@ -163,7 +163,7 @@ _0802F5D0: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation pop {r4, pc} thumb_func_start sub_0802F5DC @@ -235,7 +235,7 @@ _0802F62A: movs r0, #4 orrs r1, r0 adds r0, r5, #0 - bl UpdateSprite + bl InitializeAnimation _0802F660: adds r0, r5, #0 bl sub_0802F9C8 @@ -348,7 +348,7 @@ _0802F6F0: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0802F7A2 _0802F742: ldrb r0, [r4, #0xe] @@ -395,7 +395,7 @@ _0802F76C: ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802F7A2: adds r0, r4, #0 bl sub_0802F9C8 @@ -483,7 +483,7 @@ _0802F818: lsrs r1, r1, #1 _0802F844: adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0802F884 _0802F84C: lsls r0, r1, #0x18 @@ -822,12 +822,12 @@ sub_0802FA88: @ 0x0802FA88 movs r0, #4 orrs r1, r0 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation b _0802FAF2 _0802FAEA: lsrs r1, r2, #3 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802FAF2: movs r7, #1 b _0802FB2A @@ -854,7 +854,7 @@ _0802FAF6: strb r2, [r4, #0x14] lsrs r1, r2, #1 adds r0, r4, #0 - bl UpdateSprite + bl InitializeAnimation _0802FB2A: adds r0, r7, #0 pop {r4, r5, r6, r7, pc} diff --git a/include/entity.h b/include/entity.h index 72e7ad59..a4abf24d 100644 --- a/include/entity.h +++ b/include/entity.h @@ -24,6 +24,13 @@ union SplitWord { } HALF; }; +union SplitHWord { + u16 HWORD; + struct { + u8 LO, HI; + } PACKED HALF; +}; + typedef struct Entity { u32 *field_0x0; @@ -51,20 +58,20 @@ typedef struct Entity u8 ss5:1; u8 ss6:1; u8 ss7:1; - } __attribute__((packed)) b; - } __attribute__((packed)) spriteSettings; + } PACKED b; + } PACKED spriteSettings; struct { u8 b0:2; u8 b1:2; u8 b2:4; - } __attribute__((packed)) spriteOrder; + } PACKED spriteOrder; u8 palette; struct { u8 b0:4; u8 b1:1; u8 b2:3; - } __attribute__((packed)) spriteOrientation; + } PACKED spriteOrientation; u8 filler[2]; u8 animationList; u8 field_1f; @@ -74,7 +81,7 @@ typedef struct Entity struct { u8 b0:3; u8 b1:5; - } __attribute__((packed)) ticks; + } PACKED ticks; u16 collisions; union SplitWord x; union SplitWord y; @@ -108,7 +115,7 @@ typedef struct Entity u8 f0:6; u8 f1:1; u8 f2:1; - } __attribute__((packed)) frames; + } PACKED frames; u8 gfx; u8 field_0x5c; u8 field_0x5d; @@ -126,7 +133,7 @@ typedef struct Entity u16 itemCooldown; u32 field_0x7c; u32 field_0x80; - u16 cutsceneBeh; + union SplitHWord cutsceneBeh; u16 field_0x86; } Entity; diff --git a/include/gba/defines.h b/include/gba/defines.h index 8e2ac6f5..765f0065 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -16,6 +16,7 @@ #define NAKED __attribute__((naked)) #define UNUSED __attribute__((unused)) +#define PACKED __attribute__((packed)) #define ALIGNED(n) __attribute__((aligned(n))) diff --git a/include/greatFairy.h b/include/greatFairy.h index 3c058c64..77762242 100644 --- a/include/greatFairy.h +++ b/include/greatFairy.h @@ -2,7 +2,7 @@ #define GREATFAIRY_H extern u32 __modsi3(u32, u32); -extern void UpdateSprite(Entity *, u32); +extern void InitializeAnimation(Entity *, u32); extern void sub_08087380(); extern u32 CheckRoomFlag(); extern Entity *sub_080873AC(Entity*, u32, u32); diff --git a/linker.ld b/linker.ld index 80b4ccc0..5b600f8e 100644 --- a/linker.ld +++ b/linker.ld @@ -404,6 +404,7 @@ SECTIONS { asm/vaatiArm.o(.text); asm/dust.o(.text); asm/vaatiBall.o(.text); + src/slime.o(.text); asm/slime.o(.text); asm/miniSlime.o(.text); asm/fireballGuy.o(.text); @@ -765,7 +766,7 @@ SECTIONS { asm/windTribeTeleporter.o(.text); asm/objectB9.o(.text); asm/objectBA.o(.text); - asm/windCrest.o(.text); + asm/windcrest.o(.text); asm/litArea.o(.text); asm/objectBD.o(.text); asm/pinwheel.o(.text); diff --git a/src/greatFairy.c b/src/greatFairy.c index df4a2b00..64a90fb3 100644 --- a/src/greatFairy.c +++ b/src/greatFairy.c @@ -38,7 +38,7 @@ void sub_08086AF8(Entity *ent) { sub_08087380(); ent->parameter3 = 0; - ent->cutsceneBeh = 290; + ent->cutsceneBeh.HWORD = 290; } //Dormant update @@ -53,7 +53,7 @@ void sub_08086B10(Entity *ent) if (event == 0) { return; } - pFrame = &ent->cutsceneBeh; + pFrame = &ent->cutsceneBeh.HWORD; if (*pFrame != 0) { *pFrame = *pFrame - 1; } diff --git a/src/octorok.c b/src/octorok.c index 64ceb622..4d6a0a78 100644 --- a/src/octorok.c +++ b/src/octorok.c @@ -1,18 +1,18 @@ #include "global.h" #include "entity.h" -extern void sub_0800129E(); -extern void sub_0804A9AC(); +extern void EnemyFunctionHandler(); +extern void SetChildOffset(); extern void sub_0804AA30(); extern void sub_0804A9FC(); extern void sub_0804A7D4(); extern void CreateDeathFx(); extern void sub_0801ECFC(); extern u32 sub_0806F520(); -extern void UpdateSprite(); +extern void InitializeAnimation(); extern void sub_0806F4E8(); extern void sub_0806F3E4(); -extern void UpdateSpriteAnimation(); +extern void InitializeAnimationAnimation(); extern void sub_0804A720(); extern u32 Random(); extern void sub_0801ED14(); @@ -26,8 +26,8 @@ extern u8 gUnk_080CA170[8]; //Main void sub_0801EAB0(Entity *ent) { - sub_0800129E(ent, gOctorok); - sub_0804A9AC(ent, 0, 1, -16); + EnemyFunctionHandler(ent, gOctorok); + SetChildOffset(ent, 0, 1, -16); } //Idle @@ -62,7 +62,7 @@ void sub_0801EB2C(Entity *ent) if ((ent->previousActionFlag < 3) && (iVar1 = sub_0806F520(ent), iVar1 == 0)) { sub_0801ECFC(ent); - UpdateSprite(ent, ent->animationState); + InitializeAnimation(ent, ent->animationState); } else { gUnk_080CA158[ent->previousActionFlag](ent); @@ -88,7 +88,7 @@ void sub_0801EB7C(Entity *ent) void sub_0801EB84(Entity *ent) { ent->flags = ent->flags & 127; - UpdateSpriteAnimation(ent, 2); + InitializeAnimationAnimation(ent, 2); } void nullsub_3() @@ -114,7 +114,7 @@ void sub_0801EBC8(Entity *ent) ent->animationState = (ent->entityType).parameter1 == 2 ? (ent->entityType).parameter1 : Random() & 3; ent->filler[0] = 18; sub_0801ECFC(ent); - UpdateSprite(ent,ent->animationState); + InitializeAnimation(ent,ent->animationState); } #else NAKED diff --git a/src/positionRelative.c b/src/positionRelative.c index 14aab5b3..f2877f59 100644 --- a/src/positionRelative.c +++ b/src/positionRelative.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" -extern void UpdateSpriteOrderAndFlip(Entity *); +extern void InitializeAnimationOrderAndFlip(Entity *); void PositionRelative(Entity *source, Entity *target, s32 offsetX, s32 offsetY) { //r0, r1, r2, r3 s32 x; @@ -15,5 +15,5 @@ void PositionRelative(Entity *source, Entity *target, s32 offsetX, s32 offsetY) target->height = source->height; //ldr target->collisionLayer = source->collisionLayer; - UpdateSpriteOrderAndFlip(target); + InitializeAnimationOrderAndFlip(target); } \ No newline at end of file diff --git a/src/slime.c b/src/slime.c index 0c1f24d9..679be3f4 100644 --- a/src/slime.c +++ b/src/slime.c @@ -1,14 +1,178 @@ #include "global.h" #include "entity.h" -extern void sub_0804A9AC(); -extern void sub_0800129E(); +typedef struct { + void * field_0x0; + void * entityCount; + u8 freezeTime; +} EntityHandler; -extern void gUnk_080D16A4(void); +extern void EnemyFunctionHandler(Entity *, void *); +extern void SetChildOffset(Entity *, u32, u32, u32); +extern void sub_0804AA30(Entity *, void *); +extern void sub_0804A9FC(Entity *, u32); +extern void sub_0804A720(Entity *); +extern void InitializeAnimation(Entity *, u32); +extern void sub_08044FF8(Entity *); +extern u32 Random(void); +extern void sub_08004274(Entity *); +extern u32 sub_0806FA04(u32, u32); +extern u32 sub_08049FA0(Entity *); +extern u32 sub_08049EE4(Entity *); +extern u32 sub_080AEF88(void); +extern Entity * CreateEnemy(u32, u32); -void Slime(Entity *ent) + +extern void (*gUnk_080D16BC[])(Entity *); +extern void (*gUnk_080D16A4[])(Entity *); + +extern u8 gUnk_080D16D0; +extern EntityHandler gUnk_03003DB8; + + +void sub_08044F50(Entity *this) { - sub_0800129E(ent, &gUnk_080D16A4); - sub_0804A9AC(ent,0,1,-12); -} \ No newline at end of file + EnemyFunctionHandler(this, &gUnk_080D16A4); + SetChildOffset(this,0,1,-12); +} + +void sub_08044F70(Entity *this) +{ + gUnk_080D16BC[this->action](this); +} + +void sub_08044F88(Entity *this) +{ + if ((this->currentHealth != 0) && (this->cutsceneBeh.HALF.LO != this->currentHealth)) { + this->action = 4; + } + else { + sub_0804AA30(this,&gUnk_080D16A4); + } + + if (this->field_0x43 != 0) { + sub_0804A9FC(this,28); + } +} + +void nullsub_171(){} + +void sub_08044FC8(Entity *this) +{ + this->action = 1; + this->spriteSettings.b.ss0 = 1; + this->nonPlanarMovement = 128; + sub_0804A720(this); + InitializeAnimation(this, 0); + sub_08044FF8(this); +} + +void sub_08044FF8(Entity *this) +{ + u32 bVar1; + + this->action = 2; + bVar1 = Random(); + this->parameter3 = (bVar1 & 31) + 30; + this->cutsceneBeh.HALF.LO = this->currentHealth; +} + +void sub_08045018(Entity *this) +{ + u32 cVar1; + u32 param3; + u32 iVar3; + u32 randValue; + + sub_08004274(this); + param3 = this->parameter3 -= 1; + if (param3 == 0) { + this->action = 3; + this->parameter3 = 1; + if (0 < this->nonPlanarMovement) { + this->parameter3 = sub_0806FA04(4096, this->nonPlanarMovement) >> 8; + } + iVar3 = sub_08049FA0(this); + if ((iVar3 == 0) && (randValue = Random(), (randValue & 3) != 0)) { + cVar1 = sub_08049EE4(this); + this->direction = (cVar1 + 0xfc + (Random() & 8)) & 24; + return; + } + this->direction = Random() & 24; + } +} + +void sub_08045088(Entity *this) +{ + u8 bVar1; + + sub_080AEF88(); + sub_08004274(this); + bVar1 = this->parameter3 -= 1; + if (bVar1 == 0) { + this->action = 1; + } +} + +#ifdef NON_MATCHING +void sub_080450A8(Entity *this) + +{ + u8 bVar1; + u32 uVar2; + s32 iVar3; + s32 iVar4; + Entity *pEVar5; + Entity **ppEVar6; + s32 dividend; + u32 uVar7; + Entity *local_r6_72; + u32 divisor; + u8 *pcVar8; + Entity *local_2c [4]; + + ppEVar6 = local_2c; + bVar1 = (&gUnk_080D16D0)[(this->entityType).parameter1]; + divisor = (u32)bVar1; + if ((int)gUnk_03003DB8.entityCount < (int)(72 - divisor)) { + uVar7 = divisor; + if (bVar1 != 0) { + do { + uVar2 = CreateEnemy(87,this->entityType.parameter1); + *ppEVar6 = uVar2; + ppEVar6 = ppEVar6 + 1; + uVar7 = uVar7 - 1; + } while (uVar7 != 0); + } + pcVar8 = "\x06"; + iVar4 = 0; + if (bVar1 != 0) { + do { + local_r6_72 = local_2c[iVar4]; + dividend = iVar4 + 1; + iVar3 = Div(dividend,divisor); + local_r6_72->attachedEntity = local_2c[iVar3]; + iVar4 = Div(iVar4 + divisor + -1,divisor); + local_r6_72->parent = local_2c[iVar4]; + (local_r6_72->entityType).parameter2 = 1; + local_r6_72->height.WORD = 0; + local_r6_72->hurtBlinkTime = 240; + sub_08045178(this,local_r6_72,*pcVar8,pcVar8[1]); + pcVar8 = pcVar8 + 2; + iVar4 = dividend; + } while (dividend < divisor); + } + pEVar5 = CreateFx(this,2,0); + if (pEVar5 != NULL) { + CopyPosition(this,pEVar5); + } + DeleteEnemy(this); + } +} +#else +NAKED +void sub_080450A8(Entity *this) { + asm(".include \"asm/non_matching/slime/sub_080450A8.inc\""); +} +#endif \ No newline at end of file diff --git a/src/stamp.c b/src/stamp.c index a0bbbd2b..dae01efd 100644 --- a/src/stamp.c +++ b/src/stamp.c @@ -2,7 +2,7 @@ #include "entity.h" #include "textbox.h" -extern void UpdateSprite(Entity *, u32); +extern void InitializeAnimation(Entity *, u32); extern void sub_08078778(Entity *); extern void sub_0805E47C(Entity *); extern void sub_08004274(Entity *); @@ -24,7 +24,7 @@ extern void (*gStampBehaviors2[2])(Entity*); extern TextBox gTextBox; extern u32 gUnk_0810C2E4; -extern void UpdateSprite(Entity *, u32); +extern void InitializeAnimation(Entity *, u32); extern void sub_08078778(Entity *); extern void sub_0805E47C(Entity *); extern void sub_08004274(Entity *); @@ -60,7 +60,7 @@ void sub_08062BD4(Entity *ent) { ent->action = 1; ent->spriteSettings.b.ss0 = 1; - UpdateSprite(ent, 0); + InitializeAnimation(ent, 0); sub_08078778(ent); } @@ -79,7 +79,7 @@ void sub_08062C24(Entity *ent) { sub_08004274(ent); if ((ent->frames.all & 128) != 0) { - UpdateSprite(ent, 4); + InitializeAnimation(ent, 4); TextboxTryNoOverlap(2561); ent->action++; } @@ -89,7 +89,7 @@ void sub_08062C54(Entity *ent) { if ((gTextBox.doTextBox & 127) == 0) { ent->action = 1; - UpdateSprite(ent, 0); + InitializeAnimation(ent, 0); sub_0805E584(ent); } } @@ -98,7 +98,7 @@ void sub_08062C7C(Entity *ent) { ent->action = 1; sub_0807DD64(ent); - UpdateSprite(ent, 0); + InitializeAnimation(ent, 0); CreateFx(ent, 37, 0); sub_08062CA4(ent); }