From 1861a5c73b10f7d8ea32605a5ccc7b78fc3fea2b Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Mon, 2 Feb 2026 19:12:50 -0700
Subject: [PATCH] Fix map sprites showing in HUD area

---
 patches/ips/disableable_etanks.ips | Bin 972 -> 987 bytes
 patches/src/disableable_etanks.asm |  24 ++++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/patches/ips/disableable_etanks.ips b/patches/ips/disableable_etanks.ips
index 458e64a264b93068bcc627e344c059b933e94b4a..8e26b3dc6e6e29996e49a90841e4f838a88e81ba 100644
GIT binary patch
delta 170
zcmX@Zew%$lS%Bav24;o0AB=);fpq#0M&Vo_ZSaFpSr<r0{9x3HVqpH01Ek+GF#DAK
zU^K92U{&b&@#+<$p&3xclpl;nSwNX}KNwBE0%aCW+-JzRc;W{=@s%PBt#ei~G9;{I
zVQBbTux8)-LmL7%F4?Td$jK=9?gs-C?@tC6&7TY$kv|(4CQbHWQWL8A`9Wf7{|6D<
TnxA)TeqMO}r*3ltlMf>RWaU6j

delta 155
zcmcc3eujNQnTK#L1G9p`4@QN}KsxRRqp~iLj`+c-6UD&%ClyG)XJGcp|G{Wr&%mnC
z_~X?pMnf~8irycLMp;0a<v$orz5-=tPdsMGIA`JyJ%L^x#g!rr-wM|3TYqRnz{a_o
zZ5cTk1)u+5U}F2pz@qe%fg|W=14H-Za3(dO(w`qBmiB)Tu`T_1xAf<Q*MG`4_cQr0
F0suOSJ6-?)

diff --git a/patches/src/disableable_etanks.asm b/patches/src/disableable_etanks.asm
index aabb3df46..fdbcccb94 100644
--- a/patches/src/disableable_etanks.asm
+++ b/patches/src/disableable_etanks.asm
@@ -2,7 +2,7 @@
 !bank_80_free_space_end = $80E440
 
 !bank_82_free_space_start = $82F830
-!bank_82_free_space_end = $82F9CC
+!bank_82_free_space_end = $82F9D3
 
 !bank_85_free_space_start = $85AD00
 !bank_85_free_space_end = $85AE13
@@ -133,9 +133,11 @@ org $82936D
 org $82A32D
     jsr hook_ppu_gameplay_setup
 
-org $82A0B3
-    jsr hook_ppu_pause_setup
+org $8291CA
+    jsr hook_load_equip_menu
 
+org $8291ED
+    jsr hook_load_map
 
 org !bank_82_free_space_start
 
@@ -161,14 +163,20 @@ hook_unpause_loading:
 hook_ppu_gameplay_setup:
     ; lda #$04 from vanilla
     sta $210C ;hijacked (both 8215 and A32D are this instruction)
-hook_ppu_done:
     sta $9C
     rts
 
-hook_ppu_pause_setup:
-    sta $210C
-    lda #$14
-    bra hook_ppu_done
+hook_load_equip_menu:
+    lda #$0014
+hook_load_done:
+    sta $9C
+    lda #$0001 ;Hijacked
+    rts
+
+hook_load_map:
+    lda #$0004
+    bra hook_load_done
+
 
 hook_equipment_screen_main_category_jump_table:
     ; 0 - reserve tank, 1 - beams, 2 - suits/misc, 3 - boots - all go to their vanilla entry points