mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-01 16:29:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://github.com/TwilitRealm/dusklight into better-tools

Browse Source
This commit is contained in:
TakaRikka
2026-08-29 18:37:14 -07:00
parent fbe7b57132 a775418c66
commit c4ded86010
144 changed files with 12422 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alink.h
+2
View File
@@ -8449,8 +8449,10 @@ struct daAlink_cutHorseParamTbl {
/* 0xA */ u8 m_cutType;
}; // Size: 0xC
#if !TARGET_PC
inline BOOL dComIfGs_isTransformLV(int i_no);
inline BOOL dComIfGs_isEventBit(const u16);
#endif
static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* i_actor, void* i_data);
static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* i_actor, void* i_data);
include/d/actor/d_a_e_hp.h
+1 -1
View File
@@ -97,7 +97,7 @@ public:
/* 0xDEC */ u8 field_0xdec[0xdf9 - 0xdec];
/* 0xDF9 */ u8 field_0xdf9;
#if TARGET_PC
bool mItemCheckOverridden;
bool mItemCheckHandled;
#endif
};
include/d/actor/d_a_itembase.h
+9
View File
@@ -32,6 +32,12 @@ struct daItemBase_data {
class daItemBase_c : public fopAc_ac_c {
public:
u8 getItemNo();
#if TARGET_PC
u8 getDisplayItemNo() const {
return mDisplayItemNo != 0xFF ? mDisplayItemNo : m_itemNo;
}
void setDisplayItemNo(u8 itemNo) { mDisplayItemNo = itemNo; }
#endif
void hide();
void show();
void changeDraw();
@@ -79,6 +85,9 @@ public:
/* 0x928 */ s16 m_get_timer;
/* 0x92A */ u8 m_itemNo;
/* 0x92B */ u8 field_0x92b;
#if TARGET_PC
u8 mDisplayItemNo = 0xFF;
#endif
};
#endif /* D_A_D_A_ITEMBASE_H */
include/d/actor/d_a_midna.h
+1 -1
View File
@@ -423,7 +423,7 @@ public:
static DUSK_GAME_DATA daMidna_texData_s const m_texDataTable[21];
static DUSK_GAME_DATA daMidna_anmData_s const m_anmDataTable[53];
private:
// private:
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ J3DModel* mpShadowModel;
include/d/actor/d_a_obj_life_container.h
+1
View File
@@ -92,6 +92,7 @@ private:
u8 mOriginalItemNo;
bool mItemOverridden;
bool mOverrideHover;
bool mGoldenWolfItem;
#endif
};
include/d/actor/d_a_player.h
+2
View File
@@ -311,9 +311,11 @@ private:
class daMidna_c;
class daSpinner_c;
class daPy_py_c;
#if !TARGET_PC
inline daPy_py_c* dComIfGp_getLinkPlayer();
inline BOOL dComIfGs_isEventBit(const u16);
inline u32 dComIfGs_getLastSceneMode();
#endif
class daPy_py_c : public fopAc_ac_c {
public:
include/d/d_a_itembase_static.h
+5
View File
@@ -1,10 +1,15 @@
#ifndef D_A_D_A_ITEMBASE_STATIC_H
#define D_A_D_A_ITEMBASE_STATIC_H
#include "dolphin/types.h"
class fopAc_ac_c;
int CheckFieldItemCreateHeap(fopAc_ac_c* actor);
int CheckItemCreateHeap(fopAc_ac_c* i_this);
#if TARGET_PC
const char* dItem_fieldModelArc(u8 itemNo);
#endif
#endif /* D_A_D_A_ITEMBASE_STATIC_H */
include/d/d_com_inf_game.h
+934 -78
View File
File diff suppressed because it is too large Load Diff
include/d/d_file_sel_info.h
+1 -1
View File
@@ -37,7 +37,7 @@ public:
CPaneMgrAlpha* getNoDatBase() { return mNoDatBase; }
void draw() { _draw(); }
private:
// private:
/* 0x04 */ JKRArchive* mArchive;
/* 0x08 */ dDlst_FileInfo_c mFileInfo;
/* 0x1C */ u8 field_0x1c[4];
include/d/d_file_select.h
-33
View File
@@ -16,39 +16,6 @@
class dFile_info_c;
class J2DPicture;
#if TARGET_PC
static PaneCache mSelDtPanes[] = {
{MULTI_CHAR('tate_n0'), 0.0f, 0.0f, false},
{MULTI_CHAR('tate_n1'), 0.0f, 0.0f, false},
{MULTI_CHAR('ken_n0'), 0.0f, 0.0f, false},
{MULTI_CHAR('ken_n1'), 0.0f, 0.0f, false},
{MULTI_CHAR('fuku_n0'), 0.0f, 0.0f, false},
{MULTI_CHAR('fuku_n1'), 0.0f, 0.0f, false},
{MULTI_CHAR('fuku_n2'), 0.0f, 0.0f, false},
{MULTI_CHAR('gray_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('b_base'), 0.0f, 0.0f, false},
{MULTI_CHAR('b_base1'), 0.0f, 0.0f, false},
};
static PaneCache fileSelPanes[] = {
{MULTI_CHAR('w_uzu00'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu01'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu02'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu03'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu04'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu05'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu06'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu07'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu08'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_uzu09'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_er_msg'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_er_msE'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_er_msR'), 0.0f, 0.0f, false},
{MULTI_CHAR('er_for0'), 0.0f, 0.0f, false},
{MULTI_CHAR('er_for1'), 0.0f, 0.0f, false},
};
#endif
class dDlst_FileSel_c : public dDlst_base_c {
public:
void draw();
include/d/d_item_data.h
+5
View File
@@ -142,7 +142,12 @@ enum {
/* 0x2F */ dItemNo_WEAR_KOKIRI_e,
/* 0x30 */ dItemNo_ARMOR_e,
/* 0x31 */ dItemNo_WEAR_ZORA_e,
#if TARGET_PC
/* 0x32 */ dItemNo_MAGIC_LV1_e,
dItemNo_SHADOW_CRYSTAL_e = dItemNo_MAGIC_LV1_e,
#else
/* 0x32 */ dItemNo_MAGIC_LV1_e,
#endif
/* 0x33 */ dItemNo_DUNGEON_EXIT_2_e,
/* 0x34 */ dItemNo_WALLET_LV1_e,
/* 0x35 */ dItemNo_WALLET_LV2_e,
include/d/d_kantera_icon_meter.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
void drawSelf() { mpKanteraIcon->draw(); }
private:
// private:
/* 0x04 */ dDlst_KanteraIcon_c* mpKanteraIcon;
/* 0x08 */ CPaneMgr* mpParent;
/* 0x0C */ CPaneMgr* mpGauge;
include/d/d_menu_collect.h
+1 -44
View File
@@ -15,49 +15,6 @@ class dMenu_Fishing_c;
class dMenu_Skill_c;
class dMenu_Insect_c;
class dSelect_cursor_c;
#if TARGET_PC
struct PaneCache {
u64 tag;
f32 origTransX;
f32 origTransY;
bool cached;
};
static PaneCache mpScreenPanes[] = {
{MULTI_CHAR('sa_tex_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('op_tex_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('heart_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('wolf_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('item_0_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('item_1_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('item_2_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('fish_3_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('lett_4_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('maki_5_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('fuku_n0'), 0.0f, 0.0f, false},
{MULTI_CHAR('fuku_n1'), 0.0f, 0.0f, false},
{MULTI_CHAR('fuku_n2'), 0.0f, 0.0f, false},
{MULTI_CHAR('tate_n0'), 0.0f, 0.0f, false},
{MULTI_CHAR('tate_n1'), 0.0f, 0.0f, false},
{MULTI_CHAR('ken_n0'), 0.0f, 0.0f, false},
{MULTI_CHAR('ken_n1'), 0.0f, 0.0f, false},
{MULTI_CHAR('kabu_6n'), 0.0f, 0.0f, false},
{MULTI_CHAR('t_t00'), 0.0f, 0.0f, false},
{MULTI_CHAR('f_t00'), 0.0f, 0.0f, false},
{MULTI_CHAR('itemn_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('infotxtn'), 0.0f, 0.0f, false},
{MULTI_CHAR('sa_op_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('title_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('menu_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('w_er_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('center_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('info_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('lavel_n'), 0.0f, 0.0f, false},
{MULTI_CHAR('modelbgn'), 0.0f, 0.0f, false},
};
#endif
class dMenu_Collect2D_c;
class dMenu_Collect2DTop_c : public dDlst_base_c {
public:
@@ -172,7 +129,7 @@ public:
J2DPicture* getBlackTex() { return mpBlackTex; }
u8 getSubWindowOpenCheck() { return mSubWindowOpenCheck; }
private:
// private:
/* 0x004 */ JKRExpHeap* mpHeap;
/* 0x008 */ JKRExpHeap* mpSubHeap;
/* 0x00C */ void* field_0xc;
include/d/d_menu_fishing.h
+1 -1
View File
@@ -43,7 +43,7 @@ public:
u8 getStatus() { return mStatus; }
private:
// private:
/* 0x004 */ JKRExpHeap* mpHeap;
/* 0x008 */ JKRArchive* mpArchive;
/* 0x00C */ STControl* mpStick;
include/d/d_menu_fmap.h
+1 -1
View File
@@ -270,7 +270,7 @@ public:
static DUSK_GAME_DATA dMenu_Fmap_c* MyClass;
private:
// private:
/* 0x004 */ JKRExpHeap* mpHeap;
/* 0x008 */ JKRExpHeap* mpTalkHeap;
/* 0x00C */ STControl* mpStick;
include/d/d_menu_insect.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
u8 getStatus() { return mStatus; }
private:
// private:
/* 0x04 */ JKRExpHeap* mpHeap;
/* 0x08 */ JKRArchive* mpArchive;
/* 0x0C */ STControl* mpStick;
include/d/d_menu_letter.h
+1 -1
View File
@@ -64,7 +64,7 @@ public:
u8 getStatus() { return mStatus; }
private:
// private:
/* 0x004 */ JKRExpHeap* mpHeap;
/* 0x008 */ JKRArchive* mpArchive;
/* 0x00C */ STControl* mpStick;
include/d/d_menu_option.h
+1 -1
View File
@@ -117,7 +117,7 @@ public:
return ((u8)mUseFlag & (u8)i_flag) != 0 ? true : false;
}
private:
// private:
/* 0x004 */ J2DScreen* mpBackScreen;
/* 0x008 */ J2DScreen* mpScreen;
/* 0x00C */ J2DScreen* mpClipScreen;
include/d/d_menu_ring.h
+1 -1
View File
@@ -84,7 +84,7 @@ public:
void drawFlag0() { mDrawFlag = 0; }
void setStatus(u8 i_status) { mStatus = i_status; }
private:
// private:
/* 0x004 */ JKRExpHeap* mpHeap;
/* 0x008 */ STControl* mpStick;
/* 0x00C */ CSTControl* mpCStick;
include/d/d_menu_save.h
+1 -1
View File
@@ -278,7 +278,7 @@ public:
u8 getEndStatus() { return mEndStatus; }
void setUseType(u8 type) { mUseType = type; }
private:
// private:
/* 0x0004 */ JKRArchive* mpArchive;
/* 0x0008 */ mDoDvdThd_mountArchive_c* mpMount;
/* 0x000C */ STControl* stick;
include/d/d_menu_skill.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
u8 getStatus() { return mStatus; }
private:
// private:
/* 0x004 */ JKRExpHeap* mpHeap;
/* 0x008 */ JKRArchive* mpArchive;
/* 0x00C */ STControl* mpStick;
include/d/d_meter2_draw.h
+1 -1
View File
@@ -154,7 +154,7 @@ public:
}
#endif
private:
// private:
/* 0x004 */ item_params mItemParams[4];
/* 0x074 */ JKRExpHeap* heap;
/* 0x078 */ J2DScreen* mpScreen;
include/d/d_meter2_info.h
+146
View File
@@ -328,6 +328,150 @@ void dMeter2Info_onWide2D();
void dMeter2Info_offWide2D();
#endif
#if TARGET_PC
DUSK_NOINLINE void dMeter2Info_Initialize();
DUSK_NOINLINE dMeterMap_c* dMeter2Info_getMeterMapClass();
DUSK_NOINLINE dMw_c* dMeter2Info_getMenuWindowClass();
DUSK_NOINLINE void dMeter2Info_setWindowStatus(u8 i_status);
DUSK_NOINLINE CPaneMgr* dMeter2Info_getMeterItemPanePtr(s32 i_idx);
DUSK_NOINLINE void dMeter2Info_getString(
u32 i_stringID, TEXT_SPAN o_string, JMSMesgEntry_c* i_msgEntry);
DUSK_NOINLINE void dMeter2Info_getStringKanji(
u32 i_stringID, TEXT_SPAN o_string, JMSMesgEntry_c* i_msgEntry);
DUSK_NOINLINE void dMeter2Info_getStringKana(
u32 i_stringID, TEXT_SPAN o_string, JMSMesgEntry_c* i_msgEntry);
DUSK_NOINLINE f32 dMeter2Info_getStringLength(
JUTFont* i_font, f32 param_2, f32 param_3, char* i_string);
DUSK_NOINLINE f32 dMeter2Info_getStringLength(J2DTextBox* i_textbox, char* i_string);
DUSK_NOINLINE void dMeter2Info_setHotSpringTimer(u8 i_slotNo);
DUSK_NOINLINE u16 dMeter2Info_getOilGaugeBackUp();
DUSK_NOINLINE void dMeter2Info_setOilGaugeBackUp(u16 param_1);
DUSK_NOINLINE void dMeter2Info_setSaveStageName(const char* i_stageName);
DUSK_NOINLINE u8 dMeter2Info_getInsectSelectType();
DUSK_NOINLINE void dMeter2Info_setInsectSelectType(u8 i_type);
DUSK_NOINLINE u8 dMeter2Info_getWarpStatus();
DUSK_NOINLINE void dMeter2Info_setWarpStatus(u8 i_status);
DUSK_NOINLINE int dMeter2Info_readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_pic1,
void* i_texBuf2, J2DPicture* i_pic2, void* i_texBuf3, J2DPicture* i_pic3, void* i_texBuf4,
J2DPicture* i_pic4, int param_9);
DUSK_NOINLINE void dMeter2Info_setItemColor(
u8 i_itemNo, J2DPicture* i_pic1, J2DPicture* i_pic2, J2DPicture* i_pic3, J2DPicture* i_pic4);
DUSK_NOINLINE u8 dMeter2Info_getWarpRoomNo();
DUSK_NOINLINE u8 dMeter2Info_getWarpPlayerNo();
DUSK_NOINLINE cXyz& dMeter2Info_getWarpPos();
DUSK_NOINLINE const char* dMeter2Info_getWarpStageName();
DUSK_NOINLINE void dMeter2Info_setNowCount(u8 i_count);
DUSK_NOINLINE void dMeter2Info_setMaxCount(u8 i_count);
DUSK_NOINLINE BOOL dMeter2Info_isDirectUseItem(int param_0);
DUSK_NOINLINE bool dMeter2Info_isUseButton(int i_buttonBit);
DUSK_NOINLINE void dMeter2Info_setMeterMapClass(dMeterMap_c* i_map);
DUSK_NOINLINE void dMeter2Info_decHotSpringTimer();
DUSK_NOINLINE void dMeter2Info_allUseButton();
DUSK_NOINLINE void dMeter2Info_offUseButton(int i_buttonBit);
DUSK_NOINLINE void dMeter2Info_resetGameStatus();
DUSK_NOINLINE void dMeter2Info_onGameStatus(int i_status);
DUSK_NOINLINE void dMeter2Info_setMapStatus(u8 i_status);
DUSK_NOINLINE u8 dMeter2Info_getMapStatus();
DUSK_NOINLINE void dMeter2Info_setPauseStatus(u8 i_status);
DUSK_NOINLINE void dMeter2Info_resetPauseStatus();
DUSK_NOINLINE u8 dMeter2Info_getPauseStatus();
DUSK_NOINLINE bool dMeter2Info_isGameStatus(int i_status);
DUSK_NOINLINE bool dMeter2Info_isTouchKeyCheck(int i_status);
DUSK_NOINLINE void dMeter2Info_setMapKeyDirection(u16 i_direction);
DUSK_NOINLINE bool dMeter2Info_isSub2DStatus(int i_flag);
DUSK_NOINLINE void dMeter2Info_offMenuInForce(int i_flag);
DUSK_NOINLINE bool dMeter2Info_isMenuInForce(int i_flag);
DUSK_NOINLINE void dMeter2Info_setMenuWindowClass(dMw_c* i_menu);
DUSK_NOINLINE void dMeter2Info_resetWarpStatus();
DUSK_NOINLINE u16 dMeter2Info_getMapKeyDirection();
DUSK_NOINLINE u8 dMeter2Info_getWindowStatus();
DUSK_NOINLINE void dMeter2Info_setMsgResource(void* i_res);
DUSK_NOINLINE void dMeter2Info_setStageMsgResource(void* i_res);
DUSK_NOINLINE void dMeter2Info_setMsgUnitResource(void* i_res);
DUSK_NOINLINE void* dMeter2Info_getMsgResource();
DUSK_NOINLINE void* dMeter2Info_getStageMsgResource();
DUSK_NOINLINE void* dMeter2Info_getMsgUnitResource();
DUSK_NOINLINE u8 dMeter2Info_getLightDropGetFlag(int i_no);
DUSK_NOINLINE s32 dMeter2Info_getMeterStringType();
DUSK_NOINLINE void dMeter2Info_setMeterClass(dMeter2_c* i_meter);
DUSK_NOINLINE void dMeter2Info_onLifeGaugeSE();
DUSK_NOINLINE void dMeter2Info_offLifeGaugeSE();
DUSK_NOINLINE u8 dMeter2Info_getLifeGaugeSE();
DUSK_NOINLINE const char* dMeter2Info_getSaveStageName();
DUSK_NOINLINE void dMeter2Info_onShopTalkFlag();
DUSK_NOINLINE void dMeter2Info_setLightDropGetFlag(int i_no, u8 i_flag);
DUSK_NOINLINE u8 dMeter2Info_getRentalBombBag();
DUSK_NOINLINE u8 dMeter2Info_getMiniGameItemSetFlag();
DUSK_NOINLINE void dMeter2Info_setMiniGameItem(u8 i_minigameFlag);
DUSK_NOINLINE void dMeter2Info_resetMiniGameItem(bool i_saveItem);
DUSK_NOINLINE void dMeter2Info_setTableMapRegionNo(u8 i_regionNo);
DUSK_NOINLINE void dMeter2Info_setGoldWolfMapType(u8 i_mapType);
DUSK_NOINLINE void dMeter2Info_changeWater(u8 i_slotNo);
DUSK_NOINLINE void dMeter2Info_warpInProc();
DUSK_NOINLINE void dMeter2Info_warpOutProc();
DUSK_NOINLINE dMeter2_c* dMeter2Info_getMeterClass();
DUSK_NOINLINE s16 dMeter2Info_getMsgKeyWaitTimer();
DUSK_NOINLINE void dMeter2Info_onDirectUseItem(int param_0);
DUSK_NOINLINE void dMeter2Info_setFloatingFlow(u16 i_flowID, s16 i_msgTimer, bool i_wakuVisible);
DUSK_NOINLINE u8 dMeter2Info_getGameOverType();
DUSK_NOINLINE void dMeter2Info_setGameOverType(u8 i_gameoverType);
DUSK_NOINLINE void dMeter2Info_setMsgKeyWaitTimer(s16 i_waitTimer);
DUSK_NOINLINE s32 dMeter2Info_getMsgTimeMs();
DUSK_NOINLINE s32 dMeter2Info_getTimeMs();
DUSK_NOINLINE void dMeter2Info_setMsgTimeMs(s32 i_msgTime);
DUSK_NOINLINE void dMeter2Info_setTimeMs(s32 i_time);
DUSK_NOINLINE u8 dMeter2Info_getNowCount();
DUSK_NOINLINE u8 dMeter2Info_getMaxCount();
DUSK_NOINLINE void dMeter2Info_setScopeZoomPointer(u8 param_0);
DUSK_NOINLINE void dMeter2Info_decMsgKeyWaitTimer();
DUSK_NOINLINE bool dMeter2Info_isFloatingMessageVisible();
DUSK_NOINLINE u8 dMeter2Info_getItemExplainWindowStatus();
DUSK_NOINLINE void dMeter2Info_setItemExplainWindowStatus(u8 i_value);
DUSK_NOINLINE void dMeter2Info_resetDirectUseItem();
DUSK_NOINLINE u16 dMeter2Info_getFloatingFlowID();
DUSK_NOINLINE u8 dMeter2Info_getCollectCursorPosX();
DUSK_NOINLINE u8 dMeter2Info_getCollectCursorPosY();
DUSK_NOINLINE void dMeter2Info_setCollectCursorPosXY(u8 x, u8 y);
DUSK_NOINLINE void dMeter2Info_onBlinkButton(int i_flag);
DUSK_NOINLINE bool dMeter2Info_isFloatingMessageWakuVisible();
DUSK_NOINLINE bool dMeter2Info_isBlinkButton(int i_flag);
DUSK_NOINLINE void dMeter2Info_resetBlinkButton();
DUSK_NOINLINE void dMeter2Info_resetFloatingMessage();
DUSK_NOINLINE s16 dMeter2Info_decFloatingMessageTimer();
DUSK_NOINLINE s16 dMeter2Info_getFloatingMessageTimer();
DUSK_NOINLINE u16 dMeter2Info_getFloatingMessageID();
DUSK_NOINLINE s16 dMeter2Info_getHorseLifeCount();
DUSK_NOINLINE void dMeter2Info_setMeterString(s32 i_string);
DUSK_NOINLINE void dMeter2Info_resetMeterString();
DUSK_NOINLINE void dMeter2Info_setMeterItemPanePtr(int i_no, CPaneMgr* i_pane);
DUSK_NOINLINE bool dMeter2Info_isShopTalkFlag();
DUSK_NOINLINE void dMeter2Info_setMapDrugFlag(bool i_flag);
DUSK_NOINLINE bool dMeter2Info_isTempBit(int i_bit);
DUSK_NOINLINE void dMeter2Info_offSub2DStatus(int i_bit);
DUSK_NOINLINE void dMeter2Info_onSub2DStatus(int i_bit);
DUSK_NOINLINE void dMeter2Info_set2DWidth(f32 i_width);
DUSK_NOINLINE void dMeter2Info_set2DHeight(f32 i_height);
DUSK_NOINLINE void dMeter2Info_set2DPosH(f32 i_posH);
DUSK_NOINLINE void dMeter2Info_set2DPosV(f32 i_posV);
DUSK_NOINLINE void dMeter2Info_offShopTalkFlag();
DUSK_NOINLINE void dMeter2Info_onUseButton(int i_button);
DUSK_NOINLINE f32 dMeter2Info_get2DWidth();
DUSK_NOINLINE f32 dMeter2Info_get2DHeight();
DUSK_NOINLINE void dMeter2Info_setWarpInfo(const char* i_stageName, const cXyz& i_position,
s16 i_angle, u8 i_roomNo, u8 param_4, u8 i_warpPlayerNo);
DUSK_NOINLINE u8 dMeter2Info_getTableMapRegionNo();
DUSK_NOINLINE u8 dMeter2Info_getGoldWolfMapType();
DUSK_NOINLINE bool dMeter2Info_isWindowAccept(int param_0);
DUSK_NOINLINE void dMeter2Info_setHorseLifeCount(s16 i_count);
DUSK_NOINLINE void dMeter2Info_offTempBit(int i_bit);
DUSK_NOINLINE void dMeter2Info_onTempBit(int i_bit);
DUSK_NOINLINE void dMeter2Info_setFloatingMessage(u16 i_msgID, s16 i_msgTimer, bool i_wakuVisible);
DUSK_NOINLINE void dMeter2Info_setMiniGameCount(s8 i_count);
DUSK_NOINLINE void dMeter2Info_onWindowAccept(int param_0);
DUSK_NOINLINE void dMeter2Info_offWindowAccept(int param_0);
DUSK_NOINLINE void dMeter2Info_onMenuInForce(int param_0);
#else
inline void dMeter2Info_Initialize() {
g_meter2_info.init();
}
@@ -865,4 +1009,6 @@ inline void dMeter2Info_onMenuInForce(int param_0) {
g_meter2_info.onMenuInForce(param_0);
}
#endif
#endif /* D_METER_D_METER2_INFO_H */
include/d/d_msg_class.h
+33
View File
@@ -121,6 +121,25 @@ struct jmessage_tReference : public JMessage::TReference {
void setDemoFrame(u32 i_frame) { mDemoFrame = i_frame; }
void setTopColorType(u8 i_colorType) { mTopColorType = i_colorType; }
void setNowColorType(u8 i_colorType) { mNowColorType = i_colorType; }
#if TARGET_PC
void resetColors() {
mNowCCColor = 0xFFFFFFFF;
mNowGCColor = 0xFFFFFFFF;
mTopCCColor = 0xFFFFFFFF;
mTopGCColor = 0xFFFFFFFF;
mNowFullColor = false;
mTopFullColor = false;
}
void setFullColor(u32 ccColor, u32 gcColor) {
mNowCCColor = ccColor;
mNowGCColor = gcColor;
mNowFullColor = true;
}
void clearNowFullColor() { mNowFullColor = false; }
bool hasTopFullColor() { return mTopFullColor; }
u32 getTopCCColor() { return mTopCCColor; }
u32 getTopGCColor() { return mTopGCColor; }
#endif
void setTopTagScale(u16 i_tagScale) { mTopTagScale = i_tagScale; }
void setNowTagScale(u16 i_tagScale) { mNowTagScale = i_tagScale; }
void setRevoMessageID(u32 i_msgID) { mRevoMessageID = i_msgID; }
@@ -365,6 +384,14 @@ struct jmessage_tReference : public JMessage::TReference {
/* 0x1274 */ bool mSelectSetCancelFlag;
/* 0x1275 */ bool mBombNameUseFlag;
/* 0x1276 */ u8 mBatchColorFlag;
#if TARGET_PC
u32 mNowCCColor;
u32 mNowGCColor;
u32 mTopCCColor;
u32 mTopGCColor;
bool mNowFullColor;
bool mTopFullColor;
#endif
}; // Size: 0x1278
struct jmessage_tMeasureProcessor : public JMessage::TRenderingProcessor {
@@ -462,6 +489,9 @@ struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor {
void do_selwidthcenter(int);
void do_heightcenter();
void do_color(u8);
#if TARGET_PC
void do_fullcolor(u32 ccColor, u32 gcColor);
#endif
void do_scale(f32);
void do_linedown(s16);
void do_transY(s16, bool);
@@ -640,6 +670,9 @@ struct jmessage_string_tRenderingProcessor : public JMessage::TRenderingProcesso
void do_rubystrcat(char*);
void do_outfont(u8);
void do_color(u8);
#if TARGET_PC
void do_fullcolor(u32 ccColor, u32 gcColor);
#endif
void do_scale(f32);
void do_linedown(s16);
void do_numset(s16);
include/d/d_msg_out_font.h
+2 -2
View File
@@ -25,7 +25,7 @@ public:
void setTextBoxPtr(J2DTextBox* p_textBox) { mpTextBoxPtr = p_textBox; }
void resetType() { mType = 0x47; }
private:
// private:
/* 0x04 */ J2DTextBox* mpTextBoxPtr;
/* 0x08 */ f32 mPosX;
/* 0x0C */ f32 mPosY;
@@ -53,7 +53,7 @@ public:
void setRupeeColor(u8 color) { mRupeeColor = color; }
private:
// private:
/* 0x004 */ COutFontSet_c* mpOfs[35];
/* 0x090 */ J2DPicture* mpPane[70];
/* 0x1A8 */ f32 mAlphaRatio;
include/d/d_name.h
-28
View File
@@ -12,34 +12,6 @@ class J2DTextBox;
class JUTFont;
class STControl;
#if TARGET_PC
struct PaneCache {
u64 tag;
f32 origTransX;
f32 origTransY;
bool cached;
};
static PaneCache l_tagName[] = {
{MULTI_CHAR('m_00_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_00_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_00_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_00_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_00_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_01_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_01_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_01_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_01_3'), 0.0f, 0.0f, false},
{MULTI_CHAR('m_01_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m03_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m03_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m03_2'), 0.0f, 0.0f, false},
{MULTI_CHAR('m03_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m03_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_05_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_05_1'), 0.0f, 0.0f, false},
{MULTI_CHAR('m_05_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_05_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_05_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_07_0'), 0.0f, 0.0f, false},
{MULTI_CHAR('m_07_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_07_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_07_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_07_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_4'), 0.0f, 0.0f, false},
{MULTI_CHAR('m_09_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_09_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_09_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_09_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_09_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_10_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_10_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_10_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_10_3'), 0.0f, 0.0f, false},
{MULTI_CHAR('m_10_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m12_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m12_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m12_2'), 0.0f, 0.0f, false},
{MULTI_CHAR('m12_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m12_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('p_end_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('p_end_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('p_end_0'), 0.0f, 0.0f, false},
};
static PaneCache l_nameTagName[] = {
{MULTI_CHAR('name_00'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_01'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_02'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_03'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_04'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_05'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_06'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_07'), 0.0f, 0.0f, false},
};
static PaneCache l_nameCurTagName[] = {
{MULTI_CHAR('s__n_00'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_01'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_02'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_03'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_04'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_05'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_06'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_07'), 0.0f, 0.0f, false},
};
#endif
class dNm_HIO_c {
public:
dNm_HIO_c();