z64 - v

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;

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;

include/interface.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "dma.h"
-#include "z64view.h"
+#include "view.h"
 
 struct PlayState;
 

include/map_select_state.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "game.h"
-#include "z64view.h"
+#include "view.h"
 
 struct MapSelectState;
 

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"
 

include/pause.h

@@ -3,7 +3,7 @@
 
 #include "animation.h"
 #include "message.h"
-#include "z64view.h"
+#include "view.h"
 
 struct OcarinaStaff;
 struct PlayState;

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;

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;

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;

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"

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"

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"
 

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

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"

src/code/z_view.c

@@ -1,4 +1,4 @@
-#include "z64view.h"
+#include "view.h"
 
 #include "libc64/malloc.h"
 #include "libu64/debug.h"

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.

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

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.

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"

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;