Add PaperJerome16 to CityBuilding6 room

mdsteele · Sep 5, 2024 · b519df8 · b519df8
1 parent 2bb93f0
commit b519df8
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 2 deletions.
diff --git a/src/dialog.asm b/src/dialog.asm
@@ -97,6 +97,7 @@
 .IMPORT DataA_Dialog_PaperJerome13_sDialog
 .IMPORT DataA_Dialog_PaperJerome14_sDialog
 .IMPORT DataA_Dialog_PaperJerome15_sDialog
+.IMPORT DataA_Dialog_PaperJerome16_sDialog
 .IMPORT DataA_Dialog_PaperJerome18_sDialog
 .IMPORT DataA_Dialog_PaperJerome19_sDialog
 .IMPORT DataA_Dialog_PaperJerome20_sDialog
@@ -512,6 +513,7 @@ _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, PaperJerome16,        DataA_Dialog_PaperJerome16_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

diff --git a/src/dialog.inc b/src/dialog.inc
@@ -175,6 +175,7 @@ kDialogEntryCutscene = $ff  ; ends the dialog and starts a new cutscene
     PaperJerome13
     PaperJerome14
     PaperJerome15
+    PaperJerome16
     PaperJerome18
     PaperJerome19
     PaperJerome20

diff --git a/src/newgame.asm b/src/newgame.asm
@@ -329,6 +329,7 @@ _SetFlags:
     .byte eFlag::PaperJerome03  ; room: SewerPipe
     .byte eFlag::FlowerSewer
     .byte eFlag::CityCenterEnteredCity
+    .byte eFlag::PaperJerome16  ; room: CityBuilding6
     .byte eFlag::CityOutskirtsBlastedRocks
     .byte eFlag::CityCenterKeygenConnected
     .byte eFlag::PaperJerome35  ; room: CityDump

diff --git a/src/paper.asm b/src/paper.asm
@@ -62,6 +62,8 @@
 .IMPORT DataA_Text2_PaperJerome14_Page2_u8_arr
 .IMPORT DataA_Text2_PaperJerome15_Page1_u8_arr
 .IMPORT DataA_Text2_PaperJerome15_Page2_u8_arr
+.IMPORT DataA_Text2_PaperJerome16_Page1_u8_arr
+.IMPORT DataA_Text2_PaperJerome16_Page2_u8_arr
 .IMPORT DataA_Text2_PaperJerome18_Page1_u8_arr
 .IMPORT DataA_Text2_PaperJerome18_Page2_u8_arr
 .IMPORT DataA_Text2_PaperJerome19_Page1_u8_arr
@@ -284,7 +286,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
     d_byte eFlag::PaperJerome13, eDialog::PaperJerome13
     d_byte eFlag::PaperJerome14, eDialog::PaperJerome14
     d_byte eFlag::PaperJerome15, eDialog::PaperJerome15
-    d_byte eFlag::PaperJerome16, 0  ; TODO
+    d_byte eFlag::PaperJerome16, eDialog::PaperJerome16
     d_byte eFlag::PaperJerome17, 0  ; TODO
     d_byte eFlag::PaperJerome18, eDialog::PaperJerome18
     d_byte eFlag::PaperJerome19, eDialog::PaperJerome19
@@ -336,7 +338,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
     d_byte eFlag::PaperJerome13, eArea::Garden   ; room: GardenLanding
     d_byte eFlag::PaperJerome14, eArea::Garden   ; room: GardenFlower
     d_byte eFlag::PaperJerome15, eArea::Prison   ; room: PrisonLower
-    d_byte eFlag::PaperJerome16, $ff  ; TODO
+    d_byte eFlag::PaperJerome16, eArea::City     ; room: CityBuilding6
     d_byte eFlag::PaperJerome17, $ff  ; TODO
     d_byte eFlag::PaperJerome18, eArea::Factory  ; room: FactoryWest
     d_byte eFlag::PaperJerome19, eArea::Sewer    ; room: SewerBasin
@@ -803,6 +805,13 @@ _Right:
     dlg_Done
 .ENDPROC
 
+.EXPORT DataA_Dialog_PaperJerome16_sDialog
+.PROC DataA_Dialog_PaperJerome16_sDialog
+    dlg_Text Paper, DataA_Text2_PaperJerome16_Page1_u8_arr
+    dlg_Text Paper, DataA_Text2_PaperJerome16_Page2_u8_arr
+    dlg_Done
+.ENDPROC
+
 .EXPORT DataA_Dialog_PaperJerome18_sDialog
 .PROC DataA_Dialog_PaperJerome18_sDialog
     dlg_Text Paper, DataA_Text2_PaperJerome18_Page1_u8_arr

diff --git a/src/rooms/city_building6.asm b/src/rooms/city_building6.asm
@@ -121,6 +121,12 @@ _Devices_sDevice_arr:
     d_byte Target_byte, eDialog::CityBuilding6Screen
     D_END
     D_STRUCT sDevice
+    d_byte Type_eDevice, eDevice::Paper
+    d_byte BlockRow_u8, 11
+    d_byte BlockCol_u8, 5
+    d_byte Target_byte, eFlag::PaperJerome16
+    D_END
+    D_STRUCT sDevice
     d_byte Type_eDevice, eDevice::Mousehole
     d_byte BlockRow_u8, 3
     d_byte BlockCol_u8, 12

diff --git a/src/text/text2.txt b/src/text/text2.txt
@@ -186,6 +186,15 @@ seemed likely, but
 oddly, none of the
 likely causes arose.#
 
+@PaperJerome16_Page1
+Day 16: Some thought
+our technology would
+destroy us. They were
+mostly wrong.#
+
+@PaperJerome16_Page2
+But only mostly.#
+
 @PaperJerome18_Page1
 Day 18: We developed
 artificial minds so