From 2f0a85e7fbc6330e847b168863a00498d88068d8 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Tue, 21 Apr 2026 20:41:14 +0900
Subject: [PATCH] fix equipment tile color

also removed some of the deprecated instructions from this to remove warnings when building.
---
 patches/ips/map_area.ips | Bin 4549 -> 4556 bytes
 patches/src/map_area.asm |  27 +++++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/patches/ips/map_area.ips b/patches/ips/map_area.ips
index 92c3ae5572a6a459bf818c92fb93d617b7059af2..41645f586706a1858898b68038343150f531ddd0 100644
GIT binary patch
delta 234
zcmV<G02TkmBg`YPh5-TLvxfoI0RixnT>~XD!ls4l>H%b;00SWR_W@=;00koXr-kYP
zXJh~aApG|MXUPBuAjJ3T>gwtNcMkyiB6yRu15N>MlLG{p0XvhN1g8pOr)vVDkOiI~
z+>=cOWi4{0sR#gTty>?BVjm!Kr64J#B9NkmBF2S)AOg0W{{?Fz|FD1n!hRrfr659+
z-vzA!N|S~LY5_u%@diN(45dtlq#*C4ASshP2OI&jlUWDK0dkWh2&n<`lg<cS0rHb8
k2~i6YrXo0lfFRtaAY!wJ2~+_A+_T&Y9t8ngv-=Oq0Y<f3tpET3

delta 255
zcmV<b0095YBgG@Ih5-TEvxfoI0RicgT>~XDyQYQe>H%b;00SWR_W@=;00koQr-kYP
zXJh~aApG|MXUPBuAjJ3T>gwtNcMkyiB5{+n15N>FlLG{p0W_1G1g8pHr)vVDkOh|@
z)ssyHWi4x^sR#gTty>?BVjm!Dr63}uB9NkmBF2S)AOg0W{{?Fz|FD1n!hRrYr64<#
z-vzCclLlk~JCpbZK_>;JOn;;x=%gSbr6P=lfWHXYekuO|jfn>$!;^xoTOZA0AMi3D
ztdn2|$^mPWD+s9p>yy<8TmkEoG6_)&3#KACgMc8_rXX9hjtNu&0oAkP3LXUkRI>sQ
F$^q8tWo-Ze

diff --git a/patches/src/map_area.asm b/patches/src/map_area.asm
index 55d05f9c9..4e99cebc0 100644
--- a/patches/src/map_area.asm
+++ b/patches/src/map_area.asm
@@ -226,7 +226,8 @@ org $809DD3 : dw $3C00, $3C01, $3C02, $3C03, $3C04, $3C05, $3C06, $3C07, $3C08,
 ;;org $80A2F7 : dw $1C0F   ; was: dw $184E  (not doing this, since it's overwritten in hud_expansion_opaque.asm instead)
 
 ; For message boxes, skip modifying palette 6:
-org $858150 : rep $19 : nop
+org $858150
+  nop #25
 
 ; Use palette 0 for full auto reserve
 org $80998B             
@@ -408,8 +409,7 @@ determine_map_scroll_wrapper:
     jsr $9EC4    ; Determine map scroll limits
     rtl
 
-print pc
-warnpc !bank_82_freespace_end
+assert pc() <= !bank_82_freespace_end
 
 org !bank_85_freespace_start
 
@@ -418,7 +418,7 @@ load_bg3_map_tilemap_wrapper:
     jsr load_bg3_map_tilemap
     rtl
 
-warnpc $85A290
+assert pc() <= $85A290
 org $85A290
 ; must match the reference in fix_kraid_hud.asm
 load_bg3_map_tiles_wrapper:
@@ -572,6 +572,9 @@ load_equipment_screen:
     lda #$318C
     sta $7EC0DE
     sta $7EC05E
+    ;fix color used for dark map theme 
+    lda #$7FFF
+    sta $7EC04A
 
     ; Fix colors used for partially revealed tiles on map screen
     lda #$7FFF
@@ -1180,7 +1183,7 @@ kraid_room_load_hook:
     sep #$20
     rtl
 
-warnpc !bank_85_freespace_end
+assert pc() <= !bank_85_freespace_end
 
 org $82DFC2
     jsl area_cross_hook
@@ -1213,7 +1216,7 @@ org $858426
 ;org $A7CA77 : dw #$48FB            ; 2bpp palette 2, color 3: pink color for E-tanks (instead of black)
 ;org $A7CA7B : dw !unexplored_gray   ; 2bpp palette 3, color 1: gray color for HUD dotted grid lines
 
-org $A7CA7B : dw #$48FB            ; 2bpp palette 3, color 1: pink color for E-tanks
+org $A7CA7B : dw $48FB            ; 2bpp palette 3, color 1: pink color for E-tanks
 ;org $A7CA97 : dw #$7FFF            ; 2bpp palette 6, color 3: white color for HUD text/digits
 
 ; hook start of game to load correct BG3 tiles based on room:
@@ -1278,7 +1281,7 @@ org $828E75
 .skip_load_bg3
     plp
     rtl
-warnpc $828EDA
+assert pc() <= $828EDA
 
 ; Use palette 4 instead of palette 2 or non-map pause menu content
 ; (to free up more colors in palette 2 for use in map tiles).
@@ -1344,7 +1347,7 @@ write_room_name_tiles:
 .skip_write
     jmp $90cb
 
-warnpc !bank_82_freespace2_end
+assert pc() <= !bank_82_freespace2_end
 
 org !bank_85_freespace2_start
 
@@ -1613,7 +1616,7 @@ sram_to_gfx_dma: ; size in A, src in X (bank hardcoded to $70), dest in Y
     STX $0330
     RTL
 
-warnpc !bank_85_freespace2_end
+assert pc() <= !bank_85_freespace2_end
 
 ;;; Map icon patch
 ;;; Shows save icons as yellow, orange, pink for save slots n, n-1, n+1, respectively
@@ -1765,7 +1768,7 @@ boss_green:
 db $BD,$BD,$F6,$4F,$FB,$87,$F7,$CF,$BD,$B9,$76,$4E,$34,$2C,$18,$18
 db $BD,$BD,$42,$42,$81,$81,$C3,$C3,$BD,$FF,$42,$42,$24,$24,$18,$18
 
-warnpc !bank_b6_freespace_end
+assert pc() <= !bank_b6_freespace_end
 
 org !bank_85_freespace3_start    
 assert pc() == !map_icon_settings
@@ -2172,7 +2175,7 @@ draw_sprite:
 .sprite_disabled
     PLA
     BRA .sprite_is_disabled
-warnpc !bank_85_freespace3_end
+assert pc() <= !bank_85_freespace3_end
 
 ; Fixes FX for rare bug when entering right-sided door through East Pants Room
 org !bank_94_freespace_start
@@ -2183,4 +2186,4 @@ fix_pants_room_fx:
 .no_fix
     STX $78D            ; replaced code
     RTS
-warnpc !bank_94_freespace_end
+assert pc() <= !bank_94_freespace_end
\ No newline at end of file