move engine related files to root

.vscode/settings.json

@@ -5,12 +5,12 @@
     "global.h": "c",
     "m4a_internal.h": "c",
     "lib/m4a.h": "c",
-    "engine/task.h": "c",
+    "task.h": "c",
     "flash_internal.h": "c",
     "agb_flash.h": "c",
-    "engine/malloc_ewram.h": "c",
+    "malloc_ewram.h": "c",
     "data.h": "c",
-    "engine/sprite.h": "c",
+    "sprite.h": "c",
     "game/math.h": "c",
     "game/save.h": "c",
     "flags.h": "c",
@@ -28,9 +28,9 @@
     "zones.h": "c",
     "player.h": "c",
     "input.h": "c",
-    "engine/input_recorder.h": "c",
-    "recordings.h": "c",
-    "engine/trig.h": "c",
+    "input_recorder.h": "c",
+    "data/recordings.h": "c",
+    "trig.h": "c",
     "game/options_screen.h": "c",
     "songs.h": "c",
     "text.h": "c",
@@ -39,13 +39,13 @@
     "game/time.h": "c",
     "random": "c",
     "multiplayer.h": "c",
-    "engine/malloc_vram.h": "c",
+    "malloc_vram.h": "c",
     "game/multiplayer/multipak_connection.h": "c",
     "game/multiplayer/team_play.h": "c",
     "multi_boot.h": "c",
     "game/character_select.h": "c",
     "transition.h": "c",
-    "palettes.h": "c",
+    "data/palettes.h": "c",
     "game/multiplayer/mode_select.h": "c",
     "game/time_attack/lobby.h": "c",
     "game/course_select.h": "c",
@@ -163,7 +163,7 @@
     "game/interactables_2/094.h": "c",
     "game/interactables_2/080.h": "c",
     "game/interactables_2/music_plant/pipe_horn.h": "c",
-    "engine/animation_commands.h": "c",
+    "animation_commands.h": "c",
     "game/interactables_2/074.h": "c",
     "game/interactables_2/tec_base/light_bridge.h": "c",
     "game/interactables_2/wind_up_stick.h": "c",

include/animation_commands.h

@@ -2,7 +2,7 @@
 #define GUARD_ANIMATION_COMMANDS_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #define AnimCommandSizeInWords(_structType) ((sizeof(_structType)) / sizeof(s32))
 

include/core.h

@@ -3,9 +3,9 @@
 
 #include "global.h"
 #include "data.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/input_recorder.h"
