From e823641389f7925c9636f2b82bdf63a0b5186b8c Mon Sep 17 00:00:00 2001
From: fig02 <fig02srl@gmail.com>
Date: Mon, 28 Apr 2025 11:21:51 -0400
Subject: [PATCH] z64 - v

---
 include/console_logo_state.h                            | 2 +-
 include/file_select_state.h                             | 2 +-
 include/interface.h                                     | 2 +-
 include/map_select_state.h                              | 2 +-
 include/message.h                                       | 2 +-
 include/pause.h                                         | 2 +-
 include/play_state.h                                    | 2 +-
 include/sample_state.h                                  | 2 +-
 include/title_setup_state.h                             | 2 +-
 include/{z64view.h => view.h}                           | 4 ++--
 include/{z64vis.h => vis.h}                             | 4 ++--
 src/code/game.c                                         | 2 +-
 src/code/speed_meter.c                                  | 2 +-
 src/code/z_play.c                                       | 2 +-
 src/code/z_view.c                                       | 2 +-
 src/code/z_viscvg.c                                     | 2 +-
 src/code/z_vismono.c                                    | 2 +-
 src/code/z_viszbuf.c                                    | 2 +-
 src/overlays/gamestates/ovl_file_choose/z_file_choose.c | 2 +-
 src/overlays/gamestates/ovl_opening/z_opening.c         | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)
 rename include/{z64view.h => view.h} (99%)
 rename include/{z64vis.h => vis.h} (98%)

diff --git a/include/console_logo_state.h b/include/console_logo_state.h
index 497401d4ef..da9509b72d 100644
--- a/include/console_logo_state.h
+++ b/include/console_logo_state.h
@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "game.h"
 #include "sram.h"
