Skip to content

Commit

Permalink
Expand LavaStation room, and add a solifuge baddie
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdsteele
mdsteele committed Apr 30, 2024
1 parent 778d4dd commit 3447951
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 47 deletions.
2 changes: 1 addition & 1 deletion src/minimap.bg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ AMBECDAAAACBAFAIAHCEBFBNAAAACKAAAAAAAAAAAABMAAAA
ALCDBBADAAAABBBFBHAECFCGAAABAOBFBGAAABAFAHBLBHBD
BOABCLAFAGAACBCFCHAFAHBFBIBHANCFCGAAABBEAECFCHCD
CBBEAOADAAAAAAAAAAAAAACCCICGCKAAAAAAAACBAFAHBFBG
BBCDAAAAAABBAFAHAEBDAAAAAAAACKAABBADACAHBEAECFCJ
BBCDAAAAAABBAFAHAEBDAAAAAAAACKAABBAFAGABBEAECFCJ
CAAAAAABBECEAEAFAGCBADAAAAABBLBHCEBEBFBHCDAAAAAP
AAAAAAAACBAFAIAIAIAGAAAAAAAACCCHAECECFCHAFAGAAAA
34 changes: 21 additions & 13 deletions src/rooms/lava_station.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
.INCLUDE "../room.inc"

.IMPORT DataA_Room_Lava_sTileset
.IMPORT Data_Empty_sActor_arr
.IMPORT FuncA_Machine_BoilerFinishEmittingSteam
.IMPORT FuncA_Machine_BoilerTick
.IMPORT FuncA_Machine_BoilerWriteReg
Expand Down Expand Up @@ -75,7 +74,7 @@ kPipe2PlatformIndex = 3
.PROC DataC_Lava_Station_sRoom
D_STRUCT sRoom
d_byte MinScrollX_u8, $10
d_word MaxScrollX_u16, $10
d_word MaxScrollX_u16, $110
d_byte Flags_bRoom, eArea::Lava
d_byte MinimapStartRow_u8, 12
d_byte MinimapStartCol_u8, 17
Expand All @@ -89,7 +88,7 @@ _Ext_sRoomExt:
D_STRUCT sRoomExt
d_addr Terrain_sTileset_ptr, DataA_Room_Lava_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, _Devices_sDevice_arr
d_addr Passages_sPassage_arr_ptr, _Passages_sPassage_arr
d_addr Enter_func_ptr, FuncC_Lava_Station_EnterRoom
Expand All @@ -99,15 +98,15 @@ _Ext_sRoomExt:
D_END
_TerrainData:
: .incbin "out/rooms/lava_station.room"
.assert * - :- = 17 * 15, error
.assert * - :- = 33 * 15, error
_Machines_sMachine_arr:
: .assert * - :- = kBoilerMachineIndex * .sizeof(sMachine), error
D_STRUCT sMachine
d_byte Code_eProgram, eProgram::LavaStationBoiler
d_byte Breaker_eFlag, 0
d_byte Flags_bMachine, bMachine::Act | bMachine::WriteE
d_byte Status_eDiagram, eDiagram::Boiler
d_word ScrollGoalX_u16, $10
d_word ScrollGoalX_u16, $fc
d_byte ScrollGoalY_u8, $40
d_byte RegNames_u8_arr4, 0, 0, "V", 0
d_byte MainPlatform_u8, kBoilerPlatformIndex
Expand All @@ -127,53 +126,62 @@ _Platforms_sPlatform_arr:
d_byte Type_ePlatform, ePlatform::Solid
d_word WidthPx_u16, $18
d_byte HeightPx_u8, $10
d_word Left_i16, $0060
d_word Left_i16, $0160
d_word Top_i16, $00d0
D_END
.assert * - :- = kValvePlatformIndex * .sizeof(sPlatform), error
D_STRUCT sPlatform
d_byte Type_ePlatform, ePlatform::Zone
d_word WidthPx_u16, $08
d_byte HeightPx_u8, $08
d_word Left_i16, $0034
d_word Left_i16, $0134
d_word Top_i16, $00b4
D_END
.assert * - :- = kPipe1PlatformIndex * .sizeof(sPlatform), error
D_STRUCT sPlatform
d_byte Type_ePlatform, ePlatform::Zone
d_word WidthPx_u16, $08
d_byte HeightPx_u8, $08
d_word Left_i16, $0038
d_word Left_i16, $0138
d_word Top_i16, $0058
D_END
.assert * - :- = kPipe2PlatformIndex * .sizeof(sPlatform), error
D_STRUCT sPlatform
d_byte Type_ePlatform, ePlatform::Zone
d_word WidthPx_u16, $08
d_byte HeightPx_u8, $08
d_word Left_i16, $0050
d_word Left_i16, $0150
d_word Top_i16, $0080
D_END
.assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error
.byte ePlatform::None
_Actors_sActor_arr:
: D_STRUCT sActor
d_byte Type_eActor, eActor::BadSolifuge
d_word PosX_i16, $00d8
d_word PosY_i16, $0078
d_byte Param_byte, 0
D_END
.assert * - :- <= kMaxActors * .sizeof(sActor), error
.byte eActor::None
_Devices_sDevice_arr:
: D_STRUCT sDevice
d_byte Type_eDevice, eDevice::Console
d_byte BlockRow_u8, 11
d_byte BlockCol_u8, 7
d_byte BlockCol_u8, 23
d_byte Target_byte, kBoilerMachineIndex
D_END
.assert * - :- = kUpgradeDeviceIndex * .sizeof(sDevice), error
D_STRUCT sDevice
d_byte Type_eDevice, eDevice::Upgrade
d_byte BlockRow_u8, 10
d_byte BlockCol_u8, 13
d_byte BlockCol_u8, 29
d_byte Target_byte, kUpgradeFlag
D_END
D_STRUCT sDevice
d_byte Type_eDevice, eDevice::Paper
d_byte BlockRow_u8, 4
d_byte BlockCol_u8, 11
d_byte BlockCol_u8, 27
d_byte Target_byte, eFlag::PaperManual3
D_END
.assert * - :- <= kMaxDevices * .sizeof(sDevice), error
Expand All @@ -182,7 +190,7 @@ _Passages_sPassage_arr:
: D_STRUCT sPassage
d_byte Exit_bPassage, ePassage::Western | 0
d_byte Destination_eRoom, eRoom::LavaShaft
d_byte SpawnBlock_u8, 3
d_byte SpawnBlock_u8, 4
d_byte SpawnAdjust_byte, 0
D_END
.assert * - :- <= kMaxPassages * .sizeof(sPassage), error
Expand Down
32 changes: 16 additions & 16 deletions src/rooms/lava_station.bg
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@BG 0 0 0 17x15
@BG 0 0 0 33x15
>lava_0
>lava_1
>lava_2
Expand All @@ -7,18 +7,18 @@
>lava_5
>lava_6

