From 42faaa2bc5ded2b5297aa0f536c68c7f43844ba2 Mon Sep 17 00:00:00 2001 From: "Matthew D. Steele" Date: Tue, 3 Sep 2024 21:02:31 -0400 Subject: [PATCH] Add PaperJerome29 to MermaidElevator room --- src/dialog.asm | 2 ++ src/dialog.inc | 1 + src/newgame.asm | 9 +++++---- src/paper.asm | 13 +++++++++++-- src/rooms/mermaid_elevator.asm | 4 ++-- src/text/text2.txt | 12 ++++++++++++ 6 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/dialog.asm b/src/dialog.asm index af0cc33c..cacbdb54 100644 --- a/src/dialog.asm +++ b/src/dialog.asm @@ -104,6 +104,7 @@ .IMPORT DataA_Dialog_PaperJerome23_sDialog .IMPORT DataA_Dialog_PaperJerome27_sDialog .IMPORT DataA_Dialog_PaperJerome28_sDialog +.IMPORT DataA_Dialog_PaperJerome29_sDialog .IMPORT DataA_Dialog_PaperJerome31_sDialog .IMPORT DataA_Dialog_PaperJerome32_sDialog .IMPORT DataA_Dialog_PaperJerome34_sDialog @@ -516,6 +517,7 @@ _Finish: 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, PaperJerome29, DataA_Dialog_PaperJerome29_sDialog d_entry t, PaperJerome31, DataA_Dialog_PaperJerome31_sDialog d_entry t, PaperJerome32, DataA_Dialog_PaperJerome32_sDialog d_entry t, PaperJerome34, DataA_Dialog_PaperJerome34_sDialog diff --git a/src/dialog.inc b/src/dialog.inc index de76988b..79b9332a 100644 --- a/src/dialog.inc +++ b/src/dialog.inc @@ -182,6 +182,7 @@ kDialogEntryCutscene = $ff ; ends the dialog and starts a new cutscene PaperJerome23 PaperJerome27 PaperJerome28 + PaperJerome29 PaperJerome31 PaperJerome32 PaperJerome34 diff --git a/src/newgame.asm b/src/newgame.asm index 60c006cd..9ee68166 100644 --- a/src/newgame.asm +++ b/src/newgame.asm @@ -234,14 +234,14 @@ _SetFlags: .byte eFlag::GardenLandingDroppedIn .byte eFlag::PaperJerome13 .byte eFlag::UpgradeOpIf - .byte eFlag::PaperManual6 + .byte eFlag::PaperManual3 .byte eFlag::PaperJerome12 .byte eFlag::GardenEastTalkedToCorra .byte eFlag::MermaidHut1MetQueen .byte eFlag::MermaidHut4MetFlorist .byte eFlag::GardenTowerCratesPlaced .byte eFlag::FlowerMermaid - .byte eFlag::PaperManual5 + .byte eFlag::PaperManual6 .byte eFlag::GardenTowerWallBroken .byte eFlag::BossGarden .byte eFlag::UpgradeRam1 @@ -257,10 +257,11 @@ _SetFlags: .byte eFlag::UpgradeRam2 .byte eFlag::BreakerTemple .byte eFlag::FlowerTemple + .byte eFlag::PaperJerome29 .byte eFlag::PaperJerome07 .byte eFlag::FlowerFactory + .byte eFlag::PaperManual5 .byte eFlag::CoreSouthCorraWaiting - .byte eFlag::PaperManual4 .byte eFlag::PaperJerome18 .byte eFlag::CoreSouthCorraHelped .byte eFlag::PrisonEastEastGateOpen @@ -300,7 +301,7 @@ _SetFlags: .byte eFlag::MermaidSpringUnplugged .byte eFlag::LavaWestDroppedIn .byte eFlag::UpgradeOpCopy - .byte eFlag::PaperManual3 + .byte eFlag::PaperManual4 .byte eFlag::PaperJerome10 .byte eFlag::LavaCenterChain3Broken .byte eFlag::LavaCenterChain1Broken diff --git a/src/paper.asm b/src/paper.asm index 996aee02..3912197b 100644 --- a/src/paper.asm +++ b/src/paper.asm @@ -76,6 +76,8 @@ .IMPORT DataA_Text2_PaperJerome27_Page3_u8_arr .IMPORT DataA_Text2_PaperJerome28_Page1_u8_arr .IMPORT DataA_Text2_PaperJerome28_Page2_u8_arr +.IMPORT DataA_Text2_PaperJerome29_Page1_u8_arr +.IMPORT DataA_Text2_PaperJerome29_Page2_u8_arr .IMPORT DataA_Text2_PaperJerome31_Page1_u8_arr .IMPORT DataA_Text2_PaperJerome31_Page2_u8_arr .IMPORT DataA_Text2_PaperJerome32_Page1_u8_arr @@ -290,7 +292,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols d_byte eFlag::PaperJerome26, 0 ; TODO d_byte eFlag::PaperJerome27, eDialog::PaperJerome27 d_byte eFlag::PaperJerome28, eDialog::PaperJerome28 - d_byte eFlag::PaperJerome29, 0 ; TODO + d_byte eFlag::PaperJerome29, eDialog::PaperJerome29 d_byte eFlag::PaperJerome30, 0 ; TODO d_byte eFlag::PaperJerome31, eDialog::PaperJerome31 d_byte eFlag::PaperJerome32, eDialog::PaperJerome32 @@ -342,7 +344,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols d_byte eFlag::PaperJerome26, $ff ; TODO d_byte eFlag::PaperJerome27, eArea::Lava ; room: LavaTunnel d_byte eFlag::PaperJerome28, eArea::Temple ; room: TempleChevet - d_byte eFlag::PaperJerome29, $ff ; TODO + d_byte eFlag::PaperJerome29, eArea::Mermaid ; room: MermaidElevator d_byte eFlag::PaperJerome30, $ff ; TODO d_byte eFlag::PaperJerome31, eArea::Core ; room: CoreFlower d_byte eFlag::PaperJerome32, eArea::Shadow ; room: ShadowDepths @@ -845,6 +847,13 @@ _Right: dlg_Done .ENDPROC +.EXPORT DataA_Dialog_PaperJerome29_sDialog +.PROC DataA_Dialog_PaperJerome29_sDialog + dlg_Text Paper, DataA_Text2_PaperJerome29_Page1_u8_arr + dlg_Text Paper, DataA_Text2_PaperJerome29_Page2_u8_arr + dlg_Done +.ENDPROC + .EXPORT DataA_Dialog_PaperJerome31_sDialog .PROC DataA_Dialog_PaperJerome31_sDialog dlg_Text Paper, DataA_Text2_PaperJerome31_Page1_u8_arr diff --git a/src/rooms/mermaid_elevator.asm b/src/rooms/mermaid_elevator.asm index 57870a32..56c0b1b9 100644 --- a/src/rooms/mermaid_elevator.asm +++ b/src/rooms/mermaid_elevator.asm @@ -189,10 +189,10 @@ _Devices_sDevice_arr: d_byte Target_byte, sElevatorState::LowerJetLowerLever_u8 D_END D_STRUCT sDevice - d_byte Type_eDevice, eDevice::Placeholder ; TODO: Paper + d_byte Type_eDevice, eDevice::Paper d_byte BlockRow_u8, 4 d_byte BlockCol_u8, 11 - d_byte Target_byte, 0 ; TODO: eFlag::Paper??? + d_byte Target_byte, eFlag::PaperJerome29 D_END .assert * - :- <= kMaxDevices * .sizeof(sDevice), error .byte eDevice::None diff --git a/src/text/text2.txt b/src/text/text2.txt index 0e0f2b78..0b561432 100644 --- a/src/text/text2.txt +++ b/src/text/text2.txt @@ -264,6 +264,18 @@ why we and they were different in the first place, isn't it?# +@PaperJerome29_Page1 +Day 29: Fearful of +further unrest, we +began to fortify the +temple and the city.# + +@PaperJerome29_Page2 +Of course, this only +further incensed the +mermaids, and they +cut all ties with us.# + @PaperJerome31_Page1 Day 31: Despite how we chose to use all our