z64 - g

include/console_logo_state.h

@@ -2,7 +2,7 @@
 #define CONSOLE_LOGO_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64sram.h"
 #include "z64view.h"
 

include/file_select_state.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "environment.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64message.h"
 #include "z64skybox.h"
 #include "z64sram.h"

include/game.h

@@ -1,5 +1,5 @@
-#ifndef Z64GAME_H
-#define Z64GAME_H
+#ifndef GAME_H
+#define GAME_H
 // This file is named "game" after game.c for now, this may change later with the system name
 
 #include "ultra64/ultratypes.h"

include/game_over.h

@@ -1,5 +1,5 @@
-#ifndef Z64GAME_OVER_H
-#define Z64GAME_OVER_H
+#ifndef GAME_OVER_H
+#define GAME_OVER_H
 
 #include "ultra64.h"
 

include/map_select_state.h

@@ -2,7 +2,7 @@
 #define MAP_SELECT_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64view.h"
 
 struct MapSelectState;

include/prenmi_state.h

@@ -2,7 +2,7 @@
 #define PRENMI_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 
 typedef struct PreNMIState {
     /* 0x00 */ GameState state;

include/sample_state.h

@@ -2,7 +2,7 @@
 #define SAMPLE_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64view.h"
 
 typedef struct SampleState {

include/setup_state.h

@@ -1,7 +1,7 @@
 #ifndef SETUP_STATE_H
 #define SETUP_STATE_H
 
-#include "z64game.h"
+#include "game.h"
 
 typedef struct SetupState {
     /* 0x00 */ GameState state;

include/title_setup_state.h

@@ -1,7 +1,7 @@
 #ifndef TITLE_SETUP_STATE_H
 #define TITLE_SETUP_STATE_H
 
-#include "z64game.h"
+#include "game.h"
 #include "z64view.h"
 
 typedef struct TitleSetupState {

include/z64play.h

@@ -11,8 +11,8 @@
 #include "cutscene.h"
 #include "environment.h"
 #include "frame_advance.h"
-#include "z64game.h"
-#include "z64game_over.h"
+#include "game.h"
+#include "game_over.h"
 #include "z64interface.h"
 #include "z64light.h"
 #include "z64message.h"

src/code/game.c

@@ -28,7 +28,7 @@
 #include "zelda_arena.h"
 #include "debug.h"
 #include "dma.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64play.h"
 #include "z64vis.h"
 

src/code/speed_meter.c

@@ -9,7 +9,7 @@
 #include "speed_meter.h"
 #include "terminal.h"
 #include "zelda_arena.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64view.h"
 
 /**

src/code/sys_matrix.c

@@ -7,7 +7,7 @@
 #include "sys_matrix.h"
 #include "ultra64.h"
 #include "z_lib.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64skin_matrix.h"
 
 // clang-format off

src/code/z_game_over.c

@@ -4,7 +4,7 @@
 #include "rumble.h"
 #include "sequence.h"
 #include "versions.h"
-#include "z64game_over.h"
+#include "game_over.h"
 #include "z64play.h"
 #include "z64save.h"
 

src/code/z_sram.c

@@ -9,7 +9,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "audio.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64interface.h"
 #include "z64message.h"
 #include "z64ocarina.h"

src/code/z_vr_box.c

@@ -6,7 +6,7 @@
 #include "terminal.h"
 #include "ultra64.h"
 #include "environment.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64play.h"
 #include "z64save.h"
 

src/overlays/gamestates/ovl_file_choose/file_select.h

@@ -5,7 +5,7 @@
 #include "ultra64.h"
 #include "gfx.h"
 #include "versions.h"
-#include "z64game.h"
+#include "game.h"
 
 
 #define GET_NEWF(sramCtx, slotNum, index) (sramCtx->readBuff[gSramSlotOffsets[slotNum] + offsetof(SaveContext, save.info.playerData.newf[index])])

src/overlays/gamestates/ovl_opening/z_opening.c

@@ -8,7 +8,7 @@
 #include "regs.h"
 #include "sys_matrix.h"
 #include "title_setup_state.h"
-#include "z64game.h"
+#include "game.h"
 #include "z64play.h"
 #include "z64save.h"
 #include "z64sram.h"