Populate SewerEast room

mdsteele · Jun 26, 2024 · 142bc9f · 142bc9f
1 parent f359048
commit 142bc9f
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 27 deletions.
diff --git a/src/rooms/sewer_east.asm b/src/rooms/sewer_east.asm
@@ -17,12 +17,13 @@
 ;;; with Annalog.  If not, see <http://www.gnu.org/licenses/>.              ;;;
 ;;;=========================================================================;;;
 
+.INCLUDE "../actor.inc"
 .INCLUDE "../macros.inc"
+.INCLUDE "../oam.inc"
 .INCLUDE "../platform.inc"
 .INCLUDE "../room.inc"
 
 .IMPORT DataA_Room_Sewer_sTileset
-.IMPORT Data_Empty_sActor_arr
 .IMPORT Data_Empty_sDevice_arr
 .IMPORT FuncA_Room_SewagePushAvatar
 .IMPORT Func_Noop
@@ -50,7 +51,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, Data_Empty_sActor_arr
+    d_addr Actors_sActor_arr_ptr, _Actors_sActor_arr
     d_addr Devices_sDevice_arr_ptr, Data_Empty_sDevice_arr
     d_addr Passages_sPassage_arr_ptr, _Passages_sPassage_arr
     d_addr Enter_func_ptr, Func_Noop
@@ -63,14 +64,69 @@ _TerrainData:
     .assert * - :- = 18 * 24, error
 _Platforms_sPlatform_arr:
 :   D_STRUCT sPlatform
+    d_byte Type_ePlatform, ePlatform::Solid
+    d_word WidthPx_u16, $10
+    d_byte HeightPx_u8, $08
+    d_word Left_i16,  $00a0
+    d_word Top_i16,   $00c0
+    D_END
+    D_STRUCT sPlatform
+    d_byte Type_ePlatform, ePlatform::Solid
+    d_word WidthPx_u16, $10
+    d_byte HeightPx_u8, $08
+    d_word Left_i16,  $0030
+    d_word Top_i16,   $00d0
+    D_END
+    D_STRUCT sPlatform
+    d_byte Type_ePlatform, ePlatform::Solid
+    d_word WidthPx_u16, $20
+    d_byte HeightPx_u8, $08
+    d_word Left_i16,  $00d0
+    d_word Top_i16,   $00d8
+    D_END
+    D_STRUCT sPlatform
     d_byte Type_ePlatform, ePlatform::Water
     d_word WidthPx_u16, $40
     d_byte HeightPx_u8, $20
     d_word Left_i16,  $0070
     d_word Top_i16,   $0074
     D_END
+    D_STRUCT sPlatform
+    d_byte Type_ePlatform, ePlatform::Water
+    d_word WidthPx_u16, $30
+    d_byte HeightPx_u8, $10
+    d_word Left_i16,  $00a0
+    d_word Top_i16,   $0124
+    D_END
     .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error
     .byte ePlatform::None
+_Actors_sActor_arr:
+:   D_STRUCT sActor
+    d_byte Type_eActor, eActor::BadGrub
+    d_word PosX_i16, $0080
+    d_word PosY_i16, $00b8
+    d_byte Param_byte, bObj::Pri
+    D_END
+    D_STRUCT sActor
+    d_byte Type_eActor, eActor::BadSlime
+    d_word PosX_i16, $0090
+    d_word PosY_i16, $00d4
+    d_byte Param_byte, 0
+    D_END
+    D_STRUCT sActor
+    d_byte Type_eActor, eActor::BadSlime
+    d_word PosX_i16, $00f0
+    d_word PosY_i16, $00f4
+    d_byte Param_byte, 0
+    D_END
+    D_STRUCT sActor
+    d_byte Type_eActor, eActor::BadGrub
+    d_word PosX_i16, $0028
+    d_word PosY_i16, $0148
+    d_byte Param_byte, 0
+    D_END
+    .assert * - :- <= kMaxActors * .sizeof(sActor), error
+    .byte eActor::None
 _Passages_sPassage_arr:
 :   D_STRUCT sPassage
     d_byte Exit_bPassage, ePassage::Western | 0
@@ -94,7 +150,7 @@ _Passages_sPassage_arr:
     d_byte Exit_bPassage, ePassage::Bottom | 0
     d_byte Destination_eRoom, eRoom::SewerBasin
     d_byte SpawnBlock_u8, 7
-    d_byte SpawnAdjust_byte, $c1
+    d_byte SpawnAdjust_byte, $49
     D_END
     .assert * - :- <= kMaxPassages * .sizeof(sPassage), error
 .ENDPROC

diff --git a/src/rooms/sewer_east.bg b/src/rooms/sewer_east.bg
@@ -2,29 +2,30 @@
 >sewer_0
 >sewer_1
 >sewer_2
+>sewer_3
 >sewer_4
 
-DCDCDCDCDCDCDCDBCJCIDADCDCDCDCDCDCDC
-DCDCDCDCDB    CGCNCMCH    DADCDCDCDC
-DCDCDB        CIDADBCJ        DADCDC
-DCDCDB        CI    CJ        DADCDC
-DCDCDB        CI    CJDD      DADCDC
-              CI    CJ    DD  DADCDC
-              CI    CJ        DADCDC
-            DDBMBPBPBNDD
-DCDCDB      DD        DD
-DCDCDB    DADCDCDCDCDCDCDB
-DCDCDB                        DADCDC
-DCDCDB                        DADCDC
-DCDCDB                  DADB  DADCDC
-DCDCDB                        DADCDC
-DCDCDB              DADB      DADCDC
-DCDCDB                        DADCDC
-DCDCDB                  DADB  DADCDC
-DCDCDB        CB              DADCDC
-DCDCDB        CC    DADB      DADCDC
-DCDCDB        CC              DADCDC
-DCDCDB        CC        DADB  DADCDC
-DCDCDB        CC              DADCDC
-DCDCDCDCDB    CC    DADCDCDCDCDCDCDC
-DCDCDCDCDCDB  CC  DADCDCDCDCDCDCDCDC
+ECECECECECECECEBCJCIEAECECECECECECEC
+ECECECECEB    CGCNCMCH    EAECECECEC
+ECECEB        CIEAEBCJ      BFEAECEC
+ECECEB  CB    CIBFBCCJ        EAECEC
+ECECEB  CC    CI    CJED      EAECEC
+        CC  EDCI    CJBC    EAECECEC
+        CC  EDCI    CJBD      EAECEC
+        CC  EDBMBPBPBNED
+ECECEB  CC  ED        ED
+ECECEB  CCEAECECECECECECEB
+ECEBBC  CC  BFBCBFBFEAECEB    EAECEC
+ECEBCECECDCFCFCFCFCFCFCHEAEB  BIEAEC
+ECECECECECECECECECEJDBCJ      BIEAEC
+ECECEJDB      BFBG    CJ  DEDGEEECEC
+ECEB    BE            CJ  EAECECECEC
+ECEB  BFBC      EAEB  CJ      BFEAEC
+ECECEB            ED  CJ        EAEC
+ECECECEB  CA  CB  ED  CJ        EAEC
+ECEBBC        CC  EDBPBNBPED    EAEC
+ECEB          CCEAECECECECEB    EAEC
+ECEBBE        CC  BFBABCBG    EAECEC
+ECECECEB      CC              EAECEC
+ECECECECEB    CC    EAECECECECECECEC
+ECECECECECEB  CC  EAECECECECECECECEC