Link d_profile (#62)

zeldaret · Oct 11, 2024 · 40b04ad · 40b04ad
1 parent 98f7e90
commit 40b04ad
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 73 deletions.
diff --git a/config/SOUE01/rels/d_a_t_wood_areaNP/symbols.txt b/config/SOUE01/rels/d_a_t_wood_areaNP/symbols.txt
@@ -53,7 +53,7 @@ lbl_329_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float
 lbl_329_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float
 lbl_329_rodata_C = .rodata:0x0000000C; // type:object size:0x4 data:float
 FILTER_PROFILE = .rodata:0x00000010; // type:object size:0xC data:2byte
-g_profile_TAG_WOOD_AREA = .data:0x00000000; // type:object size:0x10 data:4byte
+g_profile_WOODAREA_TAG = .data:0x00000000; // type:object size:0x10 data:4byte
 __vt__14dAcTWoodArea_c = .data:0x00000010; // type:object size:0x80
 __vt__53sFStateMgr_c<14dAcTWoodArea_c,20sStateMethodUsr_FI_c> = .data:0x00000090; // type:object size:0x30
 __vt__83sStateMgr_c<14dAcTWoodArea_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000000C0; // type:object size:0x30

diff --git a/config/SOUE01/rels/d_t_timerNP/symbols.txt b/config/SOUE01/rels/d_t_timerNP/symbols.txt
@@ -22,6 +22,6 @@ getConstant0x50_Thunk__10dTgTimer_cFv = .text:0x00000460; // type:function size:
 __dt__10dTgTimer_cFv = .text:0x00000470; // type:function size:0x5C
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
-g_profile_TIMER_TAG = .data:0x00000000; // type:object size:0x10 data:4byte
+g_profile_TAG_TIMER = .data:0x00000000; // type:object size:0x10 data:4byte
 __vt__10dTgTimer_c = .data:0x00000034; // type:object size:0x74
 __vt__5dTg_c = .data:0x000000A8; // type:object size:0x74
diff --git a/config/SOUE01/rels/d_t_tumble_weedNP/symbols.txt b/config/SOUE01/rels/d_t_tumble_weedNP/symbols.txt
@@ -54,7 +54,7 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc
 lbl_476_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float
 lbl_476_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float
 lbl_476_rodata_20 = .rodata:0x00000020; // type:object size:0x44 data:float
-g_profile_TAG_TUMBLE_WEED = .data:0x00000000; // type:object size:0x10 data:4byte
+g_profile_TUMBLE_WEED_TAG = .data:0x00000000; // type:object size:0x10 data:4byte
 __vt__15dTgTumbleWeed_c = .data:0x00000010; // type:object size:0x74
 __vt__54sFStateMgr_c<15dTgTumbleWeed_c,20sStateMethodUsr_FI_c> = .data:0x00000088; // type:object size:0x30
 __vt__84sStateMgr_c<15dTgTumbleWeed_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000000B8; // type:object size:0x30

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
diff --git a/configure.py b/configure.py
@@ -1388,7 +1388,7 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
     Rel(NonMatching, "d_lyt_file_select", "REL/d/d_lyt_file_select.cpp"),
     Rel(NonMatching, "d_lyt_seeker_stone", "REL/d/d_lyt_seeker_stone.cpp"),
     Rel(NonMatching, "d_lyt_title_BG", "REL/d/d_lyt_title_BG.cpp"),
-    Rel(NonMatching, "d_profile", "REL/d/d_profile.cpp"),
+    Rel(Matching, "d_profile", "REL/d/d_profile.cpp"),
     Rel(NonMatching, "d_SoftwareKeyboard", "REL/d/d_SoftwareKeyboard.cpp"),
     Rel(NonMatching, "d_s_boot", "REL/d/d_s_boot.cpp"),
     Rel(NonMatching, "d_title_manager", "REL/d/d_title_manager.cpp"),

diff --git a/src/REL/d/a/d_a_t_wood_area.cpp b/src/REL/d/a/d_a_t_wood_area.cpp
@@ -4,7 +4,7 @@
 const f32 dAcTWoodArea_c::scaleX = 100.0f;
 const f32 dAcTWoodArea_c::scaleY = 100.0f;
 
-SPECIAL_ACTOR_PROFILE(TAG_WOOD_AREA, dAcTWoodArea_c, fProfile::WOODAREA_TAG, 0x166, 0, 2);
+SPECIAL_ACTOR_PROFILE(WOODAREA_TAG, dAcTWoodArea_c, fProfile::WOODAREA_TAG, 0x166, 0, 2);
 
 STATE_DEFINE(dAcTWoodArea_c, Init);
 STATE_DEFINE(dAcTWoodArea_c, Wait);

diff --git a/src/REL/d/t/d_t_timer.cpp b/src/REL/d/t/d_t_timer.cpp
@@ -1,7 +1,7 @@
 #include <d/t/d_t_timer.h>
 #include <toBeSorted/sceneflag_manager.h>
 
-SPECIAL_ACTOR_PROFILE(TIMER_TAG, dTgTimer_c, fProfile::TAG_TIMER, 0x029F, 0, 0);
+SPECIAL_ACTOR_PROFILE(TAG_TIMER, dTgTimer_c, fProfile::TAG_TIMER, 0x029F, 0, 0);
 
 // TODO counter abstraction
 bool increment(u16 *t) {

diff --git a/src/REL/d/t/d_t_tumble_weed.cpp b/src/REL/d/t/d_t_tumble_weed.cpp
@@ -2,7 +2,7 @@
 #include <d/t/d_t_tumble_weed.h>
 #include <m/m_vec.h>
 
-SPECIAL_ACTOR_PROFILE(TAG_TUMBLE_WEED, dTgTumbleWeed_c, fProfile::TUMBLE_WEED_TAG, 0x0244, 0, 0);
+SPECIAL_ACTOR_PROFILE(TUMBLE_WEED_TAG, dTgTumbleWeed_c, fProfile::TUMBLE_WEED_TAG, 0x0244, 0, 0);
 
 STATE_DEFINE(dTgTumbleWeed_c, AreaOut);
 STATE_DEFINE(dTgTumbleWeed_c, AreaIn);