mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 07:25:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_meter_HIO OK + misc (#2009)

Browse Source
This commit is contained in:
hatal175
2023-12-22 12:56:56 +02:00
committed by GitHub
parent 064f444c0f
commit 3fb456635b
27 changed files with 359 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/menu/d_menu_fishing.h
+4 -8
View File
@@ -51,14 +51,10 @@ private:
/* 0x0F4 */ CPaneMgr* mpFishInfoParent[2];
/* 0x0FC */ CPaneMgr* mpButtonAB[2];
/* 0x104 */ CPaneMgr* mpButtonText[2];
/* 0x10C */ J2DTextBox* field_0x10c[1][6];
/* 0x124 */ J2DTextBox* field_0x124[6];
/* 0x13C */ J2DTextBox* field_0x13c[1][6];
/* 0x154 */ J2DTextBox* field_0x154[6];
/* 0x16C */ J2DTextBox* field_0x16c[1][6];
/* 0x184 */ J2DTextBox* field_0x184[6];
/* 0x19C */ J2DTextBox* field_0x19c[1][6];
/* 0x1B4 */ J2DTextBox* field_0x1b4[6];
/* 0x10C */ J2DTextBox* field_0x10c[2][6];
/* 0x13C */ J2DTextBox* field_0x13c[2][6];
/* 0x16C */ J2DTextBox* field_0x16c[2][6];
/* 0x19C */ J2DTextBox* field_0x19c[2][6];
/* 0x1CC */ J2DTextBox* field_0x1cc[6];
/* 0x1E4 */ J2DTextBox* field_0x1e4;
/* 0x1E8 */ J2DTextBox* field_0x1e8;
include/d/meter/d_meter_HIO.h
+16 -16
View File
@@ -11,7 +11,7 @@ class JKRArchive;
class dMeter_menuHIO_c {
public:
/* 801FE330 */ dMeter_menuHIO_c();
/* 8020123C */ virtual ~dMeter_menuHIO_c();
/* 8020123C */ virtual ~dMeter_menuHIO_c() {}
/* 0x0 */ // vtable
/* 0x4 */ u8 field_0x4[2];
@@ -23,7 +23,7 @@ STATIC_ASSERT(sizeof(dMeter_menuHIO_c) == 8);
class dMeter_drawCollectHIO_c {
public:
dMeter_drawCollectHIO_c();
virtual ~dMeter_drawCollectHIO_c();
virtual ~dMeter_drawCollectHIO_c() {}
enum {
/* 0x0 */ VESSEL_HEART,
@@ -72,7 +72,7 @@ public:
class dMeter_drawOptionHIO_c {
public:
/* 801FE4EC */ dMeter_drawOptionHIO_c();
/* 80200F98 */ virtual ~dMeter_drawOptionHIO_c();
/* 80200F98 */ virtual ~dMeter_drawOptionHIO_c() {}
enum OptionType {
/* 0x0 */ ATTENTION,
@@ -108,7 +108,7 @@ public:
class dMeter_drawLetterHIO_c {
public:
/* 801FE5CC */ dMeter_drawLetterHIO_c();
/* 80200F50 */ virtual ~dMeter_drawLetterHIO_c();
/* 80200F50 */ virtual ~dMeter_drawLetterHIO_c() {}
enum {
/* 0x0 */ WINDOW_FRAME,
@@ -148,7 +148,7 @@ public:
class dMeter_drawFishingHIO_c {
public:
/* 801FE730 */ dMeter_drawFishingHIO_c();
/* 80200F08 */ virtual ~dMeter_drawFishingHIO_c();
/* 80200F08 */ virtual ~dMeter_drawFishingHIO_c() {}
enum {
/* 0x0 */ HYLIAN_BASS,
@@ -198,7 +198,7 @@ public:
class dMeter_drawInsectHIO_c {
public:
/* 801FE8DC */ dMeter_drawInsectHIO_c();
/* 80200EC0 */ virtual ~dMeter_drawInsectHIO_c();
/* 80200EC0 */ virtual ~dMeter_drawInsectHIO_c() {}
enum Type {
/* 0x0 */ DEFAULT,
@@ -229,7 +229,7 @@ public:
class dMeter_drawCalibrationHIO_c {
public:
/* 801FE954 */ dMeter_drawCalibrationHIO_c();
/* 80200E78 */ virtual ~dMeter_drawCalibrationHIO_c();
/* 80200E78 */ virtual ~dMeter_drawCalibrationHIO_c() {}
/* 0x00 */ // vtable
/* 0x04 */ u8 field_0x4[4];
@@ -244,7 +244,7 @@ public:
class dMeter_drawSkillHIO_c {
public:
/* 801FE990 */ dMeter_drawSkillHIO_c();
/* 80200E30 */ virtual ~dMeter_drawSkillHIO_c();
/* 80200E30 */ virtual ~dMeter_drawSkillHIO_c() {}
enum {
/* 0x0 */ WINDOW,
@@ -282,7 +282,7 @@ public:
class dMeter_drawEmpButtonHIO_c {
public:
/* 801FEAF0 */ dMeter_drawEmpButtonHIO_c();
/* 80200DA0 */ virtual ~dMeter_drawEmpButtonHIO_c();
/* 80200DA0 */ virtual ~dMeter_drawEmpButtonHIO_c() {}
/* 0x000 */ // vtable
/* 0x004 */ u8 field_0x4[4];
@@ -434,7 +434,7 @@ public:
class dMeter_drawMiniGameHIO_c {
public:
/* 801FEFF0 */ dMeter_drawMiniGameHIO_c();
/* 80200DE8 */ virtual ~dMeter_drawMiniGameHIO_c();
/* 80200DE8 */ virtual ~dMeter_drawMiniGameHIO_c() {}
/* 0x000 */ // vtable
/* 0x004 */ u8 field_0x4[4];
@@ -546,7 +546,7 @@ public:
class dMeter_drawLightDropHIO_c {
public:
/* 801FF31C */ dMeter_drawLightDropHIO_c();
/* 80200D58 */ virtual ~dMeter_drawLightDropHIO_c();
/* 80200D58 */ virtual ~dMeter_drawLightDropHIO_c() {}
/* 0x00 */ // vtable
/* 0x04 */ u8 field_0x4[4];
@@ -594,7 +594,7 @@ public:
class dMeter_drawHIO_c {
public:
/* 801FF5B8 */ dMeter_drawHIO_c();
/* 80201128 */ virtual ~dMeter_drawHIO_c();
/* 80201128 */ virtual ~dMeter_drawHIO_c() {}
/* 0x000 */ // vtable
/* 0x004 */ s8 field_0x4;
@@ -962,7 +962,7 @@ STATIC_ASSERT(sizeof(dMeter_drawHIO_c) == 3880);
class dMeter_ringHIO_c {
public:
/* 802001AC */ dMeter_ringHIO_c();
/* 802010E0 */ virtual ~dMeter_ringHIO_c();
/* 802010E0 */ virtual ~dMeter_ringHIO_c() {}
enum {
/* 0x0 */ SET_ITEM,
@@ -1053,7 +1053,7 @@ STATIC_ASSERT(sizeof(dMeter_ringHIO_c) == 344);
class dMeter_mapIconHIO_c {
public:
/* 802004B4 */ dMeter_mapIconHIO_c();
/* 80201028 */ virtual ~dMeter_mapIconHIO_c();
/* 80201028 */ virtual ~dMeter_mapIconHIO_c() {}
enum {
/* 0x00 */ ICON_PORTAL,
@@ -1217,7 +1217,7 @@ public:
}; // Size: 0xC
struct MapBlinkAnime {
MapBlinkAnime();
MapBlinkAnime() {}
/* 0x00 */ BlinkAnime mSelectedRegion;
/* 0x0C */ BlinkAnime mUnselectedRegion;
@@ -1341,7 +1341,7 @@ STATIC_ASSERT(sizeof(dMeter_fmapHIO_c) == 1188);
class dMeter_cursorHIO_c {
public:
/* 80200CD4 */ dMeter_cursorHIO_c();
/* 80201098 */ virtual ~dMeter_cursorHIO_c();
/* 80201098 */ virtual ~dMeter_cursorHIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x08 */ cXyz mSeraShopObjZoom;
include/d/msg/d_msg_out_font.h
+1
View File
@@ -20,6 +20,7 @@ public:
f32 getPosY() { return mPosY; }
f32 getSizeX() { return mSizeX; }
f32 getSizeY() { return mSizeY; }
u8 getAlpha() { return mAlpha; }
J2DTextBox* getTextBoxPtr() { return mpTextBoxPtr; }
void setTextBoxPtr(J2DTextBox* p_textBox) { mpTextBoxPtr = p_textBox; }
void resetType() { mType = 0x47; }
include/d/msg/d_msg_unit.h
+42
View File
@@ -1,6 +1,48 @@
#ifndef D_MSG_D_MSG_UNIT_H
#define D_MSG_D_MSG_UNIT_H
#include "global.h"
// Struct definitions might be wrong
typedef struct bmg_section_t {
u32 msgType; // sectionType
u32 size; // total size of the section
u8 data[0]; // section data
} bmg_section_t;
typedef struct bmg_header_t {
/* 0x00 */ char magic[8]; // = BMG_MAGIC
/* 0x08 */ u32 size; // total size of file
/* 0x0c */ u32 n_sections; // number of sections
/* 0x10 */ u32 encoding; // text encoding
/* 0x11 */ u8 unknown[12]; // unknown data
/* 0x20 */ bmg_section_t section[0]; // first section header
} bmg_header_t;
typedef struct inf1_entry_t {
u32 dat1EntryOffset;
u16 startFrame;
u16 endFrame;
} inf1_entry_t;
typedef struct inf1_section_t {
/* 0x00 */ u32 msgType; // sectionType
/* 0x04 */ u32 size; // total size of the section
/* 0x08 */ u16 entryCount;
/* 0x0A */ u16 entryLength;
/* 0x0C */ u16 msgArchiveId;
/* 0x0E */ inf1_entry_t entries[0];
} inf1_section_t;
typedef struct str1_entry_t {
char str[0];
} str1_entry_t;
typedef struct str1_section_t {
/* 0x00 */ u32 msgType; // sectionType
/* 0x04 */ u32 size; // total size of the section
/* 0x08 */ str1_entry_t entries[0];
} str1_section_t;
class dMsgUnit_c {
public: