From a23a10639979ee10cbea5ffdadadc490d9e60227 Mon Sep 17 00:00:00 2001 From: Julgodis <> Date: Thu, 8 Apr 2021 01:47:05 +0200 Subject: demangle data-symbols --- src/d/menu/d_menu_fmap_map.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/d/menu/d_menu_fmap_map.cpp') diff --git a/src/d/menu/d_menu_fmap_map.cpp b/src/d/menu/d_menu_fmap_map.cpp index a44585d551..b6006a5828 100644 --- a/src/d/menu/d_menu_fmap_map.cpp +++ b/src/d/menu/d_menu_fmap_map.cpp @@ -11,6 +11,8 @@ // Types: // +struct dMenu_Fmap_world_data_c {}; + struct dDrawPath_c { struct group_class {}; @@ -32,8 +34,6 @@ struct dMenu_Fmap_region_data_c { /* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*); }; -struct dMenu_Fmap_world_data_c {}; - struct renderingFmap_c { struct palette_e {}; @@ -82,6 +82,10 @@ struct dRenderingFDAmap_c { /* 8003D6B8 */ void getDecorationLineWidth(int); }; +struct dMfm_HIO_prm_res_src_s { + static u8 m_other[1 + 3 /* padding */]; +}; + struct dMenu_Fmap_room_data_c { /* 8003D818 */ void isArrival(); }; @@ -119,6 +123,10 @@ struct dDlst_list_c { struct Vec {}; +struct JMath { + static u8 sincosTable_[65536]; +}; + // // Forward References: // @@ -167,6 +175,7 @@ extern "C" bool isRenderingFloor__15renderingFmap_cFi(); extern "C" void beforeDrawPath__15renderingFmap_cFv(); extern "C" void afterDrawPath__15renderingFmap_cFv(); extern "C" extern char const* const d_menu_d_menu_fmap_map__stringBase0; +extern "C" u8 m_other__22dMfm_HIO_prm_res_src_s[1 + 3 /* padding */]; // // External References: @@ -218,7 +227,7 @@ extern "C" extern void* __vt__18dRenderingFDAmap_c[26]; extern "C" extern void* __vt__11dDrawPath_c[16]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 sincosTable___5JMath[65536]; +extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 struct_80450D64[4]; // @@ -632,7 +641,7 @@ asm void dMenu_FmapMap_c::_delete() { /* ############################################################################################## */ /* 80454194-80454198 002794 0001+03 2/2 0/0 0/0 .sdata2 m_other__22dMfm_HIO_prm_res_src_s */ -SECTION_SDATA2 static u8 m_other__22dMfm_HIO_prm_res_src_s[1 + 3 /* padding */] = { +SECTION_SDATA2 u8 dMfm_HIO_prm_res_src_s::m_other[1 + 3 /* padding */] = { 0x1E, /* padding */ 0x00, -- cgit v1.2.3