Skip to content

Commit

Permalink
Add more papers
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdsteele
mdsteele committed Aug 18, 2024
1 parent c41e9c2 commit a54250f
Show file tree
Hide file tree
Showing 11 changed files with 185 additions and 19 deletions.
8 changes: 8 additions & 0 deletions src/dialog.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
.IMPORT DataA_Dialog_PaperJerome02_sDialog
.IMPORT DataA_Dialog_PaperJerome03_sDialog
.IMPORT DataA_Dialog_PaperJerome04_sDialog
.IMPORT DataA_Dialog_PaperJerome05_sDialog
.IMPORT DataA_Dialog_PaperJerome07_sDialog
.IMPORT DataA_Dialog_PaperJerome08_sDialog
.IMPORT DataA_Dialog_PaperJerome09_sDialog
Expand All @@ -95,11 +96,14 @@
.IMPORT DataA_Dialog_PaperJerome13_sDialog
.IMPORT DataA_Dialog_PaperJerome14_sDialog
.IMPORT DataA_Dialog_PaperJerome15_sDialog
.IMPORT DataA_Dialog_PaperJerome18_sDialog
.IMPORT DataA_Dialog_PaperJerome19_sDialog
.IMPORT DataA_Dialog_PaperJerome20_sDialog
.IMPORT DataA_Dialog_PaperJerome21_sDialog
.IMPORT DataA_Dialog_PaperJerome23_sDialog
.IMPORT DataA_Dialog_PaperJerome27_sDialog
.IMPORT DataA_Dialog_PaperJerome28_sDialog
.IMPORT DataA_Dialog_PaperJerome31_sDialog
.IMPORT DataA_Dialog_PaperJerome34_sDialog
.IMPORT DataA_Dialog_PaperJerome35_sDialog
.IMPORT DataA_Dialog_PaperJerome36_sDialog
Expand Down Expand Up @@ -507,6 +511,7 @@ _Finish:
d_entry t, PaperJerome02, DataA_Dialog_PaperJerome02_sDialog
d_entry t, PaperJerome03, DataA_Dialog_PaperJerome03_sDialog
d_entry t, PaperJerome04, DataA_Dialog_PaperJerome04_sDialog
d_entry t, PaperJerome05, DataA_Dialog_PaperJerome05_sDialog
d_entry t, PaperJerome07, DataA_Dialog_PaperJerome07_sDialog
d_entry t, PaperJerome08, DataA_Dialog_PaperJerome08_sDialog
d_entry t, PaperJerome09, DataA_Dialog_PaperJerome09_sDialog
Expand All @@ -516,11 +521,14 @@ _Finish:
d_entry t, PaperJerome13, DataA_Dialog_PaperJerome13_sDialog
d_entry t, PaperJerome14, DataA_Dialog_PaperJerome14_sDialog
d_entry t, PaperJerome15, DataA_Dialog_PaperJerome15_sDialog
d_entry t, PaperJerome18, DataA_Dialog_PaperJerome18_sDialog
d_entry t, PaperJerome19, DataA_Dialog_PaperJerome19_sDialog
d_entry t, PaperJerome20, DataA_Dialog_PaperJerome20_sDialog
d_entry t, PaperJerome21, DataA_Dialog_PaperJerome21_sDialog
d_entry t, PaperJerome23, DataA_Dialog_PaperJerome23_sDialog
d_entry t, PaperJerome27, DataA_Dialog_PaperJerome27_sDialog
d_entry t, PaperJerome28, DataA_Dialog_PaperJerome28_sDialog
d_entry t, PaperJerome31, DataA_Dialog_PaperJerome31_sDialog
d_entry t, PaperJerome34, DataA_Dialog_PaperJerome34_sDialog
d_entry t, PaperJerome35, DataA_Dialog_PaperJerome35_sDialog
d_entry t, PaperJerome36, DataA_Dialog_PaperJerome36_sDialog
Expand Down
4 changes: 4 additions & 0 deletions src/dialog.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ kDialogEntryCutscene = $ff ; ends the dialog and starts a new cutscene
PaperJerome02
PaperJerome03
PaperJerome04
PaperJerome05
PaperJerome07
PaperJerome08
PaperJerome09
Expand All @@ -173,11 +174,14 @@ kDialogEntryCutscene = $ff ; ends the dialog and starts a new cutscene
PaperJerome13
PaperJerome14
PaperJerome15
PaperJerome18
PaperJerome19
PaperJerome20
PaperJerome21
PaperJerome23
PaperJerome27
PaperJerome28
PaperJerome31
PaperJerome34
PaperJerome35
PaperJerome36
Expand Down
4 changes: 4 additions & 0 deletions src/newgame.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ _SetFlags:
.byte eFlag::FlowerFactory
.byte eFlag::CoreSouthCorraWaiting
.byte eFlag::PaperManual4
.byte eFlag::PaperJerome18
.byte eFlag::CoreSouthCorraHelped
.byte eFlag::PrisonEastEastGateOpen
.byte eFlag::PrisonEastLowerGateShut
Expand All @@ -273,6 +274,7 @@ _SetFlags:
.byte eFlag::PrisonCellGateOpen
.byte eFlag::FlowerPrison
.byte eFlag::MermaidHut1AlexPetition
.byte eFlag::PaperJerome31
.byte eFlag::FlowerCore
.byte eFlag::TempleNaveAlexWaiting
.byte eFlag::TempleNaveTalkedToAlex
Expand Down Expand Up @@ -310,6 +312,7 @@ _SetFlags:
.byte eFlag::BossMine
.byte eFlag::UpgradeRam4
.byte eFlag::BreakerMine
.byte eFlag::PaperJerome19
.byte eFlag::UpgradeOpAddSub
.byte eFlag::FactoryPassLoweredRocks
.byte eFlag::FactoryElevatorTalkedToBruno
Expand All @@ -318,6 +321,7 @@ _SetFlags:
.byte eFlag::FactoryVaultTalkedToAlex
.byte eFlag::FactoryEastCorraHelped
.byte eFlag::FlowerLava
.byte eFlag::PaperJerome05
.byte eFlag::PaperJerome03
.byte eFlag::FlowerSewer
.byte eFlag::CityCenterEnteredCity
Expand Down
16 changes: 8 additions & 8 deletions src/paper.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
d_byte eFlag::PaperJerome02, eDialog::PaperJerome02
d_byte eFlag::PaperJerome03, eDialog::PaperJerome03
d_byte eFlag::PaperJerome04, eDialog::PaperJerome04
d_byte eFlag::PaperJerome05, 0 ; TODO
d_byte eFlag::PaperJerome05, eDialog::PaperJerome05
d_byte eFlag::PaperJerome06, 0 ; TODO
d_byte eFlag::PaperJerome07, eDialog::PaperJerome07
d_byte eFlag::PaperJerome08, eDialog::PaperJerome08
Expand All @@ -204,8 +204,8 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
d_byte eFlag::PaperJerome15, eDialog::PaperJerome15
d_byte eFlag::PaperJerome16, 0 ; TODO
d_byte eFlag::PaperJerome17, 0 ; TODO
d_byte eFlag::PaperJerome18, 0 ; TODO
d_byte eFlag::PaperJerome19, 0 ; TODO
d_byte eFlag::PaperJerome18, eDialog::PaperJerome18
d_byte eFlag::PaperJerome19, eDialog::PaperJerome19
d_byte eFlag::PaperJerome20, eDialog::PaperJerome20
d_byte eFlag::PaperJerome21, eDialog::PaperJerome21
d_byte eFlag::PaperJerome22, 0 ; TODO
Expand All @@ -217,7 +217,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
d_byte eFlag::PaperJerome28, eDialog::PaperJerome28
d_byte eFlag::PaperJerome29, 0 ; TODO
d_byte eFlag::PaperJerome30, 0 ; TODO
d_byte eFlag::PaperJerome31, 0 ; TODO
d_byte eFlag::PaperJerome31, eDialog::PaperJerome31
d_byte eFlag::PaperJerome32, 0 ; TODO
d_byte eFlag::PaperJerome33, 0 ; TODO
d_byte eFlag::PaperJerome34, eDialog::PaperJerome34
Expand All @@ -243,7 +243,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
d_byte eFlag::PaperJerome02, eArea::Shadow ; room: ShadowHall
d_byte eFlag::PaperJerome03, eArea::Sewer ; room: SewerPipe
d_byte eFlag::PaperJerome04, eArea::Shadow ; room: ShadowHeart
d_byte eFlag::PaperJerome05, $ff ; TODO
d_byte eFlag::PaperJerome05, eArea::Sewer ; room: SewerWest
d_byte eFlag::PaperJerome06, $ff ; TODO
d_byte eFlag::PaperJerome07, eArea::Factory ; room: FactoryBridge
d_byte eFlag::PaperJerome08, eArea::Crypt ; room: CryptCenter
Expand All @@ -256,8 +256,8 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
d_byte eFlag::PaperJerome15, eArea::Prison ; room: PrisonLower
d_byte eFlag::PaperJerome16, $ff ; TODO
d_byte eFlag::PaperJerome17, $ff ; TODO
d_byte eFlag::PaperJerome18, $ff ; TODO
d_byte eFlag::PaperJerome19, $ff ; TODO
d_byte eFlag::PaperJerome18, eArea::Factory ; room: FactoryWest
d_byte eFlag::PaperJerome19, eArea::Sewer ; room: SewerBasin
d_byte eFlag::PaperJerome20, eArea::Shadow ; room: ShadowDescent
d_byte eFlag::PaperJerome21, eArea::Crypt ; room: CryptEscape
d_byte eFlag::PaperJerome22, $ff ; TODO
Expand All @@ -269,7 +269,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
d_byte eFlag::PaperJerome28, eArea::Temple ; room: TempleChevet
d_byte eFlag::PaperJerome29, $ff ; TODO
d_byte eFlag::PaperJerome30, $ff ; TODO
d_byte eFlag::PaperJerome31, $ff ; TODO
d_byte eFlag::PaperJerome31, eArea::Core ; room: CoreFlower
d_byte eFlag::PaperJerome32, $ff ; TODO
d_byte eFlag::PaperJerome33, $ff ; TODO
d_byte eFlag::PaperJerome34, eArea::Temple ; room: TemplePit
Expand Down
37 changes: 37 additions & 0 deletions src/rooms/core_flower.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
;;;=========================================================================;;;

