From 9d58563e55afc7a98c61e12e47a24b7c8fcef240 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Tue, 27 Jan 2026 17:58:54 -0800 Subject: [PATCH] fix console crash when entering final staircase --- asm/patch_diffs/required_bosses_diff.yaml | 2 ++ asm/patches/required_bosses.asm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/asm/patch_diffs/required_bosses_diff.yaml b/asm/patch_diffs/required_bosses_diff.yaml index f43a1ebb..96dbab99 100644 --- a/asm/patch_diffs/required_bosses_diff.yaml +++ b/asm/patch_diffs/required_bosses_diff.yaml @@ -20,3 +20,5 @@ Relocations: - {r_addend: 0x8FAE4C, r_info: 0x104, r_offset: 0x28FAE7E} - {r_addend: 0x8FAE44, r_info: 0x106, r_offset: 0x28FAEAA} - {r_addend: 0x8FAE44, r_info: 0x104, r_offset: 0x28FAEAE} +- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAED6} +- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAEDA} diff --git a/asm/patches/required_bosses.asm b/asm/patches/required_bosses.asm index d336410f..0f37d3c1 100644 --- a/asm/patches/required_bosses.asm +++ b/asm/patches/required_bosses.asm @@ -67,8 +67,8 @@ check_required_bosses_check_continue_loop: bne+ check_required_bosses_begin_loop ; If all required bosses are defeated, set the associated switch flag (0x25) - lis r3, 0x1020 - lwz r3, -0x7b24(r3) + lis r3, gameInfo_ptr@ha + lwz r3, gameInfo_ptr@l(r3) addi r3, r3, 0x20 ; SaveData->mCurInfo li r4, 0x25 ; flag li r5, 0 ; current room number (which is 0)