Add PaperJerome26 to MineEast room

mdsteele · Sep 5, 2024 · a6d7b0f · a6d7b0f
1 parent 995fb9c
commit a6d7b0f
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/src/dialog.asm b/src/dialog.asm
@@ -106,6 +106,7 @@
 .IMPORT DataA_Dialog_PaperJerome22_sDialog
 .IMPORT DataA_Dialog_PaperJerome23_sDialog
 .IMPORT DataA_Dialog_PaperJerome24_sDialog
+.IMPORT DataA_Dialog_PaperJerome26_sDialog
 .IMPORT DataA_Dialog_PaperJerome27_sDialog
 .IMPORT DataA_Dialog_PaperJerome28_sDialog
 .IMPORT DataA_Dialog_PaperJerome29_sDialog
@@ -526,6 +527,7 @@ _Finish:
     d_entry t, PaperJerome22,        DataA_Dialog_PaperJerome22_sDialog
     d_entry t, PaperJerome23,        DataA_Dialog_PaperJerome23_sDialog
     d_entry t, PaperJerome24,        DataA_Dialog_PaperJerome24_sDialog
+    d_entry t, PaperJerome26,        DataA_Dialog_PaperJerome26_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

diff --git a/src/dialog.inc b/src/dialog.inc
@@ -184,6 +184,7 @@ kDialogEntryCutscene = $ff  ; ends the dialog and starts a new cutscene
     PaperJerome22
     PaperJerome23
     PaperJerome24
+    PaperJerome26
     PaperJerome27
     PaperJerome28
     PaperJerome29

diff --git a/src/newgame.asm b/src/newgame.asm
@@ -312,6 +312,7 @@ _SetFlags:
     .byte eFlag::UpgradeRam3
     .byte eFlag::BreakerLava
     .byte eFlag::UpgradeOpSync
+    .byte eFlag::PaperJerome26  ; room: MineEast
     .byte eFlag::PaperJerome09  ; room: MineNorth
     .byte eFlag::BossMine
     .byte eFlag::UpgradeRam4

diff --git a/src/paper.asm b/src/paper.asm
@@ -79,6 +79,8 @@
 .IMPORT DataA_Text2_PaperJerome23_Page2_u8_arr
 .IMPORT DataA_Text2_PaperJerome24_Page1_u8_arr
 .IMPORT DataA_Text2_PaperJerome24_Page2_u8_arr
+.IMPORT DataA_Text2_PaperJerome26_Page1_u8_arr
+.IMPORT DataA_Text2_PaperJerome26_Page2_u8_arr
 .IMPORT DataA_Text2_PaperJerome27_Page1_u8_arr
 .IMPORT DataA_Text2_PaperJerome27_Page2_u8_arr
 .IMPORT DataA_Text2_PaperJerome27_Page3_u8_arr
@@ -305,7 +307,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
     d_byte eFlag::PaperJerome23, eDialog::PaperJerome23
     d_byte eFlag::PaperJerome24, eDialog::PaperJerome24
     d_byte eFlag::PaperJerome25, 0  ; TODO
-    d_byte eFlag::PaperJerome26, 0  ; TODO
+    d_byte eFlag::PaperJerome26, eDialog::PaperJerome26
     d_byte eFlag::PaperJerome27, eDialog::PaperJerome27
     d_byte eFlag::PaperJerome28, eDialog::PaperJerome28
     d_byte eFlag::PaperJerome29, eDialog::PaperJerome29
@@ -357,7 +359,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
     d_byte eFlag::PaperJerome23, eArea::Core     ; room: CoreLock
     d_byte eFlag::PaperJerome24, eArea::City     ; room: CityBuilding1
     d_byte eFlag::PaperJerome25, $ff  ; TODO
-    d_byte eFlag::PaperJerome26, $ff  ; TODO
+    d_byte eFlag::PaperJerome26, eArea::Mine     ; room: MineEast
     d_byte eFlag::PaperJerome27, eArea::Lava     ; room: LavaTunnel
     d_byte eFlag::PaperJerome28, eArea::Temple   ; room: TempleChevet
     d_byte eFlag::PaperJerome29, eArea::Mermaid  ; room: MermaidElevator
@@ -876,6 +878,13 @@ _Right:
     dlg_Done
 .ENDPROC
 
+.EXPORT DataA_Dialog_PaperJerome26_sDialog
+.PROC DataA_Dialog_PaperJerome26_sDialog
+    dlg_Text Paper, DataA_Text2_PaperJerome26_Page1_u8_arr
+    dlg_Text Paper, DataA_Text2_PaperJerome26_Page2_u8_arr
+    dlg_Done
+.ENDPROC
+
 .EXPORT DataA_Dialog_PaperJerome27_sDialog
 .PROC DataA_Dialog_PaperJerome27_sDialog
     dlg_Text Paper, DataA_Text2_PaperJerome27_Page1_u8_arr

diff --git a/src/rooms/mine_east.asm b/src/rooms/mine_east.asm
@@ -228,7 +228,7 @@ _Platforms_sPlatform_arr:
 _Actors_sActor_arr:
 :   D_STRUCT sActor
     d_byte Type_eActor, eActor::BadFirefly
-    d_word PosX_i16, $00e8
+    d_word PosX_i16, $00e4
     d_word PosY_i16, $00b0
     d_byte Param_byte, (bBadFirefly::ThetaMask & $00) | bBadFirefly::FlipH
     D_END
@@ -247,6 +247,12 @@ _Devices_sDevice_arr:
     d_byte BlockCol_u8, 13
     d_byte Target_byte, kLiftMachineIndex
     D_END
+    D_STRUCT sDevice
+    d_byte Type_eDevice, eDevice::Paper
+    d_byte BlockRow_u8, 9
+    d_byte BlockCol_u8, 15
+    d_byte Target_byte, eFlag::PaperJerome26
+    D_END
     .assert * - :- <= kMaxDevices * .sizeof(sDevice), error
     .byte eDevice::None
 _Passages_sPassage_arr:

diff --git a/src/rooms/mine_east.bg b/src/rooms/mine_east.bg
@@ -17,7 +17,7 @@ GGGEGGGB      EAEB    ECEFEFEFEFEJ
 EMEMEMEH      ECED      CL    ANEG
 EMEMEIEDAN              CP  AP  EG
 EMEPEH                  CL      EG
-EMEMED    AO            CL      EG
+EMEMED    AO            CL    GKEG
 EMEMEH              AN  CN      EG
 EMEMEKGEGDGNGL          CL      EG
 EMEMEMEIED              CLAN    EG

diff --git a/src/text/text2.txt b/src/text/text2.txt
@@ -114,7 +114,7 @@ Honor. Valor. All fine
 qualities.#
 
 @PaperJerome09_Page2
-But I fear they are
+But I regret they are
 fast losing sight of
 what they claim their
 convictions stand for.#
@@ -277,6 +277,18 @@ change humans before
 they aren't remotely
 human anymore?#
 
+@PaperJerome26_Page1
+Day 26: Once their
+frustration with us
+boiled over, the orcs
+attacked.#
+
+@PaperJerome26_Page2
+It was more riot than
+war, but the conflict
+lasted five years. The
+mermaids were no help.#
+
 @PaperJerome27_Page1
 Day 27: By 2250 things
 had settled down a