Protect practice hack WRAM against x-ray

src/defines.asm

@@ -16,19 +16,24 @@
 !ram_tilemap_buffer = $7EF500 ; 2048 bytes
 
 ; Shortcut routine is written on boot and each time the menu closes,
-; so it can use the same space as the practice hack menu tilemap buffer
-!CTRL_SHORTCUT_ROUTINE = $7EF502 ; up to 1883 bytes or +$75A
-!CTRL_SHORTCUT_TABLE = !CTRL_SHORTCUT_ROUTINE+$7B6 ; 48 bytes
-!CTRL_SHORTCUT_TYPE = !CTRL_SHORTCUT_ROUTINE+$7E6
-!CTRL_SHORTCUT_PRI = !CTRL_SHORTCUT_ROUTINE+$7E8
-!CTRL_SHORTCUT_SEC = !CTRL_SHORTCUT_ROUTINE+$7EA
-!CTRL_SHORTCUT_JSL_WORD_LSB = !CTRL_SHORTCUT_ROUTINE+$7EC
-!CTRL_SHORTCUT_JSL_WORD_MSB = !CTRL_SHORTCUT_ROUTINE+$7EE
-!CTRL_SHORTCUT_PRI_TO_SEC_DUAL_JUMP = !CTRL_SHORTCUT_ROUTINE+$7F0
-!CTRL_SHORTCUT_SEC_TO_DUAL_JUMP = !CTRL_SHORTCUT_ROUTINE+$7F2
-!CTRL_SHORTCUT_TABLE_PRI_INDEX = !CTRL_SHORTCUT_ROUTINE+$7F4
-!CTRL_SHORTCUT_TABLE_SEC_INDEX = !CTRL_SHORTCUT_ROUTINE+$7F6
-!CTRL_SHORTCUT_TABLE_DUAL_INDEX = !CTRL_SHORTCUT_ROUTINE+$7F8
+; so it can use the same space as the practice hack menu tilemap buffer.
+!CTRL_SHORTCUT_ROUTINE = $7EF502 ; up to 1941 bytes or through +$796
+!CTRL_SHORTCUT_PRI_UPDATE_TIMERS = !CTRL_SHORTCUT_ROUTINE+$7B0
+!CTRL_SHORTCUT_TABLE = !CTRL_SHORTCUT_ROUTINE+$7B2 ; 48 bytes
+!CTRL_SHORTCUT_TYPE = !CTRL_SHORTCUT_ROUTINE+$7E2
+!CTRL_SHORTCUT_PRI = !CTRL_SHORTCUT_ROUTINE+$7E4
+!CTRL_SHORTCUT_SEC = !CTRL_SHORTCUT_ROUTINE+$7E6
+!CTRL_SHORTCUT_JSL_WORD_LSB = !CTRL_SHORTCUT_ROUTINE+$7E8
+!CTRL_SHORTCUT_JSL_WORD_MSB = !CTRL_SHORTCUT_ROUTINE+$7EA
+!CTRL_SHORTCUT_PRI_TO_SEC_DUAL_JUMP = !CTRL_SHORTCUT_ROUTINE+$7EC
+!CTRL_SHORTCUT_SEC_TO_DUAL_JUMP = !CTRL_SHORTCUT_ROUTINE+$7EE
+!CTRL_SHORTCUT_TABLE_PRI_INDEX = !CTRL_SHORTCUT_ROUTINE+$7F0
+!CTRL_SHORTCUT_TABLE_SEC_INDEX = !CTRL_SHORTCUT_ROUTINE+$7F2
+!CTRL_SHORTCUT_TABLE_DUAL_INDEX = !CTRL_SHORTCUT_ROUTINE+$7F4
+; The following tracking variables are for Update Timers,
+; and they are only accurate and maintained enough to make that work
+!CTRL_SHORTCUT_TRACKING_PRI_PREV = !CTRL_SHORTCUT_ROUTINE+$7F6
+!CTRL_SHORTCUT_TRACKING_LANDED = !CTRL_SHORTCUT_ROUTINE+$7F8
 ; Shortcuts can skip remaining checks by replacing the return address word
 !CTRL_SHORTCUT_SKIP_REMAINING_PEA = !CTRL_SHORTCUT_ROUTINE+$7FA
 !CTRL_SHORTCUT_SKIP_REMAINING_PEA_VALUE = $FCFC
@@ -197,8 +202,8 @@
 !ram_suits_heat_damage_check        = !WRAM_PERSIST_START+$32
 !ram_pacifist                       = !WRAM_PERSIST_START+$34
 !ram_freeze_on_load                 = !WRAM_PERSIST_START+$36
+!ram_drop_chance_table              = !WRAM_PERSIST_START+$38
 
-!ram_spacetime_infohud              = !WRAM_PERSIST_START+$38
 !ram_watch_left_index               = !WRAM_PERSIST_START+$3A
 !ram_watch_right_index              = !WRAM_PERSIST_START+$3C
 !ram_watch_write_mode               = !WRAM_PERSIST_START+$3E