.INCLUDE "../actor.inc"
.INCLUDE "../charmap.inc"
.INCLUDE "../device.inc"
.INCLUDE "../devices/flower.inc"
.INCLUDE "../dialog.inc"
.INCLUDE "../flag.inc"
.INCLUDE "../macros.inc"
.INCLUDE "../oam.inc"
Expand Down Expand Up @@ -114,6 +116,12 @@ _Devices_sDevice_arr:
d_byte BlockCol_u8, 14
d_byte Target_byte, eFlag::FlowerCore
D_END
D_STRUCT sDevice
d_byte Type_eDevice, eDevice::Paper
d_byte BlockRow_u8, 19
d_byte BlockCol_u8, 3
d_byte Target_byte, eFlag::PaperJerome31
D_END
.assert * - :- <= kMaxDevices * .sizeof(sDevice), error
.byte eDevice::None
_Passages_sPassage_arr:
Expand All @@ -138,3 +146,32 @@ _Passages_sPassage_arr:
.ENDPROC

;;;=========================================================================;;;

.SEGMENT "PRGA_Dialog"

.EXPORT DataA_Dialog_PaperJerome31_sDialog
.PROC DataA_Dialog_PaperJerome31_sDialog
dlg_Text Paper, DataA_Text3_PaperJerome31_Page1_u8_arr
dlg_Text Paper, DataA_Text3_PaperJerome31_Page2_u8_arr
dlg_Done
.ENDPROC

