diff options
| author | Behemoth <Luisscheurenbrand@gmail.com> | 2020-09-01 00:57:40 +0200 |
|---|---|---|
| committer | Behemoth <Luisscheurenbrand@gmail.com> | 2020-09-01 00:58:36 +0200 |
| commit | 662e221f89aaaed63e80c167822d5d51bf5e172e (patch) | |
| tree | 112d6f35534ea9b047af9b3c725627944825fe93 /src/object | |
| parent | cc5bb0133b20733958f2c112917f26314c681d54 (diff) | |
label a bunch of stuff
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/lightableSwitch.c | 8 | ||||
| -rw-r--r-- | src/object/mask.c | 4 | ||||
| -rw-r--r-- | src/object/metalDoor.c | 4 | ||||
| -rw-r--r-- | src/object/object1A.c | 4 | ||||
| -rw-r--r-- | src/object/object2A.c | 2 | ||||
| -rwxr-xr-x | src/object/pot.c | 2 | ||||
| -rw-r--r-- | src/object/railtrack.c | 8 |
7 files changed, 16 insertions, 16 deletions
diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index e9a1e8e0..efa72fb2 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 sub_08004488(u32); +extern void EnqueSFX(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); } - sub_08004488(0x110); + EnqueSFX(0x110); } sub_0809EABC(this); } @@ -123,7 +123,7 @@ void sub_0809EBD8(Entity* this) { this->actionDelay = 0x10; this->frameIndex = 2; SetFlag(this->field_0x86); - sub_08004488(0x110); + EnqueSFX(0x110); } } @@ -137,7 +137,7 @@ void sub_0809EC08(Entity* this) { this->action = 1; this->frameIndex = 3; ClearFlag(this->field_0x86); - sub_08004488(0x110); + EnqueSFX(0x110); } } } diff --git a/src/object/mask.c b/src/object/mask.c index 675805b8..cd5d13f4 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 sub_08004488(u32); +extern void EnqueSFX(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: - sub_08004488(0x72); + EnqueSFX(0x72); case 0x40: SetFlag(this->field_0x86); break; diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index 381bf0d8..b0df5777 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 sub_08004488(u32); +extern void EnqueSFX(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; } - sub_08004488(0x10b); + EnqueSFX(0x10b); } } diff --git a/src/object/object1A.c b/src/object/object1A.c index e903d21b..5f43ec2f 100644 --- a/src/object/object1A.c +++ b/src/object/object1A.c @@ -3,7 +3,7 @@ extern void sub_08086A6C(); extern s32 sub_080044EC(); -extern void sub_080AEF88(); +extern void ProcessMovement(); extern u32 Random(void); extern void (*gUnk_081206C4[99])(Entity*); @@ -42,7 +42,7 @@ void sub_08086A28(Entity* ent) { if (iVar1 == 0) { ent->action = 2; } - sub_080AEF88(ent); + ProcessMovement(ent); CopyPosition(ent, ent->attachedEntity); } } diff --git a/src/object/object2A.c b/src/object/object2A.c index d8f30b54..8db435e5 100644 --- a/src/object/object2A.c +++ b/src/object/object2A.c @@ -36,5 +36,5 @@ void sub_08089B18(Entity *this) return; } } - sub_08004488(0x124); + EnqueSFX(0x124); }
\ No newline at end of file diff --git a/src/object/pot.c b/src/object/pot.c index 5ea63ab5..8931598f 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); - sub_08004488(0x10F); + EnqueSFX(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 3cf693d2..d8227bef 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 sub_08004488(u32); +extern void EnqueSFX(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); - sub_08004488(0x151); + EnqueSFX(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); - sub_08004488(0x151); + EnqueSFX(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); - sub_08004488(0x151); + EnqueSFX(0x151); } } } |
