Misc objects problems (#748)

* fix hidan door

Signed-off-by: angie <angheloalf95@gmail.com>

* doors and lens of truth in gameplaykeep

Signed-off-by: angie <angheloalf95@gmail.com>

* other minor fixes

Signed-off-by: angie <angheloalf95@gmail.com>

* Fix a typo

Signed-off-by: Angie <angheloalf95@gmail.com>

5 files changed, 20 insertions, 19 deletions

diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index f5d99fff3..f1d5a9530 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -2245,7 +2245,7 @@ void func_80030ED8(Actor* actor) {
 void func_80030FA8(GraphicsContext* gfxCtx) {
     OPEN_DISPS(gfxCtx, "../z_actor.c", 6161);
 
-    gDPLoadTextureBlock(POLY_XLU_DISP++, gUnknownCircle5Tex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
+    gDPLoadTextureBlock(POLY_XLU_DISP++, gLensOfTruthMaskTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
                         G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
 
     gDPSetTileSize(POLY_XLU_DISP++, G_TX_RENDERTILE, 384, 224, 892, 732);
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
index 9e9d0eb78..0113cfd0f 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
@@ -252,7 +252,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
         Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 652),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_OPA_DISP++, gDoorMetalBarsDL);
+        gSPDisplayList(POLY_OPA_DISP++, gDungeonDoorDL);
     }
     if ((this->boxObjIdx > 0) && ((this->boxObjIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_BOX)) > 0) &&
         (Object_IsLoaded(&globalCtx->objectCtx, this->boxObjIdx))) {
diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
index 43f6d3246..a90990981 100644
--- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
+++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
@@ -6,6 +6,7 @@
 
 #include "z_door_killer.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0x00000010
 
@@ -89,10 +90,10 @@ static ColliderJntSphInit sJntSphInit = {
 };
 
 static DoorKillerTextureEntry sDoorTextures[4] = {
-    { OBJECT_HIDAN_OBJECTS, 0x0600E5A0 },
+    { OBJECT_HIDAN_OBJECTS, gFireTempleDoorKillerTex },
     { OBJECT_MIZU_OBJECTS, 0x060035C0 },
     { OBJECT_HAKA_DOOR, 0x06000000 },
-    { OBJECT_GAMEPLAY_KEEP, 0x0400EF38 },
+    { OBJECT_GAMEPLAY_KEEP, gWoodenDoorTex },
 };
 
 void DoorKiller_Init(Actor* thisx, GlobalContext* globalCtx) {
diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index 7d7bc767b..f354dcf65 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -84,26 +84,26 @@ typedef struct {
 } ShutterInfo;
 
 static ShutterInfo D_80998134[] = {
-    { 0x060067A0, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x06006910, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x060067A0, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x06006910, gDoorMetalBarsDL, 130, 12, 20, 15 },
     { 0x060000C0, 0x060001F0, 240, 14, 70, 15 },
     { 0x06000590, 0x06006460, 0, 110, 50, 15 },
     { gPhantomGanonBarsDL, NULL, 130, 12, 50, 15 },
     { 0x0601EC20, NULL, 130, 12, 50, 15 },
     { 0x06000100, 0x060001F0, 240, 14, 50, 15 },
     { 0x060010C0, NULL, 130, 12, 50, 15 },
-    { gDoorMetalBarsDL, gDungeonDoorDL, 130, 12, 20, 15 },
-    { gFireTempleDoorFrontDL, gDungeonDoorDL, 130, 12, 20, 15 },
-    { gFireTempleDoorBackDL, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x060000C0, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x06005D90, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x06007000, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x06002620, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x06003890, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x06001D10, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x060010D0, gDungeonDoorDL, 130, 12, 20, 15 },
-    { gGanonsCastleDoorDL, gDungeonDoorDL, 130, 12, 20, 15 },
-    { 0x060000C0, gDungeonDoorDL, 130, 12, 20, 15 },
+    { gDungeonDoorDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { gFireTempleDoorFrontDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { gFireTempleDoorBackDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x060000C0, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x06005D90, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x06007000, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x06002620, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x06003890, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x06001D10, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x060010D0, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { gGanonsCastleDoorDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
+    { 0x060000C0, gDoorMetalBarsDL, 130, 12, 20, 15 },
 };
 
 static s8 D_80998224[] = {
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c
index ed6e12f2c..426d9d8d1 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -68,7 +68,7 @@ static u8 sDoorAnimOpenFrames[] = { 25, 25, 25, 25 };
 static u8 sDoorAnimCloseFrames[] = { 60, 70, 60, 70 };
 
 static Gfx* D_809FCEE4[5][2] = {
-    { gDoorLeftDL, gDoorRightDL }, { gFireTempleBombableDoorDL2, gFireTempleBombableDoorDL1 },
+    { gDoorLeftDL, gDoorRightDL }, { gFireTempleDoorWithHandleFrontDL, gFireTempleDoorWithHandleBackDL },
     { 0x06004958, 0x06004A10 },    { 0x060013B8, 0x06001420 },
     { 0x050047A0, 0x05004978 },
 };