reorganise some interactables

SAT-R · Apr 15, 2023 · e2af8e7 · e2af8e7
1 parent 24bb101
commit e2af8e7
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -157,10 +157,10 @@
     "game/interactables_1/windmill.h": "c",
     "__hash_table": "c",
     "__split_buffer": "c",
-    "game/interactables_2/095.h": "c",
+    "game/interactables_2/sky_canyon/095.h": "c",
     "game/interactables_2/070.h": "c",
     "game/interactables_2/tec_base/note_block.h": "c",
-    "game/interactables_2/094.h": "c",
+    "game/interactables_2/sky_canyon/094.h": "c",
     "game/interactables_2/080.h": "c",
     "game/interactables_2/music_plant/pipe_horn.h": "c",
     "animation_commands.h": "c",

diff --git a/...ude/game/interactables_2/gravity_toggle.h → ...teractables_2/egg_utopia/gravity_toggle.h b/...ude/game/interactables_2/gravity_toggle.h → ...teractables_2/egg_utopia/gravity_toggle.h
diff --git a/.../game/interactables_2/speeding_platform.h → ...actables_2/egg_utopia/speeding_platform.h b/.../game/interactables_2/speeding_platform.h → ...actables_2/egg_utopia/speeding_platform.h
diff --git a/include/game/interactables_2/085.h → ...ude/game/interactables_2/sky_canyon/085.h b/include/game/interactables_2/085.h → ...ude/game/interactables_2/sky_canyon/085.h
diff --git a/include/game/interactables_2/094.h → ...ude/game/interactables_2/sky_canyon/094.h b/include/game/interactables_2/094.h → ...ude/game/interactables_2/sky_canyon/094.h
diff --git a/include/game/interactables_2/095.h → ...ude/game/interactables_2/sky_canyon/095.h b/include/game/interactables_2/095.h → ...ude/game/interactables_2/sky_canyon/095.h
diff --git a/ldscript.txt b/ldscript.txt
@@ -152,16 +152,16 @@ SECTIONS
         build/sa2/src/game/interactables_2/080.o(.text);
         build/sa2/src/game/interactables_2/sky_canyon/giant_propeller.o(.text);
         build/sa2/src/game/interactables_2/sky_canyon/small_windmill.o(.text);
-        build/sa2/src/game/interactables_2/085.o(.text);
+        build/sa2/src/game/interactables_2/sky_canyon/085.o(.text);
         build/sa2/asm/interactable_086.o(.text);
         build/sa2/asm/interactable_087.o(.text);
         build/sa2/asm/interactable_091.o(.text);
         build/sa2/asm/interactable_093.o(.text);
-        build/sa2/src/game/interactables_2/094.o(.text);
-        build/sa2/src/game/interactables_2/095.o(.text);
+        build/sa2/src/game/interactables_2/sky_canyon/094.o(.text);
+        build/sa2/src/game/interactables_2/sky_canyon/095.o(.text);
         build/sa2/asm/interactable_sky_canyon_flying_handle.o(.text);
-        build/sa2/src/game/interactables_2/speeding_platform.o(.text);
-        build/sa2/src/game/interactables_2/gravity_toggle.o(.text);
+        build/sa2/src/game/interactables_2/egg_utopia/speeding_platform.o(.text);
+        build/sa2/src/game/interactables_2/egg_utopia/gravity_toggle.o(.text);
         build/sa2/src/game/interactables_2/notification_ring_bonus.o(.text);
         build/sa2/src/game/interactables_2/sky_canyon_init.o(.text);
         build/sa2/src/game/interactables_2/105.o(.text);

diff --git a/src/game/interactables_2/gravity_toggle.c → ...teractables_2/egg_utopia/gravity_toggle.c b/src/game/interactables_2/gravity_toggle.c → ...teractables_2/egg_utopia/gravity_toggle.c
@@ -1,5 +1,5 @@
 #include "core.h"
-#include "game/interactables_2/gravity_toggle.h"
+#include "game/interactables_2/egg_utopia/gravity_toggle.h"
 
 #include "constants/move_states.h"
 

diff --git a/src/game/interactables_2/speeding_platform.c → ...actables_2/egg_utopia/speeding_platform.c b/src/game/interactables_2/speeding_platform.c → ...actables_2/egg_utopia/speeding_platform.c
@@ -7,7 +7,7 @@
 
 #include "game/game.h"
 #include "game/entity.h"
-#include "game/interactables_2/speeding_platform.h"
+#include "game/interactables_2/egg_utopia/speeding_platform.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"

diff --git a/src/game/interactables_2/085.c → src/game/interactables_2/sky_canyon/085.c b/src/game/interactables_2/085.c → src/game/interactables_2/sky_canyon/085.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "game/interactables_2/085.h"
+#include "game/interactables_2/sky_canyon/085.h"
 #include "game/game.h"
 #include "trig.h"
 #include "lib/m4a.h"

diff --git a/src/game/interactables_2/094.c → src/game/interactables_2/sky_canyon/094.c b/src/game/interactables_2/094.c → src/game/interactables_2/sky_canyon/094.c
@@ -3,7 +3,7 @@
 #include "game/game.h"
 #include "lib/m4a.h"
 #include "game/entity.h"
-#include "game/interactables_2/094.h"
+#include "game/interactables_2/sky_canyon/094.h"
 #include "constants/move_states.h"
 #include "constants/songs.h"
 

diff --git a/src/game/interactables_2/095.c → src/game/interactables_2/sky_canyon/095.c b/src/game/interactables_2/095.c → src/game/interactables_2/sky_canyon/095.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 #include "task.h"
-#include "game/interactables_2/095.h"
+#include "game/interactables_2/sky_canyon/095.h"
 #include "malloc_vram.h"
 #include "trig.h"