Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/defines.asm
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,7 @@
!DEMO_PREINSTRUCTION_POINTER = $0A7A
!DEMO_INSTRUCTION_TIMER = $0A7C
!DEMO_INSTRUCTION_POINTER = $0A7E
!XRAY_ANGLE = $0A82
!DEMO_CONTROLLER_PRI = $0A84
!DEMO_INPUT_ENABLED = $0A88
!DEMO_PREVIOUS_CONTROLLER_PRI = $0A8C
Expand Down Expand Up @@ -1171,9 +1172,10 @@
!MAP_TILES_EXPLORED_CERES = $7ED352
!MAP_TILES_EXPLORED_DEBUG = $7ED452
!EVENT_BIT_ARRAY = $7ED820
!MAP_DATA_EXPLORED_COMPRESSED = $7ED91C
!OPENED_DOOR_BIT_ARRAY = $7ED8B0
!MAP_STATION_FLAGS = $7ED908
!LOADING_GAME_STATE = $7ED914
!MAP_DATA_EXPLORED_COMPRESSED = $7ED91C

!INPUT_BIND_UP = $7E09AA
!INPUT_BIND_DOWN = $7E09AC
Expand Down Expand Up @@ -1378,9 +1380,10 @@ endif
!SPRITE_32x32_PROJ = #$0040
!SPRITE_OOB_WATCH = #$0080
!SPRITE_HUD_SPACETIME = #$0100
!SPRITE_HUD_XRAY = #$0200
!SPRITE_HUD_SPACETIME_INVERTED = #$FEFF
!SPRITE_HUD_XRAY = #$0200
!SPRITE_HUD_XRAY_INVERTED = #$FDFF
!SPRITE_OOB_X_WRAP = #$0400

!UPDATE_TIMERS_CTRL_SHORTCUT_TYPE = $05

Expand Down
2 changes: 1 addition & 1 deletion src/main.asm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ lorom
!VERSION_MAJOR = 2
!VERSION_MINOR = 7
!VERSION_BUILD = 7
!VERSION_REV = 0
!VERSION_REV = 1

table ../resources/normal.tbl
print ""
Expand Down
4 changes: 4 additions & 0 deletions src/mainmenu.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,7 @@ if !PRESERVE_WRAM
endif
dw #$FFFF
dw #sprites_oob_viewer
dw #sprites_oob_show_x_wrap
dw #$0000
%cm_header("SPRITE FEATURES")

Expand Down Expand Up @@ -1904,6 +1905,9 @@ sprites_oob_viewer:
.skip_oob
RTL

