From ed7dad1ae175be49551583e1a396bfd5660e9b44 Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Mon, 5 Oct 2026 12:54:43 -0400
Subject: [PATCH 1/5] objectives screen: show areas if discovered

---
 patches/ips/pause_menu_objectives.ips | Bin 2354 -> 2809 bytes
 patches/rom_map/Bank 85.txt           |   1 +
 patches/src/constants.asm             |   1 +
 patches/src/pause_menu_objectives.asm | 304 ++++++++++++++++++++------
 rust/maprando/src/patch.rs            |  46 ++--
 scripts/build_ips.py                  |   2 +-
 6 files changed, 268 insertions(+), 86 deletions(-)

diff --git a/patches/ips/pause_menu_objectives.ips b/patches/ips/pause_menu_objectives.ips
index dec655bff2d9c0240a95f09485146d29bb089557..eaa86fd9e74dbb043e548ab0d8e3f97e764bac86 100644
GIT binary patch
delta 848
zcmZWjT}V@57=FK<ZQALgk~NNNKc|(t6Bg^n+%D1!i!qHZf(r9uM1q-tL?Fn~jqJcs
zX&Wc0m}?dsaZ3{t`axtv+ChV4Hw`f|5R!vqIgo_L==2>?$n`z&yzl!w@6Y$9;`h;D
zP3^r=ZewEuRcS!m_C1VqRBZyH=$BFTY0z4aMHHzfjMI;!p(}Re4?R4?Se|npt5YGb
zLYoRzMLEyZP0QySmNY>xeDJ8kwE9`-YbAOS`gM(Hfz-?dszt7zD0gS5`PCQ+F9GIS
zB2jl;za;tn>8)MqY9u;XBHfQfyGo>f-bk2qp8v-?`AbBbVw6sF@^i#A>f!II&!flu
zq?$ST+D^ohFp`#}SmTru*67&Vk@P$*#lWW2kL(2hMNOk&ep~H8Ju`NV5qVW9K<CDM
zFkO@%FtRt_cS}F6r-xGca(X-!J6Pqr-YV!hGf9&5Kg@9|p~(dn5en8hv(7AMNI)*I
z5>KcgP@ud-F2GR<RW88DKzXqfPaFnJ0PnHFndx__Uc59&3TEoI?^G1(`=vutcwN7H
zJEc!^d>=A-%V!hVTl{9rt0l>|W%HB^2F@r@E(YZ6L<e3LUuhl0!Nt(PSvwdDa1~4$
zxP%I~+s)~oV#`3aTS<~?*TvW9!K`4;;(ye17aG))!MvuoV5|2C#yr_uaB@az-tL<g
zOnIGBnFPZT<<`7iIkVt<f_o{xSvzY&1fkUq4=*owchfWg+E?=@%08)7Ftb_Kh`cN-
z;+IS+%(4IjtV48&4M~LuSQ(%QBE}wrT$DwOJqGNp!#1qK(oP>Z#LD#p+s9YWE-4%2
z9WetLV4(||0I=^6nGBN|VEL}uCRvg8KZkhaC;G!=ltyI%K5hR8AeZ36<%@p-o0epz

delta 443
zcmew<x=Cn)y3Xl2t*>6aVpL^iV2iN;u^H858JPcc{AX0tWnfb(nF|t9pABTn&Yc)+
z!1!=ti=Jl1yw(Jz$spneh)|giB%*-C+9dh2(ef9V6;A9-V4AJKa&F>nNycjvzlO&w
zXkb|X=YNyt|N2&;56X)e7;Y&Xnf-xxx5E9|E4fwYGg#C$uz)x(Ud;aW;)&3O2dfiq
zb#bj)S;x@IwEw{C{#J(lFMuS=a)w_jED8I8>QCO)_`vewMZ@QW&Hju!jP+~gw`O;H
zuU^2#05pB?(z)}!%<5je=;*lc87j1X?))w^p|f-6=b#B)pF4jIs?cgAV|QX2dl+Ku
z<X=o-B0y<$^A1l=VP4O;X0iy29pl@{!7Q4S7qBQW9-MrT#gcK&=HDzbjFW@ecL9T(
hfsLVu;RZtig8~COn5@Ndiiy!-^EVC$MrK!kHvpo6y-WZA

diff --git a/patches/rom_map/Bank 85.txt b/patches/rom_map/Bank 85.txt
index e7bf5015a0..e3b2c9f919 100644
--- a/patches/rom_map/Bank 85.txt	
+++ b/patches/rom_map/Bank 85.txt	
@@ -22,3 +22,4 @@ AD43 - AEDB: ; reserve_backward_fill.asm
 AEE0 - B599: ; crash_handle_base.asm
 B600 - B93E: ; map_area.asm
 C000 - C450: ; savestate.asm
+C500 - C700: ; pause_menu_objectives.asm
diff --git a/patches/src/constants.asm b/patches/src/constants.asm
index d5c357be6d..4861e0807d 100644
--- a/patches/src/constants.asm
+++ b/patches/src/constants.asm
@@ -47,6 +47,7 @@
 !objectives_num = $82FFFC ; bits 0-15
 !objectives_addrs = $8FEBC0
 !objectives_bitmasks #= !objectives_addrs+(2*!objectives_max)
+!objectives_tiles = $8FED00
 
 ; range of item PLMs in bank 84
 !item_plm_start = #$DF89
diff --git a/patches/src/pause_menu_objectives.asm b/patches/src/pause_menu_objectives.asm
index 3c67e5b759..dd4bd8ca49 100644
--- a/patches/src/pause_menu_objectives.asm
+++ b/patches/src/pause_menu_objectives.asm
@@ -30,6 +30,9 @@ incsrc "constants.asm"
 !bank_85_free_space2_start = $85AA00
 !bank_85_free_space2_end = $85AAA0
 
+!bank_85_free_space3_start = $85C500
+!bank_85_free_space3_end = $85C700
+
 !bank_B6_free_space_start = $B6F200
 !bank_B6_free_space_end = $B6F660
 
@@ -274,7 +277,7 @@ draw_samus_indicator:
     rts
 
 print "82 end: ", PC
-warnpc !bank_82_free_space_end
+assert pc() <= !bank_82_free_space_end
 
 ;;; continue in bank 85 for obj screen management code
 org !bank_85_free_space_start
@@ -334,65 +337,7 @@ pad_0:
     RTS
     
 check_objs:
-;;; check objectives and add check marks
-    LDY.w #!line_size*2            ; start of 1st line
-    LDA !objectives_num : AND #$7FFF
-    STA !tmp_tile_offset           ; # objectives
-    BEQ .exit
-    LDX #$0000
-
-.obj_check_lp
-    PHX
-    JSR check_objective
-    BEQ .nocheck
-
-    ; find the next check character and mark it green
-    TYX
-    JSR find_next_check
-    LDA #$250B                     ; check mark (green)
-    STA !BG1_tilemap, x        
-    BRA .next
-
-.nocheck:
-    ; find the next check character and skip marking it
-    TYX                            ; X <- position in tilemap 
-    JSR find_next_check
-
-.next:    
-    INX : INX                      ; advance to next position in tilemap
-    TXY
-    PLX                            ; X <- objective number
-    INX
-    CPX !tmp_tile_offset
-    BNE .obj_check_lp
-.exit
-    PLB
-    RTS
-
-check_objective: ; X = index
-    PHX
-    TXA
-    ASL
-    TAX
-    LDA.w #$007E
-    STA.b $02
-    LDA.l !objectives_addrs, X
-    STA.b $00
-    LDA.l !objectives_bitmasks, X
-    STA.b $04
-    LDA.b [$00]
-    PLX
-    BIT.b $04
-    RTS
-
-find_next_check:
-    LDA !BG1_tilemap, x
-    CMP !check_char                ; tile to switch?
-    BEQ .found
-    INX : INX
-    BRA find_next_check
-.found:
-    RTS
+    JMP check_objs_2
     
 ;;; direct DMA of BG1 tilemap to VRAM
 blit_objs:
@@ -744,6 +689,7 @@ func_map2obj_load_obj:
     STA $0723                      ; Screen fade delay = 1
     STA $0725                      ; Screen fade counter = 1
     INC !pause_index               ; Pause index = B (map screen to objective screen - fading in)
+    %queueGfxDMA(obj_letters, $2800, $00C0) ; Color-coded area letters
     LDA !room_name_option
     BEQ .skip_name
     JSR fill_bottom_frame
@@ -854,7 +800,7 @@ obj_bg1_tilemap:
     dw $280F, "OBJECTIVES", $280F
 
 print "85 end: ", pc
-warnpc !bank_85_free_space_end
+assert pc() <= !bank_85_free_space_end
 
 ;; routines for bottom frame screen swap / map switching
 org !bank_85_free_space2_start
@@ -925,13 +871,221 @@ fix_palette:
     STA $7EC04A
     RTS
     
-warnpc !bank_85_free_space2_end
+assert pc() <= !bank_85_free_space2_end
+
+org !bank_85_free_space3_start
+check_objs_2:
+;;; check objectives and add check marks / area letters
+;;; PHB is on stack
+    LDY.w #!line_size*2         ; start of 1st line
+    LDA !objectives_num : AND #$7FFF
+    BEQ .exit
+    STZ $16                     ; obj index
+    
+.obj_check_lp
+    LDX $16
+    JSR objective_done
+    BEQ .check_if_seen
+; find the next check character and mark it done
+    JSR find_next_check
+    LDA #$250B                  ; check mark       
+    BRA .write_tile
+
+.check_if_seen
+    PHY                         ; tilemap ptr
+; obj # * 7
+    LDA $16
+    STA $1E
+    ASL
+    ASL
+    ASL
+    SEC
+    SBC $1E
+    TAX                         ; obj tiles table ptr
+    CLC
+    LDA !objectives_tiles+5,X   ; grid size to check
+    CMP #$0101                  ; valid size?
+    BCC .skip_check
+    DEC
+    XBA
+    DEC
+    XBA
+    STA $1A                     ; grid x-1, y-1
+    LDA !objectives_tiles,X     ; room hdr
+    PHX
+    TAX
+    LDA $8F0002,X               ; x, y origin
+    PLX
+    CLC
+    ADC !objectives_tiles+3,X   ; add offset from top/left of room
+    STA $18
+    LDA !objectives_tiles+2,X   ; state hdr offset
+    AND #$00FF
+    CLC
+    ADC !objectives_tiles,X     ; room hdr
+    TAX
+    LDA $8F0010,X
+    TAX
+    LDA $B80000,X               ; area
+    AND #$00FF
+    STA $1E
+    JSR check_partial_reveal
+.skip_check
+    PLY
+    JSR find_next_check         ; carry preserved
+    BCC .next
+    LDA $1E                     ; area
+    CLC
+    ADC #$2A80                  ; area letters (VRAM)
+.write_tile
+    STA !BG1_tilemap,X
+
+.next:    
+    INX : INX                   ; advance to next position in tilemap
+    TXY
+    INC $16
+    LDA !objectives_num : AND #$7FFF
+    CMP $16
+    BNE .obj_check_lp
+
+.exit
+    PLB
+    RTS
+
+objective_done:
+; X = index
+    PHX
+    TXA
+    ASL
+    TAX
+    LDA.w #$007E
+    STA.b $02
+    LDA.l !objectives_addrs,X
+    STA.b $00
+    LDA.l !objectives_bitmasks,X
+    STA.b $04
+    LDA.b [$00]
+    PLX
+    BIT.b $04
+    RTS
+
+find_next_check:
+; Y = tilemap ptr
+    PHP
+    TYX
+.next_lp
+    LDA !BG1_tilemap,X
+    CMP !check_char             ; tile to switch?
+    BEQ .found
+    INX : INX
+    BRA .next_lp
+.found:
+    PLP
+    RTS
+
+check_partial_reveal:
+; $18 = origin x, y (already offset adjusted)
+; $1A = grid size x-1, y-1
+; $1C = columns left
+; $1D = rows left
+; result in carry flag
+    PHP
+    LDA $1A
+    STA $1C
+    LDA $18
+    PHA
+    AND #$FF00
+    XBA
+    TAY
+    PLA
+    AND #$00FF
+    TAX
+; X, Y = origin
+.next
+    PHX                         ; save current x, y
+    PHY
+    TXA
+    AND #$00FF
+    PHA
+    AND #$0020
+    STA $22
+    PLA
+    AND #$001F
+    STA $12
+    AND #$0007
+    PHA                         ; save bit subindex of tile
+    LDA $12
+    LSR
+    LSR
+    LSR
+    STA $14
+    TYA
+    AND #$00FF
+    INC
+    CLC
+    ADC $22
+    ASL
+    ASL
+    CLC
+    ADC $14
+    TAX
+    SEP #$20
+    TXA
+    XBA
+    LDA $1E                     ; area
+    XBA
+    TAX
+    LDA $702700,X               ; partial revealed byte
+    PLX                         ; bit subindex of tile
+    AND $90AC04,X               ; check bit
+    BEQ .not_revealed
+    PLY
+    PLX
+    PLP
+    SEC
+    RTS
+    
+.not_revealed
+    LDA $1C
+    BEQ .x_done
+    PLY                         ; current x, y
+    PLX
+    DEC
+    STA $1C                     ; cols--
+    INX
+    REP #$30
+    BRA .next
+    
+.x_done
+    LDA $1D
+    BEQ .done
+    PLY                         ; current x, y
+    PLX
+    DEC
+    STA $1D                     ; rows--
+    LDA $1A
+    STA $1C
+    LDA $18
+    REP #$30
+    AND #$00FF
+    TAX
+    INY
+    BRA .next
+    
+.done
+    PLY                         ; fix stack
+    PLX
+    PLP
+    CLC
+    RTS
+
+assert pc() <= !bank_85_free_space3_end
 
 org !bank_B6_free_space_start
 obj_txt_ptrs:
 ;; max size for single screen: (30 char dw + terminating dw) * 18 lines = 1116 bytes
 
-warnpc !bank_B6_free_space_end
+assert pc() <= !bank_B6_free_space_end
 
 ; objective screen tiles
 ; 'Q'
@@ -961,8 +1115,8 @@ org $b6a0c0
 
 ; check mark
 org $b6a160
-    db $01, $00, $03, $00, $06, $00, $8C, $00, $D8, $00, $70, $00, $20, $00, $00, $00
-    db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+    db $01, $01, $03, $03, $06, $06, $8C, $8C, $D8, $D8, $70, $70, $20, $20, $00, $00
+    db $01, $01, $03, $03, $06, $06, $8C, $8C, $D8, $D8, $70, $70, $20, $20, $00, $00
 
 ; top of 'OBJ' button
 org $b6a180
@@ -1004,3 +1158,23 @@ db $7C, $00, $C6, $00, $C6, $00, $7C, $00, $C6, $00, $C6, $00, $7C, $00, $00, $0
 db $FF, $7C, $FF, $C6, $FF, $C6, $FF, $7C, $FF, $C6, $FF, $C6, $FF, $7C, $FF, $00
 db $7C, $00, $C6, $00, $C6, $00, $7E, $00, $06, $00, $C6, $00, $7C, $00, $00, $00
 db $FF, $7C, $FF, $C6, $FF, $C6, $FF, $7E, $FF, $06, $FF, $C6, $FF, $7C, $FF, $00
+
+obj_letters:
+; C
+db $7C, $7C, $C6, $C6, $C6, $C6, $C0, $C0, $C6, $C6, $C6, $C6, $7C, $7C, $00, $00
+db $83, $7C, $39, $C6, $39, $C6, $3F, $C0, $39, $C6, $39, $C6, $83, $7C, $FF, $00
+; B
+db $00, $FC, $00, $C6, $00, $C6, $00, $FC, $00, $C6, $00, $C6, $00, $FC, $00, $00
+db $FF, $FC, $FF, $C6, $FF, $C6, $FF, $FC, $FF, $C6, $FF, $C6, $FF, $FC, $FF, $00
+; N
+db $00, $C6, $00, $E6, $00, $F6, $00, $DE, $00, $CE, $00, $C6, $00, $C6, $00, $00
+db $39, $C6, $19, $E6, $09, $F6, $21, $DE, $31, $CE, $39, $C6, $39, $C6, $FF, $00
+; W
+db $C6, $00, $C6, $00, $D6, $00, $D6, $00, $7C, $00, $6C, $00, $44, $00, $00, $00
+db $39, $C6, $39, $C6, $29, $D6, $29, $D6, $83, $7C, $93, $6C, $BB, $44, $FF, $00
+; M
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $39, $C6, $11, $EE, $01, $FE, $29, $D6, $39, $C6, $39, $C6, $39, $C6, $FF, $00
+; T
+db $00, $FC, $00, $30, $00, $30, $00, $30, $00, $30, $00, $30, $00, $30, $00, $00
+db $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index 2f2b932105..63d2c2f130 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -3577,29 +3577,35 @@ impl Patcher<'_> {
         obj_coords_vec.sort();
         for (obj_i, coords) in obj_coords_vec.iter().enumerate() {
             let obj = obj_coords[coords];
-            let (addr, mask) = match obj {
-                Kraid => (0xD829, 1),
-                Ridley => (0xD82A, 1),
-                Phantoon => (0xD82B, 1),
-                Draygon => (0xD82C, 1),
-                SporeSpawn => (0xD829, 2),
-                Crocomire => (0xD82A, 2),
-                Botwoon => (0xD82C, 2),
-                GoldenTorizo => (0xD82A, 4),
-                MetroidRoom1 => (0xD822, 1),
-                MetroidRoom2 => (0xD822, 2),
-                MetroidRoom3 => (0xD822, 4),
-                MetroidRoom4 => (0xD822, 8),
-                BombTorizo => (0xD828, 4),
-                BowlingStatue => (0xD823, 1),
-                AcidChozoStatue => (0xD821, 0x10),
-                PitRoom => (0xD823, 2),
-                BabyKraidRoom => (0xD823, 4),
-                PlasmaRoom => (0xD823, 8),
-                MetalPiratesRoom => (0xD823, 0x10),
+            let (addr, mask, room_hdr, offset_state_hdr, offset_x, offset_y, obj_tiles_x, obj_tiles_y) = match obj {
+                Kraid => (0xD829, 1, 0xA59F, 18, 0, 0, 2, 2),
+                Ridley => (0xD82A, 1, 0xB32E, 18, 0, 0, 1, 2),
+                Phantoon => (0xD82B, 1, 0xCD13, 18, 0, 0, 1, 1),
+                Draygon => (0xD82C, 1, 0xDA60, 18, 0, 0, 2, 2),
+                SporeSpawn => (0xD829, 2, 0x9DC7, 18, 0, 0, 1, 3),
+                Crocomire => (0xD82A, 2, 0xA98D, 18, 0, 0, 8, 1),
+                Botwoon => (0xD82C, 2, 0xD95E, 18, 0, 0, 2, 1),
+                GoldenTorizo => (0xD82A, 4, 0xB283, 18, 0, 0, 2, 2),
+                MetroidRoom1 => (0xD822, 1, 0xDAE1, 18, 0, 0, 6, 1),
+                MetroidRoom2 => (0xD822, 2, 0xDB31, 18, 0, 0, 1, 2),
+                MetroidRoom3 => (0xD822, 4, 0xDB7D, 18, 0, 0, 6, 1),
+                MetroidRoom4 => (0xD822, 8, 0xDBCD, 18, 0, 0, 1, 2),
+                BombTorizo => (0xD828, 4, 0x9804, 23, 0, 0, 1, 1),
+                BowlingStatue => (0xD823, 1, 0xC98E, 18, 4, 1, 1, 1),
+                AcidChozoStatue => (0xD821, 0x10, 0xB1E5, 13, 0, 0, 1, 1),
+                PitRoom => (0xD823, 2, 0x99BD, 13, 0, 0, 3, 1),
+                BabyKraidRoom => (0xD823, 4, 0xA521, 18, 0, 0, 6, 1),
+                PlasmaRoom => (0xD823, 8, 0xD2AA, 13, 0, 0, 2, 3),
+                MetalPiratesRoom => (0xD823, 0x10, 0xB62B, 13, 0, 0, 3, 1),
             };
             self.rom.write_u16(snes2pc(0x8FEBC0) + obj_i * 2, addr)?;
             self.rom.write_u16(snes2pc(0x8FEBE8) + obj_i * 2, mask)?;
+            self.rom.write_u16(snes2pc(0x8FED00) + obj_i * 7, room_hdr)?;
+            self.rom.write_u8(snes2pc(0x8FED02) + obj_i * 7, offset_state_hdr)?;
+            self.rom.write_u8(snes2pc(0x8FED03) + obj_i * 7, offset_x)?;
+            self.rom.write_u8(snes2pc(0x8FED04) + obj_i * 7, offset_y)?;
+            self.rom.write_u8(snes2pc(0x8FED05) + obj_i * 7, obj_tiles_x)?;
+            self.rom.write_u8(snes2pc(0x8FED06) + obj_i * 7, obj_tiles_y)?;
         }
 
         Ok(())
diff --git a/scripts/build_ips.py b/scripts/build_ips.py
index 0438568c17..d26e6edb01 100644
--- a/scripts/build_ips.py
+++ b/scripts/build_ips.py
@@ -132,7 +132,7 @@ def check_range(filename, other_filename, overlap_start, overlap_end):
     ],
     'pause_menu_objectives': [
         ['map_area', 0x82910A, 0x82910D],
-        ['hud_expansion_opaque', 0xB69A00, 0xB6AD40]
+        ['hud_expansion_opaque', 0xB69A00, 0xB6AE00]
     ],
     'hud_expansion_opaque': [
         ['max_ammo_display_fast', 0x858851, 0x858A93],

From 91961005af90cc0ac96826b5f0bda23c1769abe5 Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Mon, 5 Oct 2026 12:59:43 -0400
Subject: [PATCH 2/5] formatting..

---
 rust/maprando/src/patch.rs | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index 63d2c2f130..43e8d8e4c4 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -3577,7 +3577,16 @@ impl Patcher<'_> {
         obj_coords_vec.sort();
         for (obj_i, coords) in obj_coords_vec.iter().enumerate() {
             let obj = obj_coords[coords];
-            let (addr, mask, room_hdr, offset_state_hdr, offset_x, offset_y, obj_tiles_x, obj_tiles_y) = match obj {
+            let (
+                addr,
+                mask,
+                room_hdr,
+                offset_state_hdr,
+                offset_x,
+                offset_y,
+                obj_tiles_x,
+                obj_tiles_y,
+            ) = match obj {
                 Kraid => (0xD829, 1, 0xA59F, 18, 0, 0, 2, 2),
                 Ridley => (0xD82A, 1, 0xB32E, 18, 0, 0, 1, 2),
                 Phantoon => (0xD82B, 1, 0xCD13, 18, 0, 0, 1, 1),
@@ -3600,12 +3609,16 @@ impl Patcher<'_> {
             };
             self.rom.write_u16(snes2pc(0x8FEBC0) + obj_i * 2, addr)?;
             self.rom.write_u16(snes2pc(0x8FEBE8) + obj_i * 2, mask)?;
-            self.rom.write_u16(snes2pc(0x8FED00) + obj_i * 7, room_hdr)?;
-            self.rom.write_u8(snes2pc(0x8FED02) + obj_i * 7, offset_state_hdr)?;
+            self.rom
+                .write_u16(snes2pc(0x8FED00) + obj_i * 7, room_hdr)?;
+            self.rom
+                .write_u8(snes2pc(0x8FED02) + obj_i * 7, offset_state_hdr)?;
             self.rom.write_u8(snes2pc(0x8FED03) + obj_i * 7, offset_x)?;
             self.rom.write_u8(snes2pc(0x8FED04) + obj_i * 7, offset_y)?;
-            self.rom.write_u8(snes2pc(0x8FED05) + obj_i * 7, obj_tiles_x)?;
-            self.rom.write_u8(snes2pc(0x8FED06) + obj_i * 7, obj_tiles_y)?;
+            self.rom
+                .write_u8(snes2pc(0x8FED05) + obj_i * 7, obj_tiles_x)?;
+            self.rom
+                .write_u8(snes2pc(0x8FED06) + obj_i * 7, obj_tiles_y)?;
         }
 
         Ok(())

From 7afc5237387a4c2cdddf1c391483ab751b89bd25 Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Wed, 7 Oct 2026 12:49:37 -0400
Subject: [PATCH 3/5] optimizations

---
 patches/ips/pause_menu_objectives.ips | Bin 2809 -> 2798 bytes
 patches/src/pause_menu_objectives.asm |  21 ++++++---------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/patches/ips/pause_menu_objectives.ips b/patches/ips/pause_menu_objectives.ips
index eaa86fd9e74dbb043e548ab0d8e3f97e764bac86..5672335b70b64cf9a528357b8602df93111b647a 100644
GIT binary patch
delta 100
zcmV-q0Gt2$748+V8wN8hpnw3c{QrU}|9|j!WEQ3tAcn>82q2rqsS725Q(C1K3JMB1
z<rb<KzXk1&IOzcakTR1~1~3Jz#d;u{lZXZ!6^g51iVCW~=<AP#1i!%RkE*`_0DiN-
G208?J&nnvh

delta 134
zcmaDS`crg+G@FI_f(C~5fBrXV{;&T~n<BPMOriVe2M&d0M^|#IHbg`%6>F8_;^MM+
zDz{2vKkM86lZ=cL%&cBpy`JpHW?-}ZXcbW91g@oW5}6HJ^BFAaUc8w7Oblw?QLziH
ks}pW@ajjZe$I!~O|G?}1R)+mAfF#RuhF_bvuvxJH0LK13+5i9m

diff --git a/patches/src/pause_menu_objectives.asm b/patches/src/pause_menu_objectives.asm
index dd4bd8ca49..740f113f12 100644
--- a/patches/src/pause_menu_objectives.asm
+++ b/patches/src/pause_menu_objectives.asm
@@ -893,23 +893,18 @@ check_objs_2:
 
 .check_if_seen
     PHY                         ; tilemap ptr
-; obj # * 7
     LDA $16
-    STA $1E
     ASL
     ASL
     ASL
     SEC
-    SBC $1E
+    SBC $16                     ; n*7, straight from the index
     TAX                         ; obj tiles table ptr
     CLC
     LDA !objectives_tiles+5,X   ; grid size to check
-    CMP #$0101                  ; valid size?
+    SEC
+    SBC #$0101                  ; valid size?
     BCC .skip_check
-    DEC
-    XBA
-    DEC
-    XBA
     STA $1A                     ; grid x-1, y-1
     LDA !objectives_tiles,X     ; room hdr
     PHX
@@ -954,18 +949,14 @@ check_objs_2:
 
 objective_done:
 ; X = index
-    PHX
     TXA
     ASL
     TAX
-    LDA.w #$007E
-    STA.b $02
-    LDA.l !objectives_addrs,X
-    STA.b $00
     LDA.l !objectives_bitmasks,X
     STA.b $04
-    LDA.b [$00]
-    PLX
+    LDA.l !objectives_addrs,X
+    TAX
+    LDA.l $7e0000,X
     BIT.b $04
     RTS
 

From 73f0942c841e85b2d92285d4ab3db2f0985f89fe Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Fri, 9 Oct 2026 09:14:49 -0400
Subject: [PATCH 4/5] add toggle

---
 patches/ips/pause_menu_objectives.ips         | Bin 2798 -> 2815 bytes
 patches/src/pause_menu_objectives.asm         |  17 +++++--
 .../Community Race Season 5.json              |   3 +-
 rust/data/presets/full-settings/Default.json  |   3 +-
 .../full-settings/Mentor Tournament.json      |   3 +-
 .../Summer Series Expert Challenge.json       |   3 +-
 rust/data/presets/objectives/Bosses.json      |   3 +-
 rust/data/presets/objectives/Chozos.json      |   3 +-
 rust/data/presets/objectives/Metroids.json    |   3 +-
 rust/data/presets/objectives/Minibosses.json  |   3 +-
 rust/data/presets/objectives/None.json        |   3 +-
 rust/data/presets/objectives/Pirates.json     |   3 +-
 rust/data/presets/objectives/Random.json      |   3 +-
 .../templates/generate/objectives.html        |  11 ++++-
 .../templates/generate/scripts.html           |   2 +
 .../templates/seed/objective_details.html     |   6 +++
 rust/maprando/src/patch.rs                    |  46 +++++++++++++-----
 rust/maprando/src/settings.rs                 |  19 ++++++++
 18 files changed, 106 insertions(+), 28 deletions(-)

diff --git a/patches/ips/pause_menu_objectives.ips b/patches/ips/pause_menu_objectives.ips
index 5672335b70b64cf9a528357b8602df93111b647a..ba8b964041cdc3169d9c66fbb035d8c1a266c4f2 100644
GIT binary patch
delta 99
zcmaDS`d@T|G@Fj?f(C~5fBrXV{;$8l>@)Rfir6wSh3Q8>a44)fx{_P9A#Odx+x`oz
zKwd-mWJ@+z)xAfnfSd_jOXVao8?@##Sk%3EG5eVq)QqEIADDdvk8WPT=Enj6<8CdJ

delta 60
zcmV-C0K@<P748+V8wMUMpnw3c{QrU}|9|j!WEQ3tAcn>82q2rqsS725Q<FyqMFp(I
SdLWyVkp>$A(2BFM22KPt{uzJ(

diff --git a/patches/src/pause_menu_objectives.asm b/patches/src/pause_menu_objectives.asm
index 740f113f12..8876e695a1 100644
--- a/patches/src/pause_menu_objectives.asm
+++ b/patches/src/pause_menu_objectives.asm
@@ -879,7 +879,10 @@ check_objs_2:
 ;;; PHB is on stack
     LDY.w #!line_size*2         ; start of 1st line
     LDA !objectives_num : AND #$7FFF
-    BEQ .exit
+    BNE .not_null
+    JMP .exit
+    
+.not_null
     STZ $16                     ; obj index
     
 .obj_check_lp
@@ -892,6 +895,12 @@ check_objs_2:
     BRA .write_tile
 
 .check_if_seen
+    LDA $8FED00
+    BNE .enabled                ; areas enabled?
+    JSR find_next_check
+    BRA .next
+    
+.enabled
     PHY                         ; tilemap ptr
     LDA $16
     ASL
@@ -941,8 +950,8 @@ check_objs_2:
     INC $16
     LDA !objectives_num : AND #$7FFF
     CMP $16
-    BNE .obj_check_lp
-
+    BEQ .exit
+    JMP .obj_check_lp
 .exit
     PLB
     RTS
@@ -1104,7 +1113,7 @@ org $b6a0c0
     db $00, $00, $18, $00, $18, $00, $00, $00, $00, $00, $18, $00, $18, $00, $00, $00
     db $FF, $00, $FF, $18, $FF, $18, $FF, $00, $FF, $00, $FF, $18, $FF, $18, $FF, $00
 
-; check mark
+; check mark (white)
 org $b6a160
     db $01, $01, $03, $03, $06, $06, $8C, $8C, $D8, $D8, $70, $70, $20, $20, $00, $00
     db $01, $01, $03, $03, $06, $06, $8C, $8C, $D8, $D8, $70, $70, $20, $20, $00, $00
diff --git a/rust/data/presets/full-settings/Community Race Season 5.json b/rust/data/presets/full-settings/Community Race Season 5.json
index bb8ac788eb..71634f3815 100644
--- a/rust/data/presets/full-settings/Community Race Season 5.json	
+++ b/rust/data/presets/full-settings/Community Race Season 5.json	
@@ -4877,7 +4877,8 @@
         ],
         "min_objectives": 4,
         "max_objectives": 4,
-        "objective_screen": "Enabled"
+        "objective_screen": "Enabled",
+        "objective_areas": "Disabled"
     },
     "map_layout": "Standard",
     "doors_settings": {
diff --git a/rust/data/presets/full-settings/Default.json b/rust/data/presets/full-settings/Default.json
index 31130449bf..17dbbb6d26 100644
--- a/rust/data/presets/full-settings/Default.json
+++ b/rust/data/presets/full-settings/Default.json
@@ -4789,7 +4789,8 @@
         ],
         "min_objectives": 4,
         "max_objectives": 4,
-        "objective_screen": "Enabled"
+        "objective_screen": "Enabled",
+        "objective_areas": "Enabled"
     },
     "map_layout": "Standard",
     "doors_settings": {
diff --git a/rust/data/presets/full-settings/Mentor Tournament.json b/rust/data/presets/full-settings/Mentor Tournament.json
index db84d74848..d01c82ee74 100644
--- a/rust/data/presets/full-settings/Mentor Tournament.json	
+++ b/rust/data/presets/full-settings/Mentor Tournament.json	
@@ -4877,7 +4877,8 @@
         ],
         "min_objectives": 4,
         "max_objectives": 4,
-        "objective_screen": "Enabled"
+        "objective_screen": "Enabled",
+        "objective_areas": "Disabled"
     },
     "map_layout": "Standard",
     "doors_settings": {
diff --git a/rust/data/presets/full-settings/Summer Series Expert Challenge.json b/rust/data/presets/full-settings/Summer Series Expert Challenge.json
index f7e22a14a2..3f7d292d6c 100644
--- a/rust/data/presets/full-settings/Summer Series Expert Challenge.json	
+++ b/rust/data/presets/full-settings/Summer Series Expert Challenge.json	
@@ -4789,7 +4789,8 @@
         ],
         "min_objectives": 4,
         "max_objectives": 4,
-        "objective_screen": "Enabled"
+        "objective_screen": "Enabled",
+        "objective_areas": "Disabled"
     },
     "map_layout": "Standard",
     "doors_settings": {
diff --git a/rust/data/presets/objectives/Bosses.json b/rust/data/presets/objectives/Bosses.json
index dd844ae9dd..697eeded3e 100644
--- a/rust/data/presets/objectives/Bosses.json
+++ b/rust/data/presets/objectives/Bosses.json
@@ -23,5 +23,6 @@
     ],
     "min_objectives": 4,
     "max_objectives": 4,
-    "objective_screen": "Enabled"
+    "objective_screen": "Enabled",
+    "objective_areas": "Enabled"
 }
diff --git a/rust/data/presets/objectives/Chozos.json b/rust/data/presets/objectives/Chozos.json
index 9fb255f107..4a49c2f30c 100644
--- a/rust/data/presets/objectives/Chozos.json
+++ b/rust/data/presets/objectives/Chozos.json
@@ -23,5 +23,6 @@
     ],
     "min_objectives": 4,
     "max_objectives": 4,
-    "objective_screen": "Enabled"
+    "objective_screen": "Enabled",
+    "objective_areas": "Enabled"
 }
diff --git a/rust/data/presets/objectives/Metroids.json b/rust/data/presets/objectives/Metroids.json
index d524737ef5..05de803c54 100644
--- a/rust/data/presets/objectives/Metroids.json
+++ b/rust/data/presets/objectives/Metroids.json
@@ -23,5 +23,6 @@
     ],
     "min_objectives": 4,
     "max_objectives": 4,
-    "objective_screen": "Enabled"
+    "objective_screen": "Enabled",
+    "objective_areas": "Enabled"
 }
