From 40b04ad7247e1d60ac99f62698e7c04388bfcdfc Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Fri, 11 Oct 2024 16:17:25 +0200
Subject: [PATCH] Link d_profile (#62)

---
 .../SOUE01/rels/d_a_t_wood_areaNP/symbols.txt |   2 +-
 config/SOUE01/rels/d_t_timerNP/symbols.txt    |   2 +-
 .../SOUE01/rels/d_t_tumble_weedNP/symbols.txt |   2 +-
 config/SOUE01/symbols.txt                     | 166 +++++++++++-------
 configure.py                                  |   2 +-
 src/REL/d/a/d_a_t_wood_area.cpp               |   2 +-
 src/REL/d/t/d_t_timer.cpp                     |   2 +-
 src/REL/d/t/d_t_tumble_weed.cpp               |   2 +-
 8 files changed, 107 insertions(+), 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
index 03f21551..7f14ff99 100644
--- 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
index 3a6af027..77e518f1 100644
--- 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
index 5d60b4ab..5f46264d 100644
--- 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
index f54cecb0..f9d8f363 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -33818,7 +33818,7 @@ lbl_8052B694 = .data:0x8052B694; // type:object size:0x18
 lbl_8052B6AC = .data:0x8052B6AC; // type:object size:0x18
 lbl_8052B6C4 = .data:0x8052B6C4; // type:object size:0x20
 lbl_8052B6E4 = .data:0x8052B6E4; // type:object size:0x24
-lbl_8052B708 = .data:0x8052B708; // type:object size:0xC
+g_profile_STAGE_MANAGER = .data:0x8052B708; // type:object size:0xC
 lbl_8052B714 = .data:0x8052B714; // type:object size:0x68
 lbl_8052B77C = .data:0x8052B77C; // type:object size:0x10
 lbl_8052B78C = .data:0x8052B78C; // type:object size:0xC data:string
@@ -33850,15 +33850,17 @@ lbl_8052BBE4 = .data:0x8052BBE4; // type:object size:0x2C
 lbl_8052BC10 = .data:0x8052BC10; // type:object size:0xC0
 lbl_8052BCD0 = .data:0x8052BCD0; // type:object size:0x78
 lbl_8052BD48 = .data:0x8052BD48; // type:object size:0x3A8
-lbl_8052C0F0 = .data:0x8052C0F0; // type:object size:0x44
-AcLast__vtable = .data:0x8052C134; // type:object size:0x58
+lbl_8052C0F0 = .data:0x8052C0F0; // type:object size:0x38
+g_profile_LAST = .data:0x8052C128; // type:object size:0xC
+AcLast__vtable = .data:0x8052C134; // type:object size:0x4C
+g_profile_CAMERA = .data:0x8052C180; // type:object size:0xC
 lbl_8052C18C = .data:0x8052C18C; // type:object size:0x20
 lbl_8052C1AC = .data:0x8052C1AC; // type:object size:0xC data:string
 lbl_8052C1B8 = .data:0x8052C1B8; // type:object size:0xC
 lbl_8052C1C4 = .data:0x8052C1C4; // type:object size:0x10
 lbl_8052C1D4 = .data:0x8052C1D4; // type:object size:0xC
 dCamera__vtable = .data:0x8052C1E0; // type:object size:0x50
-ObjLight__actorInit = .data:0x8052C230; // type:object size:0xC
+g_profile_LIGHT_OBJECT = .data:0x8052C230; // type:object size:0xC
 jumptable_8052C23C = .data:0x8052C23C; // type:object size:0x2C scope:local
 jumptable_8052C268 = .data:0x8052C268; // type:object size:0x24 scope:local
 jumptable_8052C28C = .data:0x8052C28C; // type:object size:0x24 scope:local
@@ -33867,7 +33869,7 @@ lbl_8052C2E0 = .data:0x8052C2E0; // type:object size:0x84 data:float
 ObjLight__vtable = .data:0x8052C364; // type:object size:0x4C
 lbl_8052C3B0 = .data:0x8052C3B0; // type:object size:0x54
 lbl_8052C404 = .data:0x8052C404; // type:object size:0x2C
-WeatherTag__actorInit = .data:0x8052C430; // type:object size:0x94
+g_profile_WEATHER_TAG = .data:0x8052C430; // type:object size:0x94
 lbl_8052C4C4 = .data:0x8052C4C4; // type:object size:0x64
 WeatherTag__vtable = .data:0x8052C528; // type:object size:0x78
 lbl_8052C5A0 = .data:0x8052C5A0; // type:object size:0x30
@@ -33891,7 +33893,7 @@ jumptable_8052C8A0 = .data:0x8052C8A0; // type:object size:0xF0 scope:local
 jumptable_8052CAC8 = .data:0x8052CAC8; // type:object size:0x28 scope:local
 lbl_8052CAF0 = .data:0x8052CAF0; // type:object size:0x114
 jumptable_8052CC04 = .data:0x8052CC04; // type:object size:0x20 scope:local
-lbl_8052CC24 = .data:0x8052CC24; // type:object size:0xC
+g_profile_MESSAGE = .data:0x8052CC24; // type:object size:0xC
 lbl_8052CC30 = .data:0x8052CC30; // type:object size:0x10
 lbl_8052CC40 = .data:0x8052CC40; // type:object size:0x10 data:string
 lbl_8052CC50 = .data:0x8052CC50; // type:object size:0x10 data:string
@@ -34087,7 +34089,8 @@ lbl_8052DE40 = .data:0x8052DE40; // type:object size:0x10
 EVENT_FLOW_FILENAMES = .data:0x8052DE50; // type:object size:0x18
 lbl_8052DE68 = .data:0x8052DE68; // type:object size:0x10
 GlobalMessageRelatedContext__vtable = .data:0x8052DE78; // type:object size:0x4C
-ActorEventFlowManager__vtable = .data:0x8052DEC4; // type:object size:0x88
+ActorEventFlowManager__vtable = .data:0x8052DEC4; // type:object size:0x78
+g_profile_STAGE = .data:0x8052DF40; // type:object size:0xC
 actorInit.defaultFlags = .data:0x8052DF4C; // type:object size:0x24
 lbl_8052DF70 = .data:0x8052DF70; // type:object size:0x10
 lbl_8052DF80 = .data:0x8052DF80; // type:object size:0x10
@@ -34099,9 +34102,10 @@ lbl_8052DFD8 = .data:0x8052DFD8; // type:object size:0x1C
 RoomManager__vtable = .data:0x8052DFF4; // type:object size:0x4C
 lbl_8052E040 = .data:0x8052E040; // type:object size:0xC
 RoomManager__RoomTable__vtable = .data:0x8052E04C; // type:object size:0xC
-lbl_8052E058 = .data:0x8052E058; // type:object size:0x34
+lbl_8052E058 = .data:0x8052E058; // type:object size:0x24
+g_profile_STAGE_SELECT = .data:0x8052E080; // type:object size:0xC
 AcStageSelect__vtable = .data:0x8052E08C; // type:object size:0x4C
-lbl_8052E0D8 = .data:0x8052E0D8; // type:object size:0x44
+g_profile_ROOM = .data:0x8052E0D8; // type:object size:0x44
 lbl_8052E11C = .data:0x8052E11C; // type:object size:0x10
 lbl_8052E12C = .data:0x8052E12C; // type:object size:0x10
 lbl_8052E13C = .data:0x8052E13C; // type:object size:0x10
@@ -34116,18 +34120,19 @@ lbl_8052E210 = .data:0x8052E210; // type:object size:0x30
 lbl_8052E240 = .data:0x8052E240; // type:object size:0x18
 lbl_8052E258 = .data:0x8052E258; // type:object size:0x18
 lbl_8052E270 = .data:0x8052E270; // type:object size:0xB4
-lbl_8052E324 = .data:0x8052E324; // type:object size:0x44
+lbl_8052E324 = .data:0x8052E324; // type:object size:0x34
+g_profile_VRBOX_TAG = .data:0x8052E358; // type:object size:0x10
 lbl_8052E368 = .data:0x8052E368; // type:object size:0x18
 lbl_8052E380 = .data:0x8052E380; // type:object size:0x20
 lbl_8052E3A0 = .data:0x8052E3A0; // type:object size:0x20
 TagVrbox__vtable = .data:0x8052E3C0; // type:object size:0x78
-AcTitleReloader__actorInit = .data:0x8052E438; // type:object size:0xC
+g_profile_TITLE = .data:0x8052E438; // type:object size:0xC
 actorInit.defaultFlags2 = .data:0x8052E444; // type:object size:0xC
 lbl_8052E450 = .data:0x8052E450; // type:object size:0xC
 lbl_8052E45C = .data:0x8052E45C; // type:object size:0x4C
 AcTitleReloader__vtable = .data:0x8052E4A8; // type:object size:0xE4
 lbl_8052E58C = .data:0x8052E58C; // type:object size:0x6C
-lbl_8052E5F8 = .data:0x8052E5F8; // type:object size:0x10
+g_profile_GAME = .data:0x8052E5F8; // type:object size:0x10
 lbl_8052E608 = .data:0x8052E608; // type:object size:0x30
 Reloader__vtable = .data:0x8052E638; // type:object size:0x68
 Reloader__stateMgr__vtable = .data:0x8052E6A0; // type:object size:0x30
@@ -34137,7 +34142,8 @@ lbl_8052E718 = .data:0x8052E718; // type:object size:0x18
 lbl_8052E730 = .data:0x8052E730; // type:object size:0x10
 lbl_8052E740 = .data:0x8052E740; // type:object size:0x10
 lbl_8052E750 = .data:0x8052E750; // type:object size:0xA4
-lbl_8052E7F4 = .data:0x8052E7F4; // type:object size:0x78
+lbl_8052E7F4 = .data:0x8052E7F4; // type:object size:0x6C
+g_profile_C_BASE = .data:0x8052E860; // type:object size:0xC
 lbl_8052E86C = .data:0x8052E86C; // type:object size:0x10
 lbl_8052E87C = .data:0x8052E87C; // type:object size:0x10
 lbl_8052E88C = .data:0x8052E88C; // type:object size:0x4C
@@ -34145,7 +34151,7 @@ lbl_8052E8D8 = .data:0x8052E8D8; // type:object size:0x30
 lbl_8052E908 = .data:0x8052E908; // type:object size:0x30
 lbl_8052E938 = .data:0x8052E938; // type:object size:0x18
 lbl_8052E950 = .data:0x8052E950; // type:object size:0x18
-lbl_8052E968 = .data:0x8052E968; // type:object size:0xC
+g_profile_C_GAME = .data:0x8052E968; // type:object size:0xC
 lbl_8052E974 = .data:0x8052E974; // type:object size:0x10
 lbl_8052E984 = .data:0x8052E984; // type:object size:0x10
 lbl_8052E994 = .data:0x8052E994; // type:object size:0x14 data:string
@@ -34236,7 +34242,7 @@ lbl_8053009C = .data:0x8053009C; // type:object size:0x34
 lbl_805300D0 = .data:0x805300D0; // type:object size:0x34
 lbl_80530104 = .data:0x80530104; // type:object size:0x34
 lbl_80530138 = .data:0x80530138; // type:object size:0x38
-ActorLink__ActorInit = .data:0x80530170; // type:object size:0x10
+g_profile_PLAYER = .data:0x80530170; // type:object size:0x10
 ActorLink__PLAYER_ACTIONS = .data:0x80530180; // type:object size:0x1810
 lbl_80531990 = .data:0x80531990; // type:object size:0x18
 lbl_805319A8 = .data:0x805319A8; // type:object size:0x10
@@ -34381,7 +34387,9 @@ lbl_8053329C = .data:0x8053329C; // type:object size:0x14 data:string
 lbl_805332B0 = .data:0x805332B0; // type:object size:0x10
 AcItem__TearGetDemoThings = .data:0x805332C0; // type:object size:0x40
 lbl_80533300 = .data:0x80533300; // type:object size:0x10
-lbl_80533310 = .data:0x80533310; // type:object size:0x884
+lbl_80533310 = .data:0x80533310; // type:object size:0x18
+g_profile_ITEM = .data:0x80533328; // type:object size:0x10
+lbl_80533338 = .data:0x80533338; // type:object size:0x85C
 jumptable_80533B94 = .data:0x80533B94; // type:object size:0xE8 scope:local
 jumptable_80533C7C = .data:0x80533C7C; // type:object size:0xE8 scope:local
 lbl_80533D64 = .data:0x80533D64; // type:object size:0xC data:4byte
@@ -34399,7 +34407,7 @@ lbl_80534024 = .data:0x80534024; // type:object size:0x38
 lbl_8053405C = .data:0x8053405C; // type:object size:0x14
 lbl_80534070 = .data:0x80534070; // type:object size:0x3EC
 lbl_8053445C = .data:0x8053445C; // type:object size:0x34
-AcBomb__actorInit = .data:0x80534490; // type:object size:0x10
+g_profile_BOMB = .data:0x80534490; // type:object size:0x10
 lbl_805344A0 = .data:0x805344A0; // type:object size:0x2C
 lbl_805344CC = .data:0x805344CC; // type:object size:0xC
 lbl_805344D8 = .data:0x805344D8; // type:object size:0x18
@@ -34410,7 +34418,7 @@ lbl_805345C0 = .data:0x805345C0; // type:object size:0x30
 lbl_805345F0 = .data:0x805345F0; // type:object size:0x18
 lbl_80534608 = .data:0x80534608; // type:object size:0x168
 lbl_80534770 = .data:0x80534770; // type:object size:0x38
-lbl_805347A8 = .data:0x805347A8; // type:object size:0x38
+g_profile_ARROW = .data:0x805347A8; // type:object size:0x38
 lbl_805347E0 = .data:0x805347E0; // type:object size:0x2C data:4byte
 lbl_8053480C = .data:0x8053480C; // type:object size:0x14 data:string
 lbl_80534820 = .data:0x80534820; // type:object size:0x10
@@ -34421,7 +34429,8 @@ lbl_805348F8 = .data:0x805348F8; // type:object size:0x30
 lbl_80534928 = .data:0x80534928; // type:object size:0x18
 lbl_80534940 = .data:0x80534940; // type:object size:0x15C
 lbl_80534A9C = .data:0x80534A9C; // type:object size:0x34
-AcBoomerang__colliderInit = .data:0x80534AD0; // type:object size:0x40
+AcBoomerang__colliderInit = .data:0x80534AD0; // type:object size:0x30
+g_profile_BOOMERANG = .data:0x80534B00; // type:object size:0x10
 lbl_80534B10 = .data:0x80534B10; // type:object size:0xC data:string
 lbl_80534B1C = .data:0x80534B1C; // type:object size:0x1C data:string
 lbl_80534B38 = .data:0x80534B38; // type:object size:0xC
@@ -34434,7 +34443,7 @@ lbl_80534C40 = .data:0x80534C40; // type:object size:0x18
 lbl_80534C58 = .data:0x80534C58; // type:object size:0x18
 lbl_80534C70 = .data:0x80534C70; // type:object size:0x1D0
 lbl_80534E40 = .data:0x80534E40; // type:object size:0x38
-lbl_80534E78 = .data:0x80534E78; // type:object size:0x68
+g_profile_OBJ_FAIRY = .data:0x80534E78; // type:object size:0x68
 lbl_80534EE0 = .data:0x80534EE0; // type:object size:0x30
 lbl_80534F10 = .data:0x80534F10; // type:object size:0xC
 lbl_80534F1C = .data:0x80534F1C; // type:object size:0x2C
@@ -34444,7 +34453,7 @@ lbl_80534FF8 = .data:0x80534FF8; // type:object size:0x30
 lbl_80535028 = .data:0x80535028; // type:object size:0x18
 lbl_80535040 = .data:0x80535040; // type:object size:0x1F8
 __vt__28sFStateID_c<13dAcObjFairy_c> = .data:0x80535238; // type:object size:0x38
-AcTbox__actorInit = .data:0x80535270; // type:object size:0x10
+g_profile_TBOX = .data:0x80535270; // type:object size:0x10
 lbl_80535280 = .data:0x80535280; // type:object size:0xC data:string
 lbl_8053528C = .data:0x8053528C; // type:object size:0xC
 lbl_80535298 = .data:0x80535298; // type:object size:0xC
@@ -34474,7 +34483,7 @@ lbl_805355A0 = .data:0x805355A0; // type:object size:0x18
 lbl_805355B8 = .data:0x805355B8; // type:object size:0x18
 lbl_805355D0 = .data:0x805355D0; // type:object size:0x410
 lbl_805359E0 = .data:0x805359E0; // type:object size:0x38
-lbl_80535A18 = .data:0x80535A18; // type:object size:0x10
+g_profile_TIME_AREA = .data:0x80535A18; // type:object size:0x10
 lbl_80535A28 = .data:0x80535A28; // type:object size:0x68
 lbl_80535A90 = .data:0x80535A90; // type:object size:0x20
 AcTimeArea__vtable = .data:0x80535AB0; // type:object size:0x88
@@ -34495,10 +34504,12 @@ __vt__23sFStateFct_c<8dAcOsw_c> = .data:0x80535E08; // type:object size:0x14
 __vt__20sFState_c<8dAcOsw_c> = .data:0x80535E20; // type:object size:0x18
 __vt__19dAcOswMdlCallback_c = .data:0x80535E38; // type:object size:0x18
 lbl_80535F84 = .data:0x80535F84; // type:object size:0x34
-lbl_80535FB8 = .data:0x80535FB8; // type:object size:0x88
+g_profile_THPPLAYER = .data:0x80535FB8; // type:object size:0xC
 lbl_80536040 = .data:0x80536040; // type:object size:0x50
-lbl_80536090 = .data:0x80536090; // type:object size:0x20
-TgAlldie__vtable = .data:0x805360B0; // type:object size:0x88
+lbl_80536090 = .data:0x80536090; // type:object size:0x10
+g_profile_ALLDIE_TAG = .data:0x805360A0; // type:object size:0x10
+TgAlldie__vtable = .data:0x805360B0; // type:object size:0x78
+g_profile_VIEW_CLIP_TAG = .data:0x80536128; // type:object size:0x10
 TgViewClip__vtable = .data:0x80536138; // type:object size:0x78
 g_profile_SW_TAG = .data:0x805361B0; // type:object size:0x10
 lbl_805361C0 = .data:0x805361C0; // type:object size:0xD data:string
@@ -34508,7 +34519,7 @@ __vt__75sStateMgr_c<7dTgSw_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk
 __vt__22sFStateFct_c<7dTgSw_c> = .data:0x805362A8; // type:object size:0x14
 __vt__19sFState_c<7dTgSw_c> = .data:0x805362C0; // type:object size:0x18
 __vt__21sFStateID_c<7dTgSw_c> = .data:0x80536440; // type:object size:0x34
-lbl_80536478 = .data:0x80536478; // type:object size:0x10
+g_profile_MASS_OBJ_TAG = .data:0x80536478; // type:object size:0x10
 lbl_80536488 = .data:0x80536488; // type:object size:0xC
 lbl_80536494 = .data:0x80536494; // type:object size:0xC
 lbl_805364A0 = .data:0x805364A0; // type:object size:0x10
@@ -34524,26 +34535,30 @@ lbl_80536518 = .data:0x80536518; // type:object size:0x1C
 jumptable_80536534 = .data:0x80536534; // type:object size:0x28 scope:local
 TgMassObj__vtable = .data:0x8053655C; // type:object size:0x74
 lbl_805365D0 = .data:0x805365D0; // type:object size:0x2C
-lbl_805365FC = .data:0x805365FC; // type:object size:0x1C
-TgCamera__vtable = .data:0x80536618; // type:object size:0x88
-lbl_805366A0 = .data:0x805366A0; // type:object size:0x88
-TgEvent__vtable = .data:0x80536728; // type:object size:0x88
+lbl_805365FC = .data:0x805365FC; // type:object size:0xC
+g_profile_CAMERA_TAG = .data:0x80536608; // type:object size:0x10
+TgCamera__vtable = .data:0x80536618; // type:object size:0x10
+g_profile_CAMERA2_TAG = .data:0x80536690; // type:object size:0x10
+lbl_805366A0 = .data:0x805366A0; // type:object size:0x78
+g_profile_EVENT_TAG = .data:0x80536718; // type:object size:0x10
+TgEvent__vtable = .data:0x80536728; // type:object size:0x78
+g_profile_EVENTF_TAG = .data:0x805367A0; // type:object size:0x10
 TgEventF__vtable = .data:0x805367B0; // type:object size:0x78
-lbl_80536828 = .data:0x80536828; // type:object size:0x10
+g_profile_TAG_TKEVNT = .data:0x80536828; // type:object size:0x10
 TgTkEvnt__vtable = .data:0x80536838; // type:object size:0x78
 lbl_805368B0 = .data:0x805368B0; // type:object size:0x30
 lbl_805368E0 = .data:0x805368E0; // type:object size:0x30
 lbl_80536910 = .data:0x80536910; // type:object size:0x18
 lbl_80536928 = .data:0x80536928; // type:object size:0xC8
 lbl_805369F0 = .data:0x805369F0; // type:object size:0x38
-lbl_80536A28 = .data:0x80536A28; // type:object size:0x10
+g_profile_NPC_INV = .data:0x80536A28; // type:object size:0x10
 lbl_80536A38 = .data:0x80536A38; // type:object size:0x80
 lbl_80536AB8 = .data:0x80536AB8; // type:object size:0x30
 lbl_80536AE8 = .data:0x80536AE8; // type:object size:0x30
 lbl_80536B18 = .data:0x80536B18; // type:object size:0x18
 lbl_80536B30 = .data:0x80536B30; // type:object size:0x58
 lbl_80536B88 = .data:0x80536B88; // type:object size:0x38
-lbl_80536BC0 = .data:0x80536BC0; // type:object size:0x10
+g_profile_NPC_TKE = .data:0x80536BC0; // type:object size:0x10
 lbl_80536BD0 = .data:0x80536BD0; // type:object size:0xC
 lbl_80536BDC = .data:0x80536BDC; // type:object size:0x10
 lbl_80536BEC = .data:0x80536BEC; // type:object size:0xC
@@ -34554,10 +34569,11 @@ AcNpcTke__vtable = .data:0x80536CF8; // type:object size:0x288
 lbl_80536F80 = .data:0x80536F80; // type:object size:0x34
 lbl_80536FB4 = .data:0x80536FB4; // type:object size:0x34
 lbl_80536FE8 = .data:0x80536FE8; // type:object size:0x14
-lbl_80536FFC = .data:0x80536FFC; // type:object size:0x24
+lbl_80536FFC = .data:0x80536FFC; // type:object size:0x14 data:string
+g_profile_NPC_STR = .data:0x80537010; // type:object size:0x10
 AcNpcStr__vtable = .data:0x80537020; // type:object size:0x288
 lbl_805372A8 = .data:0x805372A8; // type:object size:0x68
-lbl_80537310 = .data:0x80537310; // type:object size:0xC
+g_profile_LYT_PAUSE = .data:0x80537310; // type:object size:0xC
 lbl_8053731C = .data:0x8053731C; // type:object size:0xC
 lbl_80537328 = .data:0x80537328; // type:object size:0x10
 LytPauseDisp__vtable = .data:0x80537338; // type:object size:0x50
@@ -34591,7 +34607,8 @@ lbl_80537ACC = .data:0x80537ACC; // type:object size:0x18
 lbl_80537AE4 = .data:0x80537AE4; // type:object size:0x1C
 lbl_80537B00 = .data:0x80537B00; // type:object size:0x1C
 lbl_80537B1C = .data:0x80537B1C; // type:object size:0x18
-lbl_80537B34 = .data:0x80537B34; // type:object size:0xAC
+lbl_80537B34 = .data:0x80537B34; // type:object size:0xA0
+g_profile_LYT_GAMEOVER_MGR = .data:0x80537BD4; // type:object size:0xC
 lbl_80537BE0 = .data:0x80537BE0; // type:object size:0x10 data:string
 lbl_80537BF0 = .data:0x80537BF0; // type:object size:0x10 data:string
 lbl_80537C00 = .data:0x80537C00; // type:object size:0x50
@@ -34606,7 +34623,7 @@ lbl_80537D50 = .data:0x80537D50; // type:object size:0x18
 lbl_80537D68 = .data:0x80537D68; // type:object size:0x390
 lbl_805380F8 = .data:0x805380F8; // type:object size:0x34
 lbl_8053812C = .data:0x8053812C; // type:object size:0x34
-lbl_80538160 = .data:0x80538160; // type:object size:0xC
+g_profile_LYT_SAVE_MGR = .data:0x80538160; // type:object size:0xC
 lbl_8053816C = .data:0x8053816C; // type:object size:0xC data:string
 lbl_80538178 = .data:0x80538178; // type:object size:0xC data:string
 lbl_80538184 = .data:0x80538184; // type:object size:0xC data:string
@@ -34625,7 +34642,7 @@ lbl_805382F8 = .data:0x805382F8; // type:object size:0x30
 lbl_80538328 = .data:0x80538328; // type:object size:0x18
 lbl_80538340 = .data:0x80538340; // type:object size:0x124
 lbl_80538464 = .data:0x80538464; // type:object size:0x34
-lbl_80538498 = .data:0x80538498; // type:object size:0xC
+g_profile_LYT_DROP_LINE = .data:0x80538498; // type:object size:0xC
 lbl_805384A4 = .data:0x805384A4; // type:object size:0xC
 lbl_805384B0 = .data:0x805384B0; // type:object size:0x50
 lbl_80538500 = .data:0x80538500; // type:object size:0x30
@@ -34633,7 +34650,7 @@ lbl_80538530 = .data:0x80538530; // type:object size:0x30
 lbl_80538560 = .data:0x80538560; // type:object size:0x18
 lbl_80538578 = .data:0x80538578; // type:object size:0xA8
 lbl_80538620 = .data:0x80538620; // type:object size:0x38
-lbl_80538658 = .data:0x80538658; // type:object size:0xC
+g_profile_LYT_FORCE_LINE = .data:0x80538658; // type:object size:0xC
 lbl_80538664 = .data:0x80538664; // type:object size:0xC data:string
 lbl_80538670 = .data:0x80538670; // type:object size:0xC data:string
 lbl_8053867C = .data:0x8053867C; // type:object size:0xC data:string
@@ -34719,7 +34736,7 @@ lbl_80538BC0 = .data:0x80538BC0; // type:object size:0x30
 lbl_80538BF0 = .data:0x80538BF0; // type:object size:0x18
 lbl_80538C08 = .data:0x80538C08; // type:object size:0xA8
 lbl_80538CB0 = .data:0x80538CB0; // type:object size:0x38
-lbl_80538CE8 = .data:0x80538CE8; // type:object size:0xC
+g_profile_LYT_ENEMY_ICON = .data:0x80538CE8; // type:object size:0xC
 lbl_80538CF4 = .data:0x80538CF4; // type:object size:0xC
 lbl_80538D00 = .data:0x80538D00; // type:object size:0x50
 lbl_80538D50 = .data:0x80538D50; // type:object size:0x30
@@ -34851,7 +34868,8 @@ lbl_80539828 = .data:0x80539828; // type:object size:0x28
 lbl_80539850 = .data:0x80539850; // type:object size:0x24
 lbl_80539874 = .data:0x80539874; // type:object size:0x10
 lbl_80539884 = .data:0x80539884; // type:object size:0x24
-lbl_805398A8 = .data:0x805398A8; // type:object size:0x28
+lbl_805398A8 = .data:0x805398A8; // type:object size:0x1C
+g_profile_LYT_MINI_GAME = .data:0x805398C4; // type:object size:0xC
 lbl_805398D0 = .data:0x805398D0; // type:object size:0xC
 lbl_805398DC = .data:0x805398DC; // type:object size:0x10
 lbl_805398EC = .data:0x805398EC; // type:object size:0x10
@@ -35020,7 +35038,8 @@ lbl_8053A42C = .data:0x8053A42C; // type:object size:0xC data:string
 lbl_8053A438 = .data:0x8053A438; // type:object size:0xC data:string
 lbl_8053A444 = .data:0x8053A444; // type:object size:0x134 data:4byte
 lbl_8053A578 = .data:0x8053A578; // type:object size:0x10
-lbl_8053A588 = .data:0x8053A588; // type:object size:0x28
+lbl_8053A588 = .data:0x8053A588; // type:object size:0x1C
+g_profile_LYT_SUIRYU_SCORE = .data:0x8053A5A4; // type:object size:0xC
 lbl_8053A5B0 = .data:0x8053A5B0; // type:object size:0x4C
 lbl_8053A5FC = .data:0x8053A5FC; // type:object size:0xC
 lbl_8053A608 = .data:0x8053A608; // type:object size:0x30
@@ -35167,7 +35186,8 @@ lbl_8053B1E8 = .data:0x8053B1E8; // type:object size:0xC data:string
 lbl_8053B1F4 = .data:0x8053B1F4; // type:object size:0xC data:string
 lbl_8053B200 = .data:0x8053B200; // type:object size:0xC data:string
 lbl_8053B20C = .data:0x8053B20C; // type:object size:0x134 data:4byte
-lbl_8053B340 = .data:0x8053B340; // type:object size:0x28
+lbl_8053B340 = .data:0x8053B340; // type:object size:0x1C
+g_profile_LYT_SUIRYU_SCORE_COMP = .data:0x8053B35C; // type:object size:0xC
 vtable2 = .data:0x8053B368; // type:object size:0x50
 lbl_8053B3B8 = .data:0x8053B3B8; // type:object size:0x30
 lbl_8053B3E8 = .data:0x8053B3E8; // type:object size:0x30
@@ -35186,7 +35206,7 @@ lbl_8053B570 = .data:0x8053B570; // type:object size:0x358
 lbl_8053B8C8 = .data:0x8053B8C8; // type:object size:0x34
 lbl_8053B8FC = .data:0x8053B8FC; // type:object size:0x34
 lbl_8053B930 = .data:0x8053B930; // type:object size:0x38
-lbl_8053B968 = .data:0x8053B968; // type:object size:0x10
+g_profile_LYT_BOSS_CAPTION = .data:0x8053B968; // type:object size:0x10
 lbl_8053B978 = .data:0x8053B978; // type:object size:0x18 data:string
 lbl_8053B990 = .data:0x8053B990; // type:object size:0xC data:string
 lbl_8053B99C = .data:0x8053B99C; // type:object size:0x1C
@@ -35206,7 +35226,7 @@ lbl_8053BB20 = .data:0x8053BB20; // type:object size:0x30
 lbl_8053BB50 = .data:0x8053BB50; // type:object size:0x18
 lbl_8053BB68 = .data:0x8053BB68; // type:object size:0x164
 lbl_8053BCCC = .data:0x8053BCCC; // type:object size:0x34
-lbl_8053BD00 = .data:0x8053BD00; // type:object size:0xC
+g_profile_LYT_DEMO_DOWSING = .data:0x8053BD00; // type:object size:0xC
 lbl_8053BD0C = .data:0x8053BD0C; // type:object size:0x1C
 lbl_8053BD28 = .data:0x8053BD28; // type:object size:0xC
 lbl_8053BD34 = .data:0x8053BD34; // type:object size:0x1C
@@ -35304,7 +35324,8 @@ lbl_8053C6A0 = .data:0x8053C6A0; // type:object size:0x10
 lbl_8053C6B0 = .data:0x8053C6B0; // type:object size:0x10
 lbl_8053C6C0 = .data:0x8053C6C0; // type:object size:0x10
 lbl_8053C6D0 = .data:0x8053C6D0; // type:object size:0x10
-lbl_8053C6E0 = .data:0x8053C6E0; // type:object size:0x20 data:4byte
+lbl_8053C6E0 = .data:0x8053C6E0; // type:object size:0x10 data:4byte
+g_profile_LYT_SHOP = .data:0x8053C6F0; // type:object size:0x10
 lbl_8053C700 = .data:0x8053C700; // type:object size:0x18 data:string
 dLytShop__vtable = .data:0x8053C718; // type:object size:0x50
 lbl_8053C768 = .data:0x8053C768; // type:object size:0x30
@@ -35394,7 +35415,8 @@ lbl_8053D544 = .data:0x8053D544; // type:object size:0xC
 lbl_8053D550 = .data:0x8053D550; // type:object size:0x10
 jumptable_8053D560 = .data:0x8053D560; // type:object size:0x24 scope:local
 lbl_8053D5C8 = .data:0x8053D5C8; // type:object size:0x10
-lbl_8053D5D8 = .data:0x8053D5D8; // type:object size:0x40
+lbl_8053D5D8 = .data:0x8053D5D8; // type:object size:0x34
+g_profile_LYT_DEPOSIT = .data:0x8053D60C; // type:object size:0xC
 lbl_8053D618 = .data:0x8053D618; // type:object size:0x20
 lbl_8053D638 = .data:0x8053D638; // type:object size:0x50
 lbl_8053D688 = .data:0x8053D688; // type:object size:0x30
@@ -35415,7 +35437,8 @@ lbl_8053DF90 = .data:0x8053DF90; // type:object size:0x38
 lbl_8053DFC8 = .data:0x8053DFC8; // type:object size:0x18
 lbl_8053DFE0 = .data:0x8053DFE0; // type:object size:0xC
 lbl_8053DFEC = .data:0x8053DFEC; // type:object size:0x18
-lbl_8053E004 = .data:0x8053E004; // type:object size:0x20
+lbl_8053E004 = .data:0x8053E004; // type:object size:0x14
+g_profile_LYT_DEMO_TITLE = .data:0x8053E018; // type:object size:0xC
 lbl_8053E024 = .data:0x8053E024; // type:object size:0xC
 lbl_8053E030 = .data:0x8053E030; // type:object size:0x50
 lbl_8053E080 = .data:0x8053E080; // type:object size:0x30
@@ -35440,7 +35463,8 @@ lbl_8053E5E0 = .data:0x8053E5E0; // type:object size:0x18
 lbl_8053E5F8 = .data:0x8053E5F8; // type:object size:0x1C
 lbl_8053E614 = .data:0x8053E614; // type:object size:0xC
 lbl_8053E620 = .data:0x8053E620; // type:object size:0x14 data:string
-lbl_8053E634 = .data:0x8053E634; // type:object size:0x4C
+lbl_8053E634 = .data:0x8053E634; // type:object size:0x40
+g_profile_LYT_END_ROLL = .data:0x8053E674; // type:object size:0xC
 lbl_8053E680 = .data:0x8053E680; // type:object size:0x20
 AcLytEndRoll__vtable = .data:0x8053E6A0; // type:object size:0x50
 lbl_8053E6F0 = .data:0x8053E6F0; // type:object size:0x30
@@ -35454,7 +35478,7 @@ lbl_8053E7F0 = .data:0x8053E7F0; // type:object size:0x18
 lbl_8053E808 = .data:0x8053E808; // type:object size:0x884
 lbl_8053F08C = .data:0x8053F08C; // type:object size:0x34
 lbl_8053F0C0 = .data:0x8053F0C0; // type:object size:0x38
-lbl_8053F0F8 = .data:0x8053F0F8; // type:object size:0x10
+g_profile_COMMON_BULLET = .data:0x8053F0F8; // type:object size:0x10
 lbl_8053F108 = .data:0x8053F108; // type:object size:0x20
 lbl_8053F128 = .data:0x8053F128; // type:object size:0x88
 lbl_8053F1B0 = .data:0x8053F1B0; // type:object size:0x30
@@ -35462,7 +35486,7 @@ lbl_8053F1E0 = .data:0x8053F1E0; // type:object size:0x30
 lbl_8053F210 = .data:0x8053F210; // type:object size:0x18
 lbl_8053F228 = .data:0x8053F228; // type:object size:0x64
 lbl_8053F28C = .data:0x8053F28C; // type:object size:0x34
-lbl_8053F2C0 = .data:0x8053F2C0; // type:object size:0x10
+g_profile_NPC_TALK_KENSEI = .data:0x8053F2C0; // type:object size:0x10
 lbl_8053F2D0 = .data:0x8053F2D0; // type:object size:0xC
 lbl_8053F2DC = .data:0x8053F2DC; // type:object size:0x10
 lbl_8053F2EC = .data:0x8053F2EC; // type:object size:0x14
@@ -35545,7 +35569,7 @@ lbl_8053FCA8 = .data:0x8053FCA8; // type:object size:0xC
 lbl_8053FCB4 = .data:0x8053FCB4; // type:object size:0xC
 lbl_8053FCC0 = .data:0x8053FCC0; // type:object size:0x1A0
 lbl_8053FE60 = .data:0x8053FE60; // type:object size:0x38
-AcJstudioAct__actorinit = .data:0x8053FE98; // type:object size:0x10
+g_profile_JSTUDIO_ACTOR = .data:0x8053FE98; // type:object size:0x10
 lbl_8053FEA8 = .data:0x8053FEA8; // type:object size:0x20
 lbl_8053FEC8 = .data:0x8053FEC8; // type:object size:0xC
 lbl_8053FED4 = .data:0x8053FED4; // type:object size:0xC
@@ -35577,10 +35601,11 @@ lbl_80540120 = .data:0x80540120; // type:object size:0x18
 lbl_80540138 = .data:0x80540138; // type:object size:0x20
 lbl_80540158 = .data:0x80540158; // type:object size:0xC
 lbl_80540164 = .data:0x80540164; // type:object size:0x140
-lbl_805402A4 = .data:0x805402A4; // type:object size:0x44
+lbl_805402A4 = .data:0x805402A4; // type:object size:0x34
+g_profile_JSTUDIO_SYSOBJ = .data:0x805402D8; // type:object size:0x10
 lbl_805402E8 = .data:0x805402E8; // type:object size:0x9C data:4byte
 lbl_80540384 = .data:0x80540384; // type:object size:0x74
-lbl_805403F8 = .data:0x805403F8; // type:object size:0xC
+g_profile_LYT_CONTROL_GAME = .data:0x805403F8; // type:object size:0xC
 lbl_80540404 = .data:0x80540404; // type:object size:0xC
 lbl_80540410 = .data:0x80540410; // type:object size:0xC
 lbl_8054041C = .data:0x8054041C; // type:object size:0xC data:string
@@ -35613,22 +35638,27 @@ lbl_80540780 = .data:0x80540780; // type:object size:0x30
 LytMsgWindow__vtable2 = .data:0x805407B0; // type:object size:0x30
 lbl_805407E0 = .data:0x805407E0; // type:object size:0x18
 lbl_805407F8 = .data:0x805407F8; // type:object size:0x458
-lbl_80540C50 = .data:0x80540C50; // type:object size:0x44
-lbl_80540C94 = .data:0x80540C94; // type:object size:0x5C
-TgMapArea__vtable = .data:0x80540CF0; // type:object size:0x88
+lbl_80540C50 = .data:0x80540C50; // type:object size:0x38
+g_profile_LYT_CONTROL_TITLE = .data:0x80540C88; // type:object size:0xC
+lbl_80540C94 = .data:0x80540C94; // type:object size:0x4C
+g_profile_MAP_AREA_TAG = .data:0x80540CE0; // type:object size:0x10
+TgMapArea__vtable = .data:0x80540CF0; // type:object size:0x78
+g_profile_TRUCK_RAIL = .data:0x80540D68; // type:object size:0x10
 lbl_80540D78 = .data:0x80540D78; // type:object size:0x1C
 lbl_80540D94 = .data:0x80540D94; // type:object size:0x10
 lbl_80540DA4 = .data:0x80540DA4; // type:object size:0x14
 lbl_80540DB8 = .data:0x80540DB8; // type:object size:0xC
 lbl_80540DC4 = .data:0x80540DC4; // type:object size:0xC
 TgTruckRails__vtable = .data:0x80540DD0; // type:object size:0x78
-lbl_80540E48 = .data:0x80540E48; // type:object size:0x50
+lbl_80540E48 = .data:0x80540E48; // type:object size:0x40
+g_profile_OBJ_FORCE_SIGN = .data:0x80540E88; // type:object size:0x10
 lbl_80540E98 = .data:0x80540E98; // type:object size:0x20
 AcOForceSign__vtable = .data:0x80540EB8; // type:object size:0x80
 lbl_80540F38 = .data:0x80540F38; // type:object size:0xC
-lbl_80540F44 = .data:0x80540F44; // type:object size:0x24
+lbl_80540F44 = .data:0x80540F44; // type:object size:0x14 data:string
+g_profile_TAG_FORCE_GET_FLAG = .data:0x80540F58; // type:object size:0x10
 TgForceGetFlag__vtable = .data:0x80540F68; // type:object size:0x78
-AcOwaterSpout__actorInit = .data:0x80540FE0; // type:object size:0x10
+g_profile_OBJ_WATER_SPOUT = .data:0x80540FE0; // type:object size:0x10
 lbl_80540FF0 = .data:0x80540FF0; // type:object size:0x10
 lbl_80541000 = .data:0x80541000; // type:object size:0x20
 AcOwaterSpout__vtable = .data:0x80541020; // type:object size:0x80
@@ -35637,7 +35667,7 @@ lbl_805410D0 = .data:0x805410D0; // type:object size:0x30
 lbl_80541100 = .data:0x80541100; // type:object size:0x18
 lbl_80541118 = .data:0x80541118; // type:object size:0x5C
 lbl_80541174 = .data:0x80541174; // type:object size:0x34
-TgSirenTag__ActorInit = .data:0x805411A8; // type:object size:0x2C
+g_profile_SIREN_TAG = .data:0x805411A8; // type:object size:0x2C
 lbl_805411D4 = .data:0x805411D4; // type:object size:0x10
 lbl_805411E4 = .data:0x805411E4; // type:object size:0xC data:string
 TgSirenTag__vtable = .data:0x805411F0; // type:object size:0x78
@@ -35646,7 +35676,7 @@ stateManagerMaybe_start = .data:0x80541298; // type:object size:0x30
 lbl_805412C8 = .data:0x805412C8; // type:object size:0x18
 lbl_805412E0 = .data:0x805412E0; // type:object size:0x1E0
 lbl_805414C0 = .data:0x805414C0; // type:object size:0x38
-lbl_805414F8 = .data:0x805414F8; // type:object size:0x10
+g_profile_OBJ_SPORE = .data:0x805414F8; // type:object size:0x10
 lbl_80541508 = .data:0x80541508; // type:object size:0x2C
 lbl_80541534 = .data:0x80541534; // type:object size:0x1C
 lbl_80541550 = .data:0x80541550; // type:object size:0x80
@@ -35654,13 +35684,17 @@ lbl_805415D0 = .data:0x805415D0; // type:object size:0x30
 lbl_80541600 = .data:0x80541600; // type:object size:0x30
 lbl_80541630 = .data:0x80541630; // type:object size:0x18
 lbl_80541648 = .data:0x80541648; // type:object size:0x58
-lbl_805416A0 = .data:0x805416A0; // type:object size:0x48
+lbl_805416A0 = .data:0x805416A0; // type:object size:0x38
+g_profile_GENKI_MGR_TAG = .data:0x805416D8; // type:object size:0x10
 lbl_805416E8 = .data:0x805416E8; // type:object size:0x10
-TgGenkiMgr__vtable = .data:0x805416F8; // type:object size:0x88
+TgGenkiMgr__vtable = .data:0x805416F8; // type:object size:0x78
+g_profile_OBJ_WATER_MARK = .data:0x80541770; // type:object size:0x10
 lbl_80541780 = .data:0x80541780; // type:object size:0x14 data:string
 lbl_80541794 = .data:0x80541794; // type:object size:0x24
-lbl_805417B8 = .data:0x805417B8; // type:object size:0x8C
-lbl_80541844 = .data:0x80541844; // type:object size:0x58
+lbl_805417B8 = .data:0x805417B8; // type:object size:0x80
+g_profile_E3_TITLE = .data:0x80541838; // type:object size:0xC
+lbl_80541844 = .data:0x80541844; // type:object size:0x4C
+g_profile_E3_GAMEEND = .data:0x80541890; // type:object size:0xC
 lbl_8054189C = .data:0x8054189C; // type:object size:0x4C
 lbl_805418E8 = .data:0x805418E8; // type:object size:0x48
 __vt__13sStateIDChk_c = .data:0x80541930; // type:object size:0x10
diff --git a/configure.py b/configure.py
index b1081841..a68b09f8 100644
--- 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
index 4168143a..95202ea2 100644
--- 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
index 58f3d523..8807870e 100644
--- 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
index d4247e65..2187ee23 100644
--- 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);