@gaialabs/iog-baserom 0.2.6 → 0.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/baserom/auto-use-items/CellKeysAutoUse.patch.asm +30 -0
- package/baserom/auto-use-items/CrystalBallAutoUse.patch.asm +131 -0
- package/baserom/auto-use-items/DiamondBlockAutoUse.patch.asm +50 -0
- package/baserom/auto-use-items/ElevatorKeyAutoUse.patch.asm +26 -0
- package/baserom/auto-use-items/GorgonFlowerAutoUse.patch.asm +153 -0
- package/baserom/auto-use-items/HieroglyphPuzzle.patch.asm +1187 -0
- package/baserom/auto-use-items/HopeStatueAutoUse.patch.asm +99 -0
- package/baserom/auto-use-items/IncanStatueAutoUse.patch.asm +75 -0
- package/baserom/auto-use-items/ItemUseStub.patch.asm +24 -0
- package/baserom/auto-use-items/MagicPowerAutoUse.patch.asm +55 -0
- package/baserom/auto-use-items/MeatAutoUse.patch.asm +33 -0
- package/baserom/auto-use-items/MushroomDropAutoUse.patch.asm +100 -0
- package/baserom/auto-use-items/PalaceKeyAutoUse.patch.asm +52 -0
- package/baserom/auto-use-items/PrisonKeyAutoUse.patch.asm +84 -0
- package/baserom/auto-use-items/PurificationStoneAutoUse.patch.asm +49 -0
- package/baserom/auto-use-items/RamaStatueAutoUse.patch.asm +100 -0
- package/baserom/auto-use-items/TearpotAutoUse.patch.asm +41 -0
- package/baserom/{spritemaps → boot-logo}/spm_boot_logos.sprite.asm +10 -0
- package/baserom/collectible-system/RelicMenu.patch.asm +250 -0
- package/baserom/collectible-system/key_item_core.asm +445 -0
- package/baserom/{patches → equipped-icon}/EquippedIcon.patch.asm +41 -46
- package/baserom/equipped-icon/ItemSwapping.patch.asm +99 -0
- package/baserom/{palettes → equipped-icon}/pal_item_exprite2.pal +0 -0
- package/baserom/{spritemaps → equipped-icon}/spm_sc02_main_characters.sprite.asm +10 -0
- package/baserom/equipped-icon/spriteset_aura.asm +131 -0
- package/baserom/equipped-icon/spriteset_dark_friar.asm +277 -0
- package/baserom/equipped-icon/spriteset_darkgaia_projectile.asm +233 -0
- package/baserom/fixes-tweaks/BCDHex.patch.asm +60 -0
- package/baserom/fixes-tweaks/HudRedesign.patch.asm +108 -0
- package/baserom/fixes-tweaks/NeilsFatherFix.patch.asm +26 -0
- package/baserom/fixes-tweaks/PyramidPortalExit.patch.asm +41 -0
- package/baserom/fixes-tweaks/SceneTitles.patch.asm +84 -0
- package/baserom/fixes-tweaks/ThankfulFlower.patch.asm +28 -0
- package/baserom/fixes-tweaks/Utils.patch.asm +111 -0
- package/baserom/{spritemaps → fixes-tweaks}/spm_goldship_sprites.sprite.asm +11 -0
- package/baserom/fonts/EnhancedOverworldText.patch.asm +44 -0
- package/baserom/fonts/EnhancedPrologueText.patch.asm +252 -0
- package/baserom/{graphics → fonts}/gfx_fonts.bin +0 -0
- package/baserom/fonts/gfx_overworld_font.bin +0 -0
- package/baserom/inventory/EnhancedSlotActor.patch.asm +50 -0
- package/baserom/inventory/InventoryCounters.patch.asm +407 -0
- package/baserom/inventory/InventoryManagement.patch.asm +390 -0
- package/baserom/kara-run/gfx_castle_sprites.bin +0 -0
- package/baserom/new-game-plus/NGPEpilogueSwitch.patch.asm +52 -0
- package/baserom/{patches → new-game-plus}/NewGamePlus.patch.asm +42 -23
- package/baserom/oakton/map_fr30.map +0 -0
- package/baserom/oakton/map_fr30_effect.map +0 -0
- package/baserom/options-menu/EnhancedInvItemPicker.patch.asm +130 -0
- package/baserom/options-menu/MinimalHudOption.patch.asm +109 -0
- package/baserom/options-menu/OptionsMenu.patch.asm +218 -0
- package/baserom/options-menu/TextSpeedOption.patch.asm +108 -0
- package/baserom/options-menu/options_input_remap.asm +373 -0
- package/baserom/options-menu/options_menu_core.asm +1221 -0
- package/baserom/patches/APUWaitFixes.patch.asm +30 -17
- package/baserom/patches/AccentMap.patch.asm +16 -5
- package/baserom/patches/MusicTransitions.patch.asm +41 -24
- package/baserom/player-input/MergeInputFlags.patch.asm +146 -0
- package/baserom/player-input/PlayerInput.patch.asm +51 -0
- package/baserom/red-jewels/AnnSparkle.patch.asm +28 -0
- package/baserom/red-jewels/ChestFlaggedHiddenRedJewel.patch.asm +50 -0
- package/baserom/red-jewels/FishermanRedJewel.patch.asm +55 -0
- package/baserom/red-jewels/LanceSparkle.patch.asm +38 -0
- package/baserom/red-jewels/RedJewelSparkle.patch.asm +49 -0
- package/baserom/red-jewels/SnakePanicSparkle.patch.asm +45 -0
- package/baserom/red-jewels/SparkleAlways.patch.asm.example +19 -0
- package/baserom/red-jewels/StoneGirlSparkle.patch.asm +26 -0
- package/baserom/red-jewels/TrappedSlaveSparkle.patch.asm +63 -0
- package/baserom/red-jewels/generic_sparkle.asm +57 -0
- package/baserom/run-button/RunButtonCore.patch.asm +89 -0
- package/baserom/run-button/RunButtonOption.patch.asm +50 -0
- package/baserom/{patches/BitmapPatch.patch.asm → scene-load/BitmapLoad.patch.asm} +27 -12
- package/baserom/scene-load/Cop51Decompress.patch.asm +98 -0
- package/baserom/scene-load/ExpriteLoader.patch.asm +82 -0
- package/baserom/scene-load/MapNameLookup.patch.asm +27 -0
- package/baserom/scene-load/MenuBGLoad.patch.asm +70 -0
- package/baserom/scene-load/SFXTable.patch.asm +92 -0
- package/baserom/scene-load/SceneMetaLoad.patch.asm +68 -0
- package/baserom/scene-load/SpritemapLoad.patch.asm +61 -0
- package/baserom/scene-load/TilemapLoad.patch.asm +109 -0
- package/baserom/scene-load/TilesetLoad.patch.asm +41 -0
- package/baserom/set_overworld.set +0 -0
- package/baserom/seths-jewel/SethsJewelGoldShip.patch.asm +22 -0
- package/baserom/seths-jewel/SethsJewelIcon.patch.asm +22 -0
- package/baserom/seths-jewel/SethsJewelItem.patch.asm +62 -0
- package/baserom/seths-jewel/SethsJewelSprites.patch.asm +49 -0
- package/baserom/{patches → sky-delivery}/SouthCapeDeliveryman.patch.asm +12 -3
- package/baserom/sky-delivery/WatermiaDeliveryman.patch.asm +15 -0
- package/dist/index.cjs +10159 -964
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +9 -1
- package/dist/index.d.cts.map +1 -1
- package/dist/index.d.mts +9 -1
- package/dist/index.d.mts.map +1 -1
- package/dist/index.mjs +10161 -967
- package/dist/index.mjs.map +1 -1
- package/package.json +10 -8
- package/baserom/asm/spriteset_aura.asm +0 -122
- package/baserom/asm/spriteset_dark_friar.asm +0 -268
- package/baserom/asm/spriteset_will_projectile.asm +0 -224
- package/baserom/patches/Cop51Patch.patch.asm +0 -81
- package/baserom/patches/DPShop.asm.old +0 -328
- package/baserom/patches/DeathWarp.asm.old +0 -174
- package/baserom/patches/ExpandedHealthBars.old +0 -203
- package/baserom/patches/ExpriteLoader.patch.asm +0 -66
- package/baserom/patches/GemShop.asm.old +0 -345
- package/baserom/patches/InventoryCounters.patch.asm +0 -292
- package/baserom/patches/InventoryManagement.patch.asm +0 -324
- package/baserom/patches/InventoryScript.asm.old +0 -319
- package/baserom/patches/ItemDictionary.asm.old +0 -86
- package/baserom/patches/ItemRewards.asm.old +0 -49
- package/baserom/patches/ItemSwapping.patch.asm +0 -80
- package/baserom/patches/MapNameLookup.patch.asm +0 -13
- package/baserom/patches/MenuBGPatch.patch.asm +0 -54
- package/baserom/patches/NGPEpilogueSwitch.patch.asm +0 -44
- package/baserom/patches/PixelConverter.patch.asm.old +0 -60
- package/baserom/patches/QuickScripts.asm.old +0 -210
- package/baserom/patches/RunButton.patch.asm +0 -79
- package/baserom/patches/SFXTable.patch.asm +0 -73
- package/baserom/patches/SceneLoadPatch.patch.asm +0 -52
- package/baserom/patches/SpritemapPatch.patch.asm +0 -45
- package/baserom/patches/Teleporter.patch.asm.old +0 -203
- package/baserom/patches/TilemapPatch.patch.asm +0 -94
- package/baserom/patches/TilesetPatch.patch.asm +0 -27
- package/baserom/patches/Utils.patch.asm +0 -414
- package/baserom/patches/WatermiaDeliveryman.patch.asm +0 -2
- /package/baserom/{graphics → boot-logo}/gfx_boot_exprite.raw.bin +0 -0
- /package/baserom/{graphics → boot-logo}/gfx_boot_logos.bin +0 -0
- /package/baserom/{palettes → boot-logo}/pal_boot_logos.pal +0 -0
- /package/baserom/{palettes → equipped-icon}/fx_palette_198000.pal +0 -0
- /package/baserom/{graphics → equipped-icon}/gfx_item_exprite.raw.bin +0 -0
- /package/baserom/{graphics → equipped-icon}/misc_fx_1CD580.bin +0 -0
- /package/baserom/{palettes → equipped-icon}/pal_item_exprite.pal +0 -0
- /package/baserom/{palettes → equipped-icon}/pal_sc02_main_characters.pal +0 -0
- /package/baserom/{graphics → fonts}/gfx_credits_font.bin +0 -0
- /package/baserom/{graphics → inventory}/gfx_inventory_sprites.bin +0 -0
|
@@ -0,0 +1,1187 @@
|
|
|
1
|
+
; ==============================================================================
|
|
2
|
+
; Pyramid hieroglyph wall puzzle (pyCD) - interactive rearrangement UI
|
|
3
|
+
; ==============================================================================
|
|
4
|
+
; What it does: Replaces pyCD_puzzle main loop with wall activators and a spawned
|
|
5
|
+
; controller actor: cursor over six alcoves, Up/Down cycles owned hieroglyphs
|
|
6
|
+
; (non-numeric order), Confirm lift/swap mode, success sets flag #D1 and vanilla
|
|
7
|
+
; success dialog. WRAM $0B28 holds slot values ($FFFF empty); $0B5B relic bits.
|
|
8
|
+
; Vanilla behavior: pyCD_puzzle actor syncs metatiles from $0B28 then polls flag #D1;
|
|
9
|
+
; loc_08CBCD requires all slots filled and sequential match slot[i]==i before
|
|
10
|
+
; success (passive check, no player UI).
|
|
11
|
+
; Hooks (overrides): pyCD_puzzle.code_08CBC2! spawns five pyCD_puzzle_activator
|
|
12
|
+
; actors and SetEntryHere/RTL wait loop instead of falling into loc_08CBCD.
|
|
13
|
+
; Adds: pyCD_puzzle_activator, pyCD_puzzle_controller, puzzle_ctrl_* handlers,
|
|
14
|
+
; PuzzleBuildAvailability, PuzzleDraw/ClearIndicators, metatile VRAM helpers,
|
|
15
|
+
; PuzzleProcessDeferred state machine, puzzle_exit_string_stub.
|
|
16
|
+
; Depends on: !key_item_flags $0B58; hieroglyphMetatiles in pyCD_puzzle extract;
|
|
17
|
+
; items $1E-$23; flag bytes #0F (activator gate), #D1 solved; joypadRaw bypass;
|
|
18
|
+
; mapLayerTilemap $7EA000, tileQueryResult queue, displayModeFlags bit 0 refresh.
|
|
19
|
+
; State: Actor DP $20-$2E scratch (documented in controller comment); deferred
|
|
20
|
+
; states $2A 1/5/6/7/8; solution check slot[i]==i for i=0..5; inventory+$0B5B mask.
|
|
21
|
+
; Hazards/notes: TSB/TRB joypadMaskStd $CFFC during UI; PHD/PLX before COP Die on
|
|
22
|
+
; exit; edge input from $0660; must RTL each frame when $2A deferred or orphan
|
|
23
|
+
; loc_08CBCD runs; COP calls need X=actor slot; Up/Down cycle uses tables below.
|
|
24
|
+
; ==============================================================================
|
|
25
|
+
|
|
26
|
+
!key_item_flags 0B58
|
|
27
|
+
!joypadMaskStd 065A
|
|
28
|
+
!joypadRaw 0660
|
|
29
|
+
!displayModeFlags 09EC
|
|
30
|
+
!tileQueryResult 0902
|
|
31
|
+
!inventorySlots 0AB4
|
|
32
|
+
!sfxQueueCh2 06F9
|
|
33
|
+
|
|
34
|
+
hieroglyphOrderCombination [
|
|
35
|
+
#020501030004
|
|
36
|
+
]
|
|
37
|
+
|
|
38
|
+
; Reverse lookup: hieroglyph index → position in cycle order.
|
|
39
|
+
; hiero 0→pos 4, 1→2, 2→0, 3→3, 4→5, 5→1
|
|
40
|
+
hieroCycleReverse [
|
|
41
|
+
#04
|
|
42
|
+
#02
|
|
43
|
+
#00
|
|
44
|
+
#03
|
|
45
|
+
#05
|
|
46
|
+
#01
|
|
47
|
+
]
|
|
48
|
+
|
|
49
|
+
; Bit masks for availability (hieroglyph index → bit)
|
|
50
|
+
hieroBitTable [
|
|
51
|
+
#01
|
|
52
|
+
#02
|
|
53
|
+
#04
|
|
54
|
+
#08
|
|
55
|
+
#10
|
|
56
|
+
#20
|
|
57
|
+
]
|
|
58
|
+
|
|
59
|
+
-------------------------------------------
|
|
60
|
+
; Interactable actor placed at the wall.
|
|
61
|
+
; On interact: checks if any hieroglyph is available,
|
|
62
|
+
; then spawns the puzzle controller.
|
|
63
|
+
|
|
64
|
+
pyCD_puzzle_activator {
|
|
65
|
+
COP [SetInteractHandler] ( &pyCD_puzzle_activator_interact )
|
|
66
|
+
COP [WaitOnFlagByte] ( #D1, #01 )
|
|
67
|
+
COP [Die]
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
pyCD_puzzle_activator_interact {
|
|
71
|
+
COP [BranchOnFlagByte] ( #0F, #00, &pyCD_puzzle_activator_clear )
|
|
72
|
+
RTL
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
pyCD_puzzle_activator_clear {
|
|
76
|
+
LDA $key_item_flags+3
|
|
77
|
+
BIT #$003F
|
|
78
|
+
BNE pyCD_puzzle_activator_spawn
|
|
79
|
+
COP [BranchIfHasItem] ( #1E, &pyCD_puzzle_activator_spawn )
|
|
80
|
+
COP [BranchIfHasItem] ( #1F, &pyCD_puzzle_activator_spawn )
|
|
81
|
+
COP [BranchIfHasItem] ( #20, &pyCD_puzzle_activator_spawn )
|
|
82
|
+
COP [BranchIfHasItem] ( #21, &pyCD_puzzle_activator_spawn )
|
|
83
|
+
COP [BranchIfHasItem] ( #22, &pyCD_puzzle_activator_spawn )
|
|
84
|
+
COP [BranchIfHasItem] ( #23, &pyCD_puzzle_activator_spawn )
|
|
85
|
+
COP [PrintDialogString] ( &pyCD_puzzle_no_items_str )
|
|
86
|
+
RTL
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
pyCD_puzzle_activator_spawn {
|
|
90
|
+
COP [SpawnListAppend] ( @pyCD_puzzle_controller, #00, #00, #$2000 )
|
|
91
|
+
RTL
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
-------------------------------------------
|
|
95
|
+
|
|
96
|
+
pyCD_puzzle_no_items_str `[DEF]There are six alcoves[N]in this wall. I wonder[N]what they could be for...[END]`
|
|
97
|
+
|
|
98
|
+
-------------------------------------------
|
|
99
|
+
; Interactive puzzle controller.
|
|
100
|
+
; Spawned when player interacts with the wall.
|
|
101
|
+
;
|
|
102
|
+
; Actor scratch layout ($20-$2F only — $30+ overflows into next actor):
|
|
103
|
+
; $20 = cursor slot (0-5)
|
|
104
|
+
; $22 = previous frame joypadRaw (edge detection)
|
|
105
|
+
; $24 = edge-detected buttons / old cursor during deferred (dual-use)
|
|
106
|
+
; $26 = scratch (cycle candidate / slot counter / metatile temp)
|
|
107
|
+
; $28 = scratch (guard counter / owned count / VRAM addr temp)
|
|
108
|
+
; $2A = placed-count scratch / deferred state (dual-use, see below)
|
|
109
|
+
; $2C = swap mode flag (0 = normal, non-zero = swap active)
|
|
110
|
+
; $2E = floating hieroglyph index (valid when $2C != 0)
|
|
111
|
+
;
|
|
112
|
+
; $24 and $2A are dual-purpose: during deferred visual updates input
|
|
113
|
+
; is skipped entirely (RTL before edge detection), so these fields
|
|
114
|
+
; are never overwritten by transient scratch. $2A holds the deferred
|
|
115
|
+
; state (0 = idle), $24 holds the old cursor slot for swap moves.
|
|
116
|
+
;
|
|
117
|
+
; Input is read from joypadRaw ($0660) which bypasses
|
|
118
|
+
; joypadMaskStd filtering, then edge-detected manually.
|
|
119
|
+
|
|
120
|
+
pyCD_puzzle_controller {
|
|
121
|
+
; === INIT ===
|
|
122
|
+
LDA #$CFFC
|
|
123
|
+
TSB $joypadMaskStd
|
|
124
|
+
|
|
125
|
+
LDA #$0000
|
|
126
|
+
STA $20
|
|
127
|
+
STA $22
|
|
128
|
+
STA $2A
|
|
129
|
+
STA $2C
|
|
130
|
+
|
|
131
|
+
JSR $&PuzzleDrawIndicators
|
|
132
|
+
|
|
133
|
+
; === MAIN LOOP ===
|
|
134
|
+
COP [SetEntryHere]
|
|
135
|
+
|
|
136
|
+
; Process deferred visual updates before handling input
|
|
137
|
+
LDA $2A
|
|
138
|
+
BEQ puzzle_no_deferred
|
|
139
|
+
JSR $&PuzzleProcessDeferred
|
|
140
|
+
RTL
|
|
141
|
+
|
|
142
|
+
puzzle_no_deferred:
|
|
143
|
+
; Edge-detect: (raw XOR prev) AND raw = newly pressed
|
|
144
|
+
LDA $joypadRaw
|
|
145
|
+
TAY
|
|
146
|
+
EOR $22
|
|
147
|
+
AND $joypadRaw
|
|
148
|
+
STY $22
|
|
149
|
+
STA $24
|
|
150
|
+
BEQ puzzle_ctrl_done
|
|
151
|
+
|
|
152
|
+
; Check swap mode
|
|
153
|
+
LDA $2C
|
|
154
|
+
BNE puzzle_swap_dispatch
|
|
155
|
+
|
|
156
|
+
; === NORMAL MODE ===
|
|
157
|
+
LDA $24
|
|
158
|
+
|
|
159
|
+
; Confirm ($8000)
|
|
160
|
+
BIT #$8000
|
|
161
|
+
BEQ puzzle_skip_confirm
|
|
162
|
+
JMP $&puzzle_ctrl_confirm
|
|
163
|
+
|
|
164
|
+
puzzle_skip_confirm:
|
|
165
|
+
; Cancel ($4000 = B after IOG remap)
|
|
166
|
+
BIT #$4000
|
|
167
|
+
BEQ puzzle_skip_cancel
|
|
168
|
+
JMP $&puzzle_ctrl_exit
|
|
169
|
+
|
|
170
|
+
puzzle_skip_cancel:
|
|
171
|
+
BIT #$0200
|
|
172
|
+
BEQ puzzle_skip_left
|
|
173
|
+
JMP $&puzzle_ctrl_left
|
|
174
|
+
|
|
175
|
+
puzzle_skip_left:
|
|
176
|
+
BIT #$0100
|
|
177
|
+
BEQ puzzle_skip_right
|
|
178
|
+
JMP $&puzzle_ctrl_right
|
|
179
|
+
|
|
180
|
+
puzzle_skip_right:
|
|
181
|
+
BIT #$0800
|
|
182
|
+
BEQ puzzle_skip_up
|
|
183
|
+
JMP $&puzzle_ctrl_up
|
|
184
|
+
|
|
185
|
+
puzzle_skip_up:
|
|
186
|
+
BIT #$0400
|
|
187
|
+
BEQ puzzle_ctrl_done
|
|
188
|
+
JMP $&puzzle_ctrl_down
|
|
189
|
+
|
|
190
|
+
puzzle_swap_dispatch:
|
|
191
|
+
; === SWAP MODE ===
|
|
192
|
+
LDA $24
|
|
193
|
+
|
|
194
|
+
; Confirm or Cancel → exit swap
|
|
195
|
+
BIT #$C000
|
|
196
|
+
BEQ puzzle_swap_skip_exit
|
|
197
|
+
JMP $&puzzle_swap_exit
|
|
198
|
+
|
|
199
|
+
puzzle_swap_skip_exit:
|
|
200
|
+
; Left → swap left
|
|
201
|
+
BIT #$0200
|
|
202
|
+
BEQ puzzle_swap_skip_left
|
|
203
|
+
JMP $&puzzle_swap_left
|
|
204
|
+
|
|
205
|
+
puzzle_swap_skip_left:
|
|
206
|
+
; Right → swap right
|
|
207
|
+
BIT #$0100
|
|
208
|
+
BEQ puzzle_ctrl_done
|
|
209
|
+
JMP $&puzzle_swap_right
|
|
210
|
+
|
|
211
|
+
puzzle_ctrl_done:
|
|
212
|
+
RTL
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
-------------------------------------------
|
|
216
|
+
; Left handler: move cursor left (wraps 0 → 5).
|
|
217
|
+
|
|
218
|
+
puzzle_ctrl_left {
|
|
219
|
+
JSR $&PuzzleClearIndicators
|
|
220
|
+
|
|
221
|
+
LDA $20
|
|
222
|
+
DEC
|
|
223
|
+
BPL puzzle_left_ok
|
|
224
|
+
LDA #$0005
|
|
225
|
+
|
|
226
|
+
puzzle_left_ok:
|
|
227
|
+
STA $20
|
|
228
|
+
|
|
229
|
+
SEP #$20
|
|
230
|
+
LDA #$10
|
|
231
|
+
STA $sfxQueueCh2
|
|
232
|
+
REP #$20
|
|
233
|
+
|
|
234
|
+
JSR $&PuzzleDrawIndicators
|
|
235
|
+
RTL
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
-------------------------------------------
|
|
239
|
+
; Right handler: move cursor right (wraps 5 → 0).
|
|
240
|
+
|
|
241
|
+
puzzle_ctrl_right {
|
|
242
|
+
JSR $&PuzzleClearIndicators
|
|
243
|
+
|
|
244
|
+
LDA $20
|
|
245
|
+
INC
|
|
246
|
+
CMP #$0006
|
|
247
|
+
BCC puzzle_right_ok
|
|
248
|
+
LDA #$0000
|
|
249
|
+
|
|
250
|
+
puzzle_right_ok:
|
|
251
|
+
STA $20
|
|
252
|
+
|
|
253
|
+
SEP #$20
|
|
254
|
+
LDA #$10
|
|
255
|
+
STA $sfxQueueCh2
|
|
256
|
+
REP #$20
|
|
257
|
+
|
|
258
|
+
JSR $&PuzzleDrawIndicators
|
|
259
|
+
RTL
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
-------------------------------------------
|
|
263
|
+
; Confirm handler: enter swap mode if the current slot has a tile.
|
|
264
|
+
; Lifts the tile out of the slot (clears slot, draws tile above).
|
|
265
|
+
|
|
266
|
+
puzzle_ctrl_confirm {
|
|
267
|
+
LDA $20
|
|
268
|
+
ASL
|
|
269
|
+
TAY
|
|
270
|
+
LDA $0B28, Y
|
|
271
|
+
BMI puzzle_confirm_done
|
|
272
|
+
|
|
273
|
+
; Save the hieroglyph and empty the slot
|
|
274
|
+
AND #$00FF
|
|
275
|
+
STA $2E
|
|
276
|
+
LDA #$FFFF
|
|
277
|
+
STA $0B28, Y
|
|
278
|
+
LDA #$FFFF
|
|
279
|
+
STA $2C
|
|
280
|
+
|
|
281
|
+
; Clear the slot metatile (immediate)
|
|
282
|
+
JSR $&PuzzleClearSlotMetatile
|
|
283
|
+
; Defer: draw floating tile above on next frame
|
|
284
|
+
LDA #$0001
|
|
285
|
+
STA $2A
|
|
286
|
+
|
|
287
|
+
SEP #$20
|
|
288
|
+
LDA #$10
|
|
289
|
+
STA $sfxQueueCh2
|
|
290
|
+
REP #$20
|
|
291
|
+
|
|
292
|
+
puzzle_confirm_done:
|
|
293
|
+
RTL
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
-------------------------------------------
|
|
297
|
+
; Up handler: cycle to the next available hieroglyph in display order.
|
|
298
|
+
; Uses hieroglyphOrderCombination for the cycling sequence.
|
|
299
|
+
|
|
300
|
+
puzzle_ctrl_up {
|
|
301
|
+
JSR $&PuzzleBuildAvailability
|
|
302
|
+
LDA $24
|
|
303
|
+
AND #$003F
|
|
304
|
+
BEQ puzzle_up_done
|
|
305
|
+
|
|
306
|
+
; Determine starting cycle position
|
|
307
|
+
LDA $20
|
|
308
|
+
ASL
|
|
309
|
+
TAY
|
|
310
|
+
LDA $0B28, Y
|
|
311
|
+
BMI puzzle_up_from_empty
|
|
312
|
+
|
|
313
|
+
; Filled slot: look up its cycle position, start from next
|
|
314
|
+
AND #$00FF
|
|
315
|
+
PHX
|
|
316
|
+
TAX
|
|
317
|
+
SEP #$20
|
|
318
|
+
LDA $@hieroCycleReverse, X
|
|
319
|
+
REP #$20
|
|
320
|
+
PLX
|
|
321
|
+
AND #$00FF
|
|
322
|
+
INC
|
|
323
|
+
BRA puzzle_up_scan
|
|
324
|
+
|
|
325
|
+
puzzle_up_from_empty:
|
|
326
|
+
LDA #$0000
|
|
327
|
+
|
|
328
|
+
puzzle_up_scan:
|
|
329
|
+
STA $26
|
|
330
|
+
LDA #$0006
|
|
331
|
+
STA $28
|
|
332
|
+
|
|
333
|
+
puzzle_up_loop:
|
|
334
|
+
LDA $26
|
|
335
|
+
CMP #$0006
|
|
336
|
+
BCC puzzle_up_test
|
|
337
|
+
LDA #$0000
|
|
338
|
+
STA $26
|
|
339
|
+
|
|
340
|
+
puzzle_up_test:
|
|
341
|
+
; Look up hieroglyph at this cycle position
|
|
342
|
+
LDA $26
|
|
343
|
+
AND #$00FF
|
|
344
|
+
PHX
|
|
345
|
+
TAX
|
|
346
|
+
SEP #$20
|
|
347
|
+
LDA $@hieroglyphOrderCombination, X
|
|
348
|
+
TAX
|
|
349
|
+
LDA $@hieroBitTable, X
|
|
350
|
+
BIT $24
|
|
351
|
+
REP #$20
|
|
352
|
+
BNE puzzle_up_match
|
|
353
|
+
PLX
|
|
354
|
+
|
|
355
|
+
LDA $26
|
|
356
|
+
INC
|
|
357
|
+
STA $26
|
|
358
|
+
LDA $28
|
|
359
|
+
DEC
|
|
360
|
+
STA $28
|
|
361
|
+
BNE puzzle_up_loop
|
|
362
|
+
BRA puzzle_up_done
|
|
363
|
+
|
|
364
|
+
puzzle_up_match:
|
|
365
|
+
STX $26
|
|
366
|
+
PLX
|
|
367
|
+
|
|
368
|
+
puzzle_up_found:
|
|
369
|
+
LDA $20
|
|
370
|
+
ASL
|
|
371
|
+
TAY
|
|
372
|
+
LDA $26
|
|
373
|
+
AND #$00FF
|
|
374
|
+
STA $0B28, Y
|
|
375
|
+
JSR $&PuzzleUpdateSlotMetatile
|
|
376
|
+
|
|
377
|
+
SEP #$20
|
|
378
|
+
LDA #$10
|
|
379
|
+
STA $sfxQueueCh2
|
|
380
|
+
REP #$20
|
|
381
|
+
|
|
382
|
+
puzzle_up_done:
|
|
383
|
+
RTL
|
|
384
|
+
}
|
|
385
|
+
|
|
386
|
+
-------------------------------------------
|
|
387
|
+
; Down handler: cycle to the previous available hieroglyph in display order.
|
|
388
|
+
; Uses hieroglyphOrderCombination for the cycling sequence.
|
|
389
|
+
|
|
390
|
+
puzzle_ctrl_down {
|
|
391
|
+
JSR $&PuzzleBuildAvailability
|
|
392
|
+
LDA $24
|
|
393
|
+
AND #$003F
|
|
394
|
+
BEQ puzzle_down_done
|
|
395
|
+
|
|
396
|
+
; Determine starting cycle position
|
|
397
|
+
LDA $20
|
|
398
|
+
ASL
|
|
399
|
+
TAY
|
|
400
|
+
LDA $0B28, Y
|
|
401
|
+
BMI puzzle_down_from_empty
|
|
402
|
+
|
|
403
|
+
; Filled slot: look up its cycle position, start from previous
|
|
404
|
+
AND #$00FF
|
|
405
|
+
PHX
|
|
406
|
+
TAX
|
|
407
|
+
SEP #$20
|
|
408
|
+
LDA $@hieroCycleReverse, X
|
|
409
|
+
REP #$20
|
|
410
|
+
PLX
|
|
411
|
+
AND #$00FF
|
|
412
|
+
DEC
|
|
413
|
+
BRA puzzle_down_scan
|
|
414
|
+
|
|
415
|
+
puzzle_down_from_empty:
|
|
416
|
+
LDA #$0005
|
|
417
|
+
|
|
418
|
+
puzzle_down_scan:
|
|
419
|
+
STA $26
|
|
420
|
+
LDA #$0006
|
|
421
|
+
STA $28
|
|
422
|
+
|
|
423
|
+
puzzle_down_loop:
|
|
424
|
+
LDA $26
|
|
425
|
+
BPL puzzle_down_test
|
|
426
|
+
LDA #$0005
|
|
427
|
+
STA $26
|
|
428
|
+
|
|
429
|
+
puzzle_down_test:
|
|
430
|
+
; Look up hieroglyph at this cycle position
|
|
431
|
+
LDA $26
|
|
432
|
+
AND #$00FF
|
|
433
|
+
PHX
|
|
434
|
+
TAX
|
|
435
|
+
SEP #$20
|
|
436
|
+
LDA $@hieroglyphOrderCombination, X
|
|
437
|
+
TAX
|
|
438
|
+
LDA $@hieroBitTable, X
|
|
439
|
+
BIT $24
|
|
440
|
+
REP #$20
|
|
441
|
+
BNE puzzle_down_match
|
|
442
|
+
PLX
|
|
443
|
+
|
|
444
|
+
LDA $26
|
|
445
|
+
DEC
|
|
446
|
+
STA $26
|
|
447
|
+
LDA $28
|
|
448
|
+
DEC
|
|
449
|
+
STA $28
|
|
450
|
+
BNE puzzle_down_loop
|
|
451
|
+
BRA puzzle_down_done
|
|
452
|
+
|
|
453
|
+
puzzle_down_match:
|
|
454
|
+
STX $26
|
|
455
|
+
PLX
|
|
456
|
+
|
|
457
|
+
puzzle_down_found:
|
|
458
|
+
LDA $20
|
|
459
|
+
ASL
|
|
460
|
+
TAY
|
|
461
|
+
LDA $26
|
|
462
|
+
AND #$00FF
|
|
463
|
+
STA $0B28, Y
|
|
464
|
+
JSR $&PuzzleUpdateSlotMetatile
|
|
465
|
+
|
|
466
|
+
SEP #$20
|
|
467
|
+
LDA #$10
|
|
468
|
+
STA $sfxQueueCh2
|
|
469
|
+
REP #$20
|
|
470
|
+
|
|
471
|
+
puzzle_down_done:
|
|
472
|
+
RTL
|
|
473
|
+
}
|
|
474
|
+
|
|
475
|
+
-------------------------------------------
|
|
476
|
+
; Swap exit: drop floating tile back into the current slot.
|
|
477
|
+
; Pressing Confirm or Cancel in swap mode lands here.
|
|
478
|
+
|
|
479
|
+
puzzle_swap_exit {
|
|
480
|
+
LDA $20
|
|
481
|
+
ASL
|
|
482
|
+
TAY
|
|
483
|
+
LDA $2E
|
|
484
|
+
AND #$00FF
|
|
485
|
+
STA $0B28, Y
|
|
486
|
+
|
|
487
|
+
STZ $2C
|
|
488
|
+
|
|
489
|
+
; Clear floating tile above (immediate)
|
|
490
|
+
JSR $&PuzzleClearAboveTile
|
|
491
|
+
; Defer: redraw slot metatile on next frame
|
|
492
|
+
LDA #$0005
|
|
493
|
+
STA $2A
|
|
494
|
+
|
|
495
|
+
SEP #$20
|
|
496
|
+
LDA #$10
|
|
497
|
+
STA $sfxQueueCh2
|
|
498
|
+
REP #$20
|
|
499
|
+
RTL
|
|
500
|
+
}
|
|
501
|
+
|
|
502
|
+
-------------------------------------------
|
|
503
|
+
; Swap left: move floating tile left, swap adjacent tile right.
|
|
504
|
+
|
|
505
|
+
puzzle_swap_left {
|
|
506
|
+
LDA $20
|
|
507
|
+
BEQ puzzle_swap_left_done
|
|
508
|
+
|
|
509
|
+
JSR $&PuzzleClearIndicators
|
|
510
|
+
|
|
511
|
+
LDA $20
|
|
512
|
+
STA $24
|
|
513
|
+
|
|
514
|
+
; Data swap: left tile fills current empty slot
|
|
515
|
+
LDA $20
|
|
516
|
+
ASL
|
|
517
|
+
TAY
|
|
518
|
+
LDA $0B26, Y
|
|
519
|
+
STA $0B28, Y
|
|
520
|
+
LDA #$FFFF
|
|
521
|
+
STA $0B26, Y
|
|
522
|
+
|
|
523
|
+
; Move cursor left
|
|
524
|
+
LDA $20
|
|
525
|
+
DEC
|
|
526
|
+
STA $20
|
|
527
|
+
|
|
528
|
+
JSR $&PuzzleDrawIndicators
|
|
529
|
+
|
|
530
|
+
; Clear new slot metatile (immediate)
|
|
531
|
+
JSR $&PuzzleClearSlotMetatile
|
|
532
|
+
; Defer: clear old floating → draw new floating → redraw old slot
|
|
533
|
+
LDA #$0006
|
|
534
|
+
STA $2A
|
|
535
|
+
|
|
536
|
+
SEP #$20
|
|
537
|
+
LDA #$10
|
|
538
|
+
STA $sfxQueueCh2
|
|
539
|
+
REP #$20
|
|
540
|
+
|
|
541
|
+
puzzle_swap_left_done:
|
|
542
|
+
RTL
|
|
543
|
+
}
|
|
544
|
+
|
|
545
|
+
-------------------------------------------
|
|
546
|
+
; Swap right: move floating tile right, swap adjacent tile left.
|
|
547
|
+
|
|
548
|
+
puzzle_swap_right {
|
|
549
|
+
LDA $20
|
|
550
|
+
CMP #$0005
|
|
551
|
+
BCS puzzle_swap_right_done
|
|
552
|
+
|
|
553
|
+
JSR $&PuzzleClearIndicators
|
|
554
|
+
|
|
555
|
+
LDA $20
|
|
556
|
+
STA $24
|
|
557
|
+
|
|
558
|
+
; Data swap: right tile fills current empty slot
|
|
559
|
+
LDA $20
|
|
560
|
+
ASL
|
|
561
|
+
TAY
|
|
562
|
+
LDA $0B2A, Y
|
|
563
|
+
STA $0B28, Y
|
|
564
|
+
LDA #$FFFF
|
|
565
|
+
STA $0B2A, Y
|
|
566
|
+
|
|
567
|
+
; Move cursor right
|
|
568
|
+
LDA $20
|
|
569
|
+
INC
|
|
570
|
+
STA $20
|
|
571
|
+
|
|
572
|
+
JSR $&PuzzleDrawIndicators
|
|
573
|
+
|
|
574
|
+
; Clear new slot metatile (immediate)
|
|
575
|
+
JSR $&PuzzleClearSlotMetatile
|
|
576
|
+
; Defer: clear old floating → draw new floating → redraw old slot
|
|
577
|
+
LDA #$0006
|
|
578
|
+
STA $2A
|
|
579
|
+
|
|
580
|
+
SEP #$20
|
|
581
|
+
LDA #$10
|
|
582
|
+
STA $sfxQueueCh2
|
|
583
|
+
REP #$20
|
|
584
|
+
|
|
585
|
+
puzzle_swap_right_done:
|
|
586
|
+
RTL
|
|
587
|
+
}
|
|
588
|
+
|
|
589
|
+
-------------------------------------------
|
|
590
|
+
; Exit handler: clear indicators, unlock input,
|
|
591
|
+
; check solution, die.
|
|
592
|
+
|
|
593
|
+
puzzle_ctrl_exit {
|
|
594
|
+
JSR $&PuzzleClearIndicators
|
|
595
|
+
|
|
596
|
+
LDA #$CFFC
|
|
597
|
+
TRB $joypadMaskStd
|
|
598
|
+
|
|
599
|
+
; Check if all 6 slots are filled
|
|
600
|
+
LDY #$0000
|
|
601
|
+
|
|
602
|
+
puzzle_exit_scan:
|
|
603
|
+
LDA $0B28, Y
|
|
604
|
+
BMI puzzle_exit_die
|
|
605
|
+
INY
|
|
606
|
+
INY
|
|
607
|
+
CPY #$000C
|
|
608
|
+
BNE puzzle_exit_scan
|
|
609
|
+
|
|
610
|
+
; All filled — check solution
|
|
611
|
+
JSR $&PuzzleCheckSolution
|
|
612
|
+
BCC puzzle_exit_die
|
|
613
|
+
|
|
614
|
+
; Correct solution!
|
|
615
|
+
PHD
|
|
616
|
+
PLX
|
|
617
|
+
COP [SetFlagByte] ( #D1 )
|
|
618
|
+
COP [PlaySoundBoth] ( #$0F0F )
|
|
619
|
+
LDA #$CFFC
|
|
620
|
+
TSB $joypadMaskStd
|
|
621
|
+
COP [WaitByte] ( #3B )
|
|
622
|
+
JSL $@puzzle_exit_string_stub
|
|
623
|
+
LDA #$CFFC
|
|
624
|
+
TRB $joypadMaskStd
|
|
625
|
+
|
|
626
|
+
puzzle_exit_die:
|
|
627
|
+
LDA #$0008
|
|
628
|
+
TSB $joypadHeld
|
|
629
|
+
PHD
|
|
630
|
+
PLX
|
|
631
|
+
COP [Die]
|
|
632
|
+
}
|
|
633
|
+
|
|
634
|
+
-------------------------------------------
|
|
635
|
+
; Build a 6-bit availability mask for the current cursor slot.
|
|
636
|
+
; Result in actor DP $24. Bit N = hieroglyph N available.
|
|
637
|
+
;
|
|
638
|
+
; Phase 1: OR relic flags + inventory → raw owned mask in $24
|
|
639
|
+
; Phase 2: popcount of raw mask → owned count in $28
|
|
640
|
+
; Phase 3: remove hieroglyphs placed in OTHER slots from $24,
|
|
641
|
+
; count placed-in-others → $2A
|
|
642
|
+
; Phase 4: if current slot is empty AND placed_others >= owned
|
|
643
|
+
; → clear $24 (player has used all their hieroglyphs)
|
|
644
|
+
|
|
645
|
+
PuzzleBuildAvailability {
|
|
646
|
+
; Phase 1: start with relic flags (explicit address)
|
|
647
|
+
LDA $0B5B
|
|
648
|
+
AND #$003F
|
|
649
|
+
STA $24
|
|
650
|
+
|
|
651
|
+
; Scan inventory for items $1E-$23, OR into $24
|
|
652
|
+
PHX
|
|
653
|
+
SEP #$20
|
|
654
|
+
LDY #$0000
|
|
655
|
+
|
|
656
|
+
build_avail_inv:
|
|
657
|
+
LDA $inventorySlots, Y
|
|
658
|
+
SEC
|
|
659
|
+
SBC #$1E
|
|
660
|
+
CMP #$06
|
|
661
|
+
BCS build_avail_inv_next
|
|
662
|
+
TAX
|
|
663
|
+
LDA $@hieroBitTable, X
|
|
664
|
+
TSB $24
|
|
665
|
+
|
|
666
|
+
build_avail_inv_next:
|
|
667
|
+
INY
|
|
668
|
+
CPY #$0010
|
|
669
|
+
BNE build_avail_inv
|
|
670
|
+
|
|
671
|
+
; Phase 2: popcount of $24 → owned count
|
|
672
|
+
LDA $24
|
|
673
|
+
AND #$3F
|
|
674
|
+
LDX #$0000
|
|
675
|
+
|
|
676
|
+
build_avail_popcnt:
|
|
677
|
+
CMP #$00
|
|
678
|
+
BEQ build_avail_popcnt_done
|
|
679
|
+
LSR
|
|
680
|
+
BCC build_avail_popcnt
|
|
681
|
+
INX
|
|
682
|
+
BRA build_avail_popcnt
|
|
683
|
+
|
|
684
|
+
build_avail_popcnt_done:
|
|
685
|
+
REP #$20
|
|
686
|
+
TXA
|
|
687
|
+
AND #$00FF
|
|
688
|
+
STA $28
|
|
689
|
+
PLX
|
|
690
|
+
|
|
691
|
+
; Phase 3: remove hieroglyphs placed in OTHER slots, count them
|
|
692
|
+
PHX
|
|
693
|
+
LDY #$0000
|
|
694
|
+
LDA #$0000
|
|
695
|
+
STA $26
|
|
696
|
+
STA $2A
|
|
697
|
+
|
|
698
|
+
build_avail_remove:
|
|
699
|
+
LDA $26
|
|
700
|
+
CMP $20
|
|
701
|
+
BEQ build_avail_skip
|
|
702
|
+
LDA $0B28, Y
|
|
703
|
+
BMI build_avail_skip
|
|
704
|
+
LDA $2A
|
|
705
|
+
INC
|
|
706
|
+
STA $2A
|
|
707
|
+
LDA $0B28, Y
|
|
708
|
+
AND #$00FF
|
|
709
|
+
TAX
|
|
710
|
+
SEP #$20
|
|
711
|
+
LDA $@hieroBitTable, X
|
|
712
|
+
TRB $24
|
|
713
|
+
REP #$20
|
|
714
|
+
|
|
715
|
+
build_avail_skip:
|
|
716
|
+
INY
|
|
717
|
+
INY
|
|
718
|
+
LDA $26
|
|
719
|
+
INC
|
|
720
|
+
STA $26
|
|
721
|
+
CMP #$0006
|
|
722
|
+
BNE build_avail_remove
|
|
723
|
+
|
|
724
|
+
; Phase 4: count cap
|
|
725
|
+
; If current slot is empty AND placed_others >= owned → clear mask
|
|
726
|
+
LDA $20
|
|
727
|
+
ASL
|
|
728
|
+
TAY
|
|
729
|
+
LDA $0B28, Y
|
|
730
|
+
BPL build_avail_cap_done
|
|
731
|
+
LDA $2A
|
|
732
|
+
CMP $28
|
|
733
|
+
BCC build_avail_cap_done
|
|
734
|
+
STZ $24
|
|
735
|
+
|
|
736
|
+
build_avail_cap_done:
|
|
737
|
+
PLX
|
|
738
|
+
STZ $2A
|
|
739
|
+
RTS
|
|
740
|
+
}
|
|
741
|
+
|
|
742
|
+
-------------------------------------------
|
|
743
|
+
; Draw BG3 indicator tiles above and below the current cursor slot.
|
|
744
|
+
;
|
|
745
|
+
; BG3 buffer at $7F0200, 32 cols × 2 bytes = $40 per row.
|
|
746
|
+
; Above row 11: base offset $02C0. Below row 14: base offset $0380.
|
|
747
|
+
; Slot N uses columns (10+2N, 11+2N), so column offset = $14 + N×4.
|
|
748
|
+
;
|
|
749
|
+
; Indicator tiles (SNES tilemap word: vhopppcc cccccccc):
|
|
750
|
+
; Above: $20EB / $20DF (tile $EB/$DF, priority bit 13)
|
|
751
|
+
; Below: $A0EB / $A0DF (V-flip bit 15 + priority bit 13)
|
|
752
|
+
|
|
753
|
+
PuzzleDrawIndicators {
|
|
754
|
+
PHX
|
|
755
|
+
|
|
756
|
+
LDA $20
|
|
757
|
+
ASL
|
|
758
|
+
ASL
|
|
759
|
+
CLC
|
|
760
|
+
ADC #$02D4
|
|
761
|
+
TAX
|
|
762
|
+
LDA #$20EB
|
|
763
|
+
STA $7F0200, X
|
|
764
|
+
LDA #$20DF
|
|
765
|
+
STA $7F0202, X
|
|
766
|
+
|
|
767
|
+
LDA $20
|
|
768
|
+
ASL
|
|
769
|
+
ASL
|
|
770
|
+
CLC
|
|
771
|
+
ADC #$0394
|
|
772
|
+
TAX
|
|
773
|
+
LDA #$A0EB
|
|
774
|
+
STA $7F0200, X
|
|
775
|
+
LDA #$A0DF
|
|
776
|
+
STA $7F0202, X
|
|
777
|
+
|
|
778
|
+
PLX
|
|
779
|
+
LDA #$0001
|
|
780
|
+
TSB $displayModeFlags
|
|
781
|
+
RTS
|
|
782
|
+
}
|
|
783
|
+
|
|
784
|
+
-------------------------------------------
|
|
785
|
+
; Clear BG3 indicator tiles at the current cursor slot.
|
|
786
|
+
|
|
787
|
+
PuzzleClearIndicators {
|
|
788
|
+
PHX
|
|
789
|
+
|
|
790
|
+
LDA $20
|
|
791
|
+
ASL
|
|
792
|
+
ASL
|
|
793
|
+
CLC
|
|
794
|
+
ADC #$02D4
|
|
795
|
+
TAX
|
|
796
|
+
LDA #$0000
|
|
797
|
+
STA $7F0200, X
|
|
798
|
+
STA $7F0202, X
|
|
799
|
+
|
|
800
|
+
LDA $20
|
|
801
|
+
ASL
|
|
802
|
+
ASL
|
|
803
|
+
CLC
|
|
804
|
+
ADC #$0394
|
|
805
|
+
TAX
|
|
806
|
+
LDA #$0000
|
|
807
|
+
STA $7F0200, X
|
|
808
|
+
STA $7F0202, X
|
|
809
|
+
|
|
810
|
+
PLX
|
|
811
|
+
LDA #$0001
|
|
812
|
+
TSB $displayModeFlags
|
|
813
|
+
RTS
|
|
814
|
+
}
|
|
815
|
+
|
|
816
|
+
-------------------------------------------
|
|
817
|
+
; Update the metatile display for the current cursor slot.
|
|
818
|
+
; Reads slot value from $0B28, looks up the metatile ID,
|
|
819
|
+
; writes to mapLayerTilemap, and queues the VRAM update.
|
|
820
|
+
|
|
821
|
+
PuzzleUpdateSlotMetatile {
|
|
822
|
+
PHX
|
|
823
|
+
|
|
824
|
+
; Look up metatile ID
|
|
825
|
+
LDA $20
|
|
826
|
+
ASL
|
|
827
|
+
TAY
|
|
828
|
+
LDA $0B28, Y
|
|
829
|
+
AND #$00FF
|
|
830
|
+
TAX
|
|
831
|
+
SEP #$20
|
|
832
|
+
LDA $@hieroglyphMetatiles, X
|
|
833
|
+
STA $26
|
|
834
|
+
REP #$20
|
|
835
|
+
|
|
836
|
+
; Write to mapLayerTilemap (offset = $65 + slot index)
|
|
837
|
+
LDA $20
|
|
838
|
+
CLC
|
|
839
|
+
ADC #$0065
|
|
840
|
+
TAX
|
|
841
|
+
LDA $26
|
|
842
|
+
AND #$00FF
|
|
843
|
+
SEP #$20
|
|
844
|
+
STA $7EA000, X
|
|
845
|
+
REP #$20
|
|
846
|
+
|
|
847
|
+
; Queue VRAM update if tile query is free
|
|
848
|
+
LDA $tileQueryResult
|
|
849
|
+
BNE puzzle_mt_done
|
|
850
|
+
|
|
851
|
+
; Expand metatile: ID × 8 into metatileMapLayer ($7E2000)
|
|
852
|
+
LDA $26
|
|
853
|
+
AND #$00FF
|
|
854
|
+
ASL
|
|
855
|
+
ASL
|
|
856
|
+
ASL
|
|
857
|
+
TAX
|
|
858
|
+
LDA $7E2000, X
|
|
859
|
+
STA $0904
|
|
860
|
+
LDA $7E2002, X
|
|
861
|
+
STA $0906
|
|
862
|
+
LDA $7E2004, X
|
|
863
|
+
STA $090A
|
|
864
|
+
LDA $7E2006, X
|
|
865
|
+
STA $090C
|
|
866
|
+
|
|
867
|
+
; VRAM address: $118A + slot × 2
|
|
868
|
+
LDA $20
|
|
869
|
+
ASL
|
|
870
|
+
CLC
|
|
871
|
+
ADC #$118A
|
|
872
|
+
STA $tileQueryResult
|
|
873
|
+
CLC
|
|
874
|
+
ADC #$0020
|
|
875
|
+
STA $0908
|
|
876
|
+
|
|
877
|
+
puzzle_mt_done:
|
|
878
|
+
PLX
|
|
879
|
+
RTS
|
|
880
|
+
}
|
|
881
|
+
|
|
882
|
+
-------------------------------------------
|
|
883
|
+
; Check if $0B28 matches the solution.
|
|
884
|
+
; Returns carry set = correct, carry clear = wrong.
|
|
885
|
+
|
|
886
|
+
PuzzleCheckSolution {
|
|
887
|
+
; Solution is sequential: slot[i] == i for all 6 slots.
|
|
888
|
+
LDY #$0000
|
|
889
|
+
|
|
890
|
+
puzzle_sol_loop:
|
|
891
|
+
TYA
|
|
892
|
+
LSR
|
|
893
|
+
CMP $0B28, Y
|
|
894
|
+
BNE puzzle_sol_fail
|
|
895
|
+
INY
|
|
896
|
+
INY
|
|
897
|
+
CPY #$000C
|
|
898
|
+
BNE puzzle_sol_loop
|
|
899
|
+
|
|
900
|
+
SEC
|
|
901
|
+
RTS
|
|
902
|
+
|
|
903
|
+
puzzle_sol_fail:
|
|
904
|
+
CLC
|
|
905
|
+
RTS
|
|
906
|
+
}
|
|
907
|
+
|
|
908
|
+
-------------------------------------------
|
|
909
|
+
; Expand metatile $26 (low byte = ID) and queue VRAM write at $28.
|
|
910
|
+
; Used by all metatile visual helpers. Returns if queue is busy.
|
|
911
|
+
|
|
912
|
+
PuzzleQueueMetatile {
|
|
913
|
+
PHX
|
|
914
|
+
|
|
915
|
+
LDA $tileQueryResult
|
|
916
|
+
BNE queue_mt_done
|
|
917
|
+
|
|
918
|
+
LDA $26
|
|
919
|
+
AND #$00FF
|
|
920
|
+
ASL
|
|
921
|
+
ASL
|
|
922
|
+
ASL
|
|
923
|
+
TAX
|
|
924
|
+
LDA $7E2000, X
|
|
925
|
+
STA $0904
|
|
926
|
+
LDA $7E2002, X
|
|
927
|
+
STA $0906
|
|
928
|
+
LDA $7E2004, X
|
|
929
|
+
STA $090A
|
|
930
|
+
LDA $7E2006, X
|
|
931
|
+
STA $090C
|
|
932
|
+
|
|
933
|
+
LDA $28
|
|
934
|
+
STA $tileQueryResult
|
|
935
|
+
CLC
|
|
936
|
+
ADC #$0020
|
|
937
|
+
STA $0908
|
|
938
|
+
|
|
939
|
+
queue_mt_done:
|
|
940
|
+
PLX
|
|
941
|
+
RTS
|
|
942
|
+
}
|
|
943
|
+
|
|
944
|
+
-------------------------------------------
|
|
945
|
+
; Clear current slot ($20) to empty alcove metatile ($87).
|
|
946
|
+
|
|
947
|
+
PuzzleClearSlotMetatile {
|
|
948
|
+
PHX
|
|
949
|
+
|
|
950
|
+
LDA $20
|
|
951
|
+
CLC
|
|
952
|
+
ADC #$0065
|
|
953
|
+
TAX
|
|
954
|
+
SEP #$20
|
|
955
|
+
LDA #$87
|
|
956
|
+
STA $7EA000, X
|
|
957
|
+
REP #$20
|
|
958
|
+
|
|
959
|
+
PLX
|
|
960
|
+
|
|
961
|
+
LDA #$0087
|
|
962
|
+
STA $26
|
|
963
|
+
LDA $20
|
|
964
|
+
ASL
|
|
965
|
+
CLC
|
|
966
|
+
ADC #$118A
|
|
967
|
+
STA $28
|
|
968
|
+
JSR $&PuzzleQueueMetatile
|
|
969
|
+
RTS
|
|
970
|
+
}
|
|
971
|
+
|
|
972
|
+
-------------------------------------------
|
|
973
|
+
; Redraw slot at $24 (old cursor) based on its $0B28 value.
|
|
974
|
+
; If filled → hieroglyph metatile. If empty → alcove ($87).
|
|
975
|
+
|
|
976
|
+
PuzzleRedrawSlotAt {
|
|
977
|
+
PHX
|
|
978
|
+
|
|
979
|
+
LDA $24
|
|
980
|
+
ASL
|
|
981
|
+
TAY
|
|
982
|
+
LDA $0B28, Y
|
|
983
|
+
BMI redraw_slot_empty
|
|
984
|
+
|
|
985
|
+
AND #$00FF
|
|
986
|
+
TAX
|
|
987
|
+
SEP #$20
|
|
988
|
+
LDA $@hieroglyphMetatiles, X
|
|
989
|
+
STA $26
|
|
990
|
+
REP #$20
|
|
991
|
+
BRA redraw_slot_map
|
|
992
|
+
|
|
993
|
+
redraw_slot_empty:
|
|
994
|
+
LDA #$0087
|
|
995
|
+
STA $26
|
|
996
|
+
|
|
997
|
+
redraw_slot_map:
|
|
998
|
+
LDA $24
|
|
999
|
+
CLC
|
|
1000
|
+
ADC #$0065
|
|
1001
|
+
TAX
|
|
1002
|
+
LDA $26
|
|
1003
|
+
AND #$00FF
|
|
1004
|
+
SEP #$20
|
|
1005
|
+
STA $7EA000, X
|
|
1006
|
+
REP #$20
|
|
1007
|
+
|
|
1008
|
+
PLX
|
|
1009
|
+
|
|
1010
|
+
LDA $24
|
|
1011
|
+
ASL
|
|
1012
|
+
CLC
|
|
1013
|
+
ADC #$118A
|
|
1014
|
+
STA $28
|
|
1015
|
+
JSR $&PuzzleQueueMetatile
|
|
1016
|
+
RTS
|
|
1017
|
+
}
|
|
1018
|
+
|
|
1019
|
+
-------------------------------------------
|
|
1020
|
+
; Draw the floating hieroglyph ($2E) one metatile row above
|
|
1021
|
+
; the current cursor slot ($20). VRAM base = $114A + slot × 2.
|
|
1022
|
+
|
|
1023
|
+
PuzzleDrawAboveTile {
|
|
1024
|
+
; Draws the floating tile above the slot via VRAM queue only.
|
|
1025
|
+
; Does NOT modify $7EA000 so the original wall metatile can
|
|
1026
|
+
; be read back by PuzzleClearAboveTile on demand.
|
|
1027
|
+
PHX
|
|
1028
|
+
|
|
1029
|
+
LDA $2E
|
|
1030
|
+
AND #$00FF
|
|
1031
|
+
TAX
|
|
1032
|
+
SEP #$20
|
|
1033
|
+
LDA $@hieroglyphMetatiles, X
|
|
1034
|
+
STA $26
|
|
1035
|
+
REP #$20
|
|
1036
|
+
|
|
1037
|
+
PLX
|
|
1038
|
+
|
|
1039
|
+
LDA $20
|
|
1040
|
+
ASL
|
|
1041
|
+
CLC
|
|
1042
|
+
ADC #$114A
|
|
1043
|
+
STA $28
|
|
1044
|
+
JSR $&PuzzleQueueMetatile
|
|
1045
|
+
RTS
|
|
1046
|
+
}
|
|
1047
|
+
|
|
1048
|
+
-------------------------------------------
|
|
1049
|
+
; Clear the above-slot position at current cursor ($20).
|
|
1050
|
+
; Reads the original wall metatile from the metatile map
|
|
1051
|
+
; (never modified for the above row).
|
|
1052
|
+
|
|
1053
|
+
PuzzleClearAboveTile {
|
|
1054
|
+
PHX
|
|
1055
|
+
|
|
1056
|
+
LDA $20
|
|
1057
|
+
CLC
|
|
1058
|
+
ADC #$0055
|
|
1059
|
+
TAX
|
|
1060
|
+
SEP #$20
|
|
1061
|
+
LDA $7EA000, X
|
|
1062
|
+
STA $26
|
|
1063
|
+
REP #$20
|
|
1064
|
+
|
|
1065
|
+
PLX
|
|
1066
|
+
|
|
1067
|
+
LDA $20
|
|
1068
|
+
ASL
|
|
1069
|
+
CLC
|
|
1070
|
+
ADC #$114A
|
|
1071
|
+
STA $28
|
|
1072
|
+
JSR $&PuzzleQueueMetatile
|
|
1073
|
+
RTS
|
|
1074
|
+
}
|
|
1075
|
+
|
|
1076
|
+
-------------------------------------------
|
|
1077
|
+
; Clear the above-slot position at old cursor ($24).
|
|
1078
|
+
; Reads the original wall metatile from the metatile map.
|
|
1079
|
+
|
|
1080
|
+
PuzzleClearAboveTileAt {
|
|
1081
|
+
PHX
|
|
1082
|
+
|
|
1083
|
+
LDA $24
|
|
1084
|
+
CLC
|
|
1085
|
+
ADC #$0055
|
|
1086
|
+
TAX
|
|
1087
|
+
SEP #$20
|
|
1088
|
+
LDA $7EA000, X
|
|
1089
|
+
STA $26
|
|
1090
|
+
REP #$20
|
|
1091
|
+
|
|
1092
|
+
PLX
|
|
1093
|
+
|
|
1094
|
+
LDA $24
|
|
1095
|
+
ASL
|
|
1096
|
+
CLC
|
|
1097
|
+
ADC #$114A
|
|
1098
|
+
STA $28
|
|
1099
|
+
JSR $&PuzzleQueueMetatile
|
|
1100
|
+
RTS
|
|
1101
|
+
}
|
|
1102
|
+
|
|
1103
|
+
-------------------------------------------
|
|
1104
|
+
; Deferred visual update state machine.
|
|
1105
|
+
; Called once per frame when $2A != 0. Each state performs
|
|
1106
|
+
; one VRAM queue operation, then chains to the next state.
|
|
1107
|
+
;
|
|
1108
|
+
; States:
|
|
1109
|
+
; 1 = draw floating above $20 → done (swap enter)
|
|
1110
|
+
; 5 = redraw slot at $20 → done (swap exit)
|
|
1111
|
+
; 6 = clear old floating at $24 → 7 (swap move step 2)
|
|
1112
|
+
; 7 = draw new floating above $20 → 8 (swap move step 3)
|
|
1113
|
+
; 8 = redraw old slot at $24 → done (swap move step 4)
|
|
1114
|
+
|
|
1115
|
+
PuzzleProcessDeferred {
|
|
1116
|
+
LDA $2A
|
|
1117
|
+
|
|
1118
|
+
CMP #$0001
|
|
1119
|
+
BEQ deferred_draw_floating
|
|
1120
|
+
|
|
1121
|
+
CMP #$0005
|
|
1122
|
+
BEQ deferred_draw_slot
|
|
1123
|
+
|
|
1124
|
+
CMP #$0006
|
|
1125
|
+
BEQ deferred_clear_old_above
|
|
1126
|
+
|
|
1127
|
+
CMP #$0007
|
|
1128
|
+
BEQ deferred_draw_new_above
|
|
1129
|
+
|
|
1130
|
+
CMP #$0008
|
|
1131
|
+
BEQ deferred_redraw_old_slot
|
|
1132
|
+
|
|
1133
|
+
; Unknown state — reset
|
|
1134
|
+
STZ $2A
|
|
1135
|
+
RTS
|
|
1136
|
+
|
|
1137
|
+
deferred_draw_floating:
|
|
1138
|
+
JSR $&PuzzleDrawAboveTile
|
|
1139
|
+
STZ $2A
|
|
1140
|
+
RTS
|
|
1141
|
+
|
|
1142
|
+
deferred_draw_slot:
|
|
1143
|
+
JSR $&PuzzleUpdateSlotMetatile
|
|
1144
|
+
STZ $2A
|
|
1145
|
+
RTS
|
|
1146
|
+
|
|
1147
|
+
deferred_clear_old_above:
|
|
1148
|
+
JSR $&PuzzleClearAboveTileAt
|
|
1149
|
+
LDA #$0007
|
|
1150
|
+
STA $2A
|
|
1151
|
+
RTS
|
|
1152
|
+
|
|
1153
|
+
deferred_draw_new_above:
|
|
1154
|
+
JSR $&PuzzleDrawAboveTile
|
|
1155
|
+
LDA #$0008
|
|
1156
|
+
STA $2A
|
|
1157
|
+
RTS
|
|
1158
|
+
|
|
1159
|
+
deferred_redraw_old_slot:
|
|
1160
|
+
JSR $&PuzzleRedrawSlotAt
|
|
1161
|
+
STZ $2A
|
|
1162
|
+
RTS
|
|
1163
|
+
}
|
|
1164
|
+
|
|
1165
|
+
-------------------------------------------
|
|
1166
|
+
; Override the main puzzle actor loop.
|
|
1167
|
+
; Spawns 5 activators (one per wall slot cluster), then polls for flag D1.
|
|
1168
|
+
; RTL yields each frame; SetEntryHere re-enters at the flag check.
|
|
1169
|
+
; Without the explicit RTL, execution falls through to orphaned sub-label
|
|
1170
|
+
; loc_08CBCD which runs the ORIGINAL sequential solution check.
|
|
1171
|
+
|
|
1172
|
+
pyCD_puzzle.code_08CBC2! {
|
|
1173
|
+
COP [BranchOnFlagByte] ( #D1, #01, &code_08CC09 )
|
|
1174
|
+
COP [SpawnAfterAbsFlags] ( @pyCD_puzzle_activator, #$0048, #$0098, #$7000 )
|
|
1175
|
+
COP [SpawnAfterAbsFlags] ( @pyCD_puzzle_activator, #$0060, #$0098, #$7000 )
|
|
1176
|
+
COP [SpawnAfterAbsFlags] ( @pyCD_puzzle_activator, #$0078, #$0098, #$7000 )
|
|
1177
|
+
COP [SpawnAfterAbsFlags] ( @pyCD_puzzle_activator, #$0090, #$0098, #$7000 )
|
|
1178
|
+
COP [SpawnAfterAbsFlags] ( @pyCD_puzzle_activator, #$00A8, #$0098, #$7000 )
|
|
1179
|
+
COP [SetEntryHere]
|
|
1180
|
+
COP [BranchOnFlagByte] ( #D1, #01, &code_08CC09 )
|
|
1181
|
+
RTL
|
|
1182
|
+
}
|
|
1183
|
+
|
|
1184
|
+
puzzle_exit_string_stub {
|
|
1185
|
+
COP [PrintDialogString] ( &dialogstring_08CD0B )
|
|
1186
|
+
RTL
|
|
1187
|
+
}
|