z64 - i

include/interface.h

@@ -1,5 +1,5 @@
-#ifndef Z64INTERFACE_H
-#define Z64INTERFACE_H
+#ifndef INTERFACE_H
+#define INTERFACE_H
 
 #include "ultra64.h"
 #include "dma.h"

include/inventory.h

@@ -1,8 +1,8 @@
-#ifndef Z64INVENTORY_H
-#define Z64INVENTORY_H
+#ifndef INVENTORY_H
+#define INVENTORY_H
 
 #include "ultra64.h"
-#include "z64item.h"
+#include "item.h"
 
 struct PlayState;
 

include/item.h

@@ -1,5 +1,5 @@
-#ifndef Z64ITEM_H
-#define Z64ITEM_H
+#ifndef ITEM_H
+#define ITEM_H
 
 // Note that z_kaleido_scope.c assumes that the dimensions and texture format here also matches the dimensions and
 // texture format for MAP_NAME_TEX1_*

include/message_data_fmt.h

@@ -2,7 +2,7 @@
 #define MESSAGE_DATA_FMT_H
 
 #include "z64save.h" // For highscores
-#include "z64item.h" // For item ids
+#include "item.h" // For item ids
 #include "sfx.h" // For sfx ids
 
 /*

include/z64play.h

@@ -13,7 +13,7 @@
 #include "frame_advance.h"
 #include "game.h"
 #include "game_over.h"
-#include "z64interface.h"
+#include "interface.h"
 #include "z64light.h"
 #include "z64message.h"
 #include "z64object.h"

include/z64save.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "versions.h"
-#include "z64inventory.h"
+#include "inventory.h"
 #include "z64math.h"
 
 typedef enum ZTargetSetting {

src/code/z_construct.c

@@ -5,7 +5,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "z64lifemeter.h"
-#include "z64interface.h"
+#include "interface.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64save.h"

src/code/z_en_item00.c

@@ -14,7 +14,7 @@
 #include "z_lib.h"
 #include "draw.h"
 #include "effect.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"

src/code/z_sram.c

@@ -10,7 +10,7 @@
 #include "versions.h"
 #include "audio.h"
 #include "game.h"
-#include "z64interface.h"
+#include "interface.h"
 #include "z64message.h"
 #include "z64ocarina.h"
 #include "z64save.h"

src/overlays/actors/ovl_En_Fish/z_en_fish.c

@@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "z_lib.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 

src/overlays/actors/ovl_En_Ge3/z_en_ge3.c

@@ -13,7 +13,7 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 

src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c

@@ -14,7 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64light.h"
 #include "z64play.h"
 #include "z64player.h"

src/overlays/actors/ovl_En_Ishi/z_en_ishi.c

@@ -23,7 +23,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"

src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c

@@ -10,7 +10,7 @@
 #include "regs.h"
 #include "terminal.h"
 #include "debug_display.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 

src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c

@@ -11,7 +11,7 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 
 #include "assets/objects/object_gi_hearts/object_gi_hearts.h"

src/overlays/actors/ovl_Item_Shield/z_item_shield.c

@@ -16,7 +16,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 

src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c

@@ -14,7 +14,7 @@
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64item.h"
+#include "item.h"
 #include "z64play.h"
 #include "z64player.h"
 

src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "gfx.h"
-#include "z64inventory.h"
+#include "inventory.h"
 #include "z64pause.h"
 
 struct PlayState;