mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-09 04:00:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enque -> Enqueue

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/acroBandits.c
+1 -1
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;
}
src/enemy/beetle.c
+2 -2
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))
src/enemy/bladeTrap.c
+2 -2
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);
}
src/enemy/chuchu.c
+4 -4
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)
src/enemy/cuccoChickAggr.c
+3 -3
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);
}
src/enemy/darkNut.c
+8 -8
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);
}
}
src/enemy/doorMimic.c
+1 -1
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;
}
src/enemy/lakitu.c
+2 -2
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) {
src/enemy/octorok.c
+1 -1
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);
}
}
src/enemy/rollobite.c
+1 -1
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);
src/enemy/rupeeLike.c
+1 -1
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);
src/enemy/spinyChuchu.c
+4 -4
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);
}
}
}
src/npc/carlov.c
+3 -3
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);
}
}
src/npc/melari.c
+2 -2
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) {
src/npc/postman.c
+2 -2
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;
src/object/lightableSwitch.c
+4 -4
View File
@@ -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);
}
}
}
src/object/mask.c
+2 -2
View File
@@ -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;
src/object/metalDoor.c
+2 -2
View File
@@ -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);
}
}
src/object/object2A.c
+1 -1
View File
@@ -36,5 +36,5 @@ void sub_08089B18(Entity *this)
return;
}
}
EnqueSFX(0x124);
EnqueueSFX(0x124);
}
src/object/pot.c
+1 -1
View File
@@ -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);
src/object/railtrack.c
+4 -4
View File
@@ -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);
}
}
}