mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 14:36:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_disappear / d_a_kytag16 OK

Browse Source
This commit is contained in:
TakaRikka
2023-06-30 16:33:01 -07:00
parent 7b680de442
commit 554e962be0
7 changed files with 181 additions and 306 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/kankyo/d_kankyo.h
+1 -1
View File
@@ -35,7 +35,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 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);
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/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 */