From ff49ace524978236263cdc4f3f785f8fc5e20592 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Thu, 2 Dec 2021 01:21:32 +0100 Subject: [PATCH] Symbol cleanup 4 (#1050) * Replace some hardcoded constants with proper asset symbols * Remove Blob which turned out to be a texture --- assets/xml/objects/object_bwall.xml | 2 +- assets/xml/objects/object_haka_objects.xml | 12 +++---- assets/xml/objects/object_kingdodongo.xml | 4 +-- assets/xml/objects/object_spot02_objects.xml | 13 ++++++- assets/xml/objects/object_tw.xml | 12 ++++--- src/code/z_draw.c | 3 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 10 +++--- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 7 +++- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 34 +++++++++++-------- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 3 +- .../actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 7 +++- .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 6 +++- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 8 ++--- .../z_bg_spot01_objects2.c | 5 ++- .../z_bg_spot02_objects.c | 12 +++++-- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 14 ++++---- 16 files changed, 98 insertions(+), 54 deletions(-) diff --git a/assets/xml/objects/object_bwall.xml b/assets/xml/objects/object_bwall.xml index bc1605813d..d4f43ddc14 100644 --- a/assets/xml/objects/object_bwall.xml +++ b/assets/xml/objects/object_bwall.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_haka_objects.xml b/assets/xml/objects/object_haka_objects.xml index 237ff2f275..3ca6d27c08 100644 --- a/assets/xml/objects/object_haka_objects.xml +++ b/assets/xml/objects/object_haka_objects.xml @@ -7,17 +7,17 @@ - + - + - + - + - + - + diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index d2c01e8781..158cfb4d3b 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -104,9 +104,9 @@ - + - + diff --git a/assets/xml/objects/object_spot02_objects.xml b/assets/xml/objects/object_spot02_objects.xml index 978b7cba87..65f45ff515 100644 --- a/assets/xml/objects/object_spot02_objects.xml +++ b/assets/xml/objects/object_spot02_objects.xml @@ -5,7 +5,6 @@ - @@ -29,5 +28,17 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml index be4115b2c7..bb471aee51 100644 --- a/assets/xml/objects/object_tw.xml +++ b/assets/xml/objects/object_tw.xml @@ -50,7 +50,7 @@ - + @@ -62,7 +62,8 @@ - + + @@ -206,6 +207,7 @@ + @@ -245,11 +247,11 @@ - - + + - + diff --git a/src/code/z_draw.c b/src/code/z_draw.c index d9f63c9ad9..0e26fd6abd 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -76,6 +76,7 @@ #include "objects/object_gi_dekupouch/object_gi_dekupouch.h" #include "objects/object_gi_rupy/object_gi_rupy.h" #include "objects/object_gi_sword_1/object_gi_sword_1.h" +#include "objects/object_st/object_st.h" // "Get Item" Model Draw Functions void GetItem_DrawMaskOrBombchu(GlobalContext* globalCtx, s16 drawId); @@ -365,7 +366,7 @@ DrawItemTableEntry sDrawItemTable[] = { // kokiri sword, OBJECT_GI_SWORD_1 { GetItem_DrawOpa0, { gGiKokiriSwordDL } }, // gold skulltula token, OBJECT_ST - { GetItem_DrawSkullToken, { 0x06004DB0, 0x06004EB8 } }, // TODO symbols from this object + { GetItem_DrawSkullToken, { object_st_DL_004DB0, object_st_DL_004EB8 } }, }; /** diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index e3b9b831d6..6c631a4f43 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -6,6 +6,8 @@ #include "z_bg_breakwall.h" #include "scenes/dungeons/ddan/ddan_scene.h" +#include "objects/object_bwall/object_bwall.h" +#include "objects/object_kingdodongo/object_kingdodongo.h" #define FLAGS 0x00000010 @@ -59,10 +61,10 @@ static ColliderQuadInit sQuadInit = { }; static BombableWallInfo sBombableWallInfo[] = { - { 0x06000118, 0x06000040, 0 }, - { 0x06000118, 0x06000040, 0 }, - { 0x060264A8, 0x06025BD0, 1 }, - { 0x06025B64, NULL, -1 }, + { &object_bwall_Col_000118, object_bwall_DL_000040, 0 }, + { &object_bwall_Col_000118, object_bwall_DL_000040, 0 }, + { &object_kingdodongo_Col_0264A8, object_kingdodongo_DL_025BD0, 1 }, + { &object_kingdodongo_Col_025B64, NULL, -1 }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 8d4d2b693a..31ff9da9ae 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -338,7 +338,12 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) { } void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) { - static Gfx* displayLists[] = { 0x06012270, 0x06010A10, 0x0600A860, 0x0600F1B0 }; + static Gfx* displayLists[] = { + object_haka_objects_DL_012270, + object_haka_objects_DL_010A10, + object_haka_objects_DL_00A860, + object_haka_objects_DL_00F1B0, + }; BgHakaGate* this = THIS; MtxF currentMtxF; diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index aabc61a471..92e5894f81 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -6,6 +6,7 @@ #include "z_bg_haka_megane.h" #include "objects/object_hakach_objects/object_hakach_objects.h" +#include "objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0x000000B0 @@ -37,24 +38,27 @@ static InitChainEntry sInitChain[] = { }; static CollisionHeader* sCollisionHeaders[] = { - &gBotw1Col, &gBotw2Col, NULL, 0x06004330, 0x060044D0, NULL, 0x06004780, - 0x06004940, NULL, 0x06004B00, NULL, 0x06004CC0, NULL, + &gBotw1Col, + &gBotw2Col, + NULL, + &object_haka_objects_Col_004330, + &object_haka_objects_Col_0044D0, + NULL, + &object_haka_objects_Col_004780, + &object_haka_objects_Col_004940, + NULL, + &object_haka_objects_Col_004B00, + NULL, + &object_haka_objects_Col_004CC0, + NULL, }; static Gfx* sDLists[] = { - gBotwFakeWallsAndFloorsDL, - gBotwThreeFakeFloorsDL, - gBotwHoleTrap2DL, - 0x060040F0, - 0x060043B0, - 0x06001120, - 0x060045A0, - 0x060047F0, - 0x060018F0, - 0x060049B0, - 0x06003CF0, - 0x06004B70, - 0x06002ED0, + gBotwFakeWallsAndFloorsDL, gBotwThreeFakeFloorsDL, gBotwHoleTrap2DL, + object_haka_objects_DL_0040F0, object_haka_objects_DL_0043B0, object_haka_objects_DL_001120, + object_haka_objects_DL_0045A0, object_haka_objects_DL_0047F0, object_haka_objects_DL_0018F0, + object_haka_objects_DL_0049B0, object_haka_objects_DL_003CF0, object_haka_objects_DL_004B70, + object_haka_objects_DL_002ED0, }; void BgHakaMegane_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 694b25d616..49825f9633 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -518,7 +518,8 @@ void func_80880D68(BgHakaTrap* this) { void BgHakaTrap_Draw(Actor* thisx, GlobalContext* globalCtx) { static Gfx* sDLists[5] = { - 0x06007610, 0x06009860, 0x06007EF0, 0x06008A20, 0x060072C0, + object_haka_objects_DL_007610, object_haka_objects_DL_009860, object_haka_objects_DL_007EF0, + object_haka_objects_DL_008A20, object_haka_objects_DL_0072C0, }; static Color_RGBA8 D_8088103C = { 0, 0, 0, 0 }; BgHakaTrap* this = THIS; diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 9a9fc24878..0b7af0eb19 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -402,7 +402,12 @@ void BgHakaZou_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgHakaZou_Draw(Actor* thisx, GlobalContext* globalCtx) { - static Gfx* dLists[] = { 0x060064E0, 0x06005CE0, gBotwBombSpotDL, 0x06005CE0 }; + static Gfx* dLists[] = { + object_haka_objects_DL_0064E0, + object_haka_objects_DL_005CE0, + gBotwBombSpotDL, + object_haka_objects_DL_005CE0, + }; Gfx_DrawDListOpa(globalCtx, dLists[thisx->params]); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index c96aeeb34a..82515cd21b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -204,7 +204,11 @@ void BgJyaHaheniron_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgJyaHaheniron_Draw(Actor* thisx, GlobalContext* globalCtx) { - static Gfx* dLists[] = { 0x06000880, 0x06000AE0, 0x06000600 }; + static Gfx* dLists[] = { + gObjectJyaIronDL_000880, + gObjectJyaIronDL_000AE0, + gObjectJyaIronDL_000600, + }; s32 pad; BgJyaHaheniron* this = THIS; 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 2251262e37..9fa475ac14 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 @@ -48,10 +48,10 @@ static InitChainEntry sInitChain[] = { }; static Gfx* sDLists[] = { - 0x060024E0, - 0x06001980, - 0x060020F0, - 0x06002B70, + object_mori_hineri1_DL_0024E0, + object_mori_hineri1a_DL_001980, + object_mori_hineri2_DL_0020F0, + object_mori_hineri2a_DL_002B70, }; void BgMoriHineri_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index e2ca2c8ec7..469d168b52 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -39,7 +39,10 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -static Gfx* D_808AC510[] = { 0x06001EB0, 0x06002780, 0x06003078, 0x06001228, 0x06001528 }; +static Gfx* D_808AC510[] = { + gKakarikoPotionShopSignDL, gKakarikoShootingGallerySignDL, gKakarikoBazaarSignDL, + gKakarikoConstructionSiteDL, gKakarikoShootingGalleryDL, +}; void BgSpot01Objects2_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot01Objects2* this = THIS; diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 98723f1163..2a46e65d55 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -27,8 +27,10 @@ void func_808ACC34(BgSpot02Objects* this, GlobalContext* globalCtx); void func_808AD3D4(BgSpot02Objects* this, GlobalContext* globalCtx); static void* D_808AD850[] = { - 0x060096B0, 0x0600A2B0, 0x0600AEB0, 0x0600BAB0, 0x0600C6B0, 0x0600D2B0, - 0x0600DEB0, 0x0600EAB0, 0x0600F6B0, 0x060102B0, 0x06010EB0, 0x06011AB0, + object_spot02_objects_Tex_0096B0, object_spot02_objects_Tex_00A2B0, object_spot02_objects_Tex_00AEB0, + object_spot02_objects_Tex_00BAB0, object_spot02_objects_Tex_00C6B0, object_spot02_objects_Tex_00D2B0, + object_spot02_objects_Tex_00DEB0, object_spot02_objects_Tex_00EAB0, object_spot02_objects_Tex_00F6B0, + object_spot02_objects_Tex_0102B0, object_spot02_objects_Tex_010EB0, object_spot02_objects_Tex_011AB0, }; const ActorInit Bg_Spot02_Objects_InitVars = { @@ -190,7 +192,11 @@ void BgSpot02Objects_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot02Objects_Draw(Actor* thisx, GlobalContext* globalCtx) { - static Gfx* dLists[] = { 0x06012A50, 0x060127C0, 0x060130B0 }; + static Gfx* dLists[] = { + object_spot02_objects_DL_012A50, + object_spot02_objects_DL_0127C0, + object_spot02_objects_DL_0130B0, + }; Gfx_DrawDListOpa(globalCtx, dLists[thisx->params]); } diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 842f765da6..a73192e490 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -3482,9 +3482,9 @@ void func_80943028(Actor* thisx, GlobalContext* globalCtx) { } static void* sEyeTextures[] = { - 0x0600A438, - 0x0600B238, - 0x0600B638, + object_tw_Tex_00A438, + object_tw_Tex_00B238, + object_tw_Tex_00B638, }; void BossTw_Draw(Actor* thisx, GlobalContext* globalCtx2) { @@ -3568,10 +3568,10 @@ void BossTw_Draw(Actor* thisx, GlobalContext* globalCtx2) { CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7123); } -Gfx* D_8094A9B0[] = { - 0x0602A9B0, - 0x0602A070, - 0x0602A470, +void* D_8094A9B0[] = { + object_tw_Tex_02A9B0, + object_tw_Tex_02A070, + object_tw_Tex_02A470, }; s32 BossTw_TwinrovaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,