Add PaperManual8 to CityBuilding3 room

mdsteele · Sep 4, 2024 · 8afd015 · 8afd015
1 parent 42faaa2
commit 8afd015
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/src/dialog.asm b/src/dialog.asm
@@ -116,6 +116,7 @@
 .IMPORT DataA_Dialog_PaperManual4_sDialog
 .IMPORT DataA_Dialog_PaperManual5_sDialog
 .IMPORT DataA_Dialog_PaperManual6_sDialog
+.IMPORT DataA_Dialog_PaperManual8_sDialog
 .IMPORT DataA_Dialog_PaperManual9_sDialog
 .IMPORT DataA_Dialog_PortraitAnimBank_u8_arr
 .IMPORT DataA_Dialog_PortraitFirstTileId_u8_arr
@@ -529,6 +530,7 @@ _Finish:
     d_entry t, PaperManual4,         DataA_Dialog_PaperManual4_sDialog
     d_entry t, PaperManual5,         DataA_Dialog_PaperManual5_sDialog
     d_entry t, PaperManual6,         DataA_Dialog_PaperManual6_sDialog
+    d_entry t, PaperManual8,         DataA_Dialog_PaperManual8_sDialog
     d_entry t, PaperManual9,         DataA_Dialog_PaperManual9_sDialog
     d_entry t, PrisonFlowerSign,     DataA_Dialog_PrisonFlowerSign_sDialog
     d_entry t, PrisonUpperAlexCell,  DataA_Dialog_PrisonUpperAlexCell_sDialog

diff --git a/src/dialog.inc b/src/dialog.inc
@@ -194,6 +194,7 @@ kDialogEntryCutscene = $ff  ; ends the dialog and starts a new cutscene
     PaperManual4
     PaperManual5
     PaperManual6
+    PaperManual8
     PaperManual9
     PrisonFlowerSign
     PrisonUpperAlexCell

diff --git a/src/newgame.asm b/src/newgame.asm
@@ -333,6 +333,7 @@ _SetFlags:
     .byte eFlag::PaperJerome35
     .byte eFlag::FlowerCity
     .byte eFlag::CityBuilding3BlastedCrates
+    .byte eFlag::PaperManual8
     .byte eFlag::CityCenterDoorUnlocked
     .byte eFlag::BossCity
     .byte eFlag::UpgradeBRemote

diff --git a/src/paper.asm b/src/paper.asm
@@ -104,6 +104,8 @@
 .IMPORT DataA_Text2_PaperManual5_Page3_u8_arr
 .IMPORT DataA_Text2_PaperManual6_Page1_u8_arr
 .IMPORT DataA_Text2_PaperManual6_Page2_u8_arr
+.IMPORT DataA_Text2_PaperManual8_Page1_u8_arr
+.IMPORT DataA_Text2_PaperManual8_Page2_u8_arr
 .IMPORT DataA_Text2_PaperManual9_Page1_u8_arr
 .IMPORT DataA_Text2_PaperManual9_Page2_u8_arr
 .IMPORT Data_PowersOfTwo_u8_arr8
@@ -307,7 +309,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
     d_byte eFlag::PaperManual5, eDialog::PaperManual5
     d_byte eFlag::PaperManual6, eDialog::PaperManual6
     d_byte eFlag::PaperManual7, 0  ; TODO
-    d_byte eFlag::PaperManual8, 0  ; TODO
+    d_byte eFlag::PaperManual8, eDialog::PaperManual8
     d_byte eFlag::PaperManual9, eDialog::PaperManual9
     D_END
 .ENDPROC
@@ -359,7 +361,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
     d_byte eFlag::PaperManual5,  eArea::Factory  ; room: FactoryUpper
     d_byte eFlag::PaperManual6,  eArea::Garden   ; room: GardenShaft
     d_byte eFlag::PaperManual7,  $ff  ; TODO
-    d_byte eFlag::PaperManual8,  $ff  ; TODO
+    d_byte eFlag::PaperManual8,  eArea::City     ; room: CityBuilding3
     d_byte eFlag::PaperManual9,  eArea::Temple   ; room: TempleApse
     D_END
 .ENDPROC
@@ -935,6 +937,13 @@ _Right:
     dlg_Done
 .ENDPROC
 
+.EXPORT DataA_Dialog_PaperManual8_sDialog
+.PROC DataA_Dialog_PaperManual8_sDialog
+    dlg_Text Paper, DataA_Text2_PaperManual8_Page1_u8_arr
+    dlg_Text Paper, DataA_Text2_PaperManual8_Page2_u8_arr
+    dlg_Done
+.ENDPROC
+
 .EXPORT DataA_Dialog_PaperManual9_sDialog
 .PROC DataA_Dialog_PaperManual9_sDialog
     dlg_Text Paper, DataA_Text2_PaperManual9_Page1_u8_arr

diff --git a/src/rooms/city_building3.asm b/src/rooms/city_building3.asm
@@ -348,6 +348,12 @@ _Devices_sDevice_arr:
     d_byte BlockCol_u8, 11
     d_byte Target_byte, eRoom::CityCenter
     D_END
+    D_STRUCT sDevice
+    d_byte Type_eDevice, eDevice::Paper
+    d_byte BlockRow_u8, 8
+    d_byte BlockCol_u8, 5
+    d_byte Target_byte, eFlag::PaperManual8
+    D_END
     .assert * - :- <= kMaxDevices * .sizeof(sDevice), error
     .byte eDevice::None
 .ENDPROC

diff --git a/src/text/text2.txt b/src/text/text2.txt
@@ -421,6 +421,18 @@ For example:
   :MOVE {kTileIdBgArrowDown}
 or the reverse.#
 
+@PaperManual8_Page1
+CPU FIELD MANUAL p.8:
+Three IFs can combine
+to test that both of
+two conditions hold.#
+
+@PaperManual8_Page2
+e.g. for A{kTileIdBgCmpGe}3 AND A{kTileIdBgCmpLe}7:
+ :IF A{kTileIdBgCmpGe}3
+ :IF A>7
+ :IF 0=1#
+
 @PaperManual9_Page1
 CPU FIELD MANUAL p.9:
 An IF can guard a TIL