Remove some unneeded TODOs

mdsteele · Jun 24, 2024 · a2be72e · a2be72e
1 parent a52ae93
commit a2be72e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/src/rooms/crypt_south.asm b/src/rooms/crypt_south.asm
@@ -34,6 +34,7 @@
 .INCLUDE "../spawn.inc"
 
 .IMPORT DataA_Room_Crypt_sTileset
+.IMPORT Data_Empty_sActor_arr
 .IMPORT FuncA_Machine_Error
 .IMPORT FuncA_Machine_GetWinchHorzSpeed
 .IMPORT FuncA_Machine_GetWinchVertSpeed
@@ -159,7 +160,7 @@ _Ext_sRoomExt:
     D_STRUCT sRoomExt
     d_addr Terrain_sTileset_ptr, DataA_Room_Crypt_sTileset
     d_addr Platforms_sPlatform_arr_ptr, _Platforms_sPlatform_arr
-    d_addr Actors_sActor_arr_ptr, _Actors_sActor_arr
+    d_addr Actors_sActor_arr_ptr, Data_Empty_sActor_arr
     d_addr Devices_sDevice_arr_ptr, _Devices_sDevice_arr
     d_addr Passages_sPassage_arr_ptr, _Passages_sPassage_arr
     d_addr Enter_func_ptr, FuncA_Room_CryptSouth_EnterRoom
@@ -248,10 +249,6 @@ _Platforms_sPlatform_arr:
     D_END
     .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error
     .byte ePlatform::None
-_Actors_sActor_arr:
-:   ;; TODO: add some baddies?
-    .assert * - :- <= kMaxActors * .sizeof(sActor), error
-    .byte eActor::None
 _Devices_sDevice_arr:
 :   D_STRUCT sDevice
     d_byte Type_eDevice, eDevice::ConsoleFloor

diff --git a/src/rooms/crypt_tomb.asm b/src/rooms/crypt_tomb.asm
@@ -33,6 +33,7 @@
 .INCLUDE "../spawn.inc"
 
 .IMPORT DataA_Room_Crypt_sTileset
+.IMPORT Data_Empty_sActor_arr
 .IMPORT FuncA_Machine_Error
 .IMPORT FuncA_Machine_GetWinchHorzSpeed
 .IMPORT FuncA_Machine_GetWinchVertSpeed
@@ -156,7 +157,7 @@ _Ext_sRoomExt:
     D_STRUCT sRoomExt
     d_addr Terrain_sTileset_ptr, DataA_Room_Crypt_sTileset
     d_addr Platforms_sPlatform_arr_ptr, _Platforms_sPlatform_arr
-    d_addr Actors_sActor_arr_ptr, _Actors_sActor_arr
+    d_addr Actors_sActor_arr_ptr, Data_Empty_sActor_arr
     d_addr Devices_sDevice_arr_ptr, _Devices_sDevice_arr
     d_addr Passages_sPassage_arr_ptr, _Passages_sPassage_arr
     d_addr Enter_func_ptr, FuncA_Room_CryptTomb_EnterRoom
@@ -245,10 +246,6 @@ _Platforms_sPlatform_arr:
     D_END
     .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error
     .byte ePlatform::None
-_Actors_sActor_arr:
-:   ;; TODO: add some baddies?
-    .assert * - :- <= kMaxActors * .sizeof(sActor), error
-    .byte eActor::None
 _Devices_sDevice_arr:
 :   D_STRUCT sDevice
     d_byte Type_eDevice, eDevice::ConsoleFloor

diff --git a/src/rooms/factory_center.asm b/src/rooms/factory_center.asm
@@ -25,6 +25,7 @@
 .INCLUDE "../room.inc"
 
 .IMPORT DataA_Room_Factory_sTileset
+.IMPORT Data_Empty_sActor_arr
 .IMPORT Data_Empty_sPlatform_arr
 .IMPORT Func_Noop
 .IMPORT Ppu_ChrObjFactory
@@ -61,7 +62,7 @@ _Ext_sRoomExt:
     D_STRUCT sRoomExt
     d_addr Terrain_sTileset_ptr, DataA_Room_Factory_sTileset
     d_addr Platforms_sPlatform_arr_ptr, Data_Empty_sPlatform_arr
-    d_addr Actors_sActor_arr_ptr, _Actors_sActor_arr
+    d_addr Actors_sActor_arr_ptr, Data_Empty_sActor_arr
     d_addr Devices_sDevice_arr_ptr, _Devices_sDevice_arr
     d_addr Passages_sPassage_arr_ptr, _Passages_sPassage_arr
     d_addr Enter_func_ptr, FuncC_Factory_Center_EnterRoom
@@ -72,10 +73,6 @@ _Ext_sRoomExt:
 _TerrainData:
 :   .incbin "out/rooms/factory_center.room"
     .assert * - :- = 18 * 15, error
-_Actors_sActor_arr:
-:   ;; TODO: add some baddies
-    .assert * - :- <= kMaxActors * .sizeof(sActor), error
-    .byte eActor::None
 _Devices_sDevice_arr:
 :   .assert * - :- = kUpgradeDeviceIndex * .sizeof(sDevice), error
     D_STRUCT sDevice

diff --git a/src/rooms/sewer_west.asm b/src/rooms/sewer_west.asm
@@ -32,6 +32,7 @@
 .INCLUDE "../room.inc"
 
 .IMPORT DataA_Room_Sewer_sTileset
+.IMPORT Data_Empty_sActor_arr
 .IMPORT FuncA_Machine_Error
 .IMPORT FuncA_Machine_GetMultiplexerMoveSpeed
 .IMPORT FuncA_Machine_ReachedGoal
@@ -99,7 +100,7 @@ _Ext_sRoomExt:
     D_STRUCT sRoomExt
     d_addr Terrain_sTileset_ptr, DataA_Room_Sewer_sTileset
     d_addr Platforms_sPlatform_arr_ptr, _Platforms_sPlatform_arr
-    d_addr Actors_sActor_arr_ptr, _Actors_sActor_arr
+    d_addr Actors_sActor_arr_ptr, Data_Empty_sActor_arr
     d_addr Devices_sDevice_arr_ptr, _Devices_sDevice_arr
     d_addr Passages_sPassage_arr_ptr, _Passages_sPassage_arr
     d_addr Enter_func_ptr, Func_Noop
@@ -151,10 +152,6 @@ _Platforms_sPlatform_arr:
     D_END
     .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error
     .byte ePlatform::None
-_Actors_sActor_arr:
-:   ;; TODO: add baddies?
-    .assert * - :- <= kMaxActors * .sizeof(sActor), error
-    .byte eActor::None
 _Devices_sDevice_arr:
 :   D_STRUCT sDevice
     d_byte Type_eDevice, eDevice::ConsoleFloor