@@ -220,7 +225,6 @@
 !ram_frames_held                    = !WRAM_PERSIST_START+$5C
 !ram_quickboot_spc_state            = !WRAM_PERSIST_START+$5E
 !ram_display_backup                 = !WRAM_PERSIST_START+$60
-!ram_drop_chance_table              = !WRAM_PERSIST_START+$62
 
 ; ^ FREE SPACE ^ up to +$7C (!WRAM_START+$FC - !WRAM_PERSIST_START)
 
@@ -361,6 +365,9 @@
 !ram_cm_ceres_seconds = !WRAM_MENU_START+$90
 !ram_cm_zebes_seconds = !WRAM_MENU_START+$92
 
+!ram_cm_sprites_spacetime = !WRAM_MENU_START+$90
+!ram_cm_sprites_xray = !WRAM_MENU_START+$92
+
 !ram_cm_ctrl_add_shortcut_slot = !WRAM_MENU_START+$90
 !ram_cm_ctrl_last_pri = !WRAM_MENU_START+$92
 !ram_cm_ctrl_last_sec = !WRAM_MENU_START+$94
@@ -369,6 +376,8 @@
 !ram_cm_ctrl_timer = !WRAM_MENU_START+$9A
 !ram_cm_ctrl_savestates_allowed = !WRAM_MENU_START+$9C
 
+!ram_cm_updatetimers_ctrl = !WRAM_MENU_START+$90
+
 !ram_cm_sfxlib1 = !WRAM_MENU_START+$90
 !ram_cm_sfxlib2 = !WRAM_MENU_START+$92
 !ram_cm_sfxlib3 = !WRAM_MENU_START+$94
@@ -475,7 +484,7 @@
 ; SRAM
 ; -----
 
-!SRAM_VERSION = #$001D
+!SRAM_VERSION = #$001E
 
 !SRAM_START = $702000
 !SRAM_SIZE = #$1000
@@ -560,6 +569,8 @@
 !sram_bonk_indicators = !SRAM_START+$A6
 !sram_speed_booster_physics = !SRAM_START+$A8
 !sram_fast_teleport = !SRAM_START+$AA
+!sram_update_timers_ctrl_input = !SRAM_START+$AC
+!sram_update_timers_options = !SRAM_START+$AE
 
 ; ^ FREE SPACE ^ up to +$EC
 
@@ -979,7 +990,11 @@
 !SAMUS_BOMB_SPREAD_CHARGE_TIMER = $0CD4
 !SAMUS_POWER_BOMB_X = $0CE2
 !SAMUS_POWER_BOMB_Y = $0CE4
+!OFFSCREEN_HDMA_INDEX = $0D1E
 !CURRENT_BLOCK_INDEX = $0DC4
+!SAMUS_VERTICAL_COLLISION_RESULT = $0DC6
+!SAMUS_X_SPEED_KILLED = $0DCE
+!SAMUS_SOLID_COLLISION_FLAG = $0DD0
 !PREVIOUS_CONTROLLER_PRI = $0DFE
 !PREVIOUS_CONTROLLER_PRI_NEW = $0E00
 !ELEVATOR_PROPERTIES = $0E16
@@ -1363,6 +1378,20 @@ endif
 !SPRITE_ENEMY_PROJ = #$0020
 !SPRITE_32x32_PROJ = #$0040
 !SPRITE_OOB_WATCH = #$0080
+!SPRITE_HUD_SPACETIME = #$0100
+!SPRITE_HUD_XRAY = #$0200
+!SPRITE_HUD_SPACETIME_INVERTED = #$FEFF
+!SPRITE_HUD_XRAY_INVERTED = #$FDFF
+
+!UPDATE_TIMERS_CTRL_SHORTCUT_TYPE = $05
+
+!UPDATE_TIMERS_ALWAYS = #$0001
+!UPDATE_TIMERS_ON_LANDED = #$0002
+!UPDATE_TIMERS_ON_PRESS = #$0004
+!UPDATE_TIMERS_ON_HOLD = #$0008
+!UPDATE_TIMERS_ON_PRESS_HOLD = #$000C
+!UPDATE_TIMERS_ON_RELEASE = #$0010
+!UPDATE_TIMERS_ON_HOLD_RELEASE = #$0018
 
 !CUTSCENE_SKIP_INTRO = #$0001
 !CUTSCENE_SKIP_CERES_ARRIVAL = #$0002

src/freespace.asm

@@ -248,7 +248,7 @@ endif
 !END_FREESPACE_CE = $CE0000+$10000
 !END_FREESPACE_DE = $DE0000+$10000
 !END_FREESPACE_DF = $DF0000+$10000
-!END_FREESPACE_E0 = $E00000+$10000
+!END_FREESPACE_E0 = $E00000+$E7E0 ; preserve_wram.asm
 !END_FREESPACE_E1 = $E10000+$10000
 !END_FREESPACE_E2 = $E20000+$10000
 !END_FREESPACE_E3 = $E30000+$10000