Skip to content

Commit

Permalink
Clean up inlines for f_op_actor_mng
Browse files Browse the repository at this point in the history
  • Loading branch information
LagoLunatic committed Jan 24, 2024
1 parent 5bb468a commit 59c571a
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 128 deletions.
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def DolphinLib(lib_name, objects):
Object(Matching, "f_op/f_op_actor.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(Matching, "f_op/f_op_actor_iter.cpp"),
Object(Matching, "f_op/f_op_actor_tag.cpp"),
Object(NonMatching, "f_op/f_op_actor_mng.cpp"),
Object(NonMatching, "f_op/f_op_actor_mng.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(Matching, "f_op/f_op_camera.cpp"),
Object(Matching, "f_op/f_op_camera_mng.cpp"),
Object(Matching, "f_op/f_op_overlap.cpp"),
Expand Down
39 changes: 31 additions & 8 deletions include/d/d_com_inf_game.h
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,33 @@ class __d_timer_info_c {

class dADM_CharTbl : public cDT {
public:
s32 GetNITEM0() { return mIndex_N_ITEM0; }
s32 GetNITEM1() { return mIndex_N_ITEM1; }
s32 GetNITEM2() { return mIndex_N_ITEM2; }
s32 GetNITEM3() { return mIndex_N_ITEM3; }
s32 GetNITEM4() { return mIndex_N_ITEM4; }
s32 GetNITEM5() { return mIndex_N_ITEM5; }
s32 GetNITEM6() { return mIndex_N_ITEM6; }
s32 GetNITEM7() { return mIndex_N_ITEM7; }
s32 GetNITEM8() { return mIndex_N_ITEM8; }
s32 GetNITEM9() { return mIndex_N_ITEM9; }
s32 GetNITEM10() { return mIndex_N_ITEM10; }
s32 GetNITEM11() { return mIndex_N_ITEM11; }
s32 GetNITEM12() { return mIndex_N_ITEM12; }
s32 GetNITEM13() { return mIndex_N_ITEM13; }
s32 GetNITEM14() { return mIndex_N_ITEM14; }
s32 GetNITEM15() { return mIndex_N_ITEM15; }
s32 GetPercent() { return mIndex_percent; }
s32 GetITEM0() { return mIndex_ITEM0; }
s32 GetITEM1() { return mIndex_ITEM1; }
s32 GetITEM2() { return mIndex_ITEM2; }
s32 GetITEM3() { return mIndex_ITEM3; }
s32 GetITEM4() { return mIndex_ITEM4; }
s32 GetITEM5() { return mIndex_ITEM5; }
s32 GetITEM6() { return mIndex_ITEM6; }
s32 GetITEM7() { return mIndex_ITEM7; }

private:
/* 0x28 */ s32 mIndex_ARG;
/* 0x2C */ s32 mIndex_N_ITEM0;
/* 0x30 */ s32 mIndex_N_ITEM1;
Expand Down Expand Up @@ -2527,27 +2554,23 @@ inline s32 dComIfGp_event_orderOld(u16 eventType, u16 priority, u16 flag, u16 hi
}

inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
u32 t = g_dComIfG_gameInfo.play.getEvent().mPtTalk;
return g_dComIfG_gameInfo.play.getEvent().convPId(t);
return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtT();
}

inline void dComIfGp_event_setTalkPartner(void* i_actor) {
g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor);
}

inline fopAc_ac_c* dComIfGp_event_getItemPartner() {
u32 i = g_dComIfG_gameInfo.play.getEvent().mPtItem;
return g_dComIfG_gameInfo.play.getEvent().convPId(i);
return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtI();
}

inline fopAc_ac_c* dComIfGp_event_getPt1() {
u32 pt1 = g_dComIfG_gameInfo.play.getEvent().mPt1;
return g_dComIfG_gameInfo.play.getEvent().convPId(pt1);
return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt1();
}

inline fopAc_ac_c* dComIfGp_event_getPt2() {
u32 pt2 = g_dComIfG_gameInfo.play.getEvent().mPt2;
return g_dComIfG_gameInfo.play.getEvent().convPId(pt2);
return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt2();
}

inline f32 dComIfGp_event_getCullRate() {
Expand Down
16 changes: 14 additions & 2 deletions include/d/d_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class dEvt_control_c {
dStage_Event_dt_c* getStageEventDt();
dStage_Event_dt_c* nextStageEventDt(void*);
int getPId(void*);
fopAc_ac_c * convPId(unsigned int);
void* convPId(unsigned int);
u8 getTactFreeMStick(int);
u8 getTactFreeCStick(int);
bool giveItemCut(u8);
Expand All @@ -100,11 +100,15 @@ class dEvt_control_c {
bool chkTalkXY() { return mTalkButton == 1 || mTalkButton == 2 || mTalkButton == 3; }
void setPtI_Id(unsigned int id) { mPtItem = id; }
void setPtI(void* actor) { mPtItem = getPId(actor); }
void* getPtI() { return convPId(mPtItem); }
void setGtItm(u8 itemNo) { mGetItemNo = itemNo; }
u8 getGtItm() { return mGetItemNo; }
void setPtT(void* i_actor) { mPtTalk = getPId(i_actor); }
void* getPtT() { return convPId(mPtTalk); }
void setPt1(void* i_actor) { mPt1 = getPId(i_actor); }
void* getPt1() { return convPId(mPt1); }
void setPt2(void* i_actor) { mPt2 = getPId(i_actor); }
void* getPt2() { return convPId(mPt2); }
u8 getPreItemNo() { return mItemNo; }

f32 getCullRate() { return mCullFarClipRatio; }
Expand All @@ -118,14 +122,22 @@ class dEvt_control_c {
bool runCheck() { return mMode != 0; }
u8 getMode() { return mMode; }

void checkHind(u16) {}
void chkPhoto() {}
void getMode() const {}
void offHindFlag(u16) {}
void onHindFlag(u16) {}
void setDebugStb(u8) {}

public:
/* 0x00 */ dEvt_order_c mOrder[8];
/* 0xC0 */ s8 mOrderCount;
/* 0xC1 */ s8 mFirstOrderIdx;
/* 0xC2 */ u8 mMode;
/* 0xC3 */ u8 mbEndProc;
/* 0xC4 */ u32 mPt1;
/* 0xC8 */ u32 mPt2;
/* 0xCC */ int mPtTalk;
/* 0xCC */ u32 mPtTalk;
/* 0xD0 */ u32 mPtItem;
/* 0xD4 */ u8 mGetItemNo;
/* 0xD5 */ u8 field_0xD5[0xD6 - 0xD5];
Expand Down
19 changes: 14 additions & 5 deletions include/f_op/f_op_actor.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ struct actor_process_profile_definition {
/* 0x28 */ u32 mStatus;
/* 0x2C */ u8 mGroup;
/* 0x2D */ u8 mCullType;
};
}; // Size: 0x30

// Unclear what this is. Only appears in 2 profiles (PLAYER,BG)
struct actor_process_profile_definition2 {
/* 0x00 */ actor_process_profile_definition def;
/* 0x30 */ u32 field_0x30;
};
}; // Size: 0x34

class JKRSolidHeap;

Expand Down Expand Up @@ -220,7 +220,10 @@ struct fopAc_cullSizeSphere {
/* 0xC */ f32 mRadius;

fopAc_cullSizeSphere() {}
fopAc_cullSizeSphere(cXyz, f32);
fopAc_cullSizeSphere(cXyz p, f32 r) {
mCenter = p;
mRadius = r;
}
~fopAc_cullSizeSphere() {}
#endif
};
Expand All @@ -232,8 +235,14 @@ struct fopAc_cullSizeBox {
/* 0xC */ Vec mMax;
#else
fopAc_cullSizeBox() {}
fopAc_cullSizeBox(const fopAc_cullSizeBox&);
fopAc_cullSizeBox(cXyz, cXyz);
fopAc_cullSizeBox(const fopAc_cullSizeBox& box) {
mMin = box.mMin;
mMax = box.mMax;
}
fopAc_cullSizeBox(cXyz min, cXyz max) {
mMin = min;
mMax = max;
}
~fopAc_cullSizeBox() {}

/* 0x0 */ cXyz mMin;
Expand Down
3 changes: 3 additions & 0 deletions include/f_op/f_op_actor_mng.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ struct fopAcM_search_prm {
class l_HIO {
public:
~l_HIO() {}

void entry() {}
void erase() {}
};

class dKy_tevstr_c;
Expand Down
16 changes: 8 additions & 8 deletions src/d/actor/d_a_ib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,14 @@ BOOL daIball_c::createItem() {
int itemTableIdx = itemBitNo;
u32 items[8];

items[0] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM0, itemTableIdx);
items[1] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM1, itemTableIdx);
items[2] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM2, itemTableIdx);
items[3] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM3, itemTableIdx);
items[4] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM4, itemTableIdx);
items[5] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM5, itemTableIdx);
items[6] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM6, itemTableIdx);
items[7] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM7, itemTableIdx);
items[0] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM0(), itemTableIdx);
items[1] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM1(), itemTableIdx);
items[2] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM2(), itemTableIdx);
items[3] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM3(), itemTableIdx);
items[4] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM4(), itemTableIdx);
items[5] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM5(), itemTableIdx);
items[6] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM6(), itemTableIdx);
items[7] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM7(), itemTableIdx);

