Move shared declarations into dedicated headers

.github/workflows/checks.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Format Project
       uses: DoozyX/clang-format-lint-action@v0.15
       with:
-        source: "./code ./source"
+        source: "./code ./source ./shared"
         extensions: 'c,h,cpp,hpp'
         clangFormatVersion: 14
 

.github/workflows/clang_format_code.yml

@@ -18,7 +18,7 @@ jobs:
 
     - uses: DoozyX/clang-format-lint-action@v0.15
       with:
-        source: "./code ./source"
+        source: "./code ./source ./shared"
         extensions: 'h,cpp,c,hpp'
         clangFormatVersion: 14
         style: file

Makefile

@@ -39,9 +39,9 @@ APP_AUTHOR      :=  Gamestabled
 APP_DESCRIPTION :=  A different Ocarina of Time experience
 TARGET		    :=	$(notdir $(CURDIR))
 BUILD		    :=	build
-SOURCES		    :=	$(sort $(dir $(wildcard source/*/ source/)))
+SOURCES			:=	$(sort $(dir $(wildcard source/*/ source/ shared/)))
 DATA		    :=	data
-INCLUDES	    :=	include $(SOURCES)
+INCLUDES		:=	include $(SOURCES)
 GRAPHICS		:=	gfx
 GFXBUILD		:=	$(BUILD)
 ROMFS			:=	romfs

code/Makefile

