From fd114de6635326552c4e46348eceae94a146a8a3 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Mon, 2 Nov 2026 23:45:04 +0900
Subject: [PATCH 1/2] fix missing samus on bomb message box

1. add samus tiles back to tilemap
2. update bomb message to use above tilemap at new location
3. take out the "missile" hack and edit the .ttb directly
4. clean up hud_expasion.asm, - update warnpc, consolidate some code, remove old notes / code etc.
---
 patches/ips/hud_expansion_opaque.ips          | Bin 92330 -> 92320 bytes
 .../HUD_Expansion/Data/Opaque/HUD_vanilla.gfx | Bin 8192 -> 8192 bytes
 .../HUD_Expansion/Data/Opaque/messages.ttb    | Bin 3780 -> 3780 bytes
 .../Data/Opaque/messages_ammo.ttb             | Bin 3780 -> 0 bytes
 patches/src/hud_expansion_opaque.asm          | 203 +++++-------------
 5 files changed, 59 insertions(+), 144 deletions(-)
 delete mode 100644 patches/src/HUD_Expansion/Data/Opaque/messages_ammo.ttb

diff --git a/patches/ips/hud_expansion_opaque.ips b/patches/ips/hud_expansion_opaque.ips
index 4c6a1686b34b1e78b633c85bc54c6682e76eb35b..2033017d1aee0eb86cda0c0d73f2ce06ee05b94f 100644
GIT binary patch
delta 282
zcmZ2=k#)gE)(x7Rf*V#aHLPM_RyYBqUx4V%R-6Hxj2k8%)StYIQ-FD+#^#9!bwNzV
zO`Exe|FYEAavU;<TFKznE2g-TVc#MKmIbpI6!=y)IDo_#F}U}MDXz_v{9t%ejp2jB
zNgjp|VjEOXvN3!RStl;P|KI<%b=L9=+8G-7Rx%uEU|z{^Xb}Sw#Dpphh0l!%y-d!1
ztj>!VCHfegA1Tb}WpQ5F&?~CAlChWD>5xJK^X7gDA0d7Nkm>v&W4VA<T-f|ZYugO#
z{~!K8`aAg#@4x5&EB0sXfBQXuv;F1%|M$PY{r>jb`|oG}{r<cAeDU1+{r~y@|NlRK
T{(m3~3MS9pdvNo-BRoq0*j|Ly

delta 220
zcmZ2*k#*HY)(x7Rf;Uz$HLPM_R@eZfUx4V%R-6HxlP?HzOgy78c^7BUW**@`EcLBx
z^CUk+pHyS`pm~yq;e-4J|C4MCA7s~w%bz;6pMjyhm&tjZwY)@w$RdUV77ZMW7>+bB
zFJd^<$K<?-fvJxbNV@llDK27^=wonxq_A?<2Bwwmy)4cv8+t_*S2Ff;I~`J3$>7#2
zrnr(}AJD9ovlu|K3{1VOAmxl~Kots~8#lK~_z4Lbft(=-at1rd5$p|{A8BoyF<Ill
LpUqQ_@GJoUaMx16

diff --git a/patches/src/HUD_Expansion/Data/Opaque/HUD_vanilla.gfx b/patches/src/HUD_Expansion/Data/Opaque/HUD_vanilla.gfx
index 799e58568654ee9b6a205f00d342e7adb7693959..c8e52d734c79eed987061ef4895fe701619a0f38 100644
GIT binary patch
delta 75
zcmZp0XmHrT%5DAs!~aKrC;#F7_xyjw{*3)^zvpkZzuf=-{`a@v-+p`l{p`Qre|MiR
do?E~FKmY&#|L4#D4`e~XB-VqQ8F~H-0|3EtHIo1U

delta 16
XcmZp0XmHrT%00Q2{m*7bp8vuCG#Lgi

diff --git a/patches/src/HUD_Expansion/Data/Opaque/messages.ttb b/patches/src/HUD_Expansion/Data/Opaque/messages.ttb
index 4b615f0b60cc2a1fbebe9ff283b480846723812f..3b5a2792b4c2ade0d1e7859d541d957275bfc5f6 100644
GIT binary patch
delta 112
zcmX>idqj4F7boL}i4!#^E?}EjCBVE<V>6h;0^~4m+I*Vx5TmLNKM<bLIiYh22v6vo
z);R*?Uj&k;b<XJ=&^Zj2pS+1XNsQm-kj*)pGdAaKPTL%@xeUaIZEo32*5Omz9Kch;
F1OT*@EC2ui

delta 99
zcmX>idqj4F7w6;&92^tp$W8vhC^NCgVe=WzgN$-E{5EH7PS{)m!V@;9ZH@r>7lGty
xn{ze?Yz|M(<x`t{k=t3~5RiYy<~&%%WuW|Fn_D*g7W@{I_4rga2k?|I0RShrDAfP}

diff --git a/patches/src/HUD_Expansion/Data/Opaque/messages_ammo.ttb b/patches/src/HUD_Expansion/Data/Opaque/messages_ammo.ttb
deleted file mode 100644
index 68f5c6351f0a2c6a2e9cff2b26d9a2b2154d00c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3780
zcmcInS#H}f5X}jqYs`l~^pQnLc!4%KOpholg5$=r4N0-%7D&;(=)M5mleTY2QyRvi
zt=1_BS#QL7vvEjSn;V<e2*`|-hLloHJ(}T3NipQp`CLG?evK?s-ZSb`fzhV{tjQUJ
zYxd^G;_T`tKK@~ND?GgO_xzXiie4kmqwsck1pYVRhxCXZ(+B!UzfgtW^o*X<3;L<E
z@%b<4jK;ct0WGV6kH0!{qv7Xog<JoSe?YbZ+u?RY{$15Be~xZUBbv@@&;`z@t7|56
z^T#i>{J5FF6YjLgovpfjoBM9KJJ0<yeW9<=dq?l*9gs(|0xrLfvxl7%qXJ{}eIGlg
z2OC|~B1RQzt?T~fOgr4{KMJF@^4|;hz&Cww_P`T*I?sRBDu0gtoGx?~`1~j+K?m@T
zaPw-8-_=<rHS_nw{k8Hx2oJpZpLcxgZ(_00PO#QF);`wRp8=I3cNw>fEx$mum~VS0
zMkfs_3ob`WhM%F@IV_xbEJ%in4WHL5$7)UCF-GKk{wFKWe`Ck++3yA2#VME}3hw<8
zMu|Q!^R7=RnR)J*vG&OwQ`@n#l3}r(<2$ocjN{680q^`ilUo04|G7SvNj7%AvtIL_
z`%&$=fIdO%4ZUr6{}@}=TY|Oc4(uW8#j{8Hb+P3KSiz)`%Nj06N;Q89{}Yb|$#8Ma
zw>@xg#kw`~`Q(k!2N{0b<u5(g*!Si#8q#;oX^(E6f2ppb@5-Foi*K(%)k%y0Ura24
z3RI?IHOBoI_YzltE5S%rfx#LwZWr_H>fv&vWVwkNA&#*cz-x)?Slt(PCBwzcPt_1t
zu6k+)DF;r}33A{kskY*Bq-6asze|RTEpMIp*+z`)Gt|JuKLCnR18d#&DJ88D1^&?{
ze`cd*{uPiOUCjQcV4h*+INq7Y0i?b<omYQV|CHba=(Jc(z<8h|wwar|>r+auo==ht
z7c=8Bx{7A-Y<k_=7<NV-i(QVCSi?r{uc2hP*qj~w?k)7WXHL*I-(SX#;hX=T6P)3t
q{(j@{5%~|q^|?`f{qgggsKB}v<QQh1v{O_SXNyDK7iJBvXYdC*!?;lZ

diff --git a/patches/src/hud_expansion_opaque.asm b/patches/src/hud_expansion_opaque.asm
index 0e0664c25f..46ef4f4ce6 100644
--- a/patches/src/hud_expansion_opaque.asm
+++ b/patches/src/hud_expansion_opaque.asm
@@ -113,14 +113,7 @@ org $82D521
     incbin !this_dir/Data/samus_wireframe.ttb
 
 org $85877F
-;    incbin !this_dir/Data/Opaque/messages.ttb
-    incbin !this_dir/Data/Opaque/messages_ammo.ttb
-
-org $8592FF
-
-; change AMMO back to MISSILE
-    dw $000E, $000E, $000E, $000E, $000E, $000E, $2C0F, $2C0F, $2C0F, $2CCC, $2CC8, $2CD2, $2CD2, $2CC8, $2CCB, $2CC4, $2C0F, $2CD1, $2CC4, $2CCB, $2CCE, $2CC0, $2CC3, $2C0F, $2C0F, $000E, $000E, $000E, $000E, $000E, $000E, $000E
-assert pc() <= $8593BF
+    incbin !this_dir/Data/Opaque/messages.ttb
 
 ; FX tilemap
 org $8A8000
@@ -237,44 +230,6 @@ org $80A0ED
     ; add an injection to run the transition DMA at gameplay load
     JSR TransitionDMA_CalculateLayer2XPos ; A2F9
 
-;; clear layer 3
-;; This is rewritten to make it free up some space for the next function
-;org $80A29C
-;    PHP
-;    LDX #$0002
-;ClearLayer3_Loop:
-;    REP #$20
-;    LDA #$5880
-;    STA $2116 ; DMA VRAM address
-;    LDA.w ClearLayer3_DMA_Params,X
-;    STA $4310 ; DMA Parameter/VRAM Address
-;    LDA.w ClearLayer3_WRAM_Address,X
-;    STA $4312 ; DMA WRAM Address
-;    LDA #$0080
-;    STA $4314 ; DMA WRAM Bank
-;    LDA #$0780
-;    STA $4315 ; DMA Bytes
-;    SEP #$20
-;    LDA.w ClearLayer3_VRAM_Inc_Value,X
-;    STA $2115 ; VRAM Adress Increment Value
-;    LDA #$02
-;    STA $420B ; Start DMA
-;    DEX
-;    DEX
-;    BPL ClearLayer3_Loop
-;    PLP
-;    RTL
-;
-;ClearLayer3_DMA_Params:
-;    DW $1908, $1808
-;ClearLayer3_WRAM_Address:
-;    DW #ClearLayer3_ClearTile+1, #ClearLayer3_ClearTile+0
-;ClearLayer3_VRAM_Inc_Value:
-;    DW $0080, $0000
-;ClearLayer3_ClearTile:
-;    DW $180F    ; palette 6
-
-
 org !bank_80_free_space_start
 ; Added function
 TransitionDMA_CalculateLayer2XPos:
@@ -288,8 +243,7 @@ TransitionDMA_CalculateLayer2XPos:
     PLP
     JSR $A2F9  ; run hi-jacked instruction
     RTS
-
-warnpc !bank_80_free_space_end
+assert pc() <= !bank_80_free_space_end
 ;warnpc $80A2F9 : padbyte $FF : pad $80A2F9
 
 
@@ -305,82 +259,62 @@ org $8580E8
     JSR ClearLayer3ForMessageClose ; 81F3 Clear message box BG3 tilemap
 
 org !bank_85_free_space_start
-; Instead of always clearing the screen, it swaps the bottom rows
-; of the graphics with the textbox letters with the FX graphics
+ClearLayer3ForMessageOpen:
+    PHP
+    REP #$30
+    PHY
+    LDA #$4600 : STA $2116
+    LDA #$BE00
+    LDX #$0400
+    LDY #$009A
+    JSR ClearLayer3_Go
+    BRA ClearLayer3_Finish
 ClearLayer3ForMessageClose:
-    LDA $196E ; FX type
-    BEQ ClearLayer3_Return ; FX type = 0x00 (none)
+    PHP
+    REP #$30
+    PHY
+    LDX #$4700 : STX $2116
+    LDA $196E            ; FX type
+    BEQ ClearLayer3_Finish
     CMP #$0026
-    BEQ ClearLayer3_WaterAddress ; FX type = 0x26 (golden statues room)
+    BEQ ClearLayer3_Water
     CMP #$000C
-    BEQ ClearLayer3_FogAddress ; FX type = 0x0C (fog)
-    BCS ClearLayer3_Return  ; FX type > 0x0C (ceres/haze)
+    BEQ ClearLayer3_Fog
+    BCS ClearLayer3_Finish
     CMP #$0006
-    BEQ ClearLayer3_WaterAddress ; FX type = 0x06 (water)
-    LDX $1F17 ; pointer to ram address to dma
-    DEX
-    DEX
-    LDA $870000,X
-    STA $4302 ; set dma ram address
-    LDX $1F3B ; X = dma size
-    CLC
-    BRA ClearLayer3_ContinueDMA
-ClearLayer3ForMessageOpen:
-    LDX #$C000 ; DMA ram address size
-    SEC
-    BRA ClearLayer3_WriteDMAAddress
-ClearLayer3_FogAddress:
-    LDX #$C400 ; DMA ram address size
-    BRA ClearLayer3_WriteDMAAddress
-ClearLayer3_WaterAddress:   
-    LDX #$C200 ; DMA ram address size
-ClearLayer3_WriteDMAAddress:
-    STX $4302 ; set DMA ram address
-    LDX #$0200 ; X = dma size
-ClearLayer3_ContinueDMA:
-    STX $4305 ; set DMA size
-    LDX #$4700
-    STX $2116 ; set dma VRAM address
-    LDX #$1801
-    STX $4300 ; set dma mode/address
+    BEQ ClearLayer3_Water
+    LDX $1F17
+    LDA $86FFFE,X
+    LDX $1F3B
+    LDY #$0087
+    BRA ClearLayer3_CloseGo
+ClearLayer3_Fog:
+    LDA #$C400
+    BRA ClearLayer3_FX
+ClearLayer3_Water:
+    LDA #$C200
+ClearLayer3_FX:
+    LDX #$0200
+    LDY #$009A
+ClearLayer3_CloseGo:
+    JSR ClearLayer3_Go
+ClearLayer3_Finish:
+    PLY
+    PLP
+    JSR $81F3            ; displaced code
+    RTS
+ClearLayer3_Go:
+    STA $4302
+    STX $4305
+    LDX #$1801 : STX $4300
     SEP #$20
-
-    LDA #$9A
-    BCS ClearLayer3_SetBank
-    LDA #$87
-ClearLayer3_SetBank:
-    STA $4304 ; set dma ram bank (9A on open, 87 on close)
-
-    LDA #$80
-    STA $2115 ; VRAM address increment value
-    LDA #$01
-    STA $420B ; start DMA (channel 0)
-ClearLayer3_Return:
-
-    ; transfer message-box letters to VRAM, since these
-    ; could have gotten overwritten by Kraid Room.
-    rep #$20
-    LDA #$4600
-    STA $2116  ; VRAM (destination) address = $4600
-
-    lda #$BE00 ; source address = $BE00
-    sta $4302
-
-    ; Set source bank to $9A:
-    lda #$009A
-    sta $4304
-
-    lda #$0200
-    sta $4305 ; transfer size = $0200 bytes
-
-    sep #$20
-    lda #$01
-    sta $420B  ; perform DMA transfer on channel 1
-
-    JSR $81F3 ; displaced code
+    TYA
+    STA $4304
+    LDA #$80 : STA $2115
+    LDA #$01 : STA $420B
+    REP #$20
     RTS
-
-warnpc !bank_85_free_space_end
+assert pc() <= !bank_85_free_space_end
 
 ; load FX
 org $89AC31
@@ -389,15 +323,10 @@ org $89AC31
 ; free space in Bank 89
 org $89AF00 ; A = FX type
 Load_FX:
-    CMP #$0026
-    BEQ LoadFX_Water ; type = golden statues
-    CMP #$000C
-    BEQ LoadFX_Fog ; type = fog
-    CMP #$0006
-    BEQ LoadFX_Water ; type = water
-    BRA LoadFX_Return ; else
-LoadFX_Fog:
-    LDA #$9AC4
+    CMP #$0026 : BEQ LoadFX_Water ; type = golden statues
+    CMP #$0006 : BEQ LoadFX_Water ; type = water
+    CMP #$000C : BNE LoadFX_Return ; not fog -> nothing to load
+    LDA #$9AC4 ; fog
     BRA LoadFX_Continue
 LoadFX_Water:
     LDA #$9AC2
@@ -412,8 +341,7 @@ LoadFX_Continue:
 LoadFX_Return:
     LDA $ABF0,y ; Displaced code
     RTS
-
-warnpc $89AF60
+assert pc() <= $89AF60
 
 ;----------------------------
 ; Repoint Data
@@ -468,20 +396,7 @@ org $829580
 ; 'blank' tile for clearing layer 3 (BG Data Instruction)
 org $82E569
     LDA #$180F ; 184E
-
-; Skipping this, since it is overwritten in map_area.asm:
-; ; Message box button text table
-; org $858426
-;     DW $28C0 ;$28E0, ; A
-;     DW $3CC1 ;$3CE1, ; B
-;     DW $2CD7 ;$2CF7, ; X
-;     DW $2CD8 ;$38F8, ; Y
-;     DW $38FA ;$38D0, ; Select
-;     DW $2CCB ;$38EB, ; L
-;     DW $2CD1 ;$38F1, ; R
-;     DW $280F ;$284E  ; Blank
-
-; Digit tilemap on HUD because the numbers are moved
+    
 org $809DBF
 ; Health
     DW $2C00, $2C01, $2C02, $2C03, $2C04, $2C05, $2C06, $2C07, $2C08, $2C09
@@ -508,4 +423,4 @@ org $82B3BB
 org $82B3C6
     ADC #$0800 ; 0804
 org $82B3D0
-    ADC #$0800 ; 0804
+    ADC #$0800 ; 0804
\ No newline at end of file

From 0eaf3831a2cd87d55c44fdf0a22b7f1074353d62 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 4 Nov 2026 19:31:19 +0900
Subject: [PATCH 2/2] change sprite to all white

---
 patches/ips/hud_expansion_opaque.ips          | Bin 92320 -> 92320 bytes
 .../HUD_Expansion/Data/Opaque/HUD_vanilla.gfx | Bin 8192 -> 8192 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/patches/ips/hud_expansion_opaque.ips b/patches/ips/hud_expansion_opaque.ips
index 2033017d1aee0eb86cda0c0d73f2ce06ee05b94f..a5e1018cd6b38628a67040b35258d1136496e980 100644
GIT binary patch
delta 63
zcmZ2*k#)gE)(x`{8$9?w;Xlv+=l?DKYy5xuU-`fA|Nj5ifvhJ$u`~aF{_p-T_}~6N
T|NsC0=L4br|IMclUtIzKd5|sa

delta 63
zcmV-F0KosC(FLH<1+bgLFyj4_{0;u+|9HP>zwP&Lvp>_1|KIoR_wDxY_s#zM{kzX|
Voqxao5C8xFpP&DKzq8B3)ueqKE$jdQ

diff --git a/patches/src/HUD_Expansion/Data/Opaque/HUD_vanilla.gfx b/patches/src/HUD_Expansion/Data/Opaque/HUD_vanilla.gfx
index c8e52d734c79eed987061ef4895fe701619a0f38..a6b6d066cb0c73eb18efd60bdb854eb7e784b185 100644
GIT binary patch
delta 61
zcmZp0XmHrT!ENy1|AhZM|DXT2_^<K*>3`+_!vFjKUk9?D0L9My|M|cBzu<rS|NQ^|
Q|DO+p_Ww6qaGwwX0Ms=pO#lD@

delta 61
zcmV-D0K)%(K!8B72n#Uc{geC+{^$RAzi7Yh_iwX5(~tk(_wD!X_V4%2{`>vA&vTuB
TzyA;a|Noz#|9`);I19)W*TE@G