ECECECECECECECEJEIECECEJEIEJECECEC
ECECECEJBJBK BG BLBI BH EIEJEI
BLBK BLBGEI
BC CO CM EC
EBEBEAEA EI
ECECFEFO EKEL EI
ECECFAEJ CN BJBK BFEC
ECECFAECBF EAEC
EJEJFIECECFPEEEG EIEC
ECECFAECECFA CMECEC
ECECFAECECFA EN EIEC
ECECFHEPFCFG AB BK EA EJEI
ECECECFAECECEEEGEHEHEGEHEEECEGECEC
ECECECFHFJFDGGAL CN EJ ECEC
ECECECECECEC EI ECEC
ECECEJEIECECECECECEJEIECECECECECECECECECECECECEJEIECECEJEIEJECECEC
ECECECECEJCBBJBK EIECECECEJEIECECECECEJBJBK BG BLBI BH EIEJEI
ECECECEJBK BKEIEJCD BL BLBK BLBGEI
BL BK BC CO CM EC
BA CM CN EAEBEAEA EI
EBEBEABE BEECECFEFO EKEL EI
ECECECEA CN EAECECFAEJ CN BJBK BFEC
ECECECEC BB BF BF ECECECFAECBF EAEC
ECECEJEIECECECECEHEEEGEFECECECECEJEJFIECECFPEEEG EIEC
ECECECECECECECEJ ECECEJEIECECFAECECFA CMECEC
ECECECECECECECCN ECECECECECECFAECECFA EN EIEC
ECECECECEJEIEC EIECECECECECFHEPFCFG AB BK EA EJEI
ECECECECECECEC CO ECECECECECECFAECECEEEGEHEHEGEHEEECEGECEC
ECECECEJEIECEC ECECEJEIECECFHFJFDGGAL CN EJ ECEC
ECECECECECECEC ECECECECECECECECEC EI ECEC
6 changes: 3 additions & 3 deletions src/rooms/lava_tunnel.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
.PROC DataC_Lava_Tunnel_sRoom
D_STRUCT sRoom
d_byte MinScrollX_u8, $0
d_word MaxScrollX_u16, $100
d_word MaxScrollX_u16, $0
d_byte Flags_bRoom, eArea::Lava
d_byte MinimapStartRow_u8, 12
d_byte MinimapStartCol_u8, 18
d_byte MinimapStartCol_u8, 19
d_addr TerrainData_ptr, _TerrainData
d_byte NumMachines_u8, 0
d_addr Machines_sMachine_arr_ptr, 0
Expand All @@ -59,7 +59,7 @@ _Ext_sRoomExt:
D_END
_TerrainData:
: .incbin "out/rooms/lava_tunnel.room"
.assert * - :- = 33 * 15, error
.assert * - :- = 17 * 15, error
_Passages_sPassage_arr:
: D_STRUCT sPassage
d_byte Exit_bPassage, ePassage::Eastern | 0
Expand Down
28 changes: 14 additions & 14 deletions src/rooms/lava_tunnel.bg
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@BG 0 0 0 33x15
@BG 0 0 0 17x15
>lava_0
>lava_1
>lava_2
Expand All @@ -8,18 +8,18 @@
>lava_6
>lava_7

HAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHA
HAHA HAHA
HAHA HAHA
HAHA HAHA
HAHA HAHA
HAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHA
HAHA HAHA
HAHA HAHA
HAHA HAHA
HAHA HAHA
HAHA
ECEC
ECEC EAEA
ECEC ECEC
ECEC ECECEC
ECEC ECECEC
ECEC ECECECEC
ECEC ECECECEC
ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC
ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC
ECEC EAEA
ECEC ECEC
ECEC ECECEC
ECEC ECECEC
ECEC ECECECEC
ECEC ECECECEC
ECECECECECECECECECECECECECECECECEC
ECECECECECECECECECECECECECECECECEC

0 comments on commit 3447951

Please sign in to comment.