diff --git a/rust/data/presets/objectives/Minibosses.json b/rust/data/presets/objectives/Minibosses.json
index 236cb235f5..8d9c2b01bf 100644
--- a/rust/data/presets/objectives/Minibosses.json
+++ b/rust/data/presets/objectives/Minibosses.json
@@ -23,5 +23,6 @@
     ],
     "min_objectives": 4,
     "max_objectives": 4,
-    "objective_screen": "Enabled"
+    "objective_screen": "Enabled",
+    "objective_areas": "Enabled"
 }
diff --git a/rust/data/presets/objectives/None.json b/rust/data/presets/objectives/None.json
index 48f4202fd6..343cb81aee 100644
--- a/rust/data/presets/objectives/None.json
+++ b/rust/data/presets/objectives/None.json
@@ -23,5 +23,6 @@
     ],
     "min_objectives": 0,
     "max_objectives": 0,
-    "objective_screen": "Enabled"
+    "objective_screen": "Enabled",
+    "objective_areas": "Enabled"
 }
diff --git a/rust/data/presets/objectives/Pirates.json b/rust/data/presets/objectives/Pirates.json
index a14c1d6fed..101afa98ef 100644
--- a/rust/data/presets/objectives/Pirates.json
+++ b/rust/data/presets/objectives/Pirates.json
@@ -23,5 +23,6 @@
     ],
     "min_objectives": 4,
     "max_objectives": 4,
