From d40fdbaeaa72ec7cedd9802fc2c0834ff144921d Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Mon, 29 Jun 2026 11:49:49 +0900
Subject: [PATCH 1/2] bugfix: oob killer

updated to reflect the springboard for the crashhandler being moved.

it's now tied to the address in constants.asm so shouldn't be as easy to overlook.
---
 patches/ips/oob_death.ips | Bin 111 -> 115 bytes
 patches/src/oob_death.asm |   7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/patches/ips/oob_death.ips b/patches/ips/oob_death.ips
index f676155fca8a8bd32b4a0bd8b6d796f83ee52981..1f660b340f2c07e236026ed19bed7b9e90136101 100644
GIT binary patch
delta 65
zcmV-H0KWfka~4oRR6|GrQ9uA)B8P^csS*Iqm<f<jkrp{57Ofu&DgOY;8UXMMsYC!G
XG}C}0In#h^0Sm7H1R_AufJIM6t{fF0

delta 61
zcmXTU7YlF<arR&cbYO^7YHwSxQi$Q~49*EY6U8hQgx1P)Y5r$8DaG)CeWeS762pep
RY)0<&3@l0x7aLst-2hHb6AS<V

diff --git a/patches/src/oob_death.asm b/patches/src/oob_death.asm
index 3a41b77f13..56c16984c2 100644
--- a/patches/src/oob_death.asm
+++ b/patches/src/oob_death.asm
@@ -3,6 +3,8 @@
 arch snes.cpu
 lorom
 
+incsrc "constants.asm"
+
 !any_bank_free_space_start = $80D140
 !any_bank_free_space_end = $80D200
 
@@ -61,8 +63,9 @@ check_oob:
     beq .skip
 
     lda #$0044    ; msg ID
-    jsl $85b000   ; bug dialog
+    jsl !bug_dialog   ; bug dialog
+    jsl !kill_samus
 
 .skip:
     rtl
-warnpc !any_bank_free_space_end
\ No newline at end of file
+assert pc() <= !any_bank_free_space_end
\ No newline at end of file

From 72b01c85c0f19b523145de945b6bec061a087811 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Mon, 29 Jun 2026 20:27:31 +0900
Subject: [PATCH 2/2] remove the kill samus

there is already an exception in the handler base for the oobkill
---
 patches/ips/oob_death.ips | Bin 115 -> 111 bytes
 patches/src/oob_death.asm |   1 -
 2 files changed, 1 deletion(-)

diff --git a/patches/ips/oob_death.ips b/patches/ips/oob_death.ips
index 1f660b340f2c07e236026ed19bed7b9e90136101..5c4ef3cc54a2ef58cd03a899f2d684b3f1e22160 100644
GIT binary patch
delta 61
zcmXTU7YlF<arR&cbYO^7YHwSxQi$Q~49*EY6U8hQgx1P)Y5r$8DaG)CeWeS7lF8+U
RY)0<&3@l0x7aLst-2hWn6J7uS

delta 65
zcmV-H0KWfka~4oRR6|GrQ9uA)B8P^csS*Iqm<f<jkrp{57Ofu&DgOY;8UXMMsYC!G
XG}C}0In#h^0Sm7H1R_AufJIM6t{fF0

diff --git a/patches/src/oob_death.asm b/patches/src/oob_death.asm
index 56c16984c2..7a111be275 100644
--- a/patches/src/oob_death.asm
+++ b/patches/src/oob_death.asm
@@ -64,7 +64,6 @@ check_oob:
 
     lda #$0044    ; msg ID
     jsl !bug_dialog   ; bug dialog
-    jsl !kill_samus
 
 .skip:
     rtl