diff --git a/src/newgame.asm b/src/newgame.asm index 3aa2f172..78d1fe04 100644 --- a/src/newgame.asm +++ b/src/newgame.asm @@ -110,7 +110,7 @@ _SetFlags: d_byte Tomb, " TOMB " d_byte Breaker3, "BREAKER3" d_byte Spring, " SPRING " - d_byte Volcanic, "VOLCANIC" + d_byte Cavern, " CAVERN " d_byte Breaker4, "BREAKER4" d_byte Collapse, " MINE " d_byte Breaker5, "BREAKER5" @@ -138,7 +138,7 @@ _SetFlags: d_byte Tomb, eRoom::CryptTomb d_byte Breaker3, eRoom::BossCrypt d_byte Spring, eRoom::MermaidSpring - d_byte Volcanic, eRoom::BossLava ; TODO start just outside + d_byte Cavern, eRoom::LavaCavern d_byte Breaker4, eRoom::BossLava d_byte Collapse, eRoom::MineCollapse d_byte Breaker5, eRoom::BossMine @@ -166,7 +166,7 @@ _SetFlags: d_byte Tomb, bSpawn::Device | 3 ; TODO: use a constant d_byte Breaker3, bSpawn::Device | kBossDoorDeviceIndex d_byte Spring, bSpawn::Passage | 0 - d_byte Volcanic, bSpawn::Device | kBossDoorDeviceIndex ; TODO + d_byte Cavern, bSpawn::Device | 0 ; TODO: use a constant d_byte Breaker4, bSpawn::Device | kBossDoorDeviceIndex d_byte Collapse, bSpawn::Device | 2 ; TODO: use a constant d_byte Breaker5, bSpawn::Device | kBossDoorDeviceIndex @@ -194,7 +194,7 @@ _SetFlags: d_byte Tomb, eFlag::BossCrypt d_byte Breaker3, eFlag::BreakerCrypt d_byte Spring, eFlag::MermaidSpringConsoleFixed - d_byte Volcanic, eFlag::BossLava + d_byte Cavern, eFlag::BossLava d_byte Breaker4, eFlag::BreakerLava d_byte Collapse, eFlag::BossMine d_byte Breaker5, eFlag::BreakerMine diff --git a/src/newgame.inc b/src/newgame.inc index 7bbf9195..f5d9149f 100644 --- a/src/newgame.inc +++ b/src/newgame.inc @@ -30,7 +30,7 @@ Tomb ; start just outside the crypt boss room Breaker3 ; start in the crypt boss room, just after defeating it Spring ; start at the hot spring, with Alex waiting there to help - Volcanic ; start just outside the lava boss room + Cavern ; start just outside the lava boss room Breaker4 ; start in the lava boss room, just after defeating it Collapse ; start just outside the mine boss room Breaker5 ; start in the mine boss room, just after defeating it diff --git a/src/room.asm b/src/room.asm index 65be37d5..f4eebd12 100644 --- a/src/room.asm +++ b/src/room.asm @@ -93,12 +93,15 @@ .IMPORT DataC_Garden_Shrine_sRoom .IMPORT DataC_Garden_Tower_sRoom .IMPORT DataC_Garden_Tunnel_sRoom +.IMPORT DataC_Lava_Cavern_sRoom .IMPORT DataC_Lava_Center_sRoom .IMPORT DataC_Lava_East_sRoom .IMPORT DataC_Lava_Flower_sRoom .IMPORT DataC_Lava_Shaft_sRoom .IMPORT DataC_Lava_Station_sRoom .IMPORT DataC_Lava_Teleport_sRoom +.IMPORT DataC_Lava_Tunnel_sRoom +.IMPORT DataC_Lava_Vent_sRoom .IMPORT DataC_Lava_West_sRoom .IMPORT DataC_Mermaid_Cellar_sRoom .IMPORT DataC_Mermaid_East_sRoom @@ -352,12 +355,15 @@ _LoadNewRoom: d_entry table, GardenShrine, DataC_Garden_Shrine_sRoom d_entry table, GardenTower, DataC_Garden_Tower_sRoom d_entry table, GardenTunnel, DataC_Garden_Tunnel_sRoom + d_entry table, LavaCavern, DataC_Lava_Cavern_sRoom d_entry table, LavaCenter, DataC_Lava_Center_sRoom d_entry table, LavaEast, DataC_Lava_East_sRoom d_entry table, LavaFlower, DataC_Lava_Flower_sRoom d_entry table, LavaShaft, DataC_Lava_Shaft_sRoom d_entry table, LavaStation, DataC_Lava_Station_sRoom d_entry table, LavaTeleport, DataC_Lava_Teleport_sRoom + d_entry table, LavaTunnel, DataC_Lava_Tunnel_sRoom + d_entry table, LavaVent, DataC_Lava_Vent_sRoom d_entry table, LavaWest, DataC_Lava_West_sRoom d_entry table, MermaidCellar, DataC_Mermaid_Cellar_sRoom d_entry table, MermaidEast, DataC_Mermaid_East_sRoom @@ -538,12 +544,15 @@ _PrisonMusic: d_byte GardenShrine, eMusic::Garden d_byte GardenTower, eMusic::Garden d_byte GardenTunnel, eMusic::Garden + d_byte LavaCavern, eMusic::Silence d_byte LavaCenter, eMusic::Silence d_byte LavaEast, eMusic::Silence d_byte LavaFlower, eMusic::Silence d_byte LavaShaft, eMusic::Silence d_byte LavaStation, eMusic::Silence d_byte LavaTeleport, eMusic::Silence + d_byte LavaTunnel, eMusic::Silence + d_byte LavaVent, eMusic::Silence d_byte LavaWest, eMusic::Silence d_byte MermaidCellar, eMusic::Silence d_byte MermaidEast, eMusic::Silence diff --git a/src/room.inc b/src/room.inc index 14a23778..be242c5a 100644 --- a/src/room.inc +++ b/src/room.inc @@ -103,12 +103,15 @@ kMaxPassages = 8 GardenShrine GardenTower GardenTunnel + LavaCavern LavaCenter LavaEast LavaFlower LavaShaft LavaStation LavaTeleport + LavaTunnel + LavaVent LavaWest MermaidCellar MermaidEast diff --git a/src/rooms/boss_lava.asm b/src/rooms/boss_lava.asm index 212efa00..a1cd6230 100644 --- a/src/rooms/boss_lava.asm +++ b/src/rooms/boss_lava.asm @@ -425,7 +425,7 @@ _Devices_sDevice_arr: d_byte Type_eDevice, eDevice::Door1Unlocked d_byte BlockRow_u8, 9 d_byte BlockCol_u8, 8 - d_byte Target_byte, eRoom::BossLava ; TODO + d_byte Target_byte, eRoom::LavaCavern D_END .assert * - :- = kBossUpgradeDeviceIndex * .sizeof(sDevice), error D_STRUCT sDevice diff --git a/src/rooms/lava_cavern.asm b/src/rooms/lava_cavern.asm new file mode 100644 index 00000000..363caa8d --- /dev/null +++ b/src/rooms/lava_cavern.asm @@ -0,0 +1,100 @@ +;;;=========================================================================;;; +;;; Copyright 2022 Matthew D. Steele ;;; +;;; ;;; +;;; This file is part of Annalog. ;;; +;;; ;;; +;;; Annalog is free software: you can redistribute it and/or modify it ;;; +;;; under the terms of the GNU General Public License as published by the ;;; +;;; Free Software Foundation, either version 3 of the License, or (at your ;;; +;;; option) any later version. ;;; +;;; ;;; +;;; Annalog is distributed in the hope that it will be useful, but WITHOUT ;;; +;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;;; +;;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;;; +;;; for more details. ;;; +;;; ;;; +;;; You should have received a copy of the GNU General Public License along ;;; +;;; with Annalog. If not, see . ;;; +;;;=========================================================================;;; + +.INCLUDE "../actor.inc" +.INCLUDE "../device.inc" +.INCLUDE "../macros.inc" +.INCLUDE "../platform.inc" +.INCLUDE "../platforms/lava.inc" +.INCLUDE "../room.inc" + +.IMPORT DataA_Room_Lava_sTileset +.IMPORT FuncA_Objects_AnimateLavaTerrain +.IMPORT FuncA_Terrain_FadeInShortRoomWithLava +.IMPORT Func_Noop +.IMPORT Ppu_ChrObjLava + +;;;=========================================================================;;; + +.SEGMENT "PRGC_Lava" + +.EXPORT DataC_Lava_Cavern_sRoom +.PROC DataC_Lava_Cavern_sRoom + D_STRUCT sRoom + d_byte MinScrollX_u8, $10 + d_word MaxScrollX_u16, $110 + d_byte Flags_bRoom, eArea::Lava + d_byte MinimapStartRow_u8, 14 + d_byte MinimapStartCol_u8, 20 + d_addr TerrainData_ptr, _TerrainData + d_byte NumMachines_u8, 0 + d_addr Machines_sMachine_arr_ptr, 0 + d_byte Chr18Bank_u8, <.bank(Ppu_ChrObjLava) + d_addr Ext_sRoomExt_ptr, _Ext_sRoomExt + D_END +_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, _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, Func_Noop + d_addr FadeIn_func_ptr, FuncA_Terrain_FadeInShortRoomWithLava + d_addr Tick_func_ptr, Func_Noop + d_addr Draw_func_ptr, FuncA_Objects_AnimateLavaTerrain + D_END +_TerrainData: +: .incbin "out/rooms/lava_cavern.room" + .assert * - :- = 33 * 15, error +_Platforms_sPlatform_arr: +: ;; Lava: + D_STRUCT sPlatform + d_byte Type_ePlatform, ePlatform::Kill + d_word WidthPx_u16, $210 + d_byte HeightPx_u8, kLavaPlatformHeightPx + d_word Left_i16, $0000 + d_word Top_i16, kLavaPlatformTopShortRoom + 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::Door1Unlocked + d_byte BlockRow_u8, 9 + d_byte BlockCol_u8, 25 + d_byte Target_byte, eRoom::BossLava + D_END + .assert * - :- <= kMaxDevices * .sizeof(sDevice), error + .byte eDevice::None +_Passages_sPassage_arr: +: D_STRUCT sPassage + d_byte Exit_bPassage, ePassage::Western | 0 + d_byte Destination_eRoom, eRoom::LavaEast + d_byte SpawnBlock_u8, 6 + d_byte SpawnAdjust_byte, 0 + D_END + .assert * - :- <= kMaxPassages * .sizeof(sPassage), error +.ENDPROC + +;;;=========================================================================;;; diff --git a/src/rooms/lava_cavern.bg b/src/rooms/lava_cavern.bg new file mode 100644 index 00000000..27872ce8 --- /dev/null +++ b/src/rooms/lava_cavern.bg @@ -0,0 +1,24 @@ +@BG 0 0 0 33x15 +>lava_0 +>lava_1 +>lava_2 +>lava_3 +>lava_4 +>lava_5 +>lava_6 + +ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC +ECECECECECECECECEC ECECEC +ECEC ECECEC EC + ECEC EC + EC EC + EC EC + EC EC +EAEAEA EC +ECEC BM EC +ECEC ECECEC BO EC +ECEC ECECEC EC +ECEC ECEC ECECEC EC +ECEC ECECECECECECECECECECECECECECECECECECECECEC +BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBP +BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBP diff --git a/src/rooms/lava_east.asm b/src/rooms/lava_east.asm index 5729a072..d67b375a 100644 --- a/src/rooms/lava_east.asm +++ b/src/rooms/lava_east.asm @@ -451,13 +451,13 @@ _Passages_sPassage_arr: D_END D_STRUCT sPassage d_byte Exit_bPassage, ePassage::Eastern | 0 - d_byte Destination_eRoom, eRoom::LavaEast ; TODO LavaVent + d_byte Destination_eRoom, eRoom::LavaVent d_byte SpawnBlock_u8, 4 d_byte SpawnAdjust_byte, 0 D_END D_STRUCT sPassage d_byte Exit_bPassage, ePassage::Eastern | 1 - d_byte Destination_eRoom, eRoom::LavaEast ; TODO LavaCavern + d_byte Destination_eRoom, eRoom::LavaCavern d_byte SpawnBlock_u8, 15 d_byte SpawnAdjust_byte, 0 D_END diff --git a/src/rooms/lava_tunnel.asm b/src/rooms/lava_tunnel.asm new file mode 100644 index 00000000..f3a94e50 --- /dev/null +++ b/src/rooms/lava_tunnel.asm @@ -0,0 +1,73 @@ +;;;=========================================================================;;; +;;; Copyright 2022 Matthew D. Steele ;;; +;;; ;;; +;;; This file is part of Annalog. ;;; +;;; ;;; +;;; Annalog is free software: you can redistribute it and/or modify it ;;; +;;; under the terms of the GNU General Public License as published by the ;;; +;;; Free Software Foundation, either version 3 of the License, or (at your ;;; +;;; option) any later version. ;;; +;;; ;;; +;;; Annalog is distributed in the hope that it will be useful, but WITHOUT ;;; +;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;;; +;;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;;; +;;; for more details. ;;; +;;; ;;; +;;; You should have received a copy of the GNU General Public License along ;;; +;;; with Annalog. If not, see . ;;; +;;;=========================================================================;;; + +.INCLUDE "../macros.inc" +.INCLUDE "../room.inc" + +.IMPORT DataA_Room_Lava_sTileset +.IMPORT Data_Empty_sActor_arr +.IMPORT Data_Empty_sDevice_arr +.IMPORT Data_Empty_sPlatform_arr +.IMPORT Func_Noop +.IMPORT Ppu_ChrObjLava + +;;;=========================================================================;;; + +.SEGMENT "PRGC_Lava" + +.EXPORT DataC_Lava_Tunnel_sRoom +.PROC DataC_Lava_Tunnel_sRoom + D_STRUCT sRoom + d_byte MinScrollX_u8, $0 + d_word MaxScrollX_u16, $100 + d_byte Flags_bRoom, eArea::Lava + d_byte MinimapStartRow_u8, 12 + d_byte MinimapStartCol_u8, 18 + d_addr TerrainData_ptr, _TerrainData + d_byte NumMachines_u8, 0 + d_addr Machines_sMachine_arr_ptr, 0 + d_byte Chr18Bank_u8, <.bank(Ppu_ChrObjLava) + d_addr Ext_sRoomExt_ptr, _Ext_sRoomExt + D_END +_Ext_sRoomExt: + D_STRUCT sRoomExt + d_addr Terrain_sTileset_ptr, DataA_Room_Lava_sTileset + d_addr Platforms_sPlatform_arr_ptr, Data_Empty_sPlatform_arr + d_addr Actors_sActor_arr_ptr, Data_Empty_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 + d_addr FadeIn_func_ptr, Func_Noop + d_addr Tick_func_ptr, Func_Noop + d_addr Draw_func_ptr, Func_Noop + D_END +_TerrainData: +: .incbin "out/rooms/lava_tunnel.room" + .assert * - :- = 33 * 15, error +_Passages_sPassage_arr: +: D_STRUCT sPassage + d_byte Exit_bPassage, ePassage::Eastern | 0 + d_byte Destination_eRoom, eRoom::LavaVent + d_byte SpawnBlock_u8, 6 + d_byte SpawnAdjust_byte, 0 + D_END + .assert * - :- <= kMaxPassages * .sizeof(sPassage), error +.ENDPROC + +;;;=========================================================================;;; diff --git a/src/rooms/lava_tunnel.bg b/src/rooms/lava_tunnel.bg new file mode 100644 index 00000000..ff6b4f2e --- /dev/null +++ b/src/rooms/lava_tunnel.bg @@ -0,0 +1,25 @@ +@BG 0 0 0 33x15 +>lava_0 +>lava_1 +>lava_2 +>lava_3 +>lava_4 +>lava_5 +>lava_6 +>lava_7 + +HAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHA +HAHA HAHA +HAHA HAHA +HAHA HAHA +HAHA HAHA +HAHA +ECEC +ECEC EAEA +ECEC ECEC +ECEC ECECEC +ECEC ECECEC +ECEC ECECECEC +ECEC ECECECEC +ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC +ECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECECEC diff --git a/src/rooms/lava_vent.asm b/src/rooms/lava_vent.asm new file mode 100644 index 00000000..ff18140d --- /dev/null +++ b/src/rooms/lava_vent.asm @@ -0,0 +1,89 @@ +;;;=========================================================================;;; +;;; Copyright 2022 Matthew D. Steele ;;; +;;; ;;; +;;; This file is part of Annalog. ;;; +;;; ;;; +;;; Annalog is free software: you can redistribute it and/or modify it ;;; +;;; under the terms of the GNU General Public License as published by the ;;; +;;; Free Software Foundation, either version 3 of the License, or (at your ;;; +;;; option) any later version. ;;; +;;; ;;; +;;; Annalog is distributed in the hope that it will be useful, but WITHOUT ;;; +;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;;; +;;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;;; +;;; for more details. ;;; +;;; ;;; +;;; You should have received a copy of the GNU General Public License along ;;; +;;; with Annalog. If not, see . ;;; +;;;=========================================================================;;; + +.INCLUDE "../actor.inc" +.INCLUDE "../device.inc" +.INCLUDE "../macros.inc" +.INCLUDE "../oam.inc" +.INCLUDE "../platform.inc" +.INCLUDE "../room.inc" + +.IMPORT DataA_Room_Lava_sTileset +.IMPORT Data_Empty_sActor_arr +.IMPORT Data_Empty_sDevice_arr +.IMPORT Data_Empty_sPlatform_arr +.IMPORT Func_Noop +.IMPORT Ppu_ChrObjLava + +;;;=========================================================================;;; + +.SEGMENT "PRGC_Lava" + +.EXPORT DataC_Lava_Vent_sRoom +.PROC DataC_Lava_Vent_sRoom + D_STRUCT sRoom + d_byte MinScrollX_u8, $10 + d_word MaxScrollX_u16, $10 + d_byte Flags_bRoom, bRoom::Tall | eArea::Lava + d_byte MinimapStartRow_u8, 12 + d_byte MinimapStartCol_u8, 20 + d_addr TerrainData_ptr, _TerrainData + d_byte NumMachines_u8, 0 + d_addr Machines_sMachine_arr_ptr, 0 + d_byte Chr18Bank_u8, <.bank(Ppu_ChrObjLava) + d_addr Ext_sRoomExt_ptr, _Ext_sRoomExt + D_END +_Ext_sRoomExt: + D_STRUCT sRoomExt + d_addr Terrain_sTileset_ptr, DataA_Room_Lava_sTileset + d_addr Platforms_sPlatform_arr_ptr, Data_Empty_sPlatform_arr + d_addr Actors_sActor_arr_ptr, Data_Empty_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 + d_addr FadeIn_func_ptr, Func_Noop + d_addr Tick_func_ptr, Func_Noop + d_addr Draw_func_ptr, Func_Noop + D_END +_TerrainData: +: .incbin "out/rooms/lava_vent.room" + .assert * - :- = 18 * 24, error +_Passages_sPassage_arr: +: D_STRUCT sPassage + d_byte Exit_bPassage, ePassage::Western | 0 + d_byte Destination_eRoom, eRoom::LavaTunnel + d_byte SpawnBlock_u8, 6 + d_byte SpawnAdjust_byte, 0 + D_END + D_STRUCT sPassage + d_byte Exit_bPassage, ePassage::Eastern | 0 + d_byte Destination_eRoom, eRoom::MineEntry + d_byte SpawnBlock_u8, 5 + d_byte SpawnAdjust_byte, 0 + D_END + D_STRUCT sPassage + d_byte Exit_bPassage, ePassage::Western | 1 + d_byte Destination_eRoom, eRoom::LavaEast + d_byte SpawnBlock_u8, 19 + d_byte SpawnAdjust_byte, 0 + D_END + .assert * - :- <= kMaxPassages * .sizeof(sPassage), error +.ENDPROC + +;;;=========================================================================;;; diff --git a/src/rooms/lava_vent.bg b/src/rooms/lava_vent.bg new file mode 100644 index 00000000..0c3698b5 --- /dev/null +++ b/src/rooms/lava_vent.bg @@ -0,0 +1,33 @@ +@BG 0 0 0 18x24 +>lava_0 +>lava_1 +>lava_2 +>lava_3 +>lava_4 +>lava_5 +>lava_7 + +GAGAGAGAGAGAGAGAGAGAGAGAGAGAGAGAGAGA +GAGAGAGAGAGAGAGAGAGAGAGAGAGAGAGAGAGA +GAGA GAGAGA +GAGA GAGA +GAGA + + GAGAGA +EAEAEA GAGAGA +ECECEC ECEC ECEC GAGA +ECEC ECEC +ECEC ECEC ECEC +ECEC ECEC +ECEC ECEC ECEC +ECEC ECEC +ECEC ECEC ECEC +ECEC ECEC +ECEC ECEC ECEC +ECEC ECEC + ECEC ECEC + ECEC +EAEAEA ECEC ECEC +ECECEC ECEC +ECECECECECECECECECECECECECECECECECEC +ECECECECECECECECECECECECECECECECECEC diff --git a/src/rooms/mine_entry.asm b/src/rooms/mine_entry.asm index 2f93de9b..7add7085 100644 --- a/src/rooms/mine_entry.asm +++ b/src/rooms/mine_entry.asm @@ -89,7 +89,7 @@ _Actors_sActor_arr: _Passages_sPassage_arr: : D_STRUCT sPassage d_byte Exit_bPassage, ePassage::Western | 0 - d_byte Destination_eRoom, eRoom::MineEntry ; TODO + d_byte Destination_eRoom, eRoom::LavaVent d_byte SpawnBlock_u8, 11 d_byte SpawnAdjust_byte, 0 D_END diff --git a/src/rooms/mine_entry.bg b/src/rooms/mine_entry.bg index 9d7056ba..f4653f10 100644 --- a/src/rooms/mine_entry.bg +++ b/src/rooms/mine_entry.bg @@ -14,11 +14,11 @@ EMEIED AN CL EMEH AN CN EMEHAM AO CIEAEB AN EMEH CCECED EAEEEE -EMEKEB GAGB CACB EGEMEM -EMEMEHAP ECED CCCD ECEJEM -EFEFED CACB EAEB AN EGEM +GHEKEB GAGB CACB EGEMEM +GHGHGJAP ECED CCCD ECEJEM +GHGHGH CACB EAEB AN EGEM CCCD AP ECED EGEM AM CACB CCCD AM EAELEM -EEEEEEEB CCCD AMCACB EGEMEM -EMEMEMEKGFGEGBBMBMBMGAGGGEGFGFELEMEM -EMEMEMEMEMEMEMFPFPFPEOEMEMEMEMEMEMEM +GHGHGIFM CCCD AMCACB EGEMEM +GHGHGHEAGFGEGBBMBMBMGAGGGEGFGFELEMEM + GJEGEMEMEMFPFPFPEOEMEMEMEMEMEMEM diff --git a/src/tilesets/lava.bg b/src/tilesets/lava.bg index 6e3a005d..93024cec 100644 --- a/src/tilesets/lava.bg +++ b/src/tilesets/lava.bg @@ -1,4 +1,4 @@ -@BG 0 0 0 32x14 +@BG 0 0 0 32x16 >terrain_teleport >steam_pipes >terrain_shared_0 @@ -23,3 +23,5 @@ BBECEDBBEDECBABAEDECBFECBBECBGBABBECBABCEDHAHBECBABKBJECEDECBJEC BBEDECBBBABAECEDBEBABBEDBHEDECEDBDEDECEDECHCHDEDECEDBHEDBABKBBED BABABHECHAHBEDECEDECEDBB HAED ED FEECBEBABHECEDBBEBBJBJECBBEC BABABABAHCHDBFBEBABFECBGFIHCFAFIECAGAHEDBBEDECEDBABHECBBBGBABGBK +DADB DADBDADBDA DBDA DBDADB +DBDA DB DADBDADBDADB DA DBDA diff --git a/tests/scenario.py b/tests/scenario.py index a6ed624e..94cf33a2 100644 --- a/tests/scenario.py +++ b/tests/scenario.py @@ -41,6 +41,7 @@ 'BossCity': 'CitySinkhole', 'BossCrypt': 'CryptTomb', 'BossGarden': 'GardenTower', + 'BossLava': 'LavaCavern', 'BossMine': 'MineCollapse', 'BossShadow': 'ShadowDepths', 'BossTemple': 'TempleSpire',