From 723d23396721cc5a7bfc16b76d682ed6a3f22882 Mon Sep 17 00:00:00 2001 From: Behemoth Date: Tue, 1 Sep 2020 01:47:04 +0200 Subject: [PATCH] Enque -> Enqueue --- asm/armos.s | 8 ++++---- asm/ballChainSoldier.s | 2 +- asm/bigIceBlock.s | 2 +- asm/bigPushableLever.s | 4 ++-- asm/blockPushed.s | 2 +- asm/bobomb.s | 6 +++--- asm/bollard.s | 4 ++-- asm/book.s | 2 +- asm/bossDoor.s | 2 +- asm/businessScrub.s | 2 +- asm/businessScrubPrologue.s | 8 ++++---- asm/castorWildsStatue.s | 2 +- asm/cloudPiranha.s | 4 ++-- asm/code_080043E8.s | 4 ++-- asm/code_0800857C.s | 2 +- asm/code_08016DF8.s | 2 +- asm/code_08019444.s | 2 +- asm/code_080A5574.s | 32 ++++++++++++++++---------------- asm/cucco.s | 2 +- asm/cuccoAggr.s | 6 +++--- asm/cuccoChick.s | 2 +- asm/deathFx.s | 2 +- asm/dog.s | 4 ++-- asm/enemy4D.s | 2 +- asm/eyeSwitch.s | 2 +- asm/eyegore.s | 8 ++++---- asm/fairy.s | 2 +- asm/fallingBoulder.s | 2 +- asm/fan.s | 2 +- asm/figurineDevice.s | 2 +- asm/frozenWaterElement.s | 4 ++-- asm/lavaPlatform.s | 8 ++++---- asm/likeLike.s | 2 +- asm/lockedDoor.s | 4 ++-- asm/madderpillar.s | 16 ++++++++-------- asm/managerF.s | 2 +- asm/minecartDoor.s | 4 ++-- asm/minishEzlo.s | 4 ++-- asm/mountainMinish.s | 2 +- asm/mulldozer.s | 2 +- asm/object20.s | 2 +- asm/object24.s | 4 ++-- asm/object2A.s | 2 +- asm/object35.s | 4 ++-- asm/object43.s | 2 +- asm/object44.s | 2 +- asm/object64.s | 2 +- asm/object6A.s | 4 ++-- asm/object87.s | 2 +- asm/object8B.s | 2 +- asm/objectA0.s | 2 +- asm/objectA8.s | 2 +- asm/objectBlockingStairs.s | 6 +++--- asm/objectD.s | 4 ++-- asm/objectOnPillar.s | 4 ++-- asm/octorokGolden.s | 2 +- asm/picoBloom.s | 2 +- asm/puffstool.s | 2 +- asm/pullableLever.s | 6 +++--- asm/pushableFurniture.s | 6 +++--- asm/pushableGrave.s | 2 +- asm/pushableLever.s | 4 ++-- asm/pushableRock.s | 2 +- asm/pushableStatue.s | 2 +- asm/rope.s | 2 +- asm/scissorsBeetle.s | 2 +- asm/sensorBladeTrap.s | 2 +- asm/sluggula.s | 4 ++-- asm/smallIceBlock.s | 6 +++--- asm/spearMoblin.s | 4 ++-- asm/specialFx.s | 2 +- asm/spikedBeetle.s | 4 ++-- asm/stalfos.s | 12 ++++++------ asm/vaati.s | 6 +++--- asm/vaatiArm.s | 2 +- asm/vaatiEyesMacro.s | 4 ++-- asm/vaatiReborn.s | 2 +- asm/wallMaster.s | 2 +- asm/warpPoint.s | 4 ++-- asm/waterDrop.s | 2 +- asm/windTribespeople.s | 2 +- asm/wizzrobeFire.s | 4 ++-- asm/wizzrobeIce.s | 4 ++-- asm/wizzrobeWind.s | 4 ++-- include/functions.h | 2 +- src/enemy/acroBandits.c | 2 +- src/enemy/beetle.c | 4 ++-- src/enemy/bladeTrap.c | 4 ++-- src/enemy/chuchu.c | 8 ++++---- src/enemy/cuccoChickAggr.c | 6 +++--- src/enemy/darkNut.c | 16 ++++++++-------- src/enemy/doorMimic.c | 2 +- src/enemy/lakitu.c | 4 ++-- src/enemy/octorok.c | 2 +- src/enemy/rollobite.c | 2 +- src/enemy/rupeeLike.c | 2 +- src/enemy/spinyChuchu.c | 8 ++++---- src/npc/carlov.c | 6 +++--- src/npc/melari.c | 4 ++-- src/npc/postman.c | 4 ++-- src/object/lightableSwitch.c | 8 ++++---- src/object/mask.c | 4 ++-- src/object/metalDoor.c | 4 ++-- src/object/object2A.c | 2 +- src/object/pot.c | 2 +- src/object/railtrack.c | 8 ++++---- 106 files changed, 212 insertions(+), 212 deletions(-) diff --git a/asm/armos.s b/asm/armos.s index e8c495cd..bd76cf19 100644 --- a/asm/armos.s +++ b/asm/armos.s @@ -299,7 +299,7 @@ _080303C0: bl sub_08030834 movs r0, #0x95 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX b _0803042C .align 2, 0 _080303D0: .4byte gUnk_080FD2F0 @@ -450,7 +450,7 @@ _080304DE: strb r2, [r3] movs r0, #0x95 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _080304F0: pop {r4, pc} .align 2, 0 @@ -502,7 +502,7 @@ _0803053E: strb r0, [r3] movs r0, #0x95 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _08030552: pop {pc} @@ -1157,7 +1157,7 @@ sub_08030A04: @ 0x08030A04 ands r0, r1 strb r0, [r4] ldr r0, _08030A28 @ =0x00000101 - bl EnqueSFX + bl EnqueueSFX _08030A24: pop {r4, pc} .align 2, 0 diff --git a/asm/ballChainSoldier.s b/asm/ballChainSoldier.s index 817a4c7b..515d4854 100644 --- a/asm/ballChainSoldier.s +++ b/asm/ballChainSoldier.s @@ -306,7 +306,7 @@ sub_0803E71C: @ 0x0803E71C movs r0, #0xf6 strb r0, [r1] adds r0, #0x65 - bl EnqueSFX + bl EnqueueSFX _0803E756: pop {pc} .align 2, 0 diff --git a/asm/bigIceBlock.s b/asm/bigIceBlock.s index d7ff4818..6194398b 100644 --- a/asm/bigIceBlock.s +++ b/asm/bigIceBlock.s @@ -98,7 +98,7 @@ sub_080997CC: @ 0x080997CC strb r1, [r4, #0xc] strb r0, [r4, #0xe] ldr r0, _080997F0 @ =0x000001B3 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_080997F4 _080997EC: diff --git a/asm/bigPushableLever.s b/asm/bigPushableLever.s index 20cb7569..6c1b7753 100644 --- a/asm/bigPushableLever.s +++ b/asm/bigPushableLever.s @@ -66,7 +66,7 @@ sub_08098F14: @ 0x08098F14 bl SetTile movs r0, #0x99 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r5, #0 movs r1, #0x1e bl sub_0805E4E0 @@ -348,7 +348,7 @@ _08099166: cmp r0, #0 bne _08099194 ldr r0, _080991A0 @ =0x00000131 - bl EnqueSFX + bl EnqueueSFX _08099194: pop {r4, pc} .align 2, 0 diff --git a/asm/blockPushed.s b/asm/blockPushed.s index 551d6dd9..86af1cfc 100644 --- a/asm/blockPushed.s +++ b/asm/blockPushed.s @@ -233,7 +233,7 @@ _08082FF0: bl sub_080832D8 _08083088: ldr r0, _08083090 @ =0x0000010F - bl EnqueSFX + bl EnqueueSFX _0808308E: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/bobomb.s b/asm/bobomb.s index e36df5cd..c0cf57ce 100644 --- a/asm/bobomb.s +++ b/asm/bobomb.s @@ -123,7 +123,7 @@ _0802C75E: adds r0, r4, #0 bl sub_0802CB68 ldr r0, _0802C76C @ =0x0000014D - bl EnqueSFX + bl EnqueueSFX b _0802C79E .align 2, 0 _0802C76C: .4byte 0x0000014D @@ -638,7 +638,7 @@ _0802CB10: bne _0802CB30 movs r0, #0x82 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0802CB30: adds r0, r4, #0 bl sub_0802CC18 @@ -777,7 +777,7 @@ sub_0802CC18: @ 0x0802CC18 movs r0, #0x1c strb r0, [r1] ldr r0, _0802CC38 @ =0x0000014D - bl EnqueSFX + bl EnqueueSFX _0802CC34: pop {pc} .align 2, 0 diff --git a/asm/bollard.s b/asm/bollard.s index 4fdf8b39..811c7f67 100644 --- a/asm/bollard.s +++ b/asm/bollard.s @@ -76,7 +76,7 @@ _0808B2F4: ldrb r2, [r2] bl SetTile ldr r0, _0808B320 @ =0x000001A5 - bl EnqueSFX + bl EnqueueSFX _0808B31C: pop {r4, pc} .align 2, 0 @@ -130,7 +130,7 @@ _0808B36C: adds r0, r4, #0 bl sub_0808B3AC ldr r0, _0808B388 @ =0x000001A5 - bl EnqueSFX + bl EnqueueSFX _0808B384: pop {r4, pc} .align 2, 0 diff --git a/asm/book.s b/asm/book.s index f5f6c852..325205d1 100644 --- a/asm/book.s +++ b/asm/book.s @@ -190,7 +190,7 @@ _0809B4C0: lsls r0, r0, #2 strb r0, [r1, #0x15] ldr r0, _0809B518 @ =0x0000010F - bl EnqueSFX + bl EnqueueSFX b _0809B520 .align 2, 0 _0809B510: .4byte gPlayerState diff --git a/asm/bossDoor.s b/asm/bossDoor.s index 577953ae..d48324aa 100644 --- a/asm/bossDoor.s +++ b/asm/bossDoor.s @@ -358,7 +358,7 @@ _0808C470: strh r0, [r1, #0x32] _0808C494: ldr r0, _0808C4A0 @ =0x0000010B - bl EnqueSFX + bl EnqueueSFX _0808C49A: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/businessScrub.s b/asm/businessScrub.s index c0c6f131..ea2a740e 100644 --- a/asm/businessScrub.s +++ b/asm/businessScrub.s @@ -70,7 +70,7 @@ sub_08028934: @ 0x08028934 strh r0, [r1, #0x36] _08028982: ldr r0, _0802898C @ =0x000001BB - bl EnqueSFX + bl EnqueueSFX _08028988: pop {r4, pc} .align 2, 0 diff --git a/asm/businessScrubPrologue.s b/asm/businessScrubPrologue.s index deb2307f..deb98135 100644 --- a/asm/businessScrubPrologue.s +++ b/asm/businessScrubPrologue.s @@ -85,7 +85,7 @@ _08045C16: movs r1, #0xff strb r1, [r0] ldr r0, _08045C34 @ =0x000001BB - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #2 bl sub_0805E3A0 @@ -480,7 +480,7 @@ _08045F00: adds r0, r4, #0 bl sub_080954AC ldr r0, _08045F34 @ =0x0000018D - bl EnqueSFX + bl EnqueueSFX b _08045F4E .align 2, 0 _08045F34: .4byte 0x0000018D @@ -698,7 +698,7 @@ _080460AE: bge _0804608A movs r0, #0xb7 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX ldr r0, _08046120 @ =0x000007A2 movs r1, #1 bl sub_0807BA8C @@ -725,7 +725,7 @@ _080460AE: bl CopyPosition movs r0, #0xc2 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _08046102: ldr r1, [r7, #0x54] cmp r1, #0 diff --git a/asm/castorWildsStatue.s b/asm/castorWildsStatue.s index 90bd9782..1ff5b938 100644 --- a/asm/castorWildsStatue.s +++ b/asm/castorWildsStatue.s @@ -260,7 +260,7 @@ _08067560: ble _0806753A movs r0, #0xa6 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX movs r0, #0x28 movs r1, #4 bl sub_08080964 diff --git a/asm/cloudPiranha.s b/asm/cloudPiranha.s index b30f3fb4..bda5efbc 100644 --- a/asm/cloudPiranha.s +++ b/asm/cloudPiranha.s @@ -376,7 +376,7 @@ sub_080386B8: @ 0x080386B8 strb r0, [r2] movs r0, #0x92 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #0x70 bl sub_0801D2B4 @@ -459,7 +459,7 @@ sub_08038754: @ 0x08038754 orrs r0, r1 strb r0, [r2] ldr r0, _080387C0 @ =0x0000012B - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #0x71 bl sub_0801D2B4 diff --git a/asm/code_080043E8.s b/asm/code_080043E8.s index 85ecffd6..bbd2883b 100644 --- a/asm/code_080043E8.s +++ b/asm/code_080043E8.s @@ -85,8 +85,8 @@ sub_08004484: @ 0x08004484 ldr r2, _080044DC @ =gUnk_03005FF0 bx r2 - thumb_func_start EnqueSFX -EnqueSFX: @ 0x08004488 + thumb_func_start EnqueueSFX +EnqueueSFX: @ 0x08004488 ldr r1, _080044E0 @ =gUnk_02024048 ldrb r2, [r1] cmp r2, #8 diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s index 5dbf7120..cb5c54a0 100644 --- a/asm/code_0800857C.s +++ b/asm/code_0800857C.s @@ -769,7 +769,7 @@ sub_08008B22: @ 0x08008B22 sub_08008B2E: @ 0x08008B2E push {r0, lr} adds r0, r2, #0 - bl EnqueSFX + bl EnqueueSFX pop {r0, pc} .align 2, 0 _08008B38: .4byte 0x00000180 diff --git a/asm/code_08016DF8.s b/asm/code_08016DF8.s index ef099089..c8bfb456 100644 --- a/asm/code_08016DF8.s +++ b/asm/code_08016DF8.s @@ -398,7 +398,7 @@ _080170E8: cmp r0, #0 bne _08017112 ldr r0, _08017138 @ =0x0000011F - bl EnqueSFX + bl EnqueueSFX _08017112: ldr r0, _0801712C @ =gUnk_02002A40 adds r2, r0, #0 diff --git a/asm/code_08019444.s b/asm/code_08019444.s index ebd87ab7..8a28ea67 100644 --- a/asm/code_08019444.s +++ b/asm/code_08019444.s @@ -4328,7 +4328,7 @@ _0801B4AC: cmp r0, #0 bne _0801B4C0 movs r0, #0xfb - bl EnqueSFX + bl EnqueueSFX _0801B4C0: pop {r4, pc} .align 2, 0 diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index d9d6fa0c..63bf2f0a 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -6061,7 +6061,7 @@ sub_080A8470: @ 0x080A8470 cmp r0, #0x68 bne _080A848E movs r0, #0x86 - bl EnqueSFX + bl EnqueueSFX _080A848E: adds r0, r4, #0 bl DeleteEntity @@ -6115,7 +6115,7 @@ sub_080A84C8: @ 0x080A84C8 strb r0, [r1] _080A84F0: ldr r0, _080A8500 @ =0x0000018D - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #0x18 bl InitializeAnimation @@ -6328,7 +6328,7 @@ sub_080A8680: @ 0x080A8680 strb r1, [r0, #0xf] movs r0, #0x8c lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX pop {pc} thumb_func_start sub_080A86A0 @@ -6344,7 +6344,7 @@ sub_080A86A0: @ 0x080A86A0 strh r3, [r0, #0x24] movs r0, #0xc7 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX pop {pc} thumb_func_start sub_080A86BC @@ -6810,7 +6810,7 @@ _080A8A16: movs r1, #1 bl InitializeAnimation movs r0, #0x84 - bl EnqueSFX + bl EnqueueSFX movs r0, #3 strb r0, [r5, #0xc] b _080A8A44 @@ -6893,7 +6893,7 @@ _080A8AAA: adds r0, r2, #0 bl InitializeAnimation ldr r0, _080A8AC4 @ =0x0000015F - bl EnqueSFX + bl EnqueueSFX _080A8AC2: pop {pc} .align 2, 0 @@ -7053,7 +7053,7 @@ _080A8BDA: bl InitializeAnimation movs r0, #0xaf lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _080A8BF4: pop {pc} .align 2, 0 @@ -7198,7 +7198,7 @@ _080A8CEE: bl InitializeAnimation movs r0, #0xb0 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _080A8D08: pop {pc} .align 2, 0 @@ -8110,7 +8110,7 @@ sub_080A93DC: @ 0x080A93DC bl InitializeAnimation movs r0, #0xc5 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_0806F69C b _080A9424 @@ -8199,7 +8199,7 @@ sub_080A9488: @ 0x080A9488 lsrs r0, r0, #3 strb r0, [r4, #0x14] movs r0, #0x74 - bl EnqueSFX + bl EnqueueSFX ldrb r1, [r4, #0x14] adds r0, r4, #0 bl sub_080A94C0 @@ -9728,7 +9728,7 @@ sub_080A9FD0: @ 0x080A9FD0 ands r0, r1 strb r0, [r2] ldr r0, _080AA038 @ =0x0000015D - bl EnqueSFX + bl EnqueueSFX _080A9FF2: movs r0, #0x2e ldrsh r1, [r5, r0] @@ -9906,7 +9906,7 @@ _080AA136: bl DeleteThisEntity _080AA14E: movs r0, #0xf2 - bl EnqueSFX + bl EnqueueSFX movs r4, #1 strb r4, [r6, #0xc] movs r0, #0xff @@ -10715,7 +10715,7 @@ _080AA774: adds r0, r4, #0 bl InitAnimationForceUpdate ldr r0, _080AA788 @ =0x00000101 - bl EnqueSFX + bl EnqueueSFX _080AA784: pop {r4, r5, r6, pc} .align 2, 0 @@ -10780,7 +10780,7 @@ _080AA7DA: strb r0, [r5] movs r0, #0x80 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _080AA806: ldrb r1, [r5] movs r0, #0x80 @@ -10989,7 +10989,7 @@ _080AA920: strh r0, [r7, #0x32] movs r0, #0x80 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _080AA99A: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -15575,7 +15575,7 @@ sub_080ACB90: @ 0x080ACB90 movs r2, #0x40 bl CreateFx ldr r0, _080ACBC8 @ =0x00000119 - bl EnqueSFX + bl EnqueueSFX bl DeleteThisEntity _080ACBC6: pop {r4, pc} diff --git a/asm/cucco.s b/asm/cucco.s index 13120cfc..2013d64c 100644 --- a/asm/cucco.s +++ b/asm/cucco.s @@ -93,7 +93,7 @@ _0806E52C: lsls r1, r1, #1 adds r1, r1, r4 ldrh r0, [r1] - bl EnqueSFX + bl EnqueueSFX _0806E552: adds r0, r5, #0 bl sub_0806E65C diff --git a/asm/cuccoAggr.s b/asm/cuccoAggr.s index a339f4cc..c8046759 100644 --- a/asm/cuccoAggr.s +++ b/asm/cuccoAggr.s @@ -194,7 +194,7 @@ sub_08038DD8: @ 0x08038DD8 movs r1, #4 bl InitializeAnimation ldr r0, _08038E14 @ =0x000001D9 - bl EnqueSFX + bl EnqueueSFX pop {pc} .align 2, 0 _08038E10: .4byte gUnk_080CF7BC @@ -519,7 +519,7 @@ _0803906C: movs r1, #0xeb lsls r1, r1, #1 adds r0, r5, r1 - bl EnqueSFX + bl EnqueueSFX b _080390BC _080390AA: movs r0, #4 @@ -743,7 +743,7 @@ sub_08039218: @ 0x08039218 bl InitializeAnimation _0803924C: ldr r0, _0803925C @ =0x000001D9 - bl EnqueSFX + bl EnqueueSFX pop {pc} .align 2, 0 _08039254: .4byte gUnk_080CF824 diff --git a/asm/cuccoChick.s b/asm/cuccoChick.s index d325fcc8..a1e8a869 100644 --- a/asm/cuccoChick.s +++ b/asm/cuccoChick.s @@ -81,7 +81,7 @@ _0806E782: cmp r1, #0 beq _0806E7A8 movs r0, #0xd6 - bl EnqueSFX + bl EnqueueSFX _0806E7A8: adds r0, r4, #0 bl sub_0806E838 diff --git a/asm/deathFx.s b/asm/deathFx.s index ca601373..63eafe4a 100644 --- a/asm/deathFx.s +++ b/asm/deathFx.s @@ -125,7 +125,7 @@ _08081702: movs r0, #1 strb r0, [r4, #0xc] movs r0, #0xff - bl EnqueSFX + bl EnqueueSFX _0808170C: adds r0, r4, #0 movs r1, #3 diff --git a/asm/dog.s b/asm/dog.s index c7170024..c0a02ab3 100644 --- a/asm/dog.s +++ b/asm/dog.s @@ -473,9 +473,9 @@ _08069EA0: adds r0, r4, #0 bl sub_080788E0 movs r0, #0xd1 - bl EnqueSFX + bl EnqueueSFX movs r0, #0xcd - bl EnqueSFX + bl EnqueueSFX _08069EC8: pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/enemy4D.s b/asm/enemy4D.s index c7216a38..03a8a479 100644 --- a/asm/enemy4D.s +++ b/asm/enemy4D.s @@ -234,7 +234,7 @@ sub_0803ED40: @ 0x0803ED40 movs r0, #0xf6 strb r0, [r1] adds r0, #0x65 - bl EnqueSFX + bl EnqueueSFX _0803ED74: pop {pc} .align 2, 0 diff --git a/asm/eyeSwitch.s b/asm/eyeSwitch.s index 5fa1d8e5..a91ff6eb 100644 --- a/asm/eyeSwitch.s +++ b/asm/eyeSwitch.s @@ -109,7 +109,7 @@ _08088728: ands r0, r1 strb r0, [r4, #0x10] ldr r0, _0808875C @ =0x00000111 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] diff --git a/asm/eyegore.s b/asm/eyegore.s index 43ca7f0d..a49491c7 100644 --- a/asm/eyegore.s +++ b/asm/eyegore.s @@ -105,7 +105,7 @@ _08030AC0: movs r0, #0x86 lsls r0, r0, #1 _08030AE0: - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_08031344 b _08030B0E @@ -124,7 +124,7 @@ _08030AFA: movs r0, #0xf strb r0, [r1] movs r0, #0xfe - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_08031344 _08030B0E: @@ -563,7 +563,7 @@ sub_08030E3C: @ 0x08030E3C lsls r1, r1, #9 str r1, [r0, #0x20] ldr r0, _08030E54 @ =0x00000157 - bl EnqueSFX + bl EnqueueSFX pop {pc} .align 2, 0 _08030E54: .4byte 0x00000157 @@ -589,7 +589,7 @@ sub_08030E70: @ 0x08030E70 bl sub_08030E80 movs r0, #0xac lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX pop {pc} thumb_func_start sub_08030E80 diff --git a/asm/fairy.s b/asm/fairy.s index b17899db..236beb3f 100644 --- a/asm/fairy.s +++ b/asm/fairy.s @@ -188,7 +188,7 @@ sub_0808D7B4: @ 0x0808D7B4 bl sub_0805E3A0 movs r0, #0x9b lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX ldrb r0, [r4, #0xb] cmp r0, #2 beq _0808D834 diff --git a/asm/fallingBoulder.s b/asm/fallingBoulder.s index 9431e511..9fbcfe62 100644 --- a/asm/fallingBoulder.s +++ b/asm/fallingBoulder.s @@ -216,7 +216,7 @@ _0802C36A: bne _0802C3CC movs r0, #0xa6 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX ldrb r1, [r4, #0x10] movs r0, #0x80 orrs r0, r1 diff --git a/asm/fan.s b/asm/fan.s index 51822d10..86fedf65 100644 --- a/asm/fan.s +++ b/asm/fan.s @@ -347,7 +347,7 @@ sub_0809F0E4: @ 0x0809F0E4 push {r4, r5, lr} adds r5, r0, #0 ldr r0, _0809F124 @ =0x00000183 - bl EnqueSFX + bl EnqueueSFX ldrb r0, [r5, #0xa] movs r1, #2 eors r1, r0 diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index ed64416f..7e099233 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -266,7 +266,7 @@ _08087D60: bl PositionRelative _08087DAA: ldr r0, _08087DB8 @ =0x00000111 - bl EnqueSFX + bl EnqueueSFX _08087DB0: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/frozenWaterElement.s b/asm/frozenWaterElement.s index d2e0ac77..97699a4d 100644 --- a/asm/frozenWaterElement.s +++ b/asm/frozenWaterElement.s @@ -96,7 +96,7 @@ sub_0809BF1C: @ 0x0809BF1C lsls r0, r0, #1 strh r0, [r1] adds r0, #0x73 - bl EnqueSFX + bl EnqueueSFX _0809BF6C: pop {r4, pc} .align 2, 0 @@ -129,7 +129,7 @@ _0809BFA0: cmp r1, #0 bne _0809BFAE ldr r0, _0809C09C @ =0x000001B3 - bl EnqueSFX + bl EnqueueSFX _0809BFAE: ldrh r0, [r5] cmp r0, #0x77 diff --git a/asm/lavaPlatform.s b/asm/lavaPlatform.s index c2dc7c10..3024b6b9 100644 --- a/asm/lavaPlatform.s +++ b/asm/lavaPlatform.s @@ -73,7 +73,7 @@ sub_0809229C: @ 0x0809229C bl InitAnimationForceUpdate movs r0, #0xbf lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX ldr r0, [r4, #0x54] movs r1, #3 bl InitializeAnimation @@ -281,7 +281,7 @@ _08092434: movs r1, #2 bl InitializeAnimation ldr r0, _08092468 @ =0x0000017B - bl EnqueSFX + bl EnqueueSFX _08092462: pop {r4, pc} .align 2, 0 @@ -335,7 +335,7 @@ _080924B8: strb r0, [r3] movs r0, #0xbe lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX b _080924DC _080924CC: movs r0, #2 @@ -344,7 +344,7 @@ _080924CC: beq _080924DC strb r2, [r3] ldr r0, _080924E0 @ =0x0000017D - bl EnqueSFX + bl EnqueueSFX _080924DC: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/likeLike.s b/asm/likeLike.s index e0b8c086..438361dd 100644 --- a/asm/likeLike.s +++ b/asm/likeLike.s @@ -485,7 +485,7 @@ _080280F0: bne _08028102 movs r0, #0x82 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _08028102: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/lockedDoor.s b/asm/lockedDoor.s index 22acc1b0..a41b0bfb 100644 --- a/asm/lockedDoor.s +++ b/asm/lockedDoor.s @@ -232,7 +232,7 @@ sub_080834B4: @ 0x080834B4 ldrb r2, [r2] bl SetTile ldr r0, _080834E8 @ =0x0000010B - bl EnqueSFX + bl EnqueueSFX _080834E6: pop {pc} .align 2, 0 @@ -323,7 +323,7 @@ _0808357A: adds r0, r4, #0 bl sub_08083814 ldr r0, _08083590 @ =0x0000010B - bl EnqueSFX + bl EnqueueSFX _0808358C: pop {r4, pc} .align 2, 0 diff --git a/asm/madderpillar.s b/asm/madderpillar.s index d569af3e..c98eafb5 100644 --- a/asm/madderpillar.s +++ b/asm/madderpillar.s @@ -117,7 +117,7 @@ _08029948: movs r1, #0x7f bl sub_0801D2B4 movs r0, #0xfe - bl EnqueSFX + bl EnqueueSFX ldr r0, [r5, #0x54] strb r4, [r0, #0xc] _08029970: @@ -298,7 +298,7 @@ sub_08029AA4: @ 0x08029AA4 adds r0, r1, #0 bl sub_08029EEC ldr r0, _08029ADC @ =0x0000019D - bl EnqueSFX + bl EnqueueSFX _08029ADA: pop {pc} .align 2, 0 @@ -335,7 +335,7 @@ sub_08029AE0: @ 0x08029AE0 bl sub_0801D2B4 movs r0, #0xc1 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _08029B28: pop {r4, pc} .align 2, 0 @@ -491,7 +491,7 @@ sub_08029C2C: @ 0x08029C2C movs r1, #0x7f bl sub_0801D2B4 movs r0, #0x6c - bl EnqueSFX + bl EnqueueSFX _08029C4E: pop {pc} @@ -625,7 +625,7 @@ sub_08029D14: @ 0x08029D14 movs r1, #0x7f bl sub_0801D2B4 movs r0, #0x6c - bl EnqueSFX + bl EnqueueSFX b _08029D70 _08029D42: adds r0, r4, #0 @@ -648,7 +648,7 @@ _08029D42: ldr r0, _08029D74 @ =gUnk_080FD298 str r0, [r4, #0x48] movs r0, #0x6b - bl EnqueSFX + bl EnqueueSFX _08029D70: pop {r4, pc} .align 2, 0 @@ -1132,7 +1132,7 @@ _0802A0B8: bl sub_08029EEC movs r0, #0x82 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0802A0E4: movs r0, #0x2e ldrsh r1, [r4, r0] @@ -1286,7 +1286,7 @@ _0802A1B0: @ jump table _0802A22C: movs r0, #0x97 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0802A234: pop {pc} .align 2, 0 diff --git a/asm/managerF.s b/asm/managerF.s index f2181c89..04cc1c91 100644 --- a/asm/managerF.s +++ b/asm/managerF.s @@ -747,7 +747,7 @@ _08059436: strh r0, [r2, #0x32] movs r0, #0xd8 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX bl DeleteThisEntity _08059476: pop {r4, pc} diff --git a/asm/minecartDoor.s b/asm/minecartDoor.s index a2988960..d75eec45 100644 --- a/asm/minecartDoor.s +++ b/asm/minecartDoor.s @@ -150,7 +150,7 @@ sub_08096BBC: @ 0x08096BBC ldrb r2, [r2] bl SetTile ldr r0, _08096BF4 @ =0x0000010B - bl EnqueSFX + bl EnqueueSFX _08096BF2: pop {r4, pc} .align 2, 0 @@ -277,7 +277,7 @@ sub_08096CB0: @ 0x08096CB0 adds r0, r4, #0 bl sub_08083814 ldr r0, _08096CE8 @ =0x0000010B - bl EnqueSFX + bl EnqueueSFX _08096CE6: pop {r4, pc} .align 2, 0 diff --git a/asm/minishEzlo.s b/asm/minishEzlo.s index c470a603..057a51b8 100644 --- a/asm/minishEzlo.s +++ b/asm/minishEzlo.s @@ -48,7 +48,7 @@ _08062FA0: ands r0, r1 strb r0, [r4] ldr r0, _08062FEC @ =0x000001CF - bl EnqueSFX + bl EnqueueSFX _08062FCC: ldrb r1, [r4] movs r0, #0x20 @@ -60,7 +60,7 @@ _08062FCC: strb r0, [r4] movs r0, #0x88 lsls r0, r0, #2 - bl EnqueSFX + bl EnqueueSFX _08062FE4: pop {r4, pc} .align 2, 0 diff --git a/asm/mountainMinish.s b/asm/mountainMinish.s index c9571ff4..60dde3ec 100644 --- a/asm/mountainMinish.s +++ b/asm/mountainMinish.s @@ -299,7 +299,7 @@ _08068068: lsls r0, r0, #1 adds r0, r0, r4 ldrh r0, [r0] - bl EnqueSFX + bl EnqueueSFX _0806807E: ldrb r1, [r6] movs r0, #2 diff --git a/asm/mulldozer.s b/asm/mulldozer.s index 4c449faa..8244ecb8 100644 --- a/asm/mulldozer.s +++ b/asm/mulldozer.s @@ -826,7 +826,7 @@ _08033238: strh r0, [r4, #0x32] movs r0, #0x86 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _08033278: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/object20.s b/asm/object20.s index 7fe7e16d..526b9cd8 100644 --- a/asm/object20.s +++ b/asm/object20.s @@ -64,7 +64,7 @@ _08087836: adds r0, r4, #0 bl sub_0801766C movs r0, #0xfd - bl EnqueSFX + bl EnqueueSFX pop {r4, pc} .align 2, 0 _08087884: .4byte gUnk_08120A54 diff --git a/asm/object24.s b/asm/object24.s index 16ac6466..00ed5c8b 100644 --- a/asm/object24.s +++ b/asm/object24.s @@ -93,7 +93,7 @@ sub_0808886C: @ 0x0808886C ldrh r0, [r0] bl SetFlag ldr r0, _080888B4 @ =0x0000016B - bl EnqueSFX + bl EnqueueSFX b _080888F2 .align 2, 0 _080888B4: .4byte 0x0000016B @@ -117,7 +117,7 @@ _080888D2: _080888DA: movs r0, #0x86 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX b _080888F0 _080888E4: cmp r4, r0 diff --git a/asm/object2A.s b/asm/object2A.s index da9945a6..d43ecb9c 100644 --- a/asm/object2A.s +++ b/asm/object2A.s @@ -140,6 +140,6 @@ _08089C96: bl InitializeAnimation movs r0, #0x92 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _08089CBA: pop {r4, r5, r6, pc} diff --git a/asm/object35.s b/asm/object35.s index 532c75c4..746cf2e4 100644 --- a/asm/object35.s +++ b/asm/object35.s @@ -220,7 +220,7 @@ sub_0808B9D4: @ 0x0808B9D4 ldrb r2, [r2] bl SetTile ldr r0, _0808BA0C @ =0x0000010B - bl EnqueSFX + bl EnqueueSFX _0808BA0A: pop {r4, pc} .align 2, 0 @@ -294,7 +294,7 @@ sub_0808BA6C: @ 0x0808BA6C movs r1, #2 bl sub_08083814 ldr r0, _0808BAA8 @ =0x0000010B - bl EnqueSFX + bl EnqueueSFX ldr r0, _0808BAAC @ =0x00004022 adds r1, r4, #0 adds r1, #0x76 diff --git a/asm/object43.s b/asm/object43.s index 48912c1e..55392ea6 100644 --- a/asm/object43.s +++ b/asm/object43.s @@ -263,7 +263,7 @@ _0808E084: _0808E0B8: .4byte gScreenTransition _0808E0BC: ldr r0, _0808E140 @ =0x00000115 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #0x12 movs r2, #0 diff --git a/asm/object44.s b/asm/object44.s index 98dc9e54..f97e9383 100644 --- a/asm/object44.s +++ b/asm/object44.s @@ -113,7 +113,7 @@ _0808E340: cmp r0, #0 beq _0808E34E ldr r0, _0808E350 @ =0x0000018B - bl EnqueSFX + bl EnqueueSFX _0808E34E: pop {r4, pc} .align 2, 0 diff --git a/asm/object64.s b/asm/object64.s index 03c201f9..dc28fa20 100644 --- a/asm/object64.s +++ b/asm/object64.s @@ -61,7 +61,7 @@ _08093E6A: cmp r0, #0 bne _08093E90 ldrh r0, [r2] - bl EnqueSFX + bl EnqueueSFX _08093E90: ldrb r1, [r4, #0xb] movs r0, #0x20 diff --git a/asm/object6A.s b/asm/object6A.s index 8eb8d64d..dd1859cc 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -637,7 +637,7 @@ _08094ED4: bl InitializeAnimation movs r0, #0xbf lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX b _08094F94 .align 2, 0 _08094F04: .4byte 0xFFFFE000 @@ -1992,7 +1992,7 @@ sub_08095954: @ 0x08095954 str r0, [r1] movs r0, #0x92 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r2, r5, #0 adds r2, #0x5a ldrb r1, [r2] diff --git a/asm/object87.s b/asm/object87.s index 9ee385e3..c6c724ce 100644 --- a/asm/object87.s +++ b/asm/object87.s @@ -67,7 +67,7 @@ _08099F70: bl InitializeAnimation movs r0, #0x92 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX b _0809A1B6 _08099F82: ldr r0, [r5, #0x50] diff --git a/asm/object8B.s b/asm/object8B.s index ddaa9483..a02afe6b 100644 --- a/asm/object8B.s +++ b/asm/object8B.s @@ -170,7 +170,7 @@ sub_0809B050: @ 0x0809B050 bl sub_0809B0B0 movs r0, #0x86 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0809B0A2: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/objectA0.s b/asm/objectA0.s index 4e8acfd6..fee7ebba 100644 --- a/asm/objectA0.s +++ b/asm/objectA0.s @@ -114,7 +114,7 @@ sub_0809F1B0: @ 0x0809F1B0 adds r1, r5, #0 bl PositionRelative movs r0, #0xec - bl EnqueSFX + bl EnqueueSFX b _0809F21E .align 2, 0 _0809F208: .4byte gUnk_08124684 diff --git a/asm/objectA8.s b/asm/objectA8.s index 5414d233..47032256 100644 --- a/asm/objectA8.s +++ b/asm/objectA8.s @@ -65,7 +65,7 @@ _0809FAE6: bl sub_0805E3A0 movs r0, #0x9b lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0809FB30: pop {pc} .align 2, 0 diff --git a/asm/objectBlockingStairs.s b/asm/objectBlockingStairs.s index 38850853..99edc949 100644 --- a/asm/objectBlockingStairs.s +++ b/asm/objectBlockingStairs.s @@ -184,7 +184,7 @@ _08092FF2: movs r1, #0x50 bl sub_0805E4E0 ldr r0, _0809303C @ =0x0000010F - bl EnqueSFX + bl EnqueueSFX adds r0, r6, #0 bl sub_08093248 b _080930E6 @@ -326,7 +326,7 @@ _08093104: strb r0, [r4, #0x15] strb r2, [r4, #0xe] ldr r0, _08093164 @ =0x0000010F - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_08093248 b _08093174 @@ -620,7 +620,7 @@ _0809334A: adds r1, r5, #0 bl sub_08093308 movs r0, #0x72 - bl EnqueSFX + bl EnqueueSFX pop {r4, r5, pc} .align 2, 0 diff --git a/asm/objectD.s b/asm/objectD.s index f6f6cf5c..d2296bfa 100644 --- a/asm/objectD.s +++ b/asm/objectD.s @@ -124,7 +124,7 @@ sub_080843F8: @ 0x080843F8 movs r2, #0 bl CreateFx ldr r0, _08084424 @ =0x0000010D - bl EnqueSFX + bl EnqueueSFX _08084420: pop {pc} .align 2, 0 @@ -150,7 +150,7 @@ sub_08084428: @ 0x08084428 bl SetFlag movs r0, #0x86 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _08084454: pop {r4, pc} .align 2, 0 diff --git a/asm/objectOnPillar.s b/asm/objectOnPillar.s index 344e6854..a6f43db9 100644 --- a/asm/objectOnPillar.s +++ b/asm/objectOnPillar.s @@ -360,7 +360,7 @@ sub_08097098: @ 0x08097098 movs r0, #0x20 strh r0, [r1] adds r0, #0xef - bl EnqueSFX + bl EnqueueSFX adds r0, r6, #0 adds r0, #0x70 ldrh r0, [r0] @@ -504,7 +504,7 @@ _080971B8: ldrh r0, [r0] bl SetFlag ldr r0, _080971D8 @ =0x0000010B - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_080971E0 movs r0, #1 diff --git a/asm/octorokGolden.s b/asm/octorokGolden.s index 7366c687..3256ab32 100644 --- a/asm/octorokGolden.s +++ b/asm/octorokGolden.s @@ -201,7 +201,7 @@ sub_08037D54: @ 0x08037D54 strh r0, [r2, #0x36] movs r0, #0x92 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX b _08037E0C .align 2, 0 _08037DBC: .4byte gUnk_080CF490 diff --git a/asm/picoBloom.s b/asm/picoBloom.s index 6ce20de9..0fa701a6 100644 --- a/asm/picoBloom.s +++ b/asm/picoBloom.s @@ -84,7 +84,7 @@ sub_08098AE8: @ 0x08098AE8 ands r0, r1 strb r0, [r4] ldr r0, _08098B0C @ =0x0000021B - bl EnqueSFX + bl EnqueueSFX _08098B08: pop {r4, pc} .align 2, 0 diff --git a/asm/puffstool.s b/asm/puffstool.s index cf03222f..70b4dca2 100644 --- a/asm/puffstool.s +++ b/asm/puffstool.s @@ -154,7 +154,7 @@ _080250C2: _08025104: movs r0, #0xc3 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0802510C: ldr r1, _08025118 @ =gUnk_080CBF9C adds r0, r4, #0 diff --git a/asm/pullableLever.s b/asm/pullableLever.s index f9dc53c4..ff888fe0 100644 --- a/asm/pullableLever.s +++ b/asm/pullableLever.s @@ -296,7 +296,7 @@ _080913E0: strb r5, [r1] movs r0, #0xcf lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0809142A: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -575,7 +575,7 @@ _080915E0: bhi _08091640 movs r0, #0x86 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] @@ -593,7 +593,7 @@ _08091640: movs r0, #0x10 strb r0, [r5, #0xf] adds r0, #0xff - bl EnqueSFX + bl EnqueueSFX _08091656: add sp, #4 pop {r3, r4} diff --git a/asm/pushableFurniture.s b/asm/pushableFurniture.s index fd04b86c..2e0e74d0 100644 --- a/asm/pushableFurniture.s +++ b/asm/pushableFurniture.s @@ -230,7 +230,7 @@ _0808FAF2: bne _0808FB0A movs r0, #0x86 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0808FB0A: ldrb r0, [r4, #0xa] cmp r0, #2 @@ -271,7 +271,7 @@ _0808FB3E: movs r0, #2 strb r0, [r4, #0xd] movs r0, #0x80 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_0808FF20 b _0808FB64 @@ -598,7 +598,7 @@ _0808FDB4: strb r0, [r4, #0xe] _0808FDB6: ldr r0, _0808FDE0 @ =0x0000010F - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_08090254 ldr r1, _0808FDE4 @ =gUnk_080B4488 diff --git a/asm/pushableGrave.s b/asm/pushableGrave.s index 00dcfd34..d65652f4 100644 --- a/asm/pushableGrave.s +++ b/asm/pushableGrave.s @@ -293,7 +293,7 @@ _080977BC: b _080977E4 _080977C8: movs r0, #0x72 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_080977F4 ldrb r0, [r4, #0xa] diff --git a/asm/pushableLever.s b/asm/pushableLever.s index e20940d6..cb21b55c 100644 --- a/asm/pushableLever.s +++ b/asm/pushableLever.s @@ -62,7 +62,7 @@ sub_08098294: @ 0x08098294 bl SetTile movs r0, #0xb5 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #0x1e bl sub_0805E4E0 @@ -315,7 +315,7 @@ _08098492: bne _080984C2 movs r0, #0x82 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _080984C2: pop {r4, pc} .align 2, 0 diff --git a/asm/pushableRock.s b/asm/pushableRock.s index 16ba39cb..c9d147b7 100644 --- a/asm/pushableRock.s +++ b/asm/pushableRock.s @@ -114,7 +114,7 @@ _0808A598: adds r0, r4, #0 bl InitializeAnimation ldr r0, _0808A5C8 @ =0x0000010F - bl EnqueSFX + bl EnqueueSFX b _0808A5DE .align 2, 0 _0808A5C8: .4byte 0x0000010F diff --git a/asm/pushableStatue.s b/asm/pushableStatue.s index 4cc9ad88..efd6cdfa 100644 --- a/asm/pushableStatue.s +++ b/asm/pushableStatue.s @@ -463,7 +463,7 @@ sub_08089538: @ 0x08089538 movs r0, #0x20 strh r0, [r1] adds r0, #0xef - bl EnqueSFX + bl EnqueueSFX adds r0, r5, #0 adds r0, #0x80 ldrh r0, [r0] diff --git a/asm/rope.s b/asm/rope.s index c65ccb53..d16b913c 100644 --- a/asm/rope.s +++ b/asm/rope.s @@ -214,7 +214,7 @@ _080314CC: adds r0, r4, #0 bl UpdateSpriteForCollisionLayer movs r0, #0x84 - bl EnqueSFX + bl EnqueueSFX _080314FA: pop {r4, pc} diff --git a/asm/scissorsBeetle.s b/asm/scissorsBeetle.s index 04e7d56d..956643ba 100644 --- a/asm/scissorsBeetle.s +++ b/asm/scissorsBeetle.s @@ -356,7 +356,7 @@ _08038B18: movs r1, #0 bl sub_08038C84 ldr r0, _08038B60 @ =0x0000015B - bl EnqueSFX + bl EnqueueSFX _08038B5E: pop {r4, pc} .align 2, 0 diff --git a/asm/sensorBladeTrap.s b/asm/sensorBladeTrap.s index f95f02b4..1351ee98 100644 --- a/asm/sensorBladeTrap.s +++ b/asm/sensorBladeTrap.s @@ -200,7 +200,7 @@ sub_0802BB10: @ 0x0802BB10 eors r1, r2 strb r1, [r0, #0x15] movs r0, #0x74 - bl EnqueSFX + bl EnqueueSFX pop {pc} .align 2, 0 diff --git a/asm/sluggula.s b/asm/sluggula.s index 8ae3f9a9..d75ab61a 100644 --- a/asm/sluggula.s +++ b/asm/sluggula.s @@ -266,7 +266,7 @@ _08023D6E: cmp r0, #0 bne _08023E0A ldr r0, _08023D90 @ =0x0000012D - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #4 bl InitializeAnimation @@ -289,7 +289,7 @@ _08023D94: orrs r0, r1 strb r0, [r4, #0x18] movs r0, #0x84 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl UpdateSpriteForCollisionLayer b _08023E0A diff --git a/asm/smallIceBlock.s b/asm/smallIceBlock.s index e851c0e6..ab6f9052 100644 --- a/asm/smallIceBlock.s +++ b/asm/smallIceBlock.s @@ -104,7 +104,7 @@ sub_08099248: @ 0x08099248 strb r0, [r4, #0xc] strb r1, [r4, #0xe] ldr r0, _0809927C @ =0x000001B3 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_08099330 ldrb r0, [r4, #0xa] @@ -200,7 +200,7 @@ sub_08099310: @ 0x08099310 bl sub_08099468 movs r0, #0xd9 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0809932E: pop {r4, pc} @@ -406,7 +406,7 @@ sub_080994B8: @ 0x080994B8 push {r4, r5, r6, lr} adds r5, r0, #0 ldr r0, _08099530 @ =0x000001B1 - bl EnqueSFX + bl EnqueueSFX adds r0, r5, #0 adds r0, #0x6c ldrh r0, [r0] diff --git a/asm/spearMoblin.s b/asm/spearMoblin.s index 123692be..6d6ba820 100644 --- a/asm/spearMoblin.s +++ b/asm/spearMoblin.s @@ -350,7 +350,7 @@ _080284B4: strb r0, [r4, #0x15] movs r0, #0x8f lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX b _0802850A _080284D2: strb r1, [r4, #0xc] @@ -477,7 +477,7 @@ _080285BC: cmp r0, #0 bne _080285D6 movs r0, #0xf0 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #2 movs r2, #0x40 diff --git a/asm/specialFx.s b/asm/specialFx.s index 27ece1b6..383cd385 100644 --- a/asm/specialFx.s +++ b/asm/specialFx.s @@ -101,7 +101,7 @@ _0808456C: cmp r0, #0 bne _08084582 ldrh r0, [r4, #2] - bl EnqueSFX + bl EnqueueSFX _08084582: ldrb r1, [r5, #0xb] movs r0, #0x80 diff --git a/asm/spikedBeetle.s b/asm/spikedBeetle.s index bcaf117b..a5035592 100644 --- a/asm/spikedBeetle.s +++ b/asm/spikedBeetle.s @@ -366,7 +366,7 @@ _0802B8CC: strb r0, [r4, #0xe] _0802B8D4: ldr r0, _0802B8DC @ =0x0000012B - bl EnqueSFX + bl EnqueueSFX _0802B8DA: pop {r4, pc} .align 2, 0 @@ -419,7 +419,7 @@ _0802B91C: adds r0, r3, #0 bl InitializeAnimation ldr r0, _0802B944 @ =0x0000012B - bl EnqueSFX + bl EnqueueSFX _0802B940: pop {r4, pc} .align 2, 0 diff --git a/asm/stalfos.s b/asm/stalfos.s index 309afcfa..1476b093 100644 --- a/asm/stalfos.s +++ b/asm/stalfos.s @@ -153,7 +153,7 @@ _08039390: strb r0, [r1, #0xb] movs r0, #0xc3 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX b _080393DC _080393CA: adds r0, r1, #0 @@ -162,7 +162,7 @@ _080393CA: strb r2, [r0] movs r0, #0xc3 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX str r4, [r5, #0x54] _080393DC: adds r0, r5, #0 @@ -452,7 +452,7 @@ sub_080395D8: @ 0x080395D8 movs r0, #0x5a strb r0, [r1] movs r0, #0x7d - bl EnqueSFX + bl EnqueueSFX _08039602: pop {r4, pc} @@ -509,7 +509,7 @@ _0803963A: adds r0, r2, #0 bl sub_080399C4 ldr r0, _0803966C @ =0x0000014B - bl EnqueSFX + bl EnqueueSFX _0803966A: pop {pc} .align 2, 0 @@ -764,7 +764,7 @@ _08039836: adds r0, r2, #0 bl InitAnimationForceUpdate ldr r0, _08039854 @ =0x0000012B - bl EnqueSFX + bl EnqueueSFX pop {pc} .align 2, 0 _08039854: .4byte 0x0000012B @@ -1018,7 +1018,7 @@ sub_08039A20: @ 0x08039A20 movs r0, #0x3c strb r0, [r1] movs r0, #0xfb - bl EnqueSFX + bl EnqueueSFX _08039A44: pop {r4, pc} .align 2, 0 diff --git a/asm/vaati.s b/asm/vaati.s index 11f143cd..49e70e22 100644 --- a/asm/vaati.s +++ b/asm/vaati.s @@ -115,11 +115,11 @@ _08066B20: _08066B2A: movs r0, #0x87 lsls r0, r0, #2 - bl EnqueSFX + bl EnqueueSFX b _08066B66 _08066B34: ldr r0, _08066B3C @ =0x0000021E - bl EnqueSFX + bl EnqueueSFX b _08066B66 .align 2, 0 _08066B3C: .4byte 0x0000021E @@ -140,7 +140,7 @@ _08066B52: adds r0, r4, #0 bl sub_0805DE18 ldr r0, _08066B70 @ =0x0000021D - bl EnqueSFX + bl EnqueueSFX _08066B66: ldrb r1, [r5] movs r0, #0x7f diff --git a/asm/vaatiArm.s b/asm/vaatiArm.s index 33ac5c87..c3ec0207 100644 --- a/asm/vaatiArm.s +++ b/asm/vaatiArm.s @@ -3298,7 +3298,7 @@ _08043D92: cmp r2, #4 bls _08043D92 movs r0, #0xfe - bl EnqueSFX + bl EnqueueSFX pop {r4, r5, pc} .align 2, 0 _08043DAC: .4byte gUnk_080D13E9 diff --git a/asm/vaatiEyesMacro.s b/asm/vaatiEyesMacro.s index cd272756..8a768333 100644 --- a/asm/vaatiEyesMacro.s +++ b/asm/vaatiEyesMacro.s @@ -100,7 +100,7 @@ _0802ED0E: beq _0802ED24 movs r0, #0xbd lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX _0802ED24: ldrb r0, [r5] strb r0, [r6] @@ -123,7 +123,7 @@ _0802ED3E: cmp r0, #0xff beq _0802ED4E movs r0, #0xe5 - bl EnqueSFX + bl EnqueueSFX _0802ED4E: movs r0, #0xff strb r0, [r5] diff --git a/asm/vaatiReborn.s b/asm/vaatiReborn.s index 74b23e66..0b4450b3 100644 --- a/asm/vaatiReborn.s +++ b/asm/vaatiReborn.s @@ -336,7 +336,7 @@ _0806B8C4: adds r0, #1 strb r0, [r5, #0xd] movs r0, #0xf4 - bl EnqueSFX + bl EnqueueSFX movs r0, #0 strb r0, [r5, #0xe] _0806B8FA: diff --git a/asm/wallMaster.s b/asm/wallMaster.s index da7410a1..c2a51fea 100644 --- a/asm/wallMaster.s +++ b/asm/wallMaster.s @@ -243,7 +243,7 @@ sub_0802A5B8: @ 0x0802A5B8 cmp r0, #0 bne _0802A60E ldr r0, _0802A5E4 @ =0x0000012D - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 movs r1, #0 bl InitializeAnimation diff --git a/asm/warpPoint.s b/asm/warpPoint.s index 46bf961b..f2f0d1fa 100644 --- a/asm/warpPoint.s +++ b/asm/warpPoint.s @@ -110,7 +110,7 @@ _0808B4F8: strb r2, [r1, #0x14] movs r0, #0x89 lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX ldrb r1, [r4, #0xf] adds r1, #0x10 adds r0, r4, #0 @@ -142,7 +142,7 @@ _0808B554: movs r0, #0x3c strb r0, [r4, #0xf] adds r0, #0xd6 - bl EnqueSFX + bl EnqueueSFX _0808B562: pop {r4, pc} diff --git a/asm/waterDrop.s b/asm/waterDrop.s index 664c8b9d..12be5881 100644 --- a/asm/waterDrop.s +++ b/asm/waterDrop.s @@ -85,7 +85,7 @@ sub_0802A2B4: @ 0x0802A2B4 orrs r0, r1 strb r0, [r2] movs r0, #0x84 - bl EnqueSFX + bl EnqueueSFX b _0802A2E2 _0802A2DC: adds r0, r4, #0 diff --git a/asm/windTribespeople.s b/asm/windTribespeople.s index dd4e7087..97aab657 100644 --- a/asm/windTribespeople.s +++ b/asm/windTribespeople.s @@ -147,7 +147,7 @@ sub_0806CA5C: @ 0x0806CA5C cmp r0, #0xa bne _0806CA7E movs r0, #0xe8 - bl EnqueSFX + bl EnqueueSFX _0806CA7E: ldrh r0, [r4, #0x10] cmp r0, #0 diff --git a/asm/wizzrobeFire.s b/asm/wizzrobeFire.s index da743284..43f398ff 100644 --- a/asm/wizzrobeFire.s +++ b/asm/wizzrobeFire.s @@ -292,7 +292,7 @@ _0802FD18: bl SetTile movs r0, #0xab lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 @@ -337,7 +337,7 @@ _0802FD94: strb r0, [r4, #0xe] movs r0, #0xab lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_0802F8E4 ldrb r1, [r4, #0x15] diff --git a/asm/wizzrobeIce.s b/asm/wizzrobeIce.s index c0634a4c..f261759f 100644 --- a/asm/wizzrobeIce.s +++ b/asm/wizzrobeIce.s @@ -319,7 +319,7 @@ _0802FFF0: bl SetTile movs r0, #0xab lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX ldrb r1, [r4, #0x15] lsrs r1, r1, #3 adds r0, r4, #0 @@ -364,7 +364,7 @@ _0803006C: strb r0, [r4, #0xe] movs r0, #0xab lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_0802F8E4 ldrb r1, [r4, #0x15] diff --git a/asm/wizzrobeWind.s b/asm/wizzrobeWind.s index 4025a460..b411d030 100644 --- a/asm/wizzrobeWind.s +++ b/asm/wizzrobeWind.s @@ -334,7 +334,7 @@ _0802F6F0: strb r0, [r4, #0x10] movs r0, #0xab lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] @@ -389,7 +389,7 @@ _0802F76C: strb r0, [r4, #0xe] movs r0, #0xab lsls r0, r0, #1 - bl EnqueSFX + bl EnqueueSFX adds r0, r4, #0 bl sub_0802F8E4 ldrb r1, [r4, #0x15] diff --git a/include/functions.h b/include/functions.h index adef870f..914be456 100644 --- a/include/functions.h +++ b/include/functions.h @@ -192,7 +192,7 @@ extern void sub_08001242(Entity*); extern u32 sub_08003FC4(Entity*, u32); extern u32 sub_080043E8(Entity*); extern void sub_08001290(Entity*, u32); -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); extern void sub_08004596(Entity*, u32); extern u32 sub_0807953C(void); extern void ResetPlayer(void); diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index 03e02143..d25b4d9a 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -343,7 +343,7 @@ void sub_08031EE8(Entity* this) { if (this->height.HALF.HI < 1) { draw = this->spriteSettings.b.draw; if (!draw) - EnqueSFX(299); + EnqueueSFX(299); this->spriteSettings.b.draw = 1; } diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index a454402a..aa51a736 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -131,7 +131,7 @@ void sub_08021984(Entity* this) { this->height.HALF.HI = -0x80; this->spriteRendering.b3 = 1; this->spriteOrientation.flipY = 1; - EnqueSFX(0x12d); + EnqueueSFX(0x12d); } if (sub_08003FC4(this, 0x1800) == 0) { @@ -198,7 +198,7 @@ void sub_08021AD8(Entity* this) { return; } this->direction = (u8)tmp; - EnqueSFX(0x7c); + EnqueueSFX(0x7c); } sub_080AEFE0(this); if (!sub_08003FC4(this, 0x1800)) diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c index 2229aec2..b58ef0d6 100644 --- a/src/enemy/bladeTrap.c +++ b/src/enemy/bladeTrap.c @@ -3,7 +3,7 @@ #include "room.h" extern void sub_080A2CC0(); extern void sub_0806F69C(); -extern void EnqueSFX(); +extern void EnqueueSFX(); extern Entity* GetCurrentRoomProperty(); void BladeTrap(Entity* ent) { @@ -27,7 +27,7 @@ void BladeTrap(Entity* ent) { *puVar3 = uVar1 - 1; if ((*puVar3) == 0) { if ((u16)(ent->direction & 0x80) == 0) { - EnqueSFX(0x74); + EnqueueSFX(0x74); } sub_080A2CC0((EntityData*)ent, &ent->attachedEntity, puVar3); } diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index 738d2c13..9b816805 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -213,7 +213,7 @@ void sub_0801F1B0(Entity* this) { if (this->frames.all & 1) { this->frames.all ^= 1; this->damageType = 90; - EnqueSFX(299); + EnqueueSFX(299); } sub_080AEFE0(this); if (sub_08003FC4(this, 0x4000) == 0) @@ -400,7 +400,7 @@ void sub_0801F584(Entity* this) { if (this->frames.all & 0x1) { this->frames.all ^= 1; this->damageType = 91; - EnqueSFX(299); + EnqueueSFX(299); } sub_080AEFE0(this); if (sub_08003FC4(this, 0x4000) == 0) @@ -548,7 +548,7 @@ void sub_0801F884(Entity* this) { ent->entityType.parameter = 64; this->action = 4; this->damageType = 165; - EnqueSFX(0x193); + EnqueueSFX(0x193); } } } @@ -577,7 +577,7 @@ void sub_0801F940(Entity* this) { if (this->frames.all & 0x10) { if (this->frames.all & 1) { this->frames.all ^= 1; - EnqueSFX(299); + EnqueueSFX(299); } sub_080AEFE0(this); if (sub_08003FC4(this, 0x4000) == 0) diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c index f1169ae7..686e5100 100644 --- a/src/enemy/cuccoChickAggr.c +++ b/src/enemy/cuccoChickAggr.c @@ -49,7 +49,7 @@ void sub_08022988(Entity* this) { this->frameIndex = 1; this->field_0x20 = 0x10000; - EnqueSFX(0xd6); + EnqueueSFX(0xd6); } ProcessMovement(this); @@ -75,7 +75,7 @@ void sub_080229F8(Entity* this) { sub_08022B44(this); } else { this->field_0x20 = 0x10000; - EnqueSFX(0xd6); + EnqueueSFX(0xd6); } } } @@ -143,7 +143,7 @@ void sub_08022B44(Entity *this){ if (this->direction & 0xf) this->spriteSettings.b.flipX = (this->direction >> 4)^1; - EnqueSFX(0xd6); + EnqueueSFX(0xd6); } diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c index b7e5bf0f..b0c63e8a 100644 --- a/src/enemy/darkNut.c +++ b/src/enemy/darkNut.c @@ -90,7 +90,7 @@ void sub_08020BB8(Entity* this) { } this->action = 10; sub_08021218(this, 0xb, this->animationState); - EnqueSFX(0x15d); + EnqueueSFX(0x15d); sub_08021588(this); break; case 0x4c: @@ -273,7 +273,7 @@ void sub_08021038(Entity* this) { pEVar2->parent = this; this->attachedEntity = pEVar2; } - EnqueSFX(270); + EnqueueSFX(270); } if (this->frames.all & 0x80) { @@ -295,7 +295,7 @@ void sub_080210A8(Entity* this) { if (this->frames.all & 1) { this->frames.all = 0; sub_08021588(this); - EnqueSFX(349); + EnqueueSFX(349); } else if (this->frames.all & 0x80) { sub_08021390(this); } @@ -313,7 +313,7 @@ void sub_080210E4(Entity* this) { this->attachedEntity = ent; } - EnqueSFX(270); + EnqueueSFX(270); } sub_08021644(this); @@ -575,13 +575,13 @@ void sub_0802159C(Entity* this) { ent->parent = this; this->attachedEntity = ent; } - EnqueSFX(0x116); + EnqueueSFX(0x116); } else if (this->frames.all == 2) { this->frames.all = 0; sub_08021588(this); } else if (this->frames.all & 0x20) { this->frames.all &= ~0x20; - EnqueSFX(0x115); + EnqueueSFX(0x115); } } @@ -596,7 +596,7 @@ void sub_08021600(Entity* this) { ent->parent = this; this->attachedEntity = ent; } - EnqueSFX(0x10e); + EnqueueSFX(0x10e); } else if (this->frames.all == 2) { this->frames.all = 0; sub_08021588(this); @@ -606,7 +606,7 @@ void sub_08021600(Entity* this) { void sub_08021644(Entity* this) { if (this->frames.all & 0x20) { this->frames.all &= ~0x20; - EnqueSFX(0x7d); + EnqueueSFX(0x7d); } } diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index 5d5ca031..e30dfa28 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -102,7 +102,7 @@ void sub_080220F0(Entity* this) { fx->y.HALF.HI += off->v; } } - EnqueSFX(260); + EnqueueSFX(260); } else if (this->frames.all & 1) { this->field_0x44 = 4; } diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c index cf41451e..86f6ce0d 100644 --- a/src/enemy/lakitu.c +++ b/src/enemy/lakitu.c @@ -50,7 +50,7 @@ extern u32 sub_080041A0(Entity *, Entity *, u32, u32); extern u32 GetFacingDirection(Entity *, Entity *); // sub_0803CB64 -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); typedef struct { s8 x; @@ -343,7 +343,7 @@ void sub_0803CB64(Entity *this) { PositionRelative(this, cloud, offset->x << 16, offset->y << 16); - EnqueSFX(0x193); + EnqueueSFX(0x193); } void sub_0803CBAC(Entity *this) { diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c index 3b9fe027..e4b25fa9 100644 --- a/src/enemy/octorok.c +++ b/src/enemy/octorok.c @@ -142,7 +142,7 @@ void Octorok_ShootNut(Entity* this) { ent->y.HALF.HI += off[1]; ent->height.HALF.HI = -3; this->frames.all &= 0xfe; - EnqueSFX(0x18d); + EnqueueSFX(0x18d); } } diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index 74e80188..7ef108b4 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -183,7 +183,7 @@ void Rollobite_RolledUp(Entity* this) { sub_08078930(this); } else { if (unk == 1) - EnqueSFX(260); + EnqueueSFX(260); if ((this->direction & 0x80) == 0) sub_080AEFE0(this); diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index 9468d7a2..05117e73 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -62,7 +62,7 @@ void sub_08029318(Entity* this) { this->field_0x82.HALF.HI = 0x41; this->flags2 &= 0xfc; this->field_0x80.HALF.LO = gPlayerEntity.spritePriority.b1; - EnqueSFX(0x104); + EnqueueSFX(0x104); } else { if (this->field_0x43 != 0) { sub_0804A9FC(this, 0x1c); diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index 6a6d19e8..273ed695 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -69,7 +69,7 @@ void sub_0802244C(Entity* this) { if (this->action == 3) { this->action = 4; InitializeAnimation(this, 3); - EnqueSFX(0x194); + EnqueueSFX(0x194); } } } else { @@ -132,7 +132,7 @@ void sub_08022654(Entity* this) { this->previousActionFlag = 2; this->spriteSettings.b.draw = 1; InitializeAnimation(this, 5); - EnqueSFX(0x7d); + EnqueueSFX(0x7d); UpdateSpriteForCollisionLayer(this); /* fallthrough */ case 2: @@ -180,7 +180,7 @@ void sub_08022780(Entity* this) { if (this->frames.all & 0x80) { this->action = 4; InitializeAnimation(this, 3); - EnqueSFX(0x194); + EnqueueSFX(0x194); } } @@ -223,7 +223,7 @@ void sub_08022854(Entity* this) { this->action = 7; this->damageType = 0x5c; InitializeAnimation(this, 5); - EnqueSFX(0x7d); + EnqueueSFX(0x7d); } } } diff --git a/src/npc/carlov.c b/src/npc/carlov.c index 25c983ae..6cffc865 100644 --- a/src/npc/carlov.c +++ b/src/npc/carlov.c @@ -10,7 +10,7 @@ extern void sub_0807DD50(Entity *); extern void sub_0807DD94(Entity *,u32); -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); extern void sub_08080964(u32,u32); @@ -25,11 +25,11 @@ void Carlov(Entity *this) } if ((this->frames.all & 0x10) != 0) { this->frames.all = this->frames.all & 0xef; - EnqueSFX(0x104); + EnqueueSFX(0x104); sub_08080964(0x10,0); } if ((this->frames.all & 0x20) != 0) { this->frames.all = this->frames.all & 0xdf; - EnqueSFX(0x7c); + EnqueueSFX(0x7c); } } \ No newline at end of file diff --git a/src/npc/melari.c b/src/npc/melari.c index 0aceb1e1..2262d14e 100644 --- a/src/npc/melari.c +++ b/src/npc/melari.c @@ -12,7 +12,7 @@ extern void sub_0806F118(Entity*); extern void sub_0807DDAC(Entity*, u32); extern void sub_0807DDE4(Entity*); extern u32 sub_080040A8(Entity*); -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); extern u32 sub_0801E99C(Entity*); extern void sub_08078784(Entity*, u32); extern void sub_0807000C(Entity*); @@ -99,7 +99,7 @@ void sub_08068780(Entity* this) { if (sub_080040A8(this) == 0) { PlaySFX(gUnk_0811153E[(s32)Random() % 3]); } else { - EnqueSFX(gUnk_08111538[(s32)Random() % 3]); + EnqueueSFX(gUnk_08111538[(s32)Random() % 3]); } ent = CreateFx(this, 0x3d, 0x20); if (ent != NULL) { diff --git a/src/npc/postman.c b/src/npc/postman.c index 8ffc696c..0624935b 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -27,7 +27,7 @@ extern u32 GetFacingDirection(Entity*, Entity*); extern void sub_080606D8(Entity*); extern void sub_0807DD94(Entity*, u32); extern void sub_080788E0(Entity*); -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); extern void sub_080606C0(Entity*); extern void sub_0800451C(Entity*); extern void sub_08078784(Entity*, u32); @@ -178,7 +178,7 @@ void sub_08060528(Entity *this) this->field_0x20 = 0x20000; this->field_0x6c.HALF.HI = 1; sub_080788E0(this); - EnqueSFX(0x7c); + EnqueueSFX(0x7c); } else { this->field_0x6a.HWORD -= 1; diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index efa72fb2..047f5282 100644 --- a/src/object/lightableSwitch.c +++ b/src/object/lightableSwitch.c @@ -7,7 +7,7 @@ extern void sub_0809EB30(Entity*); extern void sub_0809EAD8(Entity*); extern void sub_0809EABC(Entity*); -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); extern void sub_080A2CC0(Entity*, Entity**, u16*); extern Entity* GetCurrentRoomProperty(u32); extern void SetTile(u32, u32, u32); @@ -50,7 +50,7 @@ void sub_0809EA80(Entity* this) { } else { SetFlag(this->field_0x86); } - EnqueSFX(0x110); + EnqueueSFX(0x110); } sub_0809EABC(this); } @@ -123,7 +123,7 @@ void sub_0809EBD8(Entity* this) { this->actionDelay = 0x10; this->frameIndex = 2; SetFlag(this->field_0x86); - EnqueSFX(0x110); + EnqueueSFX(0x110); } } @@ -137,7 +137,7 @@ void sub_0809EC08(Entity* this) { this->action = 1; this->frameIndex = 3; ClearFlag(this->field_0x86); - EnqueSFX(0x110); + EnqueueSFX(0x110); } } } diff --git a/src/object/mask.c b/src/object/mask.c index cd5d13f4..a936e7e1 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -20,7 +20,7 @@ extern void sub_08000148(u16, u16, u32); extern s16 sub_080001DA(u16, u32); extern u16 sub_080002E0(u16, u32); -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); extern void sub_080044EC(Entity *, u16); extern void sub_0805457C(Entity *, s32); @@ -115,7 +115,7 @@ void sub_08092B0C(Entity *this) { switch (this->entityType.parameter & 0xC0) { case 0x80: - EnqueSFX(0x72); + EnqueueSFX(0x72); case 0x40: SetFlag(this->field_0x86); break; diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index b0df5777..7aa6ec5d 100644 --- a/src/object/metalDoor.c +++ b/src/object/metalDoor.c @@ -6,7 +6,7 @@ extern u32 sub_08083734(Entity*, u32); extern void sub_080A080C(Entity*); extern void sub_0806F69C(Entity*); -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); extern void sub_080A0870(Entity*); extern void PlaySFX(u32); extern u32 sub_080001DA(u32, u32); @@ -71,7 +71,7 @@ void sub_080A074C(Entity *this) ent->x.HALF.HI -= 0xc; ent->y.HALF.HI -= 0xc; } - EnqueSFX(0x10b); + EnqueueSFX(0x10b); } } diff --git a/src/object/object2A.c b/src/object/object2A.c index 8db435e5..032db162 100644 --- a/src/object/object2A.c +++ b/src/object/object2A.c @@ -36,5 +36,5 @@ void sub_08089B18(Entity *this) return; } } - EnqueSFX(0x124); + EnqueueSFX(0x124); } \ No newline at end of file diff --git a/src/object/pot.c b/src/object/pot.c index 8931598f..b7cfc8d6 100755 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -92,7 +92,7 @@ void sub_08082310(Entity* this) { this->actionDelay = 64; } SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); - EnqueSFX(0x10F); + EnqueueSFX(0x10F); break; case 0x4067: SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); diff --git a/src/object/railtrack.c b/src/object/railtrack.c index d8227bef..ef45e554 100644 --- a/src/object/railtrack.c +++ b/src/object/railtrack.c @@ -6,7 +6,7 @@ extern u32* GetLayerByIndex(u32); extern void sub_08085394(Entity*); extern void sub_0808543C(Entity*); -extern void EnqueSFX(u32); +extern void EnqueueSFX(u32); extern u32 sub_080854A8(Entity*); extern void SetTile(u32, u32, u32); @@ -54,7 +54,7 @@ void sub_08085264(Entity* this) { this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3; InitializeAnimation(this, this->animationState); sub_0808543C(this); - EnqueSFX(0x151); + EnqueueSFX(0x151); } } @@ -66,7 +66,7 @@ void sub_080852B4(Entity* this) { this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3; InitializeAnimation(this, this->animationState); sub_08085394(this); - EnqueSFX(0x151); + EnqueueSFX(0x151); } } @@ -96,7 +96,7 @@ void sub_08085308(Entity* this) { this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3; InitializeAnimation(this, this->animationState); sub_0808543C(this); - EnqueSFX(0x151); + EnqueueSFX(0x151); } } }