Skip to content

Commit

Permalink
Fix killer door textures (HarbourMasters#1177)
Browse files Browse the repository at this point in the history
* Fix killer door textures

* Remove todo as requested by @Rozelette
  • Loading branch information
vaguerant authored and th-2021 committed Nov 28, 2022
1 parent 965dcbe commit ab894b0
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,32 @@ void DoorKiller_Init(Actor* thisx, GlobalContext* globalCtx2) {
s32 bankIndex;
s32 i;

/*
// Look in the object bank for one of the four objects containing door textures
bankIndex = -1;
for (i = 0; bankIndex < 0; i++) {
bankIndex = Object_GetIndex(&globalCtx->objectCtx, sDoorTextures[i].objectId);
this->textureEntryIndex = i;
}
*/

// For SoH where all objects are loaded, hardcode the index to match the current map.
switch (globalCtx->sceneNum) {
case SCENE_HIDAN:
this->textureEntryIndex = 0;
break;
case SCENE_MIZUSIN:
this->textureEntryIndex = 1;
break;
case SCENE_HAKADAN:
case SCENE_HAKADANCH:
this->textureEntryIndex = 2;
break;
default:
this->textureEntryIndex = 3;
}
bankIndex = Object_GetIndex(&globalCtx->objectCtx, sDoorTextures[this->textureEntryIndex].objectId);

osSyncPrintf("bank_ID = %d\n", bankIndex);
osSyncPrintf("status = %d\n", this->textureEntryIndex);
this->doorObjBankIndex = bankIndex;
Expand Down

0 comments on commit ab894b0

Please sign in to comment.