bss

include/variables.h

@@ -3170,18 +3170,18 @@ extern s16 D_801F4E7A;
 extern void (*sKaleidoScopeUpdateFunc)(PlayState* play);
 extern void (*sKaleidoScopeDrawFunc)(PlayState* play);
 extern FaultAddrConvClient sKaleidoAreaFaultClient;
-// extern UNK_TYPE1 sTransitionFillTimer;
+extern s16 sTransitionFillTimer;
 extern Input D_801F6C18;
-// extern UNK_TYPE1 sTrnsnUnk;
-// extern UNK_TYPE1 D_801F6D0C;
-extern UNK_TYPE4 gTrnsnUnkState;
-// extern UNK_TYPE1 sVisMono;
+extern FbDemoStruct sTrnsnUnk;
+extern u16* D_801F6D0C;
+extern s32 gTrnsnUnkState;
+extern VisMono sVisMono;
 extern Color_RGBA8_u32 gVisMonoColor;
-// extern UNK_TYPE1 D_801F6D38;
-// extern UNK_TYPE4 D_801F6D4C;
-// extern UNK_TYPE1 sHireso;
+extern Struct_80140E80 D_801F6D38;
+extern Struct_80140E80* D_801F6D4C;
+extern HiresoStruct sHireso;
 extern u8 sBombersNotebookOpen;
-// extern UNK_TYPE1 D_801F6DFD;
+extern u8 sMotionBlurStatus;
 extern SlowlyTask D_801F6E00;
 extern s32 D_801F6FC0;
 extern StackEntry slowlyStackEntry;

include/z64.h