-#include "z64view.h"
+#include "view.h"
 
 typedef struct ConsoleLogoState {
     /* 0x0000 */ GameState state;
diff --git a/include/file_select_state.h b/include/file_select_state.h
index 59f6dcc066..6dc7cfadcb 100644
--- a/include/file_select_state.h
+++ b/include/file_select_state.h
@@ -7,7 +7,7 @@
 #include "message.h"
 #include "skybox.h"
 #include "sram.h"
-#include "z64view.h"
+#include "view.h"
 
 typedef struct FileSelectState {
     /* 0x00000 */ GameState state;
diff --git a/include/interface.h b/include/interface.h
index 2b2529b824..84834b3df6 100644
--- a/include/interface.h
+++ b/include/interface.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "dma.h"
-#include "z64view.h"
+#include "view.h"
 
 struct PlayState;
 
diff --git a/include/map_select_state.h b/include/map_select_state.h
index 701876dbcc..01e57dd1d0 100644
--- a/include/map_select_state.h
+++ b/include/map_select_state.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "game.h"
-#include "z64view.h"
+#include "view.h"
 
 struct MapSelectState;
 
diff --git a/include/message.h b/include/message.h
index 8cad48e2bd..3948f2dd09 100644
--- a/include/message.h
+++ b/include/message.h
@@ -1,7 +1,7 @@
 #ifndef MESSAGE_H
 #define MESSAGE_H
 
-#include "z64view.h"
+#include "view.h"
 #include "versions.h"
 #include "font.h"
 
diff --git a/include/pause.h b/include/pause.h
index 8d82bb7785..e85c7303d6 100644
--- a/include/pause.h
+++ b/include/pause.h
@@ -3,7 +3,7 @@
 
 #include "animation.h"
 #include "message.h"
-#include "z64view.h"
+#include "view.h"
 
 struct OcarinaStaff;
 struct PlayState;
diff --git a/include/play_state.h b/include/play_state.h
index beacf66f14..fa5e4839f3 100644
--- a/include/play_state.h
+++ b/include/play_state.h
@@ -24,7 +24,7 @@
 #include "skybox.h"
 #include "sram.h"
 #include "transition.h"
-#include "z64view.h"
+#include "view.h"
 
 union Color_RGBA8_u32;
 struct Path;
diff --git a/include/sample_state.h b/include/sample_state.h
index d8e72bf3ea..adf9e2a466 100644
--- a/include/sample_state.h
+++ b/include/sample_state.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "game.h"
-#include "z64view.h"
+#include "view.h"
 
 typedef struct SampleState {
     /* 0x0000 */ GameState state;
diff --git a/include/title_setup_state.h b/include/title_setup_state.h
index 731b0742c8..3d6a52445f 100644
--- a/include/title_setup_state.h
+++ b/include/title_setup_state.h
@@ -2,7 +2,7 @@
 #define TITLE_SETUP_STATE_H
 
 #include "game.h"
-#include "z64view.h"
+#include "view.h"
 
 typedef struct TitleSetupState {
     /* 0x0000 */ GameState state;
diff --git a/include/z64view.h b/include/view.h
similarity index 99%
rename from include/z64view.h
rename to include/view.h
index f31c39f650..b2dadd3db4 100644
--- a/include/z64view.h
+++ b/include/view.h
@@ -1,5 +1,5 @@
-#ifndef Z64VIEW_H
-#define Z64VIEW_H
+#ifndef VIEW_H
+#define VIEW_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
diff --git a/include/z64vis.h b/include/vis.h
similarity index 98%
rename from include/z64vis.h
rename to include/vis.h
index 86e286c325..52b1f0a690 100644
--- a/include/z64vis.h
+++ b/include/vis.h
@@ -1,5 +1,5 @@
-#ifndef Z64_VIS_H
-#define Z64_VIS_H
+#ifndef VIS_H
+#define VIS_H
 
 #include "ultra64.h"
 #include "color.h"
diff --git a/src/code/game.c b/src/code/game.c
index 42b39b8249..ed7f67e9d1 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -30,7 +30,7 @@
 #include "dma.h"
 #include "game.h"
 #include "play_state.h"
-#include "z64vis.h"
+#include "vis.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128"
 
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index 6d0b746b20..0216275f17 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -10,7 +10,7 @@
 #include "terminal.h"
 #include "zelda_arena.h"
 #include "game.h"
-#include "z64view.h"
+#include "view.h"
 
 /**
  * How much time the audio update on the audio thread (`AudioThread_Update`) took in total, between scheduling the last
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 9afa1ad3df..99d596c0c9 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -45,7 +45,7 @@
 #include "play_state.h"
 #include "player.h"
 #include "save.h"
-#include "z64vis.h"
+#include "vis.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:224" \
                                "ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240"
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 6fe82aaeb3..4c37194cfd 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -1,4 +1,4 @@
-#include "z64view.h"
+#include "view.h"
 
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
diff --git a/src/code/z_viscvg.c b/src/code/z_viscvg.c
index 51fc6f8e5d..1616b661c0 100644
--- a/src/code/z_viscvg.c
+++ b/src/code/z_viscvg.c
@@ -21,7 +21,7 @@
  */
 
 #include "gfx.h"
-#include "z64vis.h"
+#include "vis.h"
 
 /**
  * Draws only coverage: does not retain any of the original pixel RGB, primColor is used as background color.
diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c
index 517f2ada60..632d00a6e7 100644
--- a/src/code/z_vismono.c
+++ b/src/code/z_vismono.c
@@ -13,7 +13,7 @@
 #include "attributes.h"
 #include "gfx.h"
 #include "gfxalloc.h"
-#include "z64vis.h"
+#include "vis.h"
 
 // Height of the fragments the color frame buffer (CFB) is split into.
 // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into
diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c
index 431d7f6d9a..aa72289742 100644
--- a/src/code/z_viszbuf.c
+++ b/src/code/z_viszbuf.c
@@ -33,7 +33,7 @@
  */
 
 #include "gfx.h"
-#include "z64vis.h"
+#include "vis.h"
 
 // Height of the fragments the z-buffer is split into.
 // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into TMEM.
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index bc0e490625..cc790ee13d 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -31,7 +31,7 @@
 #include "skybox.h"
 #include "sram.h"
 #include "ss_sram.h"
-#include "z64view.h"
+#include "view.h"
 
 #if OOT_PAL_N64
 #include "assets/objects/object_mag/object_mag.h"
diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c
index f03766c368..f300c1ea7b 100644
--- a/src/overlays/gamestates/ovl_opening/z_opening.c
+++ b/src/overlays/gamestates/ovl_opening/z_opening.c
@@ -12,7 +12,7 @@
 #include "play_state.h"
 #include "save.h"
 #include "sram.h"
-#include "z64view.h"
+#include "view.h"
 
 void TitleSetup_SetupTitleScreen(TitleSetupState* this) {
     gSaveContext.gameMode = GAMEMODE_TITLE_SCREEN;