Hireso -> BombersNotebook

include/functions.h

@@ -2513,11 +2513,11 @@ void Play_Init(GameState* thisx);
 // void func_8016CD4C(void);
 // void func_8016E40C(void);
 // void func_8016EA90(void);
-void Hireso_Draw(HiresoStruct* arg0, GraphicsContext* gfxCtx);
+void BombersNotebook_Draw(BombersNotebook* this, GraphicsContext* gfxCtx);
 // void func_8016F4EC(void);
-void Hireso_Update(PlayState* play, HiresoStruct* arg1, Input* input);
-void Hireso_Init(HiresoStruct* this);
-void Hireso_Destroy(HiresoStruct* this);
+void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input);
+void BombersNotebook_Init(BombersNotebook* this);
+void BombersNotebook_Destroy(BombersNotebook* this);
 void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg);
 void PreRender_Init(PreRender* this);
 void PreRender_SetValues(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf);

include/variables.h

@@ -3179,7 +3179,7 @@ extern VisMono sVisMono;
 extern Color_RGBA8_u32 gVisMonoColor;
 extern Struct_80140E80 D_801F6D38;
 extern Struct_80140E80* D_801F6D4C;
-extern HiresoStruct sHireso;
+extern BombersNotebook sBombersNotebook;
 extern u8 sBombersNotebookOpen;
 extern u8 sMotionBlurStatus;
 extern SlowlyTask D_801F6E00;

include/z64.h

