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

format / asm

Browse Source
This commit is contained in:
TakaRikka
2021-12-04 05:57:01 -08:00
parent b88340aca7
commit 942c375fe5
402 changed files with 2365 additions and 11015 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPane.h
+1 -3
View File
@@ -128,9 +128,7 @@ public:
void* getPointer(JSURandomInputStream* stream, u32 size, JKRArchive* archive);
void animationTransform();
void updateTransform(const J2DAnmTransform* transform);
void setUserInfo(u64 info) {
mUserInfoTag = info;
}
void setUserInfo(u64 info) { mUserInfoTag = info; }
static f32 static_mBounds[4];
include/SSystem/SComponent/c_lib.h
+1 -1
View File
@@ -47,7 +47,7 @@ inline u8 cLib_checkBit(u8& pVar, u8 pBit) {
return pVar & pBit;
}
template<typename T>
template <typename T>
inline T cLib_minMaxLimit(T param_0, T min, T max) {
if (param_0 < min) {
return max;
include/SSystem/SComponent/c_xyz.h
-1
View File
@@ -2,7 +2,6 @@
#define C_XYZ_H
#include "dolphin/mtx/vec.h"
#include "msl_c/math.h"
#include "global.h"
#include "msl_c/math.h"
include/d/a/d_a_alink.h
+709 -705
View File
File diff suppressed because it is too large Load Diff
include/d/a/d_a_player.h
+25 -4
View File
@@ -194,10 +194,31 @@ public:
HEAVY_STATE_BOOTS = FLG0_UNK_40000000 | EQUIP_HEAVY_BOOTS | FLG0_UNK_20000,
};
enum daPy_FLG1 { IS_WOLF = 0x2000000, FLG1_UNK_10000 = 0x10000, THROW_DAMAGE = 0x4000 };
enum daPy_FLG2 { FLG2_UNK_4080000 = 0x4080000, FLG2_UNK_2080000 = 0x2080000, BOAR_SINGLE_BATTLE = 0x1800000, STATUS_WINDOW_DRAW = 0x400000, UNK_ARMOR = 0x80000, UNK_FLG2_2 = 2, UNK_DAPY_FLG2_1 = 1 };
enum daPy_FLG3 { FLG3_UNK_2000000 = 0x2000000, FLG3_UNK_100000 = 0x100000, COPY_ROD_THROW_AFTER = 0x40000 };
enum daPy_ERFLG0 { ERFLG0_UNK_8000000 = 0x8000000, ERFLG0_UNK_1000000 = 0x1000000, ERFLG0_UNK_100000 = 0x100000, ERFLG0_UNK_1 = 1, };
enum daPy_ERFLG1 { GANON_FINISH = 0x80000000, UNK_FORCE_PUT_POS = 0x2000, ERFLG1_UNK_1 = 1, };
enum daPy_FLG2 {
FLG2_UNK_4080000 = 0x4080000,
FLG2_UNK_2080000 = 0x2080000,
BOAR_SINGLE_BATTLE = 0x1800000,
STATUS_WINDOW_DRAW = 0x400000,
UNK_ARMOR = 0x80000,
UNK_FLG2_2 = 2,
UNK_DAPY_FLG2_1 = 1
};
enum daPy_FLG3 {
FLG3_UNK_2000000 = 0x2000000,
FLG3_UNK_100000 = 0x100000,
COPY_ROD_THROW_AFTER = 0x40000
};
enum daPy_ERFLG0 {
ERFLG0_UNK_8000000 = 0x8000000,
ERFLG0_UNK_1000000 = 0x1000000,
ERFLG0_UNK_100000 = 0x100000,
ERFLG0_UNK_1 = 1,
};
enum daPy_ERFLG1 {
GANON_FINISH = 0x80000000,
UNK_FORCE_PUT_POS = 0x2000,
ERFLG1_UNK_1 = 1,
};
enum daPy_ERFLG2 {};
enum daPy_RFLG0 {
RFLG0_UNK_8000000 = 0x8000000,
include/d/com/d_com_inf_game.h
+19 -5
View File
@@ -190,7 +190,9 @@ public:
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]; }
BOOL checkCameraAttentionStatus(int i, u32 flag) { return mCameraInfo[i].mCameraAttentionStatus & flag; }
BOOL checkCameraAttentionStatus(int i, u32 flag) {
return mCameraInfo[i].mCameraAttentionStatus & flag;
}
s8 getPlayerCameraID(int i) { return mPlayerCameraID[i]; }
dPa_control_c* getParticle() { return mParticle; }
void set3DStatus(u8 status, u8 direction, u8 flag) {
@@ -1101,8 +1103,14 @@ inline u8 dComIfGs_getLastSceneMode() {
return g_dComIfG_gameInfo.info.getRestart().getLastMode();
}
inline u32 dComIfGp_particle_set(u32 param_0, 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_0, 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 u32 dComIfGp_particle_set(u32 param_0, 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_0, 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 void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) {
@@ -1113,8 +1121,14 @@ inline dPa_control_c::level_c::emitter_c* dComIfGp_particle_getEmitter(u32 param
return g_dComIfG_gameInfo.play.getParticle()->getEmitter(param_0);
}
inline u32 dComIfGp_particle_setPolyColor(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, const cXyz* param_3, const dKy_tevstr_c* param_4, const csXyz* param_5, const cXyz* param_6, int param_7, dPa_levelEcallBack* param_8, s8 param_9, const cXyz* param_10) {
return g_dComIfG_gameInfo.play.getParticle()->setPoly(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,
const cXyz* param_3, const dKy_tevstr_c* param_4,
const csXyz* param_5, const cXyz* param_6, int param_7,
dPa_levelEcallBack* param_8, s8 param_9,
const cXyz* param_10) {
return g_dComIfG_gameInfo.play.getParticle()->setPoly(param_0, param_1, param_2, param_3,
param_4, param_5, param_6, param_7,
param_8, param_9, param_10);
}
inline dRes_info_c* dComIfG_getObjectResInfo(const char* arc_name) {
include/d/d_attention.h
+3 -3
View File
@@ -206,10 +206,10 @@ public:
if (!chkFlag(0x20000000)) {
chk = false;
}
}
}
return chk;
//return !LockonTruth() && !chkFlag(0x20000000);
// return !LockonTruth() && !chkFlag(0x20000000);
}
static u8 loc_type_tbl[12];
include/d/particle/d_particle.h
+11 -7
View File
@@ -128,12 +128,12 @@ public:
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
cXyz const*, f32);
/* 8004D4CC */ u32 set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
_GXColor const*, cXyz const*, f32);
cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
_GXColor const*, cXyz const*, f32);
/* 8004CF90 */ void getPolyColor(cBgS_PolyInfo&, int, _GXColor*, _GXColor*, u8*, f32*);
/* 8004D6A4 */ u32 setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8,
cXyz const*);
csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8,
cXyz const*);
/* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*,
cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*);
/* 8004D128 */ void newSimple(u16, u8, u32*);
@@ -149,8 +149,12 @@ public:
void forceOnEventMove(u32 param_0) { field_0x210.forceOnEventMove(param_0); }
level_c::emitter_c* getEmitter(u32 param_0) { return field_0x210.getEmitter(param_0); }
u32 setNormal(u32 param_0, 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, f32 param_12) {
return set(param_0, 0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10, param_11, param_12);
u32 setNormal(u32 param_0, 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, f32 param_12) {
return set(param_0, 0, param_1, param_2, param_3, param_4, param_5, param_6, param_7,
param_8, param_9, param_10, param_11, param_12);
}
static u8 mTsubo[64];
@@ -170,7 +174,7 @@ public:
private:
/* 0x000 */ JKRSolidHeap* mHeap;
/* 0x004 */ JPAResourceManager* mCommonResMng;
/* 0x008 */ JKRExpHeap* m_resHeap;
/* 0x008 */ JKRExpHeap* m_resHeap;
/* 0x00C */ JKRSolidHeap* m_sceneHeap;
/* 0x010 */ void* m_sceneRes;
/* 0x014 */ JPAResourceManager* mSceneResMng;
include/m_Do/m_Do_ext.h
+3 -2
View File
@@ -92,7 +92,7 @@ private:
class mDoExt_invJntPacket : public J3DPacket {
public:
/* 8000E654 */ mDoExt_invJntPacket();
/* 80012220 */ virtual void draw();
/* 8000E5F8 */ virtual ~mDoExt_invJntPacket();
@@ -112,7 +112,8 @@ public:
/* 0x4 */ mDoExt_invJntPacket* field_0x4;
};
class mDoExt_morf_c : public J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya> {
class mDoExt_morf_c
: public J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya> {
public:
/* 8000F950 */ mDoExt_morf_c();
/* 8000FB7C */ void setMorf(f32);
include/rel/d/a/d_a_boomerang/d_a_boomerang.h
+3 -3
View File
@@ -1,12 +1,12 @@
#ifndef D_A_BOOMERANG_H
#define D_A_BOOMERANG_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "Z2AudioLib/Z2SoundObject.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/particle/d_particle_copoly.h"
#include "Z2AudioLib/Z2SoundObject.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class daBoomerang_sight_c {
public:
include/rel/d/a/d_a_crod/d_a_crod.h
+8 -10
View File
@@ -1,11 +1,11 @@
#ifndef D_A_CROD_H
#define D_A_CROD_H
#include "d/a/d_a_player.h"
#include "d/cc/d_cc_d.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/cc/d_cc_d.h"
#include "d/a/d_a_player.h"
#include "dolphin/types.h"
class daCrod_c : public fopAc_ac_c {
public:
@@ -23,16 +23,14 @@ public:
/* 804A3FD4 */ void draw();
static fopAc_ac_c* makeIronBallDummy(fopAc_ac_c* p_actor) {
return (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 6, &p_actor->mCurrent.mPosition, fopAcM_GetRoomNo(p_actor), NULL, NULL, -1, NULL, NULL);
return (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 6, &p_actor->mCurrent.mPosition,
fopAcM_GetRoomNo(p_actor), NULL, NULL, -1, NULL,
NULL);
}
fopAc_ac_c* getControllActor() {
return mControllActor.getActor();
}
fopAc_ac_c* getControllActor() { return mControllActor.getActor(); }
fopAc_ac_c* getCameraActor() {
return mCameraActor.getActor();
}
fopAc_ac_c* getCameraActor() { return mCameraActor.getActor(); }
void setThrow() { fopAcM_SetParam(this, 2); }
include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
+4 -4
View File
@@ -1,10 +1,10 @@
#ifndef D_A_OBJ_CARRY_H
#define D_A_OBJ_CARRY_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_xyz.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "dolphin/types.h"
class daObjCarry_c : public fopAc_ac_c {
public:
@@ -21,8 +21,8 @@ public:
/* 0x9 */ TYPE_BALL_S_2, // Light Ball B
/* 0xA */ TYPE_AOTSUBO, // Big Blue Pot
/* 0xB */ TYPE_LV8_BALL,
/* 0xC */ TYPE_TSUBO_S, // Small pot - Twilight
/* 0xD */ TYPE_TSUBO_B, // Big pot - Twilight
/* 0xC */ TYPE_TSUBO_S, // Small pot - Twilight
/* 0xD */ TYPE_TSUBO_B, // Big pot - Twilight
};
/* 80031CF8 */ static void clrSaveFlag();
@@ -198,7 +198,7 @@ private:
/* 0xCBC */ u8 field_0xcbc[0x34];
/* 0xCF0 */ u8 mType;
/* 0xCF4 */ cXyz field_0xcf4;
/* 0xD00 */
/* 0xD00 */
};
#endif /* D_A_OBJ_CARRY_H */