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

Merge pull request #358 from TakaRikka/mist

Browse Source 
d_a_tag_mist, d_a_obj_lv3waterEff, d_a_kytag16, d_a_disappear OK
This commit is contained in:
hatal175
2023-07-01 13:10:18 +03:00
committed by GitHub
parent 2c06d515d2 8fdc70b602
commit d5e0822313
76 changed files with 942 additions and 3511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+42 -48
View File
@@ -452,9 +452,7 @@ public:
mMesgCamInfoActor9 = param_9;
mMesgCamInfoActor10 = param_10;
}
int getMesgCamInfo() {
return mMesgCamInfoBasicID;
}
int getMesgCamInfo() { return mMesgCamInfoBasicID; }
void setFontArchive(JKRArchive* arc) { mFontArchive = arc; }
void setRubyArchive(JKRArchive* arc) { mRubyArchive = arc; }
void setMain2DArchive(JKRArchive* arc) { mMain2DArchive = arc; }
@@ -494,9 +492,7 @@ public:
f32 getCameraZoomForcus(int i_no) { return mCameraInfo[i_no].mCameraZoomForcus; }
void setMesgCamInfoID(int param_0) {
mMesgCamInfo = param_0;
}
void setMesgCamInfoID(int param_0) { mMesgCamInfo = param_0; }
void setStatus(u16 status) { mStatus = status; }
s32 checkStatus(u16 flags) { return flags & mStatus; }
@@ -914,8 +910,8 @@ s16 dComIfGs_getWarpPlayerAngleY();
s8 dComIfGs_getWarpRoomNo();
BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo);
BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo);
BOOL dComIfGs_isZoneSwitch(int,int);
BOOL dComIfGs_isZoneItem(int,int);
BOOL dComIfGs_isZoneSwitch(int, int);
BOOL dComIfGs_isZoneItem(int, int);
void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8, u8);
u16 dComIfGs_getMaxLifeGauge();
void dComIfGs_setWarpMarkFlag(u8);
@@ -1023,8 +1019,8 @@ inline void dComIfGs_setCollectClothes(u8 i_clothesNo) {
g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_CLOTHING, i_clothesNo);
}
inline void dComIfGs_setCardToMemory(char* card_ptr,int dataNum) {
g_dComIfG_gameInfo.info.card_to_memory(card_ptr,dataNum);
inline void dComIfGs_setCardToMemory(char* card_ptr, int dataNum) {
g_dComIfG_gameInfo.info.card_to_memory(card_ptr, dataNum);
}
inline void dComIfGs_setRodTypeLevelUp() {
@@ -1098,7 +1094,6 @@ inline void dComIfGs_offSwitch(int i_no, int i_roomNo) {
g_dComIfG_gameInfo.info.offSwitch(i_no, i_roomNo);
}
inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo) {
return g_dComIfG_gameInfo.info.isSwitch(i_no, i_roomNo);
}
@@ -1575,7 +1570,7 @@ inline BOOL dComIfGs_isActor(int i_no, int i_roomNo) {
}
inline void dComIfGs_offActor(int i_no, int i_roomNo) {
g_dComIfG_gameInfo.info.offActor(i_no,i_roomNo);
g_dComIfG_gameInfo.info.offActor(i_no, i_roomNo);
}
inline void dComIfGs_putSave(int i_stageNo) {
@@ -1752,7 +1747,6 @@ static dAttCatch_c* dComIfGp_att_getCatghTarget();
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 void dComIfGp_itemDataInit() {
g_dComIfG_gameInfo.play.itemInit();
}
@@ -3179,37 +3173,37 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
0, 0);
}
inline JPABaseEmitter* 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, const GXColor* param_10,
const cXyz* param_11) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, param_3, param_4,
param_5, param_6, param_7, param_8,
param_9, param_10, param_11, 1.0f);
inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos,
const dKy_tevstr_c* param_3, const csXyz* i_rotation,
const cXyz* i_scale, u8 i_alpha,
dPa_levelEcallBack* i_callback, s8 param_8,
const GXColor* i_prmColor, const GXColor* i_envColor,
const cXyz* i_particleScale) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(
i_resID, i_pos, param_3, i_rotation, i_scale, i_alpha, i_callback, param_8, i_prmColor,
i_envColor, i_particleScale, 1.0f);
}
inline JPABaseEmitter* dComIfGp_particle_set(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_1, param_2, NULL, param_3,
param_4, param_5, param_6, param_7,
param_8, param_9, param_10, 1.0f);
inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos,
const csXyz* i_rotation, const cXyz* i_scale,
u8 i_alpha, dPa_levelEcallBack* i_callback, s8 param_7,
const GXColor* i_prmColor, const GXColor* i_envColor,
const cXyz* i_particleScale) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(
i_resID, i_pos, NULL, i_rotation, i_scale, i_alpha, i_callback, param_7, i_prmColor,
i_envColor, i_particleScale, 1.0f);
}
inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2,
const cXyz* param_3) {
return dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL,
inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos,
const csXyz* i_rotation, const cXyz* i_scale) {
return dComIfGp_particle_set(i_resID, i_pos, NULL, i_rotation, i_scale, 255, NULL, -1, NULL,
NULL, NULL);
}
inline JPABaseEmitter* 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,
inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos,
const dKy_tevstr_c* param_2, const csXyz* i_rotation,
const cXyz* i_scale) {
return dComIfGp_particle_set(i_resID, i_pos, param_2, i_rotation, i_scale, 255, NULL, -1, NULL,
NULL, NULL);
}
@@ -3249,11 +3243,10 @@ inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param
NULL, NULL, NULL, -1, NULL);
}
inline void dComIfGp_particle_setSimple(u16 param_0,cXyz* param_1,
u8 param_2, _GXColor& param_3,
_GXColor& param_4, int param_5,
float param_6) {
g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0,param_1,0,param_2,param_3,param_4,param_5,param_6);
inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* param_1, u8 param_2, _GXColor& param_3,
_GXColor& param_4, int param_5, float param_6) {
g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0, param_1, 0, param_2, param_3, param_4,
param_5, param_6);
}
inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) {
@@ -3265,12 +3258,13 @@ inline JPABaseEmitter* dComIfGp_particle_getEmitter(u32 param_0) {
}
inline u32 dComIfGp_particle_setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param_2,
cXyz const* param_3, dKy_tevstr_c const* param_4, int param_5,
csXyz const* param_6, cXyz const* param_7,
dPa_levelEcallBack* param_8, s8 param_9,
cXyz const* param_10) {
return g_dComIfG_gameInfo.play.getParticle()->setSimpleFoot(param_0, param_1, param_2, param_3, param_4, param_5,
param_6, param_7, param_8, param_9, param_10);
cXyz const* param_3, dKy_tevstr_c const* param_4,
int param_5, csXyz const* param_6, cXyz const* param_7,
dPa_levelEcallBack* param_8, s8 param_9,
cXyz const* param_10) {
return g_dComIfG_gameInfo.play.getParticle()->setSimpleFoot(param_0, param_1, param_2, param_3,
param_4, param_5, param_6, param_7,
param_8, param_9, param_10);
}
inline u32 dComIfGp_particle_setPolyColor(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2,
include/d/d_gameover.h
+1
View File
@@ -13,6 +13,7 @@ public:
/* 8019AFE0 */ dGov_HIO_c();
/* 8019C06C */ virtual ~dGov_HIO_c();
/* 0x04 */ u8 unk_0x4;
/* 0x08 */ f32 mScale;
/* 0x0C */ f32 mAlpha;
/* 0x10 */ f32 mAnimSpeed;
include/d/kankyo/d_kankyo.h
+5 -3
View File
@@ -35,13 +35,15 @@ 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 param_0, int param_1, unsigned int param_2, int param_3);
void dKy_Sound_set(cXyz i_pos, int param_1, unsigned int 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);
void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend);
void dKy_setLight();
cXyz dKy_plight_near_pos();
void dKy_BossSpotLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 param_3, _GXColor* param_4,
f32 param_5, u8 param_6, u8 param_7);
struct LIGHT_INFLUENCE {
/* 800CFC7C */ ~LIGHT_INFLUENCE() {}
@@ -168,12 +170,12 @@ struct LightStatus {
/* 0x4C */ f32 mRefDist;
/* 0x50 */ f32 mRefBrightness;
/* 0x54 */ GXDistAttnFn mDistFn;
/* 0x58 */ u32 field_0x58[2][6]; //?
/* 0x58 */ u32 field_0x58[2][6]; //?
/* 0x88 */ f32 field_0x88;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ u32 field_0x98[2][8]; //?
/* 0x98 */ u32 field_0x98[2][8]; //?
/* 0xD8 */ f32 field_0xd8;
/* 0xDC */ f32 field_0xdc;
/* 0xE0 */ f32 field_0xe0;
include/f_op/f_op_actor.h
+4 -1
View File
@@ -144,7 +144,10 @@ public:
/* 0x544 */ actor_attention_types mAttentionInfo;
/* 0x560 */ s16 field_0x560;
/* 0x562 */ s16 mHealth;
/* 0x564 */ u8 field_0x564[0x4];
/* 0x564 */ u8 field_0x564;
/* 0x565 */ u8 field_0x565;
/* 0x566 */ u8 field_0x566;
/* 0x567 */ s8 field_0x567;
fopAc_ac_c();
~fopAc_ac_c();
include/m_Do/m_Do_hostIO.h
-1
View File
@@ -6,7 +6,6 @@
class mDoHIO_entry_c {
public:
virtual ~mDoHIO_entry_c() {}
u8 unk_0x4;
};
#endif /* M_DO_M_DO_HOSTIO_H */
include/rel/d/a/d_a_disappear/d_a_disappear.h
+8 -1
View File
@@ -1,6 +1,13 @@
#ifndef D_A_DISAPPEAR_H
#define D_A_DISAPPEAR_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class disappear_class : public fopAc_ac_c {
public:
/* 0x568 */ u8 field_0x568[0x574 - 0x568];
/* 0x574 */ s16 mDeleteTimer;
/* 0x576 */ u8 field_0x576[0x578 - 0x576];
};
#endif /* D_A_DISAPPEAR_H */
include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h
+20 -1
View File
@@ -1,6 +1,25 @@
#ifndef D_A_KYTAG16_H
#define D_A_KYTAG16_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class kytag16_class : public fopAc_ac_c {
public:
/* 0x568 */ f32 field_0x568;
/* 0x56C */ u8 field_0x56c;
/* 0x56D */ GXColor field_0x56d;
/* 0x571 */ u8 field_0x571;
/* 0x572 */ u8 field_0x572;
/* 0x573 */ u8 field_0x573;
/* 0x574 */ f32 field_0x574;
/* 0x578 */ f32 field_0x578;
/* 0x57C */ f32 field_0x57c;
/* 0x580 */ f32 field_0x580;
/* 0x584 */ f32 field_0x584;
/* 0x588 */ s16 field_0x588;
/* 0x58A */ s16 field_0x58a;
/* 0x58C */ u8 field_0x58c;
/* 0x58D */ u8 field_0x58d;
};
#endif /* D_A_KYTAG16_H */
include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h
+18 -1
View File
@@ -1,6 +1,23 @@
#ifndef D_A_OBJ_CRYSTAL_H
#define D_A_OBJ_CRYSTAL_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daObjCrystal_c : public fopAc_ac_c {
public:
/* 80BD63B8 */ void initBaseMtx();
/* 80BD6410 */ void setBaseMtx();
/* 80BD6470 */ int Create();
/* 80BD65B0 */ int CreateHeap();
/* 80BD6664 */ int create();
/* 80BD6718 */ int execute();
/* 80BD673C */ int draw();
/* 80BD67C8 */ int _delete();
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mpModel[2];
/* 0x578 */ JPABaseEmitter* mpEmitter;
/* 0x57C */ u16 mJointID;
};
#endif /* D_A_OBJ_CRYSTAL_H */
include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h
+13 -1
View File
@@ -1,6 +1,18 @@
#ifndef D_A_OBJ_LV3WATEREFF_H
#define D_A_OBJ_LV3WATEREFF_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daObjWaterEff_c : public fopAc_ac_c {
public:
/* 80C5C4F8 */ int Create();
/* 80C5C5DC */ int create();
/* 80C5C6B0 */ int execute();
/* 80C5C7B8 */ int _delete();
/* 0x568 */ cXyz mSePositions[2];
/* 0x580 */ JPABaseEmitter* mParticles[4];
/* 0x590 */ u8 unused_0x590[0x594 - 0x590];
};
#endif /* D_A_OBJ_LV3WATEREFF_H */
include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h
+23 -1
View File
@@ -1,6 +1,28 @@
#ifndef D_A_OBJ_LV4HSTARGET_H
#define D_A_OBJ_LV4HSTARGET_H
#include "dolphin/types.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
class daLv4HsTarget_c : public dBgS_MoveBgActor {
public:
/* 80C5F690 */ void setBaseMtx();
/* 80C5F784 */ int create();
/* 80C5F718 */ virtual int CreateHeap();
/* 80C5F85C */ virtual int Execute(Mtx**);
/* 80C5F870 */ virtual int Draw();
/* 80C5F8D4 */ virtual int Delete();
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
};
class daLv4HsTarget_HIO_c : public mDoHIO_entry_c {
public:
/* 80C5F62C */ daLv4HsTarget_HIO_c();
/* 80C5F990 */ virtual ~daLv4HsTarget_HIO_c() {}
};
#endif /* D_A_OBJ_LV4HSTARGET_H */
include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h
+2
View File
@@ -27,6 +27,8 @@ class daTagCstaSw_HIO_c : public mDoHIO_entry_c {
public:
/* 805A202C */ daTagCstaSw_HIO_c();
/* 805A2480 */ virtual ~daTagCstaSw_HIO_c();
u8 unk_0x4;
};
#endif /* D_A_TAG_CSTASW_H */
include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h
+4 -4
View File
@@ -13,13 +13,13 @@ public:
/* 8048EF6C */ int Draw();
/* 8048EF74 */ void initialize();
/* 0x568 */ dMsgFlow_c field_0x568;
/* 0x5B4 */ cBgS_GndChk field_0x5b4;
/* 0x568 */ dMsgFlow_c mMsgFlow;
/* 0x5B4 */ cBgS_GndChk mGndChk;
/* 0x5F0 */ u32 field_0x5f0;
/* 0x5F4 */ f32 field_0x5f4;
/* 0x5F4 */ f32 mGroundCross;
/* 0x5F8 */ s32 field_0x5f8;
/* 0x5FC */ u32 field_0x5fc;
/* 0x600 */ s32 field_0x600;
/* 0x600 */ int mFlowIndex;
/* 0x604 */ u8 field_0x604;
/* 8048ECAC */ virtual ~daTag_Lantern_c();
include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h
+1
View File
@@ -27,6 +27,7 @@ public:
/* 80D5B2EC */ daLv6CstaSw_HIO_c();
/* 80D5B740 */ virtual ~daLv6CstaSw_HIO_c();
u8 unk_0x4;
};
#endif /* D_A_TAG_LV6CSTASW_H */
include/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h
+42 -1
View File
@@ -1,6 +1,47 @@
#ifndef D_A_TAG_MIST_H
#define D_A_TAG_MIST_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daTagMist_c : public fopAc_ac_c {
public:
/* 8048F258 */ void offSw();
/* 8048F2C4 */ void onMySw();
/* 8048F310 */ BOOL isMySw();
/* 8048F370 */ int Create();
/* 8048F444 */ int create();
/* 8048F558 */ int execute();
/* 8048F690 */ int _delete();
/* 80031CF0 */ static u8 getPlayerNo();
static void setPlayerNo(u8 i_playerNo) { mPlayerNo = i_playerNo; }
static u8 mPlayerNo;
/* 0x568 */ u8 unused_0x568[0x570 - 0x568];
/* 0x570 */ cXyz mVertices[4];
/* 0x5A0 */ u8 mPlayerTouched;
/* 0x5A1 */ u8 mInitParams;
/* 0x5A2 */ u16 field_0x5a2;
/* 0x5A4 */ u16 field_0x5a4;
}; // Size: 0x5A8
namespace daTagMist_prm {
inline u8 getSwNoNum(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this) >> 0x10;
}
inline u8 getMySwNo(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this) >> 0x8;
}
inline u8 getTopSwNo(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this);
}
inline u8 getExitNo(daTagMist_c* i_this) {
return (fopAcM_GetParam(i_this) >> 0x18) & 0x3F;
}
inline int getSwNo2(daTagMist_c* i_this) {
return i_this->field_0x5a2 & 0xFF;
}
} // namespace daTagMist_prm
#endif /* D_A_TAG_MIST_H */
include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h
+2
View File
@@ -22,6 +22,8 @@ class daTagPoFire_HIO_c : public mDoHIO_entry_c {
public:
/* 80D5DACC */ daTagPoFire_HIO_c();
/* 80D5DCB0 */ virtual ~daTagPoFire_HIO_c();
u8 unk_0x4;
};
#endif /* D_A_TAG_POFIRE_H */