;;;=========================================================================;;;

.SEGMENT "PRGA_Text3"

.PROC DataA_Text3_PaperJerome31_Page1_u8_arr
.byte "Day 31: Despite how we$"
.byte "chose to use all our$"
.byte "technology, it needn't$"
.byte "have gone that way.#"
.ENDPROC

.PROC DataA_Text3_PaperJerome31_Page2_u8_arr
.byte "The complex core and$"
.byte "all these machines$"
.byte "could one day be put$"
.byte "to a different use.#"
.ENDPROC

;;;=========================================================================;;;
32 changes: 30 additions & 2 deletions src/rooms/factory_west.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
.INCLUDE "../actor.inc"
.INCLUDE "../charmap.inc"
.INCLUDE "../device.inc"
.INCLUDE "../dialog.inc"
.INCLUDE "../flag.inc"
.INCLUDE "../machine.inc"
.INCLUDE "../machines/crane.inc"
Expand Down Expand Up @@ -164,10 +165,10 @@ _Devices_sDevice_arr:
d_byte Target_byte, kCraneMachineIndex
D_END
D_STRUCT sDevice
d_byte Type_eDevice, eDevice::Placeholder ; TODO: Paper
d_byte Type_eDevice, eDevice::Paper
d_byte BlockRow_u8, 3
d_byte BlockCol_u8, 2
d_byte Target_byte, 0 ; TODO: eFlag::Paper???
d_byte Target_byte, eFlag::PaperJerome18
D_END
.assert * - :- <= kMaxDevices * .sizeof(sDevice), error
.byte eDevice::None
Expand Down Expand Up @@ -257,3 +258,30 @@ _ReadZ:
.ENDPROC

;;;=========================================================================;;;

.SEGMENT "PRGA_Dialog"

.EXPORT DataA_Dialog_PaperJerome18_sDialog
.PROC DataA_Dialog_PaperJerome18_sDialog
dlg_Text Paper, DataA_Text3_PaperJerome18_Page1_u8_arr
dlg_Text Paper, DataA_Text3_PaperJerome18_Page2_u8_arr
dlg_Done
.ENDPROC

;;;=========================================================================;;;

