mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-15 21:00:13 -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/arm_proxy.c
+38 -44
View File
@@ -26,7 +26,7 @@ extern void gUnk_030059F0(void);
extern void sub_080ADD70();
extern void sub_0801C25C();
extern void sub_08016C3C();
extern void sub_08016DF8();
extern void LoadResources();
extern void sub_0804FF98();
extern u32 sub_0805E3B0();
extern void sub_08016FF4();
@@ -43,7 +43,7 @@ extern void sub_08078180(void);
extern void sub_0807B0C8(void);
extern void sub_0807A8D8(Entity*);
extern void sub_08077FEC(u32);
extern void sub_080173A4(Entity*);
extern void ItemInit(Entity*);
extern void sub_080A2838(Entity*);
extern u32 ReadBit(void*, u32);
extern void sub_0806EC78(Entity*);
@@ -89,7 +89,8 @@ typedef struct {
extern LinkedList2 gUnk_03003C70[16];
extern LinkedList2* gUnk_02018EA0;
void sub_08016DF8(void) {
// Load any resources that were requested with LoadResourceAsync
void LoadResources(void) {
if (gUnk_03003DE0 != 0) {
u8* buf = &gUnk_03000C30;
s32 i = gUnk_03003DE0;
@@ -112,31 +113,30 @@ void sub_08016DF8(void) {
}
}
void sub_08016E78(void) {
void PrepNextFrame(void) {
gUnk_03001000.interruptFlag = 0;
VBlankIntrWait();
do {
// Our VBlankIntr will set this flag
} while (gUnk_03001000.interruptFlag == 0);
sub_080ADD70();
sub_0801C25C();
sub_08016C3C();
sub_08016DF8();
LoadResources();
if (gUnk_02000070) {
gUnk_02000070 = 0;
if (gUnk_02025EB0 != NULL) {
if (gUnk_02025EB0 != NULL)
// sizeof(BGBuffer) = 0x800, what are we omitting?
DmaCopy32(3, &gBG1Buffer, VRAM + (*gUnk_02025EB0 & 0x1f00) * 8, 0x5C0);
}
if (gUnk_0200B650 != NULL) {
if (gUnk_0200B650 != NULL)
DmaCopy32(3, &gBG2Buffer, VRAM + (*gUnk_0200B650 & 0x1f00) * 8, 0x5C0);
}
}
sub_0804FF98();
}
void sub_08016F28(Entity* this) {
void PlayerUpdate(Entity* this) {
if (gSave.stats.floorType != 0)
gPlayerState.flags.all |= 0x4000;
else
@@ -147,19 +147,18 @@ void sub_08016F28(Entity* this) {
sub_08077B20();
if ((gPlayerState.flags.all & 0x200000) != 0) {
gPlayerState.playerAction = 0x18;
gPlayerState.flags.all &= 0xfff7ffff;
gPlayerState.flags.all &= ~0x80000;
gPlayerState.hurtBlinkSpeed = 0xf0;
this->flags |= 0x80;
} else {
this->flags &= 0x7f;
this->flags &= ~0x80;
gPlayerState.field_0xa8 = 0xf;
}
}
sub_08016FF4(this);
sub_08070680(this);
if ((this->height.WORD == 0) && (this->action == 1 || this->action == 9)) {
if ((this->height.WORD == 0) && (this->action == 1 || this->action == 9))
sub_08008790(this, 8);
}
sub_080171F0();
}
sub_08078FB0(this);
@@ -175,7 +174,7 @@ void sub_08016FF4(Entity* this) {
gUnk_0200AF00.filler25[9] = 0;
if ((gPlayerEntity.bitfield & 0x80) && (gPlayerEntity.hurtBlinkTime > 0))
PlaySFX(SFX_86);
SoundReq(SFX_86);
gPlayerState.flags.all &= ~(0x2000000 | 0x200);
if (gPlayerState.flags.all & 0x400)
@@ -217,14 +216,14 @@ void sub_08016FF4(Entity* this) {
gSave.stats.field_0x1c = 0;
} else if ((gSave.stats.field_0x1c == 0) || --gSave.stats.field_0x1c == 0) {
gSave.stats.filler[2] = 0;
PlaySFX(SFX_ICE_BLOCK_MELT);
SoundReq(SFX_ICE_BLOCK_MELT);
}
if (gSave.stats.filler[3] == 0) {
gSave.stats.field_0x1e = 0;
} else if ((gSave.stats.field_0x1e == 0) || (--gSave.stats.field_0x1e == 0)) {
gSave.stats.filler[3] = 0;
PlaySFX(SFX_140);
SoundReq(SFX_140);
} else if ((gSave.stats.field_0x1e & 0xf) == 0) {
CreateSparkle(this);
}
@@ -264,7 +263,7 @@ void sub_080171F0(void) {
gPlayerState.field_0x1a[0] = 0;
gPlayerState.field_0x80 = 0;
gPlayerState.field_0xaa = 0;
_DmaZero(&gUnk_03003BE0, 0x8c);
MemClear32(&gUnk_03003BE0, 0x8c);
gPlayerEntity.spriteOffsetY = gPlayerState.field_0x3f;
gPlayerState.field_0x3f = 0;
sub_0807B0C8();
@@ -286,9 +285,9 @@ void sub_080171F0(void) {
}
}
void sub_08017338(Entity *this) {
if (!(this->flags & 1) && !this->action && !this->previousActionFlag)
sub_080173A4(this);
void ItemUpdate(Entity* this) {
if ((this->flags & 1) == 0 && this->action == 0 && this->previousActionFlag == 0)
ItemInit(this);
if (!sub_0805E3B0(this)) {
gPlayerItemFunctions[this->entityType.subtype](this);
@@ -304,7 +303,7 @@ void sub_08017338(Entity *this) {
}
// tiny regalloc
NONMATCH("asm/non_matching/arm_proxy/sub_080173A4.inc", void sub_080173A4(Entity* this)) {
NONMATCH("asm/non_matching/arm_proxy/ItemInit.inc", void ItemInit(Entity* this)) {
ItemFrame* entry;
entry = &gUnk_08126DA8[this->entityType.subtype];
@@ -336,15 +335,13 @@ NONMATCH("asm/non_matching/arm_proxy/sub_080173A4.inc", void sub_080173A4(Entity
}
END_NONMATCH
void sub_080174A4(Entity* this) {
void ObjectUpdate(Entity* this) {
int iVar1;
if (((this->flags & 1) == 0) && (this->action == 0)) {
if (((this->flags & 1) == 0) && (this->action == 0))
sub_080A2838(this);
}
if (this->hurtBlinkTime != 0) {
if (this->hurtBlinkTime != 0)
this->hurtBlinkTime++;
}
if (!sub_0805E3B0(this)) {
gObjectFunctions[this->entityType.subtype](this);
this->bitfield &= ~0x80;
@@ -359,20 +356,15 @@ void sub_08017508(Entity* this) {
// regalloc
NONMATCH("asm/non_matching/arm_proxy/sub_08017530.inc", void sub_08017530(Entity* this)) {
if ((this->currentHealth & 0x7f) &&
!ReadBit(&gUnk_020342F8, this->currentHealth - 1)) {
if ((this->currentHealth & 0x7f) && !ReadBit(&gUnk_020342F8, this->currentHealth - 1))
DeleteThisEntity();
}
if ((this->action == 0) && ((this->flags & 1) == 0)) {
if ((this->action == 0) && ((this->flags & 1) == 0))
sub_0806EC78(this);
}
if (!sub_0805E3B0(this)) {
if (!sub_0805E3B0(this))
gNPCFunctions[this->entityType.subtype][0](this);
}
if (this->next != NULL) {
if (gNPCFunctions[this->entityType.subtype][1] != NULL) {
if (gNPCFunctions[this->entityType.subtype][1] != NULL)
gNPCFunctions[this->entityType.subtype][1](this);
}
if ((this->currentHealth & 0x7f) != 0) {
u32 temp = this->currentHealth & 0x7f;
gUnk_02031EC0[temp * 2 - 2].x = this->x.HALF.HI - gRoomControls.roomOriginX;
@@ -392,7 +384,7 @@ void sub_080175F4(void) {
u32 temp;
void (*func)(void);
temp = gUnk_03003DC0.unk0;
if (gUnk_03003DC0.unk0 <= gUnk_03003DC0.unk1)
temp = gUnk_03003DC0.unk1;
@@ -411,7 +403,7 @@ void sub_080175F4(void) {
}
void sub_08017640(void) {
_DmaZero(&gUnk_03003C70,0x100);
MemClear32(&gUnk_03003C70, 0x100);
gUnk_02018EA0 = (LinkedList2*)&gUnk_03003C70[0].last;
gUnk_03003C70[0].last = &gUnk_03003C70[0].last;
gUnk_03003C70[0].first = &gUnk_03003C70[0].last;
@@ -426,7 +418,7 @@ NONMATCH("asm/non_matching/arm_proxy/sub_0801766C.inc", u32 sub_0801766C(Entity*
LinkedList2* pLVar2;
LinkedList2* i;
u8* pbVar4;
if (this->spritePriority.b2 != 0) {
return 1;
} else {
@@ -491,7 +483,7 @@ NONMATCH("asm/non_matching/arm_proxy/sub_080176E4.inc", u32 sub_080176E4(Entity*
END_NONMATCH
// you guessed it
NONMATCH("asm/non_matching/arm_proxy/sub_08016DF8.inc", void sub_08017744(Entity* this)) {
NONMATCH("asm/non_matching/arm_proxy/sub_08017744.inc", void sub_08017744(Entity* this)) {
LinkedList2* i;
for (i = &gUnk_03003C70[0]; i < &gUnk_03003C70[16]; ++i) {
if (i->node == this) {
@@ -513,16 +505,18 @@ END_NONMATCH
NONMATCH("asm/non_matching/arm_proxy/sub_080177A0.inc", bool32 sub_080177A0(Entity* this, Entity* that)) {
u32 this_d;
u32 depth;
if ((that->collisionLayer & this->collisionLayer) != 0) {
BoundingBox* bb_this = this->boundingBox;
BoundingBox* bb_that = that->boundingBox;
u32 this_w = bb_this->width;
u32 that_w = bb_that->width;
if ((((this->x.HALF.HI - that->x.HALF.HI) + bb_this->offset_x) - bb_that->offset_x) + this_w + that_w <= (this_w + that_w) * 2) {
if ((((this->x.HALF.HI - that->x.HALF.HI) + bb_this->offset_x) - bb_that->offset_x) + this_w + that_w <=
(this_w + that_w) * 2) {
u32 this_h = bb_this->height;
u32 that_h = bb_that->height;
if ((((this->y.HALF.HI - that->y.HALF.HI) + bb_this->offset_y) - bb_that->offset_y) + this_h + that_h <= (this_h + that_h) * 2) {
if ((((this->y.HALF.HI - that->y.HALF.HI) + bb_this->offset_y) - bb_that->offset_y) + this_h + that_h <=
(this_h + that_h) * 2) {
if ((this->field_0x3c & 0x10) != 0)
this_d = ((BoundingBox3D*)bb_this)->depth;
else
src/code_080300AC.c
+2 -2
View File
@@ -13,13 +13,13 @@ typedef struct {
extern struct_0300110C gUnk_0300110C;
void sub_080300AC(void) {
_DmaZero(&gUnk_0300110C.unk0, 0x44);
MemClear32(&gUnk_0300110C.unk0, 0x44);
gUnk_0300110C.unk66 = 0xff;
}
void sub_080300C4(void) {
if (gScreenTransition.field_0xae == 0xff) {
gScreenTransition.field_0xac = 0;
_DmaZero(&gScreenTransition.field_0x4c[32], 0x40);
MemClear32(&gScreenTransition.field_0x4c[32], 0x40);
}
}
src/code_0804AA84.c
+1 -1
View File
@@ -37,7 +37,7 @@ void sub_0804AAB8(void) {
}
void sub_0804AAD4(void) {
_DmaZero((void*)&gUnk_02018EB0, 0x28);
MemClear32((void*)&gUnk_02018EB0, 0x28);
gUnk_02018EB0.unk = 0;
EraseAllEntities();
CreateObject(0x3d, gArea.field_0x17, 0);
src/code_0805F9A0.c
+1 -1
View File
@@ -145,7 +145,7 @@ void sub_0805F918(u32 idx, u32 idx2, void* dest) {
idx3++;
}
}
LoadAssetAsync((const void*)&gUnk_02036AD8, (u32)dest, 0xe0);
LoadResourceAsync((const void*)&gUnk_02036AD8, (u32)dest, 0xe0);
}
u32 sub_0805F9A0(u32 r0) {
src/code_08077DF4.c
+1 -1
View File
@@ -57,7 +57,7 @@ void sub_08077E78(void* arg0, u32 bits) {
not = ~not ;
gPlayerState.field_0xa &= not ;
gPlayerState.keepFacing &= not ;
_DmaZero(arg0, 0x1c);
MemClear32(arg0, 0x1c);
}
u32 sub_08077EC8(Unk_struct* arg0) {
src/dma.c
+1 -1
View File
@@ -12,7 +12,7 @@ void _DmaFill32(u32 value, u8* dest, u32 size) {
DmaFill32(3, value, dest, size);
}
void _DmaZero(u8* src, u32 size) {
void MemClear32(u8* src, u32 size) {
u32 zero = 0;
switch (((u32)src | size) & 3) {
src/enemy/gyorgMale.c
+4 -4
View File
@@ -177,12 +177,12 @@ void sub_0804696C(Entity* this) {
this->nonPlanarMovement = 0x100;
this->spriteOrientation.flipY = 3;
this->spriteRendering.b3 = 3;
PlaySFX(0x2e);
SoundReq(0x2e);
}
if (this->actionDelay) {
if (gRoomControls.roomOriginY + 0x258 > this->y.HALF.HI) {
this->actionDelay = 0;
PlaySFX(0xf7);
SoundReq(0xf7);
}
}
}
@@ -987,7 +987,7 @@ void sub_08047BA4(Entity* this) {
} else {
this->field_0x76.HWORD = 0x88;
}
PlaySFX(0x1B5);
SoundReq(0x1B5);
sub_08047BF0(this);
}
@@ -1022,7 +1022,7 @@ void sub_08047BF0(Entity* this) {
if (this->y.HALF.HI > gRoomControls.roomOriginY + 0x270) {
this->previousActionFlag = 2;
this->field_0x7c.HALF.HI = 0xAA;
PlaySFX(0x12D);
SoundReq(0x12D);
InitAnimationForceUpdate(this, 1);
}
} else {
src/enemy/spinyChuchu.c
+1 -1
View File
@@ -122,7 +122,7 @@ void sub_08022654(Entity* this) {
if (--this->field_0xf)
return;
this->previousActionFlag = 1;
PlaySFX(0x12d);
SoundReq(0x12d);
InitializeAnimation(this, 0);
/* fallthrough */
case 1:
src/enemy/vaatiBall.c
+2 -2
View File
@@ -38,7 +38,7 @@ void VaatiBall(Entity* this) {
this->currentHealth = -1;
parent->field_0x80.HALF.LO--;
CreateDust(this);
PlaySFX(0x1c3);
SoundReq(0x1c3);
}
}
}
@@ -369,7 +369,7 @@ void sub_08044B04(Entity* this) {
if (this->actionDelay) {
if (--this->actionDelay == 0) {
this->nonPlanarMovement = 1280;
PlaySFX(0x14f);
SoundReq(0x14f);
}
}
if (this->field_0x78.HALF.HI == 3)
src/entity.c
+2 -2
View File
@@ -163,7 +163,7 @@ OtherEntity* GetEmptyManager(void) {
return NULL;
}
extern void _DmaZero(void*, u32);
extern void MemClear32(void*, u32);
extern u8 gManagerCount;
void DeleteManager(OtherEntity* ent) {
@@ -172,7 +172,7 @@ void DeleteManager(OtherEntity* ent) {
sub_0805E92C(ent);
UnlinkEntity(ent);
_DmaZero(ent, sizeof(OtherEntity));
MemClear32(ent, sizeof(OtherEntity));
gManagerCount--;
}
src/ezloNag.c
+1 -1
View File
@@ -99,7 +99,7 @@ void sub_0801CF18(Element* arg0) {
arg0->unk4 = 2;
arg0->unk1 = 8;
gUnk_0200AF00.ezloNagFuncIndex = 3;
PlaySFX(0x173);
SoundReq(0x173);
}
}
src/fileScreen.c
+35 -35
View File
@@ -98,14 +98,14 @@ void CreateDialogBox(u32 arg0, u32 arg1) {
sub_0805F46C(gUnk_080FC85C[arg0][1], &var0);
sfx = gUnk_080FC85C[arg0][2];
if (sfx) {
PlaySFX(sfx);
SoundReq(sfx);
}
gScreen.bg.bg3Control = BGCNT_PRIORITY(1);
}
void sub_08050384(void) {
sub_0801C4A0(0, 0);
_DmaZero(&gBG0Buffer, sizeof(gBG0Buffer));
MemClear32(&gBG0Buffer, sizeof(gBG0Buffer));
gScreen.bg.bg3Control = BGCNT_PRIORITY(1);
}
@@ -117,8 +117,8 @@ void sub_080503A8(u32 gfxGroup) {
void SetFileSelectState(FileSelectState mode) {
gUnk_02032EC0.state = mode;
_DmaZero(&gBG0Buffer, sizeof(gBG0Buffer));
_DmaZero(&gBG1Buffer, sizeof(gBG1Buffer));
MemClear32(&gBG0Buffer, sizeof(gBG0Buffer));
MemClear32(&gBG1Buffer, sizeof(gBG1Buffer));
}
void LoadOptionsFromSave(u32 idx) {
@@ -159,7 +159,7 @@ void HandleChooseFileScreen(void) {
gScreen.bg.bg2xOffset = 0;
gScreen.affine.bg2xOffset = 0;
gScreen.affine.bg2yOffset = 0;
_DmaZero(&gChooseFileState, sizeof(gChooseFileState));
MemClear32(&gChooseFileState, sizeof(gChooseFileState));
}
HideButtonR();
@@ -184,17 +184,17 @@ static void HandleFileScreenEnter(void) {
sub_0801DA90(1);
sub_080A3210();
_DmaZero((void*)VRAM, 0x80); // clear palettes
MemClear32((void*)VRAM, 0x80); // clear palettes
MessageInitialize();
EraseAllEntities();
sub_08080668();
sub_080ADD30();
sub_0801CFA8(0);
_DmaZero(&gUnk_0200AF00, sizeof(gUnk_0200AF00));
_DmaZero(&gUnk_02019EE0, sizeof(gUnk_02019EE0));
MemClear32(&gUnk_0200AF00, sizeof(gUnk_0200AF00));
MemClear32(&gUnk_02019EE0, sizeof(gUnk_02019EE0));
gUnk_02019EE0.unk3 = 7;
gUnk_02019EE0.unk6 = gUnk_02000000->gameLanguage > LANGUAGE_EN ? 3 : 0;
_DmaZero(&gUnk_02032EC0, sizeof(gUnk_02032EC0));
MemClear32(&gUnk_02032EC0, sizeof(gUnk_02032EC0));
gUnk_02032EC0.lastState = 8;
SetFileSelectState(STATE_NONE);
InitDMA();
@@ -216,7 +216,7 @@ static void HandleFileScreenEnter(void) {
gScreen.controls.alphaBlend = BLDALPHA_BLEND(15, 10);
gUnk_02024490.unk0 = 1;
gUnk_03001000.funcIndex = 1;
PlaySFX(0x7);
SoundReq(0x7);
DoFade(4, 8);
}
@@ -284,7 +284,7 @@ void sub_0805070C(void) {
var0->unk8 = gUnk_02000D00;
for (i = 0; i < NUM_SAVE_SLOTS; i++) {
var0->unk6 = 0;
_DmaZero(var0->unk8, 0x200);
MemClear32(var0->unk8, 0x200);
playerName = &gUnk_02019EE0.saves[i].playerName[0];
for (j = 0; j < FILENAME_LENGTH; j++) {
sub_0805F7DC(playerName[j], var0);
@@ -438,14 +438,14 @@ void sub_08050940(void) {
if (gUnk_02032EC0.lastState != mode) {
SetFileSelectState(mode);
PlaySFX(0x6A);
SoundReq(0x6A);
}
row_idx = (row_idx + num_rows) % num_rows;
if (gUnk_02019EE0.unk6 != row_idx) {
gUnk_02019EE0.unk6 = row_idx;
sub_08050AFC(row_idx);
PlaySFX(0x69);
SoundReq(0x69);
}
if (gUnk_02019EE0.saveStatus[gUnk_02019EE0.unk6] == SAVE_VALID) {
@@ -489,7 +489,7 @@ void sub_08050B3C(u16*);
void sub_08050AFC(u32 idx) {
SetActiveSave(idx);
_DmaZero(&gBG1Buffer, sizeof(gBG1Buffer));
MemClear32(&gBG1Buffer, sizeof(gBG1Buffer));
if (gUnk_02019EE0.saveStatus[idx] == SAVE_VALID) {
sub_08050B3C(&gBG1Buffer.unk29C);
}
@@ -589,14 +589,14 @@ void sub_08050C54(void) {
case A_BUTTON:
case START_BUTTON:
if (column_idx == 0) {
PlaySFX(0x80080000);
SoundReq(0x80080000);
}
gMenu.transitionTimer = 0xf;
sub_080A7114(1);
PlaySFX(0x6a);
SoundReq(0x6a);
break;
case B_BUTTON:
PlaySFX(0x6c);
SoundReq(0x6c);
SetFileSelectState(STATE_NONE);
break;
case DPAD_LEFT:
@@ -614,7 +614,7 @@ void sub_08050C54(void) {
}
if (gMenu.column_idx != column_idx) {
gMenu.column_idx = column_idx;
PlaySFX(0x69);
SoundReq(0x69);
}
}
@@ -645,7 +645,7 @@ void HandleFileLanguageSelect(void) {
}
void sub_08050DB8(void) {
_DmaZero(&gBG2Buffer, sizeof(gBG2Buffer));
MemClear32(&gBG2Buffer, sizeof(gBG2Buffer));
sub_080503A8(0xc);
gMenu.field_0x4 = gUnk_02000000->gameLanguage;
sub_080A7114(1);
@@ -667,7 +667,7 @@ void sub_08050DE4(void) {
break;
case A_BUTTON:
case START_BUTTON:
PlaySFX(0x6a);
SoundReq(0x6a);
if (gMenu.field_0x4 != row_idx) {
sub_080A7114(2);
CreateDialogBox(8, 0);
@@ -678,7 +678,7 @@ void sub_08050DE4(void) {
case B_BUTTON:
row_idx = gMenu.field_0x4;
gUnk_02000000->gameLanguage = gMenu.field_0x4;
PlaySFX(0x6c);
SoundReq(0x6c);
SetFileSelectState(STATE_NONE);
break;
}
@@ -692,7 +692,7 @@ void sub_08050DE4(void) {
}
if (gUnk_02000000->gameLanguage != row_idx) {
gUnk_02000000->gameLanguage = row_idx;
PlaySFX(0x69);
SoundReq(0x69);
}
}
@@ -765,13 +765,13 @@ NONMATCH("asm/non_matching/fileScreen/sub_08050EF4.inc", void sub_08050EF4(void)
case 3:
gUnk_02019EE0.saves[gUnk_02019EE0.unk6].messageSpeed = gUnk_02019EE0.unk4;
gUnk_02019EE0.saves[gUnk_02019EE0.unk6].brightnessPref = gUnk_02019EE0.unk5;
PlaySFX(0x6c);
SoundReq(0x6c);
sub_080A7114(mode);
SetActiveSave(gUnk_02019EE0.unk6);
break;
case 2:
CreateDialogBox(8, 0);
PlaySFX(0x6a);
SoundReq(0x6a);
default:
case 1:
sub_080A7114(mode);
@@ -780,11 +780,11 @@ NONMATCH("asm/non_matching/fileScreen/sub_08050EF4.inc", void sub_08050EF4(void)
case 0:
if (gMenu.column_idx != column_idx) {
gMenu.column_idx = column_idx;
PlaySFX(0x69);
SoundReq(0x69);
} else if (option != *p_option) {
*p_option = option;
LoadOptionsFromSave(gUnk_02019EE0.unk6);
PlaySFX(0x69);
SoundReq(0x69);
}
break;
}
@@ -842,7 +842,7 @@ void sub_08051358(void) {
if (gMenu.focusCoords[0] != 0x0b || gMenu.focusCoords[1] != 0x5) {
gMenu.focusCoords[1] = 0x5;
gMenu.focusCoords[0] = 0xb;
PlaySFX(0x67);
SoundReq(0x67);
}
}
@@ -994,7 +994,7 @@ u32 sub_080514BC(u32 a1) {
}
void sub_08051574(u32 sfx) {
PlaySFX(sfx);
SoundReq(sfx);
_DmaCopy(&gSave, &gUnk_02019EE0.saves[gUnk_02019EE0.unk6], sizeof(gUnk_02019EE0.saves[gUnk_02019EE0.unk6]));
sub_0805070C();
}
@@ -1025,10 +1025,10 @@ void sub_080515D4(void) {
if (column_idx == 1) {
CreateDialogBox(4, 0);
sub_080A7114(2);
PlaySFX(0x6a);
SoundReq(0x6a);
} else {
SetFileSelectState(0);
PlaySFX(0x6c);
SoundReq(0x6c);
}
break;
case DPAD_LEFT:
@@ -1041,7 +1041,7 @@ void sub_080515D4(void) {
if (gMenu.column_idx != column_idx) {
gMenu.column_idx = column_idx;
PlaySFX(0x69);
SoundReq(0x69);
}
}
@@ -1122,20 +1122,20 @@ void sub_080517EC(void) {
if (gUnk_02019EE0.unk7 < 3) {
CreateDialogBox(2, 0);
sub_080A7114(2);
PlaySFX(0x6a);
SoundReq(0x6a);
break;
}
// fallthrough
case B_BUTTON:
gUnk_02019EE0.unk7 = 4;
PlaySFX(0x6c);
SoundReq(0x6c);
SetFileSelectState(0);
break;
}
temp = sub_080517B4(delta);
if (temp != gUnk_02019EE0.unk7) {
gUnk_02019EE0.unk7 = temp;
PlaySFX(0x69);
SoundReq(0x69);
}
}
@@ -1187,7 +1187,7 @@ void sub_0805194C(u32 save_idx) {
gUnk_02019EE0.saveStatus[save_idx] = 0;
save = &gUnk_02019EE0.saves[save_idx];
_DmaZero(save, sizeof(*save));
MemClear32(save, sizeof(*save));
save->messageSpeed = 1;
save->brightnessPref = 1;
save->stats.health = 24;
src/game.c
+8 -8
View File
@@ -105,13 +105,13 @@ void sub_080521A0(void) {
}
gMenu.transitionTimer = 0x3c;
sub_080A7114(temp2);
PlaySFX(0x6a);
SoundReq(0x6a);
break;
}
if (gMenu.field_0x3 != temp) {
gMenu.field_0x3 = temp;
sub_08052418(0, temp);
PlaySFX(0x69);
SoundReq(0x69);
}
break;
}
@@ -170,7 +170,7 @@ void sub_080522F4(void) {
break;
case 0x1:
sub_080A7114(2);
PlaySFX(0x6a);
SoundReq(0x6a);
if (temp == 0) {
DoFade(5, 8);
} else {
@@ -181,7 +181,7 @@ void sub_080522F4(void) {
if (gMenu.field_0x3 != temp) {
gMenu.field_0x3 = temp;
sub_08052418(1, temp);
PlaySFX(0x69);
SoundReq(0x69);
}
}
break;
@@ -219,7 +219,7 @@ NONMATCH("asm/non_matching/game/sub_08052418.inc", void sub_08052418(int param_1
int i;
struct_080FCA8C temp;
_DmaZero(&gBG1Buffer, 0x800);
MemClear32(&gBG1Buffer, 0x800);
gUnk_020227E8._0[0].WORD = 0xf;
gUnk_020227E8._0[2].WORD = 0xf;
gUnk_020227E8._0[4].WORD = 0xf;
@@ -238,12 +238,12 @@ void InitializePlayer(void) {
Entity* pl;
sub_080784C8();
_DmaZero((void*)&gUnk_03000B80, 0x70);
_DmaZero((void*)&gPlayerState, 0xb0);
MemClear32((void*)&gUnk_03000B80, 0x70);
MemClear32((void*)&gPlayerState, 0xb0);
_DmaFill32(0xffffffff, &gPlayerState.field_0x40, 0x40);
pl = &gPlayerEntity;
_DmaZero((void*)pl, 0x88);
MemClear32((void*)pl, 0x88);
gRoomControls.cameraTarget = pl;
gPlayerState.playerAction = gUnk_080FCAC8[gScreenTransition.field_0xf];
if (!CheckGlobalFlag(0x14)) {
src/intro.c
+8 -8
View File
@@ -55,7 +55,7 @@ static const u16 sLightRaysAlphaBlends[] = {
static u32 AdvanceIntroSequence(u32 transition) {
gUnk_02032EC0.lastState = transition;
gUnk_03001000.funcIndex = 2;
_DmaZero(&gIntroState, sizeof(gIntroState));
MemClear32(&gIntroState, sizeof(gIntroState));
DoFade(7, 8);
}
@@ -64,7 +64,7 @@ void HandleIntroScreen(void) {
switch (gUnk_03001000.funcIndex) {
case 0:
MessageInitialize();
_DmaZero(&gUnk_02032EC0, sizeof(gUnk_02032EC0));
MemClear32(&gUnk_02032EC0, sizeof(gUnk_02032EC0));
AdvanceIntroSequence(0);
break;
case 1:
@@ -158,7 +158,7 @@ static void HandleTitlescreen(void) {
UpdateSwordBgAffineData();
}
sub_080A3210();
PlaySFX(3); // fanfare
SoundReq(3); // fanfare
DoFade(6, 8);
break;
case 1:
@@ -182,12 +182,12 @@ static void HandleTitlescreen(void) {
advance = GetAdvanceState();
if (advance != ADVANCE_NONE) {
if (advance == ADVANCE_KEY_PRESSED) {
PlaySFX(0x6a);
SoundReq(0x6a);
} else {
advance = ADVANCE_NONE;
}
AdvanceIntroSequence(advance);
PlaySFX(0x80080000);
SoundReq(0x80080000);
}
UpdatePressStartIcon();
if ((gIntroState.timer & 0x20) == 0) {
@@ -242,7 +242,7 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) {
gScreen.bg.bg1xOffset = 0xc09;
gFadeControl.field_0x4 = 0x40;
DoFade(6, 0x10);
PlaySFX(0xf8);
SoundReq(0xf8);
}
}
break;
@@ -272,7 +272,7 @@ static void HandleTitlescreenAnimationIntro(void) {
if (!gFadeControl.active) {
gIntroState.subState = 1;
gScreen.lcd.displayControl |= DISPCNT_BG2_ON;
PlaySFX(0xF6);
SoundReq(0xF6);
}
break;
case 1:
@@ -291,7 +291,7 @@ static void HandleTitlescreenAnimationIntro(void) {
gIntroState.subState++;
CreateObject(0xBD, 0, 0);
DoFade(6, 16);
PlaySFX(0xF8);
SoundReq(0xF8);
}
break;
default:
src/item.c
+3 -3
View File
@@ -11,7 +11,7 @@ void (*const gItemFunctions[])(ItemBehavior*, u32) = {
};
extern void sub_08077E78(ItemBehavior*, u32);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void sub_08078F60(void);
extern void sub_08077D38(ItemBehavior*, u32);
extern void sub_0805E544(void);
@@ -56,7 +56,7 @@ void OcarinaUse(ItemBehavior *beh, u32 arg1)
gPlayerState.keepFacing |= bVar1;
sub_08078F60();
sub_08077D38(beh, arg1);
PlaySFX(0x216);
SoundReq(0x216);
sub_0805E544();
}
}
@@ -104,7 +104,7 @@ void sub_08076D34(ItemBehavior* beh, u32 arg1) {
beh->stateID++;
beh->field_0xf = 0;
gPlayerState.field_0xa &= ~(u8)(8 >> arg1);
PlaySFX(0x15d);
SoundReq(0x15d);
}
} else {
gPlayerState.field_0x3[0] = 0;
src/item14.c
+1 -1
View File
@@ -30,7 +30,7 @@ void sub_0805FBE8(Entity* this) {
sub_0801766C(this);
sub_0806F69C(this);
sub_0805FC74(this);
PlaySFX(0x13f);
SoundReq(0x13f);
}
void sub_0805FC74(Entity* this) {
src/main.c
+6 -7
View File
@@ -36,7 +36,7 @@ void MainLoop(void) {
MessageInitialize();
sub_080ADD30();
gRand = 0x1234567;
_DmaZero(&gUnk_03001000, sizeof(gUnk_03001000));
MemClear32(&gUnk_03001000, sizeof(gUnk_03001000));
InitScreen(SCREEN_INTRO);
while (1) {
ReadKeyInput();
@@ -71,8 +71,7 @@ void MainLoop(void) {
sub_080A3480();
break;
}
sub_08016E78();
PrepNextFrame();
}
}
@@ -93,7 +92,7 @@ static void sub_08055F70(void) {
*(vu16*)BG_PLTT = 0x7FFF;
REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3;
size = 0x3FFD0;
_DmaZero(gUnk_02000030, size);
MemClear32(gUnk_02000030, size);
size = (u32)gUnk_080B2CD8 - (u32)sub_080B197C;
if (size != 0) {
_DmaCopy(sub_080B197C, gUnk_030056F0, size);
@@ -186,7 +185,7 @@ NONMATCH("asm/non_matching/sub_080560B8.inc", void sub_080560B8(void)) {
b = 1;
}
if (b != 0) {
_DmaZero((u8*)&gUnk_02000010.signature, 0x20);
MemClear32((u8*)&gUnk_02000010.signature, 0x20);
gUnk_02000010.signature = SIGNATURE;
}
}
@@ -202,7 +201,7 @@ u32 sub_08056134(void) {
}
void InitDMA() {
PlaySFX(0x80040000);
SoundReq(0x80040000);
gScreen._6d = gScreen._6c;
gScreen._6c = 0;
@@ -215,7 +214,7 @@ void InitDMA() {
}
void sub_08056208() {
PlaySFX(0x80060000);
SoundReq(0x80060000);
gScreen._6c = gScreen._6d;
gScreen._6d = 0;
}
src/manager/manager15.c
+1 -1
View File
@@ -80,7 +80,7 @@ void sub_0805A370(Manager15* this) {
if (this->manager.unk_0d) {
LoadRoomEntityList(&gUnk_080E4C08);
this->manager.action = 3;
PlaySFX(0x80100000);
SoundReq(0x80100000);
}
}
src/manager/manager1A.c
+2 -2
View File
@@ -71,7 +71,7 @@ void sub_0805B048(Manager1A* this) {
struct_08108764* tmp;
Entity* obj;
sub_0805E3A0(&this->manager, 6);
_DmaZero(&this->unk_20, 0x20);
MemClear32(&this->unk_20, 0x20);
this->manager.action = 1;
this->unk_3f = gRoomControls.roomID;
tmp = &gUnk_08108764[this->manager.unk_0a];
@@ -209,7 +209,7 @@ void sub_0805B328(Manager1A* this) {
if (!this->manager.unk_0b)
return;
tmp = &gUnk_08108764[this->manager.unk_0a];
LoadAssetAsync(&gGlobalGfxAndPalettes[tmp->unk_0c->unk_00], 0x0600F000, 0x800);
LoadResourceAsync(&gGlobalGfxAndPalettes[tmp->unk_0c->unk_00], 0x0600F000, 0x800);
gScreen.affine.bg3Control = 0x1E07;
gScreen.lcd.displayControl |= 0x800;
gScreen.affine.bg3xOffset = gRoomControls.bg3OffsetX.HALF.HI;
src/manager/manager27.c
+2 -2
View File
@@ -49,7 +49,7 @@ void sub_0805C894(Entity* this) {
if (sub_0805C920(this)) {
this->action = 2;
this->actionDelay = 1;
PlaySFX(0x11a);
SoundReq(0x11a);
}
}
@@ -65,7 +65,7 @@ void sub_0805C8B4(Entity* this) {
}
LoadPaletteGroup(gUnk_08108D20[this->field_0xf]);
if (this->field_0xf == 0) {
PlaySFX(0x11a);
SoundReq(0x11a);
}
}
if (sub_0805C920(this) == 0) {
src/manager/manager3.c
+1 -1
View File
@@ -55,7 +55,7 @@ void sub_080576C0(Manager3* this) {
this->manager.unk_0e);
if (!this->manager.unk_0f) {
this->manager.unk_0f = 1;
PlaySFX(0x152);
SoundReq(0x152);
}
}
}
src/manager/manager30.c
+3 -3
View File
@@ -48,13 +48,13 @@ void Manager30_Main(Manager30* this) {
case 0x317:
// stepped on a red tile again
this->manager.action = FAILED;
PlaySFX(0x6d);
SoundReq(0x6d);
break;
case 0x318:
// stepped on a blue tile
// turn the tile into a red tile
sub_0807B7D8(0x317, this->player_current_tile, this->manager.unk_0b);
PlaySFX(0x6b);
SoundReq(0x6b);
// decrease the number of remaining tiles and check if we're done
if (--this->manager.unk_0e == 0) {
this->manager.action = SUCCEEDED;
@@ -89,7 +89,7 @@ void Manager30_Main(Manager30* this) {
SetFlag(this->flag_succeeded);
}
} else {
PlaySFX(0x72);
SoundReq(0x72);
}
}
}
src/manager/manager39.c
+2 -2
View File
@@ -68,7 +68,7 @@ void sub_0805E18C(Manager39* this) {
}
void sub_0805E1D8(Manager39* this) {
_DmaZero(&gUnk_02034DF0, 0x80);
MemClear32(&gUnk_02034DF0, 0x80);
gScreen.bg.bg3Control = 1;
DeleteThisEntity();
}
@@ -81,7 +81,7 @@ void sub_0805E1F8(u32 unk0, u32 unk1) {
u8 unk_06[3];
} PACKED tmp;
const u8 * tmp2;
_DmaZero(&gUnk_02034DF0, 0x80);
MemClear32(&gUnk_02034DF0, 0x80);
_DmaCopy(gUnk_08108E60, &tmp, sizeof(tmp));
tmp.unk_04 = unk0>>8;
tmp.unk_05 = unk0;
src/manager/manager5.c
+4 -4
View File
@@ -71,14 +71,14 @@ void sub_08057BA4(Manager5* this) {
sub_08057CA4(this, this->unk_28, this->unk_2a);
sub_0807B7D8(this->unk_30, this->unk_38 | (this->unk_3a << 6), this->unk_3c);
this->manager.unk_0f++;
PlaySFX(0x71);
SoundReq(0x71);
} else {
if (!this->manager.unk_0f)
return;
sub_0807BA8C(this->unk_38 | (this->unk_3a << 6), this->unk_3c);
sub_08057CA4(this, this->unk_2c, this->unk_2e);
this->manager.unk_0f--;
PlaySFX(0x71);
SoundReq(0x71);
}
}
@@ -95,10 +95,10 @@ void sub_08057C28(Manager5* this) {
sub_08057CA4(this, this->unk_28, this->unk_2a);
sub_0807B7D8(this->unk_30, this->unk_38 | (this->unk_3a << 6), this->unk_3c);
this->manager.unk_0f++;
PlaySFX(0x71);
SoundReq(0x71);
} else {
if (this->unk_30 != 0x323) {
PlaySFX(0x72);
SoundReq(0x72);
}
DeleteManager(&this->manager);
}
src/manager/manager7.c
+2 -2
View File
@@ -64,7 +64,7 @@ void Manager7_Main(Manager7* this) {
switch (this->manager.unk_0e) {
case 0:
gUnk_02034490[0] = 1;
LoadAssetAsync(&gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x1000);
LoadResourceAsync(&gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x1000);
LoadPaletteGroup(gUnk_081081E4[tmp]);
this->manager.unk_0e++;
break;
@@ -75,7 +75,7 @@ void Manager7_Main(Manager7* this) {
case 5:
case 6:
case 7:
LoadAssetAsync(&gGlobalGfxAndPalettes[tmp2[(this->manager.unk_0e << 1)]],
LoadResourceAsync(&gGlobalGfxAndPalettes[tmp2[(this->manager.unk_0e << 1)]],
tmp2[(this->manager.unk_0e << 1) + 1], 0x1000);
this->manager.unk_0e++;
break;
src/manager/managerB.c
+3 -3
View File
@@ -55,7 +55,7 @@ void ManagerB_WaitForFlag(ManagerB* this) {
tmp = gRoomVars.field_0x9 ? gRoomVars.field_0x9 : 0x33;
this->unk_20 = gArea.musicIndex;
gArea.musicIndex = tmp;
PlaySFX(tmp);
SoundReq(tmp);
}
sub_080186C0(0xB0F);
}
@@ -73,7 +73,7 @@ void ManagerB_WaitForDone(ManagerB* this) {
if (this->unk_3c) {
if (!this->unk_35) {
gArea.musicIndex = this->unk_20;
PlaySFX(gArea.musicIndex);
SoundReq(gArea.musicIndex);
sub_0801855C();
}
}
@@ -128,7 +128,7 @@ ManagerBHelper* CreateHelper(Manager* this) {
extra->manager.unk_0a = 1;
extra->manager.parent = this;
this->unk_0e++;
_DmaZero(&extra->enemies, 0x20);
MemClear32(&extra->enemies, 0x20);
AppendEntityToList(extra, 8);
}
return extra;
src/manager/managerC.c
+3 -3
View File
@@ -104,7 +104,7 @@ void sub_080588F8(ManagerC* this) {
case 0xf0:
this->unk_28 = this->unk_24.HALF.HI;
this->manager.unk_0f = 0x2D;
PlaySFX(0x8c);
SoundReq(0x8c);
}
}
} else {
@@ -127,7 +127,7 @@ void sub_080588F8(ManagerC* this) {
}
if (ABS_DIFF_GT(this->unk_2c, this->unk_24.WORD, 0x100000)) {
this->unk_2c = this->unk_24.WORD;
PlaySFX(0x8b);
SoundReq(0x8b);
}
}
}
@@ -245,7 +245,7 @@ void sub_08058B5C(ManagerC* this, u32 unk1) {
gScreenTransition.playerStartPos.HALF.x = gUnk_081082E8[unk1*3];
gScreenTransition.playerStartPos.HALF.y = gUnk_081082E8[unk1*3+1];
gSave.unk7 = gUnk_081082E8[unk1*3+2];
PlaySFX(0x121);
SoundReq(0x121);
}
void sub_08058BC8(ManagerC* this) {
src/manager/managerE.c
+2 -2
View File
@@ -9,7 +9,7 @@ extern void DeleteThisEntity(void);
extern void DeleteManager(Manager*);
extern void sub_08078A90(u32);
extern void sub_08078B48(void);
extern void PlaySFX(u32);
extern void SoundReq(u32);
void sub_08058E60(ManagerE* this) {
if (!this->manager.action) {
@@ -28,7 +28,7 @@ void sub_08058E60(ManagerE* this) {
}
if (this->unk_3a == 0) {
if (this->unk_38 != 0) {
PlaySFX(this->unk_38);
SoundReq(this->unk_38);
}
LoadRoomEntityList(GetCurrentRoomProperty(this->manager.unk_0a));
DeleteThisEntity();
src/npc/bigGoron.c
+2 -2
View File
@@ -11,7 +11,7 @@ extern u16 gUnk_081140CC[];
extern void sub_0806D0B0(Entity*);
extern void sub_0807DD64(Entity*);
extern void sub_0807DDE4(Entity*);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void sub_0806D02C(Entity*);
extern Entity* FindEntityInListByForm(u32, u32, u32, u32, u32);
@@ -47,7 +47,7 @@ void sub_0806CF30(Entity* this) {
case 2:
if (--this->actionDelay == 0) {
u32 uVar2 = Random();
PlaySFX(gUnk_081140CC[uVar2 % 4]);
SoundReq(gUnk_081140CC[uVar2 % 4]);
this->actionDelay = ((u8)uVar2 & 7) * 16;
this->actionDelay += 128;
}
src/npc/bladeBrothers.c
+1 -1
View File
@@ -167,7 +167,7 @@ void sub_08068BEC(Entity* this, u32 unused) {
if (target) {
target->spritePriority.b0 = 1;
PositionRelative(this, target, 0, -0x100000);
PlaySFX(0xfa);
SoundReq(0xfa);
}
}
src/npc/cow.c
+2 -2
View File
@@ -14,7 +14,7 @@ extern void sub_080791D0();
extern void (*gUnk_08111914[])(Entity*);
extern void (*gUnk_08111928[])(Entity*);
extern Dialog gUnk_08111938[];
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern u32 UpdateFuseInteraction(Entity*);
extern PlayerState gPlayerState;
@@ -216,7 +216,7 @@ void sub_0806924C(Entity* ent) {
Cow_ShowDialogue(ent);
sub_080791D0();
}
PlaySFX(212);
SoundReq(212);
ent->interactType = 0;
}
}
src/npc/epona.c
+1 -1
View File
@@ -83,7 +83,7 @@ void sub_08065AA4(Entity* this) {
sub_08065A50(this);
sub_080791D0();
}
PlaySFX(0xD3);
SoundReq(0xD3);
this->interactType = 0;
}
}
src/npc/melari.c
+1 -1
View File
@@ -96,7 +96,7 @@ void sub_08068780(Entity* this) {
if ((this->frames.b.f2) != 0) {
this->frames.all &= 0xbf;
if (sub_080040A8(this) == 0) {
PlaySFX(gUnk_0811153E[(s32)Random() % 3]);
SoundReq(gUnk_0811153E[(s32)Random() % 3]);
} else {
EnqueueSFX(gUnk_08111538[(s32)Random() % 3]);
}
src/npc/rem.c
+3 -3
View File
@@ -4,7 +4,7 @@
#include "script.h"
extern void sub_0807DDE4(Entity*);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void sub_0806A8C8(Entity*);
extern void (*gUnk_08112260[])(Entity*);
@@ -28,11 +28,11 @@ void sub_0806a370(Entity* this) {
pbVar1 = &this->frames.all;
if (*pbVar1 == 1) {
*pbVar1 = 0;
PlaySFX(0x218);
SoundReq(0x218);
}
if (*pbVar1 == 2) {
*pbVar1 = 0;
PlaySFX(0x219);
SoundReq(0x219);
}
}
}
src/npc/simon.c
+1 -1
View File
@@ -35,7 +35,7 @@ void sub_0806C224(void) {
void Simon_CreateChest(Entity* this) {
CreateObjectWithParent(this, 0xf, 0x43, 0);
SetTileType(0x73, COORD_TO_TILE(this), this->collisionLayer);
PlaySFX(0x73);
SoundReq(0x73);
}
void sub_0806C280(void) {
src/npc/smith.c
+3 -3
View File
@@ -9,7 +9,7 @@ extern u32 GetFacingDirection(Entity*, Entity*);
extern u32 sub_0806F5A4(u32);
extern void sub_0806F118(Entity*);
extern Entity* CreateFx(Entity*, u32, u32);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void sub_0807000C(Entity*);
extern u32 sub_0801E99C(Entity*);
extern void sub_0807DD50(Entity*);
@@ -53,7 +53,7 @@ void Smith(Entity* this) {
if ((this->frames.all & 1) != 0) {
this->frames.all &= 0xfe;
CreateFx(this, 0x3d, 0x20);
PlaySFX(gUnk_08110380[(Random() & 7)]);
SoundReq(gUnk_08110380[(Random() & 7)]);
}
}
@@ -161,7 +161,7 @@ void nullsub_501(Entity* this) {
}
void sub_08066258(void) {
PlaySFX(gUnk_081103D0[Random() & 7]);
SoundReq(gUnk_081103D0[Random() & 7]);
}
void sub_08066274(u32 arg0) {
src/npc/zelda.c
+2 -2
View File
@@ -15,7 +15,7 @@ u32 GetAnimationState(Entity* ent);
void DeleteThisEntity(void);
extern Entity* GetEntityByType(u32, u32);
extern void sub_080686C4(Entity*, Entity*);
extern void PlaySFX(u32);
extern void SoundReq(u32);
extern void SetTileType(u32, u32, u32);
extern Entity gPlayerEntity;
@@ -140,7 +140,7 @@ void sub_08066E80(Entity* ent, u8* param_2) {
param_2[0x18]++;
ent->field_0x20 = 0x20000;
ent->frames.all &= 0xFE;
PlaySFX(0x7C);
SoundReq(0x7C);
}
break;
case 2:
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);
}
src/player.c
+8 -8
View File
@@ -116,8 +116,8 @@ void sub_08070C3C(Entity* this) {
this->spritePriority.b1 = 0;
ResetPlayer();
sub_0807A108();
PlaySFX(0x7b);
PlaySFX(0x85);
SoundReq(0x7b);
SoundReq(0x85);
}
void sub_08070CB4(Entity* this) {
@@ -159,7 +159,7 @@ void sub_08070D38(Entity* this) {
}
gPlayerState.jumpStatus = 0x80;
PlaySFX(0x14c);
SoundReq(0x14c);
ResetPlayer();
sub_08078F60();
}
@@ -355,8 +355,8 @@ void sub_080710A8(Entity* this) {
this->nonPlanarMovement = 0x100;
sub_0807A108();
PlaySFX(0x7c);
PlaySFX(0x78);
SoundReq(0x7c);
SoundReq(0x78);
}
void sub_08071130(Entity* this) {
@@ -412,7 +412,7 @@ void sub_08071130(Entity* this) {
this->previousActionFlag++;
sub_08078F60();
this->field_0x42 = 0;
PlaySFX(0x7d);
SoundReq(0x7d);
}
void sub_08071208(Entity* this) {
@@ -442,7 +442,7 @@ void sub_0807127C(Entity* this) {
if ((gPlayerState.flags.all & 0x80) != 0) {
this->actionDelay = 0x3c;
gPlayerState.field_0x8 = 0xc19;
PlaySFX(0x84);
SoundReq(0x84);
} else {
if ((gPlayerState.flags.all & 0x10000) == 0) {
sub_08004168(this);
@@ -504,7 +504,7 @@ void sub_08071380(Entity *this) {
this->previousActionFlag = 7;
this->actionDelay = 30;
DoFade(7, 16);
PlaySFX(0xf8);
SoundReq(0xf8);
} else {
sub_0804ACF8();
}
src/room.c
+15 -15
View File
@@ -977,7 +977,7 @@ void sub_0804BF38(u32 arg0, struct_0804BF38* arg1)
}
sub_08080964(gUnk_080D8E50[iVar3].shakeTime, gUnk_080D8E50[iVar3].shakeMag);
PlaySFX(gUnk_080D8E50[iVar2].sfx);
SoundReq(gUnk_080D8E50[iVar2].sfx);
}
#else
NAKED
@@ -1026,7 +1026,7 @@ void sub_0804C018(void) {
if (CheckGlobalFlag(MAZE_CLEAR))
if (gScreenTransition.playerStartPos.WORD == 0x2780078) // todo: wtf
PlaySFX(0x72);
SoundReq(0x72);
ClearGlobalFlag(MAZE_CLEAR);
}
@@ -1739,8 +1739,8 @@ typedef struct {
extern struct_086D4460 gUnk_086D4460;
void sub_0804C918(void) {
LoadAssetAsync(&gUnk_086D4460.LO, 0x6000000, 0x4000);
LoadAssetAsync(&gUnk_086D4460.HI, 0x6008000, 0x4000);
LoadResourceAsync(&gUnk_086D4460.LO, 0x6000000, 0x4000);
LoadResourceAsync(&gUnk_086D4460.HI, 0x6008000, 0x4000);
LoadPaletteGroup(0x19);
}
@@ -2240,7 +2240,7 @@ void sub_0804CD48(void) {
if (CheckGlobalFlag(LV1_CLEAR)) {
LoadRoomEntityList(&gUnk_080DF94C);
} else {
PlaySFX(0x80100000);
SoundReq(0x80100000);
gArea.musicIndex = gArea.pMusicIndex;
}
}
@@ -2428,7 +2428,7 @@ void sub_0804CED8(void) {
sub_0807AABC(&gPlayerEntity);
LoadRoomEntityList(&gUnk_080E1814);
} else {
PlaySFX(0x80100000);
SoundReq(0x80100000);
gArea.musicIndex = gArea.pMusicIndex;
}
}
@@ -2522,10 +2522,10 @@ void sub_0804CFB0(void) {
if (!CheckFlags(0x31)) {
if (gScreenTransition.field_0x38 == 0) {
PlaySFX(0x80100000);
SoundReq(0x80100000);
} else {
if (gScreenTransition.field_0x39 == 0) {
PlaySFX(0x80050000);
SoundReq(0x80050000);
sub_08078A90(3);
}
}
@@ -2761,7 +2761,7 @@ void sub_0804D140(void) {
if (CheckGlobalFlag(LV4_CLEAR)) {
LoadRoomEntityList(&gUnk_080E49F4);
} else {
PlaySFX(0x80100000);
SoundReq(0x80100000);
gArea.musicIndex = gArea.pMusicIndex;
}
}
@@ -3090,7 +3090,7 @@ void sub_0804D384(void) {
sub_08078A90(3);
LoadRoomEntityList(&gUnk_080E72E4);
gArea.musicIndex = gArea.pMusicIndex;
PlaySFX(0x80100000);
SoundReq(0x80100000);
}
}
}
@@ -3498,7 +3498,7 @@ u32 sub_0804D6C4() {
}
void sub_0804D6C8(void) {
PlaySFX(0x80100000);
SoundReq(0x80100000);
gArea.musicIndex = gArea.pMusicIndex;
}
@@ -4508,7 +4508,7 @@ void sub_0804E3C4() {
index = 0xE;
}
sub_0804B3C4(&gUnk_080F0E1C[index]);
PlaySFX(0x80100000);
SoundReq(0x80100000);
}
u32 sub_0804E45C() {
@@ -4716,7 +4716,7 @@ extern EntityData gUnk_080F2E2C;
void sub_0804E6E8(void) {
if (!CheckGlobalFlag(OUTDOOR)) {
gArea.musicIndex = gArea.pMusicIndex;
PlaySFX(0x800b0036);
SoundReq(0x800b0036);
}
if (!CheckGlobalFlag(START)) {
LoadRoomEntityList(&gUnk_080F2E2C);
@@ -4733,7 +4733,7 @@ extern EntityData gUnk_080F2EC4;
void sub_0804E72C(void) {
if (!CheckGlobalFlag(OUTDOOR)) {
gArea.musicIndex = gArea.pMusicIndex;
PlaySFX(0x800b0036);
SoundReq(0x800b0036);
}
if (!CheckGlobalFlag(START)) {
LoadRoomEntityList(&gUnk_080F2E94);
@@ -4786,7 +4786,7 @@ void sub_0804E7DC(void) {
}
if (!CheckGlobalFlag(OUTDOOR)) {
gArea.musicIndex = gArea.pMusicIndex;
PlaySFX(0x800b0036);
SoundReq(0x800b0036);
}
if ((gPlayerState.flags.all & 8) == 0) {
LoadRoomEntityList(&gUnk_080F31D8);
src/screenDebug.c
+4 -4
View File
@@ -23,8 +23,8 @@ void HandleDebugTextScreen() {
void sub_0805FA04(void) {
sub_0801DA90(1);
_DmaZero((void*)&gBG0Buffer, sizeof(BGBuffer));
_DmaZero((void*)&gBG3Buffer, 0x1000);
MemClear32((void*)&gBG0Buffer, sizeof(BGBuffer));
MemClear32((void*)&gBG3Buffer, 0x1000);
gScreen.lcd.displayControl = 0x940;
gScreen.bg.bg1Control = 0;
gScreen.bg.bg2Control = 0;
@@ -33,8 +33,8 @@ void sub_0805FA04(void) {
gScreen.affine.bg3Control = 0x1e0f;
gScreen.affine.unk4 = 1;
MessageInitialize();
_DmaZero((void*)&gUnk_02032EC0, sizeof(UI));
_DmaZero((void*)&gMenu, sizeof(Menu));
MemClear32((void*)&gUnk_02032EC0, sizeof(UI));
MemClear32((void*)&gMenu, sizeof(Menu));
gMenu.unk16 = gUnk_02000000->gameLanguage;
sub_08053320();
sub_0801D79C(0, 0x1144);
src/script.c
+11 -11
View File
@@ -304,9 +304,9 @@ extern ScriptExecutionContext gPlayerScriptExecutionContext;
extern ScriptExecutionContext gScriptExecutionContextArray[0x20];
void sub_0807DA70(void) {
_DmaZero(&gUnk_02033280, sizeof(gUnk_02033280));
_DmaZero(&gScriptExecutionContextArray, sizeof(gScriptExecutionContextArray));
_DmaZero(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
MemClear32(&gUnk_02033280, sizeof(gUnk_02033280));
MemClear32(&gScriptExecutionContextArray, sizeof(gScriptExecutionContextArray));
MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
gUnk_02033280.unk_08 = 8;
}
@@ -324,7 +324,7 @@ ScriptExecutionContext* CreateScriptExecutionContext(void) {
}
void DestroyScriptExecutionContext(ScriptExecutionContext* context) {
_DmaZero(context, sizeof(ScriptExecutionContext));
MemClear32(context, sizeof(ScriptExecutionContext));
}
ScriptExecutionContext* StartCutscene(Entity* entity, u16* unk_2) {
@@ -354,7 +354,7 @@ void UnloadCutsceneData(Entity* entity) {
void StartPlayerScript(u16* unk1) {
Entity* player;
_DmaZero(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
gPlayerScriptExecutionContext.unk_00 = unk1;
player = &gPlayerEntity;
*(ScriptExecutionContext**)&player->cutsceneBeh = &gPlayerScriptExecutionContext;
@@ -377,7 +377,7 @@ ScriptExecutionContext* sub_0807DB68(Entity* entity, u16* unk1) {
}
void sub_0807DB88(ScriptExecutionContext* context, u16* unk1) {
_DmaZero(context, sizeof(ScriptExecutionContext));
MemClear32(context, sizeof(ScriptExecutionContext));
context->unk_00 = unk1;
}
@@ -1425,23 +1425,23 @@ void sub_0807EF90(Entity* unk1, ScriptExecutionContext* unk2) {
}
void sub_0807EFA0(Entity* unk1, ScriptExecutionContext* unk2) {
PlaySFX(unk2->unk_00[1]);
SoundReq(unk2->unk_00[1]);
}
void sub_0807EFAC(Entity* unk1, ScriptExecutionContext* unk2) {
if (unk2->unk_00[1] >= 100) {
PlaySFX(gArea.musicIndex);
SoundReq(gArea.musicIndex);
} else {
PlaySFX(unk2->unk_00[1]);
SoundReq(unk2->unk_00[1]);
}
}
void sub_0807EFD4(Entity* unk1, ScriptExecutionContext* unk2) {
PlaySFX(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
SoundReq(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00));
}
void sub_0807EFE4(Entity* unk1, ScriptExecutionContext* unk2) {
PlaySFX(0x80100000);
SoundReq(0x80100000);
}
void sub_0807EFF4(Entity* unk1, ScriptExecutionContext* unk2) {
src/sub_08050008.c
+2 -2
View File
@@ -2,12 +2,12 @@
extern u32 gUnk_020354C0;
extern s32 gFadeControl;
extern void _DmaZero(u32, u32, u32);
extern void MemClear32(u32, u32, u32);
void sub_08050008(u32 param_1, u32 param_2, u32 param_3) {
s32* unk;
_DmaZero((u32)&gUnk_020354C0, 128, param_3);
MemClear32((u32)&gUnk_020354C0, 128, param_3);
unk = &gFadeControl;
*(unk + 1) = -1;
src/textbox.c
+12 -12
View File
@@ -83,7 +83,7 @@ void TextboxAtPosition(u32 index, u32 x, u32 y) {
}
void ShowTextbox(u32 index) {
_DmaZero(&gTextBox, 32);
MemClear32(&gTextBox, 32);
gTextBox.textIndex = index;
gTextBox.textSpeed = 99;
gTextBox.textWindowWidth = 26;
@@ -94,18 +94,18 @@ void ShowTextbox(u32 index) {
}
void MessageInitialize(void) {
_DmaZero(&gTextBox, 32);
_DmaZero(&gUnk_02022780, 168);
_DmaZero(&gUnk_02036A40, 8);
_DmaZero(&gUnk_02036A38, 8);
_DmaZero(&gUnk_02000040, 4);
MemClear32(&gTextBox, 32);
MemClear32(&gUnk_02022780, 168);
MemClear32(&gUnk_02036A40, 8);
MemClear32(&gUnk_02036A38, 8);
MemClear32(&gUnk_02000040, 4);
}
void MessageUpdate(void) {
int iVar1;
if (gTextBox.doTextBox == 1) {
_DmaZero((u32*)&gUnk_02022780, sizeof(gUnk_02022780));
MemClear32((u32*)&gUnk_02022780, sizeof(gUnk_02022780));
sub_080564C8(1);
}
@@ -141,9 +141,9 @@ NONMATCH("asm/non_matching/textbox/sub_080564EC.inc", u32 sub_080564EC(void)) {
u32 i;
char c;
_DmaZero((void*)&gUnk_02036A40, 8);
_DmaZero((void*)&gUnk_02024030, 0x18);
_DmaZero((void*)&gUnk_02022780, 0xa8);
MemClear32((void*)&gUnk_02036A40, 8);
MemClear32((void*)&gUnk_02024030, 0x18);
MemClear32((void*)&gUnk_02022780, 0xa8);
_DmaCopy(&gTextBox, &gUnk_02022780, 32);
if (gUnk_02022780._2 == 0x63) {
gUnk_02022780._2 = gUnk_02000000->messageSpeed;
@@ -180,7 +180,7 @@ u32 sub_080565B4(void) {
gUnk_02022780._89 = 1;
gUnk_02022780._99 = 1;
sub_08056F88(gUnk_02022780._3[0], gUnk_02022780._53);
PlaySFX(0x65);
SoundReq(0x65);
}
if (sub_08056CC0(1)) {
@@ -195,7 +195,7 @@ u32 sub_080565F8(void) {
gUnk_02022780._89 = 1;
gUnk_02022780._99 = 3;
sub_08056BDC(0);
PlaySFX(0x66);
SoundReq(0x66);
}
if (sub_08056CC0(-1)) {