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

Enque -> Enqueue

This commit is contained in:
Behemoth 2020-09-01 01:47:04 +02:00
parent 0a2c0ad456
commit 723d233967
106 changed files with 212 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/armos.s
View File

@ -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

2
asm/ballChainSoldier.s
View File

@ -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

2
asm/bigIceBlock.s
View File

@ -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:

4
asm/bigPushableLever.s
View File

@ -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

2
asm/blockPushed.s
View File

@ -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

6
asm/bobomb.s
View File

@ -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

4
asm/bollard.s
View File

@ -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

2
asm/book.s
View File

@ -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

2
asm/bossDoor.s
View File

@ -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

2
asm/businessScrub.s
View File

@ -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

8
asm/businessScrubPrologue.s
View File

@ -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

2
asm/castorWildsStatue.s
View File

@ -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

4
asm/cloudPiranha.s
View File

@ -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

4
asm/code_080043E8.s
View File

@ -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

2
asm/code_0800857C.s
View File

@ -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

2
asm/code_08016DF8.s
View File

@ -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

2
asm/code_08019444.s
View File

@ -4328,7 +4328,7 @@ _0801B4AC:
cmp r0, #0
bne _0801B4C0
movs r0, #0xfb
bl EnqueSFX
bl EnqueueSFX
_0801B4C0:
pop {r4, pc}
.align 2, 0

32
asm/code_080A5574.s
View File

@ -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}

2
asm/cucco.s
View File

@ -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

6
asm/cuccoAggr.s
View File

@ -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

2
asm/cuccoChick.s
View File

@ -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

2
asm/deathFx.s
View File

@ -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

4
asm/dog.s
View File

@ -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

2
asm/enemy4D.s
View File

@ -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

2
asm/eyeSwitch.s
View File

@ -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]

8
asm/eyegore.s
View File

@ -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

2
asm/fairy.s
View File

@ -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

2
asm/fallingBoulder.s
View File

@ -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

2
asm/fan.s
View File

@ -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

2
asm/figurineDevice.s
View File

@ -266,7 +266,7 @@ _08087D60:
bl PositionRelative
_08087DAA:
ldr r0, _08087DB8 @ =0x00000111
bl EnqueSFX
bl EnqueueSFX
_08087DB0:
pop {r4, r5, pc}
.align 2, 0

4
asm/frozenWaterElement.s
View File

@ -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

8
asm/lavaPlatform.s
View File

@ -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

2
asm/likeLike.s
View File

@ -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

4
asm/lockedDoor.s
View File

@ -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

16
asm/madderpillar.s
View File

@ -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

2
asm/managerF.s
View File

@ -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}

4
asm/minecartDoor.s
View File

@ -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

4
asm/minishEzlo.s
View File

@ -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

2
asm/mountainMinish.s
View File

@ -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

2
asm/mulldozer.s
View File

@ -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

2
asm/object20.s
View File

@ -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

4
asm/object24.s
View File

@ -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

2
asm/object2A.s
View File

@ -140,6 +140,6 @@ _08089C96:
bl InitializeAnimation
movs r0, #0x92
lsls r0, r0, #1
bl EnqueSFX
bl EnqueueSFX
_08089CBA:
pop {r4, r5, r6, pc}

4
asm/object35.s
View File

@ -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

2
asm/object43.s
View File

@ -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

2
asm/object44.s
View File

@ -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

2
asm/object64.s
View File

@ -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

4
asm/object6A.s
View File

@ -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]

2
asm/object87.s
View File

@ -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]

2
asm/object8B.s
View File

@ -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

2
asm/objectA0.s
View File

@ -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

2
asm/objectA8.s
View File

@ -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

6
asm/objectBlockingStairs.s
View File

@ -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

4
asm/objectD.s
View File

@ -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

4
asm/objectOnPillar.s
View File

@ -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

2
asm/octorokGolden.s
View File

@ -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

2
asm/picoBloom.s
View File

@ -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

2
asm/puffstool.s
View File

@ -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

6
asm/pullableLever.s
View File

@ -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}

6
asm/pushableFurniture.s
View File

@ -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

2
asm/pushableGrave.s
View File

@ -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]

4
asm/pushableLever.s
View File

@ -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

2
asm/pushableRock.s
View File

@ -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

2
asm/pushableStatue.s
View File

@ -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]

2
asm/rope.s
View File

@ -214,7 +214,7 @@ _080314CC:
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
movs r0, #0x84
bl EnqueSFX
bl EnqueueSFX
_080314FA:
pop {r4, pc}

2
asm/scissorsBeetle.s
View File

@ -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

2
asm/sensorBladeTrap.s
View File

@ -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

4
asm/sluggula.s
View File

@ -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

6
asm/smallIceBlock.s
View File

@ -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]

4
asm/spearMoblin.s
View File

@ -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

2
asm/specialFx.s
View File

@ -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

4
asm/spikedBeetle.s
View File

@ -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

12
asm/stalfos.s
View File

@ -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

6
asm/vaati.s
View File

@ -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

2
asm/vaatiArm.s
View File

@ -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

4
asm/vaatiEyesMacro.s
View File

@ -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]

2
asm/vaatiReborn.s
View File

@ -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:

2
asm/wallMaster.s
View File

@ -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

4
asm/warpPoint.s
View File

@ -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}

2
asm/waterDrop.s
View File

@ -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

2
asm/windTribespeople.s
View File

@ -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

4
asm/wizzrobeFire.s
View File

@ -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]

4
asm/wizzrobeIce.s
View File

@ -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]

4
asm/wizzrobeWind.s
View File

@ -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]

2
include/functions.h
View File

@ -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);

2
src/enemy/acroBandits.c
View File

@ -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;
}

4
src/enemy/beetle.c
View File

@ -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))

4
src/enemy/bladeTrap.c
View File

@ -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);
}

8
src/enemy/chuchu.c
View File

@ -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)

6
src/enemy/cuccoChickAggr.c
View File

@ -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);
}

16
src/enemy/darkNut.c
View File

@ -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);
}
}

2
src/enemy/doorMimic.c
View File

@ -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;
}

4
src/enemy/lakitu.c
View File

@ -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) {

2
src/enemy/octorok.c
View File

@ -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);
}
}

2
src/enemy/rollobite.c
View File

@ -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);

2
src/enemy/rupeeLike.c
View File

@ -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);

8
src/enemy/spinyChuchu.c
View File

@ -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);
}
}
}

6
src/npc/carlov.c
View File

@ -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);
}
}

4
src/npc/melari.c
View File

@ -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) {

4
src/npc/postman.c
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More