Merge pull request #341 from Henny022p/subtask

This commit is contained in:
notyourav
2022-02-01 20:28:25 -08:00
committed by GitHub
44 changed files with 2597 additions and 4230 deletions
+1 -1
View File
@@ -306,7 +306,7 @@ void sub_0805A76C(Manager15* this) {
gPlayerEntity.animationState = 4;
RequestPriorityDuration((Entity*)this, 600);
SetPlayerControl(0xFF);
gUnk_02034490[0] = 1;
gUnk_02034490.unk0 = 1;
gRoomControls.camera_target = NULL;
sub_08077B20();
}
+4 -4
View File
@@ -80,7 +80,7 @@ void Manager7_Main(Manager7* this) {
tmp2 = &gUnk_081080A4[tmp << 4];
tmp3 = this->manager.unk_0e;
if (tmp3 == 0) {
gUnk_02034490[0] = 1;
gUnk_02034490.unk0 = 1;
LoadResourceAsync(&gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x1000);
LoadPaletteGroup(gUnk_081081E4[tmp]);
this->manager.unk_0e++;
@@ -97,7 +97,7 @@ void Manager7_Main(Manager7* this) {
LoadResourceAsync(&gGlobalGfxAndPalettes[tmp2[(this->manager.unk_0e << 1)]],
tmp2[(this->manager.unk_0e << 1) + 1], 0x1000);
this->manager.unk_0e++;
gUnk_02034490[0] = 0;
gUnk_02034490.unk0 = 0;
case 8:
break;
}
@@ -130,7 +130,7 @@ void Manager7_Main(Manager7* this) {
tmp2 = &gUnk_081080A4[tmp << 4];
switch (this->manager.unk_0e) {
case 0:
gUnk_02034490[0] = 1;
gUnk_02034490.unk0 = 1;
LoadResourceAsync(&gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x1000);
LoadPaletteGroup(gUnk_081081E4[tmp]);
this->manager.unk_0e++;
@@ -147,7 +147,7 @@ void Manager7_Main(Manager7* this) {
this->manager.unk_0e++;
break;
case 8:
gUnk_02034490[0] = 0;
gUnk_02034490.unk0 = 0;
this->manager.unk_0e++;
break;
}