@@ -32,10 +32,9 @@ PYTHON := $(shell command -v python3 > /dev/null 2>&1 && echo python3 || echo py
 #---------------------------------------------------------------------------------
 # TARGET	Defined below
 BUILD		:=	build
-SOURCES		:=	$(sort $(dir $(wildcard src/*/ src/)))
+SOURCES		:=	$(sort $(dir $(wildcard src/*/ src/ ../shared/)))
 DATA		:=	data
 INCLUDES	:=	include $(SOURCES)
-INCLUDES    +=  assets
 #ROMFS		:=	romfs
 
 #---------------------------------------------------------------------------------

code/include/z3D/z3D.h

@@ -1,19 +1,20 @@
 #ifndef _Z3D_H_
 #define _Z3D_H_
 
+#include "s_types.h"
+#include "s_colors.h"
+#include "s_scene_id.h"
+#include "s_dungeon.h"
+
 #include <sys/cdefs.h>
 #include "z3Dactor.h"
-#include "z3Dvec.h"
 #include "z3Dcutscene.h"
 #include "z3Ditem.h"
 #include "z3Dmath.h"
 #include "z3Dbgcheck.h"
-#include "z3Dscene.h"
-#include "z3Dactor_id.h"
 #include "z3Deffect.h"
-#include "z3Dcolor.h"
 
-#include "../../include/hid.h"
+#include "hid.h"
 
 #define TRUE 1
 #define FALSE 0
@@ -653,8 +654,7 @@ typedef struct MainClass {
 } MainClass;
 
 extern GlobalContext* gGlobalContext;
-extern const u32 ItemSlots[];
-extern const char DungeonNames[][25];
+extern const u8 ItemSlots[];
 
 extern SaveContext gSaveContext;
 extern StaticContext gStaticContext;
@@ -678,34 +678,6 @@ extern s8 gSfxDefaultReverb;
 #define PLAYER ((Player*)gGlobalContext->actorCtx.actorList[ACTORTYPE_PLAYER].first)
 #define GearSlot(X) (X - ITEM_SWORD_KOKIRI)
 
-typedef enum {
-    DUNGEON_DEKU_TREE = 0,
-    DUNGEON_DODONGOS_CAVERN,
-    DUNGEON_JABUJABUS_BELLY,
-    DUNGEON_FOREST_TEMPLE,
-    DUNGEON_FIRE_TEMPLE,
-    DUNGEON_WATER_TEMPLE,
-    DUNGEON_SPIRIT_TEMPLE,
-    DUNGEON_SHADOW_TEMPLE,
-    DUNGEON_BOTTOM_OF_THE_WELL,
-    DUNGEON_ICE_CAVERN,
-    DUNGEON_GANONS_TOWER,
-    DUNGEON_GERUDO_TRAINING_GROUNDS,
-    DUNGEON_THIEVES_HIDEOUT,
-    DUNGEON_INSIDE_GANONS_CASTLE,
-    DUNGEON_GANONS_TOWER_COLLAPSING_INTERIOR,
-    DUNGEON_GANONS_CASTLE_COLLAPSING,
-    DUNGEON_TREASURE_CHEST_SHOP,
-    DUNGEON_DEKU_TREE_BOSS_ROOM,
-    DUNGEON_DODONGOS_CAVERN_BOSS_ROOM,
-    DUNGEON_JABUJABUS_BELLY_BOSS_ROOM,
-    DUNGEON_FOREST_TEMPLE_BOSS_ROOM,
-    DUNGEON_FIRE_TEMPLE_BOSS_ROOM,
-    DUNGEON_WATER_TEMPLE_BOSS_ROOM,
-    DUNGEON_SPIRIT_TEMPLE_BOSS_ROOM,
-    DUNGEON_SHADOW_TEMPLE_BOSS_ROOM,
-} DungeonId;
-
 #define SCENE_LINK_HOUSE 52
 
 extern hid_mem_t real_hid;

code/include/z3D/z3Dactor.h

@@ -1,10 +1,12 @@
 #ifndef _Z3DACTOR_H_
 #define _Z3DACTOR_H_
 
-#include "z3Dvec.h"
+#include "s_types.h"
+#include "s_actor_id.h"
+
+#include "z3Dmath.h"
 #include "z3Dcollision_check.h"
 #include "z3Dbgcheck.h"
-#include "z3Dactor_id.h"
 
 struct Actor;
 struct GlobalContext;
@@ -34,11 +36,6 @@ struct ZARInfo;
 
 #define ACTOR_FLAG_INSIDE_CULLING_VOLUME (1 << 6)
 
-typedef struct {
-    Vec3f pos;
-    Vec3s rot;
-} PosRot; // size = 0x14
-
 struct SkeletonAnimationModel;
 typedef void (*SkeletonAnimationModelFunc)(struct SkeletonAnimationModel*);
 

code/include/z3D/z3Dbgcheck.h

@@ -1,7 +1,7 @@
 #ifndef _Z3DBGCHECK_H
 #define _Z3DBGCHECK_H
 
-#include "z3Dvec.h"
+#include "s_types.h"
 
 struct GlobalContext;
 struct Actor;

code/include/z3D/z3Dcollision_check.h

@@ -1,7 +1,7 @@
 #ifndef _Z3DCOLLISION_CHECK_H_
 #define _Z3DCOLLISION_CHECK_H_
 
-#include "z3Dvec.h"
+#include "s_types.h"
 
 struct GlobalContext;
 struct CollisionCheckContext;

code/include/z3D/z3Dcutscene.h

@@ -1,7 +1,7 @@
 #ifndef _Z3DCUTSCENE_H_
 #define _Z3DCUTSCENE_H_
 
-#include "z3Dvec.h"
+#include "s_types.h"
 
 typedef struct {
     /* 0x00 */ u16 action; // "dousa"
@@ -43,4 +43,4 @@ typedef enum {
     /* 0x1A */ OCARINA_ACTION_SONG_OF_STORMS_PLAYBACK
 } OcarinaSongActionIDs;
 
-#endif //_Z3DCUTSCENE_H_
+#endif //_Z3DCUTSCENE_H_

code/include/z3D/z3Deffect.h

@@ -1,8 +1,8 @@
 #ifndef _Z3DEFFECT_H_
 #define _Z3DEFFECT_H_
 
-#include "z3Dvec.h"
-#include "z3Dcolor.h"
+#include "s_types.h"
+#include "s_colors.h"
 
 /* Effects */