@@ -766,7 +766,7 @@ typedef enum {
     /*  6 */ TRANS_TYPE_FADE_BLACK_SLOW,
     /*  7 */ TRANS_TYPE_FADE_WHITE_SLOW,
     /*  8 */ TRANS_TYPE_WIPE_FAST,
-    /*  9 */ TRANS_TYPE_FILL_WHITE2, 
+    /*  9 */ TRANS_TYPE_FILL_WHITE_FAST, 
     /* 10 */ TRANS_TYPE_FILL_WHITE,
     /* 11 */ TRANS_TYPE_INSTANT,
     /* 12 */ TRANS_TYPE_FILL_BROWN,

spec

@@ -555,7 +555,6 @@ beginseg
     include "build/src/code/z_fbdemo_circle.o"
     include "build/src/code/z_overlay.o"
     include "build/src/code/z_play.o"
-    include "build/data/code/z_play.bss.o"
     include "build/src/code/z_play_hireso.o"
     include "build/data/code/z_play_hireso.data.o"
     include "build/src/code/PreRender.o"

src/code/z_play.c

@@ -8,24 +8,22 @@
 #include "overlays/gamestates/ovl_file_choose/z_file_choose.h"
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
 
-extern Gfx D_0E000140[];
-
 s32 gDbgCamEnabled = false;
 u8 D_801D0D54 = false;
 
 // bss
-extern s16 sTransitionFillTimer;
-extern Input D_801F6C18;
-extern FbDemoStruct sTrnsnUnk;
-extern u16* D_801F6D0C;
-extern s32 gTrnsnUnkState;
-extern VisMono sVisMono;
-extern Color_RGBA8_u32 gVisMonoColor;
-extern Struct_80140E80 D_801F6D38;
-extern Struct_80140E80* D_801F6D4C;
-extern HiresoStruct sHireso;
-extern u8 sBombersNotebookOpen;
-extern u8 sMotionBlurStatus;
+s16 sTransitionFillTimer;
+Input D_801F6C18;
+FbDemoStruct sTrnsnUnk;
+u16* D_801F6D0C;
+s32 gTrnsnUnkState;
+VisMono sVisMono;
+Color_RGBA8_u32 gVisMonoColor;
+Struct_80140E80 D_801F6D38;
+Struct_80140E80* D_801F6D4C;
+HiresoStruct sHireso;
+u8 sBombersNotebookOpen;
+u8 sMotionBlurStatus;
 
 typedef enum {
     /* 0 */ MOTION_BLUR_STOPPED,
@@ -267,7 +265,7 @@ void Play_SetupTransition(PlayState* this, s32 transitionType) {
                 fbdemoType = FBDEMO_FADE;
                 break;
 
-            case TRANS_TYPE_FILL_WHITE2:
+            case TRANS_TYPE_FILL_WHITE_FAST:
             case TRANS_TYPE_FILL_WHITE:
                 this->transitionMode = TRANS_MODE_FILL_WHITE_INIT;
                 break;
@@ -655,7 +653,7 @@ void Play_UpdateTransition(PlayState* this) {
             }
 
             if ((this->transitionCtx.transitionType == TRANS_TYPE_WIPE_FAST) ||
-                (this->transitionCtx.transitionType == TRANS_TYPE_FILL_WHITE2)) {
+                (this->transitionCtx.transitionType == TRANS_TYPE_FILL_WHITE_FAST)) {
                 transWipeSpeed = 28;
             } else {
                 transWipeSpeed = 14;
@@ -1286,7 +1284,7 @@ void Play_Draw(PlayState* this) {
                 func_80170798(&this->pauseBgPreRender, &sp8C);
             }
 
-            gSPDisplayList(sp8C++, D_0E000140);
+            gSPDisplayList(sp8C++, D_0E000000.syncSegments);
             POLY_OPA_DISP = sp8C;
             sp25B = true;
             goto Play_Draw_DrawOverlayElements;
@@ -1545,11 +1543,11 @@ f32 func_80169100(PlayState* this, MtxF* mtx, CollisionPoly** poly, s32* bgId, V
     return floorHeight;
 }
 
-void func_801691F0(PlayState* this, MtxF* mtx, Vec3f* feetPos) {
+void func_801691F0(PlayState* this, MtxF* mtx, Vec3f* pos) {
     CollisionPoly* poly;
     s32 bgId;
 
-    func_80169100(this, mtx, &poly, &bgId, feetPos);
+    func_80169100(this, mtx, &poly, &bgId, pos);
 }
 
 void* Play_LoadFile(PlayState* this, RomFile* entry) {
@@ -2308,7 +2306,7 @@ void Play_Init(GameState* thisx) {
     }
 
     if ((CURRENT_DAY != 0) && ((this->roomCtx.curRoom.unk3 == 1) || (this->roomCtx.curRoom.unk3 == 5))) {
-        Actor_Spawn(&this->actorCtx, this, 0x15A, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0);
+        Actor_Spawn(&this->actorCtx, this, ACTOR_EN_TEST4, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0);
     }
 
     player = GET_PLAYER(this);
@@ -2332,5 +2330,5 @@ void Play_Init(GameState* thisx) {
     Hireso_Init(&sHireso);
 }
 
-// play_hireso need to confirm still
+//! TODO: fake symbol, remove when Hireso_Update is matching
 u16 D_801D0D78[] = { 0, 0, 0, 0 };

tools/disasm/variables.txt

@@ -4062,8 +4062,8 @@
     0x801F6D30:("gVisMonoColor","Color_RGBA8","",0x4),
     0x801F6D38:("D_801F6D38","UNK_TYPE1","",0x1),
     0x801F6D4C:("D_801F6D4C","UNK_TYPE4","",0x4),
-    0x801F6D50:("D_801F6D50","UNK_TYPE1","",0x1),
-    0x801F6DFC:("D_801F6DFC","u8","",0x1),
+    0x801F6D50:("sHireso","UNK_TYPE1","",0x1),
+    0x801F6DFC:("sBombersNotebookOpen","u8","",0x1),
     0x801F6DFD:("sMotionBlurStatus","UNK_TYPE1","",0x1),
     0x801F6E00:("D_801F6E00","SlowlyTask","",0x1c0),
     0x801F6FC0:("D_801F6FC0","UNK_TYPE1","",0x1),