stage collision -> terrain_collision

.vscode/settings.json

@@ -368,7 +368,8 @@
     "dma.h": "c",
     "ceiling_slope.h": "c",
     "french_horn.h": "c",
-    "pipe_sequence.h": "c"
+    "pipe_sequence.h": "c",
+    "terrain_collision.h": "c"
   },
   "asm-code-lens.donated": true,
   "editor.formatOnSave": true,

include/game/entity.h

@@ -8,7 +8,7 @@
 #include "game/sa1_sa2_shared/globals.h"
 #include "game/sa1_sa2_shared/collision.h"
 
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/player_callbacks.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"

ldscript.txt

@@ -28,7 +28,7 @@ SECTIONS
         src/game/stage/background/zone_4.o(.bss);
 
         . = 0x00000410;
-        src/game/stage/collision.o(.bss);
+        src/game/stage/terrain_collision.o(.bss);
 
         src/lib/agb_flash/agb_flash.o(.bss);
 
@@ -170,7 +170,7 @@ SECTIONS
         src/game/stage/background/zone_final_boss.o(.text);
         src/game/stage/background/zone_extra_boss.o(.text);
         src/game/stage/background/callbacks.o(.text);
-        src/game/stage/collision.o(.text);
+        src/game/stage/terrain_collision.o(.text);
         src/game/stage/mp_sprite_task.o(.text);
         src/game/stage/dust_effect_braking.o(.text);
         src/game/stage/dust_effect_spindash.o(.text);
@@ -440,7 +440,7 @@ SECTIONS
         src/game/stage/background/zone_7_2.o(.rodata);
         src/game/stage/background/zone_final.o(.rodata);
         src/game/stage/tilemap_table.o(.rodata);
-        src/game/stage/collision.o(.rodata);
+        src/game/stage/terrain_collision.o(.rodata);
         src/game/stage/mp_sprite_task.o(.rodata);
         src/game/stage/spawn_positions.o(.rodata);
         src/game/stage/rings_scatter.o(.rodata);

src/game/bosses/boss_1.c

@@ -17,7 +17,7 @@
 #include "game/cutscenes/level_endings.h"
 #include "game/parameters/bosses.h"
 #include "game/stage/boss_results_transition.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
 #include "game/stage/results.h"

src/game/bosses/boss_2.c

@@ -5,7 +5,7 @@
 #include "game/sa1_sa2_shared/globals.h"
 #include "game/sa1_sa2_shared/collision.h"
 
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/camera.h"
 #include "game/player_callbacks.h"
 #include "game/stage/player.h"

src/game/bosses/boss_3.c

@@ -12,7 +12,7 @@
 #include "game/parameters/bosses.h"
 #include "game/player_callbacks.h"
 
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/player.h"
 #include "game/save.h"
 #include "game/stage/screen_shake.h"

src/game/bosses/boss_4.c

@@ -11,7 +11,7 @@
 
 #include "game/player_callbacks.h"
 #include "game/stage/player.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 
 #include "game/entity.h" // Player_IsSpriteColliding
 #include "game/bosses/common.h"

src/game/bosses/boss_5.c

@@ -13,7 +13,7 @@
 
 #include "game/player_callbacks.h"
 
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
 #include "game/stage/game_7.h"

src/game/bosses/boss_6.c

@@ -15,7 +15,7 @@
 #include "game/stage/boss_results_transition.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/player_callbacks.h"
 
 #include "constants/move_states.h"

src/game/bosses/boss_7.c

@@ -6,7 +6,7 @@
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
 #include "game/stage/boss_results_transition.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 
 #include "game/bosses/boss_7.h"
 #include "game/bosses/common.h"

src/game/cutscenes/level_endings.c

@@ -10,7 +10,7 @@
 #include "game/course_select.h"
 #include "game/save.h"
 
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
 #include "game/stage/results.h"

src/game/enemies/piko_piko.c

@@ -3,7 +3,7 @@
 
 #include "game/sa1_sa2_shared/collision.h"
 
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/player.h"
 
 #include "game/entity.h"

src/game/multiplayer/mp_player.c

@@ -8,7 +8,7 @@
 #include "game/sa1_sa2_shared/collision.h"
 
 #include "game/stage/spawn_positions.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/stage.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"

src/game/player_callbacks.c

@@ -12,7 +12,7 @@
 #include "game/boost_effect.h"
 #include "game/player_callbacks.h"
 
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
 

src/game/stage/camera.c

@@ -10,7 +10,7 @@
 #include "game/stage/camera.h"
 #include "game/stage/stage.h"
 #include "game/stage/player.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/background/dummy.h"
 #include "game/stage/background/zone_1.h"
 #include "game/stage/background/zone_2.h"

src/game/stage/player.c

@@ -18,7 +18,7 @@
 #include "game/sa1_sa2_shared/music_manager.h"
 #include "game/save.h"
 #include "game/stage/camera.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/dust_effect_braking.h" // CreateSpindashDustEffect
 #include "game/stage/dust_effect_spindash.h" // CreateSpindashDustEffect
 #include "game/stage/item_tasks.h"

src/game/stage/rings_scatter.c

@@ -6,7 +6,7 @@
 
 #include "game/sa1_sa2_shared/globals.h"
 
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
 

src/game/stage/terrain_collision.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "tilemap.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/camera.h"
 #include "game/stage/player.h"
 

src/game/stage/trapped_animals.c

@@ -4,7 +4,7 @@
 #include "game/sa1_sa2_shared/globals.h"
 
 #include "game/stage/ui.h"
-#include "game/stage/collision.h"
+#include "game/stage/terrain_collision.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"