Merge pull request #78 from TakaRikka/barrier

d_a_obj_barrier mostly done
This commit is contained in:
Jasper St. Pierre
2023-09-25 09:05:41 -07:00
committed by GitHub
8 changed files with 645 additions and 207 deletions
+4
View File
@@ -10,6 +10,10 @@
OSPanic(__FILE__, LINE, "Halt"); \
}
#define JUT_PANIC(LINE) \
JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, "0"); \
OSPanic(__FILE__, LINE, "Halt");
#define JUT_WARN(LINE, ...) \
JUTAssertion::setWarningMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__); \
+1
View File
@@ -515,6 +515,7 @@ public:
cCcD_DivideInfo& GetDivideInfo() { return mDivideInfo; }
cCcD_DivideInfo* GetPDivideInfo() { return &mDivideInfo; }
int ChkBsRevHit() const { return mFlags & 2; }
void OnBsRevHit() { mFlags |= 2; }
private:
/* 0x040 */ int mFlags;
+2
View File
@@ -63,4 +63,6 @@ public:
/* 0xBB */ u8 mRoomNo2;
};
dBgW* dBgW_NewSet(cBgD_t*, unsigned long, float(*)[3][4]);
#endif /* D_BG_W_H */
+5
View File
@@ -1332,6 +1332,11 @@ inline void dComIfGd_setList() {
g_dComIfG_gameInfo.drawlist.setXluList();
}
inline void dComIfGd_setListInvisisble() {
g_dComIfG_gameInfo.drawlist.setOpaListInvisible();
g_dComIfG_gameInfo.drawlist.setXluListInvisible();
}
inline void dComIfGd_setListMaskOff() {
g_dComIfG_gameInfo.drawlist.setOpaListMaskOff();
g_dComIfG_gameInfo.drawlist.setXluListMaskOff();
+2
View File
@@ -216,6 +216,8 @@ public:
void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, OPA_BUFFER); }
void setOpaList() { setOpaDrawList(mpBufInvisibleModelOpa); }
void setXluList() { setXluDrawList(mpBufInvisibleModelXlu); }
void setOpaListInvisible() { setOpaDrawList(field_0x00030); }
void setXluListInvisible() { setXluDrawList(field_0x00034); }
void setOpaListMaskOff() { setOpaDrawList(mpBufInvisibleModelMaskOffOpa); }
void setXluListMaskOff() { setXluDrawList(mpBufInvisibleModelMaskOffXlu); }
void setOpaListSky() { setOpaDrawList(mpBufSkyOpa); }
+4
View File
@@ -321,6 +321,10 @@ inline void fopAcM_onActor(fopAc_ac_c* p_actor) {
dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(p_actor));
}
inline bool fopAcM_IsFirstCreating(void* i_actor) {
return fpcM_IsFirstCreating(i_actor);
}
void fopAcM_initManager();
void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData);
+2
View File
@@ -324,6 +324,8 @@ void mDoExt_modelUpdate(J3DModel* i_model);
void mDoExt_modelUpdateDL(J3DModel* i_model);
void mDoExt_modelEntryDL(J3DModel* i_model);
void mDoExt_modelTexturePatch(J3DModelData*);
JKRExpHeap* mDoExt_getCommandHeap();
JKRExpHeap* mDoExt_getZeldaHeap();
JKRExpHeap* mDoExt_getGameHeap();