-    "objective_screen": "Enabled"
+    "objective_screen": "Enabled",
+    "objective_areas": "Enabled"
 }
diff --git a/rust/data/presets/objectives/Random.json b/rust/data/presets/objectives/Random.json
index 02e34b70bc..12fcd91726 100644
--- a/rust/data/presets/objectives/Random.json
+++ b/rust/data/presets/objectives/Random.json
@@ -23,5 +23,6 @@
     ],
     "min_objectives": 4,
     "max_objectives": 4,
-    "objective_screen": "Enabled"
+    "objective_screen": "Enabled",
+    "objective_areas": "Enabled"
 }
diff --git a/rust/maprando-web/templates/generate/objectives.html b/rust/maprando-web/templates/generate/objectives.html
index 01c91f2a00..09d008efa9 100644
--- a/rust/maprando-web/templates/generate/objectives.html
+++ b/rust/maprando-web/templates/generate/objectives.html
@@ -49,7 +49,7 @@ <h1 class="modal-title fs-5">Objectives</h1>
                     </div>
                 </div>
                 <div class="form-group row my-2">
-                    <label for="minimumObjectives" class="col-sm-6 col-lg-4 mb-1 mt-1 col-form-label">Pause menu objective screen</label>
+                    <label for="enableObjectives" class="col-sm-6 col-lg-4 mb-1 mt-1 col-form-label">Pause menu objective screen</label>
                     <div id="objectiveScreen" class="col-sm-3 mb-1 mt-1 btn-group" role="group">
                         <input type="radio" class="btn-check" id="objectiveScreenDisabled" value="Disabled" name="objective_screen" onchange="objectivesChanged()">
                         <label class="btn btn-outline-primary" for="objectiveScreenDisabled">Disabled</label>
