d_error_msg mostly done, little Z2LinkMgr work (#2248)

This commit is contained in:
TakaRikka
2024-11-12 02:41:55 -08:00
committed by GitHub
parent f2a7b2a83a
commit ebd7e3feed
14 changed files with 426 additions and 466 deletions
+13 -1
View File
@@ -76,7 +76,11 @@ public:
/* 8021C7F4 */ virtual JUTFont* getFont() const { return mFont; }
/* 80254408 */ virtual bool setBlack(JUtility::TColor);
/* 80186C84 */ virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
/* 8019230C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 8019230C */ virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
mBlackColor = black;
mWhiteColor = white;
return true;
}
/* 801DFA34 */ virtual JUtility::TColor getBlack() const {
return mBlackColor;
}
@@ -126,6 +130,14 @@ public:
mGradientColor = i_GradientColor;
}
void setCharColor(JUtility::TColor i_charColor) {
mCharColor.set(i_charColor);
}
void setGradColor(JUtility::TColor i_GradientColor) {
mGradientColor.set(i_GradientColor);
}
void setCharSpace(f32 space) { mCharSpacing = space; }
f32 getCharSpace() const { return mCharSpacing; }
void setLineSpace(f32 space) { mLineSpacing = space; }
+1
View File
@@ -98,6 +98,7 @@ public:
void setDrawDoneMethod(EDrawDone drawDone) { mDrawDoneMethod = drawDone; }
void setFader(JUTFader* fader) { mFader = fader; }
void resetFader() { setFader(NULL); }
JUTFader* getFader() const { return mFader; }
void setClearColor(JUtility::TColor color) { mClearColor = color; }
+3
View File
@@ -100,6 +100,9 @@ public:
static bool isLeadByte_ShiftJIS(int b) {
return (b >= 0x81 && b <= 0x9f) || (b >= 0xe0 && b <= 0xfc);
}
static bool isLeadByte_EUC(int b) {
return (b >= 0xA1 && b <= 0xFE) || b == 0x8E;
}
void initialize_state();
void setCharColor(JUtility::TColor col1);
+2 -1
View File
@@ -29,8 +29,9 @@ public:
void resetRecover();
bool hasReset() const;
static Z2AudioMgr* getInterface() { return mAudioMgrPtr; }
bool isResetting() { return mResettingFlag; }
static Z2AudioMgr* getInterface() { return mAudioMgrPtr; }
static Z2AudioMgr* mAudioMgrPtr;
/* 0x0514 */ virtual bool startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
+2 -2
View File
@@ -64,8 +64,8 @@ public:
void setRiding(bool);
void setMagnetized(bool);
void setWolfEyeOpen(bool);
void startLinkSound(JAISoundID, u32, s8);
void startLinkSoundLevel(JAISoundID, u32, s8);
Z2SoundHandlePool* startLinkSound(JAISoundID, u32, s8);
JAISoundHandle* startLinkSoundLevel(JAISoundID, u32, s8);
void startLinkVoice(JAISoundID, s8);
void startLinkVoiceLevel(JAISoundID, s8);
void startLinkSwordSound(JAISoundID, u32, s8);
+7
View File
@@ -30,6 +30,13 @@ public:
void stopAllSounds(u32 fadeout);
void stopSound(JAISoundID soundID, u32 param_1) {
JAISoundHandle* phandle = getHandleSoundID(soundID);
if (phandle != NULL) {
(*phandle)->stop(param_1);
}
}
void setPos(const JGeometry::TVec3<f32>& pos);
int getNumHandles() const { return getNumLinks(); }
+1 -7
View File
@@ -8,14 +8,8 @@ struct dShutdownErrorMsg_c {
};
struct dDvdErrorMsg_c {
/* 8009D194 */ void draw(s32);
/* 8009D194 */ static void draw(s32);
/* 8009D354 */ static u8 execute();
};
struct J2DOrthoGraph {
/* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32);
/* 802E97B4 */ void setPort();
/* 802E980C */ void setOrtho(JGeometry::TBox2<f32> const&, f32, f32);
};
#endif /* D_D_ERROR_MSG_H */
+1
View File
@@ -7,6 +7,7 @@
class JUTFader;
int mDoGph_Create();
void mDoGph_drawFilterQuad(s8 param_0, s8 param_1);
extern bool data_80450BE7; // AutoForcus