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>

10 files changed, 35 insertions, 32 deletions

diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index c85080326..1fa297dec 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -599,8 +599,9 @@
         <PlayerAnimation Name="gPlayer573Anim"/>
         <PlayerAnimation Name="gPlayer574Anim"/>
         <PlayerAnimation Name="gPlayer575Anim"/>
-        <!-- TODO: this padding should be static -->
-        <Scalar Type="u64" Name="pad34F8"/>
+
+        <!-- Probably a file boundary here. -->
+
         <DList Name="gDebugPyramidDL" Offset="0x35C0"/>
         <Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
         <Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
@@ -720,7 +721,7 @@
         <Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DAC0"/>
         <Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1DEC0"/>
         <DList Name="gEffUnusedBubblesDL" Offset="0x1E2C0"/>
-        <Texture Name="gUnknownCircle5Tex" OutName="unknown_circle_5" Format="i8" Width="64" Height="64" Offset="0x1E370"/>
+        <Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E370"/>
         <Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F370"/>
         <Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F4F0"/>
         <Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1F670"/>
@@ -912,9 +913,9 @@
         <Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x49290"/>
         <DList Name="gHorseShadowDL" Offset="0x49AD0"/>
         <Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x49B20"/>
-        <DList Name="gDoorMetalBarsDL" Offset="0x49FE0"/>
+        <DList Name="gDungeonDoorDL" Offset="0x49FE0"/>
         <Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4A090"/>
-        <DList Name="gDungeonDoorDL" Offset="0x4B0D0"/>
+        <DList Name="gDoorMetalBarsDL" Offset="0x4B0D0"/>
         <Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgb5a1" Width="32" Height="64" Offset="0x4B160"/>
         <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="31" Offset="0x4C160"/>
         <Texture Name="gSun2Tex" OutName="sun_2" Format="i4" Width="64" Height="16" Offset="0x4C540"/>
@@ -922,7 +923,7 @@
         <Texture Name="gSunEvening1Tex" OutName="sun_evening_1" Format="i4" Width="64" Height="31" Offset="0x4C960"/>
         <Texture Name="gSunEvening2Tex" OutName="sun_evening_2" Format="i4" Width="64" Height="16" Offset="0x4CD40"/>
         <Texture Name="gSunEvening3Tex" OutName="sun_evening_3" Format="i4" Width="64" Height="16" Offset="0x4CF40"/>
-        <DList Name="gKokiriDustMoteTextureLoadDL " Offset="0x4D160"/>
+        <DList Name="gKokiriDustMoteTextureLoadDL" Offset="0x4D160"/>
         <DList Name="gKokiriDustMoteDL" Offset="0x4D1A8"/>
         <DList Name="gSunDL" Offset="0x4D1C0"/>
         <DList Name="gZTargetLockOnTriangleDL" Offset="0x4D450"/>
diff --git a/assets/xml/objects/object_hidan_objects.xml b/assets/xml/objects/object_hidan_objects.xml
index f6cfba283..6d13e86b5 100644
--- a/assets/xml/objects/object_hidan_objects.xml
+++ b/assets/xml/objects/object_hidan_objects.xml
@@ -78,11 +78,13 @@
         <Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
 
         <DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
-        <DList Name="gFireTempleBombableDoorDL1" Offset="0xF938"/>
-        <DList Name="gFireTempleBombableDoorDL2" Offset="0xF998"/>
+        <DList Name="gFireTempleDoorWithHandleBackDL" Offset="0xF938"/>
+        <DList Name="gFireTempleDoorWithHandleFrontDL" Offset="0xF998"/>
         <DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
         <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
 
+        <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgb5a1" Width="32" Height="64" Offset="0xE5A0"/>
+
         <!-- I don't know what could this be -->
         <Blob Name="gFireTempleBlob_00CCC0" Size="0x10E" Offset="0xCCC0"/>
     </File>
diff --git a/assets/xml/overlays/ovl_En_Jsjutan.xml b/assets/xml/overlays/ovl_En_Jsjutan.xml
index 0c864471f..ee30fc2b1 100644
--- a/assets/xml/overlays/ovl_En_Jsjutan.xml
+++ b/assets/xml/overlays/ovl_En_Jsjutan.xml
@@ -17,7 +17,7 @@
         </Array>
 
         <!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by gJsjutanShadowVisualDL -->
-        <Symbol Name="gJsjutanShadowTex" Type="u8" Size="1" Count="0x800" Offset="0x4E70"/>
+        <Symbol Name="gJsjutanShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E70"/>
 
         <!-- D_80A8D598. Draws the carpet's texture. -->
         <DList Name="gJsjutanCarpetVisualDL" Offset="0x3DF8"/>
diff --git a/assets/xml/textures/icon_item_static.xml b/assets/xml/textures/icon_item_static.xml
index c7eec2f23..43323ca1a 100644
--- a/assets/xml/textures/icon_item_static.xml
+++ b/assets/xml/textures/icon_item_static.xml
@@ -186,6 +186,5 @@
         <DList Name="gItemStaticDL_08089BA0" Offset="0x89BA0"/>
         <DList Name="gItemStaticDL_08089BF8" Offset="0x89BF8"/>
         <DList Name="gItemStaticDL_08089C48" Offset="0x89C48"/>
-        <DList Name="gItemStaticDL_08089C48" Offset="0x89C48"/>
     </File>
 </Root>
diff --git a/docs/tutorial/object_decomp.md b/docs/tutorial/object_decomp.md
index cb397e09a..f7964bf32 100644
--- a/docs/tutorial/object_decomp.md
+++ b/docs/tutorial/object_decomp.md
@@ -83,9 +83,9 @@ The following is a list of the texture formats the Nintendo 64 supports, with th
 | 4-bit intensity (I)                             | `G_IM_FMT_I, G_IM_SIZ_4b`        | i4              |
 | 4-bit intensity with alpha (I/A) (3/1)          | `G_IM_FMT_IA, G_IM_SIZ_4b`       | ia4             |
 | 4-bit color index (CI)                          | `G_IM_FMT_CI, G_IM_SIZ_4b`       | ci4             |
-| 8-bit I                                         | `G_IM_FMT_I, G_IM_SIZ_4b`        | i8              |
-| 8-bit IA (4/4)                                  | `G_IM_FMT_IA, G_IM_SIZ_4b`       | ia8             |
-| 8-bit CI                                        | `G_IM_FMT_CI, G_IM_SIZ_4b`       | ci8             |
+| 8-bit I                                         | `G_IM_FMT_I, G_IM_SIZ_8b`        | i8              |
+| 8-bit IA (4/4)                                  | `G_IM_FMT_IA, G_IM_SIZ_8b`       | ia8             |
+| 8-bit CI                                        | `G_IM_FMT_CI, G_IM_SIZ_8b`       | ci8             |
 | 16-bit red, green, blue, alpha (RGBA) (5/5/5/1) | `G_IM_FMT_RGBA, G_IM_SIZ_16b`    | rgb5a1          |
 | 16-bit IA (8/8)                                 | `G_IM_FMT_IA, G_IM_SIZ_16b`      | ia16            |
 | 16-bit YUV (Luminance, Blue-Y, Red-Y)           | `G_IM_FMT_YUV, G_IM_SIZ_16b`     | (not used)      |
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 },
 };