@@ -57,6 +57,15 @@ <h1 class="modal-title fs-5">Objectives</h1>
                         <label class="btn btn-outline-primary" for="objectiveScreenEnabled">Enabled</label>
                     </div>
                 </div>
+                <div class="form-group row my-2">
+                    <label for="enableAreas" class="col-sm-6 col-lg-4 mb-1 mt-1 col-form-label">Show areas for discovered objectives</label>
+                    <div id="objectiveAreas" class="col-sm-3 mb-1 mt-1 btn-group" role="group">
+                        <input type="radio" class="btn-check" id="objectiveAreasDisabled" value="Disabled" name="objective_areas" onchange="objectivesChanged()">
+                        <label class="btn btn-outline-primary" for="objectiveAreasDisabled">Disabled</label>
+                        <input type="radio" class="btn-check" id="objectiveAreasEnabled" value="Enabled" name="objective_areas" onchange="objectivesChanged()" checked>
+                        <label class="btn btn-outline-primary" for="objectiveAreasEnabled">Enabled</label>
+                    </div>
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary ms-auto" data-bs-dismiss="modal">Close</button>
diff --git a/rust/maprando-web/templates/generate/scripts.html b/rust/maprando-web/templates/generate/scripts.html
index 3ee5a65a93..baf301086e 100644
--- a/rust/maprando-web/templates/generate/scripts.html
+++ b/rust/maprando-web/templates/generate/scripts.html
@@ -146,6 +146,7 @@
     out.min_objectives = parseInt(document.getElementById("minimumObjectives").value);
     out.max_objectives = parseInt(document.getElementById("maximumObjectives").value);
     out.objective_screen = formData.get("objective_screen");
