diff --git a/include/functions.h b/include/functions.h index bf65caa15c..86d3be8a87 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2381,7 +2381,7 @@ void func_801434E4(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType); Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z); void SkyboxDraw_SetColors(SkyboxContext* skyboxCtx, u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB); void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z); -void SkyboxDraw_Noop(SkyboxContext* skyboxCtx); +void SkyboxDraw_Update(SkyboxContext* skyboxCtx); // void func_80147520(void); void func_80147564(PlayState* play); diff --git a/include/variables.h b/include/variables.h index 43516ca27e..ed451ee39e 100644 --- a/include/variables.h +++ b/include/variables.h @@ -3196,7 +3196,7 @@ extern Input D_801F6C18; // extern UNK_TYPE1 D_801F6D0C; extern UNK_TYPE4 gTrnsnUnkState; // extern UNK_TYPE1 D_801F6D18; -extern Color_RGBA8 D_801F6D30; +extern Color_RGBA8 gVisMonoColor; // extern UNK_TYPE1 D_801F6D38; // extern UNK_TYPE4 D_801F6D4C; // extern UNK_TYPE1 D_801F6D50; diff --git a/include/z64.h b/include/z64.h index e2357794cd..4b5ff4254c 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1177,7 +1177,7 @@ struct PlayState { /* 0x1883C */ Mtx* billboardMtx; /* 0x18840 */ u32 gameplayFrames; /* 0x18844 */ u8 unk_18844; - /* 0x18845 */ u8 unk_18845; + /* 0x18845 */ u8 haltAllActors; /* 0x18846 */ s16 numSetupActors; /* 0x18848 */ u8 numRooms; /* 0x1884C */ RomFile* roomList; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index baf3679228..0c66a6283d 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -204,16 +204,16 @@ void Cutscene_Command_Misc(PlayState* play2, CutsceneContext* csCtx, CsCmdBase* } break; case 0xA: - D_801F6D30.r = 255; - D_801F6D30.g = 255; - D_801F6D30.b = 255; - D_801F6D30.a = 255 * progress; + gVisMonoColor.r = 255; + gVisMonoColor.g = 255; + gVisMonoColor.b = 255; + gVisMonoColor.a = 255 * progress; break; case 0xB: - D_801F6D30.r = 255; - D_801F6D30.g = 180; - D_801F6D30.b = 100; - D_801F6D30.a = 255 * progress; + gVisMonoColor.r = 255; + gVisMonoColor.g = 180; + gVisMonoColor.b = 100; + gVisMonoColor.a = 255 * progress; break; case 0xC: play->roomCtx.currRoom.segment = NULL; @@ -234,10 +234,10 @@ void Cutscene_Command_Misc(PlayState* play2, CutsceneContext* csCtx, CsCmdBase* } break; case 0xE: - play->unk_18845 = 1; + play->haltAllActors = true; break; case 0xF: - play->unk_18845 = 0; + play->haltAllActors = false; break; case 0x10: if (isStartFrame) { diff --git a/src/code/z_play.c b/src/code/z_play.c index 6f10b4bc7e..3c02a51758 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -15,7 +15,7 @@ extern FbDemoStruct sTrnsnUnk; extern u16* D_801F6D0C; extern s32 gTrnsnUnkState; extern VisMono D_801F6D18; -extern Color_RGBA8 D_801F6D30; +extern Color_RGBA8 gVisMonoColor; extern Struct_80140E80 D_801F6D38; extern Struct_80140E80* D_801F6D4C; extern HiresoStruct D_801F6D50; @@ -993,7 +993,7 @@ void Play_Update(PlayState* this) { CollisionCheck_OC(this, &this->colChkCtx); CollisionCheck_Damage(this, &this->colChkCtx); CollisionCheck_ClearContext(this, &this->colChkCtx); - if (this->unk_18845 == 0) { + if (!this->haltAllActors) { Actor_UpdateAll(this, &this->actorCtx); } Cutscene_Update1(this, &this->csCtx); @@ -1008,7 +1008,7 @@ void Play_Update(PlayState* this) { Room_nop8012D510(this, &this->roomCtx.currRoom, &pad58[1], 0); Room_nop8012D510(this, &this->roomCtx.prevRoom, &pad58[1], 1); - SkyboxDraw_Noop(&this->skyboxCtx); + SkyboxDraw_Update(&this->skyboxCtx); if ((this->pauseCtx.state != 0) || (this->pauseCtx.debugEditor != DEBUG_EDITOR_NONE)) { KaleidoScopeCall_Update(this); @@ -1972,7 +1972,7 @@ void Play_Init(GameState* thisx) { this->transitionTrigger = TRANS_TRIGGER_END; this->unk_18876 = 0; this->bgCoverAlpha = 0; - this->unk_18845 = 0; + this->haltAllActors = false; this->unk_18844 = 0; if (gSaveContext.gameMode != 1) { @@ -1993,7 +1993,7 @@ void Play_Init(GameState* thisx) { TransitionFade_Start(&this->unk_18E48); VisMono_Init(&D_801F6D18); - D_801F6D30.a = 0; + gVisMonoColor.a = 0; D_801F6D4C = &D_801F6D38; func_80140E80(D_801F6D4C); D_801F6D4C->lodProportion = 0.0f; diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c index 326fcb3e2f..48b37ce8e4 100644 --- a/src/code/z_vr_box_draw.c +++ b/src/code/z_vr_box_draw.c @@ -63,5 +63,5 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb CLOSE_DISPS(gfxCtx); } -void SkyboxDraw_Noop(SkyboxContext* skyboxCtx) { +void SkyboxDraw_Update(SkyboxContext* skyboxCtx) { } diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index 1a0cb50586..45286fccb4 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -273,7 +273,7 @@ void func_80A70F2C(BgCraceMovebg* this, PlayState* play) { func_80A70C04(this, play); if (Math_StepToF(&this->unk160, 0.0f, 1.0f)) { if (!(this->unk170 & 2) && !Flags_GetSwitch(play, BGCRACEMOVEBG_GET_7F0(&this->dyna.actor) + 1)) { - play->unk_18845 = 1; + play->haltAllActors = true; func_80169FDC(&play->state); play_sound(NA_SE_OC_ABYSS); } diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 94eec2c1d6..99fd93627b 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -649,7 +649,7 @@ void func_80B814B8(BgIkanaRotaryroom* this, PlayState* play) { func_800B8E58(player, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->unk_92); func_80169EFC(&play->state); func_800B8E58(player, NA_SE_VO_LI_TAKEN_AWAY + player->ageProperties->unk_92); - play->unk_18845 = 1; + play->haltAllActors = true; play_sound(NA_SE_OC_ABYSS); this->actionFunc = NULL; } diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index 552bb27060..787f991734 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -2786,7 +2786,7 @@ 0x801435A0:("SkyboxDraw_UpdateMatrix",), 0x80143624:("SkyboxDraw_SetColors",), 0x80143668:("SkyboxDraw_Draw",), - 0x80143A04:("SkyboxDraw_Noop",), + 0x80143A04:("SkyboxDraw_Update",), 0x80143A10:("Sram_ActivateOwl",), 0x80143A54:("Sram_ClearHighscores",), 0x80143AC4:("Sram_ClearFlagsAtDawnOfTheFirstDay",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index bf6f1375c0..18a6cae872 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -4059,7 +4059,7 @@ 0x801F6D0C:("D_801F6D0C","UNK_TYPE1","",0x1), 0x801F6D10:("gTrnsnUnkState","UNK_TYPE4","",0x4), 0x801F6D18:("D_801F6D18","UNK_TYPE1","",0x1), - 0x801F6D30:("D_801F6D30","Color_RGBA8","",0x4), + 0x801F6D30:("gVisMonoColor","Color_RGBA8","",0x4), 0x801F6D38:("D_801F6D38","UNK_TYPE1","",0x1), 0x801F6D4C:("D_801F6D4C","UNK_TYPE4","",0x4), 0x801F6D50:("D_801F6D50","UNK_TYPE1","",0x1),