From 6372c4b6d366a2a6eed13ead45b48794851253a2 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Tue, 18 Aug 2026 22:32:17 +0900
Subject: [PATCH 1/2] update reserve backfill

---
 patches/ips/reserve_backward_fill.ips | Bin 627 -> 624 bytes
 patches/src/reserve_backward_fill.asm |  13 +++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/patches/ips/reserve_backward_fill.ips b/patches/ips/reserve_backward_fill.ips
index 62c299e9cc262e9dacf3e739958ec55b9941f01f..acb7f4a6db1f2525e66bc260ebf9f58cd567ecbf 100644
GIT binary patch
delta 42
zcmV+_0M-BV1n>lqkpY&ml3f8AFs;G~$pQe79y*P}39Z%%8qL%Rumz3Q36l!~XmaZi
AiU0rr

delta 45
zcmeys@|k7AM8=sLC&e<#7_U9VY4t(5_YmjWYn)PNuW$-*_g>=!3-V3oV9Edhx-1ev

diff --git a/patches/src/reserve_backward_fill.asm b/patches/src/reserve_backward_fill.asm
index b40f4c9523..848990f001 100644
--- a/patches/src/reserve_backward_fill.asm
+++ b/patches/src/reserve_backward_fill.asm
@@ -251,22 +251,19 @@ hook_reserve_delay_counter_init:
 hook_reserve_tank_refilling:
     lda !arrow_mode
     beq .vanilla
-    
-    ; Samus health -= 1, unless this would be 0
     lda $09C2
+    cmp #$0002
+    bcc .stop_etanks_empty
     dec a
-    beq .stop_etanks_empty
     sta $09C2
     lda $09D6
     inc a
     cmp $09D4
-    bpl .stop_dump_etanks
+    bcs .stop_dump_etanks
     sta $09D6
-    lda $09C2
-    dec a
-    beq .stop_etanks_empty
+
     bra .done
-    
+
 .stop_dump_etanks
     ; Reserves hit full, vent regular energy
     lda $09D4

From 40f90ea46540cff4465b2bddf4f61c70f0671e43 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 20 Aug 2026 20:54:21 +0900
Subject: [PATCH 2/2] update based on stagshot review.

(trim some of the surrounding code)
---
 patches/ips/reserve_backward_fill.ips | Bin 624 -> 612 bytes
 patches/src/reserve_backward_fill.asm |   7 ++-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/patches/ips/reserve_backward_fill.ips b/patches/ips/reserve_backward_fill.ips
index acb7f4a6db1f2525e66bc260ebf9f58cd567ecbf..cc8116e3be3750e6300a5bdf33ccfd8cb60c8335 100644
GIT binary patch
delta 29
lcmeys@`PnV7-Rp$a4W{HjgxE{+1b_};<RdDp8SZh4*;fz3daBd

delta 41
zcmV+^0M`HH1n>lqRsoxlS2_Wfv64Lj6B4b$2|5^Q2LLJf|BY7%Tx+j_lhy%_MSBnP

diff --git a/patches/src/reserve_backward_fill.asm b/patches/src/reserve_backward_fill.asm
index 848990f001..84aeec3556 100644
--- a/patches/src/reserve_backward_fill.asm
+++ b/patches/src/reserve_backward_fill.asm
@@ -238,13 +238,10 @@ hook_reserve_delay_counter_init:
     beq .vanilla
     lda $09c2   ; Reserve tank delay sound counter = [Samus health] - 1, rounded up to nearest 8
     dec a
-    clc
-    adc #$0007
-    and #$fff8
-    sta $0757
-    jml $82AF6B ; Return to vanilla code at handling the reserve tank delay sound counter
+    bra .return
 .vanilla
     lda $09d6   ; Hijacked code
+    .return
     clc
     jml $82AF62 ; Return to vanilla code