for (int i = 0; i < 8; i++) {
itemBitNo = -1;
Expand Down
80 changes: 40 additions & 40 deletions src/d/d_item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2783,37 +2783,37 @@ u8 check_itemno(int itemNo) {
u8 getEmonoItemFromLifeBallTable(u16 itemTableIdx) {
u8 items[16];

items[0] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM0, itemTableIdx);
items[1] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM1, itemTableIdx);
items[2] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM2, itemTableIdx);
items[3] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM3, itemTableIdx);
items[4] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM4, itemTableIdx);
items[5] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM5, itemTableIdx);
items[6] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM6, itemTableIdx);
items[7] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_ITEM7, itemTableIdx);
items[0] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM0(), itemTableIdx);
items[1] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM1(), itemTableIdx);
items[2] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM2(), itemTableIdx);
items[3] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM3(), itemTableIdx);
items[4] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM4(), itemTableIdx);
items[5] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM5(), itemTableIdx);
items[6] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM6(), itemTableIdx);
items[7] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetITEM7(), itemTableIdx);

for (int i = 0; i < 8; i++) {
if (isEmono(items[i])) {
return items[i];
}
}

items[0] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM0, itemTableIdx);
items[1] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM1, itemTableIdx);
items[2] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM2, itemTableIdx);
items[3] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM3, itemTableIdx);
items[4] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM4, itemTableIdx);
items[5] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM5, itemTableIdx);
items[6] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM6, itemTableIdx);
items[7] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM7, itemTableIdx);
items[8] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM8, itemTableIdx);
items[9] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM9, itemTableIdx);
items[10] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM10, itemTableIdx);
items[11] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM11, itemTableIdx);
items[12] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM12, itemTableIdx);
items[13] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM13, itemTableIdx);
items[14] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM14, itemTableIdx);
items[15] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM15, itemTableIdx);
items[0] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM0(), itemTableIdx);
items[1] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM1(), itemTableIdx);
items[2] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM2(), itemTableIdx);
items[3] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM3(), itemTableIdx);
items[4] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM4(), itemTableIdx);
items[5] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM5(), itemTableIdx);
items[6] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM6(), itemTableIdx);
items[7] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM7(), itemTableIdx);
items[8] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM8(), itemTableIdx);
items[9] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM9(), itemTableIdx);
items[10] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM10(), itemTableIdx);
items[11] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM11(), itemTableIdx);
items[12] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM12(), itemTableIdx);
items[13] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM13(), itemTableIdx);
items[14] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM14(), itemTableIdx);
items[15] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM15(), itemTableIdx);

