Add PaperManual7 to CoreElevator room

mdsteele · Sep 5, 2024 · 52ec89d · 52ec89d
1 parent a6d7b0f
commit 52ec89d
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 6 deletions.
diff --git a/src/dialog.asm b/src/dialog.asm
@@ -123,6 +123,7 @@
 .IMPORT DataA_Dialog_PaperManual4_sDialog
 .IMPORT DataA_Dialog_PaperManual5_sDialog
 .IMPORT DataA_Dialog_PaperManual6_sDialog
+.IMPORT DataA_Dialog_PaperManual7_sDialog
 .IMPORT DataA_Dialog_PaperManual8_sDialog
 .IMPORT DataA_Dialog_PaperManual9_sDialog
 .IMPORT DataA_Dialog_PortraitAnimBank_u8_arr
@@ -544,6 +545,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, PaperManual7,         DataA_Dialog_PaperManual7_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

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

diff --git a/src/newgame.asm b/src/newgame.asm
@@ -294,6 +294,7 @@ _SetFlags:
     .byte eFlag::PaperJerome21  ; room: CryptEscape
     .byte eFlag::TempleEntryTalkedToCorra
     .byte eFlag::FlowerCrypt
+    .byte eFlag::PaperManual7   ; room: CoreElevator
     .byte eFlag::CityOutskirtsTalkedToAlex
     .byte eFlag::UpgradeOpSkip
     .byte eFlag::PaperJerome14  ; room: GardenFlower

diff --git a/src/paper.asm b/src/paper.asm
@@ -120,6 +120,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_PaperManual7_Page1_u8_arr
+.IMPORT DataA_Text2_PaperManual7_Page2_u8_arr
 .IMPORT DataA_Text2_PaperManual8_Page1_u8_arr
 .IMPORT DataA_Text2_PaperManual8_Page2_u8_arr
 .IMPORT DataA_Text2_PaperManual9_Page1_u8_arr
@@ -324,7 +326,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
     d_byte eFlag::PaperManual4, eDialog::PaperManual4
     d_byte eFlag::PaperManual5, eDialog::PaperManual5
     d_byte eFlag::PaperManual6, eDialog::PaperManual6
-    d_byte eFlag::PaperManual7, 0  ; TODO
+    d_byte eFlag::PaperManual7, eDialog::PaperManual7
     d_byte eFlag::PaperManual8, eDialog::PaperManual8
     d_byte eFlag::PaperManual9, eDialog::PaperManual9
     D_END
@@ -376,7 +378,7 @@ Ram_CollectedPapers_u8_arr: .res kPaperGridCols
     d_byte eFlag::PaperManual4,  eArea::Lava     ; room: LavaStation
     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::PaperManual7,  eArea::Core     ; room: CoreElevator
     d_byte eFlag::PaperManual8,  eArea::City     ; room: CityBuilding3
     d_byte eFlag::PaperManual9,  eArea::Temple   ; room: TempleApse
     D_END
@@ -1004,6 +1006,13 @@ _Right:
     dlg_Done
 .ENDPROC
 
+.EXPORT DataA_Dialog_PaperManual7_sDialog
+.PROC DataA_Dialog_PaperManual7_sDialog
+    dlg_Text Paper, DataA_Text2_PaperManual7_Page1_u8_arr
+    dlg_Text Paper, DataA_Text2_PaperManual7_Page2_u8_arr
+    dlg_Done
+.ENDPROC
+
 .EXPORT DataA_Dialog_PaperManual8_sDialog
 .PROC DataA_Dialog_PaperManual8_sDialog
     dlg_Text Paper, DataA_Text2_PaperManual8_Page1_u8_arr

diff --git a/src/rooms/core_elevator.asm b/src/rooms/core_elevator.asm
@@ -166,6 +166,12 @@ _Devices_sDevice_arr:
     d_byte BlockCol_u8, 7
     d_byte Target_byte, sElevatorState::UpperJetUpperLever_u8
     D_END
+    D_STRUCT sDevice
+    d_byte Type_eDevice, eDevice::Paper
+    d_byte BlockRow_u8, 20
+    d_byte BlockCol_u8, 6
+    d_byte Target_byte, eFlag::PaperManual7
+    D_END
     .assert * - :- <= kMaxDevices * .sizeof(sDevice), error
     .byte eDevice::None
 _Passages_sPassage_arr:

diff --git a/src/rooms/core_elevator.bg b/src/rooms/core_elevator.bg
@@ -24,9 +24,9 @@ ADADADADAHADEBADADBP  EN        CFCG
             FP        FA
             FD        FC
             FD        FC
-            FD        FP
-            FP        FB
-            FP        FP
-            FB        FP
+          FFFP        FC
+          FP          FEFC
+          FP            FC
+          FAFB        FPFC
             FD        FC
             FD        FC
diff --git a/src/text/text2.txt b/src/text/text2.txt
@@ -510,6 +510,18 @@ For example:
   :MOVE {kTileIdBgArrowDown}
 or the reverse.#
 
+@PaperManual7_Page1
+CPU FIELD MANUAL p.7:
+Two IFs can combine to
+test that either of
+two conditions hold.#
+
+@PaperManual7_Page2
+e.g. for A=3 OR A=7:
+ :IF A{kTileIdBgCmpNe}3
+ :IF A=7
+ :then this#
+
 @PaperManual8_Page1
 CPU FIELD MANUAL p.8:
 Three IFs can combine
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,9 +24,9 @@ ADADADADAHADEBADADBP EN CFCG @@
                 FP        FA
                 FD        FC
                 FD        FC
-                FD        FP
-                FP        FB
-                FP        FP
-                FB        FP
+              FFFP        FC
+              FP          FEFC
+              FP            FC
+              FAFB        FPFC
                 FD        FC
                 FD        FC