sprites_oob_show_x_wrap:
%cm_toggle_bit("OoB Show X Wraparound", !ram_sprite_feature_flags, !SPRITE_OOB_X_WRAP, #0)


; --------------
; Infohud menu
Expand Down
2 changes: 2 additions & 0 deletions src/preserve_wram.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1498,6 +1498,7 @@ xray_offscreen_up_right:
.rightLostThirdLoop
LDA #$FF : STA [$00],Y
DEY #2 : BPL .rightLostThirdLoop
%a16()

.rightEdgeEnd
LDY $12
Expand Down Expand Up @@ -1739,6 +1740,7 @@ xray_offscreen_up_left:
.rightLostThirdLoop
LDA #$00 : STA [$00],Y
DEY #2 : BPL .rightLostThirdLoop
%a16()

.rightEdgeEnd
LDY $14
Expand Down
51 changes: 50 additions & 1 deletion src/ramwatchmenu.asm
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ RAMWatchCommonMenu:
dw ramwatch_common_proj
dw ramwatch_common_misc
dw ramwatch_common_anyglitched
dw ramwatch_common_zeropercent
dw #$0000
%cm_header("CHOOSE RAM CATEGORY")

Expand All @@ -82,7 +83,10 @@ ramwatch_common_misc:
%cm_submenu("Misc Addresses", #RAMWatchCommonMiscMenu)

ramwatch_common_anyglitched:
%cm_submenu("Any% Glitched", #RAMWatchCommonAnyGlitchedMenu)
%cm_submenu("Any% Glitched Addresses", #RAMWatchCommonAnyGlitchedMenu)

ramwatch_common_zeropercent:
%cm_submenu("0% Addresses", #RAMWatchCommonZeroPercentMenu)

RAMWatchCommonEnemyMenu:
dw ramwatch_common_enemy_side
Expand Down Expand Up @@ -488,6 +492,7 @@ RAMWatchCommonMiscMenu:
dw ramwatch_common_misc_09DC
dw ramwatch_common_misc_09DE
dw ramwatch_common_misc_09E0
dw ramwatch_common_misc_0A82
dw ramwatch_common_misc_0DC4
dw ramwatch_common_misc_0E50
dw ramwatch_common_misc_0E52
Expand Down Expand Up @@ -519,6 +524,9 @@ ramwatch_common_misc_09DE:
ramwatch_common_misc_09E0:
%cm_jsl("Game Time, Hours", action_select_common_address, #!IGT_HOURS)

ramwatch_common_misc_0A82:
%cm_jsl("X-Ray Angle", action_select_common_address, #!XRAY_ANGLE)

ramwatch_common_misc_0DC4:
%cm_jsl("Current Block Index", action_select_common_address, #!CURRENT_BLOCK_INDEX)

Expand Down Expand Up @@ -596,6 +604,47 @@ ramwatch_common_anyglitched_1D5B:
ramwatch_common_anyglitched_D820:
%cm_jsl("D820 Zebes Ablaze F---", action_select_common_address, #!EVENT_BIT_ARRAY)

RAMWatchCommonZeroPercentMenu:
dw ramwatch_common_zeropercent_09A2
dw ramwatch_common_zeropercent_09A4
dw ramwatch_common_zeropercent_09C8
dw ramwatch_common_zeropercent_D820
dw ramwatch_common_zeropercent_D82E
dw ramwatch_common_zeropercent_D8B0
dw ramwatch_common_zeropercent_D914
dw ramwatch_common_zeropercent_78F6
dw ramwatch_common_zeropercent_92F2
dw #$0000
%cm_header("SELECT 0% RAM")
%cm_footer("DESIRED VALUE ON RIGHT")

ramwatch_common_zeropercent_09A2:
%cm_jsl(" 09A2 Equipped Items FFFF", action_select_common_address, #!SAMUS_ITEMS_EQUIPPED)

ramwatch_common_zeropercent_09A4:
%cm_jsl(" 09A4 Collected Items 0000", action_select_common_address, #!SAMUS_ITEMS_COLLECTED)

ramwatch_common_zeropercent_09C8:
%cm_jsl(" 09C8 Max Missiles 0000", action_select_common_address, #!SAMUS_MISSILES_MAX)

ramwatch_common_zeropercent_D820:
%cm_jsl(" D820 Zebes Ablaze F---", action_select_common_address, #!EVENT_BIT_ARRAY)

ramwatch_common_zeropercent_D82E:
%cm_jsl(" D82E Ceres Ridley ---0", action_select_common_address, #(!EVENT_BIT_ARRAY+$E))

ramwatch_common_zeropercent_D8B0:
%cm_jsl(" D8B0 Opened Door F---", action_select_common_address, #!OPENED_DOOR_BIT_ARRAY)

ramwatch_common_zeropercent_D914:
%cm_jsl(" D914 Load Game State 0000", action_select_common_address, #!LOADING_GAME_STATE)

ramwatch_common_zeropercent_78F6:
%cm_jsl("178F6 5D Block 5D--", action_select_common_address, #$7F78F6)

ramwatch_common_zeropercent_92F2:
%cm_jsl("192F2 Exit Block --81", action_select_common_address, #$7F92F2)

action_select_common_address:
{
TYA : STA !ram_cm_watch_common_address
Expand Down
Loading
Loading