mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-23 00:28:51 -05:00
Code Issues Projects Releases Wiki Activity

[Fix] Dodongo boss battle crashing with only mq otr (#2020)

Browse Source 
Co-authored-by: briaguya <briaguya>
This commit is contained in:
briaguya 2022-11-26 02:19:33 -05:00 committed by GitHub
parent b843937b34
commit 1bf5fb64a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View File

@ -118,7 +118,10 @@ void func_808C12C4(u8* arg1, s16 arg2) {
} }
void func_808C1554(void* arg0, void* floorTex, s32 arg2, f32 arg3) { 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); floorTex = ResourceMgr_LoadTexByName(floorTex);
u16* temp_s3 = SEGMENTED_TO_VIRTUAL(arg0); u16* temp_s3 = SEGMENTED_TO_VIRTUAL(arg0);