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
+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);
}
}
+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;
+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) {
+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);
}
}
}
+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);
}
}
}
+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;
+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);
}
+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;
+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;
+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) {
+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();