From 1bf5fb64a5d7e927619458fbb8e8ad430fd3ac6b Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Sat, 26 Nov 2022 02:19:33 -0500 Subject: [PATCH] [Fix] Dodongo boss battle crashing with only mq otr (#2020) Co-authored-by: briaguya --- soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 74ae077e3..052fdbb73 100644 --- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -118,7 +118,10 @@ void func_808C12C4(u8* arg1, s16 arg2) { } void func_808C1554(void* arg0, void* floorTex, s32 arg2, f32 arg3) { - arg0 = ResourceMgr_LoadTexByName(arg0); + // Entering the King Dodongo boss battle was crashing when using only an mq otr + // because it was trying to load a texture from a non-mq path + // HACK: LoadTexByName doesn't account for mq vs non-mq paths, LoadTexOrDListByName does. + arg0 = ResourceMgr_LoadTexOrDListByName(arg0); floorTex = ResourceMgr_LoadTexByName(floorTex); u16* temp_s3 = SEGMENTED_TO_VIRTUAL(arg0);