diff --git a/assets/xml/objects/object_bdoor.xml b/assets/xml/objects/object_bdoor.xml index 80f7302fe2..644c06ea86 100644 --- a/assets/xml/objects/object_bdoor.xml +++ b/assets/xml/objects/object_bdoor.xml @@ -1,10 +1,15 @@ - + - + + + + + + diff --git a/assets/xml/objects/object_bob.xml b/assets/xml/objects/object_bob.xml index 5c33ea778f..289e994e47 100644 --- a/assets/xml/objects/object_bob.xml +++ b/assets/xml/objects/object_bob.xml @@ -21,7 +21,9 @@ - + + + diff --git a/assets/xml/objects/object_bxa.xml b/assets/xml/objects/object_bxa.xml index cac49d63e1..fb78c117e0 100644 --- a/assets/xml/objects/object_bxa.xml +++ b/assets/xml/objects/object_bxa.xml @@ -5,8 +5,9 @@ - + - + + diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml index 5935f371d4..25ee2ad42e 100644 --- a/assets/xml/objects/object_fr.xml +++ b/assets/xml/objects/object_fr.xml @@ -11,7 +11,8 @@ - + + diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index 932b0b16d8..b3da9a6086 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -108,6 +108,14 @@ + + + + + + + + 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 5bb172bb8a..6bb628b3aa 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -5,16 +5,24 @@ */ #include "z_door_shutter.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" #include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h" -#include "objects/object_ydan_objects/object_ydan_objects.h" + #include "objects/object_gnd/object_gnd.h" #include "objects/object_goma/object_goma.h" +#include "objects/object_ydan_objects/object_ydan_objects.h" +#include "objects/object_ddan_objects/object_ddan_objects.h" +#include "objects/object_bdan_objects/object_bdan_objects.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_bdoor/object_bdoor.h" #include "objects/object_hidan_objects/object_hidan_objects.h" +#include "objects/object_ganon_objects/object_ganon_objects.h" #include "objects/object_jya_door/object_jya_door.h" #include "objects/object_mizu_objects/object_mizu_objects.h" -#include "objects/object_bdan_objects/object_bdan_objects.h" +#include "objects/object_haka_door/object_haka_door.h" +#include "objects/object_ice_objects/object_ice_objects.h" +#include "objects/object_menkuri_objects/object_menkuri_objects.h" +#include "objects/object_demo_kekkai/object_demo_kekkai.h" +#include "objects/object_ouke_haka/object_ouke_haka.h" #define FLAGS ACTOR_FLAG_4 @@ -89,24 +97,24 @@ typedef struct { static ShutterInfo sShutterInfo[] = { { gDTDungeonDoor1DL, gDoorMetalBarsDL, 130, 12, 20, 15 }, { gDTDungeonDoor2DL, gDoorMetalBarsDL, 130, 12, 20, 15 }, - { 0x060000C0, 0x060001F0, 240, 14, 70, 15 }, - { gJabuDoorSection1DL, 0x06006460, 0, 110, 50, 15 }, + { gDodongoDoorDL, gDodongoBarsDL, 240, 14, 70, 15 }, + { gJabuDoorSection1DL, gJabuWebDoorDL, 0, 110, 50, 15 }, { gPhantomGanonBarsDL, NULL, 130, 12, 50, 15 }, { gGohmaDoorDL, NULL, 130, 12, 50, 15 }, { gSpiritDoorDL, gJyaDoorMetalBarsDL, 240, 14, 50, 15 }, - { 0x060010C0, NULL, 130, 12, 50, 15 }, + { object_bdoor_DL_0010C0, NULL, 130, 12, 50, 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 }, + { object_ganon_objects_DL_0000C0, gDoorMetalBarsDL, 130, 12, 20, 15 }, { gObjectMizuObjectsDoorShutterDL_005D90, gDoorMetalBarsDL, 130, 12, 20, 15 }, { gObjectMizuObjectsDoorShutterDL_007000, 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 }, + { object_haka_door_DL_002620, gDoorMetalBarsDL, 130, 12, 20, 15 }, + { object_haka_door_DL_003890, gDoorMetalBarsDL, 130, 12, 20, 15 }, + { object_ice_objects_DL_001D10, gDoorMetalBarsDL, 130, 12, 20, 15 }, + { gGTGDoorDL, gDoorMetalBarsDL, 130, 12, 20, 15 }, { gGanonsCastleDoorDL, gDoorMetalBarsDL, 130, 12, 20, 15 }, - { 0x060000C0, gDoorMetalBarsDL, 130, 12, 20, 15 }, + { object_ouke_haka_DL_0000C0, gDoorMetalBarsDL, 130, 12, 20, 15 }, }; static s8 D_80998224[] = { @@ -155,9 +163,9 @@ static Gfx* sJabuDoorDLists[] = { gJabuDoorSection5DL, gJabuDoorSection4DL, gJabuDoorSection3DL, gJabuDoorSection2DL, }; -// boss door textures? static void* D_809982D4[] = { - 0x060065C0, 0x060035C0, 0x060055C0, 0x060045C0, 0x06000000, 0x060025C0, 0x060015C0, + object_bdoor_Tex_0065C0, object_bdoor_Tex_0035C0, object_bdoor_Tex_0055C0, object_bdoor_Tex_0045C0, + object_bdoor_Tex_000000, object_bdoor_Tex_0025C0, object_bdoor_Tex_0015C0, }; void DoorShutter_SetupAction(DoorShutter* this, DoorShutterActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 93db623677..290e27e32b 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -465,7 +465,11 @@ void EnBa_Update(Actor* thisx, GlobalContext* globalCtx) { } } -static Gfx* D_809B8118[] = { 0x060024F0, 0x060027F0, 0x060029F0 }; +static void* D_809B8118[] = { + object_bxa_Tex_0024F0, + object_bxa_Tex_0027F0, + object_bxa_Tex_0029F0, +}; void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBa* this = (EnBa*)thisx; diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 80280f21e2..a4269abdeb 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -196,7 +196,9 @@ void EnBdfire_Update(Actor* thisx, GlobalContext* globalCtx) { void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx) { static void* D_809BCB10[] = { - 0x060264E0, 0x060274E0, 0x060284E0, 0x060294E0, 0x0602A4E0, 0x0602B4E0, 0x0602C4E0, 0x0602D4E0, + object_kingdodongo_Tex_0264E0, object_kingdodongo_Tex_0274E0, object_kingdodongo_Tex_0284E0, + object_kingdodongo_Tex_0294E0, object_kingdodongo_Tex_02A4E0, object_kingdodongo_Tex_02B4E0, + object_kingdodongo_Tex_02C4E0, object_kingdodongo_Tex_02D4E0, }; s16 temp; s32 pad; diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index e49d248724..be68336464 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -195,7 +195,11 @@ void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) { } void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { - static void* D_809D2560[] = { 0x060024F0, 0x060027F0, 0x060029F0 }; + static void* D_809D2560[] = { + object_bxa_Tex_0024F0, + object_bxa_Tex_0027F0, + object_bxa_Tex_0029F0, + }; EnBx* this = (EnBx*)thisx; s32 pad; Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx)); 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 053aeb2e8b..0d1d4c3a72 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -9,6 +9,7 @@ #include "objects/gameplay_field_keep/gameplay_field_keep.h" #include "objects/object_hidan_objects/object_hidan_objects.h" #include "objects/object_mizu_objects/object_mizu_objects.h" +#include "objects/object_haka_door/object_haka_door.h" #define FLAGS ACTOR_FLAG_4 @@ -71,7 +72,7 @@ static Gfx* D_809FCEE4[5][2] = { { gDoorLeftDL, gDoorRightDL }, { gFireTempleDoorWithHandleFrontDL, gFireTempleDoorWithHandleBackDL }, { gWaterTempleDoorLeftDL, gWaterTempleDoorRightDL }, - { 0x060013B8, 0x06001420 }, + { object_haka_door_DL_0013B8, object_haka_door_DL_001420 }, { gFieldDoor1DL, gFieldDoor2DL }, }; diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 040b9b45ea..fd5117bca4 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1057,7 +1057,10 @@ void EnFr_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec } void EnFr_Draw(Actor* thisx, GlobalContext* globalCtx) { - static void* eyeTextures[] = { 0x060059A0, 0x06005BA0 }; + static void* eyeTextures[] = { + object_fr_Tex_0059A0, + object_fr_Tex_005BA0, + }; s16 lightRadius; EnFr* this = (EnFr*)thisx; s16 frogIndex = this->actor.params - 1; diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 7a5f630bcd..11004e6ee6 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -276,9 +276,9 @@ void EnGe3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve void EnGe3_Draw(Actor* thisx, GlobalContext* globalCtx2) { static void* eyeTextures[] = { - 0x06005FE8, // Half-open - 0x060065A8, // Quarter-open - 0x06006D28, // Closed + gGerudoRedEyeOpenTex, + gGerudoRedEyeHalfTex, + gGerudoRedEyeShutTex, }; EnGe3* this = (EnGe3*)thisx; GlobalContext* globalCtx = globalCtx2; diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index e5e9dde930..65e5ebd2fe 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -67,12 +67,12 @@ static ColliderCylinderInit sColCylInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; // NULL-terminated arrays of eye textures -static void* sEyeTexturesAOB[] = { 0x060005C8, 0x06000DC8, 0x060015C8, NULL }; +static void* sEyeTexturesAOB[] = { gDogLadyEyeOpenTex, gDogLadyEyeHalfTex, gDogLadyEyeClosedTex, NULL }; static void* sEyeTexturesAHG7[] = { 0x0600057C, 0x0600067C, 0x0600077C, NULL }; -static void* sEyeTexturesBBA[] = { 0x060004C8, NULL }; +static void* sEyeTexturesBBA[] = { object_bba_Tex_0004C8, NULL }; static void* sEyeTexturesBJI13[] = { 0x060005FC, 0x060009FC, 0x06000DFC, NULL }; static void* sEyeTexturesBOJ2[] = { 0x060005FC, 0x060006FC, 0x060007FC, NULL }; -static void* sEyeTexturesBOB[] = { 0x060007C8, 0x06000FC8, 0x060017C8, NULL }; +static void* sEyeTexturesBOB[] = { object_bob_Tex_0007C8, object_bob_Tex_000FC8, object_bob_Tex_0017C8, NULL }; typedef struct { /* 0x00 */ s16 objectId;