Remove redundant s2d directory and delete unused files/defines (#457)

2026-01-21 10:17:19 -08:00 · 2022-09-21 20:18:37 -05:00
parent 2e701ad9e7
commit de34eb3b84
80 changed files with 16 additions and 18714 deletions
--- a/levels/bbh/leveldata.c
+++ b/levels/bbh/leveldata.c
@@ -62,7 +62,6 @@
 #include "levels/bbh/areas/1/macro.inc.c"
 #include "levels/bbh/staircase_step/collision.inc.c"
 #include "levels/bbh/tilting_trap_platform/collision.inc.c"
-#include "levels/bbh/tumbling_platform_far/collision.inc.c"
 #include "levels/bbh/tumbling_platform_near/collision.inc.c"
 #include "levels/bbh/moving_bookshelf/collision.inc.c"
 #include "levels/bbh/mesh_elevator/collision.inc.c"
--- a/levels/bbh/tumbling_platform_far/collision.inc.c
+++ b/levels/bbh/tumbling_platform_far/collision.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/castle_courtyard/leveldata.c
+++ b/levels/castle_courtyard/leveldata.c
@@ -9,7 +9,6 @@
 #include "dialog_ids.h"

 #include "make_const_nonconst.h"
-#include "levels/castle_courtyard/texture.inc.c"
 #include "levels/castle_courtyard/areas/1/1/model.inc.c"
 #include "levels/castle_courtyard/areas/1/spire/model.inc.c"
 #include "levels/castle_courtyard/areas/1/2/model.inc.c"
--- a/levels/castle_courtyard/texture.inc.c
+++ b/levels/castle_courtyard/texture.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/castle_inside/clock_hour_hand/collision.inc.c
+++ b/levels/castle_inside/clock_hour_hand/collision.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/castle_inside/clock_minute_hand/collision.inc.c
+++ b/levels/castle_inside/clock_minute_hand/collision.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/castle_inside/leveldata.c
+++ b/levels/castle_inside/leveldata.c
@@ -80,8 +80,6 @@
 #include "levels/castle_inside/areas/3/room.inc.c"
 #include "levels/castle_inside/trap_door/collision.inc.c"
 #include "levels/castle_inside/star_door/collision.inc.c"
-#include "levels/castle_inside/clock_minute_hand/collision.inc.c"
-#include "levels/castle_inside/clock_hour_hand/collision.inc.c"
 #include "levels/castle_inside/water_level_pillar/collision.inc.c"
 #include "levels/castle_inside/areas/3/trajectory.inc.c"
 #include "levels/castle_inside/areas/3/movtext.inc.c"
--- a/levels/sa/leveldata.c
+++ b/levels/sa/leveldata.c
@@ -8,7 +8,6 @@
 #include "textures.h"

 #include "make_const_nonconst.h"
-#include "levels/sa/texture.inc.c"
 #include "levels/sa/areas/1/1/model.inc.c"
 #include "levels/sa/areas/1/2/model.inc.c"
 #include "levels/sa/areas/1/collision.inc.c"
--- a/levels/sa/texture.inc.c
+++ b/levels/sa/texture.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/ssl/eyerok_col/geo.inc.c
+++ b/levels/ssl/eyerok_col/geo.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/ssl/eyerok_col/model.inc.c
+++ b/levels/ssl/eyerok_col/model.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/ssl/geo.c
+++ b/levels/ssl/geo.c
@@ -22,6 +22,5 @@
 #include "levels/ssl/spindel/geo.inc.c"
 #include "levels/ssl/moving_pyramid_wall/geo.inc.c"
 #include "levels/ssl/pyramid_elevator/geo.inc.c"
-#include "levels/ssl/eyerok_col/geo.inc.c"
 #include "levels/ssl/areas/2/geo.inc.c"
 #include "levels/ssl/areas/3/geo.inc.c"
--- a/levels/ssl/leveldata.c
+++ b/levels/ssl/leveldata.c
@@ -38,7 +38,6 @@
 #include "levels/ssl/spindel/model.inc.c"
 #include "levels/ssl/moving_pyramid_wall/model.inc.c"
 #include "levels/ssl/pyramid_elevator/model.inc.c"
-#include "levels/ssl/eyerok_col/model.inc.c" // Blank file
 #include "levels/ssl/areas/2/collision.inc.c"
 #include "levels/ssl/areas/3/collision.inc.c"
 #include "levels/ssl/areas/2/macro.inc.c"
--- a/levels/totwc/cloud/collision.inc.c
+++ b/levels/totwc/cloud/collision.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/totwc/leveldata.c
+++ b/levels/totwc/leveldata.c
@@ -15,4 +15,3 @@
 #include "levels/totwc/cloud/model.inc.c"
 #include "levels/totwc/areas/1/collision.inc.c"
 #include "levels/totwc/areas/1/macro.inc.c"
-#include "levels/totwc/cloud/collision.inc.c" // Blank File
--- a/levels/ttc/large_gear/collision.inc.c
+++ b/levels/ttc/large_gear/collision.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-
--- a/levels/ttc/leveldata.c
+++ b/levels/ttc/leveldata.c
@@ -42,7 +42,5 @@
 #include "levels/ttc/elevator_platform/collision.inc.c"
 #include "levels/ttc/clock_hand/collision.inc.c"
 #include "levels/ttc/spinner/collision.inc.c"
-#include "levels/ttc/small_gear/collision.inc.c"
-#include "levels/ttc/large_gear/collision.inc.c"
 #include "levels/ttc/areas/1/macro.inc.c"
 #include "levels/ttc/areas/1/movtext.inc.c"
--- a/levels/ttc/small_gear/collision.inc.c
+++ b/levels/ttc/small_gear/collision.inc.c
@@ -1,2 +0,0 @@
-// Blank File
-