From 8ff1f242faff3bf1241c09d27f4f256b3e3f76f5 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Thu, 2 Dec 2021 22:19:19 +0100 Subject: [PATCH] Replace some more constants with proper asset symbols (#1053) --- assets/xml/objects/object_kingdodongo.xml | 10 +++ assets/xml/objects/object_ssh.xml | 5 +- assets/xml/objects/object_tr.xml | 11 +-- assets/xml/objects/object_ts.xml | 3 +- assets/xml/objects/object_yabusame_point.xml | 4 +- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 68 +++++++++---------- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 16 +++-- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 6 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 6 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 9 ++- .../ovl_En_Takara_Man/z_en_takara_man.c | 4 +- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 26 +++---- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 5 +- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 6 +- .../z_eff_ss_g_magma2.c | 7 +- 15 files changed, 115 insertions(+), 71 deletions(-) diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index 158cfb4d3b..932b0b16d8 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -108,5 +108,15 @@ + + + + + + + + + + diff --git a/assets/xml/objects/object_ssh.xml b/assets/xml/objects/object_ssh.xml index fea66d4b84..6283f8e9f2 100644 --- a/assets/xml/objects/object_ssh.xml +++ b/assets/xml/objects/object_ssh.xml @@ -8,9 +8,10 @@ - + - + + diff --git a/assets/xml/objects/object_tr.xml b/assets/xml/objects/object_tr.xml index c5dc4f6b0f..e84d0896dc 100644 --- a/assets/xml/objects/object_tr.xml +++ b/assets/xml/objects/object_tr.xml @@ -1,9 +1,9 @@ - + - + @@ -31,7 +31,7 @@ - + @@ -43,7 +43,8 @@ - + + @@ -143,6 +144,6 @@ - + diff --git a/assets/xml/objects/object_ts.xml b/assets/xml/objects/object_ts.xml index 011b19a6d3..567277bc39 100644 --- a/assets/xml/objects/object_ts.xml +++ b/assets/xml/objects/object_ts.xml @@ -7,7 +7,8 @@ - + + diff --git a/assets/xml/objects/object_yabusame_point.xml b/assets/xml/objects/object_yabusame_point.xml index dd709430d9..bed9e8a609 100644 --- a/assets/xml/objects/object_yabusame_point.xml +++ b/assets/xml/objects/object_yabusame_point.xml @@ -1,6 +1,8 @@ - + + + diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 2bc0f39be0..b687ad5d1b 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -90,40 +90,40 @@ static EnKoSkeleton sSkeleton[2] = { }; static struct_80034EC0_Entry sOsAnimeTable[] = { - { 0x06008F6C, 1.0f, 2.0f, 14.0f, ANIMMODE_LOOP_PARTIAL, 0.0f }, - { 0x06008F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, 0.0f }, - { 0x06009B64, 0.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f }, - { 0x06009B64, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f }, - { 0x06009B64, 0.0f, 2.0f, 2.0f, ANIMMODE_ONCE, 0.0f }, - { 0x060062DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x060062DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, - { 0x06005808, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, - { 0x06007830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06008178, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x060065E0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x0600879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06007FFC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x060080B4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x060091AC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06006F9C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06007064, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06007120, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06007F38, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06007D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06006EE0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x060098EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x060090EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x0600982C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06009274, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x060099A4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06009028, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06007E64, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06007454, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06008F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, -8.0f }, - { 0x06007D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, - { 0x0600879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, - { 0x06006A60, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, - { 0x06007830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, + { &gObjOsAnim_8F6C, 1.0f, 2.0f, 14.0f, ANIMMODE_LOOP_PARTIAL, 0.0f }, + { &gObjOsAnim_8F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, 0.0f }, + { &gObjOsAnim_9B64, 0.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f }, + { &gObjOsAnim_9B64, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f }, + { &gObjOsAnim_9B64, 0.0f, 2.0f, 2.0f, ANIMMODE_ONCE, 0.0f }, + { &gObjOsAnim_62DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_62DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { &gObjOsAnim_5808, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { &gObjOsAnim_7830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_8178, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_65E0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_7FFC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_80B4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_91AC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_6F9C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_7064, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_7120, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_7F38, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_7D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_6EE0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_98EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_90EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_982C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_9274, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_99A4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_9028, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_7E64, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_7454, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gObjOsAnim_8F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, -8.0f }, + { &gObjOsAnim_7D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, + { &gObjOsAnim_879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, + { &gObjOsAnim_6A60, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, + { &gObjOsAnim_7830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, }; static u8 sOsAnimeLookup[13][5] = { diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 2bde03665d..5dbe97dd45 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -5,10 +5,12 @@ */ #include "z_en_nutsball.h" -#include "objects/object_dns/object_dns.h" -#include "objects/object_hintnuts/object_hintnuts.h" -#include "objects/object_dnk/object_dnk.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" +#include "objects/object_dekunuts/object_dekunuts.h" +#include "objects/object_hintnuts/object_hintnuts.h" +#include "objects/object_shopnuts/object_shopnuts.h" +#include "objects/object_dns/object_dns.h" +#include "objects/object_dnk/object_dnk.h" #define FLAGS 0x00000010 @@ -54,9 +56,13 @@ static ColliderCylinderInit sCylinderInit = { { 13, 13, 0, { 0 } }, }; -static s16 sObjectIDs[] = { OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK }; +static s16 sObjectIDs[] = { + OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK, +}; -static Gfx* sDLists[] = { 0x06002028, gHintNutsNutDL, 0x06004008, gDntJijiNutDL, gDntStageNutDL }; +static Gfx* sDLists[] = { + gDekuNutsDekuNutDL, gHintNutsNutDL, gBusinessScrubDekuNutDL, gDntJijiNutDL, gDntStageNutDL, +}; void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx) { EnNutsball* this = THIS; diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index bc26cbbe2b..c171508fc5 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -2353,7 +2353,11 @@ void EnOssan_DrawBazaarShopkeeper(Actor* thisx, GlobalContext* globalCtx) { s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - static void* sKokiriShopkeeperEyeTextures[] = { 0x06001570, 0x060001F0, 0x06000B30 }; + static void* sKokiriShopkeeperEyeTextures[] = { + gKokiriShopkeeperEyeDefaultTex, + gKokiriShopkeeperEyeHalfTex, + gKokiriShopkeeperEyeOpenTex, + }; EnOssan* this = THIS; s32 pad; diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 9c16d1fcbe..d6297c2cb3 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -869,7 +869,11 @@ void EnSsh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve } void EnSsh_Draw(Actor* thisx, GlobalContext* globalCtx) { - static u32* blinkTex[] = { 0x060007E0, 0x06000C60, 0x06001060 }; + static void* blinkTex[] = { + object_ssh_Tex_0007E0, + object_ssh_Tex_000C60, + object_ssh_Tex_001060, + }; s32 pad; EnSsh* this = THIS; diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index c4cf7fee9a..fc7f041f73 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -6,6 +6,8 @@ #include "vt.h" #include "z_en_sth.h" +#include "objects/object_ahg/object_ahg.h" +#include "objects/object_boj/object_boj.h" #define FLAGS 0x00000019 @@ -61,7 +63,12 @@ static s16 sObjectIds[6] = { }; static FlexSkeletonHeader* sSkeletons[6] = { - 0x060000F0, 0x060000F0, 0x060000F0, 0x060000F0, 0x060000F0, 0x060000F0, + /* object_ahg_Skel_0000F0 */ 0x060000F0, + /* object_boj_Skel_0000F0 */ 0x060000F0, + /* object_boj_Skel_0000F0 */ 0x060000F0, + /* object_boj_Skel_0000F0 */ 0x060000F0, + /* object_boj_Skel_0000F0 */ 0x060000F0, + /* object_boj_Skel_0000F0 */ 0x060000F0, }; static AnimationHeader* sAnimations[6] = { diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index d23d0476c7..257394dedc 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -215,8 +215,8 @@ s32 EnTakaraMan_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** void EnTakaraMan_Draw(Actor* thisx, GlobalContext* globalCtx) { static void* eyeTextures[] = { - 0x06000970, - 0x06000D70, + object_ts_Tex_000970, + object_ts_Tex_000D70, }; EnTakaraMan* this = THIS; diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 328f1f23a8..92d1cc24d0 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -40,28 +40,28 @@ const ActorInit En_Tr_InitVars = { // The first elements of these animation arrays are for Koume, the second for Kotake static AnimationHeader* unused[] = { - 0x06003FC8, - 0x06001CDC, + &object_tr_Anim_003FC8, + &object_tr_Anim_001CDC, }; static AnimationHeader* D_80B24368[] = { - 0x06002BC4, // Turn to look over right shoulder - 0x06000BFC, // Turn to look over right shoulder + &object_tr_Anim_002BC4, + &object_tr_Anim_000BFC, }; static AnimationHeader* D_80B24370[] = { - 0x060035CC, // Looking over left shoulder - 0x060013CC, // Looking over right shoulder + &object_tr_Anim_0035CC, + &object_tr_Anim_0013CC, }; static AnimationHeader* D_80B24378[] = { - 0x060049C8, // Floating on broom - 0x060049C8, // Floating on broom + &object_tr_Anim_0049C8, + &object_tr_Anim_0049C8, }; static AnimationHeader* D_80B24380[] = { - 0x06012E1C, // Casting magic - 0x06012E1C, // Casting magic + &object_tr_Anim_012E1C, + &object_tr_Anim_012E1C, }; static f32 D_80B24388[] = { 0.0f, 20.0f, -30.0f, 20.0f, -20.0f, -20.0f, 30.0f }; @@ -77,9 +77,9 @@ static Color_RGBA8 D_80B243C0[4] = { }; static void* sEyeTextures[] = { - 0x060086D8, // Open - 0x060094D8, // Half - 0x060098D8, // Closed + object_tr_Tex_0086D8, + object_tr_Tex_0094D8, + object_tr_Tex_0098D8, }; void EnTr_SetupAction(EnTr* this, EnTrActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index c1de1bd687..305630c114 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -7,6 +7,7 @@ #include "z_obj_tsubo.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "objects/object_tsubo/object_tsubo.h" #define FLAGS 0x00800010 @@ -51,9 +52,9 @@ const ActorInit Obj_Tsubo_InitVars = { static s16 sObjectIds[] = { OBJECT_GAMEPLAY_DANGEON_KEEP, OBJECT_TSUBO }; -static Gfx* D_80BA1B84[] = { gPotDL, 0x060017C0 }; +static Gfx* D_80BA1B84[] = { gPotDL, object_tsubo_DL_0017C0 }; -static Gfx* D_80BA1B8C[] = { gPotFragmentDL, 0x06001960 }; +static Gfx* D_80BA1B8C[] = { gPotFragmentDL, object_tsubo_DL_001960 }; static ColliderCylinderInit sCylinderInit = { { diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index a269761611..f4030677dc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -52,7 +52,11 @@ u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void return 0; } -static void* sTextures[] = { 0x06000000, 0x06000480, 0x06000900 }; +static void* sTextures[] = { + object_yabusame_point_Tex_000000, + object_yabusame_point_Tex_000480, + object_yabusame_point_Tex_000900, +}; void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { s32 pad; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index a0895c5f74..6d0071a242 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -25,8 +25,11 @@ void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsGMagma2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); static void* sTextures[] = { - 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, - 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0, + object_kingdodongo_Tex_02E4E0, object_kingdodongo_Tex_02E8E0, object_kingdodongo_Tex_02ECE0, + object_kingdodongo_Tex_02F0E0, object_kingdodongo_Tex_02F4E0, object_kingdodongo_Tex_02F8E0, + object_kingdodongo_Tex_02FCE0, object_kingdodongo_Tex_0300E0, object_kingdodongo_Tex_0304E0, + object_kingdodongo_Tex_0308E0, object_kingdodongo_Tex_0308E0, object_kingdodongo_Tex_0308E0, + object_kingdodongo_Tex_0308E0, }; EffectSsInit Effect_Ss_G_Magma2_InitVars = {