mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-10 15:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_alink work / bump dtk version (#2205)

Browse Source
This commit is contained in:
TakaRikka
2024-10-12 15:11:17 -07:00
committed by GitHub
parent 12eb254d76
commit 8514737d46
64 changed files with 1369 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alink.h
+15 -12
View File
@@ -145,7 +145,7 @@ public:
/* 800D0B8C */ virtual ~daAlink_matAnm_c();
/* 8009D90C */ virtual void calc(J3DMaterial*) const;
static void decMorfFrame() {}
static void decMorfFrame() { cLib_calcTimer<u8>(&m_morf_frame); }
static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; }
static u8 m_morf_frame;
@@ -681,6 +681,7 @@ public:
FTANM_UNK_9B = 0x9B,
FTANM_UNK_9C = 0x9C,
FTANM_UNK_9D = 0x9D,
FTANM_UNK_9E = 0x9E,
FTANM_UNK_9F = 0x9F,
FTANM_UNK_A0 = 0xA0,
FTANM_UNK_A1 = 0xA1,
@@ -1774,12 +1775,12 @@ public:
/* 800D72BC */ int setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int);
/* 800D7478 */ void setDamagePointNormal(int);
/* 800D74A4 */ void setLandDamagePoint(int);
/* 800D74F4 */ Vec* getDamageVec(dCcD_GObjInf*);
/* 800D74F4 */ cXyz* getDamageVec(dCcD_GObjInf*);
/* 800D76C4 */ void setDashDamage();
/* 800D7768 */ static BOOL checkIcePolygonDamage(cBgS_PolyInfo*);
/* 800D77C8 */ BOOL checkMagicArmorNoDamage();
/* 800D7820 */ void checkPolyDamage();
/* 800D7A98 */ bool checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
/* 800D7820 */ int checkPolyDamage();
/* 800D7A98 */ BOOL checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
/* 800D7B18 */ void damageTimerCount();
/* 800D7BE8 */ bool checkHugeAttack(int) const;
/* 800D7C14 */ bool checkLargeAttack(int) const;
@@ -1800,7 +1801,7 @@ public:
/* 800DB418 */ int procCoElecDamage();
/* 800DB5B0 */ int procStEscapeInit();
/* 800DB610 */ int procStEscape();
/* 800DB6A4 */ int procDkCaughtInit(unsigned int);
/* 800DB6A4 */ int procDkCaughtInit(fpc_ProcID);
/* 800DB860 */ int procDkCaught();
/* 800DBC98 */ void setScreamWaitAnime();
/* 800DBD1C */ int procScreamWaitInit();
@@ -3048,7 +3049,7 @@ public:
virtual void onFrollCrashFlg(u8, int);
virtual MtxP getModelJointMtx(u16);
virtual MtxP getHeadMtx();
virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
virtual BOOL checkCutJumpCancelTurn() const;
virtual bool checkIronBallReturn() const;
virtual bool checkIronBallGroundStop() const;
@@ -3137,8 +3138,8 @@ public:
virtual BOOL checkCutJumpMode() const;
u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
bool checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
bool checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
BOOL checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
// this might be a fake match, but helps fix usage in many functions
@@ -3199,8 +3200,9 @@ public:
BOOL checkCopyRodReadyAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x54); }
BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(0x5D) || checkUpperAnime(0x260); }
BOOL checkCopyRodControllAnime() const { return checkUpperAnime(0x202); }
BOOL checkWolfHeadDamageAnime() const { return checkUpperAnime(0x2A7); }
s16 checkWolfEyeUp() const { return mWolfEyeUp; }
int checkWolfEyeUp() const { return mWolfEyeUp; }
void onModeFlg(u32 flag) { mModeFlg |= flag; }
void offModeFlg(u32 flag) { mModeFlg &= ~flag; }
bool swordButton() { return itemButtonCheck(8); }
@@ -3249,7 +3251,7 @@ public:
const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; }
const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; }
BOOL checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
u32 checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
int getGrassHowlEventActor() const { return field_0x3198; }
MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); }
MtxP getMagneBootsMtx() { return mMagneBootMtx; }
@@ -3582,8 +3584,8 @@ public:
/* 0x02854 */ daPy_actorKeep_c mCargoCarryAcKeep;
/* 0x0285C */ daPy_actorKeep_c field_0x285c;
/* 0x02864 */ dMsgFlow_c mMsgFlow;
/* 0x028B0 */ unsigned int mShieldArrowIDs[16];
/* 0x028F0 */ unsigned int mMsgClassID;
/* 0x028B0 */ fpc_ProcID mShieldArrowIDs[16];
/* 0x028F0 */ fpc_ProcID mMsgClassID;
/* 0x028F4 */ int mAtnActorID;
/* 0x028F8 */ int field_0x28f8;
/* 0x028FC */ int field_0x28fc;
@@ -3722,6 +3724,7 @@ public:
union {
s16 field_0x3008;
s16 mHowlExitID;
s16 mIceFreezeTimer;
} /* 0x03008 */ mProcVar0;
union {
s16 field_0x300a;
include/d/actor/d_a_b_bq.h
+2 -2
View File
@@ -39,8 +39,8 @@ public:
/* 0x06D0 */ f32 mDistToPlayer;
/* 0x06D4 */ s16 mTimers[5];
/* 0x06DE */ s16 field_0x6de;
/* 0x06E0 */ unsigned int mTentacleIDs[2];
/* 0x06E8 */ unsigned int mMonkeyBombID;
/* 0x06E0 */ fpc_ProcID mTentacleIDs[2];
/* 0x06E8 */ fpc_ProcID mMonkeyBombID;
/* 0x06EC */ u8 field_0x6ec;
/* 0x06ED */ s8 mColpatType;
/* 0x06F0 */ f32 mColpatBlend;
include/d/actor/d_a_canoe.h
+1 -1
View File
@@ -37,7 +37,7 @@ public:
bool checkJumpRideFlg() { return mJumpRideFlg; }
void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; }
void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; }
void onRodID(unsigned int i_rodID) { mRodID = i_rodID; }
void onRodID(fpc_ProcID i_rodID) { mRodID = i_rodID; }
void setWaterFallDownSe() { field_0x141c.startSound(Z2SE_AL_CANOE_FALL_DW, 0, -1); }
void setPosAndAngle(cXyz const* i_pos, s16 i_angle) {
include/d/actor/d_a_horse.h
+2
View File
@@ -206,6 +206,8 @@ public:
bool checkGetOff() const { return fabsf(speedF) < 3.0f; }
bool checkEnemySearch() { return checkResetStateFlg0(ENEMY_SEARCH); }
bool checkOriginalDemo() const { return field_0x16b8 == 3; }
s16 checkCowHit() const { return mCowHit; }
s16 getCowHitAngle() const { return mCowHitAngle; }
void onTagJump(f32 param_0, f32 param_1, f32 param_2) {
field_0x1768 = param_0;
include/d/actor/d_a_midna.h
+1 -1
View File
@@ -51,7 +51,7 @@ public:
void onForcePanic();
u32 checkForceNormalColor() const;
u32 checkForceTiredColor() const;
bool checkMidnaTired();
static bool checkMidnaTired();
void onNoServiceWait();
/* 804BC3E0 */ void modelCallBack(int);
include/d/actor/d_a_myna.h
+2 -2
View File
@@ -87,7 +87,7 @@ public:
/* 80948644 */ void attack2_move();
/* 809486F8 */ void attack2_talk_init();
/* 80948734 */ void attack2_talk_move();
/* 809487EC */ void soldoutItem(unsigned int);
/* 809487EC */ void soldoutItem(fpc_ProcID);
/* 80948828 */ bool fly_attack_move();
/* 80948ADC */ bool fly_return_move();
/* 80948DFC */ void fly_body_wave();
@@ -95,7 +95,7 @@ public:
/* 80948FAC */ int chkEvent();
/* 809490B8 */ int orderEvent();
/* 80949128 */ void deleteItem(int);
/* 80949144 */ void deleteItem(unsigned int);
/* 80949144 */ void deleteItem(fpc_ProcID);
/* 80949190 */ void initiate();
/* 80949408 */ void setItemInfo();
/* 80949544 */ void setRoomNo();
include/d/actor/d_a_player.h
+12 -8
View File
@@ -255,7 +255,7 @@ public:
};
enum daPy_FLG1 {
FLG1_UNK_40000000 = 0x40000000,
FLG1_ICE_FREEZE = 0x40000000,
FLG1_UNK_20000000 = 0x20000000,
FLG1_UNK_10000000 = 0x10000000,
FLG1_UNK_4000000 = 0x4000000,
@@ -387,6 +387,8 @@ public:
ERFLG1_UNK_100000 = 0x100000,
ERFLG1_UNK_40000 = 0x40000,
ERFLG1_UNK_10000 = 0x10000,
ERFLG1_UNK_8000 = 0x8000,
ERFLG1_UNK_4000 = 0x4000,
ERFLG1_UNK_2000 = 0x2000,
ERFLG1_UNK_1000 = 0x1000,
ERFLG1_UNK_800 = 0x800,
@@ -437,6 +439,7 @@ public:
};
enum daPy_RFLG1 {
RFLG1_UNK_400 = 0x400,
RFLG1_UNK_200 = 0x200,
RFLG1_UNK_100 = 0x100,
RFLG1_UNK_80 = 0x80,
@@ -551,8 +554,8 @@ public:
static void setPlayerDamage(int, int);
static void setMidnaMotionNum(int);
static void setMidnaFaceNum(int);
BOOL checkShieldGet();
BOOL checkSwordGet();
static BOOL checkShieldGet();
static BOOL checkSwordGet();
void changeDemoParam2(s16);
cXyz getHeadTopPos() const;
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
@@ -641,7 +644,7 @@ public:
virtual void onFrollCrashFlg(u8, int); // weak
virtual MtxP getModelJointMtx(u16);
virtual MtxP getHeadMtx();
virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
virtual BOOL checkCutJumpCancelTurn() const { return FALSE; }
virtual bool checkIronBallReturn() const;
virtual bool checkIronBallGroundStop() const;
@@ -766,12 +769,13 @@ public:
bool checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); }
bool checkFrontRollCrash() const { return checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_UNK_40000000); }
bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_ICE_FREEZE); }
bool checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_UNK_20000); }
bool getGrabUpEnd() const { return checkResetFlg0(RFLG0_GRAB_UP_END); }
bool getGrabPutStart() const { return checkResetFlg0(RFLG0_GRAB_PUT_START); }
bool checkSwimUp() const { return checkNoResetFlg0(FLG0_SWIM_UP); }
BOOL checkHorseZelda() const { return checkNoResetFlg2(FLG2_HORSE_ZELDA); }
BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_UNK_1000000 | FLG2_UNK_800000)); }
void onBossRoomWait() { onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); }
void onBeeFollow() { onEndResetFlg0(ERFLG0_BEE_FOLLOW); }
@@ -852,10 +856,10 @@ public:
cXyz* getRightHandPosP() { return &mRightHandPos; }
u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
BOOL checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
BOOL checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
u32 checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
BOOL checkFastSwordCut() const { return checkNoResetFlg0(FLG0_UNK_80000); }
bool checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
u32 checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
void onPlayerNoDraw() { onNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void offPlayerNoDraw() { offNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void onPushPullKeep() { onNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
include/d/d_bg_s.h
+2 -2
View File
@@ -21,7 +21,7 @@ public:
void Release();
virtual ~cBgS_ChkElm() {}
virtual void Regist2(dBgW_Base*, unsigned int, void*);
virtual void Regist2(dBgW_Base*, fpc_ProcID, void*);
bool ChkUsed() const { return m_used; }
}; // Size: 0x14
@@ -35,7 +35,7 @@ public:
public:
cBgS() {}
bool Regist(dBgW_Base*, unsigned int, void*);
bool Regist(dBgW_Base*, fpc_ProcID, void*);
int Release(dBgW_Base*);
bool LineCross(cBgS_LinChk*);
f32 GroundCross(cBgS_GndChk*);
include/d/d_bg_s_acch.h
+1 -1
View File
@@ -101,7 +101,7 @@ public:
/* 80077178 */ f32 GetWallAllLowH_R();
/* 800771E4 */ f32 GetSpeedY();
/* 80077200 */ f32 GetWallAddY(Vec&);
/* 80077278 */ void SetNowActorInfo(int, void*, unsigned int);
/* 80077278 */ void SetNowActorInfo(int, void*, fpc_ProcID);
/* 80077288 */ void SetWallPolyIndex(int, int);
/* 800772E8 */ void CalcMovePosWork();
/* 8007732C */ void CalcWallRR();
include/d/d_bg_w_base.h
+1
View File
@@ -4,6 +4,7 @@
#include "SSystem/SComponent/c_bg_s_poly_info.h"
#include "SSystem/SComponent/c_bg_w.h"
#include "SSystem/SComponent/c_m3d_g_pla.h"
#include "f_pc/f_pc_base.h"
class cBgS_GndChk;
class cBgS_LinChk;
include/d/d_camera.h
+1 -1
View File
@@ -363,7 +363,7 @@ public:
/* 80181490 */ void onHorseDush();
/* 80181500 */ void GetForceLockOnActor();
/* 80181534 */ void ForceLockOn(fopAc_ac_c*);
/* 80181560 */ void ForceLockOff(unsigned int);
/* 80181560 */ void ForceLockOff(fpc_ProcID);
/* 8018159C */ void ForceLockOff(fopAc_ac_c*);
/* 80181E20 */ cXyz Up();
/* 80181E64 */ cXyz Eye();
include/d/d_cc_d.h
+9 -8
View File
@@ -116,12 +116,12 @@ public:
/* 8008523C */ virtual ~dCcD_GStts() {}
void ClrAt() { mAt = 0; }
void ClrTg() { mTg = 0; }
void SetAtApid(unsigned int id) { mAtApid = id; }
void SetTgApid(unsigned int id) { mTgApid = id; }
void SetAtApid(fpc_ProcID id) { mAtApid = id; }
void SetTgApid(fpc_ProcID id) { mTgApid = id; }
u8 GetRoomId() { return mRoomId; }
void SetRoomId(int id) { mRoomId = id; }
unsigned int GetAtOldApid() { return mAtOldApid; }
unsigned int GetTgOldApid() { return mTgOldApid; }
fpc_ProcID GetAtOldApid() { return mAtOldApid; }
fpc_ProcID GetTgOldApid() { return mTgOldApid; }
bool ChkNoActor() { return field_0x1C & 1;}
bool ChkNoneActorPerfTblId() { return field_0x08 == 0xFFFF; }
dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mAt; }
@@ -174,7 +174,7 @@ public:
dCcD_GAtTgCoCommonBase() { ct(); }
/* 8008364C */ void ClrActorInfo();
/* 80083660 */ void ct();
/* 80083678 */ void SetHitApid(unsigned int);
/* 80083678 */ void SetHitApid(fpc_ProcID);
/* 80083688 */ fopAc_ac_c* GetAc();
/* 80083704 */ void Set(dCcD_SrcGAtTgCoCommonBase const&);
/* 80083718 */ void SetEffCounterTimer();
@@ -359,9 +359,9 @@ public:
dCcD_HitCallback GetCoHitCallback() { return mGObjCo.GetHitCallback(); }
dCcD_HitCallback GetAtHitCallback() { return mGObjAt.GetHitCallback(); }
dCcD_HitCallback GetTgHitCallback() { return mGObjTg.GetHitCallback(); }
void SetCoHitApid(unsigned int apid) { mGObjCo.SetHitApid(apid); }
void SetAtHitApid(unsigned int apid) { mGObjAt.SetHitApid(apid); }
void SetTgHitApid(unsigned int apid) { mGObjTg.SetHitApid(apid); }
void SetCoHitApid(fpc_ProcID apid) { mGObjCo.SetHitApid(apid); }
void SetAtHitApid(fpc_ProcID apid) { mGObjAt.SetHitApid(apid); }
void SetTgHitApid(fpc_ProcID apid) { mGObjTg.SetHitApid(apid); }
void OnCoHitNoActor() { mGObjCo.OnRPrm(1); }
void OffCoHitNoActor() { mGObjCo.OffRPrm(1); }
void OnAtHitNoActor() { mGObjAt.OnRPrm(2); }
@@ -404,6 +404,7 @@ public:
cXyz* GetTgHitPosP() { return mGObjTg.GetHitPosP(); }
cXyz* GetTgRVecP() { return mGObjTg.GetRVecP(); }
bool ChkTgHookshotThrough() { return mGObjTg.ChkSPrm(0x80); }
bool ChkTgShieldHit() { return mGObjTg.ChkRPrm(2); }
static const Z2SoundID m_hitSeID[24];
include/d/d_com_inf_game.h
+7 -6
View File
@@ -493,7 +493,7 @@ public:
}
void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] |= flag; }
void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] &= ~flag; }
bool checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[param_0][i]; }
u32 checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[param_0][i]; }
int getPlayerCameraID(int i) { return mPlayerCameraID[i * 8]; }
int getCameraPlayer1ID(int i) { return mCameraInfo[i].field_0x5; }
@@ -813,7 +813,7 @@ public:
/* 0x1DDF8 */ u8 mFadeBrightness;
/* 0x1DDF9 */ u8 mWorldDark;
/* 0x1DDFA */ s8 field_0x1ddfa;
/* 0x1DDFB */ s8 field_0x1ddfb;
/* 0x1DDFB */ s8 mPolyDamageOff;
/* 0x1DDFC */ s8 field_0x1ddfc;
/* 0x1DE00 */ u32 field_0x1de00;
/* 0x1DE04 */ u32 field_0x1de04;
@@ -1009,6 +1009,7 @@ s8 dComIfGs_BossLife_public_Get();
u8 dComIfGs_checkGetInsectNum();
u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx);
BOOL dComIfGs_isStageTbox(int i_stageNo, int i_no);
s8 dComIfGs_PolyDamageOff_Check();
inline void dComIfGs_init() {
g_dComIfG_gameInfo.info.init();
@@ -1993,11 +1994,11 @@ inline void dComIfGp_init() {
g_dComIfG_gameInfo.play.init();
}
inline bool dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
inline u32 dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
}
inline bool dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
inline u32 dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag);
}
@@ -2005,7 +2006,7 @@ inline void dComIfGp_setItemLifeCount(float amount, u8 type) {
g_dComIfG_gameInfo.play.setItemLifeCount(amount, type);
}
inline void dComIfGp_setItemRupeeCount(int amount) {
inline void dComIfGp_setItemRupeeCount(s32 amount) {
g_dComIfG_gameInfo.play.setItemRupeeCount(amount);
}
@@ -3341,7 +3342,7 @@ inline void dComIfGp_event_setItemPartner(void* param_0) {
g_dComIfG_gameInfo.play.getEvent().setPtI(param_0);
}
inline void dComIfGp_event_setItemPartnerId(unsigned int id) {
inline void dComIfGp_event_setItemPartnerId(fpc_ProcID id) {
g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
}
include/d/d_event.h
+3 -3
View File
@@ -125,7 +125,7 @@ public:
dStage_MapEvent_dt_c* getStageEventDt();
void sceneChange(int exitId);
u32 getPId(void*);
fopAc_ac_c* convPId(unsigned int);
fopAc_ac_c* convPId(fpc_ProcID);
void* getStbDemoData(char* resName);
static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID, s32 roomNo);
static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID);
@@ -134,7 +134,7 @@ public:
void setPt2(void* ptr);
void setPtT(void* ptr);
void setPtI(void* ptr);
void setPtI_Id(unsigned int id);
void setPtI_Id(fpc_ProcID id);
void setPtD(void* ptr);
void setGtItm(u8 itemNo);
@@ -155,7 +155,7 @@ public:
void setCullRate(f32 f) { mCullRate = f; }
BOOL chkTalkXY() { return field_0xed == 1 || field_0xed == 2; }
bool isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; }
BOOL isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; }
fopAc_ac_c* getPt1() { return convPId(mPt1); }
fopAc_ac_c* getPt2() { return convPId(mPt2); }
fopAc_ac_c* getPtT() { return convPId(mPtT); }
include/d/d_gameover.h
+3 -3
View File
@@ -81,9 +81,9 @@ public:
}; // Size: 0x11C
s32 d_GameOver_Create(u8 param_0);
bool d_GameOver_Delete(unsigned int& i_id);
bool d_GameOver_Delete(fpc_ProcID& i_id);
inline s32 d_GameOver_CheckDelete(unsigned int& id) {
inline s32 d_GameOver_CheckDelete(fpc_ProcID& id) {
if (id != UINT32_MAX) {
dGameover_c* gameover = (dGameover_c*)fopMsgM_SearchByID(id);
@@ -97,7 +97,7 @@ inline s32 d_GameOver_CheckDelete(unsigned int& id) {
return 0;
}
inline s32 d_GameOver_animeStart(unsigned int& id) {
inline s32 d_GameOver_animeStart(fpc_ProcID& id) {
if (id != UINT32_MAX) {
dGameover_c* gameover = (dGameover_c*)fopMsgM_SearchByID(id);
include/d/d_kankyo.h
+2 -1
View File
@@ -4,6 +4,7 @@
#include "JSystem/J3DGraphBase/J3DStruct.h"
#include "d/d_kankyo_wether.h"
#include "m_Do/m_Do_ext.h"
#include "f_pc/f_pc_base.h"
class JPABaseEmitter;
class cBgS_PolyInfo;
@@ -30,7 +31,7 @@ void dKy_GxFog_set();
static void GxFog_set();
static void GxXFog_set();
u8 dKy_pol_argument_get(cBgS_PolyInfo const* i_poly);
void dKy_Sound_set(cXyz i_pos, int param_1, unsigned int i_actorID, int param_3);
void dKy_Sound_set(cXyz i_pos, int param_1, fpc_ProcID i_actorID, int param_3);
void dKy_bg_MAxx_proc(void* param_0);
void dKy_change_colpat(u8 colpat);
void dKy_BossLight_set(cXyz* param_0, _GXColor* param_1, f32 param_2, u8 param_3);
include/d/d_msg_object.h
+2 -2
View File
@@ -118,7 +118,7 @@ public:
/* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
char*, char*, char*, s16*);
/* 80238174 */ static void* getMsgDtPtr();
/* 80238188 */ static void setProcessID(unsigned int);
/* 80238188 */ static void setProcessID(fpc_ProcID);
/* 8023819C */ static msg_class* getActor();
/* 802381C0 */ static fopAc_ac_c* getpTalkActor();
/* 802381D4 */ static int getIdx();
@@ -181,7 +181,7 @@ public:
void onCameraCancelFlagLocal() { mCameraCancelFlag = true; }
void offCameraCancelFlagLocal() { mCameraCancelFlag = false; }
void onKillMessageFlagLocal() { mKillMessageFlag = true; }
void setProcessIDLocal(unsigned int id) { mProcessID = id; }
void setProcessIDLocal(fpc_ProcID id) { mProcessID = id; }
void setPortalMessageIDLocal(u16 msgID) { mPortalMessageID = msgID; }
void setInsectItemNoLocal(u8 itemNo) { mInsectItemNo = itemNo; }
void setLetterNameIDLocal(u16 nameID) { mLetterNameID = nameID; }
include/d/d_stage.h
+1 -1
View File
@@ -833,7 +833,7 @@ public:
static void onNoChangeRoom() { mNoChangeRoom = true; }
static void setProcID(u32 id) { mProcID = id; }
static u32 getProcID() { return mProcID; }
static void setStatusProcID(int i_roomNo, unsigned int i_id) { mStatus[i_roomNo].mProcID = i_id; }
static void setStatusProcID(int i_roomNo, fpc_ProcID i_id) { mStatus[i_roomNo].mProcID = i_id; }
static int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; }
static void setRegionNo(int i_roomNo, u8 i_regionNo) { mStatus[i_roomNo].mRegionNo = i_regionNo; }
static void setZoneCount(int i_roomNo, int count) { mStatus[i_roomNo].mZoneCount = count; }