+#include "task.h"
+#include "sprite.h"
+#include "input_recorder.h"
 
 struct MultiSioData_0_0 {
     // id

include/data.h

@@ -6,7 +6,7 @@
 #define GUARD_DATA_H
 
 #include "global.h"
-#include "engine/animation_commands.h"
+#include "animation_commands.h"
 
 // TODO: extract this data
 extern union Unk_03002E60 gMapHeaders[];

include/game/backgrounds.h

@@ -2,7 +2,7 @@
 #define GUARD_BACKGROUNDS_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 struct UNK_3005B80_UNK4 {
     u8 unk0;

include/game/game.h

@@ -14,10 +14,10 @@
 #define GAME_MODE_MULTI_PLAYER_COLLECT_RINGS 5
 
 #include "global.h"
-#include "engine/sprite.h"
-#include "lib/multi_sio.h"
+#include "sprite.h"
+#include "multi_sio.h"
 #include "game/save.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "constants/move_states.h"
 

include/game/interactable.h

@@ -3,7 +3,7 @@
 
 #include "gba/defines.h"
 #include "gba/types.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/game.h"
 
 #define INTERACTABLE_DATA_SIZE_SA1 4

include/game/interactables_2/dash_ring.h

@@ -2,7 +2,7 @@
 #define GUARD_IA_DASH_RING_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/interactable.h"
 
 #define DASH_RING__NUM_ORIENTATIONS 8

include/game/multiplayer/multipak_connection.h

@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "game/game.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 
 extern u8 gMultiplayerUnlockedCharacters;
 extern u8 gMultiplayerConnections;

include/game/options_screen.h

@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "game/save.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 #include "constants/text.h"
 

include/game/special_stage/collectables.h

@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_COLLECTABLES_H
 
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/special_stage/main.h"
 
 #define MAX_RING_PARTICLES 8

include/game/special_stage/data.h

@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_STAGE_DATA_H
 
 #include "global.h"
-#include "engine/sprite.h" // for the 'AnimId' type
+#include "sprite.h" // for the 'AnimId' type
 #include "zones.h"
 
 #define SPRITE_ARRAY_END                                                                \

include/game/special_stage/guard_robo.h

@@ -3,7 +3,7 @@
 #define GUARD_SPECIAL_GUARD_ROBO_H
 
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/special_stage/main.h"
 #include "game/special_stage/data.h"
 

include/game/special_stage/main.h

@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_STAGE_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 
 #define SPECIAL_STAGE_ZONE_SIZE 8

include/game/special_stage/ui.h

@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_STAGE_UI_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/special_stage/main.h"
 
 struct SpecialStageUI {

include/game/special_stage/utils.h

@@ -4,7 +4,7 @@
 #include "global.h"
 #include "game/special_stage/main.h"
 #include "game/special_stage/data.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 extern void *gUnknown_03005B58;
 extern void *gUnknown_03005B5C;

include/game/title_screen.h

@@ -2,7 +2,7 @@
 #define GUARD_INTRO_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 // TODO: not sure why these were shared from here, may
 // not be

include/main.h

@@ -3,9 +3,9 @@
 
 #include "global.h"
 #include "data.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/input_recorder.h"
+#include "task.h"
+#include "sprite.h"
+#include "input_recorder.h"
 
 struct MultiSioData_0_0 {
     // id

include/sio32_multi_load.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_SIO32_MULTI_LOAD_H
 #define GUARD_SIO32_MULTI_LOAD_H
 
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 
 // Optimize the following settings based on the software
 // specifications

ldscript.txt

@@ -25,26 +25,31 @@ SECTIONS
     ROM :
 	ALIGN(4)
 	{
+        /* bootstrap */
         build/sa2/asm/rom_header.o(.text);
         build/sa2/asm/crt0.o(.text);
+
+        /* engine */
         build/sa2/asm/multi_sio_asm.o(.text);
-        build/sa2/src/lib/multi_sio.o(.text);
-        build/sa2/src/lib/multi_boot.o(.text);
-        build/sa2/src/lib/sio32_multi_load.o(.text);
+        build/sa2/src/multi_sio.o(.text);
+        build/sa2/src/multi_boot.o(.text);
+        build/sa2/src/sio32_multi_load.o(.text);
         build/sa2/src/core.o(.text);
         build/sa2/src/main.o(.text);
-        build/sa2/src/engine/task.o(.text);
-        build/sa2/src/engine/sprite_1.o(.text);
-        build/sa2/src/engine/bg_update.o(.text);
-        build/sa2/src/engine/animation_commands_extra.o(.text);
+        build/sa2/src/task.o(.text);
+        build/sa2/src/sprite_1.o(.text);
+        build/sa2/src/bg_update.o(.text);
+        build/sa2/src/animation_commands_extra.o(.text);
         build/sa2/asm/sprite_2.o(.text);
-        build/sa2/src/engine/sprite_3.o(.text);
+        build/sa2/src/sprite_3.o(.text);
         build/sa2/asm/sprite_3.o(.text);
-        build/sa2/src/engine/animation_commands.o(.text);
+        build/sa2/src/animation_commands.o(.text);
         build/sa2/asm/sprite_4.o(.text);
-        build/sa2/src/engine/malloc_ewram.o(.text);
-        build/sa2/src/engine/malloc_vram.o(.text);
-        build/sa2/src/engine/input_recorder.o(.text);
+        build/sa2/src/malloc_ewram.o(.text);
+        build/sa2/src/malloc_vram.o(.text);
+        build/sa2/src/input_recorder.o(.text);
+
+        /* game */
         build/sa2/asm/entities_0.o(.text);
         build/sa2/src/game/interactables_0/spring.o(.text);
         build/sa2/asm/interactable_platform.o(.text);
@@ -164,6 +169,8 @@ SECTIONS
         build/sa2/src/game/cutscenes/final_ending_fall.o(.text);
         build/sa2/src/game/cutscenes/final_ending_land.o(.text);
         build/sa2/src/game/cutscenes/missing_emeralds.o(.text);
+
+        /* libs */
         build/sa2/asm/m4a0.o(.text);
         build/sa2/src/lib/m4a.o(.text);
         build/sa2/src/lib/agb_flash.o(.text);
@@ -185,15 +192,18 @@ SECTIONS
         *libc.a:memset.o(.text);
 
         /* Data */
-        build/sa2/src/lib/multi_sio.o(.rodata);
-        build/sa2/src/lib/sio32_multi_load.o(.rodata);
+        /* engine Data */
+        build/sa2/src/multi_sio.o(.rodata);
+        build/sa2/src/sio32_multi_load.o(.rodata);
         build/sa2/src/core.o(.rodata);
-        build/sa2/src/engine/sprite_1.o(.rodata);
-        build/sa2/src/engine/trig.o(.rodata);
+        build/sa2/src/sprite_1.o(.rodata);
+        build/sa2/src/trig.o(.rodata);
         build/sa2/asm/sprite_3.o(.rodata);
-        build/sa2/src/engine/animation_commands_extra.o(.rodata);
-        build/sa2/src/engine/animation_commands.o(.rodata);
+        build/sa2/src/animation_commands_extra.o(.rodata);
+        build/sa2/src/animation_commands.o(.rodata);
         build/sa2/asm/sprite_4.o(.rodata);
+    
+        /* game Data */
         build/sa2/data/multiboot_chao_garden.o(.rodata);
         build/sa2/asm/entities_0.o(.rodata);
         build/sa2/src/game/interactables_0/spring.o(.rodata);
@@ -546,8 +556,8 @@ SECTIONS
         build/sa2/data/data3.o(.rodata);
         build/sa2/data/special_stage_levels.o(.rodata);
         build/sa2/data/handlers_ia_pipe_horn_sequences.o(.rodata);
-        build/sa2/src/palettes.o(.rodata);
-        build/sa2/src/recordings.o(.rodata);
+        build/sa2/src/data/palettes.o(.rodata);
+        build/sa2/src/data/recordings.o(.rodata);
         build/sa2/data/data4.o(.rodata);
         build/sa2/data/multiboot_subgame_loader.o(.rodata);
 

src/animation_commands.c

@@ -3,9 +3,9 @@
 
 #include "data.h"
 #include "flags.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
-#include "engine/animation_commands.h"
+#include "animation_commands.h"
 
 extern s32 animCmd_GetTiles(void *cursor, Sprite *sprite);
 static s32 animCmd_GetPalette(void *cursor, Sprite *sprite);

src/animation_commands_extra.c

@@ -2,13 +2,13 @@
 #include "gba/syscall.h"
 #include "core.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "data.h"
 #include "flags.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
-#include "engine/animation_commands.h"
+#include "animation_commands.h"
 
 extern const struct SpriteTables *gUnknown_03002794;
 extern u8 gVramGraphicsCopyQueueIndex;

src/core.c

@@ -2,14 +2,14 @@
 #include "global.h"
 #include "data.h"
 #include "lib/m4a.h"
-#include "engine/malloc_ewram.h"
-#include "lib/multi_sio.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "malloc_ewram.h"
+#include "multi_sio.h"
+#include "sprite.h"
+#include "task.h"
 #include "lib/agb_flash.h"
 #include "flags.h"
-#include "engine/input_recorder.h"
-#include "engine/malloc_vram.h"
+#include "input_recorder.h"
+#include "malloc_vram.h"
 
 // TODO: the order of these vars has
 // been shuffled due to compilation losses.

src/data/palettes.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palettes.h"
+#include "data/palettes.h"
 
 // TODO: move to data and include as asm
 const u8 gUnknown_08C8796C[] = INCBIN_U8("graphics/8C8796C.gbapal");

src/game/boost_effect.c

@@ -1,12 +1,12 @@
 #include "global.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "sprite.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "game/math.h"
 #include "game/boost_effect.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

src/game/character_select.c

@@ -2,14 +2,14 @@
 #include "core.h"
 #include "transition.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/character_select.h"
 #include "game/save.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "flags.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiplayer/results.h"
 #include "player.h"

src/game/countdown.c

@@ -1,9 +1,9 @@
 #include "game/countdown.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/game.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "constants/animations.h"

src/game/course_select.c

@@ -1,17 +1,17 @@
 #include "game/course_select.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 #include "game/save.h"
 #include "lib/m4a.h"
 #include "game/character_select.h"
 #include "constants/songs.h"
 #include "constants/text.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 struct CourseSelectionScreen {
     struct UNK_802D4CC_UNK270 screenFade;

src/game/cutscenes/credits.c

@@ -4,9 +4,9 @@
 #include "game/cutscenes/credits_slides.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 

src/game/cutscenes/credits_end.c

@@ -4,9 +4,9 @@
 #include "game/cutscenes/missing_emeralds.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 #include "game/title_screen.h"

src/game/cutscenes/credits_slides.c

@@ -3,9 +3,9 @@
 #include "game/cutscenes/credits_end.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 

src/game/cutscenes/endings.c

@@ -2,14 +2,14 @@
 #include "game/cutscenes/endings.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/cutscenes/extra_ending_fall.h"
 #include "game/cutscenes/final_ending_fall.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/save.h"
 
 #include "constants/songs.h"

src/game/cutscenes/extra_ending_fall.c

@@ -3,11 +3,11 @@
 #include "game/cutscenes/extra_ending_slides.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/save.h"
 #include "game/math.h"
 

src/game/cutscenes/extra_ending_slides.c

@@ -2,9 +2,9 @@
 #include "game/cutscenes/credits.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 

src/game/cutscenes/final_ending_fall.c

@@ -3,9 +3,9 @@
 #include "game/cutscenes/extra_ending_slides.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 #include "game/math.h"

src/game/cutscenes/final_ending_land.c

@@ -1,13 +1,13 @@
 #include "global.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/cutscenes/credits.h"
 #include "game/cutscenes/missing_emeralds.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/save.h"
 #include "game/title_screen.h"
 #include "game/math.h"

src/game/cutscenes/level_endings.c

@@ -2,12 +2,12 @@
 #include "game/cutscenes/level_endings.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/course_select.h"
 #include "game/save.h"
 

src/game/cutscenes/missing_emeralds.c

@@ -2,9 +2,9 @@
 #include "game/cutscenes/missing_emeralds.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 #include "game/title_screen.h"

src/game/game.c

@@ -2,13 +2,13 @@
 #include "game/game.h"
 #include "game/save.h"
 #include "game/race_progress.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 #include "game/multiboot/collect_rings/time_display.h"
 #include "lib/m4a.h"
 #include "game/time_attack/lobby.h"
 #include "game/game_over.h"
 #include "constants/songs.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "constants/move_states.h"
 

src/game/game_over.c

@@ -3,10 +3,10 @@
 #include "game/game.h"
 #include "game/time_attack/lobby.h"
 #include "game/title_screen.h"
-#include "engine/task.h"
+#include "task.h"
 #include "transition.h"
 #include "lib/m4a.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "constants/songs.h"
 
 typedef struct {

src/game/init.c

@@ -2,7 +2,7 @@
 #include "core.h"
 #include "data.h"
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/init.h"
 #include "flags.h"
 #include "game/save.h"

src/game/interactables_0/044.c

@@ -1,8 +1,8 @@
 #include "global.h"
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/interactables.h"
 #include "constants/move_states.h"

src/game/interactables_0/clear_pipe.c

@@ -4,8 +4,8 @@
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/move_states.h"
 

src/game/interactables_0/platform.c

@@ -1,4 +1,4 @@
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "zones.h"
 #include "constants/animations.h"

src/game/interactables_0/ramp.c

@@ -1,9 +1,9 @@
 #include "global.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/interactable.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "zones.h"
 
 #include "constants/animations.h"

src/game/interactables_0/slidy_ice.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/game.h"
 #include "game/interactable.h"

src/game/interactables_0/spring.c

@@ -1,12 +1,12 @@
 #include "global.h"
 #include "gba/types.h"
 #include "lib/m4a.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 #include "zones.h"
 
 #include "constants/animations.h"

src/game/interactables_1/019.c

@@ -1,11 +1,11 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "data.h"
 
 #include "constants/animations.h"

src/game/interactables_1/booster.c

@@ -1,12 +1,12 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/game.h"
 
 #include "constants/animations.h"

src/game/interactables_1/bouncy_bar.c

@@ -1,9 +1,9 @@
 #include "global.h"
 #include "core.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/interactable.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "game/game.h"
 #include "lib/m4a.h"
 #include "constants/songs.h"

src/game/interactables_1/checkpoint.c

@@ -1,15 +1,15 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 #include "core.h"
 
 #include "data.h"
 #include "flags.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/animations.h"
 #include "constants/anim_commands.h"

src/game/interactables_1/decoration.c

@@ -1,11 +1,11 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
-#include "engine/task.h"
+#include "malloc_vram.h"
+#include "task.h"
 #include "game/game.h"
 
 #include "constants/animations.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 typedef struct {
     /* 0x00 */ SpriteBase base;

src/game/interactables_1/gapped_loop.c

@@ -1,12 +1,12 @@
 #include "global.h"
 #include "core.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/game.h"
 #include "game/interactable.h"
 #include "game/interactables_1/gapped_loop.h"
 #include "constants/move_states.h"
-#include "engine/sprite.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "trig.h"
 
 typedef struct {
     SpriteBase base;

src/game/interactables_1/incline_ramp.c

@@ -4,8 +4,8 @@
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/move_states.h"
 #include "constants/songs.h"

src/game/interactables_1/spikes.c

@@ -1,9 +1,9 @@
 #include <string.h> // for memcpy
 
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "game/interactable.h"
 

src/game/interactables_1/spring_bouncy.c

@@ -2,12 +2,12 @@
 #include "lib/m4a.h"
 #include "gba/syscall.h"
 
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

src/game/interactables_1/toggle_player_layer.c

@@ -1,10 +1,10 @@
 #include "global.h"
 
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/interactables.h"
 #include "constants/move_states.h"

src/game/interactables_1/windmill.c

@@ -1,9 +1,9 @@
 #include "global.h"
 #include "game/interactables_1/windmill.h"
-#include "engine/malloc_vram.h"
-#include "engine/sprite.h"
+#include "malloc_vram.h"
+#include "sprite.h"
 #include "game/game.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "constants/animations.h"
 
 typedef struct {

src/game/interactables_2/080.c

@@ -2,11 +2,11 @@
 #include "game/game.h"
 #include "game/interactable.h"
 #include "core.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/interactables_2/080.h"
-#include "engine/malloc_vram.h"
-#include "engine/trig.h"
+#include "malloc_vram.h"
+#include "trig.h"
 #include "constants/animations.h"
 #include "constants/songs.h"
 

src/game/interactables_2/085.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "game/interactables_2/085.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "lib/m4a.h"
 
 #include "constants/songs.h"

src/game/interactables_2/095.c

@@ -1,9 +1,9 @@
 #include "global.h"
 #include "core.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/interactables_2/095.h"
-#include "engine/malloc_vram.h"
-#include "engine/trig.h"
+#include "malloc_vram.h"
+#include "trig.h"
 
 #include "constants/move_states.h"
 

src/game/interactables_2/105.c

@@ -3,9 +3,9 @@
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
 #include "game/game.h"
 
 #include "constants/move_states.h"

src/game/interactables_2/dash_ring.c

@@ -1,14 +1,14 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/dash_ring.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

src/game/interactables_2/hot_crater/crane.c

@@ -1,12 +1,12 @@
 #include "global.h"
 #include "gba/types.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

src/game/interactables_2/hot_crater/turn_around_bar.c

@@ -2,9 +2,9 @@
 #include "game/game.h"
 #include "game/interactable.h"
 #include "game/interactables_2/turn_around_bar.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "sprite.h"
+#include "malloc_vram.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

src/game/interactables_2/hot_crater/wind_up_stick.c

@@ -2,9 +2,9 @@
 #include "game/game.h"
 #include "game/interactable.h"
 #include "game/interactables_2/wind_up_stick.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "sprite.h"
+#include "malloc_vram.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

src/game/interactables_2/ice_paradise/half_pipe.c

@@ -1,10 +1,10 @@
 #include "global.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/interactable.h"
 #include "game/interactables_2/ice_paradise/half_pipe.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 typedef struct {
     s32 x;

src/game/interactables_2/ice_paradise/slowing_snow.c

@@ -1,10 +1,10 @@
 #include "global.h"
 
-#include "engine/task.h"
+#include "task.h"
 #include "game/game.h"
 
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/move_states.h"
 

src/game/interactables_2/music_plant/german_flute.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/note_particle.h"

src/game/interactables_2/music_plant/guitar_string.c

@@ -1,10 +1,10 @@
 #include "global.h"
 #include "core.h"
 #include "lib/m4a.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "game/interactable.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/game.h"
 

src/game/interactables_2/music_plant/handlers_ia_pipe_horn.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "game/interactables_2/music_plant/pipe_horn.h"
 

src/game/interactables_2/music_plant/keyboard.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/note_particle.h"

src/game/interactables_2/music_plant/note_block.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/note_particle.h"

src/game/interactables_2/music_plant/note_sphere.c

@@ -3,9 +3,9 @@
 
 #include "lib/m4a.h"
 #include "game/math.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/note_particle.h"

src/game/interactables_2/music_plant/pipe_horn.c

@@ -1,10 +1,10 @@
 #include "global.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "game/interactables_2/music_plant/pipe_horn.h"
 

src/game/interactables_2/note_particle.c

@@ -1,12 +1,12 @@
 #include "global.h"
 #include "gba/types.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactables_2/note_particle.h"
 

src/game/interactables_2/notification_ring_bonus.c

@@ -1,11 +1,11 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 #include "game/game.h"
 
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

src/game/interactables_2/sky_canyon_init.c

@@ -1,7 +1,7 @@
 #include "global.h"
 
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/animations.h"
 

src/game/interactables_2/special_ring.c

@@ -1,15 +1,15 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 #include "core.h"
 
 #include "data.h"
 #include "flags.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

src/game/interactables_2/tec_base/light_bridge.c

@@ -2,9 +2,9 @@
 #include "game/game.h"
 #include "game/interactable.h"
 #include "game/interactables_2/tec_base/light_bridge.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "sprite.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "constants/interactables.h"

src/game/interactables_2/tec_base/note_block.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "game/interactables_2/tec_base/note_block.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/game.h"
 #include "lib/m4a.h"
 

src/game/multiboot/collect_rings/results.c

@@ -4,14 +4,14 @@
 #include "game/multiboot/connection.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiboot/collect_rings/results.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "game/title_screen.h"
 #include "transition.h"
 #include "lib/m4a.h"
-#include "lib/multi_boot.h"
-#include "lib/sio32_multi_load.h"
+#include "multi_boot.h"
+#include "sio32_multi_load.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"

src/game/multiboot/collect_rings/time_display.c

@@ -1,8 +1,8 @@
 #include "core.h"
 #include "game/game.h"
 #include "game/multiboot/collect_rings/time_display.h"
-#include "engine/malloc_vram.h"
-#include "engine/animation_commands.h"
+#include "malloc_vram.h"
+#include "animation_commands.h"
 
 typedef struct {
     Sprite unk0;

src/game/multiboot/connection.c

@@ -5,14 +5,14 @@
 #include "game/multiboot/collect_rings/results.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiplayer/mode_select.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "game/title_screen.h"
 #include "transition.h"
 #include "lib/m4a.h"
-#include "lib/multi_boot.h"
-#include "lib/sio32_multi_load.h"
+#include "multi_boot.h"
+#include "sio32_multi_load.h"
 #include "mb_programs.h"
 
 #include "constants/animations.h"

src/game/multiplayer/communication_outcome.c

@@ -3,11 +3,11 @@
 #include "data.h"
 #include "game/multiplayer/communication_outcome.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "game/title_screen.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 #include "lib/m4a.h"
 #include "game/game.h"
 #include "flags.h"

src/game/multiplayer/mode_select.c

@@ -4,10 +4,10 @@
 #include "game/multiboot/connection.h"
 #include "game/save.h"
 #include "core.h"
-#include "lib/multi_sio.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/malloc_vram.h"
+#include "multi_sio.h"
+#include "task.h"
+#include "sprite.h"
+#include "malloc_vram.h"
 #include "transition.h"
 #include "lib/m4a.h"
 #include "flags.h"

src/game/multiplayer/multipak_connection.c

@@ -4,11 +4,11 @@
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiplayer/communication_outcome.h"
 #include "game/multiplayer/mode_select.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "game/title_screen.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 #include "transition.h"
 #include "lib/m4a.h"
 #include "constants/text.h"

src/game/multiplayer/results.c

@@ -3,10 +3,10 @@
 #include "game/multiplayer/results.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiplayer_lobby.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 #include "lib/m4a.h"
 #include "constants/songs.h"
 #include "constants/text.h"