src dir rework

Makefile

@@ -215,7 +215,7 @@ ACTOR_DIR      := actors
 LEVEL_DIRS     := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h)))
 
 # Directories containing source files
-SRC_DIRS := src src/engine src/game src/menu src/buffers src/audio $(AUDIO_SRC_DIR) actors levels bin data assets asm lib sound
+SRC_DIRS := src src/game src/init src/menu src/buffers src/audio $(AUDIO_SRC_DIR) actors levels bin data assets asm lib sound
 BIN_DIRS := bin bin/$(VERSION)
 
 GODDARD_SRC_DIRS := src/goddard src/goddard/dynlists
@@ -382,7 +382,7 @@ load: $(ROM)
 
 # Extra object file dependencies
 $(BUILD_DIR)/asm/ipl3_font.o:         $(IPL3_RAW_FILES)
-$(BUILD_DIR)/src/game/crash_screen.o: $(CRASH_TEXTURE_C_FILES)
+$(BUILD_DIR)/src/init/crash_screen.o: $(CRASH_TEXTURE_C_FILES)
 $(BUILD_DIR)/lib/rsp.o:               $(BUILD_DIR)/rsp/rspboot.bin $(BUILD_DIR)/rsp/fast3d.bin $(BUILD_DIR)/rsp/audio.bin
 $(SOUND_BIN_DIR)/sound_data.o:        $(SOUND_BIN_DIR)/sound_data.ctl.inc.c $(SOUND_BIN_DIR)/sound_data.tbl.inc.c $(SOUND_BIN_DIR)/sequences.bin.inc.c $(SOUND_BIN_DIR)/bank_sets.inc.c
 $(BUILD_DIR)/levels/scripts.o:        $(BUILD_DIR)/include/level_headers.h
@@ -423,7 +423,7 @@ DUMMY != mkdir -p $(ALL_DIRS)
 $(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_menu_strings.h
 $(BUILD_DIR)/src/menu/file_select.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/menu/star_select.o: $(BUILD_DIR)/include/text_strings.h
-$(BUILD_DIR)/src/engine/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
+$(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
 
 
 #==============================================================================#

bin/eu/translation_de.c

@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "engine/ingame_menu.h"
+#include "game/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 

bin/eu/translation_en.c

@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "engine/ingame_menu.h"
+#include "game/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 

bin/eu/translation_fr.c

@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "engine/ingame_menu.h"
+#include "game/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 

bin/segment2.c

@@ -4,7 +4,7 @@
 #include "config.h"
 #include "macros.h"
 #include "types.h"
-#include "engine/ingame_menu.h"
+#include "game/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 

data/behavior_data.c

@@ -3,15 +3,15 @@
 #include "sm64.h"
 
 #include "object_constants.h"
-#include "engine/object_list_processor.h"
-#include "engine/interaction.h"
-#include "engine/behavior_actions.h"
-#include "engine/mario_actions_cutscene.h"
-#include "engine/mario_misc.h"
-#include "engine/object_helpers.h"
-#include "engine/debug.h"
+#include "game/object_list_processor.h"
+#include "game/interaction.h"
+#include "game/behavior_actions.h"
+#include "game/mario_actions_cutscene.h"
+#include "game/mario_misc.h"
+#include "game/object_helpers.h"
+#include "game/debug.h"
 #include "menu/file_select.h"
-#include "engine/surface_load.h"
+#include "game/surface_load.h"
 
 #include "actors/common0.h"
 #include "actors/common1.h"

enhancements/debug_box.patch

@@ -30,7 +30,7 @@ index 00000000..1ffe0288
 +#include "sm64.h"
 +#include "game/game_init.h"
 +#include "game/geo_misc.h"
-+#include "engine/math_util.h"
++#include "game/math_util.h"
 +
 +#include "debug_box.h"
 +

include/geo_commands.h

@@ -3,12 +3,12 @@
 
 #include "command_macros_base.h"
 
-#include "engine/shadow.h"
-#include "engine/object_helpers.h"
-#include "engine/behavior_actions.h"
-#include "engine/segment2.h"
-#include "engine/mario_misc.h"
-#include "engine/mario_actions_cutscene.h"
+#include "game/shadow.h"
+#include "game/object_helpers.h"
+#include "game/behavior_actions.h"
+#include "game/segment2.h"
+#include "game/mario_misc.h"
+#include "game/mario_actions_cutscene.h"
 
 // sky background params
 #define BACKGROUND_OCEAN_SKY        0

include/moving_texture_macros.h

@@ -1,7 +1,7 @@
 #ifndef MOVING_TEXTURE_MACROS_H
 #define MOVING_TEXTURE_MACROS_H
 
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // From gMovingTextureIdList
 #define TEXTURE_WATER            0

levels/bbh/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "engine/level_geo.h"
-#include "engine/geo_misc.h"
-#include "engine/camera.h"
-#include "engine/moving_texture.h"
-#include "engine/screen_transition.h"
-#include "engine/paintings.h"
+#include "game/level_geo.h"
+#include "game/geo_misc.h"
+#include "game/camera.h"
+#include "game/moving_texture.h"
+#include "game/screen_transition.h"
+#include "game/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bbh/header.h

@@ -2,7 +2,7 @@
 #define BBH_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout geo_bbh_0005B0[];

levels/bbh/script.c

@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 

levels/bitdw/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "engine/level_geo.h"
-#include "engine/geo_misc.h"
-#include "engine/camera.h"
-#include "engine/moving_texture.h"
-#include "engine/screen_transition.h"
-#include "engine/paintings.h"
+#include "game/level_geo.h"
+#include "game/geo_misc.h"
+#include "game/camera.h"
+#include "game/moving_texture.h"
+#include "game/screen_transition.h"
+#include "game/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bitdw/script.c

@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 

levels/bitfs/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "engine/level_geo.h"
-#include "engine/geo_misc.h"
-#include "engine/camera.h"
-#include "engine/moving_texture.h"
-#include "engine/screen_transition.h"
-#include "engine/paintings.h"
+#include "game/level_geo.h"
+#include "game/geo_misc.h"
+#include "game/camera.h"
+#include "game/moving_texture.h"
+#include "game/screen_transition.h"
+#include "game/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bitfs/script.c

@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 

levels/bits/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "engine/level_geo.h"
-#include "engine/geo_misc.h"
-#include "engine/camera.h"
-#include "engine/moving_texture.h"
-#include "engine/screen_transition.h"
-#include "engine/paintings.h"
+#include "game/level_geo.h"
+#include "game/geo_misc.h"
+#include "game/camera.h"
+#include "game/moving_texture.h"
+#include "game/screen_transition.h"
+#include "game/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bits/script.c

@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 

levels/bob/geo.c

@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "engine/level_geo.h"
-#include "engine/geo_misc.h"
-#include "engine/camera.h"
-#include "engine/moving_texture.h"
-#include "engine/screen_transition.h"
-#include "engine/paintings.h"
+#include "game/level_geo.h"
+#include "game/geo_misc.h"
+#include "game/camera.h"
+#include "game/moving_texture.h"
+#include "game/screen_transition.h"
+#include "game/paintings.h"
 
 #include "make_const_nonconst.h"
 

levels/bob/script.c

@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"