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

tmp

Browse Source
This commit is contained in:
theo3
2021-02-26 14:48:30 -08:00
parent 112e97abc8
commit cca3f69d18
205 changed files with 898 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/bird.c
+2 -2
View File
@@ -32,7 +32,7 @@ void sub_0809CF54(Entity* this) {
this->direction = 8;
this->collisionLayer = 2;
this->x.HALF.HI = gRoomControls.roomScrollX;
PlaySFX(0x123);
SoundReq(0x123);
UpdateSpriteForCollisionLayer(this);
InitAnimationForceUpdate(this, 0);
target = CreateObject(0x95, 1, 0);
@@ -95,7 +95,7 @@ void sub_0809D0AC(Entity* this) {
this->height.WORD = 0;
this->collisionLayer = 1;
SetLocalFlag(0x45);
PlaySFX(0x72);
SoundReq(0x72);
fx = CreateFx(this, 0x11, 0);
if (fx != NULL) {
sub_0806FAD8(this, fx);
src/object/button.c
+2 -2
View File
@@ -94,7 +94,7 @@ void sub_08081C30(Entity* this) {
this->action = 2;
ClearFlag(this->field_0x86.HWORD);
SetTileType(0x77, this->field_0x74.HWORD, this->collisionLayer);
PlaySFX(0x10C);
SoundReq(0x10C);
}
}
@@ -264,7 +264,7 @@ u32 sub_08081F7C(Entity* this, u32 r7) {
SetFlag(this->field_0x86.HWORD);
SetTileType(r7, this->field_0x74.HWORD, this->collisionLayer);
sub_08081F24(this);
PlaySFX(0x10C);
SoundReq(0x10C);
if (this->field_0x70.HALF_U.LO != 0xFFFF)
SetTile(this->field_0x70.HALF_U.LO, this->field_0x74.HWORD, this->collisionLayer);
return 0;
src/object/cloud.c
+6 -6
View File
@@ -7,7 +7,7 @@
#include "structures.h"
extern void sub_0809F7BC(Entity*);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void sub_0809F814(u32);
extern void sub_0809F7F4(Entity*);
extern void LoadRoomEntityList();
@@ -57,7 +57,7 @@ void sub_0809F548(Entity* this) {
if (--this->actionDelay == 0) {
this->action = 2;
this->actionDelay = 90;
PlaySFX(285);
SoundReq(285);
sub_0809F814((((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 63) |
(((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 63) << 6);
} else {
@@ -70,7 +70,7 @@ void sub_0809F548(Entity* this) {
void sub_0809F5B0(Entity* this) {
if (--this->actionDelay == 0) {
PlaySFX(115);
SoundReq(115);
SetGlobalFlag(KUMOTATSUMAKI);
LoadRoomEntityList(&gUnk_080DD750);
DeleteThisEntity();
@@ -105,7 +105,7 @@ void sub_0809F61C(Entity* this) {
if (--this->actionDelay == 0) {
this->action = 3;
this->actionDelay = 120;
PlaySFX(285);
SoundReq(285);
sub_0809F814((((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 63) |
(((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 63) << 6);
} else {
@@ -123,7 +123,7 @@ void sub_0809F69C(Entity* this) {
this->actionDelay = 30;
this->action = 4;
gRoomControls.cameraTarget = &gPlayerEntity;
PlaySFX(115);
SoundReq(115);
}
}
@@ -189,7 +189,7 @@ void sub_0809F7BC(Entity* this) {
void sub_0809F7F4(Entity* this) {
if (--this->field_0x68.HALF.LO == 0) {
this->field_0x68.HALF.LO = 12;
PlaySFX(388);
SoundReq(388);
}
}
src/object/greatFairy.c
+5 -5
View File
@@ -105,7 +105,7 @@ void GreatFairy_SpawningUpdate(Entity* this) {
if (mini != NULL) {
CopyPosition(this, mini);
DoFade(6, 4);
PlaySFX(325);
SoundReq(325);
this->action = 4;
this->actionDelay = 0x3c;
var = this->spriteSettings.raw & ~0x3;
@@ -220,7 +220,7 @@ void GreatFairy_MiniRisingUpdate(Entity* this) {
this->height.WORD -= 0x8000;
if (this->height.HALF.HI == -20) {
this->action = 2;
PlaySFX(321);
SoundReq(321);
} else {
if (((this->height.HALF.HI == -10) && (this->field_0xf == 0)) &&
(target = GreatFairy_CreateForm(this, DROPLET, 0), target != NULL)) {
@@ -289,7 +289,7 @@ void GreatFairy_DropletInit(Entity* this) {
this->spriteSettings.b.draw = 1;
this->height.HALF.HI = 0;
this->spritePriority.b0 = 5;
PlaySFX(320);
SoundReq(320);
}
void GreatFairy_DropletUpdate(Entity* this) {
@@ -328,7 +328,7 @@ void GreatFairy_BigRippleInit(Entity* this) {
this->actionDelay = 120;
this->spriteSettings.b.draw = 1;
this->spritePriority.b0 = 5;
PlaySFX(249);
SoundReq(249);
}
void GreatFairy_BigRippleUpdate(Entity* this) {
@@ -520,7 +520,7 @@ void sub_080873D0(Entity* this) {
void sub_080873FC(void) {
Entity* ent;
PlaySFX(0xf7);
SoundReq(0xf7);
gRoomControls.cameraTarget = NULL;
while (ent = FindEntityInListBySubtype(0x6, 0x1b, 0x6), ent != NULL) {
src/object/heartContainer.c
+1 -1
View File
@@ -54,7 +54,7 @@ static void sub_0808E714(Entity* this) {
this->action = 3;
this->field_0x3c |= 0x10;
sub_0805EC60(this);
PlaySFX(0x141);
SoundReq(0x141);
}
sub_08080CB4(this);
}
src/object/houseDoorExterior.c
+1 -1
View File
@@ -111,7 +111,7 @@ static void sub_0808681C(Entity* this) {
this->action++;
this->frameIndex = 1;
sub_08078AC0(16, 0, 1);
PlaySFX(0x111);
SoundReq(0x111);
}
break;
}
src/object/itemOnGround.c
+3 -3
View File
@@ -181,7 +181,7 @@ static void sub_08081150(Entity* this) {
this->height.HALF.HI = -0x80;
this->spriteOrientation.flipY = 1;
this->spriteRendering.b3 = 1;
PlaySFX(0x12D);
SoundReq(0x12D);
}
static void sub_08081188(Entity* this) {
@@ -205,7 +205,7 @@ void sub_080811C8(Entity* this) {
void sub_080811D8(Entity* this) {
sub_08081188(this);
PlaySFX(0x215);
SoundReq(0x215);
}
void sub_080811EC(Entity* this) {
@@ -358,7 +358,7 @@ static u8 sub_0808147C(u32 arg0) {
void sub_0808148C(u32 arg0) {
const Unk_0811E84C* var0 = &gUnk_0811E84C[arg0];
if (var0->sfx) {
PlaySFX(var0->sfx);
SoundReq(var0->sfx);
}
}
src/object/jailBars.c
+2 -2
View File
@@ -4,7 +4,7 @@
#include "room.h"
extern void sub_080A0960(Entity*, u32);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void sub_0801AF18(u8*, u32, u32);
extern void (*const gUnk_08124950[])(Entity*);
@@ -33,7 +33,7 @@ void sub_080A0910(Entity* this) {
if (CheckFlags(this->field_0x86.HWORD) != 0) {
this->action = 2;
sub_080A0960(this, 1);
PlaySFX(0x10b);
SoundReq(0x10b);
}
}
src/object/metalDoor.c
+2 -2
View File
@@ -8,7 +8,7 @@ extern void sub_080A080C(Entity*);
extern void sub_0806F69C(Entity*);
extern void EnqueueSFX(u32);
extern void sub_080A0870(Entity*);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern u32 sub_080001DA(u32, u32);
extern void SetTile(u32, u32, u32);
@@ -79,7 +79,7 @@ void sub_080A07BC(Entity* this) {
this->direction = 0x10;
this->y.HALF.HI += 2;
sub_080A0870(this);
PlaySFX(0x10b);
SoundReq(0x10b);
}
}
src/object/minecart.c
+7 -7
View File
@@ -63,7 +63,7 @@ void sub_080917DC(Entity* this) {
this->field_0x20 = 0x2a000;
this->action = 7;
InitAnimationForceUpdate(this, this->entityType.parameter + 4 + this->animationState);
PlaySFX(0x13b);
SoundReq(0x13b);
} else {
if (sub_0800445C(this) != 0) {
if (((gPlayerState.flags.all & 0x40080) == 0) && (gPlayerState.field_0x1c == 0) &&
@@ -85,7 +85,7 @@ void sub_080917DC(Entity* this) {
gPlayerEntity.flags &= 0x7f;
ResetPlayer();
sub_0807A108();
PlaySFX(0x7c);
SoundReq(0x7c);
}
} else {
this->actionDelay = 0;
@@ -113,7 +113,7 @@ void sub_080918A4(Entity* this) {
this->field_0x44 = 8;
sub_0801766C(this);
sub_0807BA8C(COORD_TO_TILE(this), this->collisionLayer);
PlaySFX(0x137);
SoundReq(0x137);
}
} else {
gPlayerEntity.direction = GetFacingDirection(&gPlayerEntity, this);
@@ -149,11 +149,11 @@ void sub_080919AC(Entity* this) {
gPlayerEntity.spritePriority.b0 = this->spritePriority.b0 - 1;
if (!sub_08091DDC(this)) {
if ((gScreenTransition.frameCount & 0xf) == 0) {
PlaySFX(0x138);
SoundReq(0x138);
}
if (--this->field_0xf == 0xff) {
PlaySFX(0x7b);
SoundReq(0x7b);
this->field_0xf = 0x3c;
}
@@ -182,8 +182,8 @@ void sub_080919AC(Entity* this) {
gPlayerEntity.flags |= 0x80;
sub_08004168(this);
InitAnimationForceUpdate(this, this->animationState + 0xc);
PlaySFX(0x78);
PlaySFX(0x139);
SoundReq(0x78);
SoundReq(0x139);
return;
case 0x67:
case 0x68:
src/object/mineralWaterSource.c
+2 -2
View File
@@ -12,7 +12,7 @@ typedef struct {
extern UnkStruct_MineralWater MineralWaterSourceParameters[];
extern bool32 sub_0806FBD8(Entity*);
extern bool32 AllocMutableBBox(Entity*);
void MineralWaterSource(Entity* this) {
MineralWaterSourceActionFuncs[this->action](this);
@@ -21,7 +21,7 @@ void MineralWaterSource(Entity* this) {
void MineralWaterSource_Init(Entity* this) {
UnkStruct_MineralWater* unknownParameters;
if (!sub_0806FBD8(this)) {
if (!AllocMutableBBox(this)) {
return;
}
src/object/object49.c
+2 -2
View File
@@ -59,7 +59,7 @@ static void sub_0808F14C(Entity* this) {
sub_0808F2B0(this);
if (sub_08003FC4(this, 0x2000) == 0) {
this->action++;
PlaySFX(0x84);
SoundReq(0x84);
}
}
@@ -218,7 +218,7 @@ void sub_0808F498(Entity* this) {
if (this->action != 0) {
if (sub_0806F3E4(this)) {
if (gScreenTransition.frameCount % 16 == 0) {
PlaySFX(0xEF);
SoundReq(0xEF);
}
DeleteThisEntity();
}
src/object/objectA2.c
+2 -2
View File
@@ -47,7 +47,7 @@ void sub_0809F374(Entity* this) {
this->height.WORD = 0;
this->action = 2;
InitializeAnimation(this, 1);
PlaySFX(0x186);
SoundReq(0x186);
} else {
this->actionDelay++;
}
@@ -63,7 +63,7 @@ void sub_0809F374(Entity* this) {
case 1:
this->actionDelay = 0;
sub_0809F448(this);
PlaySFX(0x186);
SoundReq(0x186);
}
}
}
src/object/thoughtBubble.c
+2 -2
View File
@@ -2,7 +2,7 @@
#include "entity.h"
extern void InitializeAnimation(Entity*, u32);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void DeleteThisEntity();
extern void GetNextFrame(Entity*);
@@ -22,7 +22,7 @@ void ThoughtBubble_Init(Entity* this) {
}
this->spriteOrientation.flipY = 1;
InitializeAnimation(this, this->entityType.parameter);
PlaySFX(ThoughtBubble_SFX[this->entityType.parameter]);
SoundReq(ThoughtBubble_SFX[this->entityType.parameter]);
}
void ThoughtBubble_Update(Entity* this) {
src/object/treeHidingPortal.c
+2 -2
View File
@@ -10,7 +10,7 @@ extern void CreateSparkle(Entity*);
extern u32 sub_0809E9A0(void);
extern void sub_08078A90(u32);
extern void sub_0809E918(Entity*);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void CreateMinishEntrance(u32 tile);
extern void (*const gUnk_08124354[])(Entity*);
@@ -62,7 +62,7 @@ void sub_0809E8EC(Entity* this) {
if (--this->actionDelay == 0) {
SetFlag(this->field_0x86.HWORD);
sub_08078A90(0);
PlaySFX(0x73);
SoundReq(0x73);
DeleteThisEntity();
}
}
src/object/windcrest.c
+2 -2
View File
@@ -7,7 +7,7 @@
extern void sub_0807DD64(Entity*);
extern void sub_0807DDE4(Entity*);
extern void sub_08078850(Entity*, u32, u32, u8*);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern Entity* CreateFx(Entity*, u32, u32);
extern u8 gUnk_08125010;
@@ -27,7 +27,7 @@ void sub_080A2124(Entity* this) {
}
void Windcrest_Unlock(Entity* this) {
PlaySFX(0x72);
SoundReq(0x72);
gSave.windcrests = gSave.windcrests | 1 << (this->entityType.parameter + 0x18);
CreateFx(this, 0x46, 0);
}