From 0d9bfcfd8aca3037ea76b2a6ca024ce84f1cef8b Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 5 Jan 2024 02:54:29 -0800 Subject: [PATCH] d_meter --- include/d/d_meter.h | 470 ++++++++++++++++++++++++- src/d/d_meter.cpp | 723 +++++++++++++++++++++++++++++++++++---- src/f_op/f_op_kankyo.cpp | 3 +- 3 files changed, 1123 insertions(+), 73 deletions(-) diff --git a/include/d/d_meter.h b/include/d/d_meter.h index 631f8d951..6fc3d6b04 100644 --- a/include/d/d_meter.h +++ b/include/d/d_meter.h @@ -13,24 +13,473 @@ class dMeter_HIO_c { public: dMeter_HIO_c(); virtual ~dMeter_HIO_c(); + + /* 0x004 */ u8 field_0x4[0x006 - 0x004]; + /* 0x006 */ short field_0x6; + /* 0x008 */ u8 field_0x8[0x00C - 0x008]; + /* 0x00C */ f32 field_0xc; + /* 0x010 */ f32 field_0x10; + /* 0x014 */ f32 field_0x14; + /* 0x018 */ f32 field_0x18; + /* 0x01C */ f32 field_0x1c; + /* 0x020 */ f32 field_0x20; + /* 0x024 */ f32 field_0x24; + /* 0x028 */ f32 field_0x28; + /* 0x02C */ u8 field_0x2c; + /* 0x02D */ u8 field_0x2d; + /* 0x02E */ short field_0x2e; + /* 0x030 */ short field_0x30; + /* 0x032 */ short field_0x32; + /* 0x034 */ short field_0x34; + /* 0x036 */ short field_0x36; + /* 0x038 */ short field_0x38; + /* 0x03A */ u8 field_0x3A[0x03C - 0x03A]; + /* 0x03C */ f32 field_0x3c; + /* 0x040 */ short field_0x40; + /* 0x042 */ short field_0x42; + /* 0x044 */ short field_0x44; + /* 0x046 */ short field_0x46; + /* 0x048 */ f32 field_0x48; + /* 0x04C */ f32 field_0x4c; + /* 0x050 */ short field_0x50; + /* 0x052 */ short field_0x52; + /* 0x054 */ short field_0x54; + /* 0x056 */ short field_0x56; + /* 0x058 */ f32 field_0x58; + /* 0x05C */ f32 field_0x5c; + /* 0x060 */ u8 field_0x60; + /* 0x061 */ u8 field_0x61; + /* 0x062 */ u8 field_0x62; + /* 0x063 */ u8 field_0x63; + /* 0x064 */ short field_0x64; + /* 0x066 */ short field_0x66; + /* 0x068 */ short field_0x68; + /* 0x06A */ short field_0x6a; + /* 0x06C */ short field_0x6c; + /* 0x06E */ short field_0x6e; + /* 0x070 */ short field_0x70; + /* 0x072 */ short field_0x72; + /* 0x074 */ short field_0x74; + /* 0x076 */ short field_0x76; + /* 0x078 */ short field_0x78; + /* 0x07A */ short field_0x7a; + /* 0x07C */ short field_0x7c; + /* 0x07E */ short field_0x7e; + /* 0x080 */ u8 field_0x80[0x088 - 0x080]; + /* 0x088 */ short field_0x88; + /* 0x08A */ short field_0x8a; + /* 0x08C */ short field_0x8c; + /* 0x08E */ short field_0x8e; + /* 0x090 */ short field_0x90; + /* 0x092 */ short field_0x92; + /* 0x094 */ short field_0x94; + /* 0x096 */ short field_0x96; + /* 0x098 */ short field_0x98; + /* 0x09A */ short field_0x9a; + /* 0x09C */ short field_0x9c; + /* 0x09E */ short field_0x9e; + /* 0x0A0 */ short field_0xa0; + /* 0x0A2 */ short field_0xa2; + /* 0x0A4 */ short field_0xa4; + /* 0x0A6 */ short field_0xa6; + /* 0x0A8 */ short field_0xa8; + /* 0x0AA */ short field_0xaa; + /* 0x0AC */ short field_0xac; + /* 0x0AE */ short field_0xae; + /* 0x0B0 */ short field_0xb0; + /* 0x0B2 */ short field_0xb2; + /* 0x0B4 */ short field_0xb4; + /* 0x0B6 */ short field_0xb6; + /* 0x0B8 */ short field_0xb8; + /* 0x0BA */ short field_0xba; + /* 0x0BC */ short field_0xbc; + /* 0x0BE */ short field_0xbe; + /* 0x0C0 */ short field_0xc0; + /* 0x0C2 */ short field_0xc2; + /* 0x0C4 */ short field_0xc4; + /* 0x0C6 */ short field_0xc6; + /* 0x0C8 */ short field_0xc8; + /* 0x0CA */ short field_0xca; + /* 0x0CC */ short field_0xcc; + /* 0x0CE */ short field_0xce; + /* 0x0D0 */ short field_0xd0; + /* 0x0D2 */ short field_0xd2; + /* 0x0D4 */ short field_0xd4; + /* 0x0D6 */ short field_0xd6; + /* 0x0D8 */ short field_0xd8; + /* 0x0DA */ short field_0xda; + /* 0x0DC */ short field_0xdc; + /* 0x0DE */ short field_0xde; + /* 0x0E0 */ short field_0xe0; + /* 0x0E2 */ short field_0xe2; + /* 0x0E4 */ short field_0xe4; + /* 0x0E6 */ short field_0xe6; + /* 0x0E8 */ short field_0xe8; + /* 0x0EA */ short field_0xea; + /* 0x0EC */ short field_0xec; + /* 0x0EE */ short field_0xee; + /* 0x0F0 */ short field_0xf0; + /* 0x0F2 */ short field_0xf2; + /* 0x0F4 */ short field_0xf4; + /* 0x0F6 */ short field_0xf6; + /* 0x0F8 */ short field_0xf8; + /* 0x0FA */ short field_0xfa; + /* 0x0FC */ short field_0xfc; + /* 0x0FE */ short field_0xfe; + /* 0x100 */ short field_0x100; + /* 0x102 */ short field_0x102; + /* 0x104 */ short field_0x104; + /* 0x106 */ short field_0x106; + /* 0x108 */ short field_0x108; + /* 0x10A */ short field_0x10a; + /* 0x10C */ short field_0x10c; + /* 0x10E */ short field_0x10e; + /* 0x110 */ short field_0x110; + /* 0x112 */ short field_0x112; + /* 0x114 */ short field_0x114; + /* 0x116 */ short field_0x116; + /* 0x118 */ short field_0x118; + /* 0x11A */ short field_0x11a; + /* 0x11C */ short field_0x11c; + /* 0x11E */ short field_0x11e; + /* 0x120 */ u8 field_0x120; + /* 0x121 */ u8 field_0x121; + /* 0x122 */ u8 field_0x122; + /* 0x123 */ u8 field_0x123; + /* 0x124 */ short field_0x124; + /* 0x126 */ short field_0x126; + /* 0x128 */ short field_0x128; + /* 0x12A */ short field_0x12a; + /* 0x12C */ short field_0x12c; + /* 0x12E */ short field_0x12e; + /* 0x130 */ short field_0x130; + /* 0x132 */ short field_0x132; + /* 0x134 */ short field_0x134; + /* 0x136 */ short field_0x136; + /* 0x138 */ short field_0x138; + /* 0x13A */ short field_0x13a; + /* 0x13C */ short field_0x13c; + /* 0x13E */ short field_0x13e; + /* 0x140 */ short field_0x140; + /* 0x142 */ u8 field_0x142; + /* 0x143 */ u8 field_0x143; + /* 0x144 */ u8 field_0x144; + /* 0x145 */ u8 field_0x145; + /* 0x146 */ u8 field_0x146; + /* 0x147 */ u8 field_0x147; + /* 0x148 */ u8 field_0x148; + /* 0x149 */ u8 field_0x149; + /* 0x14A */ u8 field_0x14a; + /* 0x14B */ u8 field_0x14b; + /* 0x14C */ u8 field_0x14c; + /* 0x14D */ u8 field_0x14D[0x14E - 0x14D]; + /* 0x14E */ short field_0x14e; + /* 0x150 */ short field_0x150; + /* 0x152 */ short field_0x152; + /* 0x154 */ short field_0x154; }; class dMeter_menuHIO_c { public: dMeter_menuHIO_c(); virtual ~dMeter_menuHIO_c(); + + /* 0x04 */ u8 field_0x4[0x08 - 0x04]; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ short field_0x28; + /* 0x2A */ short field_0x2a; + /* 0x2C */ short field_0x2c; + /* 0x2E */ short field_0x2e; + /* 0x30 */ short field_0x30; + /* 0x32 */ short field_0x32; + /* 0x34 */ short field_0x34; + /* 0x36 */ short field_0x36; + /* 0x38 */ short field_0x38; + /* 0x3A */ short field_0x3a; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5c; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ u8 field_0x6c; + /* 0x6D */ u8 field_0x6d; + /* 0x6E */ u8 field_0x6e; + /* 0x6F */ u8 field_0x6f; + /* 0x70 */ u8 field_0x70; + /* 0x71 */ u8 field_0x71; + /* 0x72 */ u8 field_0x72; + /* 0x73 */ u8 field_0x73; + /* 0x74 */ u8 field_0x74; + /* 0x75 */ u8 field_0x75; + /* 0x76 */ u8 field_0x76; + /* 0x77 */ u8 field_0x77; + /* 0x78 */ u8 field_0x78; + /* 0x79 */ u8 field_0x79; + /* 0x7A */ u8 field_0x7a; + /* 0x7B */ u8 field_0x7b; + /* 0x7C */ short field_0x7c; + /* 0x7E */ short field_0x7e; + /* 0x80 */ short field_0x80; + /* 0x82 */ short field_0x82; + /* 0x84 */ short field_0x84; + /* 0x86 */ u8 field_0x86[0x88 - 0x86]; + /* 0x88 */ short field_0x88; + /* 0x8A */ short field_0x8a; + /* 0x8C */ short field_0x8c; + /* 0x8E */ short field_0x8e; + /* 0x90 */ short field_0x90; + /* 0x92 */ short field_0x92; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ u8 field_0x98; + /* 0x99 */ u8 field_0x99; + /* 0x9A */ short field_0x9a; + /* 0x9C */ u8 field_0x9C[0xA0 - 0x9C]; + /* 0xA0 */ f32 field_0xa0; + /* 0xA4 */ short field_0xa4; + /* 0xA6 */ short field_0xa6; + /* 0xA8 */ short field_0xa8; + /* 0xAA */ short field_0xaa; + /* 0xAC */ short field_0xac; + /* 0xAE */ short field_0xae; + /* 0xB0 */ short field_0xb0; + /* 0xB2 */ short field_0xb2; + /* 0xB4 */ short field_0xb4; + /* 0xB6 */ short field_0xb6; + /* 0xB8 */ u8 field_0xb8; + /* 0xB9 */ u8 field_0xB9[0xBA - 0xB9]; + /* 0xBA */ short field_0xba; + /* 0xBC */ short field_0xbc; + /* 0xBE */ u8 field_0xbe; + /* 0xBF */ u8 field_0xbf; + /* 0xC0 */ u8 field_0xc0; + /* 0xC1 */ u8 field_0xc1; + /* 0xC2 */ u8 field_0xc2; + /* 0xC3 */ u8 field_0xc3; + /* 0xC4 */ u8 field_0xc4; + /* 0xC5 */ u8 field_0xc5; + /* 0xC6 */ u8 field_0xc6; + /* 0xC7 */ u8 field_0xc7; + /* 0xC8 */ u8 field_0xc8; + /* 0xC9 */ u8 field_0xc9; + /* 0xCA */ u8 field_0xca; }; class dMeter_msg_HIO_c { public: dMeter_msg_HIO_c(); virtual ~dMeter_msg_HIO_c(); + + /* 0x04 */ u8 field_0x4[0x05 - 0x04]; + /* 0x05 */ u8 field_0x5; + /* 0x06 */ u8 field_0x6; + /* 0x07 */ u8 field_0x7; + /* 0x08 */ u8 field_0x8; + /* 0x09 */ u8 field_0x9; + /* 0x0A */ u8 field_0xa; + /* 0x0B */ u8 field_0xb; + /* 0x0C */ u8 field_0xc; + /* 0x0D */ u8 field_0xd; + /* 0x0E */ u8 field_0xe; + /* 0x0F */ u8 field_0xf; + /* 0x10 */ u8 field_0x10; + /* 0x11 */ u8 field_0x11; + /* 0x12 */ u8 field_0x12; + /* 0x13 */ u8 field_0x13; + /* 0x14 */ u8 field_0x14; + /* 0x15 */ u8 field_0x15; + /* 0x16 */ u8 field_0x16; + /* 0x17 */ u8 field_0x17; + /* 0x18 */ u8 field_0x18; + /* 0x19 */ u8 field_0x19; + /* 0x1A */ u8 field_0x1a; + /* 0x1B */ u8 field_0x1b; + /* 0x1C */ u8 field_0x1c; + /* 0x1D */ u8 field_0x1d; + /* 0x1E */ u8 field_0x1e; + /* 0x1F */ u8 field_0x1f; + /* 0x20 */ u8 field_0x20; + /* 0x21 */ u8 field_0x21; + /* 0x22 */ u8 field_0x22; + /* 0x23 */ u8 field_0x23; + /* 0x24 */ u8 field_0x24; + /* 0x25 */ u8 field_0x25; + /* 0x26 */ u8 field_0x26; + /* 0x27 */ u8 field_0x27; + /* 0x28 */ u8 field_0x28; + /* 0x29 */ u8 field_0x29; + /* 0x2A */ u8 field_0x2a; + /* 0x2B */ u8 field_0x2b; + /* 0x2C */ u8 field_0x2c; + /* 0x2D */ u8 field_0x2d; + /* 0x2E */ u8 field_0x2e; + /* 0x2F */ u8 field_0x2f; + /* 0x30 */ u8 field_0x30; + /* 0x31 */ u8 field_0x31[0x38 - 0x31]; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ short field_0x44; + /* 0x46 */ short field_0x46; + /* 0x48 */ short field_0x48; + /* 0x4A */ short field_0x4a; + /* 0x4C */ short field_0x4c; + /* 0x4E */ u8 field_0x4E[0x50 - 0x4E]; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ u8 field_0x58; + /* 0x59 */ u8 field_0x59[0x5A - 0x59]; + /* 0x5A */ short field_0x5a; + /* 0x5C */ short field_0x5c; + /* 0x5E */ short field_0x5e; + /* 0x60 */ short field_0x60; + /* 0x62 */ short field_0x62; + /* 0x64 */ u8 field_0x64; + /* 0x65 */ u8 field_0x65[0x66 - 0x65]; + /* 0x66 */ short field_0x66; + /* 0x68 */ short field_0x68; + /* 0x6A */ short field_0x6a; + /* 0x6C */ short field_0x6c; + /* 0x6E */ short field_0x6e; + /* 0x70 */ short field_0x70; + /* 0x72 */ u8 field_0x72; + /* 0x73 */ u8 field_0x73[0x74 - 0x73]; + /* 0x74 */ short field_0x74; + /* 0x76 */ short field_0x76; + /* 0x78 */ short field_0x78; + /* 0x7A */ short field_0x7a; + /* 0x7C */ short field_0x7c; + /* 0x7E */ u8 field_0x7e; + /* 0x7F */ u8 field_0x7f; + /* 0x80 */ u8 field_0x80; + /* 0x81 */ u8 field_0x81; + /* 0x82 */ u8 field_0x82; + /* 0x83 */ u8 field_0x83; + /* 0x84 */ u8 field_0x84; + /* 0x85 */ u8 field_0x85; + /* 0x86 */ u8 field_0x86; + /* 0x87 */ u8 field_0x87; + /* 0x88 */ u8 field_0x88; + /* 0x89 */ u8 field_0x89; + /* 0x8A */ u8 field_0x8a; }; class dMeter_message_HIO_c { public: dMeter_message_HIO_c(); virtual ~dMeter_message_HIO_c(); + + /* 0x04 */ u8 field_0x4[0x05 - 0x04]; + /* 0x05 */ u8 field_0x5; + /* 0x06 */ u8 field_0x6; + /* 0x07 */ u8 field_0x7; + /* 0x08 */ u8 field_0x8; + /* 0x09 */ u8 field_0x9; + /* 0x0A */ u8 field_0xa; + /* 0x0B */ u8 field_0xb; + /* 0x0C */ u8 field_0xc; + /* 0x0D */ u8 field_0xd; + /* 0x0E */ u8 field_0xe; + /* 0x0F */ u8 field_0xf; + /* 0x10 */ u8 field_0x10; + /* 0x11 */ u8 field_0x11; + /* 0x12 */ u8 field_0x12; + /* 0x13 */ u8 field_0x13; + /* 0x14 */ u8 field_0x14; + /* 0x15 */ u8 field_0x15; + /* 0x16 */ u8 field_0x16; + /* 0x17 */ u8 field_0x17; + /* 0x18 */ u8 field_0x18; + /* 0x19 */ u8 field_0x19; + /* 0x1A */ u8 field_0x1a; + /* 0x1B */ u8 field_0x1b; + /* 0x1C */ u8 field_0x1c; + /* 0x1D */ u8 field_0x1d; + /* 0x1E */ u8 field_0x1e; + /* 0x1F */ u8 field_0x1f; + /* 0x20 */ u8 field_0x20; + /* 0x21 */ u8 field_0x21; + /* 0x22 */ u8 field_0x22; + /* 0x23 */ u8 field_0x23; + /* 0x24 */ u8 field_0x24; + /* 0x25 */ u8 field_0x25; + /* 0x26 */ u8 field_0x26; + /* 0x27 */ u8 field_0x27; + /* 0x28 */ u8 field_0x28; + /* 0x29 */ u8 field_0x29; + /* 0x2A */ u8 field_0x2a; + /* 0x2B */ u8 field_0x2b; + /* 0x2C */ u8 field_0x2c; + /* 0x2D */ u8 field_0x2d; + /* 0x2E */ u8 field_0x2e; + /* 0x2F */ u8 field_0x2f; + /* 0x30 */ u8 field_0x30; + /* 0x31 */ u8 field_0x31; + /* 0x32 */ u8 field_0x32; + /* 0x33 */ u8 field_0x33[0x34 - 0x33]; + /* 0x34 */ short field_0x34; + /* 0x36 */ short field_0x36; + /* 0x38 */ short field_0x38; + /* 0x3A */ u8 field_0x3a; + /* 0x3B */ u8 field_0x3b; + /* 0x3C */ short field_0x3c; + /* 0x3E */ u8 field_0x3E[0x40 - 0x3E]; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ u8 field_0x44; + /* 0x45 */ u8 field_0x45[0x46 - 0x45]; + /* 0x46 */ short field_0x46; + /* 0x48 */ short field_0x48; + /* 0x4A */ u8 field_0x4a; + /* 0x4B */ u8 field_0x4b; + /* 0x4C */ u8 field_0x4c; + /* 0x4D */ u8 field_0x4d; + /* 0x4E */ u8 field_0x4e; + /* 0x4F */ u8 field_0x4f; + /* 0x50 */ u8 field_0x50; + /* 0x51 */ u8 field_0x51; + /* 0x52 */ u8 field_0x52; + /* 0x53 */ u8 field_0x53; + /* 0x54 */ short field_0x54; + /* 0x56 */ short field_0x56; + /* 0x58 */ short field_0x58; + /* 0x5A */ u8 field_0x5a; + /* 0x5B */ u8 field_0x5b; + /* 0x5C */ u8 field_0x5c; + /* 0x5D */ u8 field_0x5d; + /* 0x5E */ u8 field_0x5e; + /* 0x5F */ u8 field_0x5F[0x60 - 0x5F]; + /* 0x60 */ short field_0x60; + /* 0x62 */ short field_0x62; + /* 0x64 */ short field_0x64; + /* 0x66 */ short field_0x66; + /* 0x68 */ short field_0x68; + /* 0x6A */ short field_0x6a; + /* 0x6C */ short field_0x6c; + /* 0x6E */ short field_0x6e; + /* 0x70 */ short field_0x70; + /* 0x72 */ short field_0x72; + /* 0x74 */ short field_0x74; + /* 0x76 */ short field_0x76; + /* 0x78 */ u8 field_0x78; + /* 0x79 */ u8 field_0x79[0x7A - 0x79]; + /* 0x7A */ short field_0x7a; + /* 0x7C */ short field_0x7c; + /* 0x7E */ short field_0x7e; + /* 0x80 */ short field_0x80; + /* 0x82 */ short field_0x82; }; class dDlst_2DMETER1_c : public dDlst_base_c { @@ -49,20 +498,39 @@ class dMeter_map_HIO_c { public: dMeter_map_HIO_c(); virtual ~dMeter_map_HIO_c(); + + /* 0x04 */ u8 field_0x4; + /* 0x05 */ u8 field_0x5; + /* 0x06 */ u8 field_0x6; + /* 0x07 */ u8 field_0x7; + /* 0x08 */ short field_0x8; + /* 0x0A */ short field_0xa; + /* 0x0C */ short field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ short field_0x14; + /* 0x16 */ short field_0x16; + /* 0x18 */ u8 field_0x18[0x20 - 0x18]; }; class mapCtrlDisp_c { public: void initMapCtrlDisp(); void moveMapCtrlDisp(); + + /* 0x00 */ u8 field_0x0; + /* 0x01 */ u8 field_0x1; + /* 0x02 */ u8 field_0x2; + /* 0x04 */ short field_0x4; }; class dMeter_info_c { public: ~dMeter_info_c() {} + + /* 0x00 */ u8 field_0x0[2]; }; -bool dMenu_flag(); +u8 dMenu_flag(); void dMenu_flagSet(u8); #endif /* D_METER_H */ diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index 024bd8bd6..fb6dd26d7 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -4,27 +4,509 @@ // #include "d/d_meter.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "d/d_com_inf_game.h" #include "d/d_drawlist.h" #include "d/d_metronome.h" +#include "stdio.h" + +dMeter_info_c dMeter_Info; +dMeter_map_HIO_c g_meter_mapHIO; +dMeter_HIO_c g_meterHIO; +dMeter_menuHIO_c g_menuHIO; +dMeter_msg_HIO_c g_msgHIO; +dMeter_message_HIO_c g_messageHIO; +dMetronome_c* dMn_c; +J2DScreen* sMainParts1; +J2DScreen* sMainParts2; +J2DScreen* sMainParts3; +J2DScreen* sScrTimer1; +J2DScreen* sScrTimer2; +J2DScreen* sChoiceRoad; +J2DPicture* moveItemPane; +u8 mapAlpha; +u8 menu_status; +u8 menu_status_old; +u8 dMenu_pause; +int dMenu_frame_timer; +u8 dMenu_menuButton; +bool subWinFlag; +bool dMeter_auctionFlag; +u8 dMeter_itemMoveFlag; +u8 dMeter_btn_chk; +u8 dMeter_itemNum; +u16 dMeter_itemTimer; +f32 texRateX; +f32 texRateY; +f32 texScaleX; +f32 texScaleY; +u8 dMenu_menuFlag; +u8 dMenu_baitNum[8]; +u8 dMeter_place_name; +u8 dMeter_itemMode; +u8 dMeter_collectMode; +u8 dMeter_windStatus; +u8 rupy_soundSetFlag; +u8 rupy_soundOnFlag; +mapCtrlDisp_c dMeter_mMapCtrlDisp; +dDlst_2DMETER1_c meter1; +dDlst_2DMETER2_c meter2; +dDlst_2Dm_c tekari; +dDlst_2Dm_c clock[3]; + +static void dummy(f32* m, u32 p2, s32 p3) { + m[0] = 0.8f; + m[1] = 0.0f; + m[2] = 1.2f; + m[3] = 0.1f; + m[4] = 1.0f; + m[5] = 1.1f; + m[6] = 255.0f; + m[7] = -1.0f; + m[8] = 452.0f; + m[9] = p2; + m[10] = p3; +} /* 801EEFDC-801EF360 .text __ct__12dMeter_HIO_cFv */ dMeter_HIO_c::dMeter_HIO_c() { - /* Nonmatching */ + field_0x6 = 10; + field_0x62 = 0; + field_0x63 = 0; + field_0xc = 1.0f; + field_0x10 = 1.4f; + field_0x14 = 0.0f; + field_0x18 = -29.0f; + field_0x1c = 1.0f; + field_0x36 = 0x16; + field_0x3c = 0.65f; + field_0x38 = 0; + field_0x2e = 0; + field_0x30 = 0; + field_0x32 = 0; + field_0x34 = 0; + field_0x2c = 0xff; + field_0x20 = 1.5f; + field_0x24 = 150.0f; + field_0x2d = 0x8c; + field_0x40 = 0x5a; + field_0x42 = 100; + field_0x44 = 100; + field_0x46 = 0x5a; + field_0x50 = 7; + field_0x52 = 0xfff4; + field_0x48 = 1.8; + field_0x4c = 12.0; + field_0x54 = 0; + field_0x56 = 0xffa8; + field_0x58 = 2.3f; + field_0x5c = 12.0f; + field_0x60 = 0x96; + field_0x61 = 100; + field_0x64 = 0; + field_0x66 = 0; + field_0x68 = 0; + field_0x6a = 0; + field_0x88 = 0xf; + field_0x8a = 5; + field_0x8c = 5; + field_0x8e = 5; + field_0x90 = 0x14; + field_0x92 = 0xc; + field_0x94 = 3; + field_0x96 = 3; + field_0x98 = 3; + field_0x9a = 0; + field_0x120 = 0x8c; + field_0x121 = 200; + field_0x122 = 0x96; + field_0x126 = 10; + field_0x128 = 6; + field_0x12a = 3; + field_0x12c = 3; + field_0x12e = 2; + field_0x130 = 0x14; + field_0x132 = 0x27; + field_0x7e = 0x14; + field_0x136 = 4; + field_0x138 = 10; + field_0x13a = 0; + field_0x13c = 10; + field_0x142 = 0xb4; + field_0x143 = 0; + field_0x144 = 0; + field_0x145 = 0xff; + field_0x146 = 0; + field_0x147 = 0; + field_0x148 = 0; + field_0x149 = 0; + field_0x123 = 1; + field_0x134 = 3; + field_0x13e = 0; + field_0x14a = 0xff; + field_0x14b = 0x32; + field_0x14c = 0x32; + field_0x14e = 10; + field_0x150 = 0x14; + field_0x152 = 4; + field_0x154 = 0x32; + field_0x28 = 2.1f; + field_0x124 = 5; + field_0x140 = 0; + field_0xa0 = 0; + field_0xa8 = 0; + field_0xa2 = 0x3c; + field_0xaa = 0xffc4; + field_0xa4 = 0; + field_0xac = 0; + field_0xa6 = 0; + field_0xae = 0; + field_0xb0 = 0x19; + field_0xb8 = 0xffe2; + field_0xb2 = 0x23; + field_0xba = 0xffea; + field_0xb4 = 0xffdf; + field_0xbc = 0xfffb; + field_0xb6 = 0xfffa; + field_0xbe = 0; + field_0xc0 = 0; + field_0xc8 = 0xffec; + field_0xc2 = 0; + field_0xca = 0xffec; + field_0xc4 = 0; + field_0xcc = 0xffec; + field_0xc6 = 0; + field_0xce = 0; + field_0xd0 = 0x28; + field_0xd8 = 0xffc4; + field_0xd2 = 0x28; + field_0xda = 0xffc4; + field_0xd4 = 0; + field_0xdc = 0; + field_0xd6 = 0; + field_0xde = 0; + field_0xe0 = 0x19; + field_0xe8 = 0xffe2; + field_0xe2 = 0x23; + field_0xea = 0xffea; + field_0xe4 = 0; + field_0xec = 0xffc4; + field_0xe6 = 0xfffa; + field_0xee = 0; + field_0xf0 = 0; + field_0xf8 = 0; + field_0xf2 = 0; + field_0xfa = 0; + field_0xf4 = 0; + field_0xfc = 0; + field_0xf6 = 0; + field_0xfe = 0; + field_0x100 = 0; + field_0x108 = 0xffc4; + field_0x102 = 0; + field_0x10a = 0xffc4; + field_0x104 = 0x32; + field_0x10c = 0xffb8; + field_0x106 = 0x32; + field_0x10e = 0xffaf; + field_0x110 = 0; + field_0x118 = 0xffeb; + field_0x112 = 0x11; + field_0x11a = 0xfff4; + field_0x114 = 0xffe2; + field_0x11c = 0xfff5; + field_0x116 = 0xff9e; + field_0x11e = 7; + field_0x9c = 0; + field_0x9e = 0; + field_0x6c = 0xffea; + field_0x72 = 0xffd5; + field_0x78 = 0x8c; + field_0x6e = 0xffdd; + field_0x74 = 0xfffd; + field_0x7a = 0x82; + field_0x70 = 0xfffa; + field_0x76 = 0xfff3; + field_0x7c = 0x8c; } /* 801EF360-801EF57C .text __ct__16dMeter_menuHIO_cFv */ dMeter_menuHIO_c::dMeter_menuHIO_c() { - /* Nonmatching */ + field_0x8 = 1.4f; + field_0xbe = 0; + field_0xc = 18.0f; + field_0x10 = 28.0f; + field_0x7e = 3; + field_0x80 = 3; + field_0xc0 = 1; + field_0x7c = 0; + field_0xc1 = 0; + field_0xc2 = 10; + field_0xc3 = 4; + field_0xc4 = 0; + field_0x3c = 0.0f; + field_0x40 = -50.0f; + field_0x44 = 1100.0f; + field_0x70 = 0xff; + field_0x71 = 0xff; + field_0x72 = 0xff; + field_0x73 = 0xff; + field_0x6c = 0x32; + field_0x6d = 0x32; + field_0x6e = 0x32; + field_0x6f = 0xff; + field_0x48 = 0.0f; + field_0x4c = 0.0f; + field_0x50 = -1200.0f; + field_0x74 = 0xff; + field_0x75 = 0xff; + field_0x76 = 0xff; + field_0x77 = 0xff; + field_0x54 = -1500.0f; + field_0x58 = 1000.0f; + field_0x5c = 500.0f; + field_0x60 = 1.0f; + field_0x64 = -1.0f; + field_0x68 = -1.0f; + field_0x78 = 200; + field_0x79 = 200; + field_0x7a = 200; + field_0x7b = 0xff; + field_0x18 = 0.25f; + field_0xbf = 0; + field_0x1c = 2.5f; + field_0xc5 = 2; + field_0x82 = 8; + field_0x84 = 5; + field_0xc6 = 0; + field_0xc7 = 1; + field_0x20 = 0.5f; + field_0xc8 = 9; + field_0xc9 = 0; + field_0xca = 0; + field_0x28 = 0xffec; + field_0x36 = 7; + field_0x32 = 8; + field_0x34 = 5; + field_0x38 = 0x1a; + field_0x3a = 0xfffd; + field_0x88 = 3; + field_0x8a = 0; + field_0x14 = 1.3f; + field_0x8c = 0xff38; + field_0xb4 = 6; + field_0x90 = 3; + field_0x92 = 7; + field_0x94 = 1.0f; + field_0x98 = 0xff; + field_0x99 = 0xff; + field_0x9a = 0; + field_0x9a = 0; + field_0xa0 = 1.0f; + field_0xb6 = 0x46; + field_0xba = 5; + field_0xbc = 3; + field_0x24 = 1.4f; + field_0xa4 = 6; + field_0xa6 = 2; + field_0xa8 = 2; + field_0xaa = 2; + field_0xac = 2; + field_0xae = 0x1e; + field_0xb0 = 0x3c; + field_0xb2 = 0; + field_0x8e = 0x15e; + field_0xb8 = 0x96; + field_0x2a = 0x10; + field_0x2c = 0x18; + field_0x2e = 0x17; + field_0x30 = 0; } /* 801EF57C-801EF75C .text __ct__16dMeter_msg_HIO_cFv */ dMeter_msg_HIO_c::dMeter_msg_HIO_c() { - /* Nonmatching */ + field_0x5 = 0x1e; + field_0x6 = 0x1e; + field_0x7 = 0x1e; + field_0x8 = 0xd7; + field_0x9 = 0x1e; + field_0xa = 0x1e; + field_0xb = 0x4b; + field_0xc = 0; + field_0x5a = 0; + field_0x5c = 0; + field_0x5e = 0x1e; + field_0x66 = 0; + field_0x68 = 0xf; + field_0xd = 0x1e; + field_0xe = 0x1e; + field_0xf = 0x1e; + field_0x10 = 0xdc; + field_0x11 = 0x1e; + field_0x12 = 0x1e; + field_0x13 = 0xb4; + field_0x14 = 0; + field_0x15 = 0; + field_0x16 = 0xff; + field_0x17 = 0; + field_0x18 = 0xff; + field_0x19 = 0x78; + field_0x1a = 0x78; + field_0x1b = 0xff; + field_0x1c = 0xff; + field_0x1d = 0xff; + field_0x1e = 0xff; + field_0x1f = 0x3c; + field_0x20 = 0xff; + field_0x21 = 0; + field_0x22 = 0xff; + field_0x23 = 0xff; + field_0x24 = 0xff; + field_0x25 = 0xff; + field_0x26 = 0; + field_0x27 = 0xff; + field_0x28 = 0xff; + field_0x6a = 0; + field_0x72 = 0; + field_0x6c = 0; + field_0x83 = 0; + field_0x84 = 1; + field_0x85 = 0; + field_0x86 = 0; + field_0x87 = 10; + field_0x88 = 0; + field_0x89 = 0; + field_0x8a = 0; + field_0x64 = 0; + field_0x82 = 2; + field_0x58 = 0x1d; + field_0x70 = 0x17; + field_0x62 = 0; + field_0x60 = 0xd; + field_0x6e = 0xf0; + field_0x50 = 0.6f; + field_0x54 = 1.1f; + field_0x4a = 2; + field_0x4c = 4; + field_0x7e = 10; + field_0x80 = 0xb4; + field_0x74 = 0x80; + field_0x7f = 0xaa; + field_0x81 = 0x46; + field_0x76 = 10; + field_0x78 = 0; + field_0x7a = 0; + field_0x7c = 0x46; + field_0x44 = 5; + field_0x46 = 3; + field_0x48 = 4; + field_0x38 = -40.0f; + field_0x3c = 0.96f; + field_0x40 = 0.5f; + field_0x29 = 0xff; + field_0x2a = 0x50; + field_0x2b = 0x50; + field_0x2c = 0x96; + field_0x2d = 0xff; + field_0x2e = 0x96; + field_0x2f = 0x96; + field_0x30 = 0xff; } /* 801EF75C-801EF924 .text __ct__20dMeter_message_HIO_cFv */ dMeter_message_HIO_c::dMeter_message_HIO_c() { - /* Nonmatching */ + field_0x5 = 0; + field_0x6 = 0; + field_0x7 = 0; + field_0x8 = 0xff; + field_0x9 = 0xff; + field_0xa = 0xff; + field_0xb = 0xff; + field_0xc = 0xff; + field_0xd = 0xff; + field_0xe = 0xff; + field_0xf = 0xff; + field_0x10 = 0; + field_0x11 = 0xff; + field_0x12 = 0xff; + field_0x13 = 0xff; + field_0x14 = 0xff; + field_0x15 = 0xff; + field_0x16 = 0xff; + field_0x17 = 0xff; + field_0x18 = 0xff; + field_0x19 = 0xff; + field_0x1a = 0xff; + field_0x1b = 0xff; + field_0x1c = 0; + field_0x1d = 0; + field_0x1e = 0; + field_0x1f = 0; + field_0x20 = 0xff; + field_0x21 = 0xff; + field_0x22 = 0xff; + field_0x23 = 0xff; + field_0x24 = 0xff; + field_0x25 = 0xff; + field_0x26 = 0xff; + field_0x27 = 0xff; + field_0x28 = 0; + field_0x29 = 0x80; + field_0x2a = 0xff; + field_0x2b = 0xff; + field_0x2c = 0xff; + field_0x2d = 0xff; + field_0x2e = 0xb4; + field_0x2f = 0xa0; + field_0x30 = 0x4b; + field_0x31 = 0; + field_0x32 = 0x1b; + field_0x34 = 0xfffe; + field_0x36 = 0x2a; + field_0x38 = 0xf; + field_0x3a = 1; + field_0x3b = 10; + field_0x3c = 0x16; + field_0x40 = 0.7f; + field_0x44 = 0; + field_0x46 = 1; + field_0x48 = 0; + field_0x4a = 0; + field_0x4b = 1; + field_0x4c = 0xff; + field_0x4d = 0xff; + field_0x4e = 0xff; + field_0x4f = 0xff; + field_0x50 = 0; + field_0x51 = 0; + field_0x52 = 0; + field_0x53 = 0; + field_0x54 = 0; + field_0x56 = 0; + field_0x58 = 0; + field_0x5a = 0; + field_0x5b = 0xff; + field_0x5c = 0; + field_0x60 = 0; + field_0x66 = 0; + field_0x6c = 1; + field_0x72 = 1; + field_0x5d = 0; + field_0x62 = 0; + field_0x68 = 0; + field_0x6e = 1; + field_0x74 = 1; + field_0x5e = 0; + field_0x64 = 0; + field_0x6a = 0; + field_0x70 = 1; + field_0x76 = 1; + field_0x78 = 0; + field_0x7a = 4; + field_0x7c = 4; + field_0x7e = 2; + field_0x80 = 600; + field_0x82 = 0x18c; } /* 801EF924-801EF938 .text dMeter_mtrShow__Fv */ @@ -38,68 +520,68 @@ void dMeter_mtrHide() { } /* 801EF94C-801EF954 .text dMenu_setMenuStatus__FUc */ -void dMenu_setMenuStatus(u8) { - /* Nonmatching */ +void dMenu_setMenuStatus(u8 param_1) { + menu_status = param_1; } /* 801EF954-801EF95C .text dMenu_setMenuStatusOld__FUc */ -void dMenu_setMenuStatusOld(u8) { - /* Nonmatching */ +void dMenu_setMenuStatusOld(u8 param_1) { + menu_status_old = param_1; } /* 801EF95C-801EF964 .text dMenu_getMenuStatus__Fv */ -void dMenu_getMenuStatus() { - /* Nonmatching */ +u8 dMenu_getMenuStatus() { + return menu_status; } /* 801EF964-801EF96C .text dMenu_getCollectMode__Fv */ -void dMenu_getCollectMode() { - /* Nonmatching */ +u8 dMenu_getCollectMode() { + return dMeter_collectMode; } /* 801EF96C-801EF974 .text dMenu_setCollectMode__FUc */ -void dMenu_setCollectMode(u8) { - /* Nonmatching */ +void dMenu_setCollectMode(u8 param_1) { + dMeter_collectMode = param_1; } /* 801EF974-801EF97C .text dMenu_getItemMode__Fv */ -void dMenu_getItemMode() { - /* Nonmatching */ +u8 dMenu_getItemMode() { + return dMeter_itemMode; } /* 801EF97C-801EF984 .text dMenu_setItemMode__FUc */ -void dMenu_setItemMode(u8) { - /* Nonmatching */ +void dMenu_setItemMode(u8 param_1) { + dMeter_itemMode = param_1; } /* 801EF984-801EF98C .text dMeter_subWinFlag__Fv */ -void dMeter_subWinFlag() { - /* Nonmatching */ +bool dMeter_subWinFlag() { + return subWinFlag; } /* 801EF98C-801EF998 .text dMeter_subWinFlagOn__Fv */ void dMeter_subWinFlagOn() { - /* Nonmatching */ + subWinFlag = true; } /* 801EF998-801EF9A4 .text dMeter_subWinFlagOff__Fv */ void dMeter_subWinFlagOff() { - /* Nonmatching */ + subWinFlag = false; } /* 801EF9A4-801EF9AC .text dMeter_isAuctionFlag__Fv */ -void dMeter_isAuctionFlag() { - /* Nonmatching */ +bool dMeter_isAuctionFlag() { + return dMeter_auctionFlag; } /* 801EF9AC-801EF9B8 .text dMeter_onAuctionFlag__Fv */ void dMeter_onAuctionFlag() { - /* Nonmatching */ + dMeter_auctionFlag = true; } /* 801EF9B8-801EF9C4 .text dMeter_offAuctionFlag__Fv */ void dMeter_offAuctionFlag() { - /* Nonmatching */ + dMeter_auctionFlag = false; } /* 801EF9C4-801EFA38 .text dMeter_itemMoveSet__FP18fopMsgM_pane_classUcUc */ @@ -108,58 +590,60 @@ void dMeter_itemMoveSet(fopMsgM_pane_class*, u8, u8) { } /* 801EFA38-801EFA40 .text dMeter_itemMoveFlagCheck__Fv */ -void dMeter_itemMoveFlagCheck() { - /* Nonmatching */ +u8 dMeter_itemMoveFlagCheck() { + return dMeter_itemMoveFlag; } /* 801EFA40-801EFA48 .text dMenu_flag__Fv */ -bool dMenu_flag() { - /* Nonmatching */ +u8 dMenu_flag() { + return dMenu_pause; } /* 801EFA48-801EFA50 .text dMenu_flagSet__FUc */ -void dMenu_flagSet(u8) { - /* Nonmatching */ +void dMenu_flagSet(u8 param_1) { + dMenu_pause = param_1; } /* 801EFA50-801EFA58 .text dMenu_timer__Fv */ -void dMenu_timer() { - /* Nonmatching */ +int dMenu_timer() { + return dMenu_frame_timer; } /* 801EFA58-801EFA60 .text dMenu_getPushMenuButton__Fv */ -void dMenu_getPushMenuButton() { - /* Nonmatching */ +u8 dMenu_getPushMenuButton() { + return dMenu_menuButton; } /* 801EFA60-801EFA68 .text dMenu_setPushMenuButton__FUc */ -void dMenu_setPushMenuButton(u8) { - /* Nonmatching */ +void dMenu_setPushMenuButton(u8 param_1) { + dMenu_menuButton = param_1; } /* 801EFA68-801EFA78 .text dMeter_PaneHide__FP18fopMsgM_pane_class */ -void dMeter_PaneHide(fopMsgM_pane_class*) { - /* Nonmatching */ +void dMeter_PaneHide(fopMsgM_pane_class* param_1) { + param_1->scrn->hide(); } /* 801EFA78-801EFA90 .text dMeter_isBit8__FPUcUc */ -void dMeter_isBit8(u8*, u8) { - /* Nonmatching */ +bool dMeter_isBit8(u8* param_1, u8 param_2) { + return (param_1[0] & param_2) != 0; } /* 801EFA90-801EFAA4 .text dMeter_onBit8__FPUcUc */ -void dMeter_onBit8(u8*, u8) { +void dMeter_onBit8(u8* param_1, u8 param_2) { /* Nonmatching */ + param_1[0] |= param_2; } /* 801EFAA4-801EFAB8 .text dMeter_offBit8__FPUcUc */ -void dMeter_offBit8(u8*, u8) { +void dMeter_offBit8(u8* param_1, u8 param_2) { /* Nonmatching */ + param_1[0] &= ~param_2; } /* 801EFAB8-801EFAC8 .text dMeter_PaneShow__FP18fopMsgM_pane_class */ -void dMeter_PaneShow(fopMsgM_pane_class*) { - /* Nonmatching */ +void dMeter_PaneShow(fopMsgM_pane_class* param_1) { + param_1->scrn->show(); } /* 801EFAC8-801EFC40 .text dMeter_alphaControl__FP15sub_meter_class */ @@ -183,23 +667,127 @@ void dMeter_alphaOpen(s16*, s16*) { } /* 801F02E8-801F0320 .text dMeter_rupy_num__FPcs */ -void dMeter_rupy_num(char*, s16) { +void dMeter_rupy_num(char* param_1, s16 param_2) { /* Nonmatching */ + sprintf(param_1, "rupy_num_%02d.bti", param_2); } +struct struct_80360f38 { + u8 field_0x0; + const char* field_0x4; +}; + /* 801F0320-801F0378 .text dMeter_actionTex__Fs */ -void dMeter_actionTex(s16) { - /* Nonmatching */ +const char* dMeter_actionTex(s16 param_1) { + static const struct_80360f38 act[] = { + 0, "ba_shiraberu.bti", + 1, "ba_miru.bti", + 2, "ba_syaberu.bti", + 3, "ba_shiraberu.bti", + 4, "ba_motu.bti", + 5, "ba_noru.bti", + 6, "ba_oriru.bti", + 7, "ba_modoru.bti", + 8, "ba_shimau.bti", + 9, "ba_oku.bti", + 10, "ba_chekku.bti", + 11, "ba_hiraku.bti", + 12, "ba_attack.bti", + 13, "ba_osu.bti", + 14, "ba_nageru.bti", + 15, "ba_shagamu.bti", + 16, "ba_harituku.bti", + 17, "ba_tukamu.bti", + 18, "ba_jump.bti", + 19, "ba_tomeru.bti", + 20, "ba_haru.bti", + 21, "ba_tatamu.bti", + 22, "ba_hanasu.bti", + 23, "ba_kettei.bti", + 24, "ba_kogu.bti", + 25, "ba_tugihe.bti", + 26, "ba_sake.bti", + 27, "ba_motu_buki.bti", + 28, "ba_noru_hune.bti", + 29, "ba_oriru_hune.bti", + 30, "ba_save.bti", + 31, "ba_option.bti", + 32, "ba_toru.bti", + 33, "ba_setumei.bti", + 34, "ba_kirikae.bti", + 35, "ba_tobu.bti", + 36, "ba_yobu.bti", + 37, "ba_hoshii.bti", + 38, "ba_yomu.bti", + 39, "ba_yameru.bti", + 40, "ba_kakudai.bti", + 41, "ba_hikaku.bti", + 42, "ba_zoom01.bti", + 43, "ba_zoom02.bti", + 44, "ba_susumu.bti", + 45, "ba_nageru.bti", + 46, "ba_motu.bti", + 47, "ba_huru.bti", + 48, "ba_kaizuhe.bti", + 49, "ba_sake.bti", + 50, "ba_modoru.bti", + 51, "ba_save.bti", + 52, "ba_save.bti", + 53, "sword_01.bti", + 54, "ba_husegu.bti", + 55, "boko_stick.bti", + 56, "hatchet.bti", + 57, "iron_club.bti", + 58, "longsword.bti", + 59, "spear.bti", + 60, "spear.bti", + 61, "bow_01.bti", + 62, "ba_modoru.bti", + }; + int found = 0; + for (int i = 0; i < 63; i++) { + if (param_1 == act[i].field_0x0) { + found = i; + break; + } + + } + return act[found].field_0x4; } /* 801F0378-801F041C .text dMeter_weponTex__Fv */ -void dMeter_weponTex() { +const char* dMeter_weponTex() { /* Nonmatching */ + static const char* wepon[] = { + "sword_00.bti", + "sword_01.bti", + "sword_02.bti", + "sword_03.bti", + }; + int var1; + if (dComIfGs_isCollect(0, 3)) { + var1 = 3; + } else if (dComIfGs_isCollect(0, 2)) { + var1 = 2; + } else if (dComIfGs_isCollect(0, 1)) { + var1 = 1; + } else { + var1 = 0; + } + return wepon[var1]; } /* 801F041C-801F0434 .text dMeter_heartTex__Fs */ -void dMeter_heartTex(s16) { +const char* dMeter_heartTex(s16 param_1) { /* Nonmatching */ + static const char* ht[] = { + "heart.bti", + "heart_03.bti", + "heart_02.bti", + "heart_01.bti", + "heart_04.bti", + }; + return ht[param_1]; } /* 801F0434-801F0608 .text dMeter_recollect_boss_data__Fv */ @@ -978,38 +1566,33 @@ void dMeter_Create(msg_class*) { } /* 802057B8-80205814 .text __dt__16dDlst_2DMETER2_cFv */ -dDlst_2DMETER2_c::~dDlst_2DMETER2_c() { - /* Nonmatching */ -} +dDlst_2DMETER2_c::~dDlst_2DMETER2_c() {} /* 80205814-80205870 .text __dt__16dDlst_2DMETER1_cFv */ -dDlst_2DMETER1_c::~dDlst_2DMETER1_c() { - /* Nonmatching */ -} +dDlst_2DMETER1_c::~dDlst_2DMETER1_c() {} /* 80205870-802058B8 .text __dt__20dMeter_message_HIO_cFv */ -dMeter_message_HIO_c::~dMeter_message_HIO_c() { - /* Nonmatching */ -} +dMeter_message_HIO_c::~dMeter_message_HIO_c() {} /* 802058B8-80205900 .text __dt__16dMeter_msg_HIO_cFv */ -dMeter_msg_HIO_c::~dMeter_msg_HIO_c() { - /* Nonmatching */ -} +dMeter_msg_HIO_c::~dMeter_msg_HIO_c() {} /* 80205900-80205948 .text __dt__16dMeter_menuHIO_cFv */ -dMeter_menuHIO_c::~dMeter_menuHIO_c() { - /* Nonmatching */ -} +dMeter_menuHIO_c::~dMeter_menuHIO_c() {} /* 80205948-80205990 .text __dt__12dMeter_HIO_cFv */ -dMeter_HIO_c::~dMeter_HIO_c() { - /* Nonmatching */ -} +dMeter_HIO_c::~dMeter_HIO_c() {} /* 80205990-802059E0 .text __ct__16dMeter_map_HIO_cFv */ dMeter_map_HIO_c::dMeter_map_HIO_c() { - /* Nonmatching */ + field_0x8 = 0x23; + field_0xa = 0x152; + field_0xc = -0xb4; + field_0x14 = 0x24e; + field_0x16 = 0x96; + field_0x6 = 200; + field_0x7 = 1; + field_0x10 = 0.8f; } /* 802059E0-80205A44 .text initMapCtrlDisp__13mapCtrlDisp_cFv */ diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index ab649f39a..841b74ad9 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -7,11 +7,10 @@ #include "f_op/f_op_draw_tag.h" #include "f_op/f_op_kankyo_mng.h" #include "f_pc/f_pc_manager.h" +#include "d/d_meter.h" #include "d/d_procname.h" #include "d/d_s_play.h" -extern bool dMenu_flag(void); - /* 8002A454-8002A4A4 .text fopKy_Draw__FPv */ static int fopKy_Draw(void* i_ky) { int ret;