.SEGMENT "PRGA_Text3"

.PROC DataA_Text3_PaperJerome18_Page1_u8_arr
.byte "Day 18: We developed$"
.byte "artificial minds so$"
.byte "smart, they could have$"
.byte "ruled us. Enslaved us.#"
.ENDPROC

.PROC DataA_Text3_PaperJerome18_Page2_u8_arr
.byte "But it turned out that$"
.byte "they didn't want to.#"
.ENDPROC

;;;=========================================================================;;;
6 changes: 6 additions & 0 deletions src/rooms/mermaid_elevator.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@ _Devices_sDevice_arr:
d_byte BlockCol_u8, 7
d_byte Target_byte, sElevatorState::LowerJetLowerLever_u8
D_END
D_STRUCT sDevice
d_byte Type_eDevice, eDevice::Placeholder ; TODO: Paper
d_byte BlockRow_u8, 4
d_byte BlockCol_u8, 11
d_byte Target_byte, 0 ; TODO: eFlag::Paper???
D_END
.assert * - :- <= kMaxDevices * .sizeof(sDevice), error
.byte eDevice::None
_Passages_sPassage_arr:
Expand Down
8 changes: 4 additions & 4 deletions src/rooms/mermaid_elevator.bg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

DN DM
DN DM
DN DM
DN DM
DN DM
DN DM
DI DG
DN DM
DN DM
DNDP DPDM
DN DM
DN DM
DN DM
Expand Down
36 changes: 36 additions & 0 deletions src/rooms/sewer_basin.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.INCLUDE "../actors/jelly.inc"
.INCLUDE "../charmap.inc"
.INCLUDE "../device.inc"
.INCLUDE "../dialog.inc"
.INCLUDE "../flag.inc"
.INCLUDE "../machine.inc"
.INCLUDE "../machines/multiplexer.inc"
Expand Down Expand Up @@ -230,6 +231,12 @@ _Devices_sDevice_arr:
d_byte BlockCol_u8, 26
d_byte Target_byte, kMultiplexerMachineIndex
D_END
D_STRUCT sDevice
d_byte Type_eDevice, eDevice::Paper
d_byte BlockRow_u8, 2
d_byte BlockCol_u8, 16
d_byte Target_byte, eFlag::PaperJerome19
D_END
.assert * - :- <= kMaxDevices * .sizeof(sDevice), error
.byte eDevice::None
_Passages_sPassage_arr:
Expand Down Expand Up @@ -363,3 +370,32 @@ _Finish:
.ENDPROC

;;;=========================================================================;;;

.SEGMENT "PRGA_Dialog"

.EXPORT DataA_Dialog_PaperJerome19_sDialog
.PROC DataA_Dialog_PaperJerome19_sDialog
dlg_Text Paper, DataA_Text3_PaperJerome19_Page1_u8_arr
dlg_Text Paper, DataA_Text3_PaperJerome19_Page2_u8_arr
dlg_Done
.ENDPROC

;;;=========================================================================;;;

.SEGMENT "PRGA_Text3"

.PROC DataA_Text3_PaperJerome19_Page1_u8_arr
.byte "Day 19: We sought$"
.byte "better life through$"
.byte "chemistry. We spewed$"
.byte "substances recklessly.#"
.ENDPROC

.PROC DataA_Text3_PaperJerome19_Page2_u8_arr
.byte "And yet, we eventually$"
.byte "got most of it cleaned$"
.byte "up. Enough of it,$"
.byte "anyway.#"
.ENDPROC

;;;=========================================================================;;;
10 changes: 5 additions & 5 deletions src/rooms/sewer_basin.bg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
>sewer_5

ECECECECECEB CC EAECECECECECECECECECECECECECECECECECECECECECECEC
ECECECEB CGCECDCFCH BBBC EA
ECECECEB CIEAECEBCJ CB BF EAECECECEB EA
CIBFBFBGCJ CC EAECEB BFBFBABC EA
CI CJ EAEBCC BFBCBG CB EAEC
CI CJ BFBCCC AE CC AB BIEA
ECECECEB CGCECDCFCHBFEDBC BBBC EA
ECECECEB CIEAECEBCJ ED CB BF EAECECECEB EA
CIBFBFBGCJ ED CC EAECEB BFBFBABC EA
CI CJ ED CC BFBCBG CB EAEC
CI CJ CC AE CC AB BIEA
ECECECEB CI CJ CC EAEB AE CC EAECECECECECECEC
ECECEBBC CI CJEDCGCECDCH EAEBBPBKBPBKBLBPBPEAEBBC BFEA
ECECEB EDCI CJBGCIEAEBCJ EAEB AE AE EAEB EA
Expand Down
Loading

0 comments on commit a54250f

Please sign in to comment.