@@ -1133,7 +1133,7 @@ typedef struct {
     /* 0xA0 */ char unk_A0[0x4];
     /* 0xA4 */ s32 unk_A4;
     /* 0xA8 */ s32 unk_A8;
-} HiresoStruct; // size = 0xAC
+} BombersNotebook; // size = 0xAC
 
 typedef enum {
     /* 0 */ PICTOGRAPH_PHOTO_STATE_OFF,

src/code/z_play.c

@@ -21,7 +21,7 @@ VisMono sVisMono;
 Color_RGBA8_u32 gVisMonoColor;
 Struct_80140E80 D_801F6D38;
 Struct_80140E80* D_801F6D4C;
-HiresoStruct sHireso;
+BombersNotebook sBombersNotebook;
 u8 sBombersNotebookOpen;
 u8 sMotionBlurStatus;
 
@@ -355,7 +355,7 @@ void Play_Destroy(GameState* thisx) {
         sBombersNotebookOpen = false;
     }
 
-    Hireso_Destroy(&sHireso);
+    BombersNotebook_Destroy(&sBombersNotebook);
     this->state.gfxCtx->callback = NULL;
     this->state.gfxCtx->callbackParam = 0;
     Play_DestroyMotionBlur();
@@ -1017,14 +1017,14 @@ void Play_SetupUpdate(PlayState* this) {
     if (!sBombersNotebookOpen) {
         if (this->pauseCtx.bombersNotebookOpen) {
             sBombersNotebookOpen = true;
-            sHireso.unk_00 = 0;
+            sBombersNotebook.unk_00 = 0;
         }
     } else if (CHECK_BTN_ALL(CONTROLLER1(&this->state)->press.button, BTN_L) ||
                CHECK_BTN_ALL(CONTROLLER1(&this->state)->press.button, BTN_B) ||
                CHECK_BTN_ALL(CONTROLLER1(&this->state)->press.button, BTN_START) || (gIrqMgrResetStatus != 0)) {
         sBombersNotebookOpen = false;
         this->pauseCtx.bombersNotebookOpen = false;
-        sHireso.unk_00 = 0;
+        sBombersNotebook.unk_00 = 0;
         this->msgCtx.msgLength = 0;
         this->msgCtx.msgMode = 0;
         this->msgCtx.currentTextId = 0;
@@ -1032,7 +1032,7 @@ void Play_SetupUpdate(PlayState* this) {
         play_sound(NA_SE_SY_CANCEL);
     }
     if (sBombersNotebookOpen) {
-        Hireso_Update(this, &sHireso, this->state.input);
+        BombersNotebook_Update(this, &sBombersNotebook, this->state.input);
         Message_Update(this);
     } else {
         Play_Update(this);
@@ -1319,7 +1319,8 @@ void Play_Draw(PlayState* this) {
         DebugDisplay_DrawObjects(this);
         Play_DrawMotionBlur(this);
 
-        if (((R_PAUSE_MENU_MODE == PAUSE_BG_PRERENDER_SETUP) || (gTrnsnUnkState == 1)) || (R_PICTOGRAPH_PHOTO_STATE == 1)) {
+        if (((R_PAUSE_MENU_MODE == PAUSE_BG_PRERENDER_SETUP) || (gTrnsnUnkState == 1)) ||
+            (R_PICTOGRAPH_PHOTO_STATE == 1)) {
             Gfx* sp74;
             Gfx* sp70 = POLY_OPA_DISP;
 
@@ -1416,7 +1417,7 @@ void Play_SetupDraw(PlayState* this) {
     }
 
     if (sBombersNotebookOpen && ((SREG(2) != 2) || (gZBufferPtr == NULL))) {
-        Hireso_Draw(&sHireso, gfxCtx);
+        BombersNotebook_Draw(&sBombersNotebook, gfxCtx);
         Message_Draw(this);
     } else {
         Play_Draw(this);
@@ -2269,8 +2270,8 @@ void Play_Init(GameState* thisx) {
     func_800EDBE0(this);
     gSaveContext.respawnFlag = 0;
     sBombersNotebookOpen = false;
-    Hireso_Init(&sHireso);
+    BombersNotebook_Init(&sBombersNotebook);
 }
 
-//! TODO: fake symbol, remove when Hireso_Update is matching
+//! TODO: fake symbol, remove when BombersNotebook_Update is matching
 u16 D_801D0D78[] = { 0, 0, 0, 0 };

src/code/z_play_hireso.c

@@ -16,12 +16,12 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/func_8016EA90.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/Hireso_Draw.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/BombersNotebook_Draw.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/func_8016F4EC.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/Hireso_Update.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/BombersNotebook_Update.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/Hireso_Init.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/BombersNotebook_Init.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/Hireso_Destroy.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_play_hireso/BombersNotebook_Destroy.s")

tools/disasm/functions.txt

@@ -3048,11 +3048,11 @@
     0x8016CD4C:("func_8016CD4C",),
     0x8016E40C:("func_8016E40C",),
     0x8016EA90:("func_8016EA90",),
-    0x8016F1A8:("Hireso_Draw",),
+    0x8016F1A8:("BombersNotebook_Draw",),
     0x8016F4EC:("func_8016F4EC",),
-    0x8016F5A8:("Hireso_Update",),
-    0x8016FC78:("Hireso_Init",),
-    0x8016FC98:("Hireso_Destroy",),
+    0x8016F5A8:("BombersNotebook_Update",),
+    0x8016FC78:("BombersNotebook_Init",),
+    0x8016FC98:("BombersNotebook_Destroy",),
     0x8016FCF0:("PreRender_SetValuesSave",),
     0x8016FD2C:("PreRender_Init",),
     0x8016FD60:("PreRender_SetValues",),

tools/disasm/variables.txt

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

tools/sizes/code_functions.csv

@@ -2562,11 +2562,11 @@ asm/non_matchings/code/z_play_hireso/func_8016C344.s,func_8016C344,0x8016C344,0x
 asm/non_matchings/code/z_play_hireso/func_8016CD4C.s,func_8016CD4C,0x8016CD4C,0x5B0
 asm/non_matchings/code/z_play_hireso/func_8016E40C.s,func_8016E40C,0x8016E40C,0x1A1
 asm/non_matchings/code/z_play_hireso/func_8016EA90.s,func_8016EA90,0x8016EA90,0x1C6
-asm/non_matchings/code/z_play_hireso/Hireso_Draw.s,Hireso_Draw,0x8016F1A8,0xD1
+asm/non_matchings/code/z_play_hireso/BombersNotebook_Draw.s,BombersNotebook_Draw,0x8016F1A8,0xD1
 asm/non_matchings/code/z_play_hireso/func_8016F4EC.s,func_8016F4EC,0x8016F4EC,0x2F
-asm/non_matchings/code/z_play_hireso/Hireso_Update.s,Hireso_Update,0x8016F5A8,0x1B4
-asm/non_matchings/code/z_play_hireso/Hireso_Init.s,Hireso_Init,0x8016FC78,0x8
-asm/non_matchings/code/z_play_hireso/Hireso_Destroy.s,Hireso_Destroy,0x8016FC98,0x16
+asm/non_matchings/code/z_play_hireso/BombersNotebook_Update.s,BombersNotebook_Update,0x8016F5A8,0x1B4
+asm/non_matchings/code/z_play_hireso/BombersNotebook_Init.s,BombersNotebook_Init,0x8016FC78,0x8
+asm/non_matchings/code/z_play_hireso/BombersNotebook_Destroy.s,BombersNotebook_Destroy,0x8016FC98,0x16
 asm/non_matchings/code/PreRender/PreRender_SetValuesSave.s,PreRender_SetValuesSave,0x8016FCF0,0xF
 asm/non_matchings/code/PreRender/PreRender_Init.s,PreRender_Init,0x8016FD2C,0xD
 asm/non_matchings/code/PreRender/PreRender_SetValues.s,PreRender_SetValues,0x8016FD60,0xD