3 files changed, 6 insertions, 4 deletions
diff --git a/src/overlays/gamestates/ovl_play/m_play.c b/src/overlays/gamestates/ovl_play/m_play.c
index 44dea63..d3201e5 100644
--- a/src/overlays/gamestates/ovl_play/m_play.c
+++ b/src/overlays/gamestates/ovl_play/m_play.c
@@ -337,8 +337,8 @@ void play_cleanup(Game* game) {
     Game_Play* game_play = (Game_Play*)game;
 
     func_800A3304_jp(game_play);
-    game_play->state.gfxCtx->unk_2F4 = 0;
-    game_play->state.gfxCtx->unk_2F8 = 0;
+    game_play->state.gfxCtx->callback = NULL;
+    game_play->state.gfxCtx->callbackArg = NULL;
     game_play->submenu.unk_00 = 0;
     PreRender_cleanup(&game_play->unk_1DC0);
     CollisionCheck_dt(game_play, &game_play->unk_2138);
diff --git a/src/overlays/gamestates/ovl_prenmi/m_prenmi.c b/src/overlays/gamestates/ovl_prenmi/m_prenmi.c
index 122e1ef..cbd567d 100644
--- a/src/overlays/gamestates/ovl_prenmi/m_prenmi.c
+++ b/src/overlays/gamestates/ovl_prenmi/m_prenmi.c
@@ -1,4 +1,5 @@
 #include "m_prenmi.h"
+#include "libc/stdbool.h"
 #include "irqmgr.h"
 #include "viconfig.h"
 #include "gfx.h"
@@ -54,7 +55,7 @@ void prenmi_main(Game* game) {
     prenmi_move(prenmi);
     prenmi_draw(prenmi);
 
-    prenmi->state.unk_A4 = 1;
+    prenmi->state.unk_A4 = true;
     { UNUSED s32 scopedTemp; }
     graph = game->gfxCtx;
 
diff --git a/src/overlays/gamestates/ovl_second_game/second_game.c b/src/overlays/gamestates/ovl_second_game/second_game.c
index 3fe3dcd..c823089 100644
--- a/src/overlays/gamestates/ovl_second_game/second_game.c
+++ b/src/overlays/gamestates/ovl_second_game/second_game.c
@@ -1,4 +1,5 @@
 #include "second_game.h"
+#include "libc/stdbool.h"
 #include "overlays/gamestates/ovl_trademark/m_trademark.h"
 #include "overlays/gamestates/ovl_cpedit/m_cpedit.h"
 #include "69CB30.h"
@@ -30,7 +31,7 @@ void second_game_main(Game* game) {
         SET_NEXT_GAMESTATE(&secondGame->state, trademark_init, sizeof(Game_Trademark));
     }
 
-    secondGame->state.unk9E = 1;
+    secondGame->state.unk_9E = true;
 }
 
 void second_game_cleanup(UNUSED Game* game) {