-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add placeholder data for missing Shadow rooms
- Loading branch information
Showing
13 changed files
with
388 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| ;;;=========================================================================;;; | ||
| ;;; Copyright 2022 Matthew D. Steele <[email protected]> ;;; | ||
| ;;; ;;; | ||
| ;;; 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 <http://www.gnu.org/licenses/>. ;;; | ||
| ;;;=========================================================================;;; | ||
|
|
||
| .INCLUDE "../actor.inc" | ||
| .INCLUDE "../actors/orc.inc" | ||
| .INCLUDE "../actors/townsfolk.inc" | ||
| .INCLUDE "../device.inc" | ||
| .INCLUDE "../macros.inc" | ||
| .INCLUDE "../platform.inc" | ||
| .INCLUDE "../platforms/lava.inc" | ||
| .INCLUDE "../room.inc" | ||
|
|
||
| .IMPORT DataA_Room_Shadow_sTileset | ||
| .IMPORT FuncA_Objects_AnimateLavaTerrain | ||
| .IMPORT FuncA_Terrain_FadeInTallRoomWithLava | ||
| .IMPORT Func_Noop | ||
| .IMPORT Ppu_ChrObjShadow | ||
|
|
||
| ;;;=========================================================================;;; | ||
|
|
||
| .SEGMENT "PRGC_Shadow" | ||
|
|
||
| .EXPORT DataC_Shadow_Descent_sRoom | ||
| .PROC DataC_Shadow_Descent_sRoom | ||
| D_STRUCT sRoom | ||
| d_byte MinScrollX_u8, $10 | ||
| d_word MaxScrollX_u16, $0010 | ||
| d_byte Flags_bRoom, bRoom::Tall | eArea::Shadow | ||
| d_byte MinimapStartRow_u8, 13 | ||
| d_byte MinimapStartCol_u8, 4 | ||
| d_addr TerrainData_ptr, _TerrainData | ||
| d_byte NumMachines_u8, 0 | ||
| d_addr Machines_sMachine_arr_ptr, 0 | ||
| d_byte Chr18Bank_u8, <.bank(Ppu_ChrObjShadow) | ||
| d_addr Ext_sRoomExt_ptr, _Ext_sRoomExt | ||
| D_END | ||
| _Ext_sRoomExt: | ||
| D_STRUCT sRoomExt | ||
| d_addr Terrain_sTileset_ptr, DataA_Room_Shadow_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_FadeInTallRoomWithLava | ||
| d_addr Tick_func_ptr, Func_Noop | ||
| d_addr Draw_func_ptr, FuncA_Objects_AnimateLavaTerrain | ||
| D_END | ||
| _TerrainData: | ||
| : .incbin "out/rooms/shadow_descent.room" | ||
| .assert * - :- = 18 * 24, error | ||
| _Platforms_sPlatform_arr: | ||
| : ;; Lava: | ||
| D_STRUCT sPlatform | ||
| d_byte Type_ePlatform, ePlatform::Kill | ||
| d_word WidthPx_u16, $120 | ||
| d_byte HeightPx_u8, kLavaPlatformHeightPx | ||
| d_word Left_i16, $0000 | ||
| d_word Top_i16, kLavaPlatformTopTallRoom | ||
| D_END | ||
| .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error | ||
| .byte ePlatform::None | ||
| _Actors_sActor_arr: | ||
| : ;; TODO | ||
| .assert * - :- <= kMaxActors * .sizeof(sActor), error | ||
| .byte eActor::None | ||
| _Devices_sDevice_arr: | ||
| : ;; TODO | ||
| .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::ShadowFlower | ||
| d_byte SpawnBlock_u8, 5 | ||
| d_byte SpawnAdjust_byte, 0 | ||
| D_END | ||
| D_STRUCT sPassage | ||
| d_byte Exit_bPassage, ePassage::Eastern | 0 | ||
| d_byte Destination_eRoom, eRoom::ShadowDrill | ||
| d_byte SpawnBlock_u8, 5 | ||
| d_byte SpawnAdjust_byte, 0 | ||
| D_END | ||
| D_STRUCT sPassage | ||
| d_byte Exit_bPassage, ePassage::Eastern | 1 | ||
| d_byte Destination_eRoom, eRoom::ShadowDepths | ||
| d_byte SpawnBlock_u8, 20 | ||
| d_byte SpawnAdjust_byte, 0 | ||
| D_END | ||
| .assert * - :- <= kMaxPassages * .sizeof(sPassage), error | ||
| .ENDPROC | ||
|
|
||
| ;;;=========================================================================;;; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| @BG 0 0 0 18x24 | ||
| >shadow_0 | ||
| >shadow_1 | ||
| >shadow_2 | ||
| >shadow_3 | ||
| >shadow_4 | ||
| >shadow_5 | ||
|
|
||
| EOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEO | ||
| EOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEO | ||
| EOEO EOEO | ||
| EOEO EOEO | ||
|
|
||
|
|
||
| EOEOEO EOEOEO | ||
| EOEO EOEO | ||
| EOEO EOEOEOEOEOEOEOEO EOEO | ||
| EOEO EOEO | ||
| EOEOEO EOEOEO | ||
| EOEO EOEO | ||
| EOEO EOEOEOEOEOEO EOEO | ||
| EOEO EOEO | ||
| EOEOEO EOEOEO | ||
| EOEO EOEO | ||
| EOEO EOEOEOEO EOEO | ||
| EOEO EOEO | ||
| EOEOEO EOEOEO | ||
| EOEO | ||
| EOEO EOEOEOEO | ||
| EOEOEOEO EOEOEOEO EOEOEOEO | ||
| ALALALALALALALALALALALALALALALALALAL | ||
| ALALALALALALALALALALALALALALALALALAL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| ;;;=========================================================================;;; | ||
| ;;; Copyright 2022 Matthew D. Steele <[email protected]> ;;; | ||
| ;;; ;;; | ||
| ;;; 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 <http://www.gnu.org/licenses/>. ;;; | ||
| ;;;=========================================================================;;; | ||
|
|
||
| .INCLUDE "../actor.inc" | ||
| .INCLUDE "../device.inc" | ||
| .INCLUDE "../macros.inc" | ||
| .INCLUDE "../platform.inc" | ||
| .INCLUDE "../room.inc" | ||
|
|
||
| .IMPORT DataA_Room_Shadow_sTileset | ||
| .IMPORT Func_Noop | ||
| .IMPORT Ppu_ChrObjShadow | ||
|
|
||
| ;;;=========================================================================;;; | ||
|
|
||
| .SEGMENT "PRGC_Shadow" | ||
|
|
||
| .EXPORT DataC_Shadow_Flower_sRoom | ||
| .PROC DataC_Shadow_Flower_sRoom | ||
| D_STRUCT sRoom | ||
| d_byte MinScrollX_u8, $00 | ||
| d_word MaxScrollX_u16, $0000 | ||
| d_byte Flags_bRoom, eArea::Shadow | ||
| d_byte MinimapStartRow_u8, 13 | ||
| d_byte MinimapStartCol_u8, 3 | ||
| d_addr TerrainData_ptr, _TerrainData | ||
| d_byte NumMachines_u8, 0 | ||
| d_addr Machines_sMachine_arr_ptr, 0 | ||
| d_byte Chr18Bank_u8, <.bank(Ppu_ChrObjShadow) | ||
| d_addr Ext_sRoomExt_ptr, _Ext_sRoomExt | ||
| D_END | ||
| _Ext_sRoomExt: | ||
| D_STRUCT sRoomExt | ||
| d_addr Terrain_sTileset_ptr, DataA_Room_Shadow_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, Func_Noop | ||
| d_addr Tick_func_ptr, Func_Noop | ||
| d_addr Draw_func_ptr, Func_Noop | ||
| D_END | ||
| _TerrainData: | ||
| : .incbin "out/rooms/shadow_flower.room" | ||
| .assert * - :- = 17 * 15, error | ||
| _Platforms_sPlatform_arr: | ||
| : ;; TODO | ||
| .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error | ||
| .byte ePlatform::None | ||
| _Actors_sActor_arr: | ||
| : ;; TODO | ||
| .assert * - :- <= kMaxActors * .sizeof(sActor), error | ||
| .byte eActor::None | ||
| _Devices_sDevice_arr: | ||
| : ;; TODO | ||
| .assert * - :- <= kMaxDevices * .sizeof(sDevice), error | ||
| .byte eDevice::None | ||
| _Passages_sPassage_arr: | ||
| : D_STRUCT sPassage | ||
| d_byte Exit_bPassage, ePassage::Eastern | 0 | ||
| d_byte Destination_eRoom, eRoom::ShadowDescent | ||
| d_byte SpawnBlock_u8, 5 | ||
| d_byte SpawnAdjust_byte, 0 | ||
| D_END | ||
| .assert * - :- <= kMaxPassages * .sizeof(sPassage), error | ||
| .ENDPROC | ||
|
|
||
| ;;;=========================================================================;;; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| @BG 0 0 0 17x15 | ||
| >shadow_0 | ||
| >shadow_1 | ||
| >shadow_2 | ||
| >shadow_3 | ||
| >shadow_4 | ||
| >shadow_5 | ||
|
|
||
| EOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEO | ||
| EOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEO | ||
| EO EOEO | ||
| EO EOEO | ||
| EO | ||
| EO | ||
| EO EOEOEO | ||
| EO EOEO | ||
| EO EOEO EOEO | ||
| EO EOEO | ||
| EO EOEOEO | ||
| EO EOEO | ||
| EOEOEOEO EOEOEOEO | ||
| EOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEO | ||
| EOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEOEO |
Oops, something went wrong.