+    out.objective_areas = formData.get("objective_areas");
     for (objOpt of objectivePresetsArr[0].objective_options) {
         for (v of ["No", "Maybe", "Yes"]) {
             if (document.getElementById(`objective${objOpt.objective}${v}`).checked) {
@@ -1111,6 +1112,7 @@
     document.getElementById("minimumObjectives").value = preset.min_objectives;
     document.getElementById("maximumObjectives").value = preset.max_objectives;
     applyRadioValue("objectiveScreen", preset.objective_screen);
+    applyRadioValue("objectiveAreas", preset.objective_areas);
 }
 
 function objectivesChanged() {
diff --git a/rust/maprando-web/templates/seed/objective_details.html b/rust/maprando-web/templates/seed/objective_details.html
index 201c05dcc9..d7c5c5a645 100644
--- a/rust/maprando-web/templates/seed/objective_details.html
+++ b/rust/maprando-web/templates/seed/objective_details.html
@@ -24,3 +24,9 @@
         {{ format!("{:?}", settings.objective_settings.objective_screen) }}
     </div>
 </div>
+<div class="row">
+    <div class="col-8 col-sm-9 col-md-8 col-lg-7 col-xl-6">Show areas for discovered objectives:</div>
+    <div class="col-4 col-sm-3">
+        {{ format!("{:?}", settings.objective_settings.objective_areas) }}
+    </div>
+</div>
diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index 43e8d8e4c4..fa889143d3 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -20,8 +20,9 @@ use crate::{
     settings::{
         AreaAssignmentPreset, CrashFixes, CrashFixesPreset, DisableETankSetting, ETankRefill,
         EnemyDrops, Fanfares, FixMode, ItemCount, MapPreset, MotherBrainFight, ObjPreset,
-        Objective, ObjectiveScreen, ProgressionPreset, QolPreset, RandomizerSettings, SaveAnimals,
-        SaveState, SkillPreset, SpeedBooster, StartLocationMode, WallJump,
+        Objective, ObjectiveAreas, ObjectiveScreen, ProgressionPreset, QolPreset,
+        RandomizerSettings, SaveAnimals, SaveState, SkillPreset, SpeedBooster, StartLocationMode,
+        WallJump,
     },
 };
 use anyhow::{Context, Result, bail, ensure};
@@ -3609,16 +3610,37 @@ impl Patcher<'_> {
             };
             self.rom.write_u16(snes2pc(0x8FEBC0) + obj_i * 2, addr)?;
             self.rom.write_u16(snes2pc(0x8FEBE8) + obj_i * 2, mask)?;
-            self.rom
-                .write_u16(snes2pc(0x8FED00) + obj_i * 7, room_hdr)?;
-            self.rom
-                .write_u8(snes2pc(0x8FED02) + obj_i * 7, offset_state_hdr)?;
-            self.rom.write_u8(snes2pc(0x8FED03) + obj_i * 7, offset_x)?;
-            self.rom.write_u8(snes2pc(0x8FED04) + obj_i * 7, offset_y)?;
-            self.rom
-                .write_u8(snes2pc(0x8FED05) + obj_i * 7, obj_tiles_x)?;
-            self.rom
-                .write_u8(snes2pc(0x8FED06) + obj_i * 7, obj_tiles_y)?;
+            match self.settings.objective_settings.objective_areas {
+                ObjectiveAreas::Enabled => {
+                    self.rom
+                        .write_u16(snes2pc(0x8FED00) + obj_i * 7, room_hdr)?;
+                    self.rom
+                        .write_u8(snes2pc(0x8FED02) + obj_i * 7, offset_state_hdr)?;
+                    self.rom.write_u8(snes2pc(0x8FED03) + obj_i * 7, offset_x)?;
+                    self.rom.write_u8(snes2pc(0x8FED04) + obj_i * 7, offset_y)?;
+                    self.rom
+                        .write_u8(snes2pc(0x8FED05) + obj_i * 7, obj_tiles_x)?;
+                    self.rom
+                        .write_u8(snes2pc(0x8FED06) + obj_i * 7, obj_tiles_y)?;
+                }
+                ObjectiveAreas::Disabled => {}
+            }
+
+            match self.settings.objective_settings.objective_areas {
+                ObjectiveAreas::Enabled => {}
+                ObjectiveAreas::Disabled => {
+                    self.rom.write_u16(snes2pc(0x8FED00), 0x0000)?; // disabled flag
+
+                    let green_check = [
+                        0x01, 0x00, 0x03, 0x00, 0x06, 0x00, 0x8C, 0x00, 0xD8, 0x00, 0x70, 0x00,
+                        0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    ];
+                    for (i, &byte) in green_check.iter().enumerate() {
+                        self.rom.write_u8(snes2pc(0x62A160) + i, byte)?;
+                    }
+                }
+            }
         }
 
         Ok(())
diff --git a/rust/maprando/src/settings.rs b/rust/maprando/src/settings.rs
index 3c6cff5693..c92f8891ae 100644
--- a/rust/maprando/src/settings.rs
+++ b/rust/maprando/src/settings.rs
@@ -562,6 +562,12 @@ pub enum ObjectiveScreen {
     Enabled,
 }
 
+#[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
+pub enum ObjectiveAreas {
+    Disabled,
+    Enabled,
+}
+
 #[derive(Serialize, Deserialize, Clone, PartialEq)]
 pub struct ObjectiveSettings {
     pub preset: Option<String>,
@@ -569,6 +575,7 @@ pub struct ObjectiveSettings {
     pub min_objectives: i32,
     pub max_objectives: i32,
     pub objective_screen: ObjectiveScreen,
+    pub objective_areas: ObjectiveAreas,
 }
 
 pub struct ObjectiveGroup {
@@ -1456,6 +1463,18 @@ fn upgrade_objective_settings(
             .unwrap()
             .insert("objective_screen".to_string(), "Enabled".into());
     }
+    if !settings_obj["objective_settings"]
+        .as_object()
+        .unwrap()
+        .contains_key("objective_areas")
+    {
+        settings_obj
+            .get_mut("objective_settings")
+            .unwrap()
+            .as_object_mut()
+            .unwrap()
+            .insert("objective_areas".to_string(), "Enabled".into());
+    }
     Ok(())
 }
 

From 248d0b63892a25576807d1f1dff2728bb95661f3 Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Fri, 9 Oct 2026 09:23:32 -0400
Subject: [PATCH 5/5] missing setting

---
 rust/maprando/tests/logic_scenarios.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rust/maprando/tests/logic_scenarios.rs b/rust/maprando/tests/logic_scenarios.rs
index 52e945b1f2..2372b6d37b 100644
--- a/rust/maprando/tests/logic_scenarios.rs
+++ b/rust/maprando/tests/logic_scenarios.rs
@@ -322,6 +322,7 @@ fn get_settings(scenario: &Scenario) -> Result<RandomizerSettings> {
             min_objectives: 0,
             max_objectives: 0,
             objective_screen: maprando::settings::ObjectiveScreen::Disabled,
+            objective_areas: maprando::settings::ObjectiveAreas::Disabled,
         },
         map_layout: String::new(),
         doors_settings: DoorsSettings {