mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-12 19:24:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

re-generate with bug fixes

Browse Source
This commit is contained in:
Julgodis
2021-03-30 01:58:08 +02:00
parent b27bb6b262
commit 2404fb33c7
3631 changed files with 20347 additions and 42325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/meter/d_meter2.cpp
+11 -28
View File
@@ -263,8 +263,6 @@ static void dMeter2_Execute(dMeter2_c*);
static bool dMeter2_IsDelete(dMeter2_c*);
static void dMeter2_Delete(dMeter2_c*);
static void dMeter2_Create(msg_class*);
extern "C" extern char const* const d_meter_d_meter2__stringBase0;
extern "C" extern void* g_profile_METER2[10];
extern "C" void _create__9dMeter2_cFv();
extern "C" void _execute__9dMeter2_cFv();
@@ -345,17 +343,6 @@ bool dMeter2Info_is2DActiveTouchArea();
void dTimer_createStockTimer();
void cLib_addCalc2(f32*, f32, f32, f32);
void* operator new(u32);
extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_mwHIO[304];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 m_mode__7dDemo_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void fopMsgM_setStageLayer__FPv();
@@ -545,7 +532,7 @@ SECTION_SDATA2 static u8 lit_4662[4] = {
};
/* 804549CC-804549D0 0004+00 s=13 e=0 z=0 None .sdata2 @4663 */
SECTION_SDATA2 static u32 lit_4663 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4663 = 1.0f;
/* 8021EA14-8021F128 0714+00 s=1 e=0 z=0 None .text _create__9dMeter2_cFv */
#pragma push
@@ -643,14 +630,10 @@ asm void dMeter2_c::checkStatus() {
/* ############################################################################################## */
/* 804549D8-804549E0 0008+00 s=4 e=0 z=0 None .sdata2 @5267 */
SECTION_SDATA2 static u8 lit_5267[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5267 = 4503601774854144.0 /* cast s32 to float */;
/* 804549E0-804549E8 0008+00 s=2 e=0 z=0 None .sdata2 @5268 */
SECTION_SDATA2 static u8 lit_5268[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5268 = 4503599627370496.0 /* cast u32 to float */;
/* 8021FD60-80220180 0420+00 s=1 e=0 z=0 None .text moveLife__9dMeter2_cFv */
#pragma push
@@ -664,7 +647,7 @@ asm void dMeter2_c::moveLife() {
/* ############################################################################################## */
/* 804549E8-804549EC 0004+00 s=4 e=0 z=0 None .sdata2 @5791 */
SECTION_SDATA2 static u32 lit_5791 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_5791 = 1.0f / 10.0f;
/* 80220180-8022051C 039C+00 s=1 e=0 z=0 None .text moveKantera__9dMeter2_cFv */
#pragma push
@@ -678,7 +661,7 @@ asm void dMeter2_c::moveKantera() {
/* ############################################################################################## */
/* 804549EC-804549F0 0004+00 s=2 e=0 z=0 None .sdata2 @5933 */
SECTION_SDATA2 static u32 lit_5933 = 0x3F000000;
SECTION_SDATA2 static f32 lit_5933 = 0.5f;
/* 8022051C-80220888 036C+00 s=1 e=0 z=0 None .text moveOxygen__9dMeter2_cFv */
#pragma push
@@ -692,10 +675,10 @@ asm void dMeter2_c::moveOxygen() {
/* ############################################################################################## */
/* 804549F0-804549F4 0004+00 s=3 e=0 z=0 None .sdata2 @6051 */
SECTION_SDATA2 static u32 lit_6051 = 0x41200000;
SECTION_SDATA2 static f32 lit_6051 = 10.0f;
/* 804549F4-804549F8 0004+00 s=1 e=0 z=0 None .sdata2 @6052 */
SECTION_SDATA2 static u32 lit_6052 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_6052 = 1.0f / 5.0f;
/* 80220888-80220C30 03A8+00 s=1 e=0 z=0 None .text moveLightDrop__9dMeter2_cFv */
#pragma push
@@ -729,7 +712,7 @@ asm void dMeter2_c::moveKey() {
/* ############################################################################################## */
/* 804549F8-804549FC 0004+00 s=2 e=0 z=0 None .sdata2 @6564 */
SECTION_SDATA2 static u32 lit_6564 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_6564 = 1.0f / 100.0f;
/* 80221244-802217F4 05B0+00 s=1 e=0 z=0 None .text moveButtonA__9dMeter2_cFv */
#pragma push
@@ -813,10 +796,10 @@ asm void dMeter2_c::moveButtonXY() {
/* ############################################################################################## */
/* 804549FC-80454A00 0004+00 s=1 e=0 z=0 None .sdata2 @7509 */
SECTION_SDATA2 static u32 lit_7509 = 0x41700000;
SECTION_SDATA2 static f32 lit_7509 = 15.0f;
/* 80454A00-80454A04 0004+00 s=1 e=0 z=0 None .sdata2 @7510 */
SECTION_SDATA2 static u32 lit_7510 = 0x42480000;
SECTION_SDATA2 static f32 lit_7510 = 50.0f;
/* 80222E88-802230F8 0270+00 s=1 e=0 z=0 None .text moveButtonCross__9dMeter2_cFv */
#pragma push
@@ -985,7 +968,7 @@ asm void dMeter2_c::alphaAnimeButton() {
/* ############################################################################################## */
/* 80454A04-80454A08 0004+00 s=1 e=0 z=0 None .sdata2 @9090 */
SECTION_SDATA2 static u32 lit_9090 = 0x437F0000;
SECTION_SDATA2 static f32 lit_9090 = 255.0f;
/* 80454A08-80454A10 0004+04 s=1 e=0 z=0 None .sdata2 @9091 */
SECTION_SDATA2 static f32 lit_9091[1 + 1 /* padding */] = {
src/d/meter/d_meter2_draw.cpp
+75 -89
View File
@@ -31,8 +31,6 @@ struct dMsgObject_c {
struct JMSMesgEntry_c {};
struct ResTIMG {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -42,6 +40,8 @@ struct JGeometry {
struct ResTLUT {};
struct ResTIMG {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
@@ -56,12 +56,6 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JUtility {
struct TColor {};
};
struct JKRExpHeap {};
struct J2DGrafContext {};
struct JKRArchive {
@@ -75,6 +69,8 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct JKRExpHeap {};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
@@ -84,6 +80,12 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct J2DAnmColor {};
struct J2DRotateAxis {};
struct J2DBasePosition {};
@@ -103,8 +105,6 @@ struct CPaneMgr {
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
struct J2DAnmColor {};
struct dMeter2Draw_c {
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 802102F8 */ ~dMeter2Draw_c();
@@ -246,9 +246,6 @@ struct J2DAnmLoaderDataBase {
// Forward References:
//
extern "C" extern u8 const data_803988B8[24];
extern "C" extern char const* const d_meter_d_meter2_draw__stringBase0;
extern "C" void __ct__13dMeter2Draw_cFP10JKRExpHeap();
extern "C" void __dt__13dMeter2Draw_cFv();
extern "C" void init__13dMeter2Draw_cFv();
@@ -370,13 +367,6 @@ void dPaneClass_showNullPane(J2DScreen*);
void cLib_addCalc2(f32*, f32, f32, f32);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_MsgObject_HIO_c[1040];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getMesgFont__Fv();
@@ -915,13 +905,13 @@ SECTION_SDATA2 static u8 lit_4182[4] = {
};
/* 80454884-80454888 0004+00 s=14 e=0 z=0 None .sdata2 @4183 */
SECTION_SDATA2 static u32 lit_4183 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4183 = 1.0f;
/* 80454888-8045488C 0004+00 s=5 e=0 z=0 None .sdata2 @4184 */
SECTION_SDATA2 static u32 lit_4184 = 0x41880000;
SECTION_SDATA2 static f32 lit_4184 = 17.0f;
/* 8045488C-80454890 0004+00 s=1 e=0 z=0 None .sdata2 @4185 */
SECTION_SDATA2 static u32 lit_4185 = 0x41A00000;
SECTION_SDATA2 static f32 lit_4185 = 20.0f;
/* 8020FAB4-802102F8 0844+00 s=0 e=1 z=0 None .text __ct__13dMeter2Draw_cFP10JKRExpHeap */
#pragma push
@@ -965,10 +955,10 @@ asm void dMeter2Draw_c::exec(u32 param_0) {
/* ############################################################################################## */
/* 80454890-80454894 0004+00 s=1 e=0 z=0 None .sdata2 @4921 */
SECTION_SDATA2 static u32 lit_4921 = 0x41800000;
SECTION_SDATA2 static f32 lit_4921 = 16.0f;
/* 80454894-80454898 0004+00 s=9 e=0 z=0 None .sdata2 @4922 */
SECTION_SDATA2 static u32 lit_4922 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4922 = 0.5f;
/* 80454898-804548A0 0004+04 s=7 e=0 z=0 None .sdata2 @4923 */
SECTION_SDATA2 static f32 lit_4923[1 + 1 /* padding */] = {
@@ -978,9 +968,7 @@ SECTION_SDATA2 static f32 lit_4923[1 + 1 /* padding */] = {
};
/* 804548A0-804548A8 0008+00 s=13 e=0 z=0 None .sdata2 @4925 */
SECTION_SDATA2 static u8 lit_4925[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4925 = 4503601774854144.0 /* cast s32 to float */;
/* 8021151C-80211BEC 06D0+00 s=1 e=0 z=0 None .text draw__13dMeter2Draw_cFv */
#pragma push
@@ -1113,13 +1101,13 @@ asm void dMeter2Draw_c::drawPikari(CPaneMgr* param_0, f32* param_1, f32 param_2,
/* ############################################################################################## */
/* 804548A8-804548AC 0004+00 s=1 e=0 z=0 None .sdata2 @5784 */
SECTION_SDATA2 static u32 lit_5784 = 0x41E00000;
SECTION_SDATA2 static f32 lit_5784 = 28.0f;
/* 804548AC-804548B0 0004+00 s=1 e=0 z=0 None .sdata2 @5785 */
SECTION_SDATA2 static u32 lit_5785 = 0x41C00000;
SECTION_SDATA2 static f32 lit_5785 = 24.0f;
/* 804548B0-804548B4 0004+00 s=4 e=0 z=0 None .sdata2 @5786 */
SECTION_SDATA2 static u32 lit_5786 = 0xBF800000;
SECTION_SDATA2 static f32 lit_5786 = -1.0f;
/* 802140DC-8021462C 0550+00 s=1 e=6 z=0 None .text
* drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc
@@ -1202,7 +1190,7 @@ asm void dMeter2Draw_c::setAlphaLifeAnimeMax() {
/* ############################################################################################## */
/* 804548B4-804548B8 0004+00 s=1 e=0 z=0 None .sdata2 @6143 */
SECTION_SDATA2 static u32 lit_6143 = 0x3E800000;
SECTION_SDATA2 static f32 lit_6143 = 0.25f;
/* 80214EB4-80215290 03DC+00 s=1 e=0 z=0 None .text drawKanteraScreen__13dMeter2Draw_cFUc */
#pragma push
@@ -1216,7 +1204,7 @@ asm void dMeter2Draw_c::drawKanteraScreen(u8 param_0) {
/* ############################################################################################## */
/* 804548B8-804548BC 0004+00 s=1 e=0 z=0 None .sdata2 @6175 */
SECTION_SDATA2 static u32 lit_6175 = 0x3D000000;
SECTION_SDATA2 static f32 lit_6175 = 0.03125f;
/* 80215290-80215380 00F0+00 s=1 e=0 z=0 None .text drawMagic__13dMeter2Draw_cFssff */
#pragma push
@@ -1240,12 +1228,10 @@ asm void dMeter2Draw_c::setAlphaMagicChange(bool param_0) {
/* ############################################################################################## */
/* 804548BC-804548C0 0004+00 s=4 e=0 z=0 None .sdata2 @6210 */
SECTION_SDATA2 static u32 lit_6210 = 0x40A00000;
SECTION_SDATA2 static f32 lit_6210 = 5.0f;
/* 804548C0-804548C8 0008+00 s=9 e=0 z=0 None .sdata2 @6293 */
SECTION_SDATA2 static u8 lit_6293[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_6293 = 4503599627370496.0 /* cast u32 to float */;
/* 802154A8-802155B8 0110+00 s=1 e=1 z=0 None .text drawKantera__13dMeter2Draw_cFllff */
#pragma push
@@ -1334,7 +1320,7 @@ asm void dMeter2Draw_c::setAlphaOxygenAnimeMax() {
/* ############################################################################################## */
/* 804548C8-804548CC 0004+00 s=4 e=0 z=0 None .sdata2 @6524 */
SECTION_SDATA2 static u32 lit_6524 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_6524 = 3.0f / 10.0f;
/* 80215B18-80215DA4 028C+00 s=1 e=1 z=0 None .text drawLightDrop__13dMeter2Draw_cFUcUcffffUc
*/
@@ -1727,7 +1713,7 @@ asm void dMeter2Draw_c::setAlphaButtonBAnimeMax() {
/* ############################################################################################## */
/* 804548CC-804548D0 0004+00 s=5 e=0 z=0 None .sdata2 @8207 */
SECTION_SDATA2 static u32 lit_8207 = 0x437F0000;
SECTION_SDATA2 static f32 lit_8207 = 255.0f;
/* 802195A4-80219788 01E4+00 s=0 e=1 z=0 None .text setButtonIconAAlpha__13dMeter2Draw_cFUcUlb
*/
@@ -1753,10 +1739,10 @@ asm void dMeter2Draw_c::setButtonIconBAlpha(u8 param_0, u32 param_1, bool param_
/* ############################################################################################## */
/* 804548D0-804548D4 0004+00 s=1 e=0 z=0 None .sdata2 @8359 */
SECTION_SDATA2 static u32 lit_8359 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_8359 = 2.0f / 5.0f;
/* 804548D4-804548D8 0004+00 s=1 e=0 z=0 None .sdata2 @8360 */
SECTION_SDATA2 static u32 lit_8360 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_8360 = 1.0f / 10.0f;
/* 80219A84-80219E98 0414+00 s=0 e=1 z=0 None .text setButtonIconMidonaAlpha__13dMeter2Draw_cFUl
*/
@@ -1807,10 +1793,10 @@ asm void dMeter2Draw_c::getActionString(u8 param_0, u8 param_1, u8* param_2) {
/* ############################################################################################## */
/* 804548D8-804548DC 0004+00 s=2 e=0 z=0 None .sdata2 @8548 */
SECTION_SDATA2 static u32 lit_8548 = 0x42C80000;
SECTION_SDATA2 static f32 lit_8548 = 100.0f;
/* 804548DC-804548E0 0004+00 s=2 e=0 z=0 None .sdata2 @8549 */
SECTION_SDATA2 static u32 lit_8549 = 0x42400000;
SECTION_SDATA2 static f32 lit_8549 = 48.0f;
/* 8021A468-8021A71C 02B4+00 s=2 e=0 z=0 None .text changeTextureItemB__13dMeter2Draw_cFUc */
#pragma push
@@ -1877,10 +1863,10 @@ asm void dMeter2Draw_c::drawItemNum(u8 param_0, f32 param_1) {
/* ############################################################################################## */
/* 804548E0-804548E4 0004+00 s=1 e=0 z=0 None .sdata2 @8774 */
SECTION_SDATA2 static u32 lit_8774 = 0x41100000;
SECTION_SDATA2 static f32 lit_8774 = 9.0f;
/* 804548E4-804548E8 0004+00 s=1 e=0 z=0 None .sdata2 @8775 */
SECTION_SDATA2 static u32 lit_8775 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_8775 = 3.0f / 5.0f;
/* 80456B90-80456B94 0004+00 s=1 e=0 z=0 None .sbss2 @8746 */
SECTION_SBSS2 static u8 lit_8746[4];
@@ -1916,52 +1902,52 @@ asm void dMeter2Draw_c::isButtonVisible() {
/* ############################################################################################## */
/* 804548E8-804548EC 0004+00 s=2 e=0 z=0 None .sdata2 @8992 */
SECTION_SDATA2 static u32 lit_8992 = 0x40800000;
SECTION_SDATA2 static f32 lit_8992 = 4.0f;
/* 804548EC-804548F0 0004+00 s=1 e=0 z=0 None .sdata2 @8993 */
SECTION_SDATA2 static u32 lit_8993 = 0xC1300000;
SECTION_SDATA2 static f32 lit_8993 = -11.0f;
/* 804548F0-804548F4 0004+00 s=4 e=0 z=0 None .sdata2 @8994 */
SECTION_SDATA2 static u32 lit_8994 = 0x3FD9999A;
SECTION_SDATA2 static f32 lit_8994 = 17.0f / 10.0f;
/* 804548F4-804548F8 0004+00 s=3 e=0 z=0 None .sdata2 @8995 */
SECTION_SDATA2 static u32 lit_8995 = 0xC0800000;
SECTION_SDATA2 static f32 lit_8995 = -4.0f;
/* 804548F8-804548FC 0004+00 s=2 e=0 z=0 None .sdata2 @8996 */
SECTION_SDATA2 static u32 lit_8996 = 0xC1133333;
SECTION_SDATA2 static f32 lit_8996 = -46.0f / 5.0f;
/* 804548FC-80454900 0004+00 s=2 e=0 z=0 None .sdata2 @8997 */
SECTION_SDATA2 static u32 lit_8997 = 0x3F733333;
SECTION_SDATA2 static f32 lit_8997 = 19.0f / 20.0f;
/* 80454900-80454904 0004+00 s=2 e=0 z=0 None .sdata2 @8998 */
SECTION_SDATA2 static u32 lit_8998 = 0x41133333;
SECTION_SDATA2 static f32 lit_8998 = 46.0f / 5.0f;
/* 80454904-80454908 0004+00 s=1 e=0 z=0 None .sdata2 @8999 */
SECTION_SDATA2 static u32 lit_8999 = 0xC1600000;
SECTION_SDATA2 static f32 lit_8999 = -14.0f;
/* 80454908-8045490C 0004+00 s=2 e=0 z=0 None .sdata2 @9000 */
SECTION_SDATA2 static u32 lit_9000 = 0x40000000;
SECTION_SDATA2 static f32 lit_9000 = 2.0f;
/* 8045490C-80454910 0004+00 s=2 e=0 z=0 None .sdata2 @9001 */
SECTION_SDATA2 static u32 lit_9001 = 0x3FC00000;
SECTION_SDATA2 static f32 lit_9001 = 1.5f;
/* 80454910-80454914 0004+00 s=2 e=0 z=0 None .sdata2 @9002 */
SECTION_SDATA2 static u32 lit_9002 = 0x43AF0000;
SECTION_SDATA2 static f32 lit_9002 = 350.0f;
/* 80454914-80454918 0004+00 s=1 e=0 z=0 None .sdata2 @9003 */
SECTION_SDATA2 static u32 lit_9003 = 0xC0000000;
SECTION_SDATA2 static f32 lit_9003 = -2.0f;
/* 80454918-8045491C 0004+00 s=1 e=0 z=0 None .sdata2 @9004 */
SECTION_SDATA2 static u32 lit_9004 = 0xC1700000;
SECTION_SDATA2 static f32 lit_9004 = -15.0f;
/* 8045491C-80454920 0004+00 s=3 e=0 z=0 None .sdata2 @9005 */
SECTION_SDATA2 static u32 lit_9005 = 0xBFA66666;
SECTION_SDATA2 static f32 lit_9005 = -13.0f / 10.0f;
/* 80454920-80454924 0004+00 s=2 e=0 z=0 None .sdata2 @9006 */
SECTION_SDATA2 static u32 lit_9006 = 0xC1800000;
SECTION_SDATA2 static f32 lit_9006 = -16.0f;
/* 80454924-80454928 0004+00 s=3 e=0 z=0 None .sdata2 @9007 */
SECTION_SDATA2 static u32 lit_9007 = 0x3FF1C71D;
SECTION_SDATA2 static f32 lit_9007 = 1.888888955116272f;
/* 8021B104-8021B364 0260+00 s=3 e=0 z=0 None .text setItemParamX__13dMeter2Draw_cFUc */
#pragma push
@@ -1975,19 +1961,19 @@ asm void dMeter2Draw_c::setItemParamX(u8 param_0) {
/* ############################################################################################## */
/* 80454928-8045492C 0004+00 s=3 e=0 z=0 None .sdata2 @9025 */
SECTION_SDATA2 static u32 lit_9025 = 0x41600000;
SECTION_SDATA2 static f32 lit_9025 = 14.0f;
/* 8045492C-80454930 0004+00 s=2 e=0 z=0 None .sdata2 @9026 */
SECTION_SDATA2 static u32 lit_9026 = 0x3FA66666;
SECTION_SDATA2 static f32 lit_9026 = 13.0f / 10.0f;
/* 80454930-80454934 0004+00 s=2 e=0 z=0 None .sdata2 @9027 */
SECTION_SDATA2 static u32 lit_9027 = 0xC0D33333;
SECTION_SDATA2 static f32 lit_9027 = -33.0f / 5.0f;
/* 80454934-80454938 0004+00 s=2 e=0 z=0 None .sdata2 @9028 */
SECTION_SDATA2 static u32 lit_9028 = 0x40D33333;
SECTION_SDATA2 static f32 lit_9028 = 33.0f / 5.0f;
/* 80454938-8045493C 0004+00 s=1 e=0 z=0 None .sdata2 @9029 */
SECTION_SDATA2 static u32 lit_9029 = 0xBFE66666;
SECTION_SDATA2 static f32 lit_9029 = -9.0f / 5.0f;
/* 8021B364-8021B5B0 024C+00 s=3 e=0 z=0 None .text setItemParamY__13dMeter2Draw_cFUc */
#pragma push
@@ -2001,22 +1987,22 @@ asm void dMeter2Draw_c::setItemParamY(u8 param_0) {
/* ############################################################################################## */
/* 8045493C-80454940 0004+00 s=2 e=0 z=0 None .sdata2 @9047 */
SECTION_SDATA2 static u32 lit_9047 = 0x400CCCCD;
SECTION_SDATA2 static f32 lit_9047 = 11.0f / 5.0f;
/* 80454940-80454944 0004+00 s=2 e=0 z=0 None .sdata2 @9048 */
SECTION_SDATA2 static u32 lit_9048 = 0xC1F00000;
SECTION_SDATA2 static f32 lit_9048 = -30.0f;
/* 80454944-80454948 0004+00 s=2 e=0 z=0 None .sdata2 @9049 */
SECTION_SDATA2 static u32 lit_9049 = 0x3F400000;
SECTION_SDATA2 static f32 lit_9049 = 0.75f;
/* 80454948-8045494C 0004+00 s=2 e=0 z=0 None .sdata2 @9050 */
SECTION_SDATA2 static u32 lit_9050 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_9050 = 4.0f / 5.0f;
/* 8045494C-80454950 0004+00 s=2 e=0 z=0 None .sdata2 @9051 */
SECTION_SDATA2 static u32 lit_9051 = 0x3FB33333;
SECTION_SDATA2 static f32 lit_9051 = 7.0f / 5.0f;
/* 80454950-80454954 0004+00 s=1 e=0 z=0 None .sdata2 @9052 */
SECTION_SDATA2 static u32 lit_9052 = 0xC0600000;
SECTION_SDATA2 static f32 lit_9052 = -3.5f;
/* 8021B5B0-8021B810 0260+00 s=3 e=0 z=0 None .text setItemParamZ__13dMeter2Draw_cFUc */
#pragma push
@@ -2030,55 +2016,55 @@ asm void dMeter2Draw_c::setItemParamZ(u8 param_0) {
/* ############################################################################################## */
/* 80454954-80454958 0004+00 s=1 e=0 z=0 None .sdata2 @9089 */
SECTION_SDATA2 static u32 lit_9089 = 0x418A6666;
SECTION_SDATA2 static f32 lit_9089 = 17.299999237060547f;
/* 80454958-8045495C 0004+00 s=1 e=0 z=0 None .sdata2 @9090 */
SECTION_SDATA2 static u32 lit_9090 = 0xC23B3333;
SECTION_SDATA2 static f32 lit_9090 = -46.79999923706055f;
/* 8045495C-80454960 0004+00 s=1 e=0 z=0 None .sdata2 @9091 */
SECTION_SDATA2 static u32 lit_9091 = 0x41D00000;
SECTION_SDATA2 static f32 lit_9091 = 26.0f;
/* 80454960-80454964 0004+00 s=1 e=0 z=0 None .sdata2 @9092 */
SECTION_SDATA2 static u32 lit_9092 = 0xC25ACCCD;
SECTION_SDATA2 static f32 lit_9092 = -54.70000076293945f;
/* 80454964-80454968 0004+00 s=1 e=0 z=0 None .sdata2 @9093 */
SECTION_SDATA2 static u32 lit_9093 = 0x41A5999A;
SECTION_SDATA2 static f32 lit_9093 = 20.700000762939453f;
/* 80454968-8045496C 0004+00 s=1 e=0 z=0 None .sdata2 @9094 */
SECTION_SDATA2 static u32 lit_9094 = 0xC25ECCCD;
SECTION_SDATA2 static f32 lit_9094 = -55.70000076293945f;
/* 8045496C-80454970 0004+00 s=1 e=0 z=0 None .sdata2 @9095 */
SECTION_SDATA2 static u32 lit_9095 = 0x41766666;
SECTION_SDATA2 static f32 lit_9095 = 77.0f / 5.0f;
/* 80454970-80454974 0004+00 s=1 e=0 z=0 None .sdata2 @9096 */
SECTION_SDATA2 static u32 lit_9096 = 0xC23F3333;
SECTION_SDATA2 static f32 lit_9096 = -47.79999923706055f;
/* 80454974-80454978 0004+00 s=1 e=0 z=0 None .sdata2 @9097 */
SECTION_SDATA2 static u32 lit_9097 = 0x41BA6666;
SECTION_SDATA2 static f32 lit_9097 = 23.299999237060547f;
/* 80454978-8045497C 0004+00 s=1 e=0 z=0 None .sdata2 @9098 */
SECTION_SDATA2 static u32 lit_9098 = 0x41EA6666;
SECTION_SDATA2 static f32 lit_9098 = 29.299999237060547f;
/* 8045497C-80454980 0004+00 s=1 e=0 z=0 None .sdata2 @9099 */
SECTION_SDATA2 static u32 lit_9099 = 0x41A26666;
SECTION_SDATA2 static f32 lit_9099 = 20.299999237060547f;
/* 80454980-80454984 0004+00 s=1 e=0 z=0 None .sdata2 @9100 */
SECTION_SDATA2 static u32 lit_9100 = 0x41400000;
SECTION_SDATA2 static f32 lit_9100 = 12.0f;
/* 80454984-80454988 0004+00 s=1 e=0 z=0 None .sdata2 @9101 */
SECTION_SDATA2 static u32 lit_9101 = 0xC1B00000;
SECTION_SDATA2 static f32 lit_9101 = -22.0f;
/* 80454988-8045498C 0004+00 s=1 e=0 z=0 None .sdata2 @9102 */
SECTION_SDATA2 static u32 lit_9102 = 0x41A80000;
SECTION_SDATA2 static f32 lit_9102 = 21.0f;
/* 8045498C-80454990 0004+00 s=1 e=0 z=0 None .sdata2 @9103 */
SECTION_SDATA2 static u32 lit_9103 = 0xC23ACCCD;
SECTION_SDATA2 static f32 lit_9103 = -46.70000076293945f;
/* 80454990-80454994 0004+00 s=1 e=0 z=0 None .sdata2 @9104 */
SECTION_SDATA2 static u32 lit_9104 = 0x41980000;
SECTION_SDATA2 static f32 lit_9104 = 19.0f;
/* 80454994-80454998 0004+00 s=1 e=0 z=0 None .sdata2 @9105 */
SECTION_SDATA2 static u32 lit_9105 = 0xC2340000;
SECTION_SDATA2 static f32 lit_9105 = -45.0f;
/* 8021B810-8021BB6C 035C+00 s=3 e=0 z=0 None .text setItemParamB__13dMeter2Draw_cFUc */
#pragma push
src/d/meter/d_meter2_info.cpp
+13 -23
View File
@@ -60,18 +60,18 @@ struct dMeterMap_c {
/* 8020D900 */ void isMapOpenCheck();
};
struct cXyz {};
struct JMSMesgEntry_c {};
struct J2DPicture {};
struct JUTFont {};
struct J2DTextBox {
/* 8021C7F4 */ void getFont() const;
};
struct JUTFont {};
struct cXyz {};
struct J2DPicture {};
struct dMeter2Info_c {
/* 8021BDDC */ dMeter2Info_c();
/* 8021BE20 */ ~dMeter2Info_c();
@@ -146,9 +146,6 @@ void dMeter2Info_setNewLetterSender();
void dMeter2Info_recieveLetter();
void dMeter2Info_set2DVibration();
void dMeter2Info_set2DVibrationM();
extern "C" extern char const* const d_meter_d_meter2_info__stringBase0;
extern "C" extern u8 letter_data__12dMenu_Letter[512];
extern "C" extern u8 g_meter2_info[248];
extern "C" void __ct__13dMeter2Info_cFv();
extern "C" void __dt__13dMeter2Info_cFv();
@@ -228,9 +225,6 @@ void dComIfGs_setWarpItemData(char const*, cXyz, s16, s8, u8, u8);
void dComIfGs_setWarpMarkFlag(u8);
void daNpcF_getPlayerInfoFromPlayerList(int, int, cXyz&, csXyz&);
void operator delete(void*);
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
SECTION_INIT void memcpy();
extern "C" void dComIfGs_setSelectItemIndex__FiUc();
@@ -605,19 +599,19 @@ SECTION_SDATA2 static u8 lit_3916[4] = {
};
/* 8045499C-804549A0 0004+00 s=1 e=0 z=0 None .sdata2 @3917 */
SECTION_SDATA2 static u32 lit_3917 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3917 = 1.0f;
/* 804549A0-804549A4 0004+00 s=1 e=0 z=0 None .sdata2 @3918 */
SECTION_SDATA2 static u32 lit_3918 = 0x41F00000;
SECTION_SDATA2 static f32 lit_3918 = 30.0f;
/* 804549A4-804549A8 0004+00 s=1 e=0 z=0 None .sdata2 @3919 */
SECTION_SDATA2 static u32 lit_3919 = 0x43980000;
SECTION_SDATA2 static f32 lit_3919 = 304.0f;
/* 804549A8-804549AC 0004+00 s=1 e=0 z=0 None .sdata2 @3920 */
SECTION_SDATA2 static u32 lit_3920 = 0x43600000;
SECTION_SDATA2 static f32 lit_3920 = 224.0f;
/* 804549AC-804549B0 0004+00 s=1 e=0 z=0 None .sdata2 @3921 */
SECTION_SDATA2 static u32 lit_3921 = 0x44180000;
SECTION_SDATA2 static f32 lit_3921 = 608.0f;
/* 804549B0-804549B8 0004+04 s=1 e=0 z=0 None .sdata2 @3922 */
SECTION_SDATA2 static f32 lit_3922[1 + 1 /* padding */] = {
@@ -734,9 +728,7 @@ asm void dMeter2Info_c::getStringKanji(u32 param_0, char* param_1, JMSMesgEntry_
/* ############################################################################################## */
/* 804549B8-804549C0 0008+00 s=2 e=0 z=0 None .sdata2 @4108 */
SECTION_SDATA2 static u8 lit_4108[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */;
/* 8021C6A4-8021C7F4 0150+00 s=0 e=1 z=0 None .text
* getStringLength__13dMeter2Info_cFP10J2DTextBoxPc */
@@ -1079,9 +1071,7 @@ asm void dMeter2Info_getPlusTextureName() {
/* ############################################################################################## */
/* 804549C0-804549C8 0008+00 s=1 e=0 z=0 None .sdata2 @5206 */
SECTION_SDATA2 static u8 lit_5206[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5206 = 4503599627370496.0 /* cast u32 to float */;
/* 8021E308-8021E4B0 01A8+00 s=0 e=3 z=0 None .text dMeter2Info_getPixel__FffffffPC7ResTIMG */
#pragma push
src/d/meter/d_meter_HIO.cpp
+151 -159
View File
@@ -114,14 +114,6 @@ struct JKRHeap {
// Forward References:
//
extern "C" extern u8 const data_80397F40[24];
extern "C" extern u8 const data_80397F58[24];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */];
extern "C" extern u8 g_menuHIO[8];
extern "C" void __ct__16dMeter_menuHIO_cFv();
extern "C" void __ct__23dMeter_drawCollectHIO_cFv();
extern "C" void __ct__22dMeter_drawOptionHIO_cFv();
@@ -314,22 +306,22 @@ asm dMeter_menuHIO_c::dMeter_menuHIO_c() {
/* ############################################################################################## */
/* 804544E0-804544E4 0004+00 s=12 e=0 z=0 None .sdata2 @3787 */
SECTION_SDATA2 static u32 lit_3787 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3787 = 1.0f;
/* 804544E4-804544E8 0004+00 s=5 e=0 z=0 None .sdata2 @3788 */
SECTION_SDATA2 static u32 lit_3788 = 0x3FC00000;
SECTION_SDATA2 static f32 lit_3788 = 1.5f;
/* 804544E8-804544EC 0004+00 s=6 e=0 z=0 None .sdata2 @3789 */
SECTION_SDATA2 static u32 lit_3789 = 0x3F8CCCCD;
SECTION_SDATA2 static f32 lit_3789 = 11.0f / 10.0f;
/* 804544EC-804544F0 0004+00 s=2 e=0 z=0 None .sdata2 @3790 */
SECTION_SDATA2 static u32 lit_3790 = 0xC1400000;
SECTION_SDATA2 static f32 lit_3790 = -12.0f;
/* 804544F0-804544F4 0004+00 s=4 e=0 z=0 None .sdata2 @3791 */
SECTION_SDATA2 static u32 lit_3791 = 0x3FA66666;
SECTION_SDATA2 static f32 lit_3791 = 13.0f / 10.0f;
/* 804544F4-804544F8 0004+00 s=5 e=0 z=0 None .sdata2 @3792 */
SECTION_SDATA2 static u32 lit_3792 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_3792 = 4.0f / 5.0f;
/* 804544F8-804544FC 0004+00 s=11 e=0 z=0 None .sdata2 @3793 */
SECTION_SDATA2 static u8 lit_3793[4] = {
@@ -340,31 +332,31 @@ SECTION_SDATA2 static u8 lit_3793[4] = {
};
/* 804544FC-80454500 0004+00 s=2 e=0 z=0 None .sdata2 @3794 */
SECTION_SDATA2 static u32 lit_3794 = 0xC0A00000;
SECTION_SDATA2 static f32 lit_3794 = -5.0f;
/* 80454500-80454504 0004+00 s=3 e=0 z=0 None .sdata2 @3795 */
SECTION_SDATA2 static u32 lit_3795 = 0x40800000;
SECTION_SDATA2 static f32 lit_3795 = 4.0f;
/* 80454504-80454508 0004+00 s=6 e=0 z=0 None .sdata2 @3796 */
SECTION_SDATA2 static u32 lit_3796 = 0x3F666666;
SECTION_SDATA2 static f32 lit_3796 = 9.0f / 10.0f;
/* 80454508-8045450C 0004+00 s=1 e=0 z=0 None .sdata2 @3797 */
SECTION_SDATA2 static u32 lit_3797 = 0xC1B26666;
SECTION_SDATA2 static f32 lit_3797 = -22.299999237060547f;
/* 8045450C-80454510 0004+00 s=1 e=0 z=0 None .sdata2 @3798 */
SECTION_SDATA2 static u32 lit_3798 = 0x41C73333;
SECTION_SDATA2 static f32 lit_3798 = 24.899999618530273f;
/* 80454510-80454514 0004+00 s=4 e=0 z=0 None .sdata2 @3799 */
SECTION_SDATA2 static u32 lit_3799 = 0x41C80000;
SECTION_SDATA2 static f32 lit_3799 = 25.0f;
/* 80454514-80454518 0004+00 s=1 e=0 z=0 None .sdata2 @3800 */
SECTION_SDATA2 static u32 lit_3800 = 0xC1C73333;
SECTION_SDATA2 static f32 lit_3800 = -24.899999618530273f;
/* 80454518-8045451C 0004+00 s=1 e=0 z=0 None .sdata2 @3801 */
SECTION_SDATA2 static u32 lit_3801 = 0xC1DC0000;
SECTION_SDATA2 static f32 lit_3801 = -27.5f;
/* 8045451C-80454520 0004+00 s=1 e=0 z=0 None .sdata2 @3802 */
SECTION_SDATA2 static u32 lit_3802 = 0x41D00000;
SECTION_SDATA2 static f32 lit_3802 = 26.0f;
/* 801FE348-801FE4EC 01A4+00 s=1 e=0 z=0 None .text __ct__23dMeter_drawCollectHIO_cFv */
#pragma push
@@ -378,19 +370,19 @@ asm dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() {
/* ############################################################################################## */
/* 80454520-80454524 0004+00 s=3 e=0 z=0 None .sdata2 @3828 */
SECTION_SDATA2 static u32 lit_3828 = 0x3F828F5C;
SECTION_SDATA2 static f32 lit_3828 = 51.0f / 50.0f;
/* 80454524-80454528 0004+00 s=3 e=0 z=0 None .sdata2 @3829 */
SECTION_SDATA2 static u32 lit_3829 = 0x3F7AE148;
SECTION_SDATA2 static f32 lit_3829 = 49.0f / 50.0f;
/* 80454528-8045452C 0004+00 s=4 e=0 z=0 None .sdata2 @3830 */
SECTION_SDATA2 static u32 lit_3830 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_3830 = 3.0f / 10.0f;
/* 8045452C-80454530 0004+00 s=1 e=0 z=0 None .sdata2 @3831 */
SECTION_SDATA2 static u32 lit_3831 = 0x42340000;
SECTION_SDATA2 static f32 lit_3831 = 45.0f;
/* 80454530-80454534 0004+00 s=1 e=0 z=0 None .sdata2 @3832 */
SECTION_SDATA2 static u32 lit_3832 = 0x42180000;
SECTION_SDATA2 static f32 lit_3832 = 38.0f;
/* 801FE4EC-801FE5CC 00E0+00 s=1 e=0 z=0 None .text __ct__22dMeter_drawOptionHIO_cFv */
#pragma push
@@ -404,7 +396,7 @@ asm dMeter_drawOptionHIO_c::dMeter_drawOptionHIO_c() {
/* ############################################################################################## */
/* 80454534-80454538 0004+00 s=4 e=0 z=0 None .sdata2 @3867 */
SECTION_SDATA2 static u32 lit_3867 = 0xC1A00000;
SECTION_SDATA2 static f32 lit_3867 = -20.0f;
/* 801FE5CC-801FE730 0164+00 s=1 e=0 z=0 None .text __ct__22dMeter_drawLetterHIO_cFv */
#pragma push
@@ -544,22 +536,22 @@ SECTION_RODATA static u8 const fishnPosY[24] = {
};
/* 80454538-8045453C 0004+00 s=1 e=0 z=0 None .sdata2 @3902 */
SECTION_SDATA2 static u32 lit_3902 = 0x3F547AE1;
SECTION_SDATA2 static f32 lit_3902 = 83.0f / 100.0f;
/* 8045453C-80454540 0004+00 s=3 e=0 z=0 None .sdata2 @3903 */
SECTION_SDATA2 static u32 lit_3903 = 0x40A00000;
SECTION_SDATA2 static f32 lit_3903 = 5.0f;
/* 80454540-80454544 0004+00 s=1 e=0 z=0 None .sdata2 @3904 */
SECTION_SDATA2 static u32 lit_3904 = 0xC1B1999A;
SECTION_SDATA2 static f32 lit_3904 = -111.0f / 5.0f;
/* 80454544-80454548 0004+00 s=1 e=0 z=0 None .sdata2 @3905 */
SECTION_SDATA2 static u32 lit_3905 = 0xC33D8000;
SECTION_SDATA2 static f32 lit_3905 = -189.5f;
/* 80454548-8045454C 0004+00 s=1 e=0 z=0 None .sdata2 @3906 */
SECTION_SDATA2 static u32 lit_3906 = 0xC07CCCCD;
SECTION_SDATA2 static f32 lit_3906 = -79.0f / 20.0f;
/* 8045454C-80454550 0004+00 s=1 e=0 z=0 None .sdata2 @3907 */
SECTION_SDATA2 static u32 lit_3907 = 0xC33C0000;
SECTION_SDATA2 static f32 lit_3907 = -188.0f;
/* 801FE730-801FE8DC 01AC+00 s=1 e=0 z=0 None .text __ct__23dMeter_drawFishingHIO_cFv */
#pragma push
@@ -573,19 +565,19 @@ asm dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() {
/* ############################################################################################## */
/* 80454550-80454554 0004+00 s=1 e=0 z=0 None .sdata2 @3912 */
SECTION_SDATA2 static u32 lit_3912 = 0x429A0000;
SECTION_SDATA2 static f32 lit_3912 = 77.0f;
/* 80454554-80454558 0004+00 s=1 e=0 z=0 None .sdata2 @3913 */
SECTION_SDATA2 static u32 lit_3913 = 0x422C0000;
SECTION_SDATA2 static f32 lit_3913 = 43.0f;
/* 80454558-8045455C 0004+00 s=1 e=0 z=0 None .sdata2 @3914 */
SECTION_SDATA2 static u32 lit_3914 = 0x42EE0000;
SECTION_SDATA2 static f32 lit_3914 = 119.0f;
/* 8045455C-80454560 0004+00 s=5 e=0 z=0 None .sdata2 @3915 */
SECTION_SDATA2 static u32 lit_3915 = 0x41A00000;
SECTION_SDATA2 static f32 lit_3915 = 20.0f;
/* 80454560-80454564 0004+00 s=1 e=0 z=0 None .sdata2 @3916 */
SECTION_SDATA2 static u32 lit_3916 = 0xC2080000;
SECTION_SDATA2 static f32 lit_3916 = -34.0f;
/* 801FE8DC-801FE954 0078+00 s=1 e=0 z=0 None .text __ct__22dMeter_drawInsectHIO_cFv */
#pragma push
@@ -599,7 +591,7 @@ asm dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c() {
/* ############################################################################################## */
/* 80454564-80454568 0004+00 s=3 e=0 z=0 None .sdata2 @3921 */
SECTION_SDATA2 static u32 lit_3921 = 0x3F400000;
SECTION_SDATA2 static f32 lit_3921 = 0.75f;
/* 801FE954-801FE990 003C+00 s=1 e=0 z=0 None .text __ct__27dMeter_drawCalibrationHIO_cFv */
#pragma push
@@ -613,10 +605,10 @@ asm dMeter_drawCalibrationHIO_c::dMeter_drawCalibrationHIO_c() {
/* ############################################################################################## */
/* 80454568-8045456C 0004+00 s=1 e=0 z=0 None .sdata2 @3956 */
SECTION_SDATA2 static u32 lit_3956 = 0x42A00000;
SECTION_SDATA2 static f32 lit_3956 = 80.0f;
/* 8045456C-80454570 0004+00 s=5 e=0 z=0 None .sdata2 @3957 */
SECTION_SDATA2 static u32 lit_3957 = 0x3F733333;
SECTION_SDATA2 static f32 lit_3957 = 19.0f / 20.0f;
/* 801FE990-801FEAF0 0160+00 s=1 e=0 z=0 None .text __ct__21dMeter_drawSkillHIO_cFv */
#pragma push
@@ -630,49 +622,49 @@ asm dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c() {
/* ############################################################################################## */
/* 80454570-80454574 0004+00 s=5 e=0 z=0 None .sdata2 @4028 */
SECTION_SDATA2 static u32 lit_4028 = 0x40200000;
SECTION_SDATA2 static f32 lit_4028 = 2.5f;
/* 80454574-80454578 0004+00 s=2 e=0 z=0 None .sdata2 @4029 */
SECTION_SDATA2 static u32 lit_4029 = 0x3F45CFFF;
SECTION_SDATA2 static f32 lit_4029 = 0.7727050185203552f;
/* 80454578-8045457C 0004+00 s=3 e=0 z=0 None .sdata2 @4030 */
SECTION_SDATA2 static u32 lit_4030 = 0x40400000;
SECTION_SDATA2 static f32 lit_4030 = 3.0f;
/* 8045457C-80454580 0004+00 s=1 e=0 z=0 None .sdata2 @4031 */
SECTION_SDATA2 static u32 lit_4031 = 0x40000000;
SECTION_SDATA2 static f32 lit_4031 = 2.0f;
/* 80454580-80454584 0004+00 s=1 e=0 z=0 None .sdata2 @4032 */
SECTION_SDATA2 static u32 lit_4032 = 0x3F933333;
SECTION_SDATA2 static f32 lit_4032 = 23.0f / 20.0f;
/* 80454584-80454588 0004+00 s=1 e=0 z=0 None .sdata2 @4033 */
SECTION_SDATA2 static u32 lit_4033 = 0x420C0000;
SECTION_SDATA2 static f32 lit_4033 = 35.0f;
/* 80454588-8045458C 0004+00 s=2 e=0 z=0 None .sdata2 @4034 */
SECTION_SDATA2 static u32 lit_4034 = 0x432F0000;
SECTION_SDATA2 static f32 lit_4034 = 175.0f;
/* 8045458C-80454590 0004+00 s=1 e=0 z=0 None .sdata2 @4035 */
SECTION_SDATA2 static u32 lit_4035 = 0xC3C40000;
SECTION_SDATA2 static f32 lit_4035 = -392.0f;
/* 80454590-80454594 0004+00 s=2 e=0 z=0 None .sdata2 @4036 */
SECTION_SDATA2 static u32 lit_4036 = 0xC1D00000;
SECTION_SDATA2 static f32 lit_4036 = -26.0f;
/* 80454594-80454598 0004+00 s=1 e=0 z=0 None .sdata2 @4037 */
SECTION_SDATA2 static u32 lit_4037 = 0x42860000;
SECTION_SDATA2 static f32 lit_4037 = 67.0f;
/* 80454598-8045459C 0004+00 s=3 e=0 z=0 None .sdata2 @4038 */
SECTION_SDATA2 static u32 lit_4038 = 0x41400000;
SECTION_SDATA2 static f32 lit_4038 = 12.0f;
/* 8045459C-804545A0 0004+00 s=3 e=0 z=0 None .sdata2 @4039 */
SECTION_SDATA2 static u32 lit_4039 = 0x41880000;
SECTION_SDATA2 static f32 lit_4039 = 17.0f;
/* 804545A0-804545A4 0004+00 s=1 e=0 z=0 None .sdata2 @4040 */
SECTION_SDATA2 static u32 lit_4040 = 0xC1880000;
SECTION_SDATA2 static f32 lit_4040 = -17.0f;
/* 804545A4-804545A8 0004+00 s=2 e=0 z=0 None .sdata2 @4041 */
SECTION_SDATA2 static u32 lit_4041 = 0xC0C00000;
SECTION_SDATA2 static f32 lit_4041 = -6.0f;
/* 804545A8-804545AC 0004+00 s=3 e=0 z=0 None .sdata2 @4042 */
SECTION_SDATA2 static u32 lit_4042 = 0xC1000000;
SECTION_SDATA2 static f32 lit_4042 = -8.0f;
/* 801FEAF0-801FEFF0 0500+00 s=1 e=0 z=0 None .text __ct__25dMeter_drawEmpButtonHIO_cFv */
#pragma push
@@ -686,73 +678,73 @@ asm dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() {
/* ############################################################################################## */
/* 804545AC-804545B0 0004+00 s=4 e=0 z=0 None .sdata2 @4071 */
SECTION_SDATA2 static u32 lit_4071 = 0x3F99999A;
SECTION_SDATA2 static f32 lit_4071 = 6.0f / 5.0f;
/* 804545B0-804545B4 0004+00 s=1 e=0 z=0 None .sdata2 @4072 */
SECTION_SDATA2 static u32 lit_4072 = 0x434F0000;
SECTION_SDATA2 static f32 lit_4072 = 207.0f;
/* 804545B4-804545B8 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */
SECTION_SDATA2 static u32 lit_4073 = 0xC22C0000;
SECTION_SDATA2 static f32 lit_4073 = -43.0f;
/* 804545B8-804545BC 0004+00 s=5 e=0 z=0 None .sdata2 @4074 */
SECTION_SDATA2 static u32 lit_4074 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4074 = 0.5f;
/* 804545BC-804545C0 0004+00 s=1 e=0 z=0 None .sdata2 @4075 */
SECTION_SDATA2 static u32 lit_4075 = 0x439E8000;
SECTION_SDATA2 static f32 lit_4075 = 317.0f;
/* 804545C0-804545C4 0004+00 s=5 e=0 z=0 None .sdata2 @4076 */
SECTION_SDATA2 static u32 lit_4076 = 0x3F333333;
SECTION_SDATA2 static f32 lit_4076 = 7.0f / 10.0f;
/* 804545C4-804545C8 0004+00 s=1 e=0 z=0 None .sdata2 @4077 */
SECTION_SDATA2 static u32 lit_4077 = 0xC3898000;
SECTION_SDATA2 static f32 lit_4077 = -275.0f;
/* 804545C8-804545CC 0004+00 s=2 e=0 z=0 None .sdata2 @4078 */
SECTION_SDATA2 static u32 lit_4078 = 0x42980000;
SECTION_SDATA2 static f32 lit_4078 = 76.0f;
/* 804545CC-804545D0 0004+00 s=2 e=0 z=0 None .sdata2 @4079 */
SECTION_SDATA2 static u32 lit_4079 = 0xC1B00000;
SECTION_SDATA2 static f32 lit_4079 = -22.0f;
/* 804545D0-804545D4 0004+00 s=2 e=0 z=0 None .sdata2 @4080 */
SECTION_SDATA2 static u32 lit_4080 = 0xC1F00000;
SECTION_SDATA2 static f32 lit_4080 = -30.0f;
/* 804545D4-804545D8 0004+00 s=4 e=0 z=0 None .sdata2 @4081 */
SECTION_SDATA2 static u32 lit_4081 = 0x3FB33333;
SECTION_SDATA2 static f32 lit_4081 = 7.0f / 5.0f;
/* 804545D8-804545DC 0004+00 s=1 e=0 z=0 None .sdata2 @4082 */
SECTION_SDATA2 static u32 lit_4082 = 0x43460000;
SECTION_SDATA2 static f32 lit_4082 = 198.0f;
/* 804545DC-804545E0 0004+00 s=2 e=0 z=0 None .sdata2 @4083 */
SECTION_SDATA2 static u32 lit_4083 = 0x43200000;
SECTION_SDATA2 static f32 lit_4083 = 160.0f;
/* 804545E0-804545E4 0004+00 s=2 e=0 z=0 None .sdata2 @4084 */
SECTION_SDATA2 static u32 lit_4084 = 0x41E00000;
SECTION_SDATA2 static f32 lit_4084 = 28.0f;
/* 804545E4-804545E8 0004+00 s=3 e=0 z=0 None .sdata2 @4085 */
SECTION_SDATA2 static u32 lit_4085 = 0xC1900000;
SECTION_SDATA2 static f32 lit_4085 = -18.0f;
/* 804545E8-804545EC 0004+00 s=1 e=0 z=0 None .sdata2 @4086 */
SECTION_SDATA2 static u32 lit_4086 = 0x41B80000;
SECTION_SDATA2 static f32 lit_4086 = 23.0f;
/* 804545EC-804545F0 0004+00 s=1 e=0 z=0 None .sdata2 @4087 */
SECTION_SDATA2 static u32 lit_4087 = 0xC1800000;
SECTION_SDATA2 static f32 lit_4087 = -16.0f;
/* 804545F0-804545F4 0004+00 s=1 e=0 z=0 None .sdata2 @4088 */
SECTION_SDATA2 static u32 lit_4088 = 0x43858000;
SECTION_SDATA2 static f32 lit_4088 = 267.0f;
/* 804545F4-804545F8 0004+00 s=1 e=0 z=0 None .sdata2 @4089 */
SECTION_SDATA2 static u32 lit_4089 = 0x43900000;
SECTION_SDATA2 static f32 lit_4089 = 288.0f;
/* 804545F8-804545FC 0004+00 s=1 e=0 z=0 None .sdata2 @4090 */
SECTION_SDATA2 static u32 lit_4090 = 0xC1E80000;
SECTION_SDATA2 static f32 lit_4090 = -29.0f;
/* 804545FC-80454600 0004+00 s=1 e=0 z=0 None .sdata2 @4091 */
SECTION_SDATA2 static u32 lit_4091 = 0x42480000;
SECTION_SDATA2 static f32 lit_4091 = 50.0f;
/* 80454600-80454604 0004+00 s=1 e=0 z=0 None .sdata2 @4092 */
SECTION_SDATA2 static u32 lit_4092 = 0x3FE66666;
SECTION_SDATA2 static f32 lit_4092 = 9.0f / 5.0f;
/* 80454604-80454608 0004+00 s=3 e=0 z=0 None .sdata2 @4093 */
SECTION_SDATA2 static u32 lit_4093 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_4093 = 3.0f / 5.0f;
/* 801FEFF0-801FF31C 032C+00 s=1 e=0 z=0 None .text __ct__24dMeter_drawMiniGameHIO_cFv */
#pragma push
@@ -766,25 +758,25 @@ asm dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() {
/* ############################################################################################## */
/* 80454608-8045460C 0004+00 s=1 e=0 z=0 None .sdata2 @4126 */
SECTION_SDATA2 static u32 lit_4126 = 0x3F428F5C;
SECTION_SDATA2 static f32 lit_4126 = 19.0f / 25.0f;
/* 8045460C-80454610 0004+00 s=1 e=0 z=0 None .sdata2 @4127 */
SECTION_SDATA2 static u32 lit_4127 = 0x41300000;
SECTION_SDATA2 static f32 lit_4127 = 11.0f;
/* 80454610-80454614 0004+00 s=3 e=0 z=0 None .sdata2 @4128 */
SECTION_SDATA2 static u32 lit_4128 = 0x40D33333;
SECTION_SDATA2 static f32 lit_4128 = 33.0f / 5.0f;
/* 80454614-80454618 0004+00 s=1 e=0 z=0 None .sdata2 @4129 */
SECTION_SDATA2 static u32 lit_4129 = 0xC20C0000;
SECTION_SDATA2 static f32 lit_4129 = -35.0f;
/* 80454618-8045461C 0004+00 s=3 e=0 z=0 None .sdata2 @4130 */
SECTION_SDATA2 static u32 lit_4130 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_4130 = 1.0f / 5.0f;
/* 8045461C-80454620 0004+00 s=1 e=0 z=0 None .sdata2 @4131 */
SECTION_SDATA2 static u32 lit_4131 = 0x41980000;
SECTION_SDATA2 static f32 lit_4131 = 19.0f;
/* 80454620-80454624 0004+00 s=1 e=0 z=0 None .sdata2 @4132 */
SECTION_SDATA2 static u32 lit_4132 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4132 = 1.0f / 10.0f;
/* 801FF31C-801FF5B8 029C+00 s=1 e=0 z=0 None .text __ct__25dMeter_drawLightDropHIO_cFv */
#pragma push
@@ -798,106 +790,106 @@ asm dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() {
/* ############################################################################################## */
/* 80454624-80454628 0004+00 s=1 e=0 z=0 None .sdata2 @4257 */
SECTION_SDATA2 static u32 lit_4257 = 0x42200000;
SECTION_SDATA2 static f32 lit_4257 = 40.0f;
/* 80454628-8045462C 0004+00 s=1 e=0 z=0 None .sdata2 @4258 */
SECTION_SDATA2 static u32 lit_4258 = 0xC0B33333;
SECTION_SDATA2 static f32 lit_4258 = -28.0f / 5.0f;
/* 8045462C-80454630 0004+00 s=1 e=0 z=0 None .sdata2 @4259 */
SECTION_SDATA2 static u32 lit_4259 = 0xC1700000;
SECTION_SDATA2 static f32 lit_4259 = -15.0f;
/* 80454630-80454634 0004+00 s=3 e=0 z=0 None .sdata2 @4260 */
SECTION_SDATA2 static u32 lit_4260 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_4260 = 2.0f / 5.0f;
/* 80454634-80454638 0004+00 s=2 e=0 z=0 None .sdata2 @4261 */
SECTION_SDATA2 static u32 lit_4261 = 0x41900000;
SECTION_SDATA2 static f32 lit_4261 = 18.0f;
/* 80454638-8045463C 0004+00 s=2 e=0 z=0 None .sdata2 @4262 */
SECTION_SDATA2 static u32 lit_4262 = 0x3F0CCCCD;
SECTION_SDATA2 static f32 lit_4262 = 11.0f / 20.0f;
/* 8045463C-80454640 0004+00 s=1 e=0 z=0 None .sdata2 @4263 */
SECTION_SDATA2 static u32 lit_4263 = 0xC2280000;
SECTION_SDATA2 static f32 lit_4263 = -42.0f;
/* 80454640-80454644 0004+00 s=2 e=0 z=0 None .sdata2 @4264 */
SECTION_SDATA2 static u32 lit_4264 = 0x41000000;
SECTION_SDATA2 static f32 lit_4264 = 8.0f;
/* 80454644-80454648 0004+00 s=2 e=0 z=0 None .sdata2 @4265 */
SECTION_SDATA2 static u32 lit_4265 = 0x3F6B851F;
SECTION_SDATA2 static f32 lit_4265 = 23.0f / 25.0f;
/* 80454648-8045464C 0004+00 s=1 e=0 z=0 None .sdata2 @4266 */
SECTION_SDATA2 static u32 lit_4266 = 0xC27C0000;
SECTION_SDATA2 static f32 lit_4266 = -63.0f;
/* 8045464C-80454650 0004+00 s=1 e=0 z=0 None .sdata2 @4267 */
SECTION_SDATA2 static u32 lit_4267 = 0xC2440000;
SECTION_SDATA2 static f32 lit_4267 = -49.0f;
/* 80454650-80454654 0004+00 s=1 e=0 z=0 None .sdata2 @4268 */
SECTION_SDATA2 static u32 lit_4268 = 0xC2780000;
SECTION_SDATA2 static f32 lit_4268 = -62.0f;
/* 80454654-80454658 0004+00 s=1 e=0 z=0 None .sdata2 @4269 */
SECTION_SDATA2 static u32 lit_4269 = 0xC2400000;
SECTION_SDATA2 static f32 lit_4269 = -48.0f;
/* 80454658-8045465C 0004+00 s=1 e=0 z=0 None .sdata2 @4270 */
SECTION_SDATA2 static u32 lit_4270 = 0xC00CCCCD;
SECTION_SDATA2 static f32 lit_4270 = -11.0f / 5.0f;
/* 8045465C-80454660 0004+00 s=2 e=0 z=0 None .sdata2 @4271 */
SECTION_SDATA2 static u32 lit_4271 = 0xBFA66666;
SECTION_SDATA2 static f32 lit_4271 = -13.0f / 10.0f;
/* 80454660-80454664 0004+00 s=1 e=0 z=0 None .sdata2 @4272 */
SECTION_SDATA2 static u32 lit_4272 = 0xC1133333;
SECTION_SDATA2 static f32 lit_4272 = -46.0f / 5.0f;
/* 80454664-80454668 0004+00 s=1 e=0 z=0 None .sdata2 @4273 */
SECTION_SDATA2 static u32 lit_4273 = 0xC2820000;
SECTION_SDATA2 static f32 lit_4273 = -65.0f;
/* 80454668-8045466C 0004+00 s=1 e=0 z=0 None .sdata2 @4274 */
SECTION_SDATA2 static u32 lit_4274 = 0x40133333;
SECTION_SDATA2 static f32 lit_4274 = 23.0f / 10.0f;
/* 8045466C-80454670 0004+00 s=1 e=0 z=0 None .sdata2 @4275 */
SECTION_SDATA2 static u32 lit_4275 = 0x41B00000;
SECTION_SDATA2 static f32 lit_4275 = 22.0f;
/* 80454670-80454674 0004+00 s=1 e=0 z=0 None .sdata2 @4276 */
SECTION_SDATA2 static u32 lit_4276 = 0x40066666;
SECTION_SDATA2 static f32 lit_4276 = 21.0f / 10.0f;
/* 80454674-80454678 0004+00 s=2 e=0 z=0 None .sdata2 @4277 */
SECTION_SDATA2 static u32 lit_4277 = 0xC1600000;
SECTION_SDATA2 static f32 lit_4277 = -14.0f;
/* 80454678-8045467C 0004+00 s=1 e=0 z=0 None .sdata2 @4278 */
SECTION_SDATA2 static u32 lit_4278 = 0xC1500000;
SECTION_SDATA2 static f32 lit_4278 = -13.0f;
/* 8045467C-80454680 0004+00 s=2 e=0 z=0 None .sdata2 @4279 */
SECTION_SDATA2 static u32 lit_4279 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4279 = -1.0f;
/* 80454680-80454684 0004+00 s=1 e=0 z=0 None .sdata2 @4280 */
SECTION_SDATA2 static u32 lit_4280 = 0x41600000;
SECTION_SDATA2 static f32 lit_4280 = 14.0f;
/* 80454684-80454688 0004+00 s=2 e=0 z=0 None .sdata2 @4281 */
SECTION_SDATA2 static u32 lit_4281 = 0x40C00000;
SECTION_SDATA2 static f32 lit_4281 = 6.0f;
/* 80454688-8045468C 0004+00 s=1 e=0 z=0 None .sdata2 @4282 */
SECTION_SDATA2 static u32 lit_4282 = 0xC0966666;
SECTION_SDATA2 static f32 lit_4282 = -47.0f / 10.0f;
/* 8045468C-80454690 0004+00 s=2 e=0 z=0 None .sdata2 @4283 */
SECTION_SDATA2 static u32 lit_4283 = 0x41133333;
SECTION_SDATA2 static f32 lit_4283 = 46.0f / 5.0f;
/* 80454690-80454694 0004+00 s=1 e=0 z=0 None .sdata2 @4284 */
SECTION_SDATA2 static u32 lit_4284 = 0xC0800000;
SECTION_SDATA2 static f32 lit_4284 = -4.0f;
/* 80454694-80454698 0004+00 s=2 e=0 z=0 None .sdata2 @4285 */
SECTION_SDATA2 static u32 lit_4285 = 0x400CCCCD;
SECTION_SDATA2 static f32 lit_4285 = 11.0f / 5.0f;
/* 80454698-8045469C 0004+00 s=2 e=0 z=0 None .sdata2 @4286 */
SECTION_SDATA2 static u32 lit_4286 = 0x3F59999A;
SECTION_SDATA2 static f32 lit_4286 = 17.0f / 20.0f;
/* 8045469C-804546A0 0004+00 s=1 e=0 z=0 None .sdata2 @4287 */
SECTION_SDATA2 static u32 lit_4287 = 0x43480000;
SECTION_SDATA2 static f32 lit_4287 = 200.0f;
/* 804546A0-804546A4 0004+00 s=1 e=0 z=0 None .sdata2 @4288 */
SECTION_SDATA2 static u32 lit_4288 = 0x43160000;
SECTION_SDATA2 static f32 lit_4288 = 150.0f;
/* 804546A4-804546A8 0004+00 s=1 e=0 z=0 None .sdata2 @4289 */
SECTION_SDATA2 static u32 lit_4289 = 0x43500000;
SECTION_SDATA2 static f32 lit_4289 = 208.0f;
/* 804546A8-804546AC 0004+00 s=1 e=0 z=0 None .sdata2 @4290 */
SECTION_SDATA2 static u32 lit_4290 = 0xC2C80000;
SECTION_SDATA2 static f32 lit_4290 = -100.0f;
/* 801FF5B8-802001AC 0BF4+00 s=1 e=0 z=0 None .text __ct__16dMeter_drawHIO_cFv */
#pragma push
@@ -911,46 +903,46 @@ asm dMeter_drawHIO_c::dMeter_drawHIO_c() {
/* ############################################################################################## */
/* 804546AC-804546B0 0004+00 s=1 e=0 z=0 None .sdata2 @4334 */
SECTION_SDATA2 static u32 lit_4334 = 0x42FA0000;
SECTION_SDATA2 static f32 lit_4334 = 125.0f;
/* 804546B0-804546B4 0004+00 s=1 e=0 z=0 None .sdata2 @4335 */
SECTION_SDATA2 static u32 lit_4335 = 0x432D0000;
SECTION_SDATA2 static f32 lit_4335 = 173.0f;
/* 804546B4-804546B8 0004+00 s=1 e=0 z=0 None .sdata2 @4336 */
SECTION_SDATA2 static u32 lit_4336 = 0x3EB33333;
SECTION_SDATA2 static f32 lit_4336 = 7.0f / 20.0f;
/* 804546B8-804546BC 0004+00 s=1 e=0 z=0 None .sdata2 @4337 */
SECTION_SDATA2 static u32 lit_4337 = 0xC26C0000;
SECTION_SDATA2 static f32 lit_4337 = -59.0f;
/* 804546BC-804546C0 0004+00 s=1 e=0 z=0 None .sdata2 @4338 */
SECTION_SDATA2 static u32 lit_4338 = 0xC2800000;
SECTION_SDATA2 static f32 lit_4338 = -64.0f;
/* 804546C0-804546C4 0004+00 s=1 e=0 z=0 None .sdata2 @4339 */
SECTION_SDATA2 static u32 lit_4339 = 0x42B40000;
SECTION_SDATA2 static f32 lit_4339 = 90.0f;
/* 804546C4-804546C8 0004+00 s=1 e=0 z=0 None .sdata2 @4340 */
SECTION_SDATA2 static u32 lit_4340 = 0xC2F80000;
SECTION_SDATA2 static f32 lit_4340 = -124.0f;
/* 804546C8-804546CC 0004+00 s=1 e=0 z=0 None .sdata2 @4341 */
SECTION_SDATA2 static u32 lit_4341 = 0x42EC0000;
SECTION_SDATA2 static f32 lit_4341 = 118.0f;
/* 804546CC-804546D0 0004+00 s=1 e=0 z=0 None .sdata2 @4342 */
SECTION_SDATA2 static u32 lit_4342 = 0xC2FE0000;
SECTION_SDATA2 static f32 lit_4342 = -127.0f;
/* 804546D0-804546D4 0004+00 s=1 e=0 z=0 None .sdata2 @4343 */
SECTION_SDATA2 static u32 lit_4343 = 0x42380000;
SECTION_SDATA2 static f32 lit_4343 = 46.0f;
/* 804546D4-804546D8 0004+00 s=1 e=0 z=0 None .sdata2 @4344 */
SECTION_SDATA2 static u32 lit_4344 = 0x41100000;
SECTION_SDATA2 static f32 lit_4344 = 9.0f;
/* 804546D8-804546DC 0004+00 s=1 e=0 z=0 None .sdata2 @4345 */
SECTION_SDATA2 static u32 lit_4345 = 0xC2700000;
SECTION_SDATA2 static f32 lit_4345 = -60.0f;
/* 804546DC-804546E0 0004+00 s=1 e=0 z=0 None .sdata2 @4346 */
SECTION_SDATA2 static u32 lit_4346 = 0xC2680000;
SECTION_SDATA2 static f32 lit_4346 = -58.0f;
/* 804546E0-804546E4 0004+00 s=1 e=0 z=0 None .sdata2 @4347 */
SECTION_SDATA2 static u32 lit_4347 = 0x42F00000;
SECTION_SDATA2 static f32 lit_4347 = 120.0f;
/* 802001AC-802004B4 0308+00 s=1 e=0 z=0 None .text __ct__16dMeter_ringHIO_cFv */
#pragma push
@@ -964,16 +956,16 @@ asm dMeter_ringHIO_c::dMeter_ringHIO_c() {
/* ############################################################################################## */
/* 804546E4-804546E8 0004+00 s=1 e=0 z=0 None .sdata2 @4357 */
SECTION_SDATA2 static u32 lit_4357 = 0x3F266666;
SECTION_SDATA2 static f32 lit_4357 = 13.0f / 20.0f;
/* 804546E8-804546EC 0004+00 s=1 e=0 z=0 None .sdata2 @4358 */
SECTION_SDATA2 static u32 lit_4358 = 0x3FA3D70A;
SECTION_SDATA2 static f32 lit_4358 = 32.0f / 25.0f;
/* 804546EC-804546F0 0004+00 s=1 e=0 z=0 None .sdata2 @4359 */
SECTION_SDATA2 static u32 lit_4359 = 0x3FCCCCCD;
SECTION_SDATA2 static f32 lit_4359 = 8.0f / 5.0f;
/* 804546F0-804546F4 0004+00 s=1 e=0 z=0 None .sdata2 @4360 */
SECTION_SDATA2 static u32 lit_4360 = 0x3E800000;
SECTION_SDATA2 static f32 lit_4360 = 0.25f;
/* 802004B4-802006C8 0214+00 s=1 e=0 z=0 None .text __ct__19dMeter_mapIconHIO_cFv */
#pragma push
@@ -987,49 +979,49 @@ asm dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() {
/* ############################################################################################## */
/* 804546F4-804546F8 0004+00 s=1 e=0 z=0 None .sdata2 @4416 */
SECTION_SDATA2 static u32 lit_4416 = 0x47435000;
SECTION_SDATA2 static f32 lit_4416 = 50000.0f;
/* 804546F8-804546FC 0004+00 s=1 e=0 z=0 None .sdata2 @4417 */
SECTION_SDATA2 static u32 lit_4417 = 0x461C4000;
SECTION_SDATA2 static f32 lit_4417 = 10000.0f;
/* 804546FC-80454700 0004+00 s=1 e=0 z=0 None .sdata2 @4418 */
SECTION_SDATA2 static u32 lit_4418 = 0xC8927C00;
SECTION_SDATA2 static f32 lit_4418 = -300000.0f;
/* 80454700-80454704 0004+00 s=1 e=0 z=0 None .sdata2 @4419 */
SECTION_SDATA2 static u32 lit_4419 = 0x48927C00;
SECTION_SDATA2 static f32 lit_4419 = 300000.0f;
/* 80454704-80454708 0004+00 s=1 e=0 z=0 None .sdata2 @4420 */
SECTION_SDATA2 static u32 lit_4420 = 0x430E0000;
SECTION_SDATA2 static f32 lit_4420 = 142.0f;
/* 80454708-8045470C 0004+00 s=1 e=0 z=0 None .sdata2 @4421 */
SECTION_SDATA2 static u32 lit_4421 = 0x42740000;
SECTION_SDATA2 static f32 lit_4421 = 61.0f;
/* 8045470C-80454710 0004+00 s=1 e=0 z=0 None .sdata2 @4422 */
SECTION_SDATA2 static u32 lit_4422 = 0x43A48000;
SECTION_SDATA2 static f32 lit_4422 = 329.0f;
/* 80454710-80454714 0004+00 s=1 e=0 z=0 None .sdata2 @4423 */
SECTION_SDATA2 static u32 lit_4423 = 0x41200000;
SECTION_SDATA2 static f32 lit_4423 = 10.0f;
/* 80454714-80454718 0004+00 s=1 e=0 z=0 None .sdata2 @4424 */
SECTION_SDATA2 static u32 lit_4424 = 0x40E00000;
SECTION_SDATA2 static f32 lit_4424 = 7.0f;
/* 80454718-8045471C 0004+00 s=1 e=0 z=0 None .sdata2 @4425 */
SECTION_SDATA2 static u32 lit_4425 = 0x3F5D6FFC;
SECTION_SDATA2 static f32 lit_4425 = 0.8649899959564209f;
/* 8045471C-80454720 0004+00 s=1 e=0 z=0 None .sdata2 @4426 */
SECTION_SDATA2 static u32 lit_4426 = 0x40900000;
SECTION_SDATA2 static f32 lit_4426 = 4.5f;
/* 80454720-80454724 0004+00 s=1 e=0 z=0 None .sdata2 @4427 */
SECTION_SDATA2 static u32 lit_4427 = 0xBF000000;
SECTION_SDATA2 static f32 lit_4427 = -0.5f;
/* 80454724-80454728 0004+00 s=2 e=0 z=0 None .sdata2 @4428 */
SECTION_SDATA2 static u32 lit_4428 = 0x3F866666;
SECTION_SDATA2 static f32 lit_4428 = 21.0f / 20.0f;
/* 80454728-8045472C 0004+00 s=1 e=0 z=0 None .sdata2 @4429 */
SECTION_SDATA2 static u32 lit_4429 = 0xC0F00000;
SECTION_SDATA2 static f32 lit_4429 = -7.5f;
/* 8045472C-80454730 0004+00 s=1 e=0 z=0 None .sdata2 @4430 */
SECTION_SDATA2 static u32 lit_4430 = 0xC0E00000;
SECTION_SDATA2 static f32 lit_4430 = -7.0f;
/* 802006C8-80200BCC 0504+00 s=1 e=0 z=0 None .text __ct__16dMeter_fmapHIO_cFv */
#pragma push
@@ -1053,16 +1045,16 @@ asm dMeter_fmapHIO_c::~dMeter_fmapHIO_c() {
/* ############################################################################################## */
/* 80454730-80454734 0004+00 s=1 e=0 z=0 None .sdata2 @4485 */
SECTION_SDATA2 static u32 lit_4485 = 0x41500000;
SECTION_SDATA2 static f32 lit_4485 = 13.0f;
/* 80454734-80454738 0004+00 s=1 e=0 z=0 None .sdata2 @4486 */
SECTION_SDATA2 static u32 lit_4486 = 0xC2CC0000;
SECTION_SDATA2 static f32 lit_4486 = -102.0f;
/* 80454738-8045473C 0004+00 s=1 e=0 z=0 None .sdata2 @4487 */
SECTION_SDATA2 static u32 lit_4487 = 0x42C80000;
SECTION_SDATA2 static f32 lit_4487 = 100.0f;
/* 8045473C-80454740 0004+00 s=1 e=0 z=0 None .sdata2 @4488 */
SECTION_SDATA2 static u32 lit_4488 = 0x43110000;
SECTION_SDATA2 static f32 lit_4488 = 145.0f;
/* 80454740-80454748 0004+04 s=1 e=0 z=0 None .sdata2 @4489 */
SECTION_SDATA2 static f32 lit_4489[1 + 1 /* padding */] = {
src/d/meter/d_meter_button.cpp
+32 -43
View File
@@ -24,6 +24,10 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
@@ -31,10 +35,6 @@ struct J2DTextBox {
struct JUTFont {};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct dMsgObject_c {
/* 802370A8 */ void isGetItemMessage();
/* 802370BC */ void isKanbanMessage();
@@ -54,8 +54,6 @@ struct J2DPane {
/* 802F7100 */ void getBounds();
};
struct JKRExpHeap {};
struct J2DGrafContext {};
struct JKRArchive {};
@@ -66,6 +64,8 @@ struct J2DScreen {
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
};
struct JKRExpHeap {};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80253930 */ CPaneMgr();
@@ -181,10 +181,6 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -192,6 +188,10 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
@@ -220,8 +220,6 @@ struct JKRHeap {
// Forward References:
//
extern "C" extern char const* const d_meter_d_meter_button__stringBase0;
extern "C" void __ct__14dMeterButton_cFv();
extern "C" void __dt__14dMeterButton_cFv();
extern "C" void _create__14dMeterButton_cFv();
@@ -326,13 +324,6 @@ void dPaneClass_showNullPane(J2DScreen*);
void cLib_addCalc2(f32*, f32, f32, f32);
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_MsgObject_HIO_c[1040];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_getCurrentHeap__Fv();
extern "C" void mDoExt_getMesgFont__Fv();
@@ -516,13 +507,13 @@ SECTION_SDATA2 static u8 lit_4146[4] = {
};
/* 8045474C-80454750 0004+00 s=30 e=0 z=0 None .sdata2 @4147 */
SECTION_SDATA2 static u32 lit_4147 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4147 = 1.0f;
/* 80454750-80454754 0004+00 s=2 e=0 z=0 None .sdata2 @4148 */
SECTION_SDATA2 static u32 lit_4148 = 0x41200000;
SECTION_SDATA2 static f32 lit_4148 = 10.0f;
/* 80454754-80454758 0004+00 s=1 e=0 z=0 None .sdata2 @4149 */
SECTION_SDATA2 static u32 lit_4149 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4149 = 1.0f / 10.0f;
/* 80201404-80202240 0E3C+00 s=0 e=1 z=0 None .text
* _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb */
@@ -542,10 +533,10 @@ asm void dMeterButton_c::_execute(u32 param_0, bool param_1, bool param_2, bool
/* ############################################################################################## */
/* 80454758-8045475C 0004+00 s=23 e=0 z=0 None .sdata2 @4513 */
SECTION_SDATA2 static u32 lit_4513 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4513 = -1.0f;
/* 8045475C-80454760 0004+00 s=2 e=0 z=0 None .sdata2 @4514 */
SECTION_SDATA2 static u32 lit_4514 = 0x41900000;
SECTION_SDATA2 static f32 lit_4514 = 18.0f;
/* 80454760-80454768 0004+04 s=1 e=0 z=0 None .sdata2 @4515 */
SECTION_SDATA2 static f32 lit_4515[1 + 1 /* padding */] = {
@@ -555,9 +546,7 @@ SECTION_SDATA2 static f32 lit_4515[1 + 1 /* padding */] = {
};
/* 80454768-80454770 0008+00 s=3 e=0 z=0 None .sdata2 @4517 */
SECTION_SDATA2 static u8 lit_4517[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4517 = 4503601774854144.0 /* cast s32 to float */;
/* 80202240-80202A9C 085C+00 s=1 e=0 z=0 None .text draw__14dMeterButton_cFv */
#pragma push
@@ -847,31 +836,31 @@ SECTION_DEAD static char const* const pad_80398154 = "\0\0\0";
#pragma pop
/* 80454770-80454774 0004+00 s=4 e=0 z=0 None .sdata2 @5628 */
SECTION_SDATA2 static u32 lit_5628 = 0x3F000000;
SECTION_SDATA2 static f32 lit_5628 = 0.5f;
/* 80454774-80454778 0004+00 s=2 e=0 z=0 None .sdata2 @5629 */
SECTION_SDATA2 static u32 lit_5629 = 0x43980000;
SECTION_SDATA2 static f32 lit_5629 = 304.0f;
/* 80454778-8045477C 0004+00 s=1 e=0 z=0 None .sdata2 @5630 */
SECTION_SDATA2 static u32 lit_5630 = 0x41000000;
SECTION_SDATA2 static f32 lit_5630 = 8.0f;
/* 8045477C-80454780 0004+00 s=1 e=0 z=0 None .sdata2 @5631 */
SECTION_SDATA2 static u32 lit_5631 = 0x4399A000;
SECTION_SDATA2 static f32 lit_5631 = 307.25f;
/* 80454780-80454784 0004+00 s=1 e=0 z=0 None .sdata2 @5632 */
SECTION_SDATA2 static u32 lit_5632 = 0x4399E000;
SECTION_SDATA2 static f32 lit_5632 = 307.75f;
/* 80454784-80454788 0004+00 s=1 e=0 z=0 None .sdata2 @5633 */
SECTION_SDATA2 static u32 lit_5633 = 0x43960000;
SECTION_SDATA2 static f32 lit_5633 = 300.0f;
/* 80454788-8045478C 0004+00 s=1 e=0 z=0 None .sdata2 @5634 */
SECTION_SDATA2 static u32 lit_5634 = 0x43984000;
SECTION_SDATA2 static f32 lit_5634 = 304.5f;
/* 8045478C-80454790 0004+00 s=1 e=0 z=0 None .sdata2 @5635 */
SECTION_SDATA2 static u32 lit_5635 = 0x43ADC000;
SECTION_SDATA2 static f32 lit_5635 = 347.5f;
/* 80454790-80454794 0004+00 s=1 e=0 z=0 None .sdata2 @5636 */
SECTION_SDATA2 static u32 lit_5636 = 0x43B7A000;
SECTION_SDATA2 static f32 lit_5636 = 367.25f;
/* 802047E8-80205834 104C+00 s=1 e=0 z=0 None .text screenInitButton__14dMeterButton_cFv */
#pragma push
@@ -895,22 +884,22 @@ asm void dMeterButton_c::screenInitText() {
/* ############################################################################################## */
/* 80454794-80454798 0004+00 s=1 e=0 z=0 None .sdata2 @6012 */
SECTION_SDATA2 static u32 lit_6012 = 0xC1C80000;
SECTION_SDATA2 static f32 lit_6012 = -25.0f;
/* 80454798-8045479C 0004+00 s=1 e=0 z=0 None .sdata2 @6013 */
SECTION_SDATA2 static u32 lit_6013 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_6013 = 4.0f / 5.0f;
/* 8045479C-804547A0 0004+00 s=1 e=0 z=0 None .sdata2 @6014 */
SECTION_SDATA2 static u32 lit_6014 = 0xC1200000;
SECTION_SDATA2 static f32 lit_6014 = -10.0f;
/* 804547A0-804547A4 0004+00 s=1 e=0 z=0 None .sdata2 @6015 */
SECTION_SDATA2 static u32 lit_6015 = 0x41C80000;
SECTION_SDATA2 static f32 lit_6015 = 25.0f;
/* 804547A4-804547A8 0004+00 s=1 e=0 z=0 None .sdata2 @6016 */
SECTION_SDATA2 static u32 lit_6016 = 0x3F666666;
SECTION_SDATA2 static f32 lit_6016 = 9.0f / 10.0f;
/* 804547A8-804547AC 0004+00 s=2 e=0 z=0 None .sdata2 @6017 */
SECTION_SDATA2 static u32 lit_6017 = 0x40000000;
SECTION_SDATA2 static f32 lit_6017 = 2.0f;
/* 80205CA0-80206978 0CD8+00 s=2 e=0 z=0 None .text updateButton__14dMeterButton_cFv */
#pragma push
@@ -1525,7 +1514,7 @@ asm void dMeterButton_c::getCenterPosCalc(u8 param_0, char* param_1, int param_2
/* ############################################################################################## */
/* 804547AC-804547B0 0004+00 s=1 e=0 z=0 None .sdata2 @7857 */
SECTION_SDATA2 static u32 lit_7857 = 0x41A00000;
SECTION_SDATA2 static f32 lit_7857 = 20.0f;
/* 8020A540-8020A94C 040C+00 s=2 e=0 z=0 None .text trans_button__14dMeterButton_cFif */
#pragma push
src/d/meter/d_meter_haihai.cpp
+18 -26
View File
@@ -17,10 +17,10 @@ struct dMeterSub_c {
struct J2DAnmTransformKey {};
struct J2DAnmColor {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct dMeterHaihai_c {
/* 8020AE8C */ dMeterHaihai_c(u8);
/* 8020AEF0 */ ~dMeterHaihai_c();
@@ -78,8 +78,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_meter_d_meter_haihai__stringBase0;
extern "C" void __ct__14dMeterHaihai_cFUc();
extern "C" void __dt__14dMeterHaihai_cFv();
extern "C" void _create__14dMeterHaihai_cFv();
@@ -107,10 +105,6 @@ extern "C" extern char const* const d_meter_d_meter_haihai__stringBase0;
void dPaneClass_showNullPane(J2DScreen*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" bool isDead__11dMeterSub_cFv();
extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap();
@@ -210,31 +204,31 @@ asm void dMeterHaihai_c::_execute(u32 param_0) {
/* ############################################################################################## */
/* 804547B4-804547B8 0004+00 s=2 e=0 z=0 None .sdata2 @3890 */
SECTION_SDATA2 static u32 lit_3890 = 0x40266666;
SECTION_SDATA2 static f32 lit_3890 = 13.0f / 5.0f;
/* 804547B8-804547BC 0004+00 s=2 e=0 z=0 None .sdata2 @3891 */
SECTION_SDATA2 static u32 lit_3891 = 0x421C0000;
SECTION_SDATA2 static f32 lit_3891 = 39.0f;
/* 804547BC-804547C0 0004+00 s=2 e=0 z=0 None .sdata2 @3892 */
SECTION_SDATA2 static u32 lit_3892 = 0x42680000;
SECTION_SDATA2 static f32 lit_3892 = 58.0f;
/* 804547C0-804547C4 0004+00 s=2 e=0 z=0 None .sdata2 @3893 */
SECTION_SDATA2 static u32 lit_3893 = 0x43980000;
SECTION_SDATA2 static f32 lit_3893 = 304.0f;
/* 804547C4-804547C8 0004+00 s=2 e=0 z=0 None .sdata2 @3894 */
SECTION_SDATA2 static u32 lit_3894 = 0x43600000;
SECTION_SDATA2 static f32 lit_3894 = 224.0f;
/* 804547C8-804547CC 0004+00 s=6 e=0 z=0 None .sdata2 @3895 */
SECTION_SDATA2 static u32 lit_3895 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3895 = 0.5f;
/* 804547CC-804547D0 0004+00 s=2 e=0 z=0 None .sdata2 @3896 */
SECTION_SDATA2 static u32 lit_3896 = 0x42B40000;
SECTION_SDATA2 static f32 lit_3896 = 90.0f;
/* 804547D0-804547D4 0004+00 s=2 e=0 z=0 None .sdata2 @3897 */
SECTION_SDATA2 static u32 lit_3897 = 0x43340000;
SECTION_SDATA2 static f32 lit_3897 = 180.0f;
/* 804547D4-804547D8 0004+00 s=2 e=0 z=0 None .sdata2 @3898 */
SECTION_SDATA2 static u32 lit_3898 = 0x43870000;
SECTION_SDATA2 static f32 lit_3898 = 270.0f;
/* 8020B140-8020B518 03D8+00 s=1 e=0 z=0 None .text draw__14dMeterHaihai_cFv */
#pragma push
@@ -248,16 +242,16 @@ asm void dMeterHaihai_c::draw() {
/* ############################################################################################## */
/* 804547D8-804547DC 0004+00 s=2 e=0 z=0 None .sdata2 @3940 */
SECTION_SDATA2 static u32 lit_3940 = 0x40400000;
SECTION_SDATA2 static f32 lit_3940 = 3.0f;
/* 804547DC-804547E0 0004+00 s=2 e=0 z=0 None .sdata2 @3941 */
SECTION_SDATA2 static u32 lit_3941 = 0x40A00000;
SECTION_SDATA2 static f32 lit_3941 = 5.0f;
/* 804547E0-804547E4 0004+00 s=1 e=0 z=0 None .sdata2 @3942 */
SECTION_SDATA2 static u32 lit_3942 = 0x428C0000;
SECTION_SDATA2 static f32 lit_3942 = 70.0f;
/* 804547E4-804547E8 0004+00 s=1 e=0 z=0 None .sdata2 @3943 */
SECTION_SDATA2 static u32 lit_3943 = 0x42480000;
SECTION_SDATA2 static f32 lit_3943 = 50.0f;
/* 8020B518-8020B814 02FC+00 s=0 e=1 z=0 None .text drawHaihai__14dMeterHaihai_cFUc */
#pragma push
@@ -322,10 +316,10 @@ asm void dMeterHaihai_c::drawHaihaiBottom(f32 param_0, f32 param_1) {
/* ############################################################################################## */
/* 804547E8-804547EC 0004+00 s=1 e=0 z=0 None .sdata2 @4116 */
SECTION_SDATA2 static u32 lit_4116 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_4116 = 4.0f / 5.0f;
/* 804547EC-804547F0 0004+00 s=1 e=0 z=0 None .sdata2 @4117 */
SECTION_SDATA2 static u32 lit_4117 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_4117 = 3.0f / 5.0f;
/* 8020BC20-8020BDAC 018C+00 s=1 e=1 z=0 None .text setScale__14dMeterHaihai_cFf */
#pragma push
@@ -372,9 +366,7 @@ asm void dMeterHaihai_c::updateHaihai() {
/* ############################################################################################## */
/* 804547F8-80454800 0008+00 s=3 e=0 z=0 None .sdata2 @4189 */
SECTION_SDATA2 static u8 lit_4189[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4189 = 4503601774854144.0 /* cast s32 to float */;
/* 8020BF00-8020C078 0178+00 s=1 e=0 z=0 None .text
* playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey */
src/d/meter/d_meter_hakusha.cpp
+10 -19
View File
@@ -31,10 +31,6 @@ struct dMeterHakusha_c {
/* 8020D480 */ void getHakushaNum();
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -42,6 +38,10 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor);
@@ -77,8 +77,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_meter_d_meter_hakusha__stringBase0;
extern "C" void __ct__15dMeterHakusha_cFPv();
extern "C" void __dt__15dMeterHakusha_cFv();
extern "C" void _create__15dMeterHakusha_cFv();
@@ -101,11 +99,6 @@ extern "C" extern char const* const d_meter_d_meter_hakusha__stringBase0;
void dPaneClass_showNullPane(J2DScreen*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" void getLayerNo__14dComIfG_play_cFi();
extern "C" bool isDead__11dMeterSub_cFv();
@@ -205,7 +198,7 @@ SECTION_SDATA2 static u8 lit_3793[4] = {
};
/* 80454804-80454808 0004+00 s=2 e=0 z=0 None .sdata2 @3794 */
SECTION_SDATA2 static u32 lit_3794 = 0x41E33333;
SECTION_SDATA2 static f32 lit_3794 = 28.399999618530273f;
/* 8020C400-8020C808 0408+00 s=1 e=0 z=0 None .text _create__15dMeterHakusha_cFv */
#pragma push
@@ -239,7 +232,7 @@ asm void dMeterHakusha_c::draw() {
/* ############################################################################################## */
/* 80454808-8045480C 0004+00 s=3 e=0 z=0 None .sdata2 @3936 */
SECTION_SDATA2 static u32 lit_3936 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3936 = 1.0f;
/* 8020CABC-8020CC58 019C+00 s=1 e=0 z=0 None .text _delete__15dMeterHakusha_cFv */
#pragma push
@@ -263,18 +256,16 @@ asm void dMeterHakusha_c::alphaAnimeHakusha(u32 param_0) {
/* ############################################################################################## */
/* 8045480C-80454810 0004+00 s=1 e=0 z=0 None .sdata2 @4094 */
SECTION_SDATA2 static u32 lit_4094 = 0x41900000;
SECTION_SDATA2 static f32 lit_4094 = 18.0f;
/* 80454810-80454814 0004+00 s=1 e=0 z=0 None .sdata2 @4095 */
SECTION_SDATA2 static u32 lit_4095 = 0x41E00000;
SECTION_SDATA2 static f32 lit_4095 = 28.0f;
/* 80454814-80454818 0004+00 s=1 e=0 z=0 None .sdata2 @4096 */
SECTION_SDATA2 static u32 lit_4096 = 0x41A00000;
SECTION_SDATA2 static f32 lit_4096 = 20.0f;
/* 80454818-80454820 0008+00 s=1 e=0 z=0 None .sdata2 @4098 */
SECTION_SDATA2 static u8 lit_4098[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4098 = 4503601774854144.0 /* cast s32 to float */;
/* 8020CD6C-8020D258 04EC+00 s=1 e=0 z=0 None .text updateHakusha__15dMeterHakusha_cFv */
#pragma push
src/d/meter/d_meter_map.cpp
+5 -18
View File
@@ -98,8 +98,6 @@ struct J2DPicture {
// Forward References:
//
extern "C" extern char const* const d_meter_d_meter_map__stringBase0;
extern "C" void isEnableDispMap__11dMeterMap_cFv();
extern "C" void getMapDispSizeTypeNo__11dMeterMap_cFv();
extern "C" void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv();
@@ -143,13 +141,6 @@ void dMeter2Info_set2DVibration();
void cLib_addCalcAngleS(s16*, s16, s16, s16, s16);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void fopOvlpM_IsDoingReq__Fv();
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
@@ -255,9 +246,7 @@ asm void dMeterMap_c::isEventRunCheck() {
/* ############################################################################################## */
/* 80454828-80454830 0008+00 s=3 e=0 z=0 None .sdata2 @4100 */
SECTION_SDATA2 static u8 lit_4100[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4100 = 4503601774854144.0 /* cast s32 to float */;
/* 8020D72C-8020D75C 0030+00 s=2 e=0 z=0 None .text getMapDispEdgeLeftX_Layout__11dMeterMap_cFv
*/
@@ -280,12 +269,10 @@ SECTION_SDATA2 static u8 lit_4128[4] = {
};
/* 80454834-80454838 0004+00 s=5 e=0 z=0 None .sdata2 @4129 */
SECTION_SDATA2 static u32 lit_4129 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4129 = 1.0f;
/* 80454838-80454840 0008+00 s=1 e=0 z=0 None .sdata2 @4131 */
SECTION_SDATA2 static u8 lit_4131[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4131 = 4503599627370496.0 /* cast u32 to float */;
/* 8020D75C-8020D7E4 0088+00 s=0 e=1 z=0 None .text getMapDispEdgeTop__11dMeterMap_cFv */
#pragma push
@@ -305,7 +292,7 @@ bool dMeterMap_c::getDispPosInside_OffsetX() {
/* ############################################################################################## */
/* 80454840-80454844 0004+00 s=1 e=0 z=0 None .sdata2 @4159 */
SECTION_SDATA2 static u32 lit_4159 = 0xC2100000;
SECTION_SDATA2 static f32 lit_4159 = -36.0f;
/* 8020D7EC-8020D874 0088+00 s=2 e=0 z=0 None .text getDispPosOutSide_OffsetX__11dMeterMap_cFv
*/
@@ -461,7 +448,7 @@ asm void dMeterMap_c::draw() {
/* ############################################################################################## */
/* 80454844-80454848 0004+00 s=3 e=0 z=0 None .sdata2 @4515 */
SECTION_SDATA2 static u32 lit_4515 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4515 = -1.0f;
/* 8020E070-8020E45C 03EC+00 s=2 e=0 z=0 None .text ctrlShowMap__11dMeterMap_cFv */
#pragma push
src/d/meter/d_meter_string.cpp
+10 -19
View File
@@ -88,8 +88,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_meter_d_meter_string__stringBase0;
extern "C" void __ct__14dMeterString_cFi();
extern "C" void __dt__14dMeterString_cFv();
extern "C" void _create__14dMeterString_cFv();
@@ -112,11 +110,6 @@ 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" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void dComIfG_TimerDeleteRequest__Fi();
@@ -201,16 +194,16 @@ 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 */
SECTION_SDATA2 static u32 lit_3758 = 0x43520000;
SECTION_SDATA2 static f32 lit_3758 = 210.0f;
/* 8045484C-80454850 0004+00 s=1 e=0 z=0 None .sdata2 @3759 */
SECTION_SDATA2 static u32 lit_3759 = 0x43CD0000;
SECTION_SDATA2 static f32 lit_3759 = 410.0f;
/* 80454850-80454854 0004+00 s=1 e=0 z=0 None .sdata2 @3760 */
SECTION_SDATA2 static u32 lit_3760 = 0x42000000;
SECTION_SDATA2 static f32 lit_3760 = 32.0f;
/* 80454854-80454858 0004+00 s=1 e=0 z=0 None .sdata2 @3761 */
SECTION_SDATA2 static u32 lit_3761 = 0x43D18000;
SECTION_SDATA2 static f32 lit_3761 = 419.0f;
/* 80454858-8045485C 0004+00 s=3 e=0 z=0 None .sdata2 @3762 */
SECTION_SDATA2 static u8 lit_3762[4] = {
@@ -242,13 +235,13 @@ asm void dMeterString_c::_execute(u32 param_0) {
/* ############################################################################################## */
/* 8045485C-80454860 0004+00 s=1 e=0 z=0 None .sdata2 @3819 */
SECTION_SDATA2 static u32 lit_3819 = 0x42700000;
SECTION_SDATA2 static f32 lit_3819 = 60.0f;
/* 80454860-80454864 0004+00 s=2 e=0 z=0 None .sdata2 @3820 */
SECTION_SDATA2 static u32 lit_3820 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3820 = 1.0f;
/* 80454864-80454868 0004+00 s=2 e=0 z=0 None .sdata2 @3821 */
SECTION_SDATA2 static u32 lit_3821 = 0xBF800000;
SECTION_SDATA2 static f32 lit_3821 = -1.0f;
/* 80454868-80454870 0004+04 s=1 e=0 z=0 None .sdata2 @3822 */
SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = {
@@ -258,9 +251,7 @@ SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = {
};
/* 80454870-80454878 0008+00 s=2 e=0 z=0 None .sdata2 @3824 */
SECTION_SDATA2 static u8 lit_3824[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
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 */
#pragma push
@@ -284,7 +275,7 @@ asm void dMeterString_c::_delete() {
/* ############################################################################################## */
/* 80454878-8045487C 0004+00 s=1 e=0 z=0 None .sdata2 @3866 */
SECTION_SDATA2 static u32 lit_3866 = 0x42200000;
SECTION_SDATA2 static f32 lit_3866 = 40.0f;
/* 8020F5A4-8020F66C 00C8+00 s=2 e=1 z=0 None .text createString__14dMeterString_cFi */
#pragma push
@@ -308,7 +299,7 @@ asm void dMeterString_c::playBckAnimation(f32 param_0) {
/* ############################################################################################## */
/* 8045487C-80454880 0004+00 s=1 e=0 z=0 None .sdata2 @3979 */
SECTION_SDATA2 static u32 lit_3979 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3979 = 0.5f;
/* 8020F6EC-8020FA88 039C+00 s=1 e=0 z=0 None .text drawPikari__14dMeterString_cFv */
#pragma push