From c78d2828a729a9b9f6aaf3698e9a82adae79aade Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Fri, 8 Jul 2022 04:17:57 +0200 Subject: [PATCH] King dodongo room crash (#613) * first attempt * force camera setting to be at least 0 (dirty!) * - * reverted something to just include fix --- soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 b5a8bf97f..37105d040 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 @@ -216,9 +216,10 @@ void BossDodongo_Init(Actor* thisx, GlobalContext* globalCtx) { Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->items); if (Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)) { // KD is dead - temp_s1_3 = SEGMENTED_TO_VIRTUAL(gDodongosCavernBossLavaFloorTex); - temp_s2 = SEGMENTED_TO_VIRTUAL(sLavaFloorRockTex); - + u16* LavaFloorTex = ResourceMgr_LoadTexByName(gDodongosCavernBossLavaFloorTex); + u16* LavaFloorRockTex = ResourceMgr_LoadTexByName(sLavaFloorRockTex); + temp_s1_3 = SEGMENTED_TO_VIRTUAL(LavaFloorTex); + temp_s2 = SEGMENTED_TO_VIRTUAL(LavaFloorRockTex); Actor_Kill(&this->actor); Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);