From 47379498be555b4c69dac7c0aa52bd31027e62da Mon Sep 17 00:00:00 2001 From: "Matthew D. Steele" Date: Mon, 9 Sep 2024 17:36:23 -0400 Subject: [PATCH] Remove some unneeded TODOs for adding more baddies --- src/rooms/city_sinkhole.asm | 7 ++----- src/rooms/factory_west.asm | 1 - src/rooms/mine_tunnel.asm | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/rooms/city_sinkhole.asm b/src/rooms/city_sinkhole.asm index 1922b6ed..abc234b2 100644 --- a/src/rooms/city_sinkhole.asm +++ b/src/rooms/city_sinkhole.asm @@ -30,6 +30,7 @@ .INCLUDE "../room.inc" .IMPORT DataA_Room_City_sTileset +.IMPORT Data_Empty_sActor_arr .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_LiftTick .IMPORT FuncA_Machine_LiftTryMove @@ -78,7 +79,7 @@ _Ext_sRoomExt: D_STRUCT sRoomExt d_addr Terrain_sTileset_ptr, DataA_Room_City_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 @@ -121,10 +122,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::Door1Open diff --git a/src/rooms/factory_west.asm b/src/rooms/factory_west.asm index 23900b7e..3b461be2 100644 --- a/src/rooms/factory_west.asm +++ b/src/rooms/factory_west.asm @@ -154,7 +154,6 @@ _Actors_sActor_arr: d_word PosY_i16, $0158 d_byte Param_byte, bObj::FlipH D_END - ;; TODO: add more baddies .assert * - :- <= kMaxActors * .sizeof(sActor), error .byte eActor::None _Devices_sDevice_arr: diff --git a/src/rooms/mine_tunnel.asm b/src/rooms/mine_tunnel.asm index b762a940..621f0d42 100644 --- a/src/rooms/mine_tunnel.asm +++ b/src/rooms/mine_tunnel.asm @@ -87,8 +87,7 @@ _Platforms_sPlatform_arr: .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error .byte ePlatform::None _Actors_sActor_arr: -: ;; TODO: Add some baddies - D_STRUCT sActor +: D_STRUCT sActor d_byte Type_eActor, eActor::BadGrub d_word PosX_i16, $00b8 d_word PosY_i16, $00a8