encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

work on daalink, fop actor, mDo machine, msg_scrn, + various (#201)

Browse Source 
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress
This commit is contained in:
TakaRikka
2022-06-29 22:19:09 +02:00
committed by GitHub
parent cd5b02450c
commit 046d178003
412 changed files with 12028 additions and 16831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+543 -298
View File
File diff suppressed because it is too large Load Diff
include/d/a/d_a_horse_static.h
+15 -1
View File
@@ -4,7 +4,21 @@
#include "dolphin/types.h"
#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
class daTagHstop_c {
class daTagHstop_c : public fopAc_ac_c {
public:
static daTagHstop_c* getTop() { return m_top; }
daTagHstop_c* getNext() { return mpNext; }
bool getActiveFlg() const { return mActive; }
/* 0x568 */ daTagHstop_c* mpNext;
/* 0x56C */ daTagHstop_c* field_0x56c;
/* 0x570 */ u8 field_0x570;
/* 0x571 */ bool mActive;
/* 0x572 */ u8 field_0x572;
/* 0x573 */ u8 field_0x573;
/* 0x574 */ int field_0x574;
static daTagHstop_c* m_top;
};
include/d/a/d_a_item_static.h
+133 -8
View File
@@ -3,20 +3,145 @@
#include "SSystem/SComponent/c_lib.h"
#include "dolphin/types.h"
#include "d/a/d_a_itembase.h"
#include "d/a/d_a_itembase_static.h"
#include "d/particle/d_particle.h"
class daItem_c {
class daItem_c;
typedef void (daItem_c::*procFunc)();
class daItem_c : public daItemBase_c {
public:
daItem_c() : field_0x998(0, 0) {}
/* 8015B0C4 */ void initBaseMtx();
/* 8015B108 */ void setBaseMtx();
/* 8015B190 */ void setBaseMtx_0();
/* 8015B1C8 */ void setBaseMtx_1();
/* 8015B3D8 */ void CreateInit();
/* 8015B7BC */ void setCullInfo();
/* 8015B7D4 */ int _daItem_create();
/* 8015BA9C */ void _daItem_execute();
/* 8015BD84 */ int _daItem_draw();
/* 8015BDE8 */ int _daItem_delete();
/* 8015BE60 */ void procInitNormal();
/* 8015BEA4 */ void procMainNormal();
/* 8015BFE8 */ void procMainEnemyCarry();
/* 8015BFEC */ void procInitForceGet();
/* 8015C038 */ void procMainForceGet();
/* 8015C058 */ void procInitSimpleGetDemo();
/* 8015C134 */ void procMainSimpleGetDemo();
/* 8015C200 */ void procInitGetDemoEvent();
/* 8015C2A4 */ void procWaitGetDemoEvent();
/* 8015C3BC */ void procMainGetDemoEvent();
/* 8015C41C */ void procInitBoomerangCarry();
/* 8015C514 */ void procMainBoomerangCarry();
/* 8015C5F4 */ void procInitSwOnWait();
/* 8015C648 */ void procMainSwOnWait();
/* 8015C708 */ void procInitBoomHitWait();
/* 8015C738 */ void procMainBoomHitWait();
/* 8015CAB8 */ void move_proc_call();
/* 8015CC4C */ void mode_wait_init();
/* 8015CC88 */ void mode_water_init();
/* 8015CCD0 */ void mode_wait();
/* 8015CDCC */ void mode_water();
/* 8015CEEC */ void itemGetNextExecute();
/* 8015D0A8 */ void itemGet();
/* 8015D370 */ BOOL checkCountTimer();
/* 8015D3CC */ bool checkPlayerGet();
/* 8015D410 */ void checkYogan();
/* 8015D480 */ void deleteItem();
/* 8015D4AC */ int itemActionForRupee();
/* 8015D56C */ void itemActionForHeart();
/* 8015D688 */ void itemActionForArrow();
/* 8015D700 */ void itemActionForBoomerang();
/* 8015D734 */ void bg_check();
/* 8015D834 */ void set_bound_se();
/* 8015D95C */ int CountTimer();
/* 8015D9F0 */ int initAction();
/* 8015DAAC */ void initFlag();
/* 8015DBF0 */ void initScale();
/* 8015DC40 */ void initSpeed(int);
/* 8015DE38 */ void initAngle();
u32 startCtrl();
u32 startControl();
u32 endControl();
void setFlag(u8 pFlag) { cLib_onBit(unk2376, pFlag); }
/* 8015CE94 */ virtual void setTevStr();
virtual void unk0() = 0;
virtual void unk1() = 0;
virtual void unk2() = 0;
virtual void unk3() = 0;
virtual void unk4() = 0;
virtual void unk5() = 0;
virtual void unk6() = 0;
virtual void unk7() = 0;
virtual void unk8() = 0;
virtual void unk9() = 0;
virtual void unk10() = 0;
virtual void unk11() = 0;
virtual void unk12() = 0;
virtual void unk13() = 0;
virtual void unk14() = 0;
virtual void unk15() = 0;
virtual void unk16() = 0;
virtual void unk17() = 0;
virtual void unk18() = 0;
virtual void unk19() = 0;
virtual void unk20() = 0;
virtual void unk21() = 0;
virtual void unk22() = 0;
virtual void unk23() = 0;
virtual void unk24() = 0;
virtual void unk25() = 0;
virtual void unk26() = 0;
virtual void unk27() = 0;
virtual void unk28() = 0;
virtual void unk29() = 0;
virtual void unk30() = 0;
virtual void unk31() = 0;
virtual void unk32() = 0;
virtual void unk33() = 0;
virtual void unk34() = 0;
virtual void unk35() = 0;
private:
u8 unk0[0x948];
u8 unk2376;
u8 unk2377;
u8 unk2378;
};
void setFlag(u8 pFlag) { cLib_onBit(mFlag, pFlag); }
void setStatus(u8 status) { mStatus = status; }
u8 getStatus() { return mStatus; }
bool checkFlag(u8 flag) { return cLib_checkBit(mFlag, flag); }
void clrFlag(u8 flag) { cLib_offBit(mFlag, flag); }
static u8 mFuncPtr[120];
//static procFunc mFuncPtr[9];
static u8 m_cyl_src[68];
static s32 m_timer_max;
/* 0x92C */ s16 field_0x92c;
/* 0x92E */ u16 field_0x92e;
/* 0x930 */ cXyz field_0x930;
/* 0x93C */ u32 field_0x93c;
/* 0x940 */ u16 field_0x940;
/* 0x942 */ s16 field_0x942;
/* 0x944 */ s16 field_0x944;
/* 0x946 */ s16 field_0x946;
/* 0x948 */ u8 mFlag;
/* 0x949 */ u8 field_0x949;
/* 0x94A */ u8 mStatus;
/* 0x94B */ u8 field_0x94b;
/* 0x94C */ u32 m_item_id;
/* 0x950 */ cXyz field_0x950;
/* 0x95C */ u8 field_0x95c;
/* 0x95D */ bool field_0x95d;
/* 0x95E */ u8 mBoomWindTgTimer;
/* 0x95F */ u8 field_0x95f;
/* 0x960 */ u8 field_0x960[0xC];
/* 0x96C */ cXyz field_0x96c;
/* 0x978 */ Z2SoundObjSimple field_0x978;
/* 0x998 */ dPa_followEcallBack field_0x998;
/* 0x9AC */ cXyz field_0x9ac;
/* 0x9B8 */ u32 field_0x9b8;
/* 0x9BC */ u8 field_0x9bc[4];
/* 0x9C0 */ u8 field_0x9c0;
/* 0x9C1 */ u8 field_0x9c1;
}; // Size: 0x9C4
#endif /* D_A_D_A_ITEM_STATIC_H */
include/d/a/d_a_itembase.h
+14 -13
View File
@@ -8,7 +8,7 @@
#include "f_op/f_op_actor.h"
struct daItemBase_data {
/* 0x00 */ f32 field_0x0;
/* 0x00 */ f32 mGravity;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
@@ -41,7 +41,7 @@ public:
int DeleteBase(char const*);
void setListEnd();
void animPlay(f32, f32, f32, f32, f32, f32);
daItemBase_data& getData();
const daItemBase_data& getData();
virtual int DrawBase();
virtual void setListStart();
@@ -61,20 +61,21 @@ public:
static daItemBase_data const m_data;
private:
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ mDoExt_btkAnm* field_0x578;
/* 0x57C */ mDoExt_bpkAnm* field_0x57c;
/* 0x580 */ mDoExt_brkAnm* field_0x580;
/* 0x584 */ mDoExt_bckAnm* field_0x584;
/* 0x588 */ mDoExt_btpAnm* field_0x588;
/* 0x58C */ dBgS_ObjAcch field_0x58c;
/* 0x764 */ dBgS_AcchCir field_0x764;
/* 0x7A4 */ dCcD_Stts field_0x7a4;
/* 0x7E0 */ dCcD_Cyl field_0x7e0;
/* 0x578 */ mDoExt_btkAnm* mpBtkAnm;
/* 0x57C */ mDoExt_bpkAnm* mpBpkAnm;
/* 0x580 */ mDoExt_brkAnm* mpBrkAnm;
/* 0x584 */ mDoExt_bckAnm* mpBckAnm;
/* 0x588 */ mDoExt_btpAnm* mpBtpAnm;
/* 0x58C */ dBgS_ObjAcch mAcch;
/* 0x764 */ dBgS_AcchCir mAcchCir;
/* 0x7A4 */ dCcD_Stts mColStatus;
/* 0x7E0 */ dCcD_Cyl mCollider;
/* 0x91C */ u32 field_0x91c;
/* 0x920 */ u8 field_0x920[0xA];
/* 0x920 */ u32 field_0x920;
/* 0x924 */ int field_0x924;
/* 0x928 */ s16 field_0x928;
/* 0x92A */ u8 m_itemNo;
/* 0x92B */ u8 field_0x92b;
};
include/d/a/d_a_itembase_static.h
+2
View File
@@ -4,4 +4,6 @@
#include "d/a/d_a_itembase.h"
#include "dolphin/types.h"
void CheckFieldItemCreateHeap(fopAc_ac_c* actor);
#endif /* D_A_D_A_ITEMBASE_STATIC_H */
include/d/a/d_a_npc.h
+3
View File
@@ -514,4 +514,7 @@ public:
STATIC_ASSERT(sizeof(daNpcF_c) == 0xB48);
void daNpcF_getPlayerInfoFromPlayerList(int param_0, int param_1, cXyz& param_2,
csXyz& param_3);
#endif /* D_A_D_A_NPC_H */
include/d/a/d_a_npc_cd.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef A_NPC_D_A_NPC_CD_H
#define A_NPC_D_A_NPC_CD_H
#include "dolphin/types.h"
#endif /* A_NPC_D_A_NPC_CD_H */
include/d/a/d_a_npc_cd2.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef A_NPC_D_A_NPC_CD2_H
#define A_NPC_D_A_NPC_CD2_H
#include "dolphin/types.h"
#endif /* A_NPC_D_A_NPC_CD2_H */
include/d/a/d_a_obj_item.h
+24
View File
@@ -0,0 +1,24 @@
#ifndef A_OBJ_D_A_OBJ_ITEM_H
#define A_OBJ_D_A_OBJ_ITEM_H
#include "d/a/d_a_item_static.h"
namespace daItem_prm {
static inline u8 getItemNo(daItem_c* item) {
return fopAcM_GetParam(item);
}
static inline u32 getItemBitNo(daItem_c* item) {
return (fopAcM_GetParam(item) >> 8) & 0xFF;
}
static inline u16 getSwOnWaitTimer(daItem_c* item) {
return item->field_0x92e & 0x3F;
}
static inline u8 checkInWater(daItem_c* item) {
return fopAcM_GetParamBit(item, 0x1C, 4);
}
};
#endif /* A_OBJ_D_A_OBJ_ITEM_H */
include/d/a/d_a_obj_ss_base.h
+21
View File
@@ -0,0 +1,21 @@
#ifndef A_OBJ_D_A_OBJ_SS_BASE_H
#define A_OBJ_D_A_OBJ_SS_BASE_H
#include "f_op/f_op_actor_mng.h"
class daObj_SSBase_c : public fopAc_ac_c {
public:
/* 8015E3F8 */ daObj_SSBase_c();
/* 8015E450 */ virtual ~daObj_SSBase_c();
/* 8015E4C8 */ virtual void setSoldOut();
/* 8015E4B0 */ virtual u32 getProcessID();
private:
/* 0x56C */ void* mpParentPtr;
/* 0x570 */ u16 field_0x570;
/* 0x572 */ u16 mFlowNodeNum;
/* 0x574 */ u16 mValueNum;
};
#endif /* A_OBJ_D_A_OBJ_SS_BASE_H */
include/d/a/d_a_player.h
+34 -4
View File
@@ -46,7 +46,13 @@ private:
class daPy_anmHeap_c {
public:
enum daAlinkHEAP_TYPE {};
enum daAlinkHEAP_TYPE {
HEAP_TYPE_1 = 1,
HEAP_TYPE_2,
HEAP_TYPE_3,
HEAP_TYPE_4,
HEAP_TYPE_5,
};
/* 80140DCC */ void __defctor(); // supposed to be the ctor?
@@ -67,6 +73,8 @@ public:
void resetArcNo() { mArcNo = 0xffff; }
bool checkNoSetArcNo() const { return mArcNo == 0xFFFF; }
void setBufferSize(u32 size) { mBufferSize = size; }
void setBuffer(u8* buf) { mBuffer = buf; }
u8* getBuffer() { return mBuffer; }
private:
/* 0x00 */ u16 mIdx;
@@ -74,7 +82,7 @@ private:
/* 0x04 */ u16 mArcNo;
/* 0x06 */ u16 field_0x06;
/* 0x08 */ u32 mBufferSize;
/* 0x0C */ void* mBuffer;
/* 0x0C */ u8* mBuffer;
/* 0x10 */ JKRSolidHeap* mAnimeHeap;
}; // Size = 0x14
@@ -130,7 +138,11 @@ public:
void setDemoMode(u32 mode) { mDemoMode = mode; }
u32 getDemoMode() const { return mDemoMode; }
int getParam1() const { return mParam1; }
void setOriginalDemoType() { setDemoType(3); }
void i_setSpecialDemoType() { setDemoType(5); }
void setStick(f32 stick) { mStick = stick; }
void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
s16 getMoveAngle() const { return mDemoMoveAngle; }
private:
/* 0x00 */ u16 mDemoType;
@@ -164,9 +176,10 @@ public:
/* 0x058C */ u32 mEndResetFlg1;
/* 0x0590 */ u32 mEndResetFlg2;
/* 0x0594 */ f32 field_0x594;
/* 0x0598 */ u8 field_0x598[0x4];
/* 0x0598 */ f32 field_0x598;
/* 0x059C */ s16 mLookAngleY;
/* 0x059E */ u8 field_0x59e[0x6];
/* 0x059E */ s16 field_0x59e;
/* 0x05A0 */ u8 field_0x5a0[0x4];
/* 0x05A4 */ cXyz mHeadTopPos;
/* 0x05B0 */ cXyz mItemPos;
/* 0x05BC */ cXyz mSwordTopPos;
@@ -187,6 +200,7 @@ public:
FLG0_UNK_80000 = 0x80000,
FLG0_UNK_20000 = 0x20000,
FLG0_UNK_8000 = 0x8000,
FLG0_UNK_4000 = 0x4000,
MAGNE_BOOTS_ON = 0x1000,
FLG0_UNK_80 = 0x80,
FLG0_UNK_40 = 0x40,
@@ -199,16 +213,20 @@ public:
};
enum daPy_FLG1 { IS_WOLF = 0x2000000, FLG1_UNK_10000 = 0x10000, THROW_DAMAGE = 0x4000 };
enum daPy_FLG2 {
FLG2_UNK_20000000 = 0x20000000,
FLG2_UNK_4080000 = 0x4080000,
FLG2_UNK_2080000 = 0x2080000,
BOAR_SINGLE_BATTLE = 0x1800000,
STATUS_WINDOW_DRAW = 0x400000,
UNK_ARMOR = 0x80000,
SCENE_CHANGE_START = 0x8000,
FLG2_UNK_4000 = 0x4000,
UNK_FLG2_2 = 2,
UNK_DAPY_FLG2_1 = 1
};
enum daPy_FLG3 {
FLG3_UNK_2000000 = 0x2000000,
FLG3_UNK_1000000 = 0x1000000,
FLG3_UNK_100000 = 0x100000,
COPY_ROD_THROW_AFTER = 0x40000
};
@@ -337,6 +355,15 @@ public:
/* 80182AC4 */ void checkCopyRodThrowAfter() const;
/* 80182AD8 */ void checkRide() const;
/* 80182B9C */ void getRightHandPos() const;
/* 8015DFD8 */ const cXyz getItemPos() const;
/* 8015DFF4 */ const cXyz& getLeftHandPos() const;
/* const cXyz* getItemPos() const {
return &mItemPos;
}
const cXyz* getLeftHandPos() const {
return &mLeftHandPos;
} */
virtual cXyz* getMidnaAtnPos() const;
virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
@@ -526,6 +553,7 @@ public:
u8 getCutType() const { return mCutType; }
u16 getSwordAtUpTime() const { return mSwordUpTimer; }
bool checkWaterInMove() const { return i_checkNoResetFlg0(UNDER_WATER_MOVEMENT); }
bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(SCENE_CHANGE_START); }
// some functions use these function as an inline
// is there a better way to handle this?
@@ -555,12 +583,14 @@ public:
void i_onPlayerNoDraw() { i_onNoResetFlg0(PLAYER_NO_DRAW); }
void i_offPlayerNoDraw() { i_offNoResetFlg0(PLAYER_NO_DRAW); }
inline static u32 i_getLastSceneMode();
inline static u32 getLastSceneMode();
inline static bool checkWoodSwordEquip();
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
static daMidna_c* getMidnaActor() { return m_midnaActor; }
include/d/bg/d_bg_s.h
+3 -3
View File
@@ -74,13 +74,13 @@ public:
bool ChkMoveBG_NoDABg(cBgS_PolyInfo const&);
s32 GetExitId(cBgS_PolyInfo const&);
s32 GetPolyColor(cBgS_PolyInfo const&);
bool GetHorseNoEntry(cBgS_PolyInfo const&);
BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
bool GetSpecialCode(cBgS_PolyInfo const&);
bool GetMagnetCode(cBgS_PolyInfo const&);
int GetMagnetCode(cBgS_PolyInfo const&);
bool GetMonkeyBarsCode(cBgS_PolyInfo const&);
bool GetUnderwaterRoofCode(cBgS_PolyInfo const&);
s32 GetWallCode(cBgS_PolyInfo const&);
bool GetPolyAtt0(cBgS_PolyInfo const&);
BOOL GetPolyAtt0(cBgS_PolyInfo const&);
bool GetPolyAtt1(cBgS_PolyInfo const&);
bool GetGroundCode(cBgS_PolyInfo const&);
s32 GetCamMoveBG(cBgS_PolyInfo const&);
include/d/bg/d_bg_s_acch.h
+14
View File
@@ -62,6 +62,7 @@ public:
/* 0x000080 */ GROUND_LANDING = (1 << 7),
/* 0x000100 */ GROUND_AWAY = (1 << 8),
/* 0x000200 */ ROOF_HIT = (1 << 9),
/* 0x000400 */ WATER_NONE = (1 << 10),
/* 0x000800 */ WATER_HIT = (1 << 11),
/* 0x001000 */ WATER_IN = (1 << 12),
/* 0x002000 */ LINE_CHECK = (1 << 13),
@@ -139,6 +140,14 @@ public:
void SetGroundAway() { m_flags |= GROUND_AWAY; }
const u32 MaskWaterHit() { return m_flags & WATER_HIT; }
const bool ChkWaterHit() { return MaskWaterHit(); }
void ClrWaterNone() { m_flags &= ~WATER_NONE; }
void SetWaterCheckOffset(f32 offset) { m_wtr_chk_offset = offset; }
void OnLineCheck() { m_flags |= LINE_CHECK; }
void ClrRoofNone() { m_flags &= ~ROOF_NONE; }
void SetRoofCrrHeight(f32 height) { m_roof_crr_height = height; }
void SetWtrChkMode(int mode) { m_wtr_mode = mode; }
void SetGrndNone() { m_flags |= GRND_NONE; }
void ClrGrndNone() { m_flags &= ~GRND_NONE; }
// inline dupe
void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; }
@@ -187,6 +196,11 @@ public:
};
class dBgS_ObjAcch : public dBgS_Acch {
public:
dBgS_ObjAcch() {
SetObj();
}
/* 80BB336C */ virtual ~dBgS_ObjAcch();
};
include/d/bg/d_bg_w.h
+6 -6
View File
@@ -109,10 +109,10 @@ public:
/* 8007B0E4 */ virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const;
virtual s32 GetExitId(cBgS_PolyInfo const&) = 0;
virtual s32 GetPolyColor(cBgS_PolyInfo const&) = 0;
virtual bool GetHorseNoEntry(cBgS_PolyInfo const&) = 0;
virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&) = 0;
virtual bool GetSpecialCode(cBgS_PolyInfo const&) = 0;
virtual void GetSpecialCode(int) = 0;
virtual bool GetMagnetCode(cBgS_PolyInfo const&) = 0;
virtual int GetMagnetCode(cBgS_PolyInfo const&) = 0;
virtual void GetPolyObjThrough(int) = 0;
virtual void GetPolyCamThrough(int) = 0;
virtual void GetPolyLinkThrough(int) = 0;
@@ -125,7 +125,7 @@ public:
virtual bool GetUnderwaterRoofCode(int) = 0;
virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0;
virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0;
virtual bool GetPolyAtt0(cBgS_PolyInfo const&) = 0;
virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&) = 0;
virtual bool GetPolyAtt1(cBgS_PolyInfo const&) = 0;
virtual bool GetGroundCode(cBgS_PolyInfo const&) = 0;
virtual void GetIronBallThrough(int) = 0;
@@ -208,10 +208,10 @@ public:
/* 8007DF00 */ virtual void SphChk(dBgS_SphChk*, virtual void*);
/* 8007B3AC */ virtual s32 GetExitId(cBgS_PolyInfo const&);
/* 8007B3D8 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&);
/* 8007B404 */ virtual bool GetHorseNoEntry(cBgS_PolyInfo const&);
/* 8007B404 */ virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
/* 8007B430 */ virtual bool GetSpecialCode(cBgS_PolyInfo const&);
/* 8007B460 */ virtual void GetSpecialCode(int);
/* 8007B488 */ virtual bool GetMagnetCode(cBgS_PolyInfo const&);
/* 8007B488 */ virtual int GetMagnetCode(cBgS_PolyInfo const&);
/* 8007B4E0 */ virtual void GetPolyObjThrough(int);
/* 8007B504 */ virtual void GetPolyCamThrough(int);
/* 8007B52C */ virtual void GetPolyLinkThrough(int);
@@ -225,7 +225,7 @@ public:
/* 8007B4B4 */ virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&);
/* 8007B6AC */ virtual void GetLinkNo(cBgS_PolyInfo const&);
/* 8007B6D8 */ virtual s32 GetWallCode(cBgS_PolyInfo const&);
/* 8007B704 */ virtual bool GetPolyAtt0(cBgS_PolyInfo const&);
/* 8007B704 */ virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&);
/* 8007B734 */ virtual bool GetPolyAtt1(cBgS_PolyInfo const&);
/* 8007B760 */ virtual bool GetGroundCode(cBgS_PolyInfo const&);
/* 8007B7DC */ virtual void GetIronBallThrough(int);
include/d/bg/d_bg_w_base.h
+3 -3
View File
@@ -49,10 +49,10 @@ public:
virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const = 0;
virtual s32 GetExitId(cBgS_PolyInfo const&) = 0;
virtual s32 GetPolyColor(cBgS_PolyInfo const&) = 0;
virtual bool GetHorseNoEntry(cBgS_PolyInfo const&) = 0;
virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&) = 0;
virtual bool GetSpecialCode(cBgS_PolyInfo const&) = 0;
virtual void GetSpecialCode(int) = 0;
virtual bool GetMagnetCode(cBgS_PolyInfo const&) = 0;
virtual int GetMagnetCode(cBgS_PolyInfo const&) = 0;
virtual void GetPolyObjThrough(int) = 0;
virtual void GetPolyCamThrough(int) = 0;
virtual void GetPolyLinkThrough(int) = 0;
@@ -66,7 +66,7 @@ public:
virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0;
virtual void GetLinkNo(cBgS_PolyInfo const&) = 0;
virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0;
virtual bool GetPolyAtt0(cBgS_PolyInfo const&) = 0;
virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&) = 0;
virtual bool GetPolyAtt1(cBgS_PolyInfo const&) = 0;
virtual bool GetGroundCode(cBgS_PolyInfo const&) = 0;
virtual void GetIronBallThrough(int) = 0;
include/d/bg/d_bg_w_kcol.h
+2 -2
View File
@@ -48,7 +48,7 @@ public:
/* 80082A80 */ virtual void GetHorseNoEntry(cBgS_PolyInfo const&);
/* 80082AB0 */ virtual void GetSpecialCode(cBgS_PolyInfo const&);
/* 80082AE0 */ virtual void GetSpecialCode(int);
/* 80082B0C */ virtual void GetMagnetCode(cBgS_PolyInfo const&);
/* 80082B0C */ virtual int GetMagnetCode(cBgS_PolyInfo const&);
/* 80082B6C */ virtual void GetPolyObjThrough(int);
/* 80082B98 */ virtual void GetPolyCamThrough(int);
/* 80082BC4 */ virtual void GetPolyLinkThrough(int);
@@ -62,7 +62,7 @@ public:
/* 80082B3C */ virtual void GetMonkeyBarsCode(cBgS_PolyInfo const&);
/* 80082D24 */ virtual void GetLinkNo(cBgS_PolyInfo const&);
/* 80082D54 */ virtual s32 GetWallCode(cBgS_PolyInfo const&);
/* 80082D84 */ virtual void GetPolyAtt0(cBgS_PolyInfo const&);
/* 80082D84 */ virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&);
/* 80082DB4 */ virtual void GetPolyAtt1(cBgS_PolyInfo const&);
/* 80082DE4 */ virtual void GetGroundCode(cBgS_PolyInfo const&);
/* 80082E14 */ virtual void GetIronBallThrough(int);
include/d/cc/d_cc_d.h
+14 -6
View File
@@ -91,13 +91,13 @@ enum dCcG_At_Spl {
};
class dCcD_GObjInf;
typedef void (*dCcD_AtHitCallback)(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
typedef void (*dCcD_HitCallback)(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
class dCcD_GAtTgCoCommonBase {
public:
/* 0x00 */ u32 mGFlag;
/* 0x04 */ u32 mRPrm;
/* 0x08 */ dCcD_AtHitCallback mHitCallback;
/* 0x08 */ dCcD_HitCallback mHitCallback;
/* 0x0C */ u32 mApid;
/* 0x10 */ fopAc_ac_c* mAc;
/* 0x14 */ s8 mEffCounter;
@@ -124,7 +124,7 @@ public:
void OnSPrm(u32 flag) { mGFlag |= flag; }
void OffSPrm(u32 flag) { mGFlag &= ~flag; }
bool ChkRPrm(u32 flag) const { return MskRPrm(flag); }
void SetHitCallback(dCcD_AtHitCallback callback) { mHitCallback = callback; }
void SetHitCallback(dCcD_HitCallback callback) { mHitCallback = callback; }
}; // Size = 0x1C
class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase {
@@ -157,6 +157,8 @@ public:
/* 80083BE8 */ virtual ~dCcD_GObjTg() {}
void SetVec(cXyz& vec) { mVec = vec; }
cXyz& GetVec() { return mVec; }
void SetShieldFrontRangeYAngle(s16* angle) { mShieldFrontRangeYAngle = angle; }
void SetMtrl(u8 mtrl) { mMtrl = mtrl; }
private:
/* 0x1C */ u8 mSe;
@@ -186,7 +188,7 @@ public:
/* 800843A8 */ cCcD_GObjInf* GetAtHitGObj();
/* 800843DC */ bool ChkAtNoGuard();
/* 800843FC */ void ClrTgHit();
/* 80084460 */ bool ChkTgHit();
/* 80084460 */ u32 ChkTgHit();
/* 800844B8 */ void ResetTgHit();
/* 800844F8 */ cCcD_Obj* GetTgHitObj();
/* 80084548 */ dCcD_GObjInf* GetTgHitGObj();
@@ -202,21 +204,27 @@ public:
bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); }
void OnAtNoHitMark() { mGObjAt.OnSPrm(2); }
void OffAtNoHitMark() { mGObjAt.OffSPrm(2); }
void OnTgNoHitMark() { mGObjTg.OnSPrm(4); }
void OnAtNoConHit() { mGObjAt.OnSPrm(1); }
void OffAtNoConHit() { mGObjAt.OffSPrm(1); }
void OnTgNoConHit() { mGObjTg.OnSPrm(2); }
void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); }
void SetAtSe(u8 se) { mGObjAt.SetSe(se); }
void SetAtMtrl(u8 mtrl) { mGObjAt.SetMtrl(mtrl); }
void SetTgMtrl(u8 mtrl) { mGObjTg.SetMtrl(mtrl); }
fopAc_ac_c* GetAtHitAc() { return mGObjAt.GetAc(); }
bool ChkAtShieldHit() { return mGObjAt.ChkRPrm(1); }
cXyz* GetAtVecP() { return mGObjAt.GetVecP(); }
void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetAtSpl(spl); }
void SetAtHitCallback(dCcD_AtHitCallback callback) { mGObjAt.SetHitCallback(callback); }
void SetAtHitCallback(dCcD_HitCallback callback) { mGObjAt.SetHitCallback(callback); }
void SetTgHitCallback(dCcD_HitCallback callback) { mGObjTg.SetHitCallback(callback); }
void SetCoHitCallback(dCcD_HitCallback callback) { mGObjCo.SetHitCallback(callback); }
u8 GetAtSe() { return mGObjAt.GetSe(); }
s32 GetAtSpl() { return mGObjAt.GetSpl(); }
u8 GetAtMtrl() { return mGObjAt.GetMtrl(); }
fopAc_ac_c* GetTgHitAc() { return mGObjTg.GetAc(); }
void SetTgShieldFrontRangeYAngle(s16* angle) { mGObjTg.SetShieldFrontRangeYAngle(angle); }
static u32 const m_hitSeID[24];
protected:
include/d/com/d_com_inf_actor.h
+12
View File
@@ -3,4 +3,16 @@
#include "dolphin/types.h"
class dComIfAc_info_c {
public:
/* 0x0 */ int field_0x0;
/* 0x4 */ bool mPause;
};
extern dComIfAc_info_c g_dComIfAc_gameInfo;
inline bool dComIfA_PauseCheck() {
return g_dComIfAc_gameInfo.mPause;
}
#endif /* D_COM_D_COM_INF_ACTOR_H */
include/d/com/d_com_inf_game.h
+196 -6
View File
@@ -52,7 +52,9 @@ public:
/* 0x00 */ camera_class* mCamera;
/* 0x04 */ u8 field_0x4;
/* 0x05 */ u8 field_0x5[3];
/* 0x05 */ u8 field_0x5;
/* 0x06 */ s8 field_0x6;
/* 0x07 */ u8 field_0x7;
/* 0x08 */ u32 mCameraAttentionStatus;
/* 0x0C */ f32 mCameraZoomScale;
/* 0x10 */ f32 mCameraZoomForcus;
@@ -326,8 +328,11 @@ public:
JKRExpHeap* getMsgExpHeap() { return mMsgExpHeap; }
JKRExpHeap* getSubExpHeap2D(int idx) { return mSubExpHeap2D[idx]; }
void setSubExpHeap2D(int idx, void* heap) { mSubExpHeap2D[idx] = (JKRExpHeap*)heap; }
void setExpHeap2D(void* heap) { mExpHeap2D = (JKRExpHeap*)heap; }
void setMsgExpHeap(void* heap) { mMsgExpHeap = (JKRExpHeap*)heap; }
JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; }
JKRArchive* getMsgArchive(int idx) { return mMsgArchive[idx]; }
JKRArchive* getMain2DArchive() { return mMain2DArchive; }
JKRArchive* getAnmArchive() { return mAnmArchive; }
JKRArchive* getCollectResArchive() { return mCollectResArchive; }
@@ -355,8 +360,11 @@ public:
void setRubyArchive(JKRArchive* arc) { mRubyArchive = arc; }
void setMain2DArchive(JKRArchive* arc) { mMain2DArchive = arc; }
void setItemTable(void* data) { mItemTable = data; }
void* getItemTable() { return mItemTable; }
void setPlayerPtr(int i, fopAc_ac_c* ptr) { mPlayerPtr[i] = ptr; }
void setPlayer(int i, fopAc_ac_c* player) { mPlayer[i] = (daAlink_c*)player; }
void setPlayerInfo(int i, fopAc_ac_c* ptr, int camIdx) { mPlayer[i] = (daAlink_c*)ptr; mPlayerCameraID[camIdx] = 0; }
void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; }
void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] &= ~flag; }
bool checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[i]; }
@@ -368,12 +376,21 @@ public:
BOOL checkCameraAttentionStatus(int i, u32 flag) {
return mCameraInfo[i].mCameraAttentionStatus & flag;
}
void setCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus = flag; }
void setCameraInfo(int camIdx, camera_class* p_cam, int param_2, int param_3, int param_4) {
mCameraInfo[camIdx].mCamera = p_cam;
mCameraInfo[camIdx].field_0x4 = param_2;
mCameraInfo[camIdx].field_0x5 = param_3;
mCameraInfo[camIdx].field_0x6 = param_4;
setCameraAttentionStatus(camIdx, 0);
}
void setStatus(u16 status) { mStatus = status; }
s32 checkStatus(u16 flags) { return flags & mStatus; }
bool& isPauseFlag() { return mPauseFlag; }
void offPauseFlag() { mPauseFlag = false; }
void onPauseFlag() { mPauseFlag = true; }
void show2dOn() { mShow2D = 1; }
s8 getLayerOld() { return mLayerOld; }
void setMesgCancelButton(u8 button) { mMesgCancelButton = button; }
@@ -389,6 +406,10 @@ public:
mWindow[i].setMode(mode);
}
void setLastPlayStageName(char* name) {
strncpy(mLastPlayStageName, name, 7);
mLastPlayStageName[7] = 0;
}
char* getLastPlayStageName() { return mLastPlayStageName; }
u8 getGameoverStatus() { return mGameoverStatus; }
@@ -440,7 +461,7 @@ public:
/* 0x04E3C */ dComIfG_camera_info_class mCameraInfo[1];
/* 0x04E74 */ daAlink_c* mPlayer[1];
/* 0x04E78 */ s8 mPlayerCameraID[4];
/* 0x04E7C */ void* mPlayerPtr[2]; // 0: Player, 1: Horse ; type may be wrong
/* 0x04E7C */ fopAc_ac_c* mPlayerPtr[2]; // 0: Player, 1: Horse ; type may be wrong
/* 0x04E84 */ dMsgObject_c* mMsgObjectClass;
/* 0x04E88 */ f32 mItemLifeCount;
/* 0x04E8C */ s32 mItemRupeeCount;
@@ -656,9 +677,7 @@ void dComIfG_get_timelayer(int* layer);
int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resName);
int dComIfG_changeOpeningScene(scene_class* scene, s16 procName);
int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_name);
BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no);
void dComIfGs_onStageSwitch(int i_stageNo, int i_no);
void dComIfGs_offStageSwitch(int i_stageNo, int i_no);
int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* resName, JKRHeap* heap);
inline void dComIfG_setBrightness(u8 brightness) {
g_dComIfG_gameInfo.mFadeBrightness = brightness;
@@ -765,6 +784,17 @@ void dComIfGs_offOneZoneSwitch(int param_0, int param_1);
s8 dComIfGp_getReverb(int roomNo);
void dComIfGs_gameStart();
int dComIfGs_wolfeye_effect_check();
BOOL dComIfGs_Wolf_Change_Check();
void dComIfGs_onVisitedRoom(int param_0);
void dComIfGs_setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo, u8 param_4,
u8 param_5);
BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no);
void dComIfGs_onStageSwitch(int i_stageNo, int i_no);
void dComIfGs_offStageSwitch(int i_stageNo, int i_no);
inline void dComIfGs_init() {
g_dComIfG_gameInfo.info.init();
}
inline void dComIfGs_onDungeonItemMap() {
g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemMap();
@@ -866,6 +896,10 @@ inline void dComIfGs_setEmptyBombBagItemIn(u8 newBomb, bool setNum) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(newBomb, setNum);
}
inline void dComIfGs_setEmptyBombBagItemIn(u8 newBomb, u8 bombNum, bool setNum) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(newBomb, bombNum, setNum);
}
inline void dComIfGs_setEmptyBottle() {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottle();
}
@@ -1051,6 +1085,10 @@ inline s32 dComIfGs_isDungeonItemWarp() {
return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemWarp();
}
inline s32 dComIfGs_isStageBossEnemy() {
return g_dComIfG_gameInfo.info.getMemory().getBit().isStageBossEnemy();
}
inline void dComIfGs_setKeyNum(u8 keyNum) {
g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(keyNum);
}
@@ -1369,6 +1407,38 @@ inline void* dComIfGs_getPEventBit() {
return g_dComIfG_gameInfo.info.getEvent().getPEventBit();
}
inline bool dComIfGs_isItem(int bitNo, int roomNo) {
return g_dComIfG_gameInfo.info.isItem(bitNo, roomNo);
}
inline void dComIfGs_onItem(int bitNo, int roomNo) {
g_dComIfG_gameInfo.info.onItem(bitNo, roomNo);
}
inline void dComIfGs_onActor(int bitNo, int roomNo) {
g_dComIfG_gameInfo.info.onActor(bitNo, roomNo);
}
inline void dComIfGs_setLastWarpAcceptStage(s8 param_0) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpAcceptStage(param_0);
}
inline void dComIfGs_setOptPointer(u8 i_pointer) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setPointer(i_pointer);
}
inline u8 dComIfGs_getNewFile() {
return g_dComIfG_gameInfo.info.getNewFile();
}
inline void dComIfGs_setInitDataToCard(u8* p_saveData, int dataNum) {
g_dComIfG_gameInfo.info.initdata_to_card((char*)p_saveData, dataNum);
}
inline void dComIfGs_setMemoryToCard(u8* p_saveData, int dataNum) {
g_dComIfG_gameInfo.info.memory_to_card((char*)p_saveData, dataNum);
}
void dComIfGp_setItemLifeCount(f32 amount, u8 type);
void dComIfGp_setItemRupeeCount(long amount);
void dComIfGp_setSelectItem(int index);
@@ -1396,6 +1466,7 @@ u8 dComIfGp_world_dark_get();
JKRExpHeap* dComIfGp_getSubHeap2D(int flag);
void dComIfGp_world_dark_set(u8);
u8 dComIfGp_getNowLevel();
void dComIfGp_calcNowRegion();
inline dStage_startStage_c* dComIfGp_getStartStage() {
return g_dComIfG_gameInfo.play.getStartStage();
@@ -1457,6 +1528,10 @@ inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) {
return g_dComIfG_gameInfo.play.getMsgDtArchive(idx);
}
inline JKRArchive* dComIfGp_getMsgArchive(int idx) {
return g_dComIfG_gameInfo.play.getMsgArchive(idx);
}
inline void dComIfGp_setFieldMapArchive2(JKRArchive* arc) {
g_dComIfG_gameInfo.play.setFieldMapArchive2(arc);
}
@@ -1537,6 +1612,10 @@ inline void dComIfGp_setItemTable(void* data) {
g_dComIfG_gameInfo.play.setItemTable(data);
}
inline void* dComIfGp_getItemTable() {
return g_dComIfG_gameInfo.play.getItemTable();
}
inline JKRExpHeap* dComIfGp_getExpHeap2D() {
return g_dComIfG_gameInfo.play.getExpHeap2D();
}
@@ -1605,6 +1684,10 @@ inline s16 dComIfGp_getNextStagePoint() {
return g_dComIfG_gameInfo.play.getNextStagePoint();
}
inline void dComIfGp_setLastPlayStageName(char* name) {
g_dComIfG_gameInfo.play.setLastPlayStageName(name);
}
inline u32 dComIfGp_getNowVibration() {
return g_dComIfG_gameInfo.play.getNowVibration();
}
@@ -1801,6 +1884,14 @@ inline void dComIfGp_setSubExpHeap2D(int idx, void* heap) {
g_dComIfG_gameInfo.play.setSubExpHeap2D(idx, heap);
}
inline void dComIfGp_setExpHeap2D(void* heap) {
g_dComIfG_gameInfo.play.setExpHeap2D(heap);
}
inline void dComIfGp_setMsgExpHeap(void* heap) {
g_dComIfG_gameInfo.play.setMsgExpHeap(heap);
}
inline void dComIfGp_offEnableNextStage() {
g_dComIfG_gameInfo.play.offEnableNextStage();
}
@@ -1825,10 +1916,22 @@ inline void dComIfGp_setStatus(u16 status) {
g_dComIfG_gameInfo.play.setStatus(status);
}
inline void dComIfGp_setLinkPlayer(fopAc_ac_c* ptr) {
g_dComIfG_gameInfo.play.setPlayerPtr(0, ptr);
}
inline void dComIfGp_setPlayerPtr(int i, fopAc_ac_c* ptr) {
g_dComIfG_gameInfo.play.setPlayerPtr(i, ptr);
}
inline void dComIfGp_setPlayer(int i, fopAc_ac_c* player) {
g_dComIfG_gameInfo.play.setPlayer(i, player);
}
inline void dComIfGp_setPlayerInfo(int plyrIdx, fopAc_ac_c* ptr, int camIdx) {
g_dComIfG_gameInfo.play.setPlayerInfo(plyrIdx, ptr, camIdx);
}
inline void dComIfGp_setPlayerStatus0(int param_0, u32 flag) {
g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 0, flag);
}
@@ -1841,6 +1944,10 @@ inline BOOL dComIfGp_checkCameraAttentionStatus(int i, u32 flag) {
return g_dComIfG_gameInfo.play.checkCameraAttentionStatus(i, flag);
}
inline void dComIfGp_setCameraInfo(int camIdx, camera_class* p_cam, int param_2, int param_3, int param_4) {
g_dComIfG_gameInfo.play.setCameraInfo(camIdx, p_cam, param_2, param_3, param_4);
}
inline void dComIfGp_clearPlayerStatus0(int param_0, u32 flag) {
g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 0, flag);
}
@@ -2015,6 +2122,14 @@ inline JKRAramArchive* dComIfGp_getFieldMapArchive2() {
return g_dComIfG_gameInfo.play.getFieldMapArchive2();
}
inline void dComIfGp_onPauseFlag() {
g_dComIfG_gameInfo.play.onPauseFlag();
}
inline void dComIfGp_createSimpleModel() {
g_dComIfG_gameInfo.play.createSimpleModel();
}
inline s32 dComIfGp_roomControl_getStayNo() {
return dStage_roomControl_c::getStayNo();
}
@@ -2063,10 +2178,55 @@ inline BOOL dComIfGp_event_compulsory(void* param_0, const char* param_1, u16 pa
return g_dComIfG_gameInfo.play.getEvent().compulsory(param_0, param_1, param_2);
}
inline int dComIfGp_event_moveApproval(void* actor) {
return g_dComIfG_gameInfo.play.getEvent().moveApproval(actor);
}
inline int dComIfGp_event_order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4,
void* param_5, s16 eventID, u8 infoIdx) {
return g_dComIfG_gameInfo.play.getEvent().order(eventType, priority, flag, param_3, param_4, param_5, eventID, infoIdx);
}
inline void dComIfGp_event_setGtItm(int i_itemNo) {
g_dComIfG_gameInfo.play.getEvent().setGtItm(i_itemNo);
}
inline void dComIfGp_evmng_cutEnd(int param_0) {
dComIfGp_getPEvtManager()->cutEnd(param_0);
}
inline BOOL dComIfGp_evmng_endCheck(const char* event) {
return g_dComIfG_gameInfo.play.getEvtManager().endCheckOld(event);
}
inline void dComIfGp_event_setItemPartnerId(unsigned int id) {
g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
}
inline int dComIfGp_evmng_startDemo(int param_0) {
return dComIfGp_getPEvtManager()->setStartDemo(param_0);
}
inline void* dComIfGp_event_getTalkPartner() {
u32 t = g_dComIfG_gameInfo.play.getEvent().mPtT;
return g_dComIfG_gameInfo.play.getEvent().convPId(t);
}
inline void* dComIfGp_event_getItemPartner() {
u32 i = g_dComIfG_gameInfo.play.getEvent().mPtI;
return g_dComIfG_gameInfo.play.getEvent().convPId(i);
}
inline void* dComIfGp_event_getPt1() {
u32 pt1 = g_dComIfG_gameInfo.play.getEvent().mPt1;
return g_dComIfG_gameInfo.play.getEvent().convPId(pt1);
}
inline void* dComIfGp_event_getPt2() {
u32 pt2 = g_dComIfG_gameInfo.play.getEvent().mPt2;
return g_dComIfG_gameInfo.play.getEvent().convPId(pt2);
}
inline int i_dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) {
return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, param_2);
}
@@ -2111,6 +2271,10 @@ inline void dComIfGp_particle_create() {
g_dComIfG_gameInfo.play.createParticle();
}
inline void dComIfGp_particle_createScene(const void* param_0) {
g_dComIfG_gameInfo.play.getParticle()->createScene(param_0);
}
inline JKRExpHeap* dComIfGp_particle_getResHeap() {
return g_dComIfG_gameInfo.play.getParticle()->getResHeap();
}
@@ -2145,6 +2309,15 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
param_10, param_11, 1.0f);
}
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const csXyz* param_3,
const cXyz* param_4, u8 param_5, dPa_levelEcallBack* param_6,
s8 param_7, const GXColor* param_8, const GXColor* param_9,
const cXyz* param_10) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(
param_0, param_1, param_2, NULL, param_3, param_4, param_5, param_6, param_7, param_8,
param_9, param_10, 1.0f);
}
inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
const csXyz* param_4, const cXyz* param_5, u8 param_6,
dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9,
@@ -2160,11 +2333,23 @@ inline u32 dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz*
NULL, NULL);
}
inline u32 dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, const csXyz* param_3,
const cXyz* param_4) {
return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL,
NULL, NULL);
}
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const csXyz* param_3,
const cXyz* param_4) {
return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL,
NULL, NULL);
}
inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) {
g_dComIfG_gameInfo.play.getParticle()->forceOnEventMove(param_0);
}
inline dPa_control_c::level_c::emitter_c* dComIfGp_particle_getEmitter(u32 param_0) {
inline JPABaseEmitter* dComIfGp_particle_getEmitter(u32 param_0) {
return g_dComIfG_gameInfo.play.getParticle()->getEmitter(param_0);
}
@@ -2232,6 +2417,11 @@ inline void dComIfGd_setList() {
g_dComIfG_gameInfo.drawlist.setXluList();
}
inline void dComIfGd_setListItem3D() {
g_dComIfG_gameInfo.drawlist.setOpaListItem3D();
g_dComIfG_gameInfo.drawlist.setXluListItem3D();
}
inline void dComIfGd_setXluList2DScreen() {
g_dComIfG_gameInfo.drawlist.setXluList2DScreen();
}
include/d/com/d_com_static.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
/* 80031248 */ void newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 800313BC */ void reset();
/* 800314D4 */ void check(fopAc_ac_c*);
/* 800314D4 */ static void check(fopAc_ac_c*);
/* 80031434 */ static bool check(s8, cXyz const&);
/* 800315A4 */ static void execute();

Some files were not shown because too many files have changed in this diff Show More