for (int i = 0; i < 16; i++) {
if (isEmono(items[i])) {
Expand All @@ -2828,22 +2828,22 @@ u8 getEmonoItemFromLifeBallTable(u16 itemTableIdx) {
u8 getItemFromLifeBallTableWithoutEmono(u16 itemTableIdx) {
u8 items[16];

items[0] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM0, itemTableIdx);
items[1] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM1, itemTableIdx);
items[2] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM2, itemTableIdx);
items[3] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM3, itemTableIdx);
items[4] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM4, itemTableIdx);
items[5] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM5, itemTableIdx);
items[6] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM6, itemTableIdx);
items[7] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM7, itemTableIdx);
items[8] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM8, itemTableIdx);
items[9] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM9, itemTableIdx);
items[10] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM10, itemTableIdx);
items[11] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM11, itemTableIdx);
items[12] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM12, itemTableIdx);
items[13] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM13, itemTableIdx);
items[14] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM14, itemTableIdx);
items[15] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->mIndex_N_ITEM15, itemTableIdx);
items[0] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM0(), itemTableIdx);
items[1] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM1(), itemTableIdx);
items[2] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM2(), itemTableIdx);
items[3] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM3(), itemTableIdx);
items[4] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM4(), itemTableIdx);
items[5] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM5(), itemTableIdx);
items[6] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM6(), itemTableIdx);
items[7] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM7(), itemTableIdx);
items[8] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM8(), itemTableIdx);
items[9] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM9(), itemTableIdx);
items[10] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM10(), itemTableIdx);
items[11] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM11(), itemTableIdx);
items[12] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM12(), itemTableIdx);
items[13] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM13(), itemTableIdx);
items[14] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM14(), itemTableIdx);
items[15] = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetNITEM15(), itemTableIdx);

for (int i = 0; i < 8; i++) {
int randIdx = cM_rndF(15.999f);
Expand Down
2 changes: 1 addition & 1 deletion src/d/d_s_room.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void* deleteJugge(void* i_this, void*) {
/* 80236A38-80236B1C .text objectSetCheck__FP19room_of_scene_class */
void objectSetCheck(room_of_scene_class* i_this) {
s32 roomNo = fopScnM_GetParam(i_this);
s32 hiddenFlag = (g_dComIfG_gameInfo.play.getRoomControl()->mStatus[roomNo].mFlags & 0x08);
s32 hiddenFlag = dComIfGp_roomControl_checkStatusFlag(roomNo, 0x08);

if (!i_this->mbReLoaded) {
if (!hiddenFlag) {
Expand Down
Loading

0 comments on commit 59c571a

Please sign in to comment.