mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
d_s_room / d_a_bg first pass
This commit is contained in:
@@ -15,8 +15,8 @@ lbl_804582B8:
|
|||||||
/* 804582EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
/* 804582EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||||
/* 804582F0 3C 63 00 02 */ addis r3, r3, 2
|
/* 804582F0 3C 63 00 02 */ addis r3, r3, 2
|
||||||
/* 804582F4 3B A3 D4 F8 */ addi r29, r3, -11016
|
/* 804582F4 3B A3 D4 F8 */ addi r29, r3, -11016
|
||||||
/* 804582F8 3C 60 80 46 */ lis r3, data_80459424@ha /* 0x80459424@ha */
|
/* 804582F8 3C 60 80 46 */ lis r3, l_modelName@ha /* 0x80459424@ha */
|
||||||
/* 804582FC 3A C3 94 24 */ addi r22, r3, data_80459424@l /* 0x80459424@l */
|
/* 804582FC 3A C3 94 24 */ addi r22, r3, l_modelName@l /* 0x80459424@l */
|
||||||
lbl_80458300:
|
lbl_80458300:
|
||||||
/* 80458300 7F 83 E3 78 */ mr r3, r28
|
/* 80458300 7F 83 E3 78 */ mr r3, r28
|
||||||
/* 80458304 7C 96 DA 14 */ add r4, r22, r27
|
/* 80458304 7C 96 DA 14 */ add r4, r22, r27
|
||||||
@@ -26,8 +26,8 @@ lbl_80458300:
|
|||||||
/* 80458314 7C 78 1B 79 */ or. r24, r3, r3
|
/* 80458314 7C 78 1B 79 */ or. r24, r3, r3
|
||||||
/* 80458318 40 82 00 24 */ bne lbl_8045833C
|
/* 80458318 40 82 00 24 */ bne lbl_8045833C
|
||||||
/* 8045831C 7F 83 E3 78 */ mr r3, r28
|
/* 8045831C 7F 83 E3 78 */ mr r3, r28
|
||||||
/* 80458320 3C 80 80 46 */ lis r4, data_80459468@ha /* 0x80459468@ha */
|
/* 80458320 3C 80 80 46 */ lis r4, l_modelName2@ha /* 0x80459468@ha */
|
||||||
/* 80458324 38 04 94 68 */ addi r0, r4, data_80459468@l /* 0x80459468@l */
|
/* 80458324 38 04 94 68 */ addi r0, r4, l_modelName2@l /* 0x80459468@l */
|
||||||
/* 80458328 7C 80 DA 14 */ add r4, r0, r27
|
/* 80458328 7C 80 DA 14 */ add r4, r0, r27
|
||||||
/* 8045832C 7F A5 EB 78 */ mr r5, r29
|
/* 8045832C 7F A5 EB 78 */ mr r5, r29
|
||||||
/* 80458330 38 C0 00 40 */ li r6, 0x40
|
/* 80458330 38 C0 00 40 */ li r6, 0x40
|
||||||
@@ -55,8 +55,8 @@ lbl_80458374:
|
|||||||
/* 8045837C 7C 03 00 40 */ cmplw r3, r0
|
/* 8045837C 7C 03 00 40 */ cmplw r3, r0
|
||||||
/* 80458380 41 80 FF E0 */ blt lbl_80458360
|
/* 80458380 41 80 FF E0 */ blt lbl_80458360
|
||||||
/* 80458384 7F 83 E3 78 */ mr r3, r28
|
/* 80458384 7F 83 E3 78 */ mr r3, r28
|
||||||
/* 80458388 3C 80 80 46 */ lis r4, data_804594AC@ha /* 0x804594AC@ha */
|
/* 80458388 3C 80 80 46 */ lis r4, l_btkName@ha /* 0x804594AC@ha */
|
||||||
/* 8045838C 38 04 94 AC */ addi r0, r4, data_804594AC@l /* 0x804594AC@l */
|
/* 8045838C 38 04 94 AC */ addi r0, r4, l_btkName@l /* 0x804594AC@l */
|
||||||
/* 80458390 7C 80 DA 14 */ add r4, r0, r27
|
/* 80458390 7C 80 DA 14 */ add r4, r0, r27
|
||||||
/* 80458394 7F A5 EB 78 */ mr r5, r29
|
/* 80458394 7F A5 EB 78 */ mr r5, r29
|
||||||
/* 80458398 38 C0 00 40 */ li r6, 0x40
|
/* 80458398 38 C0 00 40 */ li r6, 0x40
|
||||||
@@ -91,8 +91,8 @@ lbl_804583F8:
|
|||||||
/* 804583FC C0 03 93 88 */ lfs f0, lit_4125@l(r3) /* 0x80459388@l */
|
/* 804583FC C0 03 93 88 */ lfs f0, lit_4125@l(r3) /* 0x80459388@l */
|
||||||
/* 80458400 D0 1E 00 10 */ stfs f0, 0x10(r30)
|
/* 80458400 D0 1E 00 10 */ stfs f0, 0x10(r30)
|
||||||
/* 80458404 7F 83 E3 78 */ mr r3, r28
|
/* 80458404 7F 83 E3 78 */ mr r3, r28
|
||||||
/* 80458408 3C 80 80 46 */ lis r4, data_804594F0@ha /* 0x804594F0@ha */
|
/* 80458408 3C 80 80 46 */ lis r4, l_brkName@ha /* 0x804594F0@ha */
|
||||||
/* 8045840C 38 04 94 F0 */ addi r0, r4, data_804594F0@l /* 0x804594F0@l */
|
/* 8045840C 38 04 94 F0 */ addi r0, r4, l_brkName@l /* 0x804594F0@l */
|
||||||
/* 80458410 7C 80 DA 14 */ add r4, r0, r27
|
/* 80458410 7C 80 DA 14 */ add r4, r0, r27
|
||||||
/* 80458414 7F A5 EB 78 */ mr r5, r29
|
/* 80458414 7F A5 EB 78 */ mr r5, r29
|
||||||
/* 80458418 38 C0 00 40 */ li r6, 0x40
|
/* 80458418 38 C0 00 40 */ li r6, 0x40
|
||||||
|
|||||||
@@ -106,8 +106,8 @@ lbl_80458A38:
|
|||||||
/* 80458A44 41 80 FF AC */ blt lbl_804589F0
|
/* 80458A44 41 80 FF AC */ blt lbl_804589F0
|
||||||
/* 80458A48 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
|
/* 80458A48 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
|
||||||
/* 80458A4C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
|
/* 80458A4C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
|
||||||
/* 80458A50 3C 80 80 46 */ lis r4, data_80459534@ha /* 0x80459534@ha */
|
/* 80458A50 3C 80 80 46 */ lis r4, l_tevStrType@ha /* 0x80459534@ha */
|
||||||
/* 80458A54 38 84 95 34 */ addi r4, r4, data_80459534@l /* 0x80459534@l */
|
/* 80458A54 38 84 95 34 */ addi r4, r4, l_tevStrType@l /* 0x80459534@l */
|
||||||
/* 80458A58 7C 84 F0 2E */ lwzx r4, r4, r30
|
/* 80458A58 7C 84 F0 2E */ lwzx r4, r4, r30
|
||||||
/* 80458A5C 38 A0 00 00 */ li r5, 0
|
/* 80458A5C 38 A0 00 00 */ li r5, 0
|
||||||
/* 80458A60 80 D6 00 0C */ lwz r6, 0xc(r22)
|
/* 80458A60 80 D6 00 0C */ lwz r6, 0xc(r22)
|
||||||
|
|||||||
@@ -368,6 +368,9 @@ public:
|
|||||||
calcTransform(getFrame(), param_0, pSRTInfo);
|
calcTransform(getFrame(), param_0, pSRTInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u16 getUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx]; }
|
||||||
|
u16 getUpdateMaterialNum() const { return field_0x14 / 3; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/* 0x0C */ int field_0xc;
|
/* 0x0C */ int field_0xc;
|
||||||
/* 0x10 */ int field_0x10;
|
/* 0x10 */ int field_0x10;
|
||||||
@@ -379,7 +382,7 @@ private:
|
|||||||
/* 0x20 */ int field_0x20;
|
/* 0x20 */ int field_0x20;
|
||||||
/* 0x24 */ int field_0x24;
|
/* 0x24 */ int field_0x24;
|
||||||
/* 0x28 */ u8 mUpdateTexMtxID[4];
|
/* 0x28 */ u8 mUpdateTexMtxID[4];
|
||||||
/* 0x2C */ u16 mUpdateMaterialID[2];
|
/* 0x2C */ u16* mUpdateMaterialID;
|
||||||
/* 0x30 */ JUTNameTab field_0x30;
|
/* 0x30 */ JUTNameTab field_0x30;
|
||||||
/* 0x40 */ int field_0x40;
|
/* 0x40 */ int field_0x40;
|
||||||
/* 0x44 */ u16 field_0x44;
|
/* 0x44 */ u16 field_0x44;
|
||||||
@@ -427,6 +430,12 @@ public:
|
|||||||
/* 8032BD9C */ virtual ~J3DAnmTevRegKey();
|
/* 8032BD9C */ virtual ~J3DAnmTevRegKey();
|
||||||
/* 8032BE24 */ virtual s32 getKind() const;
|
/* 8032BE24 */ virtual s32 getKind() const;
|
||||||
|
|
||||||
|
u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
|
||||||
|
u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; }
|
||||||
|
|
||||||
|
u16 getCRegUpdateMaterialID(u16 idx) const { return mCRegUpdateMaterialID[idx]; }
|
||||||
|
u16 getKRegUpdateMaterialID(u16 idx) const { return mKRegUpdateMaterialID[idx]; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/* 0x0C */ u16 mCRegUpdateMaterialNum;
|
/* 0x0C */ u16 mCRegUpdateMaterialNum;
|
||||||
/* 0x0E */ u16 mKRegUpdateMaterialNum;
|
/* 0x0E */ u16 mKRegUpdateMaterialNum;
|
||||||
@@ -438,8 +447,10 @@ private:
|
|||||||
/* 0x1A */ u16 field_0x1a;
|
/* 0x1A */ u16 field_0x1a;
|
||||||
/* 0x1C */ u16 field_0x1c;
|
/* 0x1C */ u16 field_0x1c;
|
||||||
/* 0x1E */ u16 field_0x1e;
|
/* 0x1E */ u16 field_0x1e;
|
||||||
/* 0x20 */ u16 mCRegUpdateMaterialID[20];
|
/* 0x20 */ u16* mCRegUpdateMaterialID;
|
||||||
/* 0x34 */ u16 mKRegUpdateMaterialID[20];
|
/* 0x24 */ u8 field_0x24[0x34 - 0x24];
|
||||||
|
/* 0x34 */ u16* mKRegUpdateMaterialID;
|
||||||
|
/* 0x38 */ u8 field_0x38[0x48 - 0x38];
|
||||||
/* 0x48 */ void* field_0x48;
|
/* 0x48 */ void* field_0x48;
|
||||||
/* 0x4C */ void* field_0x4c;
|
/* 0x4C */ void* field_0x4c;
|
||||||
/* 0x50 */ int field_0x50;
|
/* 0x50 */ int field_0x50;
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ public:
|
|||||||
J3DTexture* getTexture() const { return mTexture; }
|
J3DTexture* getTexture() const { return mTexture; }
|
||||||
JUTNameTab* getTextureName() const { return mTextureName; }
|
JUTNameTab* getTextureName() const { return mTextureName; }
|
||||||
|
|
||||||
|
JUTNameTab* getMaterialName() const { return mMaterialName; }
|
||||||
|
|
||||||
u16 getMaterialNum() const { return mMaterialNum; }
|
u16 getMaterialNum() const { return mMaterialNum; }
|
||||||
bool isLocked() const { return field_0x1c == 1; }
|
bool isLocked() const { return field_0x1c == 1; }
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public:
|
|||||||
/* 8032617C */ virtual ~J3DModelData();
|
/* 8032617C */ virtual ~J3DModelData();
|
||||||
|
|
||||||
J3DMaterialTable& getMaterialTable() { return mMaterialTable; }
|
J3DMaterialTable& getMaterialTable() { return mMaterialTable; }
|
||||||
|
JUTNameTab* getMaterialName() const { return mMaterialTable.getMaterialName(); }
|
||||||
J3DVertexData& getVertexData() { return mVertexData; }
|
J3DVertexData& getVertexData() { return mVertexData; }
|
||||||
u16 getShapeNum() const { return mShapeTable.getShapeNum(); }
|
u16 getShapeNum() const { return mShapeTable.getShapeNum(); }
|
||||||
u16 getMaterialNum() const { return mMaterialTable.getMaterialNum(); }
|
u16 getMaterialNum() const { return mMaterialTable.getMaterialNum(); }
|
||||||
|
|||||||
@@ -63,6 +63,8 @@ public:
|
|||||||
u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); }
|
u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); }
|
||||||
|
|
||||||
void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
|
void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
|
||||||
|
void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); }
|
||||||
|
void setMaterialAnm(J3DMaterialAnm* i_anm) { mMaterialAnm = i_anm; }
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/* 0x04 */ J3DMaterial* mNext;
|
/* 0x04 */ J3DMaterial* mNext;
|
||||||
|
|||||||
@@ -97,16 +97,19 @@ public:
|
|||||||
void setScaleFlagArray(u8* pScaleFlagArray) { mScaleFlagArray = pScaleFlagArray; }
|
void setScaleFlagArray(u8* pScaleFlagArray) { mScaleFlagArray = pScaleFlagArray; }
|
||||||
void setDrawMtx(Mtx** pDrawMtx) { mDrawMtx = pDrawMtx; }
|
void setDrawMtx(Mtx** pDrawMtx) { mDrawMtx = pDrawMtx; }
|
||||||
void setNrmMtx(Mtx33** pNrmMtx) { mNrmMtx = pNrmMtx; }
|
void setNrmMtx(Mtx33** pNrmMtx) { mNrmMtx = pNrmMtx; }
|
||||||
|
void setTexMtxLoadType(u32 type) { mFlags = (mFlags & 0xFFFF0FFF) | type; }
|
||||||
bool getNBTFlag() const { return mHasNBT; }
|
bool getNBTFlag() const { return mHasNBT; }
|
||||||
u32 getBumpMtxOffset() const { return mBumpMtxOffset; }
|
u32 getBumpMtxOffset() const { return mBumpMtxOffset; }
|
||||||
|
|
||||||
inline J3DMaterial* getMaterial() const { return mMaterial; }
|
J3DMaterial* getMaterial() const { return mMaterial; }
|
||||||
inline u32 getIndex() const { return mIndex; }
|
u32 getIndex() const { return mIndex; }
|
||||||
inline u32 getPipeline() const { return (mFlags >> 2) & 0x07; }
|
u32 getPipeline() const { return (mFlags >> 2) & 0x07; }
|
||||||
inline u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
|
u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
|
||||||
inline u32 getMtxGroupNum() const { return mMtxGroupNum; }
|
u32 getMtxGroupNum() const { return mMtxGroupNum; }
|
||||||
inline J3DShapeDraw* getShapeDraw(u32 idx) const { return mShapeDraw[idx]; }
|
J3DShapeDraw* getShapeDraw(u32 idx) const { return mShapeDraw[idx]; }
|
||||||
inline J3DShapeMtx* getShapeMtx(u32 idx) const { return mShapeMtx[idx]; }
|
J3DShapeMtx* getShapeMtx(u32 idx) const { return mShapeMtx[idx]; }
|
||||||
|
Vec* getMin() { return &mMin; }
|
||||||
|
Vec* getMax() { return &mMax; }
|
||||||
|
|
||||||
static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
|
static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ class dBgW_Base : public cBgW_BgId {
|
|||||||
public:
|
public:
|
||||||
enum PushPullLabel {};
|
enum PushPullLabel {};
|
||||||
|
|
||||||
|
enum PRIORITY {
|
||||||
|
PRIORITY_0,
|
||||||
|
};
|
||||||
|
|
||||||
typedef s32 (*PushPull_CallBack)(cBgS_PolyInfo const&, fopAc_ac_c*, s16,
|
typedef s32 (*PushPull_CallBack)(cBgS_PolyInfo const&, fopAc_ac_c*, s16,
|
||||||
dBgW_Base::PushPullLabel);
|
dBgW_Base::PushPullLabel);
|
||||||
|
|
||||||
@@ -91,6 +95,7 @@ public:
|
|||||||
bool ChkPushPullOk() const { return m_pushPull_Ok; }
|
bool ChkPushPullOk() const { return m_pushPull_Ok; }
|
||||||
void SetRoomId(int id) { m_roomId = id; }
|
void SetRoomId(int id) { m_roomId = id; }
|
||||||
bool ChkPriority(int prio) { return m_priority == prio; }
|
bool ChkPriority(int prio) { return m_priority == prio; }
|
||||||
|
void SetPriority(PRIORITY priority) { m_priority = priority; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/* 0x08 */ u8 m_priority;
|
/* 0x08 */ u8 m_priority;
|
||||||
|
|||||||
@@ -825,6 +825,7 @@ BOOL dComIfGs_isEventBit(u16 i_flag);
|
|||||||
int dComIfGs_isItemFirstBit(u8 i_no);
|
int dComIfGs_isItemFirstBit(u8 i_no);
|
||||||
u16 dComIfGs_getRupee();
|
u16 dComIfGs_getRupee();
|
||||||
static u16 dComIfGs_getLife();
|
static u16 dComIfGs_getLife();
|
||||||
|
s8 dComIfGs_BossLife_public_Get();
|
||||||
|
|
||||||
inline void dComIfGs_init() {
|
inline void dComIfGs_init() {
|
||||||
g_dComIfG_gameInfo.info.init();
|
g_dComIfG_gameInfo.info.init();
|
||||||
@@ -1523,6 +1524,10 @@ inline void dComIfGs_setMemoryToCard(u8* i_saveData, int i_dataNum) {
|
|||||||
g_dComIfG_gameInfo.info.memory_to_card((char*)i_saveData, i_dataNum);
|
g_dComIfG_gameInfo.info.memory_to_card((char*)i_saveData, i_dataNum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline int dComIfGs_createZone(int roomNo) {
|
||||||
|
return g_dComIfG_gameInfo.info.createZone(roomNo);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void dComIfGp_setSelectItem(int index);
|
void dComIfGp_setSelectItem(int index);
|
||||||
s32 dComIfGp_offHeapLockFlag(int flag);
|
s32 dComIfGp_offHeapLockFlag(int flag);
|
||||||
@@ -1544,6 +1549,7 @@ int dComIfGp_getSelectItemMaxNum(int index);
|
|||||||
void dComIfGp_mapShow();
|
void dComIfGp_mapShow();
|
||||||
void dComIfGp_mapHide();
|
void dComIfGp_mapHide();
|
||||||
bool dComIfGp_checkMapShow();
|
bool dComIfGp_checkMapShow();
|
||||||
|
void dComIfGp_ret_wp_set(s8);
|
||||||
s32 dComIfGp_setHeapLockFlag(u8 flag);
|
s32 dComIfGp_setHeapLockFlag(u8 flag);
|
||||||
u8 dComIfGp_world_dark_get();
|
u8 dComIfGp_world_dark_get();
|
||||||
JKRExpHeap* dComIfGp_getSubHeap2D(int flag);
|
JKRExpHeap* dComIfGp_getSubHeap2D(int flag);
|
||||||
@@ -1567,6 +1573,7 @@ static u8 dComIfGp_getDoStatus();
|
|||||||
static u8 dComIfGp_getRStatus();
|
static u8 dComIfGp_getRStatus();
|
||||||
static dAttCatch_c* dComIfGp_att_getCatghTarget();
|
static dAttCatch_c* dComIfGp_att_getCatghTarget();
|
||||||
static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1);
|
static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1);
|
||||||
|
bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle);
|
||||||
|
|
||||||
inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
|
inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
|
||||||
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
|
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
|
||||||
@@ -2347,6 +2354,10 @@ inline s32 dComIfGp_roomControl_getStayNo() {
|
|||||||
return dStage_roomControl_c::getStayNo();
|
return dStage_roomControl_c::getStayNo();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline s32 dComIfGp_roomControl_getZoneNo(int i_roomNo) {
|
||||||
|
return dStage_roomControl_c::getZoneNo(i_roomNo);
|
||||||
|
}
|
||||||
|
|
||||||
inline void dComIfGp_roomControl_initZone() {
|
inline void dComIfGp_roomControl_initZone() {
|
||||||
g_dComIfG_gameInfo.play.getRoomControl()->initZone();
|
g_dComIfG_gameInfo.play.getRoomControl()->initZone();
|
||||||
}
|
}
|
||||||
@@ -2375,12 +2386,28 @@ inline void dComIfGp_roomControl_setStayNo(int stayNo) {
|
|||||||
g_dComIfG_gameInfo.play.getRoomControl()->setStayNo(stayNo);
|
g_dComIfG_gameInfo.play.getRoomControl()->setStayNo(stayNo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline void dComIfGp_roomControl_setZoneNo(int roomNo, int zoneNo) {
|
||||||
|
g_dComIfG_gameInfo.play.getRoomControl()->setZoneNo(roomNo, zoneNo);
|
||||||
|
}
|
||||||
|
|
||||||
inline dKy_tevstr_c* dComIfGp_roomControl_getTevStr(int i_roomNo) {
|
inline dKy_tevstr_c* dComIfGp_roomControl_getTevStr(int i_roomNo) {
|
||||||
return g_dComIfG_gameInfo.play.getRoomControl()->getTevStr(i_roomNo);
|
return g_dComIfG_gameInfo.play.getRoomControl()->getTevStr(i_roomNo);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 flag) {
|
inline BOOL dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 flag) {
|
||||||
return g_dComIfG_gameInfo.play.mRoomControl.checkStatusFlag(i_roomNo, flag);
|
return g_dComIfG_gameInfo.play.getRoomControl()->checkStatusFlag(i_roomNo, flag);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void dComIfGp_roomControl_offStatusFlag(int i_roomNo, u8 flag) {
|
||||||
|
return g_dComIfG_gameInfo.play.getRoomControl()->offStatusFlag(i_roomNo, flag);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void dComIfGp_roomControl_onStatusFlag(int i_roomNo, u8 flag) {
|
||||||
|
return g_dComIfG_gameInfo.play.getRoomControl()->onStatusFlag(i_roomNo, flag);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void dComIfGp_roomControl_setStatusFlag(int i_roomNo, u8 flag) {
|
||||||
|
return g_dComIfG_gameInfo.play.getRoomControl()->setStatusFlag(i_roomNo, flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) {
|
inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) {
|
||||||
|
|||||||
@@ -48,6 +48,11 @@ public:
|
|||||||
/* 80031434 */ static bool check(s8 i_roomNo, cXyz const& i_pos);
|
/* 80031434 */ static bool check(s8 i_roomNo, cXyz const& i_pos);
|
||||||
/* 800315A4 */ static void execute();
|
/* 800315A4 */ static void execute();
|
||||||
|
|
||||||
|
static void reset(int roomNo) {
|
||||||
|
room_c* room = (room_c*)mRoom; // tmp
|
||||||
|
room[roomNo].reset();
|
||||||
|
}
|
||||||
|
|
||||||
static u8 mData[1152];
|
static u8 mData[1152];
|
||||||
static u8 mRoom[256];
|
static u8 mRoom[256];
|
||||||
static s16 mSetTop;
|
static s16 mSetTop;
|
||||||
|
|||||||
@@ -273,6 +273,7 @@ public:
|
|||||||
static dDemo_actor_c* getActor(u8 param_0) { return m_object->getActor(param_0); }
|
static dDemo_actor_c* getActor(u8 param_0) { return m_object->getActor(param_0); }
|
||||||
static u32 getFrameNoMsg() { return m_frameNoMsg; }
|
static u32 getFrameNoMsg() { return m_frameNoMsg; }
|
||||||
static s32 getMode() { return m_mode; }
|
static s32 getMode() { return m_mode; }
|
||||||
|
static int getFrame() { return m_frame; }
|
||||||
static JStudio::stb::TControl* getControl() { return m_control; }
|
static JStudio::stb::TControl* getControl() { return m_control; }
|
||||||
static bool isStatus(u32 status) { return m_status & status; }
|
static bool isStatus(u32 status) { return m_status & status; }
|
||||||
static void onStatus(u32 status) { m_status |= status; }
|
static void onStatus(u32 status) { m_status |= status; }
|
||||||
|
|||||||
+33
-3
@@ -684,6 +684,7 @@ public:
|
|||||||
/* 0x68 */ int mVrboxcolNumInfo;
|
/* 0x68 */ int mVrboxcolNumInfo;
|
||||||
}; // Size: 0x6C
|
}; // Size: 0x6C
|
||||||
|
|
||||||
|
class dBgW_base;
|
||||||
class dStage_roomStatus_c {
|
class dStage_roomStatus_c {
|
||||||
public:
|
public:
|
||||||
/* 0x000 */ dStage_roomDt_c mRoomDt;
|
/* 0x000 */ dStage_roomDt_c mRoomDt;
|
||||||
@@ -695,7 +696,7 @@ public:
|
|||||||
/* 0x3F8 */ s8 mMemBlockID;
|
/* 0x3F8 */ s8 mMemBlockID;
|
||||||
/* 0x3F9 */ u8 mRegionNo;
|
/* 0x3F9 */ u8 mRegionNo;
|
||||||
/* 0x3FC */ int mProcID;
|
/* 0x3FC */ int mProcID;
|
||||||
/* 0x400 */ int field_0x400;
|
/* 0x400 */ dBgW_base* mpBgW;
|
||||||
|
|
||||||
int getZoneNo() const { return mZoneNo; }
|
int getZoneNo() const { return mZoneNo; }
|
||||||
~dStage_roomStatus_c() {}
|
~dStage_roomStatus_c() {}
|
||||||
@@ -723,6 +724,11 @@ public:
|
|||||||
/* 0x04 */ void** m_dzs;
|
/* 0x04 */ void** m_dzs;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct nameData {
|
||||||
|
/* 0x0 */ s8 m_num;
|
||||||
|
/* 0x1 */ char m_names[32][10]; // ?
|
||||||
|
};
|
||||||
|
|
||||||
static void createRoomDzs(u8 i_num) { m_roomDzs.create(i_num); }
|
static void createRoomDzs(u8 i_num) { m_roomDzs.create(i_num); }
|
||||||
static void* addRoomDzs(u8 i_num, u8 roomNo) { return m_roomDzs.add(i_num, roomNo); }
|
static void* addRoomDzs(u8 i_num, u8 roomNo) { return m_roomDzs.add(i_num, roomNo); }
|
||||||
static void removeRoomDzs() { m_roomDzs.remove(); }
|
static void removeRoomDzs() { m_roomDzs.remove(); }
|
||||||
@@ -744,7 +750,7 @@ public:
|
|||||||
/* 80024940 */ static char* getArcBank(int);
|
/* 80024940 */ static char* getArcBank(int);
|
||||||
/* 80024954 */ static bool resetArchiveBank(int);
|
/* 80024954 */ static bool resetArchiveBank(int);
|
||||||
/* 80024DB0 */ static void SetTimePass(int);
|
/* 80024DB0 */ static void SetTimePass(int);
|
||||||
/* 8025BAAC */ void setZoneNo(int, int);
|
/* 8025BAAC */ static void setZoneNo(int, int);
|
||||||
static s32 GetTimePass();
|
static s32 GetTimePass();
|
||||||
|
|
||||||
static s8 getStayNo() { return mStayNo; }
|
static s8 getStayNo() { return mStayNo; }
|
||||||
@@ -763,14 +769,28 @@ public:
|
|||||||
static void offNoChangeRoom() { mNoChangeRoom = false; }
|
static void offNoChangeRoom() { mNoChangeRoom = false; }
|
||||||
static void setProcID(u32 id) { mProcID = id; }
|
static void setProcID(u32 id) { mProcID = id; }
|
||||||
static u32 getProcID() { return mProcID; }
|
static u32 getProcID() { return mProcID; }
|
||||||
|
static void setStatusProcID(int i_roomNo, unsigned int i_id) { mStatus[i_roomNo].mProcID = i_id; }
|
||||||
static int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; }
|
static int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; }
|
||||||
static void setFileList2(int i_roomNo, dStage_FileList2_dt_c* list) {
|
static void setFileList2(int i_roomNo, dStage_FileList2_dt_c* list) {
|
||||||
mStatus[i_roomNo].mRoomDt.mFileList2Info = list;
|
mStatus[i_roomNo].mRoomDt.mFileList2Info = list;
|
||||||
}
|
}
|
||||||
bool checkStatusFlag(int i_roomNo, u8 flag) const {
|
|
||||||
|
static void setBgW(int param_0, dBgW_base* i_bgw) {
|
||||||
|
mStatus[param_0].mpBgW = i_bgw;
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOL checkStatusFlag(int i_roomNo, u8 flag) const {
|
||||||
return cLib_checkBit(mStatus[i_roomNo].mFlag, flag);
|
return cLib_checkBit(mStatus[i_roomNo].mFlag, flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void offStatusFlag(int i_roomNo, u8 flag) {
|
||||||
|
return cLib_offBit(mStatus[i_roomNo].mFlag, flag);
|
||||||
|
}
|
||||||
|
|
||||||
|
void onStatusFlag(int i_roomNo, u8 flag) {
|
||||||
|
return cLib_onBit(mStatus[i_roomNo].mFlag, flag);
|
||||||
|
}
|
||||||
|
|
||||||
static JKRExpHeap* mMemoryBlock[19];
|
static JKRExpHeap* mMemoryBlock[19];
|
||||||
static char mArcBank[32][10];
|
static char mArcBank[32][10];
|
||||||
static dStage_roomStatus_c mStatus[0x40];
|
static dStage_roomStatus_c mStatus[0x40];
|
||||||
@@ -917,6 +937,12 @@ static s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0);
|
|||||||
void dStage_restartRoom(u32 roomParam, u32 mode, int param_2);
|
void dStage_restartRoom(u32 roomParam, u32 mode, int param_2);
|
||||||
struct cBgS_GndChk;
|
struct cBgS_GndChk;
|
||||||
int dStage_RoomCheck(cBgS_GndChk* gndChk);
|
int dStage_RoomCheck(cBgS_GndChk* gndChk);
|
||||||
|
void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* stageDt, int param_2);
|
||||||
|
void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2);
|
||||||
|
|
||||||
|
inline bool dStage_roomRead_dt_c_ChkBg(u8 param_0) {
|
||||||
|
return param_0 & 0x80;
|
||||||
|
}
|
||||||
|
|
||||||
inline s32 dStage_roomRead_dt_c_GetVrboxswitch(roomRead_data_class& data) {
|
inline s32 dStage_roomRead_dt_c_GetVrboxswitch(roomRead_data_class& data) {
|
||||||
return data.field_0x2 & 8;
|
return data.field_0x2 & 8;
|
||||||
@@ -970,6 +996,10 @@ inline s8 dStage_stagInfo_GetTimeH(stage_stag_info_class* p_info) {
|
|||||||
return p_info->field_0x0c >> 8;
|
return p_info->field_0x0c >> 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline BOOL dStage_staginfo_GetArchiveHeap(stage_stag_info_class* p_info) {
|
||||||
|
return p_info->field_0x0a & 0x1000;
|
||||||
|
}
|
||||||
|
|
||||||
inline u32 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) {
|
inline u32 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) {
|
||||||
return p_info->field_0xb & 0xF;
|
return p_info->field_0xb & 0xF;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ static void GxFog_set();
|
|||||||
static void GxXFog_set();
|
static void GxXFog_set();
|
||||||
u8 dKy_pol_argument_get(cBgS_PolyInfo const* i_poly);
|
u8 dKy_pol_argument_get(cBgS_PolyInfo const* i_poly);
|
||||||
void dKy_Sound_set(cXyz param_0, int param_1, unsigned int param_2, int param_3);
|
void dKy_Sound_set(cXyz param_0, int param_1, unsigned int param_2, int param_3);
|
||||||
|
void dKy_bg_MAxx_proc(void* param_0);
|
||||||
|
|
||||||
struct LIGHT_INFLUENCE {
|
struct LIGHT_INFLUENCE {
|
||||||
/* 800CFC7C */ ~LIGHT_INFLUENCE() {}
|
/* 800CFC7C */ ~LIGHT_INFLUENCE() {}
|
||||||
|
|||||||
@@ -344,6 +344,8 @@ public:
|
|||||||
|
|
||||||
JKRExpHeap* getResHeap() { return m_resHeap; }
|
JKRExpHeap* getResHeap() { return m_resHeap; }
|
||||||
|
|
||||||
|
void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); }
|
||||||
|
|
||||||
static void onStatus(u8 status) { mStatus |= status; }
|
static void onStatus(u8 status) { mStatus |= status; }
|
||||||
static void offStatus(u8 status) { mStatus &= ~status; }
|
static void offStatus(u8 status) { mStatus &= ~status; }
|
||||||
static bool isStatus(u8 status) { return mStatus & status; }
|
static bool isStatus(u8 status) { return mStatus & status; }
|
||||||
|
|||||||
@@ -26,4 +26,8 @@ inline int fopScnM_LayerID(void* proc) {
|
|||||||
return fpcM_LayerID(proc);
|
return fpcM_LayerID(proc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline u32 fopScnM_GetParam(void* proc) {
|
||||||
|
return fpcM_GetParam(proc);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
#include "f_pc/f_pc_stdcreate_req.h"
|
#include "f_pc/f_pc_stdcreate_req.h"
|
||||||
#include "f_pc/f_pc_executor.h"
|
#include "f_pc/f_pc_executor.h"
|
||||||
#include "f_pc/f_pc_leaf.h"
|
#include "f_pc/f_pc_leaf.h"
|
||||||
|
#include "f_pc/f_pc_layer_iter.h"
|
||||||
|
|
||||||
typedef int (*FastCreateReqFunc)(void*);
|
typedef int (*FastCreateReqFunc)(void*);
|
||||||
typedef void (*fpcM_ManagementFunc)(void);
|
typedef void (*fpcM_ManagementFunc)(void);
|
||||||
@@ -66,6 +67,10 @@ inline BOOL fpcM_IsExecuting(unsigned int id) {
|
|||||||
return fpcEx_IsExist(id);
|
return fpcEx_IsExist(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline void* fpcM_LyJudge(process_node_class* i_node, fpcLyIt_JudgeFunc i_func, void* i_data) {
|
||||||
|
return fpcLyIt_Judge(&i_node->mLayer, i_func, i_data);
|
||||||
|
}
|
||||||
|
|
||||||
void fpcM_Draw(void* pProc);
|
void fpcM_Draw(void* pProc);
|
||||||
s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc);
|
s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc);
|
||||||
s32 fpcM_Execute(void* pProc);
|
s32 fpcM_Execute(void* pProc);
|
||||||
|
|||||||
@@ -61,6 +61,10 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
int remove(J3DModelData* i_modelData) { return i_modelData->removeTexMtxAnimator(mpAnm); }
|
int remove(J3DModelData* i_modelData) { return i_modelData->removeTexMtxAnimator(mpAnm); }
|
||||||
|
void entryFrame() { entryFrame(getFrame()); }
|
||||||
|
void entryFrame(f32 frame) { setFrame(frame); }
|
||||||
|
|
||||||
|
J3DAnmTextureSRTKey* getBtkAnm() const { return mpAnm; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/* 0x14 */ J3DAnmTextureSRTKey* mpAnm;
|
/* 0x14 */ J3DAnmTextureSRTKey* mpAnm;
|
||||||
@@ -87,6 +91,10 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
int remove(J3DModelData* i_modelData) { return i_modelData->removeTevRegAnimator(mpAnm); }
|
int remove(J3DModelData* i_modelData) { return i_modelData->removeTevRegAnimator(mpAnm); }
|
||||||
|
void entryFrame() { entryFrame(getFrame()); }
|
||||||
|
void entryFrame(f32 frame) { setFrame(frame); }
|
||||||
|
|
||||||
|
J3DAnmTevRegKey* getBrkAnm() const { return mpAnm; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/* 0x14 */ J3DAnmTevRegKey* mpAnm;
|
/* 0x14 */ J3DAnmTevRegKey* mpAnm;
|
||||||
@@ -508,6 +516,7 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 param_1, u32 pa
|
|||||||
void mDoExt_setAraCacheSize(u32 size);
|
void mDoExt_setAraCacheSize(u32 size);
|
||||||
int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id);
|
int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id);
|
||||||
void mDoExt_modelEntryDL(J3DModel* i_model);
|
void mDoExt_modelEntryDL(J3DModel* i_model);
|
||||||
|
void mDoExt_setupStageTexture(J3DModelData* i_modelData);
|
||||||
|
|
||||||
struct JUTFont;
|
struct JUTFont;
|
||||||
JUTFont* mDoExt_getMesgFont();
|
JUTFont* mDoExt_getMesgFont();
|
||||||
|
|||||||
@@ -8,6 +8,15 @@
|
|||||||
struct mDoLib_clipper {
|
struct mDoLib_clipper {
|
||||||
/* 8001528C */ void setup(f32, f32, f32, f32);
|
/* 8001528C */ void setup(f32, f32, f32, f32);
|
||||||
|
|
||||||
|
static void changeFar(f32 far) {
|
||||||
|
mClipper.setFar(far);
|
||||||
|
mClipper.calcViewFrustum();
|
||||||
|
}
|
||||||
|
|
||||||
|
static u32 clip(const Mtx m, const Vec* param_1, const Vec* param_2) {
|
||||||
|
return mClipper.clip(m, (Vec*)param_1, (Vec*)param_2);
|
||||||
|
}
|
||||||
|
|
||||||
static J3DUClipper mClipper;
|
static J3DUClipper mClipper;
|
||||||
static f32 mSystemFar;
|
static f32 mSystemFar;
|
||||||
static f32 mFovyRate;
|
static f32 mFovyRate;
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ M3_O_FILES := \
|
|||||||
M3_LIBS := \
|
M3_LIBS := \
|
||||||
|
|
||||||
M3_CFLAGS := \
|
M3_CFLAGS := \
|
||||||
|
-pool off \
|
||||||
-sdata 0 \
|
-sdata 0 \
|
||||||
-sdata2 0 \
|
-sdata2 0 \
|
||||||
|
|
||||||
|
|||||||
+576
-539
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user