d_place_name 90%

This commit is contained in:
Jasper St. Pierre
2023-10-15 21:21:07 -07:00
parent c9485926d6
commit 09c4a4dfc7
9 changed files with 268 additions and 48 deletions
+2
View File
@@ -69,6 +69,8 @@ public:
u8 getAlpha() const { return mAlpha; }
void setAlpha(u8 alpha) { mAlpha = alpha; }
bool isConnectParent() const { return mIsConnectParent; }
void show() { mVisible = true; }
void hide() { mVisible = false; }
public:
/* 0x04 */ u32 mMagic;
+8 -1
View File
@@ -9,6 +9,12 @@ class JKRArchive;
class J2DScreen : public J2DPane {
public:
J2DScreen(J2DPane* parent, bool visible, u32 tag, const JGeometry::TBox2<f32>& bounds)
: J2DPane(parent, visible, tag, bounds)
, mColor()
, mbClipToParent(false)
{}
virtual ~J2DScreen();
virtual u16 getTypeID() { return 0x08; }
virtual void calcMtx() { makeMatrix(mBounds.i.x, mBounds.i.y); }
@@ -16,10 +22,11 @@ public:
virtual J2DPane* search(u32 tag);
virtual J2DPane* createPane(J2DPane::J2DScrnBlockHeader const & header, JSURandomInputStream * pStream, J2DPane * pParent);
protected:
void draw(f32 x, f32 y, const J2DGrafContext * pCtx);
bool set(const char *pName, JKRArchive * pArc);
bool set(JSURandomInputStream * pStream);
protected:
s32 makeHierarchyPanes(J2DPane * pParent, JSURandomInputStream * pStream);
bool checkSignature(JSURandomInputStream * pStream);
bool getScreenInformation(JSURandomInputStream * pStream);
+15 -1
View File
@@ -385,6 +385,8 @@ public:
void setCurrentView(view_class* i_view) { mCurrentView = i_view; }
void setCurrentViewport(view_port_class* i_viewport) { mCurrentViewport = i_viewport; }
J2DOrthoGraph* getCurrentGrafPort() { return mCurrentGrafPort; }
void setMsgArchive(JKRArchive * pArc) { mpMsgArchive = pArc; }
void setDmsgArchive(JKRArchive * pArc) { mpDmsgArchive = pArc; }
void setTmsgArchive(JKRArchive * pArc) { mpTmsgArchive = pArc; }
@@ -552,7 +554,7 @@ public:
/* 0x4955 */ u8 field_0x4955;
/* 0x4956 */ u8 field_0x4956;
/* 0x4957 */ u8 mPlacenameIndex;
/* 0x4958 */ u8 field_0x4958;
/* 0x4958 */ u8 mPlacenameState;
/* 0x4959 */ u8 field_0x4959;
/* 0x495A */ u8 field_0x495a;
/* 0x495B */ u8 field_0x495b;
@@ -1081,6 +1083,10 @@ inline const char* dComIfGp_getStartStageName() {
return g_dComIfG_gameInfo.play.getStartStageName();
}
inline u32 dComIfGp_getNowStageNum() {
return g_dComIfG_gameInfo.play.mPlacenameIndex;
}
inline s8 dComIfGp_getStartStageRoomNo() {
return g_dComIfG_gameInfo.play.getStartStageRoomNo();
}
@@ -1517,6 +1523,10 @@ inline dADM_CharTbl* dComIfGp_CharTbl() {
return &g_dComIfG_gameInfo.play.mADM.mCharTbl;
}
inline J2DOrthoGraph* dComIfGp_getCurrentGrafPort() {
return g_dComIfG_gameInfo.play.getCurrentGrafPort();
}
/**
* === EVENT ===*/
@@ -1915,6 +1925,10 @@ inline void* dComIfG_getObjectIDRes(const char* arcName, u16 id) {
return g_dComIfG_gameInfo.mResControl.getObjectIDRes(arcName, id);
}
inline dRes_info_c* dComIfG_getObjectResInfo(const char* arcName) {
return g_dComIfG_gameInfo.mResControl.getObjectResInfo(arcName);
}
/**
* === PARTICLE ===
*/
+1 -1
View File
@@ -13,7 +13,7 @@ class cM3dGPla;
class dDlst_base_c {
public:
dDlst_base_c() {}
virtual ~dDlst_base_c();
virtual ~dDlst_base_c() {}
virtual void draw();
};
+5 -1
View File
@@ -6,11 +6,15 @@
class fopAc_ac_c;
struct msg_method_class {
/* 0x00 */ leafdraw_method_class base;
};
class msg_class : public leafdraw_class {
public:
/* 0xC0 */ int mMsgType;
/* 0xC4 */ create_tag_class mDwTg;
/* 0xD8 */ leafdraw_method_class* mSubMtd;
/* 0xD8 */ msg_method_class* mSubMtd;
/* 0xDC */ fopAc_ac_c* mpActor;
/* 0xE0 */ cXyz mPos;
/* 0xEC */ u32 mMsgID;
+21 -3
View File
@@ -12,7 +12,7 @@ class msg_class;
struct msg_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition mBase;
/* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x24 */ msg_method_class* mSubMtd; // Subclass methods
};
struct fopMsg_prm_class {
@@ -39,12 +39,26 @@ struct fopMsg_prm_timer {
/* 0x34 */ f32 field_0x34;
}; // Size: 0x38
class J2DScreen;
struct fopMsgM_pane_class {
/* 0x00 */ J2DScreen * scrn;
/* 0x04 */ cXy mPosTopLeftOrig;
/* 0x0C */ cXy mPosTopLeft;
/* 0x14 */ cXy mPosCenterOrig;
/* 0x1C */ cXy mPosCenter;
/* 0x24 */ cXy mSizeOrig;
/* 0x2C */ cXy mSize;
/* 0x34 */ u8 mAlphaOrig;
/* 0x35 */ u8 mAlpha;
/* 0x36 */ s16 mUserArea;
};
typedef int (*fopMsgCreateFunc)(void*);
JKRExpHeap* fopMsgM_createExpHeap(u32, JKRHeap*);
u32 fopMsgM_Create(s16, fopMsgCreateFunc, void*);
s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3, u32* param_4,
fopMsgCreateFunc createFunc);
s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3, u32* param_4, fopMsgCreateFunc createFunc);
void fopMsgM_Delete(void* process);
fopMsg_prm_class* fopMsgM_GetAppend(void* msg);
void fopMsgM_setMessageID(unsigned int);
@@ -66,6 +80,10 @@ inline s32 fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3
param_8, createFunc);
}
void fopMsgM_setPaneData(fopMsgM_pane_class*, J2DScreen*, unsigned long);
void fopMsgM_setNowAlpha(fopMsgM_pane_class*, f32);
void fopMsgM_setAlpha(fopMsgM_pane_class*);
u32 fopMsgM_searchMessageNumber(u32);
void fopMsgM_messageSendOn();