building RELs

src/d/meter/d_meter_string.cpp

@@ -99,19 +99,11 @@ extern "C" void playBckAnimation__14dMeterString_cFf();
 extern "C" void drawPikari__14dMeterString_cFv();
 extern "C" void isLeadByte__14dMeterString_cFi();
 extern "C" extern char const* const d_meter_d_meter_string__stringBase0;
-extern "C" extern void* __vt__14dMeterString_c[8];
 
 //
 // External References:
 //
 
-void mDoExt_getMesgFont();
-void dComIfG_TimerDeleteRequest(int);
-void dPaneClass_showNullPane(J2DScreen*);
-void dTimer_createTimer(s32, u32, u8, u8, f32, f32, f32, f32);
-void* operator new(u32);
-void operator delete(void*);
-
 extern "C" void mDoExt_getMesgFont__Fv();
 extern "C" void dComIfG_TimerDeleteRequest__Fi();
 extern "C" bool isDead__11dMeterSub_cFv();
@@ -150,8 +142,8 @@ extern "C" extern u8 g_meter2_info[248];
 //
 
 /* ############################################################################################## */
-/* 803BF308-803BF328 0020+00 s=2 e=0 z=0  None .data      __vt__14dMeterString_c */
-SECTION_DATA void* __vt__14dMeterString_c[8] = {
+/* 803BF308-803BF328 01C428 0020+00 2/2 0/0 0/0 .data            __vt__14dMeterString_c */
+SECTION_DATA extern void* __vt__14dMeterString_c[8] = {
     (void*)NULL /* RTTI */,
     (void*)NULL,
     (void*)draw__14dMeterString_cFv,
@@ -162,16 +154,7 @@ SECTION_DATA void* __vt__14dMeterString_c[8] = {
     (void*)isDead__11dMeterSub_cFv,
 };
 
-/* 8020ED60-8020EDF4 0094+00 s=0 e=1 z=0  None .text      __ct__14dMeterString_cFi */
-//	8020ED74: 803A6F88 (__vt__12dDlst_base_c)
-//	8020ED78: 803A6F88 (__vt__12dDlst_base_c)
-//	8020ED80: 803BB6D4 (__vt__11dMeterSub_c)
-//	8020ED84: 803BB6D4 (__vt__11dMeterSub_c)
-//	8020ED8C: 803BF308 (__vt__14dMeterString_c)
-//	8020ED90: 803BF308 (__vt__14dMeterString_c)
-//	8020ED98: 804061C0 (g_dComIfG_gameInfo)
-//	8020ED9C: 804061C0 (g_dComIfG_gameInfo)
-//	8020EDD8: 8020F5A4 (createString__14dMeterString_cFi)
+/* 8020ED60-8020EDF4 2096A0 0094+00 0/0 1/1 0/0 .text            __ct__14dMeterString_cFi */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -181,12 +164,7 @@ asm dMeterString_c::dMeterString_c(int param_0) {
 }
 #pragma pop
 
-/* 8020EDF4-8020EE70 007C+00 s=1 e=0 z=0  None .text      __dt__14dMeterString_cFv */
-//	8020EE14: 803BF308 (__vt__14dMeterString_c)
-//	8020EE18: 803BF308 (__vt__14dMeterString_c)
-//	8020EE38: 803BB6D4 (__vt__11dMeterSub_c)
-//	8020EE3C: 803BB6D4 (__vt__11dMeterSub_c)
-//	8020EE50: 802CED3C (__dl__FPv)
+/* 8020EDF4-8020EE70 209734 007C+00 1/0 0/0 0/0 .text            __dt__14dMeterString_cFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -197,30 +175,19 @@ asm dMeterString_c::~dMeterString_c() {
 #pragma pop
 
 /* ############################################################################################## */
-/* 80398210-80398258 0041+07 s=1 e=0 z=0  None .rodata    @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD char const* const stringBase_80398210 = "zelda_game_image_cow_get_in.blo";
-SECTION_DEAD char const* const stringBase_80398230 = "zelda_game_image_cow_get_in.bck";
-SECTION_DEAD char const* const stringBase_80398250 = "";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80398251 = "\0\0\0\0\0\0";
-#pragma pop
-
-/* 80454848-8045484C 0004+00 s=1 e=0 z=0  None .sdata2    @3758 */
+/* 80454848-8045484C 002E48 0004+00 1/1 0/0 0/0 .sdata2          @3758 */
 SECTION_SDATA2 static f32 lit_3758 = 210.0f;
 
-/* 8045484C-80454850 0004+00 s=1 e=0 z=0  None .sdata2    @3759 */
+/* 8045484C-80454850 002E4C 0004+00 1/1 0/0 0/0 .sdata2          @3759 */
 SECTION_SDATA2 static f32 lit_3759 = 410.0f;
 
-/* 80454850-80454854 0004+00 s=1 e=0 z=0  None .sdata2    @3760 */
+/* 80454850-80454854 002E50 0004+00 1/1 0/0 0/0 .sdata2          @3760 */
 SECTION_SDATA2 static f32 lit_3760 = 32.0f;
 
-/* 80454854-80454858 0004+00 s=1 e=0 z=0  None .sdata2    @3761 */
+/* 80454854-80454858 002E54 0004+00 1/1 0/0 0/0 .sdata2          @3761 */
 SECTION_SDATA2 static f32 lit_3761 = 419.0f;
 
-/* 80454858-8045485C 0004+00 s=3 e=0 z=0  None .sdata2    @3762 */
+/* 80454858-8045485C 002E58 0004+00 3/3 0/0 0/0 .sdata2          @3762 */
 SECTION_SDATA2 static u8 lit_3762[4] = {
     0x00,
     0x00,
@@ -228,40 +195,7 @@ SECTION_SDATA2 static u8 lit_3762[4] = {
     0x00,
 };
 
-/* 8020EE70-8020F150 02E0+00 s=1 e=0 z=0  None .text      _create__14dMeterString_cFv */
-//	8020EEB4: 80454848 (lit_3758)
-//	8020EEB8: 8045484C (lit_3759)
-//	8020EEBC: 80454850 (lit_3760)
-//	8020EEC0: 80454854 (lit_3761)
-//	8020EEC4: 80260F8C (dTimer_createTimer__FlUlUcUcffff)
-//	8020EED0: 804061C0 (g_dComIfG_gameInfo)
-//	8020EED4: 804061C0 (g_dComIfG_gameInfo)
-//	8020EEF4: 802CEC4C (__nw__FUl)
-//	8020EF00: 802F8498 (__ct__9J2DScreenFv)
-//	8020EF10: 80398210 (d_meter_d_meter_string__stringBase0)
-//	8020EF14: 80398210 (d_meter_d_meter_string__stringBase0)
-//	8020EF20: 802F8648 (setPriority__9J2DScreenFPCcUlP10JKRArchive)
-//	8020EF28: 802550E8 (dPaneClass_showNullPane__FP9J2DScreen)
-//	8020EF5C: 80398210 (d_meter_d_meter_string__stringBase0)
-//	8020EF60: 80398210 (d_meter_d_meter_string__stringBase0)
-//	8020EF6C: 802D4270 (getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader)
-//	8020EF70: 80308A6C (load__20J2DAnmLoaderDataBaseFPCv)
-//	8020EF7C: 802CEC4C (__nw__FUl)
-//	8020EFA4: 80253984 (__ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap)
-//	8020EFB4: 802CEC4C (__nw__FUl)
-//	8020EFD8: 80253984 (__ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap)
-//	8020EFE8: 802CEC4C (__nw__FUl)
-//	8020F00C: 80253984 (__ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap)
-//	8020F018: 800149F0 (mDoExt_getMesgFont__Fv)
-//	8020F058: 800149F0 (mDoExt_getMesgFont__Fv)
-//	8020F0BC: 80398210 (d_meter_d_meter_string__stringBase0)
-//	8020F0C0: 80398210 (d_meter_d_meter_string__stringBase0)
-//	8020F0CC: 8030074C (setString__10J2DTextBoxFsPCce)
-//	8020F0F4: 80398210 (d_meter_d_meter_string__stringBase0)
-//	8020F0F8: 80398210 (d_meter_d_meter_string__stringBase0)
-//	8020F104: 8030074C (setString__10J2DTextBoxFsPCce)
-//	8020F108: 80454858 (lit_3762)
-//	8020F130: 8020F66C (playBckAnimation__14dMeterString_cFf)
+/* 8020EE70-8020F150 2097B0 02E0+00 1/0 0/0 0/0 .text            _create__14dMeterString_cFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -271,8 +205,7 @@ asm void dMeterString_c::_create() {
 }
 #pragma pop
 
-/* 8020F150-8020F1B0 0060+00 s=1 e=0 z=0  None .text      _execute__14dMeterString_cFUl */
-//	8020F194: 8020F5A4 (createString__14dMeterString_cFi)
+/* 8020F150-8020F1B0 209A90 0060+00 1/0 0/0 0/0 .text            _execute__14dMeterString_cFUl */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -283,54 +216,26 @@ asm void dMeterString_c::_execute(u32 param_0) {
 #pragma pop
 
 /* ############################################################################################## */
-/* 8045485C-80454860 0004+00 s=1 e=0 z=0  None .sdata2    @3819 */
+/* 8045485C-80454860 002E5C 0004+00 1/1 0/0 0/0 .sdata2          @3819 */
 SECTION_SDATA2 static f32 lit_3819 = 60.0f;
 
-/* 80454860-80454864 0004+00 s=2 e=0 z=0  None .sdata2    @3820 */
+/* 80454860-80454864 002E60 0004+00 2/2 0/0 0/0 .sdata2          @3820 */
 SECTION_SDATA2 static f32 lit_3820 = 1.0f;
 
-/* 80454864-80454868 0004+00 s=2 e=0 z=0  None .sdata2    @3821 */
+/* 80454864-80454868 002E64 0004+00 2/2 0/0 0/0 .sdata2          @3821 */
 SECTION_SDATA2 static f32 lit_3821 = -1.0f;
 
-/* 80454868-80454870 0004+04 s=1 e=0 z=0  None .sdata2    @3822 */
+/* 80454868-80454870 002E68 0004+04 1/1 0/0 0/0 .sdata2          @3822 */
 SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = {
     18.0f,
     /* padding */
     0.0f,
 };
 
-/* 80454870-80454878 0008+00 s=2 e=0 z=0  None .sdata2    @3824 */
+/* 80454870-80454878 002E70 0008+00 2/2 0/0 0/0 .sdata2          @3824 */
 SECTION_SDATA2 static f64 lit_3824 = 4503601774854144.0 /* cast s32 to float */;
 
-/* 8020F1B0-8020F49C 02EC+00 s=1 e=0 z=0  None .text      draw__14dMeterString_cFv */
-//	8020F1E4: 804061C0 (g_dComIfG_gameInfo)
-//	8020F1E8: 804061C0 (g_dComIfG_gameInfo)
-//	8020F210: 8042EBC8 (g_drawHIO)
-//	8020F214: 8042EBC8 (g_drawHIO)
-//	8020F21C: 80454870 (lit_3824)
-//	8020F238: 8045485C (lit_3819)
-//	8020F260: 80454858 (lit_3762)
-//	8020F274: 80454860 (lit_3820)
-//	8020F2A4: 8020F66C (playBckAnimation__14dMeterString_cFf)
-//	8020F34C: 802557D0 (setAlphaRate__13CPaneMgrAlphaFf)
-//	8020F358: 80454870 (lit_3824)
-//	8020F374: 8042EBC8 (g_drawHIO)
-//	8020F378: 8042EBC8 (g_drawHIO)
-//	8020F3A4: 802545B0 (paneTrans__8CPaneMgrFff)
-//	8020F3A8: 8042EBC8 (g_drawHIO)
-//	8020F3AC: 8042EBC8 (g_drawHIO)
-//	8020F3DC: 80454858 (lit_3762)
-//	8020F3E8: 802F8ED4 (draw__9J2DScreenFffPC14J2DGrafContext)
-//	8020F3F0: 80454858 (lit_3762)
-//	8020F400: 8020F6EC (drawPikari__14dMeterString_cFv)
-//	8020F408: 80454864 (lit_3821)
-//	8020F418: 8042EBC8 (g_drawHIO)
-//	8020F41C: 8042EBC8 (g_drawHIO)
-//	8020F424: 80454870 (lit_3824)
-//	8020F448: 80454868 (lit_3822)
-//	8020F468: 80430188 (g_meter2_info)
-//	8020F46C: 80430188 (g_meter2_info)
-//	8020F470: 8021CC00 (resetMeterString__13dMeter2Info_cFv)
+/* 8020F1B0-8020F49C 209AF0 02EC+00 1/0 0/0 0/0 .text            draw__14dMeterString_cFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -340,8 +245,7 @@ asm void dMeterString_c::draw() {
 }
 #pragma pop
 
-/* 8020F49C-8020F5A4 0108+00 s=1 e=0 z=0  None .text      _delete__14dMeterString_cFv */
-//	8020F588: 8002F79C (dComIfG_TimerDeleteRequest__Fi)
+/* 8020F49C-8020F5A4 209DDC 0108+00 1/0 0/0 0/0 .text            _delete__14dMeterString_cFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -352,19 +256,10 @@ asm void dMeterString_c::_delete() {
 #pragma pop
 
 /* ############################################################################################## */
-/* 80454878-8045487C 0004+00 s=1 e=0 z=0  None .sdata2    @3866 */
+/* 80454878-8045487C 002E78 0004+00 1/1 0/0 0/0 .sdata2          @3866 */
 SECTION_SDATA2 static f32 lit_3866 = 40.0f;
 
-/* 8020F5A4-8020F66C 00C8+00 s=2 e=1 z=0  None .text      createString__14dMeterString_cFi */
-//	8020F5C0: 80430188 (g_meter2_info)
-//	8020F5C4: 80430188 (g_meter2_info)
-//	8020F5D0: 8021C250 (getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c)
-//	8020F5F8: 80300658 (getStringPtr__10J2DTextBoxCFv)
-//	8020F600: 80368B2C (strcpy)
-//	8020F624: 80300658 (getStringPtr__10J2DTextBoxCFv)
-//	8020F62C: 80368B2C (strcpy)
-//	8020F630: 80454878 (lit_3866)
-//	8020F638: 80454864 (lit_3821)
+/* 8020F5A4-8020F66C 209EE4 00C8+00 2/2 1/1 0/0 .text            createString__14dMeterString_cFi */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -374,8 +269,7 @@ asm void dMeterString_c::createString(int param_0) {
 }
 #pragma pop
 
-/* 8020F66C-8020F6EC 0080+00 s=2 e=0 z=0  None .text      playBckAnimation__14dMeterString_cFf */
-//	8020F6B4: 802F7FCC (animationTransform__7J2DPaneFv)
+/* 8020F66C-8020F6EC 209FAC 0080+00 2/2 0/0 0/0 .text playBckAnimation__14dMeterString_cFf */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -386,30 +280,10 @@ asm void dMeterString_c::playBckAnimation(f32 param_0) {
 #pragma pop
 
 /* ############################################################################################## */
-/* 8045487C-80454880 0004+00 s=1 e=0 z=0  None .sdata2    @3979 */
+/* 8045487C-80454880 002E7C 0004+00 1/1 0/0 0/0 .sdata2          @3979 */
 SECTION_SDATA2 static f32 lit_3979 = 0.5f;
 
-/* 8020F6EC-8020FA88 039C+00 s=1 e=0 z=0  None .text      drawPikari__14dMeterString_cFv */
-//	8020F73C: 803621C4 (_savegpr_23)
-//	8020F75C: 80254EBC (getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs)
-//	8020F780: 80300658 (getStringPtr__10J2DTextBoxCFv)
-//	8020F78C: 80454858 (lit_3762)
-//	8020F7A0: 800149F0 (mDoExt_getMesgFont__Fv)
-//	8020F7A8: 80454860 (lit_3820)
-//	8020F7C0: 802F7AFC (getParentPane__7J2DPaneFv)
-//	8020F7CC: 80454870 (lit_3824)
-//	8020F7FC: 8020FA88 (isLeadByte__14dMeterString_cFi)
-//	8020F8AC: 8045487C (lit_3979)
-//	8020F8BC: 8042EBC8 (g_drawHIO)
-//	8020F8C0: 8042EBC8 (g_drawHIO)
-//	8020F8C4: 80430188 (g_meter2_info)
-//	8020F8C8: 80430188 (g_meter2_info)
-//	8020F8D0: 80454870 (lit_3824)
-//	8020F904: 8020FA88 (isLeadByte__14dMeterString_cFi)
-//	8020F9D8: 8045487C (lit_3979)
-//	8020FA0C: 802140DC
-//(drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc)
-//	8020FA74: 80362210 (_restgpr_23)
+/* 8020F6EC-8020FA88 20A02C 039C+00 1/1 0/0 0/0 .text            drawPikari__14dMeterString_cFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -419,7 +293,7 @@ asm void dMeterString_c::drawPikari() {
 }
 #pragma pop
 
-/* 8020FA88-8020FAB4 002C+00 s=1 e=0 z=0  None .text      isLeadByte__14dMeterString_cFi */
+/* 8020FA88-8020FAB4 20A3C8 002C+00 1/1 0/0 0/0 .text            isLeadByte__14dMeterString_cFi */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -428,3 +302,14 @@ asm void dMeterString_c::isLeadByte(int param_0) {
 #include "asm/d/meter/d_meter_string/isLeadByte__14dMeterString_cFi.s"
 }
 #pragma pop
+
+/* 80398210-80398258 024870 0041+07 1/1 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+#pragma section ".dead"
+SECTION_DEAD static char const* const stringBase_80398210 = "zelda_game_image_cow_get_in.blo";
+SECTION_DEAD static char const* const stringBase_80398230 = "zelda_game_image_cow_get_in.bck";
+SECTION_DEAD static char const* const stringBase_80398250 = "";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80398251 = "\0\0\0\0\0\0";
+#pragma pop