mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-16 05:09:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup (#2216)

Browse Source
This commit is contained in:
Caroline Madsen
2024-10-17 17:24:29 -04:00
committed by GitHub
parent 38445f4d51
commit abc4c6659a
56 changed files with 6446 additions and 30124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+2 -2
View File
@@ -534,9 +534,9 @@ config.libs = [
Object(NonMatching, "d/d_menu_dmap_map.cpp"),
Object(Matching, "d/d_menu_map_common.cpp"),
Object(Matching, "d/d_menu_fishing.cpp"),
Object(NonMatching, "d/d_menu_fmap.cpp"),
Object(Equivalent, "d/d_menu_fmap.cpp"),
Object(NonMatching, "d/d_menu_fmap_map.cpp"),
Object(NonMatching, "d/d_menu_fmap2D.cpp"),
Object(Matching, "d/d_menu_fmap2D.cpp"),
Object(Matching, "d/d_menu_insect.cpp"),
Object(Matching, "d/d_menu_item_explain.cpp"),
Object(NonMatching, "d/d_menu_letter.cpp"),
include/JSystem/JParticle/JPAEmitter.h
+4 -4
View File
@@ -68,10 +68,10 @@ struct JPAEmitterWorkData {
class JPAEmitterCallBack {
public:
virtual ~JPAEmitterCallBack() = 0;
/* 80050368 */ virtual void execute(JPABaseEmitter*);
/* 80050374 */ virtual void executeAfter(JPABaseEmitter*);
/* 8005036C */ virtual void draw(JPABaseEmitter*);
/* 80050370 */ virtual void drawAfter(JPABaseEmitter*);
/* 80050368 */ virtual void execute(JPABaseEmitter*) {}
/* 80050374 */ virtual void executeAfter(JPABaseEmitter*) {}
/* 8005036C */ virtual void draw(JPABaseEmitter*) {}
/* 80050370 */ virtual void drawAfter(JPABaseEmitter*) {}
/* 8027E6A4 */ //~JPAEmitterCallBack();
};
include/d/actor/d_a_b_ds.h
-7
View File
@@ -326,15 +326,8 @@ STATIC_ASSERT(sizeof(daB_DS_c) == 0x2F28);
class daB_DS_HIO_c {
public:
/* 805CB22C */ daB_DS_HIO_c();
#ifdef NONMATCHING
/* 805DC89C */ virtual ~daB_DS_HIO_c() {}
#else
/* 805DC89C */ ~daB_DS_HIO_c();
#endif
#ifndef NONMATCHING
/* 0x00 */ void* _vtable;
#endif
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mModelSize;
/* 0x0C */ f32 mHandRange;
include/d/actor/d_a_e_vt.h
+1 -1
View File
@@ -285,7 +285,7 @@ private:
class daE_VA_HIO_c {
public:
/* 807C25EC */ daE_VA_HIO_c();
/* 807CE2AC */ virtual ~daE_VA_HIO_c();
/* 807CE2AC */ virtual ~daE_VA_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mModelSize;
include/d/actor/d_a_e_yk.h
+1 -16
View File
@@ -34,21 +34,6 @@ enum daE_YK_Action {
ACT_WIND /**< Keese is in the gale boomerang. */
};
/**
* @brief Temporary HIO struct to get a match. Remove later.
*
*/
struct daE_YK_HIO_c_tmp {
void* vtable;
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
};
/**
* @brief Shadow Keese Host Input Output class
*
@@ -56,7 +41,7 @@ struct daE_YK_HIO_c_tmp {
class daE_YK_HIO_c {
public:
/* 8080482C */ daE_YK_HIO_c();
/* 808077E0 */ virtual ~daE_YK_HIO_c();
/* 808077E0 */ virtual ~daE_YK_HIO_c() {}
/* 0x00 */ // vtable
/* 0x04 */ s8 field_0x04; // padding after this
include/d/actor/d_a_myna.h
-5
View File
@@ -129,12 +129,7 @@ public:
typedef int (daMyna_c::*BaseMotionFunc)(int);
static dCcD_SrcSph const mCcDSph;
// sinit matches, but with incorrect weak function ordering
#ifdef NONMATCHING
static daMyna_c::BaseMotionFunc mBaseMotionTBL[7];
#else
static u8 mBaseMotionTBL[84];
#endif
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ mDoExt_McaMorfSO* mpMorf;
include/d/actor/d_a_npc.h
+44 -46
View File
@@ -492,8 +492,40 @@ public:
};
class daBaseNpc_c : public fopAc_ac_c {
public:
/* 8014E6C8 */ daBaseNpc_c();
/* 8014EE44 */ J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
/* 8014EE80 */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
/* 8014EEE4 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 8014EF28 */ J3DAnmTransform* getTexPtrnAnmP(char*, int);
/* 8014EF64 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
/* 8014EFF4 */ void orderEvent(int, char*);
/* 8014F0A0 */ void setEnvTevColor();
/* 8014F0FC */ void setRoomNo();
/* 8014F148 */ int checkEndAnm(f32);
/* 8014F1C8 */ int checkEndAnm(J3DFrameCtrl*);
/* 8014E89C */ virtual ~daBaseNpc_c();
/* 8014EAD0 */ virtual void execute();
/* 8014EC50 */ virtual void draw(f32);
/* 8014EE3C */ virtual bool getResName();
/* 8014EFA4 */ virtual void attnSttsOn(int, int);
/* 8014EFF0 */ virtual void setParam();
/* 8014F09C */ virtual void mainProc();
/* 8014F140 */ virtual bool btkCtrl();
/* 8014F228 */ virtual void allAnmPlay();
/* 8014F38C */ virtual void adjustShapeAngle();
/* 8014F390 */ virtual void setMtx(int);
/* 8014F4A0 */ virtual void setCollisions();
/* 8014F4A4 */ virtual void setAttnPos();
/* 8014F4A8 */ virtual void drawOtherMdls();
/* 8014F4AC */ virtual bool dbgDraw();
static u8 const mCcDObj[48];
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
private:
/* 0x568 */ void* vtable;
/* 0x56C */ dBgS_Acch field_0x56c;
/* 0x744 */ u8 field_0x744[16];
/* 0x754 */ mDoExt_McaMorfSO* mpMorf[2];
@@ -527,40 +559,6 @@ private:
/* 0x9A2 */ u8 field_0x9a2[70];
/* 0x9E8 */ const cBgS_PolyInfo mBgSPolyInfo;
/* 0x9F9 */ u8 field_0x9f9[27];
public:
/* 8014E6C8 */ daBaseNpc_c();
/* 8014E89C */ ~daBaseNpc_c();
/* 8014EAD0 */ void execute();
/* 8014EC50 */ void draw(f32);
/* 8014EE3C */ bool getResName();
/* 8014EE44 */ J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
/* 8014EE80 */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
/* 8014EEE4 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 8014EF28 */ J3DAnmTransform* getTexPtrnAnmP(char*, int);
/* 8014EF64 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
/* 8014EFA4 */ void attnSttsOn(int, int);
/* 8014EFF0 */ void setParam();
/* 8014EFF4 */ void orderEvent(int, char*);
/* 8014F09C */ void mainProc();
/* 8014F0A0 */ void setEnvTevColor();
/* 8014F0FC */ void setRoomNo();
/* 8014F140 */ bool btkCtrl();
/* 8014F148 */ int checkEndAnm(f32);
/* 8014F1C8 */ int checkEndAnm(J3DFrameCtrl*);
/* 8014F228 */ void allAnmPlay();
/* 8014F38C */ void adjustShapeAngle();
/* 8014F390 */ void setMtx(int);
/* 8014F4A0 */ void setCollisions();
/* 8014F4A4 */ void setAttnPos();
/* 8014F4A8 */ void drawOtherMdls();
/* 8014F4AC */ bool dbgDraw();
void setVtable(void* table) { vtable = table; }
static u8 const mCcDObj[48];
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
};
class daBaseNpc_moveBgActor_c : public daBaseNpc_c {
@@ -603,7 +601,7 @@ public:
/* 801506E0 */ void remove();
/* 801506EC */ fopAc_ac_c* getActorP();
/* 80155E40 */ virtual ~daNpcF_ActorMngr_c();
/* 80155E40 */ virtual ~daNpcF_ActorMngr_c() {}
};
class daNpcF_c : public fopAc_ac_c {
@@ -793,7 +791,7 @@ public:
/* 801549E0 */ BOOL chkFindPlayer2(BOOL, s16);
/* 80154BD8 */ void setHitodamaPrtcl();
/* 80155BF4 */ virtual ~daNpcF_c();
/* 80155BF4 */ virtual ~daNpcF_c() {}
/* 80155BC8 */ virtual void setParam();
/* 80155BC0 */ virtual BOOL main();
/* 80155BD8 */ virtual BOOL ctrlBtk();
@@ -961,18 +959,18 @@ public:
void setAttnPos(cXyz* i_attnPos) { mAttnPos = i_attnPos; }
};
class daNpcF_MoveBgActor_c {
class daNpcF_MoveBgActor_c : public daNpcF_c {
private:
public:
/* 80155B54 */ ~daNpcF_MoveBgActor_c();
/* 80155E88 */ bool CreateHeap();
/* 80155E90 */ bool Create();
/* 80155E98 */ bool Delete();
/* 80155EA0 */ bool Execute(f32 (**)[3][4]);
/* 80155EA8 */ bool Draw();
/* 80155EB0 */ bool IsDelete();
/* 80155EB8 */ bool ToFore();
/* 80155EC0 */ bool ToBack();
/* 80155E88 */ virtual bool CreateHeap();
/* 80155E90 */ virtual bool Create();
/* 80155EA0 */ virtual bool Execute(f32 (**)[3][4]);
/* 80155EA8 */ virtual bool Draw();
/* 80155E98 */ virtual bool Delete();
/* 80155EB0 */ virtual bool IsDelete();
/* 80155EB8 */ virtual bool ToFore();
/* 80155EC0 */ virtual bool ToBack();
};
#endif /* D_A_D_A_NPC_H */
include/d/actor/d_a_npc_ash.h
+1 -14
View File
@@ -103,13 +103,8 @@ public:
/* 809596E0 */ bool setExpressionBtp(int);
/* 809597C0 */ void setMotionAnm(int i_idx, f32 i_morf);
/* 80959910 */ void reset();
#ifdef NONMATCHING
/* 80959B28 */ inline bool setAction(ActionFn);
/* 80959BD0 */ inline bool isSneaking();
#else
/* 80959B28 */ bool setAction(ActionFn);
/* 80959BD0 */ bool isSneaking();
#endif
/* 80959C40 */ bool wait_type0(void*);
/* 8095A67C */ void setMotion(int, f32, int);
/* 8095A6C0 */ void setExpression(int, f32);
@@ -123,11 +118,7 @@ public:
/* 8095BA80 */ BOOL EvCut_WiretapEntrant(int i_staffID);
/* 8095BCF0 */ void setParam();
/* 8095BF6C */ BOOL main();
#ifdef NONMATCHING
/* 8095C200 */ inline void playMotion();
#else
/* 8095C200 */ void playMotion();
#endif
/* 8095C520 */ BOOL ctrlBtk();
/* 8095C5C4 */ void setAttnPos();
/* 8095C9BC */ void lookat();
@@ -142,18 +133,14 @@ public:
inline bool step(s16, bool);
inline void playExpression();
#ifdef NONMATCHING
static EventFn mEvtSeqList[6];
#else
static u8 mEvtSeqList[72];
#endif
};
STATIC_ASSERT(sizeof(daNpcAsh_c) == 0xF64);
class daNpcAsh_Param_c {
public:
/* 8095D5D4 */ virtual ~daNpcAsh_Param_c();
/* 8095D5D4 */ virtual ~daNpcAsh_Param_c() {}
struct param {
/* 0x00 */ f32 mAttnOffsetY;
include/d/actor/d_a_npc_henna.h
+10 -3
View File
@@ -1,7 +1,7 @@
#ifndef D_A_NPC_HENNA_H
#define D_A_NPC_HENNA_H
#include "d/actor/d_a_npc.h"
#include "f_op/f_op_actor.h"
/**
* @ingroup actors-npcs
@@ -12,8 +12,15 @@
*
*/
class npc_henna_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x7fc - 0x568];
public:
/* 0x568 */ u8 field_0x568[0x752 - 0x568];
/* 0x752 */ u16 field_0x752;
/* 0x754 */ u16 field_0x754;
/* 0x756 */ u8 field_0x756[0x7b5 - 0x756];
/* 0x7B5 */ u8 field_0x7b5;
/* 0x7B6 */ u8 field_0x7b6[0x7b9 - 0x7b6];
/* 0x7B9 */ u8 field_0x7b9;
/* 0x7BA */ u8 field_0x7ba[0x7fc - 0x7ba];
};
STATIC_ASSERT(sizeof(npc_henna_class) == 0x7fc);
include/d/actor/d_a_npc_ne.h
-5
View File
@@ -197,12 +197,7 @@ STATIC_ASSERT(sizeof(npc_ne_class) == 0xCC4);
class daNpc_Ne_HIO_c {
public:
/* 80A88CCC */ daNpc_Ne_HIO_c();
#ifdef NONMATCHING
/* 80A92374 */ virtual ~daNpc_Ne_HIO_c() {}
#else
/* 80A92374 */ ~daNpc_Ne_HIO_c();
/* 0x00 */ void* vtable;
#endif
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mScale;
include/d/actor/d_a_npc_the.h
+1 -5
View File
@@ -203,11 +203,7 @@ private:
/* 0xE1E */ u8 mType;
static char* mEvtCutNameList[4];
#ifdef NONMATCHING
static EventFn mEvtCutList[4];
#else
static u8 mEvtCutList[48];
#endif
};
STATIC_ASSERT(sizeof(daNpcThe_c) == 0xE20);
@@ -249,7 +245,7 @@ public:
/* 0x6A */ bool mTest;
};
/* 80AFBDA0 */ virtual ~daNpcThe_Param_c();
/* 80AFBDA0 */ virtual ~daNpcThe_Param_c() {}
static daNpcThe_Param_c::param const m;
};
include/d/actor/d_a_npc_zra.h
+2 -7
View File
@@ -316,7 +316,7 @@ public:
/* 80B8B420 */ BOOL waitSearch(void*);
/* 80B8B530 */ BOOL ECut_searchPrince1(int);
/* 80B8BCE8 */ BOOL ECut_searchPrince2(int);
/* 80B8C3E8 */ void adjustShapeAngle();
/* 80B8C3E8 */ void adjustShapeAngle() {}
int getType() { return mType; }
u32 getAngleNoFromParam() { return (u8)(fopAcM_GetParam(this) >> 8); }
void setBlastFlag(u8 i_flag) { mBlastFlag = i_flag; }
@@ -393,13 +393,8 @@ public:
/* 0x15C0 */ u8 field_0x15c0;
/* 0x15C1 */ bool mBlastFlag;
#ifdef NONMATCHING
static char* mEvtCutNameList[11];
static EventFn mEvtCutList[11];
#else
static void* mEvtCutNameList[11];
static u8 mEvtCutList[132];
#endif
};
STATIC_ASSERT(sizeof(daNpc_zrA_c) == 0x15C4);
@@ -459,7 +454,7 @@ public:
/* 0xAC */ f32 field_0xac;
};
/* 80B8C3EC */ virtual ~daNpc_zrA_Param_c();
/* 80B8C3EC */ virtual ~daNpc_zrA_Param_c() {}
static param const m;
};
include/d/actor/d_a_npc_zrz.h
+1 -1
View File
@@ -76,7 +76,7 @@ public:
/* 80B9A0EC */ BOOL talk(void*);
/* 80B9A29C */ BOOL test(void*);
/* 80B9A380 */ void himoCalc();
/* 80B9AF7C */ void adjustShapeAngle();
/* 80B9AF7C */ void adjustShapeAngle() {}
private:
/* 0x0B48 */ Z2Creature mCreatureSound;
include/d/actor/d_a_obj_kantera.h
-23
View File
@@ -3,7 +3,6 @@
#include "d/actor/d_a_itembase.h"
#ifdef NONMATCHING
/**
* @ingroup actors-objects
* @class daItemKantera_c
@@ -45,27 +44,5 @@ private:
};
STATIC_ASSERT(sizeof(daItemKantera_c) == 0x948);
#else
struct daItemKantera_c {
/* 80C389BC */ void initBaseMtx();
/* 80C389F8 */ void setBaseMtx();
/* 80C38A64 */ int Create();
/* 80C38BA8 */ int __CreateHeap();
/* 80C38BB0 */ int create();
/* 80C38F78 */ void bg_check();
/* 80C39068 */ int actionInit();
/* 80C390A0 */ int actionWaitInit();
/* 80C3911C */ int actionWait();
/* 80C39234 */ int initActionOrderGetDemo();
/* 80C392D0 */ int actionOrderGetDemo();
/* 80C3934C */ int actionGetDemo();
/* 80C393B0 */ int execute();
/* 80C394DC */ int draw();
/* 80C39530 */ int _delete();
private:
/* 0x000 */ u8 field_0x0[0x948];
};
#endif
#endif /* D_A_OBJ_KANTERA_H */
include/d/actor/d_a_obj_mirror_table.h
+1 -1
View File
@@ -15,7 +15,7 @@
class daObjMirrorTable_c : public fopAc_ac_c {
public:
/* 80C99938 */ int createHeap();
/* 80C99F7C */ /* inline */ bool isSwitch(); // should be inlined once createHeap matches
/* 80C99F7C */ inline bool isSwitch();
inline void checkOnPanel();
/* 80C9A298 */ int draw();
inline void setBaseMtx();
include/d/actor/d_a_obj_volcball.h
+3 -3
View File
@@ -27,8 +27,8 @@ public:
};
struct vball_s {
/* 80D21FA8 */ ~vball_s();
/* 80D2214C */ vball_s();
/* 80D21FA8 */ ~vball_s() {}
/* 80D2214C */ vball_s() {}
/* 0x000 */ J3DModel* mpModel;
/* 0x004 */ cXyz field_0x4;
@@ -107,7 +107,7 @@ public:
/* 80D23904 */ int draw();
/* 80D23A0C */ int _delete();
/* 80D23B24 */ virtual ~daObjVolcBall_c();
/* 80D23B24 */ virtual ~daObjVolcBall_c() {}
/* 80D22DDC */ virtual BOOL eventStart();
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
include/d/actor/d_a_obj_zraMark.h
+2 -5
View File
@@ -10,10 +10,7 @@ class daNpc_Hoz_c;
class _ZraMark_Hahen_c {
public:
_ZraMark_Hahen_c() {
mpModel = NULL;
setColor(0);
}
inline _ZraMark_Hahen_c();
/* 80D4347C */ int create(cXyz const&, s8, s8, s8, s8);
/* 80D434F8 */ BOOL loadModel();
@@ -22,7 +19,7 @@ public:
/* 80D43864 */ void setMtx();
/* 80D438C8 */ void draw();
void setColor(const s8& i_color) { mColor = i_color; }
inline void setColor(const s8& i_color) { mColor = i_color; }
s8 getColor() { return mColor; }
void setPos(const cXyz& i_pos) { mPos = i_pos; }
void setSpeed(const cXyz& i_speed) { mSpeed = i_speed; }
include/d/actor/d_a_player.h
+1 -1
View File
@@ -565,7 +565,7 @@ public:
static BOOL checkShieldGet();
static BOOL checkSwordGet();
void changeDemoParam2(s16);
cXyz getHeadTopPos() const;
cXyz getHeadTopPos() const { return mHeadTopPos; }
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
cXyz* getRightFootPosP() { return &mRightFootPos; }
include/d/d_com_inf_game.h
+2 -2
View File
@@ -2606,8 +2606,8 @@ inline stage_pselect_info_class* dComIfGp_getStagePselectInfo() {
return g_dComIfG_gameInfo.play.getStage().getPselectInfo();
}
inline stage_vrbox_info_class* dComIfGp_getStageVrboxcolInfo() {
return g_dComIfG_gameInfo.play.getStage().getVrboxInfo();
inline stage_vrboxcol_info_class* dComIfGp_getStageVrboxcolInfo() {
return g_dComIfG_gameInfo.play.getStage().getVrboxcolInfo();
}
inline stage_plight_info_class* dComIfGp_getStagePlightInfo() {
include/d/d_drawlist.h
+2 -4
View File
@@ -167,8 +167,8 @@ public:
class dDlst_shadowRealPoly_c : public dDlst_shadowPoly_c {
public:
/* 800569A0 */ virtual dDlst_shadowTri_c* getTri();
/* 800569A8 */ virtual s32 getTriMax();
/* 800569A0 */ virtual dDlst_shadowTri_c* getTri() { return mShadowTri; }
/* 800569A8 */ virtual s32 getTriMax() { return ARRAY_SIZE(mShadowTri); }
/* 0x8 */ dDlst_shadowTri_c mShadowTri[256];
};
@@ -258,8 +258,6 @@ private:
STATIC_ASSERT(sizeof(dDlst_window_c) == 0x2C);
extern u8 mWipe__12dDlst_list_c; // Wipe
struct view_port_class;
struct view_class;
include/d/d_kankyo.h
+3 -3
View File
@@ -227,7 +227,7 @@ class dKyd_lightSchejule;
class stage_palette_info_class;
class stage_pselect_info_class;
class stage_envr_info_class;
class stage_vrbox_info_class;
class stage_vrboxcol_info_class;
class stage_plight_info_class;
class kytag08_class;
@@ -278,7 +278,7 @@ public:
/* 801A5288 */ void exeKankyo();
/* 801A56DC */ void drawKankyo();
/* 801ADBBC */ virtual ~dScnKy_env_light_c();
/* 801ADBBC */ virtual ~dScnKy_env_light_c() {}
void setLightTevColorType(J3DModel* i_model, dKy_tevstr_c* tevstr) {
setLightTevColorType(i_model->getModelData(), tevstr);
@@ -292,7 +292,7 @@ public:
/* 0x0004 */ stage_palette_info_class* mpDmPalet;
/* 0x0008 */ stage_pselect_info_class* mpDmPselect;
/* 0x000C */ stage_envr_info_class* mpDmEnvr;
/* 0x0010 */ stage_vrbox_info_class* mpDmVrbox;
/* 0x0010 */ stage_vrboxcol_info_class* mpDmVrbox;
/* 0x0014 */ dKyd_lightSchejule* mpSchedule;
/* 0x0018 */ LIGHT_INFLUENCE mBaseLightInfluence;
/* 0x0038 */ LIGHT_INFLUENCE mLightInfluence[30];
include/d/d_menu_dmap.h
+1 -1
View File
@@ -22,7 +22,7 @@ class dMenu_ItemExplain_c;
class J2DPictureEx;
struct renderingDmap_c {
/* 801C0380 */ ~renderingDmap_c();
/* 801C0380 */ virtual ~renderingDmap_c() {}
/* 801C051C */ renderingDmap_c();
};
include/d/d_menu_dmap_map.h
+2 -2
View File
@@ -4,7 +4,7 @@
#include "dolphin/types.h"
struct dMenu_StageMapCtrl_c {
/* 801C042C */ ~dMenu_StageMapCtrl_c();
/* 801C042C */ virtual ~dMenu_StageMapCtrl_c() {}
/* 801C0EE0 */ f32 getMapBlendPer() const;
/* 801C0F24 */ void getPixelStageSizeX() const;
/* 801C0F3C */ void getPixelStageSizeZ() const;
@@ -48,7 +48,7 @@ struct dMenu_StageMapCtrl_c {
};
struct dMenu_DmapMapCtrl_c : public dMenu_StageMapCtrl_c {
/* 801BD144 */ ~dMenu_DmapMapCtrl_c();
/* 801BD144 */ virtual ~dMenu_DmapMapCtrl_c() {}
/* 801C18C0 */ void getZoomMinMaxCheck(f32*, f32*, f32*, f32*, bool*, bool*);
/* 801C1B14 */ void calcZoomCenter(f32*, f32*);
/* 801C1BA4 */ void getZoomCmPerPixel();
include/d/d_menu_fmap_map.h
+4 -4
View File
@@ -89,10 +89,10 @@ public:
/* 801CE93C */ bool getNextRegion();
/* 801CE9A4 */ room_class* getNextRoomPointer();
/* 801CF4D0 */ ~renderingFmap_c(); // {}
/* 801CF55C */ bool isRenderingFloor(int); // { return true; }
/* 801CF564 */ void beforeDrawPath(); // {}
/* 801CF568 */ void afterDrawPath(); // {}
/* 801CF4D0 */ ~renderingFmap_c() {}
/* 801CF55C */ bool isRenderingFloor(int) { return true; }
/* 801CF564 */ void beforeDrawPath() {}
/* 801CF568 */ void afterDrawPath() {}
int getNowDrawRegionNo() { return mRegionNo; }
bool isDrawEnable() { return mDrawEnable; }
include/d/d_particle.h
+39 -47
View File
@@ -18,7 +18,7 @@ class dPa_levelEcallBack : public JPAEmitterCallBack {
public:
/* 8004FB18 */ virtual ~dPa_levelEcallBack() { cleanup(); }
virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) = 0;
/* 8004FB8C */ virtual void cleanup();
/* 8004FB8C */ virtual void cleanup() {}
};
class dPa_hermiteEcallBack_c : public dPa_levelEcallBack {
@@ -56,7 +56,7 @@ public:
/* 8004B168 */ u32 set(cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&,
int, f32);
/* 8004FC08 */ virtual ~dPa_simpleEcallBack();
/* 8004FC08 */ virtual ~dPa_simpleEcallBack() {}
/* 8004AE1C */ virtual void executeAfter(JPABaseEmitter*);
/* 8004AF94 */ virtual void draw(JPABaseEmitter*);
@@ -75,11 +75,11 @@ class dPa_followEcallBack : public dPa_levelEcallBack {
public:
/* 80049580 */ dPa_followEcallBack(u8 param_0 = 0, u8 param_1 = 0);
/* 80050200 */ virtual ~dPa_followEcallBack();
/* 80050200 */ virtual ~dPa_followEcallBack() {}
/* 800495BC */ virtual void execute(JPABaseEmitter*);
/* 800496B0 */ virtual void draw(JPABaseEmitter*);
/* 800496B4 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
/* 80050284 */ virtual void cleanup();
/* 80050284 */ virtual void cleanup() { end(); }
/* 8004974C */ virtual void end();
void remove() { end(); }
@@ -99,13 +99,13 @@ public:
class dPa_windPcallBack : public JPAParticleCallBack {
public:
/* 8004FF2C */ virtual ~dPa_windPcallBack();
/* 8004FF2C */ virtual ~dPa_windPcallBack() {}
/* 8004B4E0 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
};
class dPa_wbPcallBack_c : public JPAParticleCallBack {
public:
/* 8004FECC */ virtual ~dPa_wbPcallBack_c();
/* 8004FECC */ virtual ~dPa_wbPcallBack_c() {}
/* 8004DC28 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
};
@@ -113,7 +113,7 @@ class dPa_setColorEcallBack : public dPa_levelEcallBack {
public:
dPa_setColorEcallBack(const GXColor& color) { mColor = color; }
/* 800502E4 */ virtual ~dPa_setColorEcallBack();
/* 800502E4 */ virtual ~dPa_setColorEcallBack() {}
/* 800502B0 */ virtual void draw(JPABaseEmitter*);
/* 800502E0 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
@@ -124,7 +124,7 @@ class dPa_selectTexEcallBack : public dPa_levelEcallBack {
public:
dPa_selectTexEcallBack(u8 param_0) { field_0x4 = param_0; }
/* 8004FF8C */ virtual ~dPa_selectTexEcallBack();
/* 8004FF8C */ virtual ~dPa_selectTexEcallBack() {}
/* 8004ADC4 */ virtual void draw(JPABaseEmitter*);
/* 80050010 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
@@ -133,13 +133,13 @@ public:
class dPa_particleTracePcallBack_c : public JPAParticleCallBack {
public:
/* 8004FC68 */ virtual ~dPa_particleTracePcallBack_c();
/* 8004FC68 */ virtual ~dPa_particleTracePcallBack_c() {}
/* 8004FAD4 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
};
class dPa_modelPcallBack : public JPAParticleCallBack {
public:
/* 80050038 */ virtual ~dPa_modelPcallBack();
/* 80050038 */ virtual ~dPa_modelPcallBack() {}
/* 8004A460 */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
};
@@ -151,10 +151,10 @@ public:
/* 8004A88C */ void cleanup();
/* 8004A8DC */ void draw(f32 (*)[4]);
/* 8004AB88 */ ~model_c();
/* 8004FB90 */ model_c();
/* 8004FB90 */ model_c() { field_0x0 = NULL; }
void reset() {
field_0x0 = 0;
field_0x0 = NULL;
}
u8 getRotAxis() { return mRotAxis; }
@@ -182,7 +182,7 @@ public:
/* 8004AD58 */ static model_c* getModel(JPABaseEmitter*);
/* 8004AD90 */ static u8 getRotAxis(JPABaseEmitter*);
/* 80050378 */ virtual ~dPa_modelEcallBack();
/* 80050378 */ virtual ~dPa_modelEcallBack() {}
/* 8004AA34 */ virtual void draw(JPABaseEmitter*);
/* 80050014 */ virtual void drawAfter(JPABaseEmitter*);
/* 8004AAA8 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
@@ -202,14 +202,14 @@ public:
class dPa_light8PcallBack : public JPAParticleCallBack {
public:
/* 8004FE0C */ virtual ~dPa_light8PcallBack();
/* 8004FE0C */ virtual ~dPa_light8PcallBack() {}
/* 8004DD10 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
/* 8004DD1C */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
};
class dPa_light8EcallBack : public dPa_levelEcallBack {
public:
/* 8005015C */ virtual ~dPa_light8EcallBack();
/* 8005015C */ virtual ~dPa_light8EcallBack() {}
/* 8004A340 */ virtual void draw(JPABaseEmitter*);
/* 800501E0 */ virtual void drawAfter(JPABaseEmitter*);
/* 8004979C */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
@@ -217,14 +217,14 @@ public:
class dPa_gen_d_light8PcallBack : public JPAParticleCallBack {
public:
/* 8004FD4C */ virtual ~dPa_gen_d_light8PcallBack();
/* 8004FD4C */ virtual ~dPa_gen_d_light8PcallBack() {}
/* 8004DD18 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
/* 8004ED44 */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
};
class dPa_gen_d_light8EcallBack : public dPa_levelEcallBack {
public:
/* 800503FC */ virtual ~dPa_gen_d_light8EcallBack();
/* 800503FC */ virtual ~dPa_gen_d_light8EcallBack() {}
/* 8004A388 */ virtual void draw(JPABaseEmitter*);
/* 80050098 */ virtual void drawAfter(JPABaseEmitter*);
/* 800497CC */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
@@ -232,14 +232,14 @@ public:
class dPa_gen_b_light8PcallBack : public JPAParticleCallBack {
public:
/* 8004FDAC */ virtual ~dPa_gen_b_light8PcallBack();
/* 8004FDAC */ virtual ~dPa_gen_b_light8PcallBack() {}
/* 8004DD14 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
/* 8004E6A8 */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
};
class dPa_gen_b_light8EcallBack : public dPa_levelEcallBack {
public:
/* 800500B8 */ virtual ~dPa_gen_b_light8EcallBack();
/* 800500B8 */ virtual ~dPa_gen_b_light8EcallBack() {}
/* 8004A364 */ virtual void draw(JPABaseEmitter*);
/* 8005013C */ virtual void drawAfter(JPABaseEmitter*);
/* 800497B0 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
@@ -247,7 +247,7 @@ public:
class dPa_fsenthPcallBack : public JPAParticleCallBack {
public:
/* 8004FE6C */ virtual ~dPa_fsenthPcallBack();
/* 8004FE6C */ virtual ~dPa_fsenthPcallBack() {}
/* 8004DCA0 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
/* 8004DD0C */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
};
@@ -271,7 +271,7 @@ public:
/* 8004B504 */ void onActive();
/* 8004B544 */ void entry(u32, u16, JPABaseEmitter*, dPa_levelEcallBack*);
/* 8004B5AC */ void cleanup();
/* 8004FBFC */ emitter_c();
/* 8004FBFC */ emitter_c() { mId = 0; }
JPABaseEmitter* getEmitter() { return mEmitter; }
emitter_c* getPre() { return mPre; }
@@ -410,56 +410,48 @@ public:
static bool isStatus(u8 status) { return mStatus & status; }
static dPa_selectTexEcallBack* getTsuboSelectTexEcallBack(int idx) {
return ((dPa_selectTexEcallBack*)mTsubo) + idx;
return &mTsubo[idx];
}
static JPAEmitterManager* getEmitterManager() { return mEmitterMng; }
static JPAParticleCallBack* getLight8PcallBack() {
return (JPAParticleCallBack*)mLight8PcallBack;
//return &mLight8PcallBack;
return &mLight8PcallBack;
}
static JPAParticleCallBack* getGen_b_Light8PcallBack() {
return (JPAParticleCallBack*)m_b_Light8PcallBack;
//return &m_b_Light8PcallBack;
return &m_b_Light8PcallBack;
}
static JPAParticleCallBack* getGen_d_Light8PcallBack() {
return (JPAParticleCallBack*)m_d_Light8PcallBack;
//return &m_d_Light8PcallBack;
return &m_d_Light8PcallBack;
}
static dPa_gen_b_light8EcallBack* getGen_b_Light8EcallBack() {
return (dPa_gen_b_light8EcallBack*)m_b_Light8EcallBack;
//return &m_b_Light8EcallBack;
return &m_b_Light8EcallBack;
}
static dPa_gen_d_light8EcallBack* getGen_d_Light8EcallBack() {
return (dPa_gen_d_light8EcallBack*)m_d_Light8EcallBack;
//return &m_d_Light8PcallBack;
return &m_d_Light8EcallBack;
}
static dPa_light8EcallBack* getLight8EcallBack() {
return (dPa_light8EcallBack*)mLight8EcallBack;
//return &mLight8EcallBack;
return &mLight8EcallBack;
}
static JPAParticleCallBack* getParticleTracePCB() {
return (JPAParticleCallBack*)mParticleTracePCB;
//return &mParticleTracePCB;
return &mParticleTracePCB;
}
static JPAParticleCallBack* getFsenthPcallBack() {
return (JPAParticleCallBack*)mFsenthPcallBack;
//return &mFsenthPcallBack;
return &mFsenthPcallBack;
}
static u8 mTsubo[64];
static dPa_selectTexEcallBack mTsubo[8];
static u8 mLifeBall[24];
static Mtx mWindViewMatrix;
static JPAEmitterManager* mEmitterMng;
static u8 mWaterBubblePcallBack[4];
static u8 mFsenthPcallBack[4];
static u8 mLight8EcallBack[4];
static u8 mLight8PcallBack[4];
static u8 m_b_Light8EcallBack[4];
static u8 m_b_Light8PcallBack[4];
static u8 m_d_Light8EcallBack[4];
static u8 m_d_Light8PcallBack[4];
static u8 mParticleTracePCB[4 + 4 /* padding */];
static JPAParticleCallBack mFsenthPcallBack;
static dPa_light8EcallBack mLight8EcallBack;
static JPAParticleCallBack mLight8PcallBack;
static dPa_gen_b_light8EcallBack m_b_Light8EcallBack;
static JPAParticleCallBack m_b_Light8PcallBack;
static dPa_gen_d_light8EcallBack m_d_Light8EcallBack;
static JPAParticleCallBack m_d_Light8PcallBack;
static JPAParticleCallBack mParticleTracePCB;
static u8 mStatus;
private:
include/d/d_stage.h
+7 -2
View File
@@ -10,7 +10,12 @@
class JKRExpHeap;
struct stage_vrboxcol_info_class {
// VRB
/* 0x00 */ color_RGB_class field_0x0;
/* 0x03 */ color_RGB_class field_0x3;
/* 0x06 */ color_RGB_class field_0x6;
/* 0x09 */ GXColor field_0x9;
/* 0x0D */ GXColor field_0xd;
/* 0x11 */ GXColor field_0x11;
}; // Size: 0x18
// Virt
@@ -813,7 +818,7 @@ public:
/* 80024954 */ static bool resetArchiveBank(int);
/* 80024DB0 */ static void SetTimePass(int);
/* 8025BAAC */ static void setZoneNo(int, int);
static s8 GetTimePass();
static s8 GetTimePass() { return m_time_pass; }
static s8 getStayNo() { return mStayNo; }
static u8 getRegionNo(int i_roomNo) { return mStatus[i_roomNo].mRegionNo; }
src/Z2AudioLib/Z2EnvSeMgr.cpp
+12 -575
View File
@@ -9,120 +9,6 @@
#include "Z2AudioLib/Z2Creature.h"
#include "d/d_save.h"
#include "d/d_com_inf_game.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void __ct__11Z2EnvSeBaseFP3Vec();
extern "C" void __dt__11Z2EnvSeBaseFv();
extern "C" void startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl();
extern "C" void startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl();
extern "C" void __ct__10Z2EnvSeDirFP3Vec();
extern "C" void __dt__10Z2EnvSeDirFv();
extern "C" void setPanDir__10Z2EnvSeDirFP3Vec();
extern "C" void calcPan__10Z2EnvSeDirFf();
extern "C" void startEnvSeDirLevel__10Z2EnvSeDirF10JAISoundIDff();
extern "C" void __ct__14Z2EnvSeAutoPanFv();
extern "C" void __dt__14Z2EnvSeAutoPanFv();
extern "C" void setPanParam__14Z2EnvSeAutoPanFffbbff();
extern "C" void calcPan__14Z2EnvSeAutoPanFv();
extern "C" void startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff();
extern "C" void __ct__10Z2EnvSeMgrFv();
extern "C" void __dt__10Z2EnvSeMgrFv();
extern "C" void framework__10Z2EnvSeMgrFv();
extern "C" void resetScene__10Z2EnvSeMgrFv();
extern "C" void resetSceneInner__10Z2EnvSeMgrFv();
extern "C" void initSceneEnvSe__10Z2EnvSeMgrFlScf();
extern "C" void playSceneEnvSe__10Z2EnvSeMgrFv();
extern "C" void initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec();
extern "C" void startStaticEnvSe__10Z2EnvSeMgrFSc();
extern "C" void registWindowPos__10Z2EnvSeMgrFP3Vec();
extern "C" void startRainSe__10Z2EnvSeMgrFlSc();
extern "C" void startNearThunderSe__10Z2EnvSeMgrFSc();
extern "C" void startFarThunderSe__10Z2EnvSeMgrFP3VecSc();
extern "C" void setSnowPower__10Z2EnvSeMgrFSc();
extern "C" void initStrongWindSe__10Z2EnvSeMgrFv();
extern "C" void setWindDirection__10Z2EnvSeMgrFP3Vec();
extern "C" void startStrongWindSe__10Z2EnvSeMgrFSc();
extern "C" void initRiverSe__10Z2EnvSeMgrFUcUcUcUc();
extern "C" void registRiverSePos__10Z2EnvSeMgrFP3Vec();
extern "C" void setHyrulSewerOpen__10Z2EnvSeMgrFb();
extern "C" void startRiverSe__10Z2EnvSeMgrFSc();
extern "C" void initFallSe__10Z2EnvSeMgrFUcUcUcUc();
extern "C" void registFallSePos__10Z2EnvSeMgrFP3Vec();
extern "C" void startFallSe__10Z2EnvSeMgrFSc();
extern "C" void initEtcSe__10Z2EnvSeMgrFUcUcUcUc();
extern "C" void registEtcSePos__10Z2EnvSeMgrFP3Vec();
extern "C" void startEtcSe__10Z2EnvSeMgrFSc();
extern "C" void registWolfSmellSePos__10Z2EnvSeMgrFP3Vec();
extern "C" void startFogWipeTrigger__10Z2EnvSeMgrFP3Vec();
extern "C" void setFogWipeWidth__10Z2EnvSeMgrFf();
extern "C" void getFogDensity__10Z2EnvSeMgrFv();
extern "C" void startFogSe__10Z2EnvSeMgrFv();
extern "C" void initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc();
extern "C" void registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec();
extern "C" void startLv3WaterSe__10Z2EnvSeMgrFSc();
//
// External References:
//
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void isSwitch__12dSv_memBit_cCFi();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void releaseSound__14JAISoundHandleFv();
extern "C" void releaseHandle__8JAISoundFv();
extern "C" void stop__8JAISoundFUl();
extern "C" void moveVolume__18JAISoundParamsMoveFfUl();
extern "C" void movePitch__18JAISoundParamsMoveFfUl();
extern "C" void moveFxMix__18JAISoundParamsMoveFfUl();
extern "C" void movePan__18JAISoundParamsMoveFfUl();
extern "C" void moveDolby__18JAISoundParamsMoveFfUl();
extern "C" void func_802A2FEC();
extern "C" void linearTransform__6Z2CalcFfffffb();
extern "C" void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign();
extern "C" void getRandom__6Z2CalcFfff();
extern "C" void setParam__Q26Z2Calc8FNoise1fFfff();
extern "C" void calcNoise1f__Q26Z2Calc8FNoise1fFv();
extern "C" void setIIR__10Z2SoundMgrFP8JAISoundPCs();
extern "C" void setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __ct__12Z2MultiSeMgrFv();
extern "C" void __dt__12Z2MultiSeMgrFv();
extern "C" void registMultiSePos__12Z2MultiSeMgrFP3Vec();
extern "C" void resetMultiSePos__12Z2MultiSeMgrFv();
extern "C" void getPanPower__12Z2MultiSeMgrFv();
extern "C" void getDolbyPower__12Z2MultiSeMgrFv();
extern "C" void convertAbsToRel__10Z2AudienceFR3VecP3Veci();
extern "C" void calcRelPosVolume__10Z2AudienceFRC3Vecfi();
extern "C" void calcRelPosPan__10Z2AudienceFRC3Veci();
extern "C" void calcRelPosDolby__10Z2AudienceFRC3Veci();
extern "C" void __dl__FPv();
extern "C" void JMAFastVECNormalize__FPC3VecP3Vec();
extern "C" void __cvt_fp2unsigned();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 data_80450B44[4];
extern "C" extern u8 data_80450B60[4];
extern "C" extern u8 data_80450B74[4];
extern "C" extern u8 data_80450B7C[4];
extern "C" extern u8 data_80450B80[4];
extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */];
extern "C" f32 cEqualCSlope__6Z2Calc;
extern "C" f32 cEqualPSlope__6Z2Calc;
extern "C" extern u8 __OSReport_disable;
//
// Declarations:
//
/* 802C589C-802C58AC 2C01DC 0010+00 3/3 0/0 0/0 .text __ct__11Z2EnvSeBaseFP3Vec */
Z2EnvSeBase::Z2EnvSeBase(Vec* param_0) {
@@ -132,34 +18,6 @@ Z2EnvSeBase::Z2EnvSeBase(Vec* param_0) {
/* 802C58AC-802C5908 2C01EC 005C+00 3/3 0/0 0/0 .text __dt__11Z2EnvSeBaseFv */
Z2EnvSeBase::~Z2EnvSeBase() {}
/* ############################################################################################## */
/* 80455D40-80455D44 004340 0004+00 2/2 0/0 0/0 .sdata2 @3501 */
SECTION_SDATA2 static f32 lit_3501 = 0.33f;
/* 80455D44-80455D48 004344 0004+00 24/24 0/0 0/0 .sdata2 @3502 */
SECTION_SDATA2 static f32 lit_3502 = 1.0f;
/* 80455D48-80455D4C 004348 0004+00 19/19 0/0 0/0 .sdata2 @3503 */
SECTION_SDATA2 static u8 lit_3503[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80455D4C-80455D50 00434C 0004+00 2/2 0/0 0/0 .sdata2 @3504 */
SECTION_SDATA2 static f32 lit_3504 = 1500.0f;
/* 80455D50-80455D58 004350 0004+04 9/9 0/0 0/0 .sdata2 @3505 */
SECTION_SDATA2 static f32 lit_3505[1 + 1 /* padding */] = {
1.0f / 10.0f,
/* padding */
0.0f,
};
/* 80455D58-80455D60 004358 0008+00 8/8 0/0 0/0 .sdata2 @3508 */
SECTION_SDATA2 static f64 lit_3508 = 4503599627370496.0 /* cast u32 to float */;
/* 802C5908-802C5AB4 2C0248 01AC+00 2/2 0/0 0/0 .text
* startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl */
bool Z2EnvSeBase::startEnvSe(JAISoundID param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5,
@@ -222,13 +80,8 @@ bool Z2EnvSeBase::startEnvSeLevel(JAISoundID param_1, f32 param_2, f32 param_3,
return rv;
}
/* ############################################################################################## */
/* 8039C250-8039C260 0288B0 000C+04 2/2 0/0 0/0 .rodata cNullVec__6Z2Calc */
SECTION_RODATA static Vec const cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f};
COMPILER_STRIP_GATE(0x8039C250, &cNullVec__6Z2Calc);
/* 80455D60-80455D64 004360 0004+00 10/10 0/0 0/0 .sdata2 @3574 */
SECTION_SDATA2 static f32 lit_3574 = 0.5f;
static Vec const cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f};
/* 802C5C9C-802C5D1C 2C05DC 0080+00 1/1 0/0 0/0 .text __ct__10Z2EnvSeDirFP3Vec */
Z2EnvSeDir::Z2EnvSeDir(Vec* param_0) {
@@ -241,14 +94,9 @@ Z2EnvSeDir::Z2EnvSeDir(Vec* param_0) {
}
}
/* 802C5D1C-802C5D70 2C065C 0054+00 1/1 0/0 0/0 .text __dt__10Z2EnvSeDirFv */
Z2EnvSeDir::~Z2EnvSeDir() {}
/* ############################################################################################## */
/* 80455D64-80455D68 004364 0004+00 1/1 0/0 0/0 .sdata2 @3585 */
SECTION_SDATA2 static f32 lit_3585 = -1000.0f;
/* 802C5D70-802C5D9C 2C06B0 002C+00 2/2 0/0 0/0 .text setPanDir__10Z2EnvSeDirFP3Vec */
void Z2EnvSeDir::setPanDir(Vec* dir) {
mPanDir.x = dir->x * -1000.0f;
@@ -256,7 +104,6 @@ void Z2EnvSeDir::setPanDir(Vec* dir) {
mPanDir.z = dir->z * -1000.0f;
}
/* 802C5D9C-802C5E90 2C06DC 00F4+00 1/1 0/0 0/0 .text calcPan__10Z2EnvSeDirFf */
void Z2EnvSeDir::calcPan(f32 param_0) {
if (*getHandle()) {
@@ -274,20 +121,12 @@ void Z2EnvSeDir::calcPan(f32 param_0) {
}
}
/* 802C5E90-802C5ECC 2C07D0 003C+00 1/1 0/0 0/0 .text
* startEnvSeDirLevel__10Z2EnvSeDirF10JAISoundIDff */
bool Z2EnvSeDir::startEnvSeDirLevel(JAISoundID param_1, f32 param_2, f32 param_3) {
return Z2EnvSeBase::startEnvSeLevel(param_1, param_2, param_3, field_0x8, field_0xc, 1.0f, 0);
}
/* ############################################################################################## */
/* 80455D68-80455D6C 004368 0004+00 3/3 0/0 0/0 .sdata2 @3654 */
SECTION_SDATA2 static f32 lit_3654 = 0.0018554000416770577f;
/* 80455D6C-80455D70 00436C 0004+00 3/3 0/0 0/0 .sdata2 @3655 */
SECTION_SDATA2 static f32 lit_3655 = 0.0008553999941796064f;
/* 802C5ECC-802C5F28 2C080C 005C+00 1/1 0/0 0/0 .text __ct__14Z2EnvSeAutoPanFv */
Z2EnvSeAutoPan::Z2EnvSeAutoPan() {
field_0x8 = 0.5f;
@@ -298,7 +137,6 @@ Z2EnvSeAutoPan::Z2EnvSeAutoPan() {
field_0x19 = 1;
}
/* 802C5F28-802C5F7C 2C0868 0054+00 1/1 0/0 0/0 .text __dt__14Z2EnvSeAutoPanFv */
Z2EnvSeAutoPan::~Z2EnvSeAutoPan() {}
@@ -313,13 +151,6 @@ void Z2EnvSeAutoPan::setPanParam(f32 param_1, f32 param_2, bool param_3, bool pa
field_0x19 = param_4;
}
/* ############################################################################################## */
/* 80455D70-80455D74 004370 0004+00 4/4 0/0 0/0 .sdata2 @3704 */
SECTION_SDATA2 static f32 lit_3704 = 2.0f;
/* 80455D74-80455D78 004374 0004+00 7/7 0/0 0/0 .sdata2 @3705 */
SECTION_SDATA2 static f32 lit_3705 = -1.0f;
/* 802C5F98-802C60E0 2C08D8 0148+00 2/2 0/0 0/0 .text calcPan__14Z2EnvSeAutoPanFv */
void Z2EnvSeAutoPan::calcPan() {
if (field_0x18) {
@@ -354,7 +185,6 @@ void Z2EnvSeAutoPan::calcPan() {
}
}
/* 802C60E0-802C611C 2C0A20 003C+00 2/2 0/0 0/0 .text
* startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff */
bool Z2EnvSeAutoPan::startEnvSeAutoPanLevel(JAISoundID param_1, f32 param_2, f32 param_3,
@@ -363,94 +193,6 @@ bool Z2EnvSeAutoPan::startEnvSeAutoPanLevel(JAISoundID param_1, f32 param_2, f32
0);
}
/* ############################################################################################## */
/* 80455D78-80455D7C 004378 0004+00 8/8 0/0 0/0 .sdata2 @3749 */
SECTION_SDATA2 static f32 lit_3749 = 1.0f / 100.0f;
/* 80455D7C-80455D80 00437C 0004+00 1/1 0/0 0/0 .sdata2 @3750 */
SECTION_SDATA2 static f32 lit_3750 = 0.007823764346539974f;
/* 80455D80-80455D84 004380 0004+00 1/1 0/0 0/0 .sdata2 @3751 */
SECTION_SDATA2 static f32 lit_3751 = 3.0f / 50.0f;
/* 80455D84-80455D88 004384 0004+00 4/4 0/0 0/0 .sdata2 @3752 */
SECTION_SDATA2 static f32 lit_3752 = 1.0f / 5.0f;
/* 80455D88-80455D8C 004388 0004+00 1/1 0/0 0/0 .sdata2 @3753 */
SECTION_SDATA2 static f32 lit_3753 = 0.026302523910999298f;
/* 80455D8C-80455D90 00438C 0004+00 1/1 0/0 0/0 .sdata2 @3754 */
SECTION_SDATA2 static f32 lit_3754 = 0.004999999888241291f;
/* 80455D90-80455D94 004390 0004+00 2/2 0/0 0/0 .sdata2 @3755 */
SECTION_SDATA2 static f32 lit_3755 = 9.0f / 10.0f;
/* 80455D94-80455D98 004394 0004+00 1/1 0/0 0/0 .sdata2 @3756 */
SECTION_SDATA2 static f32 lit_3756 = 0.023310113698244095f;
/* 80455D98-80455D9C 004398 0004+00 1/1 0/0 0/0 .sdata2 @3757 */
SECTION_SDATA2 static f32 lit_3757 = 0.003000000026077032f;
/* 80455D9C-80455DA0 00439C 0004+00 1/1 0/0 0/0 .sdata2 @3758 */
SECTION_SDATA2 static f32 lit_3758 = 0.006385157350450754f;
/* 80455DA0-80455DA4 0043A0 0004+00 1/1 0/0 0/0 .sdata2 @3759 */
SECTION_SDATA2 static f32 lit_3759 = 0.004000000189989805f;
/* 80455DA4-80455DA8 0043A4 0004+00 6/6 0/0 0/0 .sdata2 @3760 */
SECTION_SDATA2 static f32 lit_3760 = 4.0f / 5.0f;
/* 80455DA8-80455DAC 0043A8 0004+00 1/1 0/0 0/0 .sdata2 @3761 */
SECTION_SDATA2 static f32 lit_3761 = 0.006188805215060711f;
/* 80455DAC-80455DB0 0043AC 0004+00 1/1 0/0 0/0 .sdata2 @3762 */
SECTION_SDATA2 static f32 lit_3762 = 0.0044999998062849045f;
/* 80455DB0-80455DB4 0043B0 0004+00 6/6 0/0 0/0 .sdata2 @3763 */
SECTION_SDATA2 static f32 lit_3763 = 3.0f / 10.0f;
/* 80455DB4-80455DB8 0043B4 0004+00 1/1 0/0 0/0 .sdata2 @3764 */
SECTION_SDATA2 static f32 lit_3764 = 0.05343298241496086f;
/* 80455DB8-80455DBC 0043B8 0004+00 1/1 0/0 0/0 .sdata2 @3765 */
SECTION_SDATA2 static f32 lit_3765 = 0.0020000000949949026f;
/* 80455DBC-80455DC0 0043BC 0004+00 7/7 0/0 0/0 .sdata2 @3766 */
SECTION_SDATA2 static f32 lit_3766 = 7.0f / 10.0f;
/* 80455DC0-80455DC4 0043C0 0004+00 1/1 0/0 0/0 .sdata2 @3767 */
SECTION_SDATA2 static f32 lit_3767 = 0.04256627336144447f;
/* 80455DC4-80455DC8 0043C4 0004+00 1/1 0/0 0/0 .sdata2 @3768 */
SECTION_SDATA2 static f32 lit_3768 = 0.0024999999441206455f;
/* 80455DC8-80455DCC 0043C8 0004+00 5/5 0/0 0/0 .sdata2 @3769 */
SECTION_SDATA2 static f32 lit_3769 = 2.0f / 5.0f;
/* 80455DCC-80455DD0 0043CC 0004+00 1/1 0/0 0/0 .sdata2 @3770 */
SECTION_SDATA2 static f32 lit_3770 = 0.01293395459651947f;
/* 80455DD0-80455DD4 0043D0 0004+00 1/1 0/0 0/0 .sdata2 @3771 */
SECTION_SDATA2 static f32 lit_3771 = 0.006000000052154064f;
/* 80455DD4-80455DD8 0043D4 0004+00 3/3 0/0 0/0 .sdata2 @3772 */
SECTION_SDATA2 static f32 lit_3772 = 3.0f / 5.0f;
/* 80455DD8-80455DDC 0043D8 0004+00 1/1 0/0 0/0 .sdata2 @3773 */
SECTION_SDATA2 static f32 lit_3773 = 0.012157413177192211f;
/* 80455DDC-80455DE0 0043DC 0004+00 1/1 0/0 0/0 .sdata2 @3774 */
SECTION_SDATA2 static f32 lit_3774 = 0.006500000134110451f;
/* 80455DE0-80455DE4 0043E0 0004+00 1/1 0/0 0/0 .sdata2 @3775 */
SECTION_SDATA2 static f32 lit_3775 = 0.020923573523759842f;
/* 80455DE4-80455DE8 0043E4 0004+00 1/1 0/0 0/0 .sdata2 @3776 */
SECTION_SDATA2 static f32 lit_3776 = 0.0010000000474974513f;
/* 80455DE8-80455DEC 0043E8 0004+00 1/1 0/0 0/0 .sdata2 @3777 */
SECTION_SDATA2 static f32 lit_3777 = 0.0037908784579485655f;
/* 802C611C-802C6540 2C0A5C 0424+00 0/0 1/1 0/0 .text __ct__10Z2EnvSeMgrFv */
Z2EnvSeMgr::Z2EnvSeMgr()
: JASGlobalInstance<Z2EnvSeMgr>(this), field_0x38(), field_0x48(1.0f), field_0x4c(1.0f),
@@ -488,10 +230,6 @@ Z2EnvSeMgr::Z2EnvSeMgr()
/* 802C6540-802C66B0 2C0E80 0170+00 0/0 1/1 0/0 .text __dt__10Z2EnvSeMgrFv */
Z2EnvSeMgr::~Z2EnvSeMgr() {}
/* ############################################################################################## */
/* 80455DEC-80455DF0 0043EC 0004+00 1/1 0/0 0/0 .sdata2 @3928 */
SECTION_SDATA2 static f32 lit_3928 = 30.0f;
/* 802C66B0-802C6998 2C0FF0 02E8+00 0/0 1/1 0/0 .text framework__10Z2EnvSeMgrFv */
void Z2EnvSeMgr::framework() {
int sceneNum = Z2GetSceneMgr()->getCurrentSceneNum();
@@ -559,14 +297,12 @@ void Z2EnvSeMgr::framework() {
}
}
/* 802C6998-802C699C 2C12D8 0004+00 0/0 1/1 0/0 .text resetScene__10Z2EnvSeMgrFv */
void Z2EnvSeMgr::resetScene() {
/* empty function */
}
/* 802C699C-802C6AC0 2C12DC 0124+00 0/0 1/1 0/0 .text resetSceneInner__10Z2EnvSeMgrFv */
#ifdef NONMATCHING
void Z2EnvSeMgr::resetSceneInner() {
if (-1.0f == field_0x60) {
field_0x38 = 0;
@@ -577,9 +313,9 @@ void Z2EnvSeMgr::resetSceneInner() {
field_0x58 = 0.0f;
field_0x5c = 0.0f;
field_0x39 = 0;
field_0x3c = 0.0f;
field_0x40 = 0.0f;
field_0x44 = 0.0f;
field_0x3c.x = 0.0f;
field_0x3c.y = 0.0f;
field_0x3c.z = 0.0f;
}
field_0x140 = 0;
mWindType = WIND_TYPE_0;
@@ -617,15 +353,6 @@ void Z2EnvSeMgr::resetSceneInner() {
mWolfSmellSeMgr.resetMultiSePos();
field_0x64.resetMultiSePos();
}
#else
void Z2EnvSeMgr::resetSceneInner() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80455DF0-80455DF4 0043F0 0004+00 2/2 0/0 0/0 .sdata2 @3963 */
SECTION_SDATA2 static f32 lit_3963 = 100.0f;
/* 802C6AC0-802C6C1C 2C1400 015C+00 0/0 1/1 0/0 .text initSceneEnvSe__10Z2EnvSeMgrFlScf
*/
@@ -681,7 +408,6 @@ void Z2EnvSeMgr::initSceneEnvSe(s32 param_1, s8 param_2, f32 param_3) {
field_0x60 = param_3;
}
/* 802C6C1C-802C6C84 2C155C 0068+00 1/1 0/0 0/0 .text playSceneEnvSe__10Z2EnvSeMgrFv */
void Z2EnvSeMgr::playSceneEnvSe() {
if (-1.0f != field_0x60) {
@@ -692,24 +418,6 @@ void Z2EnvSeMgr::playSceneEnvSe() {
}
}
/* ############################################################################################## */
/* 803CB9C8-803CB9F8 -00001 0030+00 1/1 0/0 0/0 .data @4025 */
SECTION_DATA static void* lit_4025[12] = {
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x428),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x1C8),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x20C),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x250),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x294),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x2D8),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x31C),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x360),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x3A4),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x3E8),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x31C),
(void*)(((char*)initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec) + 0x2D8),
};
/* 802C6C84-802C70C8 2C15C4 0444+00 2/1 1/1 0/0 .text initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec
*/
void Z2EnvSeMgr::initStaticEnvSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4, Vec* param_5) {
@@ -852,61 +560,6 @@ void Z2EnvSeMgr::initStaticEnvSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4,
}
}
/* ############################################################################################## */
/* 803CB9F8-803CBA28 -00001 0030+00 1/1 0/0 0/0 .data @4272 */
SECTION_DATA static void* lit_4272[12] = {
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x168),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x170),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x1C4),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x204),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x220),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x46C),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x48C),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x528),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x558),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x578),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x4DC),
(void*)(((char*)startStaticEnvSe__10Z2EnvSeMgrFSc) + 0x464),
};
/* 80455DF4-80455DF8 0043F4 0004+00 9/9 0/0 0/0 .sdata2 @4260 */
SECTION_SDATA2 static f32 lit_4260 = 127.0f;
/* 80455DF8-80455DFC 0043F8 0004+00 1/1 0/0 0/0 .sdata2 @4261 */
SECTION_SDATA2 static f32 lit_4261 = 21.0f / 10.0f;
/* 80455DFC-80455E00 0043FC 0004+00 1/1 0/0 0/0 .sdata2 @4262 */
SECTION_SDATA2 static f32 lit_4262 = 64.0f;
/* 80455E00-80455E04 004400 0004+00 1/1 0/0 0/0 .sdata2 @4263 */
SECTION_SDATA2 static f32 lit_4263 = 7.0f / 20.0f;
/* 80455E04-80455E08 004404 0004+00 1/1 0/0 0/0 .sdata2 @4264 */
SECTION_SDATA2 static f32 lit_4264 = 23.0f / 20.0f;
/* 80455E08-80455E0C 004408 0004+00 1/1 0/0 0/0 .sdata2 @4265 */
SECTION_SDATA2 static f32 lit_4265 = 8.0f / 5.0f;
/* 80455E0C-80455E10 00440C 0004+00 1/1 0/0 0/0 .sdata2 @4266 */
SECTION_SDATA2 static f32 lit_4266 = 13.0f / 20.0f;
/* 80455E10-80455E14 004410 0004+00 1/1 0/0 0/0 .sdata2 @4267 */
SECTION_SDATA2 static f32 lit_4267 = 3.0f / 25.0f;
/* 80455E14-80455E18 004414 0004+00 1/1 0/0 0/0 .sdata2 @4268 */
SECTION_SDATA2 static f32 lit_4268 = 17.0f / 20.0f;
/* 80455E18-80455E20 004418 0004+04 3/3 0/0 0/0 .sdata2 @4269 */
SECTION_SDATA2 static f32 lit_4269[1 + 1 /* padding */] = {
0.75f,
/* padding */
0.0f,
};
/* 80455E20-80455E28 004420 0008+00 9/9 0/0 0/0 .sdata2 @4271 */
SECTION_SDATA2 static f64 lit_4271 = 4503601774854144.0 /* cast s32 to float */;
/* 802C70C8-802C780C 2C1A08 0744+00 2/1 1/1 0/0 .text startStaticEnvSe__10Z2EnvSeMgrFSc
*/
bool Z2EnvSeMgr::startStaticEnvSe(s8 param_1) {
@@ -1090,17 +743,12 @@ bool Z2EnvSeMgr::startStaticEnvSe(s8 param_1) {
return rv;
}
/* 802C780C-802C7830 2C214C 0024+00 0/0 1/1 0/0 .text registWindowPos__10Z2EnvSeMgrFP3Vec
*/
void Z2EnvSeMgr::registWindowPos(Vec* param_0) {
field_0x64.registMultiSePos(param_0);
}
/* ############################################################################################## */
/* 80455E28-80455E2C 004428 0004+00 3/3 0/0 0/0 .sdata2 @4400 */
SECTION_SDATA2 static f32 lit_4400 = 11.0f / 10.0f;
/* 802C7830-802C7CF4 2C2170 04C4+00 1/1 1/1 0/0 .text startRainSe__10Z2EnvSeMgrFlSc */
bool Z2EnvSeMgr::startRainSe(s32 param_1, s8 param_2) {
if (mSnowPower > 0) {
@@ -1197,11 +845,6 @@ bool Z2EnvSeMgr::startRainSe(s32 param_1, s8 param_2) {
0);
}
/* ############################################################################################## */
/* 80455E2C-80455E30 00442C 0004+00 1/1 0/0 0/0 .sdata2 @4422 */
SECTION_SDATA2 static f32 lit_4422 = 0.25f;
/* 802C7CF4-802C7E68 2C2634 0174+00 0/0 1/1 0/0 .text startNearThunderSe__10Z2EnvSeMgrFSc
*/
void Z2EnvSeMgr::startNearThunderSe(s8 param_1) {
@@ -1219,7 +862,6 @@ void Z2EnvSeMgr::startNearThunderSe(s8 param_1) {
}
}
/* 802C7E68-802C7FB4 2C27A8 014C+00 0/0 2/2 0/0 .text startFarThunderSe__10Z2EnvSeMgrFP3VecSc */
void Z2EnvSeMgr::startFarThunderSe(Vec* param_1, s8 param_2) {
if (field_0x64.getPosCount() < 0) {
@@ -1232,7 +874,6 @@ void Z2EnvSeMgr::startFarThunderSe(Vec* param_1, s8 param_2) {
}
}
/* 802C7FB4-802C7FBC -00001 0008+00 0/0 0/0 0/0 .text setSnowPower__10Z2EnvSeMgrFSc */
void Z2EnvSeMgr::setSnowPower(s8 param_0) {
mSnowPower = param_0;
@@ -1274,14 +915,6 @@ bool Z2EnvSeMgr::startStrongWindSe(s8 param_1) {
return field_0x144.startEnvSeDirLevel(aJStack_24, param_1 / 127.0f, 1.0f);
}
/* ############################################################################################## */
/* 80455E30-80455E34 004430 0004+00 3/3 0/0 0/0 .sdata2 @4510 */
SECTION_SDATA2 static f32 lit_4510 = 1.5f;
/* 80455E34-80455E38 004434 0004+00 3/3 0/0 0/0 .sdata2 @4511 */
SECTION_SDATA2 static f32 lit_4511 = 3.0f;
/* 802C80F8-802C8234 2C2A38 013C+00 0/0 1/1 0/0 .text initRiverSe__10Z2EnvSeMgrFUcUcUcUc
*/
void Z2EnvSeMgr::initRiverSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
@@ -1317,7 +950,6 @@ void Z2EnvSeMgr::initRiverSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
}
}
/* 802C8234-802C8258 2C2B74 0024+00 1/1 1/1 0/0 .text registRiverSePos__10Z2EnvSeMgrFP3Vec */
void Z2EnvSeMgr::registRiverSePos(Vec* param_0) {
mRiverSeMgr.registMultiSePos(param_0);
@@ -1335,63 +967,8 @@ void Z2EnvSeMgr::setHyrulSewerOpen(bool param_0) {
}
}
/* ############################################################################################## */
/* 803CBA28-803CBAD0 -00001 00A8+00 1/1 0/0 0/0 .data @4622 */
SECTION_DATA static void* lit_4622[42] = {
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0x80),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0x9C),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0x8C),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xAC),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xAC),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xAC),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xA0),
(void*)(((char*)startRiverSe__10Z2EnvSeMgrFSc) + 0xAC),
};
/* 80455E38-80455E3C 004438 0004+00 2/2 0/0 0/0 .sdata2 @4619 */
SECTION_SDATA2 static f32 lit_4619 = -14500.0f;
/* 80455E3C-80455E40 00443C 0004+00 1/1 0/0 0/0 .sdata2 @4621 */
SECTION_SDATA2 static f32 lit_4621 = 150.0f;
/* 802C8300-802C8730 2C2C40 0430+00 2/1 1/1 0/0 .text startRiverSe__10Z2EnvSeMgrFSc */
// missing branch and JAISound stack issues
#ifdef NONMATCHING
// NONMATCHING missing branch and JAISound stack issues
bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
if (Z2GetStatusMgr()->mCameraMapInfo == 6) {
switch (Z2GetSceneMgr()->getCurrentSceneNum()) {
@@ -1400,7 +977,7 @@ bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
break;
}
case 0x10:
if (Z2GetStatusMgr()->mPolygonPosition.y < 14500.0f) {
if (Z2GetStatusMgr()->mPolygonPosition.y < -14500.0f) {
break;
}
case 8:
@@ -1454,18 +1031,14 @@ bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
}
}
aJStack_742 = Z2SE_ENV_SEWER;
dVar18 *= linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.6f, 1.0f,
true);
dVar17 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.0f,
true);
dVar18 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.6f, 1.0f, true);
dVar17 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.0f, true);
uVar8 = field_0x180.startEnvSeLevel(aJStack_742, dVar16, dVar18, dVar13, dVar14, dVar17, 0);
break;
case 5:
aJStack_742 = Z2SE_ENV_SPIRIT_FOUNTAIN;
dVar18 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.6f, 1.0f,
true);
dVar17 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.0f,
true);
dVar18 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.6f, 1.0f, true);
dVar17 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.0f, true);
uVar8 = field_0x180.startEnvSeLevel(aJStack_742, dVar16, dVar18, dVar13, dVar14, dVar17, 0);
break;
}
@@ -1473,11 +1046,6 @@ bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
mRiverSeMgr.resetMultiSePos();
return uVar8;
}
#else
bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
// NONMATCHING
}
#endif
/* 802C8730-802C886C 2C3070 013C+00 1/1 1/1 0/0 .text initFallSe__10Z2EnvSeMgrFUcUcUcUc
*/
@@ -1514,7 +1082,6 @@ void Z2EnvSeMgr::initFallSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
}
}
/* 802C886C-802C8890 2C31AC 0024+00 0/0 1/1 0/0 .text registFallSePos__10Z2EnvSeMgrFP3Vec
*/
void Z2EnvSeMgr::registFallSePos(Vec* param_0) {
@@ -1555,31 +1122,6 @@ bool Z2EnvSeMgr::startFallSe(s8 param_1) {
return rv;
}
/* ############################################################################################## */
/* 803CBAD0-803CBB10 -00001 0040+00 1/1 0/0 0/0 .data @4734 */
SECTION_DATA static void* lit_4734[16] = {
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x15C),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0xF4),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x108),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x180),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x150),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x180),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x180),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x180),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x170),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x11C),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x13C),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x180),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x180),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x180),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x13C),
(void*)(((char*)initEtcSe__10Z2EnvSeMgrFUcUcUcUc) + 0x13C),
};
/* 80455E40-80455E44 004440 0004+00 1/1 0/0 0/0 .sdata2 @4732 */
SECTION_SDATA2 static f32 lit_4732 = 4.0f;
/* 802C8A90-802C8C24 2C33D0 0194+00 2/1 1/1 0/0 .text initEtcSe__10Z2EnvSeMgrFUcUcUcUc */
void Z2EnvSeMgr::initEtcSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
field_0x214 = param_1;
@@ -1625,65 +1167,12 @@ void Z2EnvSeMgr::initEtcSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
}
}
/* 802C8C24-802C8C48 2C3564 0024+00 1/1 1/1 0/0 .text registEtcSePos__10Z2EnvSeMgrFP3Vec
*/
void Z2EnvSeMgr::registEtcSePos(Vec* param_0) {
mEtcSeMgr.registMultiSePos(param_0);
}
/* ############################################################################################## */
/* 803CBB10-803CBB90 -00001 0080+00 1/1 0/0 0/0 .data @4839 */
SECTION_DATA static void* lit_4839[32] = {
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x62C),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x518),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0xE4),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x20C),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x498),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x28C),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x374),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x2D8),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x624),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x2D8),
(void*)(((char*)startEtcSe__10Z2EnvSeMgrFSc) + 0x324),
};
/* 80455E44-80455E48 004444 0004+00 1/1 0/0 0/0 .sdata2 @4833 */
SECTION_SDATA2 static f32 lit_4833 = 6.0f / 5.0f;
/* 80455E48-80455E4C 004448 0004+00 1/1 0/0 0/0 .sdata2 @4834 */
SECTION_SDATA2 static f32 lit_4834 = 13.0f / 10.0f;
/* 80455E4C-80455E50 00444C 0004+00 1/1 0/0 0/0 .sdata2 @4835 */
SECTION_SDATA2 static f32 lit_4835 = 89.0f / 100.0f;
/* 80455E50-80455E54 004450 0004+00 2/2 0/0 0/0 .sdata2 @4836 */
SECTION_SDATA2 static f32 lit_4836 = 0.332f;
/* 80455E54-80455E58 004454 0004+00 2/2 0/0 0/0 .sdata2 @4837 */
SECTION_SDATA2 static f32 lit_4837 = 0.668f;
/* 802C8C48-802C92C8 2C3588 0680+00 2/1 1/1 0/0 .text startEtcSe__10Z2EnvSeMgrFSc */
bool Z2EnvSeMgr::startEtcSe(s8 param_1) {
f32 dVar17 = param_1 / 127.0f;
@@ -1796,16 +1285,11 @@ bool Z2EnvSeMgr::startEtcSe(s8 param_1) {
return rv;
}
/* 802C92C8-802C92EC 2C3C08 0024+00 0/0 0/0 1/1 .text registWolfSmellSePos__10Z2EnvSeMgrFP3Vec */
void Z2EnvSeMgr::registWolfSmellSePos(Vec* param_0) {
mWolfSmellSeMgr.registMultiSePos(param_0);
}
/* ############################################################################################## */
/* 80455E58-80455E5C 004458 0004+00 1/1 0/0 0/0 .sdata2 @4856 */
SECTION_SDATA2 static f32 lit_4856 = 340.0f;
/* 802C92EC-802C93A0 2C3C2C 00B4+00 0/0 0/0 1/1 .text startFogWipeTrigger__10Z2EnvSeMgrFP3Vec */
bool Z2EnvSeMgr::startFogWipeTrigger(Vec* param_0) {
if (*field_0x240.getHandle()) {
@@ -1817,13 +1301,11 @@ bool Z2EnvSeMgr::startFogWipeTrigger(Vec* param_0) {
}
}
/* 802C93A0-802C93E4 2C3CE0 0044+00 0/0 0/0 1/1 .text setFogWipeWidth__10Z2EnvSeMgrFf */
void Z2EnvSeMgr::setFogWipeWidth(f32 param_0) {
mFogDensity = Z2Calc::linearTransform(param_0, 0.0f, 1.0f, 1.0f, 0.4f, true);
}
/* 802C93E4-802C9400 2C3D24 001C+00 3/3 2/2 0/0 .text getFogDensity__10Z2EnvSeMgrFv */
f32 Z2EnvSeMgr::getFogDensity() {
if (field_0x214 == 0x10) {
@@ -1832,14 +1314,8 @@ f32 Z2EnvSeMgr::getFogDensity() {
return 0.0f;
}
/* ############################################################################################## */
/* 80455E5C-80455E60 00445C 0004+00 1/1 0/0 0/0 .sdata2 @4879 */
SECTION_SDATA2 static f32 lit_4879 = 20.0f;
/* 802C9400-802C950C 2C3D40 010C+00 0/0 0/0 1/1 .text startFogSe__10Z2EnvSeMgrFv */
// fmuls reg order
#ifdef NONMATCHING
// NONMATCHING fmuls reg order
bool Z2EnvSeMgr::startFogSe() {
f32 dVar10 = field_0x2e8.calcNoise1f();
f32 dVar14 = 0.332f + (0.668f * dVar10);
@@ -1859,44 +1335,6 @@ bool Z2EnvSeMgr::startFogSe() {
}
return uVar8;
}
#else
bool Z2EnvSeMgr::startFogSe() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 803CBB90-803CBBC8 -00001 0038+00 1/1 0/0 0/0 .data @5076 */
SECTION_DATA static void* lit_5076[14] = {
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x640),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x61C),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x668),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x6C4),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0xA34),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x640),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x640),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x780),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x7CC),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x640),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x844),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x8D8),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x950),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x99C),
};
/* 803CBBC8-803CBBF0 -00001 0028+00 1/1 0/0 0/0 .data @5074 */
SECTION_DATA static void* lit_5074[10] = {
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x50),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x1E8),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x380),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x5E4),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x5E4),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x11C),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x2B4),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x44C),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x5E4),
(void*)(((char*)initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc) + 0x518),
};
/* 802C950C-802C9F58 2C3E4C 0A4C+00 2/0 1/1 0/0 .text initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc */
void Z2EnvSeMgr::initLv3WaterSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
@@ -2131,7 +1569,6 @@ void Z2EnvSeMgr::initLv3WaterSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4)
}
}
/* 802C9F58-802CA794 2C4898 083C+00 2/0 1/1 0/0 .text registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec */
void Z2EnvSeMgr::registLv3WaterSePos(u8 param_1, Vec* param_2) {
switch (param_1) {
@@ -2337,4 +1774,4 @@ void Z2EnvSeMgr::startLv3WaterSe(s8 param_1) {
startRiverSe(param_1);
startFallSe(param_1);
startEtcSe(param_1);
}
}
src/Z2AudioLib/Z2SeMgr.cpp
+11 -217
View File
@@ -5,6 +5,7 @@
#include "Z2AudioLib/Z2SeMgr.h"
#include "Z2AudioLib/Z2Audience.h"
#include "Z2AudioLib/Z2Calc.h"
#include "Z2AudioLib/Z2SoundMgr.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "Z2AudioLib/Z2SpeechMgr2.h"
@@ -14,14 +15,6 @@
#include "dol2asm.h"
#include "global.h"
//
// Types:
//
struct Z2CreatureLink {
static u8 mLinkPtr[4 + 4 /* padding */];
};
//
// Forward References:
//
@@ -54,81 +47,6 @@ extern "C" void resetMultiSePos__12Z2MultiSeMgrFv();
extern "C" void getPanPower__12Z2MultiSeMgrFv();
extern "C" void getDolbyPower__12Z2MultiSeMgrFv();
//
// External References:
//
extern "C" void __dt__14JAISoundHandleFv();
extern "C" void __dt__12Z2MultiSeObjFv();
extern "C" void stop__16JAISeCategoryMgrFUl();
extern "C" void releaseSound__14JAISoundHandleFv();
extern "C" void stop__8JAISoundFUl();
extern "C" void getHandleSoundID__15JAISoundHandlesF10JAISoundID();
extern "C" void getFreeHandle__15JAISoundHandlesFv();
extern "C" void moveVolume__18JAISoundParamsMoveFfUl();
extern "C" void movePitch__18JAISoundParamsMoveFfUl();
extern "C" void moveFxMix__18JAISoundParamsMoveFfUl();
extern "C" void movePan__18JAISoundParamsMoveFfUl();
extern "C" void moveDolby__18JAISoundParamsMoveFfUl();
extern "C" void __ct__14JAISoundHandleFv();
extern "C" void linearTransform__6Z2CalcFfffffb();
extern "C" void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign();
extern "C" void stopSoundID__10Z2SoundMgrF10JAISoundID();
extern "C" void multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf();
extern "C" void setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc();
extern "C" void bgmStart__8Z2SeqMgrFUlUll();
extern "C" void menuIn__11Z2StatusMgrFv();
extern "C" void menuOut__11Z2StatusMgrFv();
extern "C" void isMovieDemo__11Z2StatusMgrFv();
extern "C" void calcOffMicSound__10Z2AudienceFf();
extern "C" void convertAbsToRel__10Z2AudienceFR3VecP3Veci();
extern "C" void calcRelPosVolume__10Z2AudienceFRC3Vecfi();
extern "C" void calcRelPosPan__10Z2AudienceFRC3Veci();
extern "C" void calcRelPosDolby__10Z2AudienceFRC3Veci();
extern "C" void playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc();
extern "C" void __dl__FPv();
extern "C" void __construct_array();
extern "C" void __cvt_fp2unsigned();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_29();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" f32 VOL_SE_SYSTEM_DEFAULT__7Z2Param;
extern "C" f32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param;
extern "C" f32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param;
extern "C" f32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param;
extern "C" f32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param;
extern "C" f32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param;
extern "C" f32 VOL_SE_OBJECT_DEFAULT__7Z2Param;
extern "C" f32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param;
extern "C" f32 VOL_SE_SYSTEM_TALKING__7Z2Param;
extern "C" f32 VOL_SE_LINK_VOICE_TALKING__7Z2Param;
extern "C" f32 VOL_SE_LINK_MOTION_TALKING__7Z2Param;
extern "C" f32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param;
extern "C" f32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param;
extern "C" f32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param;
extern "C" f32 VOL_SE_OBJECT_TALKING__7Z2Param;
extern "C" f32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param;
extern "C" f32 VOL_SE_SYSTEM_PAUSING__7Z2Param;
extern "C" f32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param;
extern "C" f32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param;
extern "C" f32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param;
extern "C" f32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param;
extern "C" f32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param;
extern "C" f32 VOL_SE_OBJECT_PAUSING__7Z2Param;
extern "C" f32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param;
extern "C" extern u8 data_80450B44[4];
extern "C" extern u8 data_80450B60[4];
extern "C" extern u8 data_80450B70[4];
extern "C" extern u8 data_80450B74[4];
extern "C" extern u8 data_80450B7C[4];
extern "C" extern u8 data_80450B80[4];
extern "C" extern u8 data_80450B84[4];
extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */];
extern "C" extern u8 __OSReport_disable;
//
// Declarations:
//
@@ -226,100 +144,9 @@ void Z2SeMgr::decrCrowdSize() {
mCrowdSize = 0;
}
/* ############################################################################################## */
/* 80455870-80455874 003E70 0004+00 1/1 0/0 0/0 .sdata2 @4038 */
SECTION_SDATA2 static f32 lit_4038 = 10000.0f;
/* 80455874-80455878 003E74 0004+00 2/2 0/0 0/0 .sdata2 @4039 */
SECTION_SDATA2 static f32 lit_4039 = 100.0f;
/* 80455878-8045587C 003E78 0004+00 11/11 0/0 0/0 .sdata2 @4040 */
SECTION_SDATA2 static u8 lit_4040[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 8045587C-80455880 003E7C 0004+00 2/2 0/0 0/0 .sdata2 @4041 */
SECTION_SDATA2 static f32 lit_4041 = 1.0f / 5.0f;
/* 80455880-80455884 003E80 0004+00 8/8 0/0 0/0 .sdata2 @4042 */
SECTION_SDATA2 static f32 lit_4042 = 1.0f;
/* 80455884-80455888 003E84 0004+00 3/3 0/0 0/0 .sdata2 @4043 */
SECTION_SDATA2 static f32 lit_4043 = 7.0f / 10.0f;
/* 80455888-8045588C 003E88 0004+00 1/1 0/0 0/0 .sdata2 @4044 */
SECTION_SDATA2 static f32 lit_4044 = 1.25f;
/* 8045588C-80455890 003E8C 0004+00 2/2 0/0 0/0 .sdata2 @4045 */
SECTION_SDATA2 static f32 lit_4045 = 2.0f / 5.0f;
/* 80455890-80455894 003E90 0004+00 1/1 0/0 0/0 .sdata2 @4046 */
SECTION_SDATA2 static f32 lit_4046 = 1.5f;
/* 80455894-80455898 003E94 0004+00 1/1 0/0 0/0 .sdata2 @4047 */
SECTION_SDATA2 static f32 lit_4047 = 35.0f;
/* 80455898-8045589C 003E98 0004+00 1/1 0/0 0/0 .sdata2 @4048 */
SECTION_SDATA2 static f32 lit_4048 = 261.0f;
/* 8045589C-804558A0 003E9C 0004+00 1/1 0/0 0/0 .sdata2 @4049 */
SECTION_SDATA2 static f32 lit_4049 = 1.0f / 20.0f;
/* 804558A0-804558A4 003EA0 0004+00 1/1 0/0 0/0 .sdata2 @4050 */
SECTION_SDATA2 static f32 lit_4050 = 7.0f / 5.0f;
/* 804558A4-804558A8 003EA4 0004+00 1/1 0/0 0/0 .sdata2 @4051 */
SECTION_SDATA2 static f32 lit_4051 = 47.0f;
/* 804558A8-804558AC 003EA8 0004+00 5/5 0/0 0/0 .sdata2 @4052 */
SECTION_SDATA2 static f32 lit_4052 = 0.5f;
/* 804558AC-804558B0 003EAC 0004+00 2/2 0/0 0/0 .sdata2 @4053 */
SECTION_SDATA2 static f32 lit_4053 = 9.0f / 10.0f;
/* 804558B0-804558B4 003EB0 0004+00 1/1 0/0 0/0 .sdata2 @4054 */
SECTION_SDATA2 static f32 lit_4054 = 41.0f;
/* 804558B4-804558B8 003EB4 0004+00 2/2 0/0 0/0 .sdata2 @4055 */
SECTION_SDATA2 static f32 lit_4055 = 3.0f / 10.0f;
/* 804558B8-804558BC 003EB8 0004+00 3/3 0/0 0/0 .sdata2 @4056 */
SECTION_SDATA2 static f32 lit_4056 = -1.0f;
/* 804558BC-804558C0 003EBC 0004+00 2/2 0/0 0/0 .sdata2 @4057 */
SECTION_SDATA2 static f32 lit_4057 = 400.0f;
/* 804558C0-804558C4 003EC0 0004+00 2/2 0/0 0/0 .sdata2 @4058 */
SECTION_SDATA2 static f32 lit_4058 = 4.0f / 5.0f;
/* 804558C4-804558C8 003EC4 0004+00 2/2 0/0 0/0 .sdata2 @4059 */
SECTION_SDATA2 static f32 lit_4059 = 11.0f / 10.0f;
/* 804558C8-804558CC 003EC8 0004+00 1/1 0/0 0/0 .sdata2 @4060 */
SECTION_SDATA2 static f32 lit_4060 = 15.0f;
/* 804558CC-804558D0 003ECC 0004+00 1/1 0/0 0/0 .sdata2 @4061 */
SECTION_SDATA2 static f32 lit_4061 = 60.0f;
/* 804558D0-804558D4 003ED0 0004+00 2/2 0/0 0/0 .sdata2 @4062 */
SECTION_SDATA2 static f32 lit_4062 = 127.0f;
/* 804558D4-804558D8 003ED4 0004+00 2/2 0/0 0/0 .sdata2 @4063 */
SECTION_SDATA2 static f32 lit_4063 = 6.0f / 5.0f;
/* 804558D8-804558E0 003ED8 0008+00 2/2 0/0 0/0 .sdata2 @4067 */
SECTION_SDATA2 static f64 lit_4067 = 4503599627370496.0 /* cast u32 to float */;
/* 804558E0-804558E8 003EE0 0008+00 2/2 0/0 0/0 .sdata2 @4070 */
SECTION_SDATA2 static f64 lit_4070 = 4503601774854144.0 /* cast s32 to float */;
/* 802AB984-802AC50C 2A62C4 0B88+00 1/1 196/196 549/549 .text
* seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc */
#ifdef NONMATCHING
// something is wrong with the switch, also isMovieDemo needs to not get inlined
// NONMATCHING something is wrong with the switch, also isMovieDemo needs to not get inlined
bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_reverb,
f32 i_pitch, f32 i_volume, f32 i_pan, f32 i_dolby, u8 param_8) {
if (i_soundID == 0xffffffff) {
@@ -541,12 +368,6 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_
param_2, i_reverb / 127.0f,
i_pitch, i_volume, i_pan, i_dolby, 0);
}
#else
bool Z2SeMgr::seStart(JAISoundID param_0, Vec const* param_1, u32 param_2, s8 param_3,
f32 param_4, f32 param_5, f32 param_6, f32 param_7, u8 param_8) {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 803C9D98-803C9DF8 -00001 0060+00 1/1 0/0 0/0 .data @4619 */
@@ -739,7 +560,6 @@ void Z2SeMgr::seMoveVolumeAll(f32 i_volume, u32 i_count) {
}
}
/* 802ADB14-802ADB50 2A8454 003C+00 0/0 1/1 0/0 .text messageSePlay__7Z2SeMgrFUsP3VecSc
*/
void Z2SeMgr::messageSePlay(u16 param_0, Vec* param_1, s8 param_2) {
@@ -768,7 +588,6 @@ void Z2SeMgr::talkInSe() {
}
}
/* 802ADC54-802ADD58 2A8594 0104+00 0/0 2/2 0/0 .text talkOutSe__7Z2SeMgrFv */
void Z2SeMgr::talkOutSe() {
if (Z2GetSceneMgr()->isInGame()) {
@@ -791,7 +610,6 @@ void Z2SeMgr::talkOutSe() {
}
}
/* 802ADD58-802ADE5C 2A8698 0104+00 0/0 1/1 0/0 .text menuInSe__7Z2SeMgrFv */
void Z2SeMgr::menuInSe() {
if (Z2GetSceneMgr()->isInGame()) {
@@ -814,17 +632,6 @@ void Z2SeMgr::menuInSe() {
}
}
/* ############################################################################################## */
/* 8039B9F0-8039B9FC 028050 000C+00 1/1 0/0 0/0 .rodata @5054 */
SECTION_RODATA static u8 const lit_5054[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x8039B9F0, &lit_5054);
/* 80455990-80455994 003F90 0004+00 1/1 0/0 0/0 .sdata2 @5085 */
SECTION_SDATA2 static f32 lit_5085 = 4.0f;
/* 802ADE5C-802ADFF4 2A879C 0198+00 1/1 0/0 0/0 .text setLevObjSE__7Z2SeMgrFUlP3VecSc */
void Z2SeMgr::setLevObjSE(u32 i_soundID, Vec* i_pos, s8 param_2) {
u8 i = 0;
@@ -868,17 +675,6 @@ void Z2SeMgr::setLevObjSE(u32 i_soundID, Vec* i_pos, s8 param_2) {
}
}
/* ############################################################################################## */
/* 8039B9FC-8039BA08 02805C 000C+00 1/1 0/0 0/0 .rodata @5100 */
SECTION_RODATA static u8 const lit_5100[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x8039B9FC, &lit_5100);
/* 80455994-80455998 003F94 0004+00 1/1 0/0 0/0 .sdata2 @5134 */
SECTION_SDATA2 static f32 lit_5134 = 3.0f;
/* 802ADFF4-802AE184 2A8934 0190+00 1/1 0/0 0/0 .text setMultiTriggerSE__7Z2SeMgrFUlP3VecSc */
void Z2SeMgr::setMultiTriggerSE(u32 i_soundID, Vec* i_pos, s8 param_2) {
u8 i = 0;
@@ -924,7 +720,6 @@ void Z2SeMgr::setMultiTriggerSE(u32 i_soundID, Vec* i_pos, s8 param_2) {
}
}
/* 802AE184-802AE524 2A8AC4 03A0+00 0/0 1/1 0/0 .text processSeFramework__7Z2SeMgrFv */
void Z2SeMgr::processSeFramework() {
if (Z2GetSceneMgr()->isSceneExist() && mCrowdSize != 0) {
@@ -943,9 +738,9 @@ void Z2SeMgr::processSeFramework() {
mLevelObjectSeCount = 0;
for (u8 i = 0; i < mMultiTriggerSeCount; i++) {
f32 volume = mMultiTriggerSe[i].getMaxVolume();
seStartLevel(mMultiTriggerSe[i].mSoundID, NULL, 0, mMultiTriggerSe[i].field_0x20, 1.0f,
volume, mMultiTriggerSe[i].getPanPower(),
mMultiTriggerSe[i].getDolbyPower(), 1);
seStart(mMultiTriggerSe[i].mSoundID, NULL, 0, mMultiTriggerSe[i].field_0x20, 1.0f,
volume, mMultiTriggerSe[i].getPanPower(),
mMultiTriggerSe[i].getDolbyPower(), 1);
}
for (u8 i = 0; i < 10; i++) {
mMultiTriggerSe[i].resetMultiSePos();
@@ -1217,12 +1012,11 @@ s8 Z2MultiSeMgr::registMultiSePos(Vec* i_pos) {
void Z2MultiSeMgr::resetMultiSePos(void) {
mPosCount = -1;
f32 _0 = FLOAT_LABEL(lit_4040);
mMaxPowL = _0;
mMaxPowR = _0;
mMaxPowF = _0;
mMaxPowB = _0;
mMaxVolume = _0;
mMaxPowL = 0.0f;
mMaxPowR = 0.0f;
mMaxPowF = 0.0f;
mMaxPowB = 0.0f;
mMaxVolume = 0.0f;
}
/* 802AECE0-802AEDC0 2A9620 00E0+00 1/1 8/8 0/0 .text getPanPower__12Z2MultiSeMgrFv */
@@ -1250,4 +1044,4 @@ f32 Z2MultiSeMgr::getDolbyPower() {
} else {
return 0.5f;
}
}
}
src/Z2AudioLib/Z2SeqMgr.cpp
+29 -768
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_b_ds.cpp
+3 -320
View File
@@ -76,323 +76,6 @@ enum daB_DS_head_Joint {
DS_HEAD_JNT_JAW,
};
//
// Forward References:
//
extern "C" void __ct__12daB_DS_HIO_cFv();
extern "C" void ctrlJoint__8daB_DS_cFP8J3DJointP8J3DModel();
extern "C" void JointCallBack__8daB_DS_cFP8J3DJointi();
extern "C" void draw__8daB_DS_cFv();
extern "C" static void daB_DS_Draw__FP8daB_DS_c();
extern "C" void setBck__8daB_DS_cFiUcff();
extern "C" void setActionMode__8daB_DS_cFii();
extern "C" void mSmokeSet__8daB_DS_cFv();
extern "C" void mHeadAngle_Clear__8daB_DS_cFv();
extern "C" void HandHitSoundSet__8daB_DS_cFb();
extern "C" void handSPosSet__8daB_DS_cFi();
extern "C" void hand_smokeSet__8daB_DS_cFUc();
extern "C" void mZsMoveChk__8daB_DS_cFv();
extern "C" void mZsMoveChk_Guard__8daB_DS_cFv();
extern "C" void mTrapScale__8daB_DS_cFv();
extern "C" void mClearTrap__8daB_DS_cFb();
extern "C" void mCreateTrap__8daB_DS_cFb();
extern "C" void mChangeVer2__8daB_DS_cFv();
extern "C" void damage_check__8daB_DS_cFv();
extern "C" void neck_set__8daB_DS_cFv();
extern "C" void mCutTypeCheck__8daB_DS_cFv();
extern "C" void startDemoCheck__8daB_DS_cFv();
extern "C" void setYoMessage__8daB_DS_cFi();
extern "C" void doYoMessage__8daB_DS_cFv();
extern "C" void executeOpeningDemo__8daB_DS_cFv();
extern "C" void setGlobalSRTMatrix__14JPABaseEmitterFPA4_Cf();
extern "C" static void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz();
extern "C" void abs__4cXyzCFv();
extern "C" void isStop__13mDoExt_morf_cFv();
extern "C" static void dComIfGp_particle_set__FUsPC4cXyzPC5csXyzPC4cXyz();
extern "C" void mHandBreathChk__8daB_DS_cFv();
extern "C" void executeWait__8daB_DS_cFv();
extern "C" void executeCircle__8daB_DS_cFv();
extern "C" void mBreakBoneSUB__8daB_DS_cFv();
extern "C" void damageSet__8daB_DS_cFv();
extern "C" void damageHitCamera__8daB_DS_cFv();
extern "C" void damageDownCheck__8daB_DS_cFv();
extern "C" void executeDamage__8daB_DS_cFv();
extern "C" void executeEtcDamage__8daB_DS_cFv();
extern "C" void breath_smokeSet__8daB_DS_cFv();
extern "C" void executeBreathAttack__8daB_DS_cFv();
extern "C" void executeHandAttack__8daB_DS_cFv();
extern "C" void executeBreathSearch__8daB_DS_cFv();
extern "C" void executeBattle2OpeningDemo__8daB_DS_cFv();
extern "C" void mFlyBMove__8daB_DS_cFf();
extern "C" void mFuwafuwaSet__8daB_DS_cFb();
extern "C" void mBattle2BreathFireSet__8daB_DS_cFUl();
extern "C" void mNeckAngleSet__8daB_DS_cFv();
extern "C" void mSetFirstPos__8daB_DS_cFv();
extern "C" void mChkScreenIn__8daB_DS_cFv();
extern "C" void mRailInOutCheck__8daB_DS_cFv();
extern "C" void executeBattle2Wait__8daB_DS_cFv();
extern "C" void mBattle2MoveFSet__8daB_DS_cFv();
extern "C" void executeBattle2FMove__8daB_DS_cFv();
extern "C" void executeBattle2Tired__8daB_DS_cFv();
extern "C" void executeBattle2Damage__8daB_DS_cFv();
extern "C" void mDeadMove__8daB_DS_cFv();
extern "C" void executeBattle2Dead__8daB_DS_cFv();
extern "C" void executeBullet__8daB_DS_cFv();
extern "C" void mBulletAction__8daB_DS_cFv();
extern "C" void mSoundSE_Set__8daB_DS_cFv();
extern "C" void action__8daB_DS_cFv();
extern "C" void mtx_set__8daB_DS_cFv();
extern "C" void cc_set__8daB_DS_cFv();
extern "C" void cc_etc_set__8daB_DS_cFv();
extern "C" void mBattle2Action__8daB_DS_cFv();
extern "C" void mBattle2_spinner_damage_check__8daB_DS_cFv();
extern "C" void mBattle2_damage_check__8daB_DS_cFv();
extern "C" void mBattle2_mtx_set__8daB_DS_cFv();
extern "C" void mBattle2_cc_etc_set__8daB_DS_cFv();
extern "C" void mBattle2_cc_set__8daB_DS_cFv();
extern "C" void execute__8daB_DS_cFv();
extern "C" static void daB_DS_Execute__FP8daB_DS_c();
extern "C" static bool daB_DS_IsDelete__FP8daB_DS_c();
extern "C" void _delete__8daB_DS_cFv();
extern "C" static void daB_DS_Delete__FP8daB_DS_c();
extern "C" void CreateHeap__8daB_DS_cFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" static void useHeapInit__FP10fopAc_ac_c();
extern "C" void create__8daB_DS_cFv();
extern "C" void __ct__8daB_DS_cFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __ct__8dCcD_SphFv();
extern "C" void __dt__8dCcD_SphFv();
extern "C" void __dt__8cM3dGSphFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __ct__4cXyzFv();
extern "C" static void daB_DS_Create__FP8daB_DS_c();
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void __dt__12daB_DS_HIO_cFv();
extern "C" void func_805DC8E4(void* _this, int*);
extern "C" void func_805DC900(void* _this, u8*);
extern "C" void __sinit_d_a_b_ds_cpp();
extern "C" static void func_805DC958();
extern "C" static void func_805DC960();
extern "C" void __dt__4cXyzFv();
extern "C" void changeDemoPos0__9daPy_py_cFPC4cXyz();
extern "C" void __as__4cXyzFRC4cXyz();
extern "C" void changeDemoMode__9daPy_py_cFUliis();
extern "C" void set__4cXyzFRC3Vec();
extern "C" void __ct__4cXyzFRC4cXyz();
extern "C" void zero__4cXyzFv();
extern "C" extern char const* const d_a_b_ds__stringBase0;
extern void* __vt__12dBgS_AcchCir[3];
extern void* __vt__10cCcD_GStts[3];
extern void* __vt__10dCcD_GStts[3];
extern void* __vt__8cM3dGCyl[3];
extern void* __vt__8cM3dGSph[3];
extern void* __vt__8cM3dGAab[3];
extern void* __vt__12dBgS_ObjAcch[9];
extern void* __vt__12J3DFrameCtrl[3];
extern void* __vt__12daB_DS_HIO_c[3];
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void transM__14mDoMtx_stack_cFfff();
extern "C" void scaleM__14mDoMtx_stack_cFfff();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void play__14mDoExt_baseAnmFv();
extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss();
extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef();
extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss();
extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void
__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl();
extern "C" void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff();
extern "C" void play__16mDoExt_McaMorfSOFUlSc();
extern "C" void updateDL__16mDoExt_McaMorfSOFv();
extern "C" void entryDL__16mDoExt_McaMorfSOFv();
extern "C" void modelCalc__16mDoExt_McaMorfSOFv();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_SearchByID__FUiPP10fopAc_ac_c();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc();
extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff();
extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff();
extern "C" void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz();
extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz();
extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c();
extern "C" void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c();
extern "C" void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs();
extern "C" void fopAcM_createItemForBoss__FPC4cXyziiPC5csXyzPC4cXyzffi();
extern "C" void fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc();
extern "C" void fopMsgM_SearchByID__FUi();
extern "C" void fopMsgM_messageSet__FUlUl();
extern "C" void fopMsgM_messageSetDemo__FUl();
extern "C" void dStage_changeScene__FifUlScsi();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void dComIfGs_onStageBossEnemy__Fi();
extern "C" void dComIfGs_onZoneSwitch__Fii();
extern "C" void dComIfGs_offZoneSwitch__Fii();
extern "C" void dComIfGs_isZoneSwitch__Fii();
extern "C" void dComIfGs_onOneZoneSwitch__Fii();
extern "C" void
dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj();
extern "C" void isDungeonItem__12dSv_memBit_cCFi();
extern "C" void onEventBit__11dSv_event_cFUs();
extern "C" void setRoom__13dSv_restart_cFRC4cXyzsSc();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void offSwitch__10dSv_info_cFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void reset__14dEvt_control_cFv();
extern "C" void dEv_noFinishSkipProc__FPvi();
extern "C" void setSkipProc__14dEvt_control_cFPvPFPvi_ii();
extern "C" void getEmitter__Q213dPa_control_c7level_cFUl();
extern "C" void setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void
set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void StartShock__12dVibration_cFii4cXyz();
extern "C" void StartQuake__12dVibration_cFii4cXyz();
extern "C" void StopQuake__12dVibration_cFi();
extern "C" void LineCross__4cBgSFP11cBgS_LinChk();
extern "C" void GroundCross__4cBgSFP11cBgS_GndChk();
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void SetWall__12dBgS_AcchCirFff();
extern "C" void __dt__9dBgS_AcchFv();
extern "C" void __ct__9dBgS_AcchFv();
extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz();
extern "C" void CrrPos__9dBgS_AcchFR4dBgS();
extern "C" void SetGroundUpY__9dBgS_AcchFf();
extern "C" void __ct__11dBgS_GndChkFv();
extern "C" void __dt__11dBgS_GndChkFv();
extern "C" void __ct__11dBgS_LinChkFv();
extern "C" void __dt__11dBgS_LinChkFv();
extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Move__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void __dt__12dCcD_GObjInfFv();
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
extern "C" void GetTgHitObj__12dCcD_GObjInfFv();
extern "C" void getHitSeID__12dCcD_GObjInfFUci();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
extern "C" void def_se_set__FP10Z2CreatureP8cCcD_ObjUlP10fopAc_ac_c();
extern "C" void cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo();
extern "C" void Start__9dCamera_cFv();
extern "C" void Stop__9dCamera_cFv();
extern "C" void SetTrimSize__9dCamera_cFl();
extern "C" void Set__9dCamera_cF4cXyz4cXyz();
extern "C" void Set__9dCamera_cF4cXyz4cXyzfs();
extern "C" void Reset__9dCamera_cF4cXyz4cXyz();
extern "C" void StartBlure__9dCamera_cFiP10fopAc_ac_cff();
extern "C" void dCam_getBody__Fv();
extern "C" void Eye__9dCamera_cFv();
extern "C" void Center__9dCamera_cFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void dKy_change_colpat__FUc();
extern "C" void dKy_custom_colset__FUcUcf();
extern "C" void __ct__10dMsgFlow_cFv();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void atan2sX_Z__4cXyzCFv();
extern "C" void atan2sY_XZ__4cXyzCFv();
extern "C" void cM_rndF__Ff();
extern "C" void cM_rndFX__Ff();
extern "C" void SetPos__11cBgS_GndChkFPC4cXyz();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void __dt__8cM3dGCirFv();
extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void SetH__8cM3dGCylFf();
extern "C" void SetR__8cM3dGCylFf();
extern "C" void SetC__8cM3dGSphFRC4cXyz();
extern "C" void SetR__8cM3dGSphFf();
extern "C" void cLib_addCalc__FPfffff();
extern "C" void cLib_addCalc2__FPffff();
extern "C" void cLib_addCalc0__FPfff();
extern "C" void cLib_addCalcPos__FP4cXyzRC4cXyzfff();
extern "C" void cLib_addCalcAngleS2__FPssss();
extern "C" void MtxPosition__FP4cXyzP4cXyz();
extern "C" void func_80280808();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void bgmStart__8Z2SeqMgrFUlUll();
extern "C" void bgmStop__8Z2SeqMgrFUll();
extern "C" void subBgmStart__8Z2SeqMgrFUl();
extern "C" void subBgmStop__8Z2SeqMgrFv();
extern "C" void bgmStreamPrepare__8Z2SeqMgrFUl();
extern "C" void bgmStreamPlay__8Z2SeqMgrFv();
extern "C" void bgmStreamStop__8Z2SeqMgrFUl();
extern "C" void changeBgmStatus__8Z2SeqMgrFl();
extern "C" void setDemoName__11Z2StatusMgrFPc();
extern "C" void __ct__15Z2CreatureEnemyFv();
extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void init__12J3DFrameCtrlFs();
extern "C" void checkPass__12J3DFrameCtrlFf();
extern "C" void __construct_array();
extern "C" void _savegpr_19();
extern "C" void _savegpr_20();
extern "C" void _savegpr_21();
extern "C" void _savegpr_22();
extern "C" void _savegpr_23();
extern "C" void _savegpr_24();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_19();
extern "C" void _restgpr_20();
extern "C" void _restgpr_21();
extern "C" void _restgpr_22();
extern "C" void _restgpr_23();
extern "C" void _restgpr_24();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u8 struct_80450C98[4];
extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
//
// Declarations:
//
/* 805DD248-805DD254 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6245,8 +5928,8 @@ cPhs__Step daB_DS_c::create() {
daB_DS_c::daB_DS_c() {}
/* 805DC834-805DC854 0116F4 0020+00 1/0 0/0 0/0 .text daB_DS_Create__FP8daB_DS_c */
static void daB_DS_Create(daB_DS_c* param_0) {
// NONMATCHING
static cPhs__Step daB_DS_Create(daB_DS_c* i_this) {
return i_this->create();
}
#pragma nosyminline on
@@ -6446,4 +6129,4 @@ extern actor_process_profile_definition g_profile_B_DS = {
0x4040000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_door_mbossL1.cpp
+87 -986
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_e_bee.cpp
+34 -676
View File
@@ -8,204 +8,8 @@
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "dol2asm.h"
#include "SSystem/SComponent/c_math.h"
//
// Forward References:
//
extern "C" void __ct__13daE_Bee_HIO_cFv();
extern "C" static void daE_Bee_Draw__FP11e_bee_class();
extern "C" static void bee_mtxset__FP5bee_s();
extern "C" static void bee_ground_ang_set__FP5bee_s();
extern "C" void __dt__4cXyzFv();
extern "C" static void bee_fly_action__FP11e_bee_classP5bee_s();
extern "C" static void bee_nest_action__FP11e_bee_classP5bee_sSc();
extern "C" static void bee_fail__FP5bee_s();
extern "C" static void bee_start__FP11e_bee_classP5bee_s();
extern "C" static void bee_control__FP11e_bee_class();
extern "C" static void daE_Bee_Execute__FP11e_bee_class();
extern "C" static bool daE_Bee_IsDelete__FP11e_bee_class();
extern "C" static void daE_Bee_Delete__FP11e_bee_class();
extern "C" static void useHeapInit__FP10fopAc_ac_c();
extern "C" static void daE_Bee_Create__FP10fopAc_ac_c();
extern "C" void __dt__8cM3dGSphFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__5bee_sFv();
extern "C" void __ct__5bee_sFv();
extern "C" void __dt__13daE_Bee_HIO_cFv();
extern "C" void __sinit_d_a_e_bee_cpp();
extern "C" extern char const* const d_a_e_bee__stringBase0;
extern void* __vt__8cM3dGSph[3];
extern void* __vt__8cM3dGCyl[3];
extern void* __vt__8cM3dGAab[3];
extern void* __vt__13daE_Bee_HIO_c[3];
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void mDoMtx_ZrotM__FPA4_fs();
extern "C" void transM__14mDoMtx_stack_cFfff();
extern "C" void scaleM__14mDoMtx_stack_cFfff();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fpcSch_JudgeByID__FPvPv();
extern "C" void addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc();
extern "C" void removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai();
extern "C" void entrySimpleModel__14dComIfG_play_cFP8J3DModeli();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl();
extern "C" void StartShock__12dVibration_cFii4cXyz();
extern "C" void LineCross__4cBgSFP11cBgS_LinChk();
extern "C" void GroundCross__4cBgSFP11cBgS_GndChk();
extern "C" void __ct__11dBgS_GndChkFv();
extern "C" void __dt__11dBgS_GndChkFv();
extern "C" void __ct__11dBgS_LinChkFv();
extern "C" void __dt__11dBgS_LinChkFv();
extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void ChkAtHit__12dCcD_GObjInfFv();
extern "C" void GetAtHitObj__12dCcD_GObjInfFv();
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
extern "C" void GetTgHitObj__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
extern "C" void cc_pl_cut_bit_get__Fv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void GetAc__8cCcD_ObjFv();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void cM_atan2s__Fff();
extern "C" void cM_rndF__Ff();
extern "C" void cM_rndFX__Ff();
extern "C" void SetPos__11cBgS_GndChkFPC4cXyz();
extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void SetH__8cM3dGCylFf();
extern "C" void SetR__8cM3dGCylFf();
extern "C" void SetC__8cM3dGSphFRC4cXyz();
extern "C" void cLib_addCalc2__FPffff();
extern "C" void cLib_addCalc0__FPfff();
extern "C" void cLib_addCalcAngleS2__FPssss();
extern "C" void MtxScale__FfffUc();
extern "C" void MtxPosition__FP4cXyzP4cXyz();
extern "C" void __dt__14Z2SoundObjBaseFv();
extern "C" void deleteObject__14Z2SoundObjBaseFv();
extern "C" void __ct__16Z2SoundObjSimpleFv();
extern "C" void __ct__18Z2SoundObjBeeGroupFv();
extern "C" void playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc();
extern "C" void __dl__FPv();
extern "C" void __construct_array();
extern "C" void _savegpr_19();
extern "C" void _savegpr_23();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _restgpr_19();
extern "C" void _restgpr_23();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern void* __vt__16Z2SoundObjSimple[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" void __register_global_object();
//
// Declarations:
//
/* ############################################################################################## */
/* 80685434-80685438 000000 0004+00 8/8 0/0 0/0 .rodata @3770 */
SECTION_RODATA static f32 const lit_3770 = 1.0f;
COMPILER_STRIP_GATE(0x80685434, &lit_3770);
/* 8068552C-80685570 000000 0044+00 1/1 0/0 0/0 .data cc_cyl_src$4798 */
static dCcD_SrcCyl cc_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x410022, 0x23}, 0x0}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
30.0f, // mRadius
130.0f // mHeight
} // mCyl
};
/* 80685570-806855B0 000044 0040+00 1/1 0/0 0/0 .data at_sph_src$4799 */
static dCcD_SrcSph at_sph_src = {
{
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0x0, 0x0}, 0x0}}, // mObj
{dCcD_SE_NONE, 0x0, 0xc, 0x0, 0x1}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{{0.0f, 0.0f, 0.0f}, 30.0f} // mSph
} // mSphAttr
};
/* 8068286C-8068289C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__13daE_Bee_HIO_cFv */
daE_Bee_HIO_c::daE_Bee_HIO_c() {
field_0x4 = -1;
mScale = 1.0f;
mDelete = false;
mNoKill = false;
}
/* 8068289C-806829A8 00011C 010C+00 1/0 0/0 0/0 .text daE_Bee_Draw__FP11e_bee_class */
static int daE_Bee_Draw(e_bee_class* i_this) {
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
bee_s* bee = i_this->mBees;
int room_no = fopAcM_GetRoomNo(i_this);
for (int i = 0; i < i_this->mNumBees; i++, bee++) {
if (bee->mAction != bee_s::ACT_DEAD && !bee->mNoDraw) {
if (bee->mIsFlying == 0) {
if ((bee->mCounter & 4) != 0) {
dComIfGp_entrySimpleModel(bee->mpModel3, room_no);
} else {
dComIfGp_entrySimpleModel(bee->mpModel4, room_no);
}
} else {
if ((bee->mCounter & 1) != 0) {
dComIfGp_entrySimpleModel(bee->mpModel1, room_no);
} else {
dComIfGp_entrySimpleModel(bee->mpModel2, room_no);
}
}
}
}
return 1;
}
/* ############################################################################################## */
/* 80685638-8068563C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */
static u8 lit_1109[1 + 3 /* padding */];
@@ -302,6 +106,39 @@ static bool hioInit;
/* 80685684-80685694 000054 0010+00 6/6 0/0 0/0 .bss l_HIO */
static daE_Bee_HIO_c l_HIO;
/* 8068286C-8068289C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__13daE_Bee_HIO_cFv */
daE_Bee_HIO_c::daE_Bee_HIO_c() {
field_0x4 = -1;
mScale = 1.0f;
mDelete = false;
mNoKill = false;
}
/* 8068289C-806829A8 00011C 010C+00 1/0 0/0 0/0 .text daE_Bee_Draw__FP11e_bee_class */
static int daE_Bee_Draw(e_bee_class* i_this) {
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
bee_s* bee = i_this->mBees;
int room_no = fopAcM_GetRoomNo(i_this);
for (int i = 0; i < i_this->mNumBees; i++, bee++) {
if (bee->mAction != bee_s::ACT_DEAD && !bee->mNoDraw) {
if (bee->mIsFlying == 0) {
if ((bee->mCounter & 4) != 0) {
dComIfGp_entrySimpleModel(bee->mpModel3, room_no);
} else {
dComIfGp_entrySimpleModel(bee->mpModel4, room_no);
}
} else {
if ((bee->mCounter & 1) != 0) {
dComIfGp_entrySimpleModel(bee->mpModel1, room_no);
} else {
dComIfGp_entrySimpleModel(bee->mpModel2, room_no);
}
}
}
}
return 1;
}
/* 806829A8-80682A70 000228 00C8+00 3/3 0/0 0/0 .text bee_mtxset__FP5bee_s */
static void bee_mtxset(bee_s* i_bee) {
mDoMtx_stack_c::transS(i_bee->mPos.x, i_bee->mPos.y, i_bee->mPos.z);
@@ -317,48 +154,6 @@ static void bee_mtxset(bee_s* i_bee) {
}
}
/* ############################################################################################## */
/* 80685438-8068543C 000004 0004+00 0/4 0/0 0/0 .rodata @3929 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3929 = 30.0f;
COMPILER_STRIP_GATE(0x80685438, &lit_3929);
#pragma pop
/* 8068543C-80685440 000008 0004+00 0/4 0/0 0/0 .rodata @3930 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3930 = 5.0f;
COMPILER_STRIP_GATE(0x8068543C, &lit_3930);
#pragma pop
/* 80685440-80685444 00000C 0004+00 0/1 0/0 0/0 .rodata @3931 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3931 = -30.0f;
COMPILER_STRIP_GATE(0x80685440, &lit_3931);
#pragma pop
/* 80685444-80685448 000010 0004+00 0/6 0/0 0/0 .rodata @3932 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3932[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80685444, &lit_3932);
#pragma pop
/* 80685448-8068544C 000014 0004+00 0/1 0/0 0/0 .rodata @3933 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3933 = -10.0f;
COMPILER_STRIP_GATE(0x80685448, &lit_3933);
#pragma pop
/* 80682A70-80682D78 0002F0 0308+00 1/1 0/0 0/0 .text bee_ground_ang_set__FP5bee_s */
static void bee_ground_ang_set(bee_s* i_bee) {
dBgS_LinChk lin_chk;
@@ -404,146 +199,6 @@ static void bee_ground_ang_set(bee_s* i_bee) {
}
}
/* 80682D78-80682DB4 0005F8 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
// cXyz::~cXyz() {
extern "C" void __dt__4cXyzFv() {
// NONMATCHING
}
/* ############################################################################################## */
/* 8068544C-80685450 000018 0004+00 0/4 0/0 0/0 .rodata @4190 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4190 = 15.0f;
COMPILER_STRIP_GATE(0x8068544C, &lit_4190);
#pragma pop
/* 80685450-80685454 00001C 0004+00 0/4 0/0 0/0 .rodata @4191 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4191 = 100.0f;
COMPILER_STRIP_GATE(0x80685450, &lit_4191);
#pragma pop
/* 80685454-80685458 000020 0004+00 0/2 0/0 0/0 .rodata @4192 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4192 = 50.0f;
COMPILER_STRIP_GATE(0x80685454, &lit_4192);
#pragma pop
/* 80685458-8068545C 000024 0004+00 0/2 0/0 0/0 .rodata @4193 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4193 = 17.0f;
COMPILER_STRIP_GATE(0x80685458, &lit_4193);
#pragma pop
/* 8068545C-80685460 000028 0004+00 0/1 0/0 0/0 .rodata @4194 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4194 = 125.0f;
COMPILER_STRIP_GATE(0x8068545C, &lit_4194);
#pragma pop
/* 80685460-80685464 00002C 0004+00 0/2 0/0 0/0 .rodata @4195 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4195 = 150.0f;
COMPILER_STRIP_GATE(0x80685460, &lit_4195);
#pragma pop
/* 80685464-8068546C 000030 0008+00 0/3 0/0 0/0 .rodata @4196 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4196[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80685464, &lit_4196);
#pragma pop
/* 8068546C-80685474 000038 0008+00 0/3 0/0 0/0 .rodata @4197 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4197[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x8068546C, &lit_4197);
#pragma pop
/* 80685474-8068547C 000040 0008+00 0/3 0/0 0/0 .rodata @4198 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4198[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80685474, &lit_4198);
#pragma pop
/* 8068547C-80685480 000048 0004+00 0/1 0/0 0/0 .rodata @4199 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4199 = 40.0f;
COMPILER_STRIP_GATE(0x8068547C, &lit_4199);
#pragma pop
/* 80685480-80685484 00004C 0004+00 0/2 0/0 0/0 .rodata @4200 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4200 = 300.0f;
COMPILER_STRIP_GATE(0x80685480, &lit_4200);
#pragma pop
/* 80685484-80685488 000050 0004+00 0/1 0/0 0/0 .rodata @4201 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4201 = 10000.0f;
COMPILER_STRIP_GATE(0x80685484, &lit_4201);
#pragma pop
/* 80685488-8068548C 000054 0004+00 0/2 0/0 0/0 .rodata @4202 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4202 = 55.0f;
COMPILER_STRIP_GATE(0x80685488, &lit_4202);
#pragma pop
/* 8068548C-80685490 000058 0004+00 0/1 0/0 0/0 .rodata @4203 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4203 = 500.0f;
COMPILER_STRIP_GATE(0x8068548C, &lit_4203);
#pragma pop
/* 80685490-80685494 00005C 0004+00 0/1 0/0 0/0 .rodata @4204 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4204 = 0.5f;
COMPILER_STRIP_GATE(0x80685490, &lit_4204);
#pragma pop
/* 80685494-80685498 000060 0004+00 0/1 0/0 0/0 .rodata @4205 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4205 = 2000.0f;
COMPILER_STRIP_GATE(0x80685494, &lit_4205);
#pragma pop
/* 80685498-8068549C 000064 0004+00 0/1 0/0 0/0 .rodata @4206 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4206 = 1500.0f;
COMPILER_STRIP_GATE(0x80685498, &lit_4206);
#pragma pop
/* 8068549C-806854A0 000068 0004+00 0/3 0/0 0/0 .rodata @4207 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4207 = 200.0f;
COMPILER_STRIP_GATE(0x8068549C, &lit_4207);
#pragma pop
/* 80685694-80685698 000064 0004+00 1/2 0/0 0/0 .bss None */
static u8 ccCylSet;
@@ -675,78 +330,6 @@ static int bee_fly_action(e_bee_class* i_this, bee_s* i_bee) {
return ret;
}
/* ############################################################################################## */
/* 806854A0-806854A4 00006C 0004+00 0/1 0/0 0/0 .rodata @4353 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4353 = 1.0f / 50.0f;
COMPILER_STRIP_GATE(0x806854A0, &lit_4353);
#pragma pop
/* 806854A4-806854A8 000070 0004+00 0/2 0/0 0/0 .rodata @4354 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4354 = 10.0f;
COMPILER_STRIP_GATE(0x806854A4, &lit_4354);
#pragma pop
/* 806854A8-806854AC 000074 0004+00 0/1 0/0 0/0 .rodata @4355 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4355 = 2.0f;
COMPILER_STRIP_GATE(0x806854A8, &lit_4355);
#pragma pop
/* 806854AC-806854B0 000078 0004+00 0/3 0/0 0/0 .rodata @4356 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4356 = 1.0f / 10.0f;
COMPILER_STRIP_GATE(0x806854AC, &lit_4356);
#pragma pop
/* 806854B0-806854B4 00007C 0004+00 0/1 0/0 0/0 .rodata @4357 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4357 = 32768.0f;
COMPILER_STRIP_GATE(0x806854B0, &lit_4357);
#pragma pop
/* 806854B4-806854B8 000080 0004+00 0/1 0/0 0/0 .rodata @4358 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4358 = -51.0f;
COMPILER_STRIP_GATE(0x806854B4, &lit_4358);
#pragma pop
/* 806854B8-806854BC 000084 0004+00 0/1 0/0 0/0 .rodata @4359 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4359 = 6.0f / 5.0f;
COMPILER_STRIP_GATE(0x806854B8, &lit_4359);
#pragma pop
/* 806854BC-806854C0 000088 0004+00 0/1 0/0 0/0 .rodata @4360 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4360 = 400.0f;
COMPILER_STRIP_GATE(0x806854BC, &lit_4360);
#pragma pop
/* 806854C0-806854C4 00008C 0004+00 0/2 0/0 0/0 .rodata @4361 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4361 = 20.0f;
COMPILER_STRIP_GATE(0x806854C0, &lit_4361);
#pragma pop
/* 806854C4-806854C8 000090 0004+00 0/3 0/0 0/0 .rodata @4362 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4362 = 65536.0f;
COMPILER_STRIP_GATE(0x806854C4, &lit_4362);
#pragma pop
/* 806835FC-80683DDC 000E7C 07E0+00 1/1 0/0 0/0 .text bee_nest_action__FP11e_bee_classP5bee_sSc */
static void bee_nest_action(e_bee_class* i_this, bee_s* i_bee, s8 i_nestHealth) {
i_bee->mIsFlying = 0;
@@ -877,43 +460,6 @@ static void bee_nest_action(e_bee_class* i_this, bee_s* i_bee, s8 i_nestHealth)
}
}
/* ############################################################################################## */
/* 806854C8-806854CC 000094 0004+00 0/1 0/0 0/0 .rodata @4395 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4395 = 3.0f;
COMPILER_STRIP_GATE(0x806854C8, &lit_4395);
#pragma pop
/* 806854CC-806854D0 000098 0004+00 0/1 0/0 0/0 .rodata @4396 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4396 = 1000.0f;
COMPILER_STRIP_GATE(0x806854CC, &lit_4396);
#pragma pop
/* 806854D0-806854D4 00009C 0004+00 0/1 0/0 0/0 .rodata @4397 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4397 = 1.0f / 5.0f;
COMPILER_STRIP_GATE(0x806854D0, &lit_4397);
#pragma pop
/* 806854D4-806854D8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4398 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4398 = 3.0f / 10.0f;
COMPILER_STRIP_GATE(0x806854D4, &lit_4398);
#pragma pop
/* 806854D8-806854DC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4399 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4399 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x806854D8, &lit_4399);
#pragma pop
/* 80683DDC-80683FF4 00165C 0218+00 1/1 0/0 0/0 .text bee_fail__FP5bee_s */
static void bee_fail(bee_s* i_bee) {
if (i_bee->mMode <= 1) {
@@ -955,15 +501,6 @@ static void bee_fail(bee_s* i_bee) {
bee_mtxset(i_bee);
}
/* ############################################################################################## */
/* 806854DC-806854E0 0000A8 0004+00 0/1 0/0 0/0 .rodata @4448 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4448 = 4000.0f;
COMPILER_STRIP_GATE(0x806854DC, &lit_4448);
#pragma pop
/* 80683FF4-80684248 001874 0254+00 1/1 0/0 0/0 .text bee_start__FP11e_bee_classP5bee_s
*/
static void bee_start(e_bee_class* i_this, bee_s* i_bee) {
@@ -1003,65 +540,8 @@ static void bee_start(e_bee_class* i_this, bee_s* i_bee) {
bee_mtxset(i_bee);
}
/* ############################################################################################## */
/* 806854E0-806854E4 0000AC 0004+00 0/1 0/0 0/0 .rodata @4676 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4676 = -20000.0f;
COMPILER_STRIP_GATE(0x806854E0, &lit_4676);
#pragma pop
/* 806854E4-806854E8 0000B0 0004+00 0/1 0/0 0/0 .rodata @4677 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4677 = 30000.0f;
COMPILER_STRIP_GATE(0x806854E4, &lit_4677);
#pragma pop
/* 806854E8-806854EC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4678 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4678 = -15000.0f;
COMPILER_STRIP_GATE(0x806854E8, &lit_4678);
#pragma pop
/* 806854EC-806854F0 0000B8 0004+00 0/1 0/0 0/0 .rodata @4679 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4679 = 120.0f;
COMPILER_STRIP_GATE(0x806854EC, &lit_4679);
#pragma pop
/* 806854F0-806854F4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4680 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4680 = 2500.0f;
COMPILER_STRIP_GATE(0x806854F0, &lit_4680);
#pragma pop
/* 806854F4-806854F8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4681 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4681 = 7.0f / 20.0f;
COMPILER_STRIP_GATE(0x806854F4, &lit_4681);
#pragma pop
/* 80685698-806856A8 000068 000C+04 0/1 0/0 0/0 .bss @4455 */
#pragma push
#pragma force_active on
static u8 lit_4455[12 + 4 /* padding */];
#pragma pop
/* 806856A8-806856B4 000078 000C+00 0/1 0/0 0/0 .bss non$4454 */
#pragma push
#pragma force_active on
static u8 non[12];
#pragma pop
/* 80684248-80684A94 001AC8 084C+00 1/1 0/0 0/0 .text bee_control__FP11e_bee_class */
#ifdef NONMATCHING
// regalloc
// NONMATCHING regalloc
static void bee_control(e_bee_class* i_this) {
s8 nest_health = 0;
@@ -1226,11 +706,6 @@ static void bee_control(e_bee_class* i_this) {
}
}
}
#else
static void bee_control(e_bee_class* param_0) {
// NONMATCHING
}
#endif
/* 80684A94-80684B5C 002314 00C8+00 2/1 0/0 0/0 .text daE_Bee_Execute__FP11e_bee_class */
static int daE_Bee_Execute(e_bee_class* i_this) {
@@ -1269,19 +744,6 @@ static int daE_Bee_IsDelete(e_bee_class* param_0) {
return 1;
}
/* ############################################################################################## */
/* 806854F8-80685508 0000C4 0010+00 1/1 0/0 0/0 .rodata l_bmdidx$4715 */
SECTION_RODATA static u8 const l_bmdidx_4715[16] = {
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06,
};
COMPILER_STRIP_GATE(0x806854F8, &l_bmdidx_4715);
/* 80685524-80685524 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80685524 = "E_bee";
#pragma pop
/* 80684B64-80684C70 0023E4 010C+00 1/0 0/0 0/0 .text daE_Bee_Delete__FP11e_bee_class */
static int daE_Bee_Delete(e_bee_class* i_this) {
static const u32 l_bmdidx[4] = {3, 4, 5, 6};
@@ -1309,7 +771,6 @@ static int daE_Bee_Delete(e_bee_class* i_this) {
return 1;
}
/* 80684C70-80684E24 0024F0 01B4+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static int useHeapInit(fopAc_ac_c* i_this) {
e_bee_class* _this = static_cast<e_bee_class*>(i_this);
@@ -1344,33 +805,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return true;
}
/* ############################################################################################## */
/* 80685508-80685518 0000D4 0010+00 0/1 0/0 0/0 .rodata l_bmdidx$4800 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const l_bmdidx_4800[16] = {
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06,
};
COMPILER_STRIP_GATE(0x80685508, &l_bmdidx_4800);
#pragma pop
/* 80685518-8068551C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4910 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4910 = -80.0f;
COMPILER_STRIP_GATE(0x80685518, &lit_4910);
#pragma pop
/* 8068551C-80685524 0000E8 0008+00 0/1 0/0 0/0 .rodata @4912 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4912[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x8068551C, &lit_4912);
#pragma pop
/* 80684E24-80685224 0026A4 0400+00 1/0 0/0 0/0 .text daE_Bee_Create__FP10fopAc_ac_c */
static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) {
e_bee_class* _this = static_cast<e_bee_class*>(i_this);
@@ -1461,54 +895,6 @@ static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) {
return step;
}
/* 80685224-8068526C 002AA4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
// cM3dGSph::~cM3dGSph() {
extern "C" void __dt__8cM3dGSphFv() {
// NONMATCHING
}
/* 8068526C-806852B4 002AEC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
// cM3dGCyl::~cM3dGCyl() {
extern "C" void __dt__8cM3dGCylFv() {
// NONMATCHING
}
/* 806852B4-806852FC 002B34 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 806852FC-80685368 002B7C 006C+00 1/1 0/0 0/0 .text __dt__5bee_sFv */
// bee_s::~bee_s() {
extern "C" void __dt__5bee_sFv() {
// NONMATCHING
}
/* 80685368-8068539C 002BE8 0034+00 1/1 0/0 0/0 .text __ct__5bee_sFv */
// bee_s::bee_s() {
extern "C" void __ct__5bee_sFv() {
// NONMATCHING
}
/* 8068539C-806853E4 002C1C 0048+00 2/1 0/0 0/0 .text __dt__13daE_Bee_HIO_cFv */
// daE_Bee_HIO_c::~daE_Bee_HIO_c() {
extern "C" void __dt__13daE_Bee_HIO_cFv() {
// NONMATCHING
}
/* 806853E4-80685420 002C64 003C+00 0/0 1/0 0/0 .text __sinit_d_a_e_bee_cpp */
void __sinit_d_a_e_bee_cpp() {
// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x806853E4, __sinit_d_a_e_bee_cpp);
#pragma pop
/* ############################################################################################## */
/* 806856B4-806856B8 000084 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
@@ -1708,31 +1094,3 @@ extern actor_process_profile_definition g_profile_E_BEE = {
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
/* 80685600-8068560C 0000D4 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */
SECTION_DATA extern void* __vt__8cM3dGSph[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGSphFv,
};
/* 8068560C-80685618 0000E0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */
SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGCylFv,
};
/* 80685618-80685624 0000EC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 80685624-80685630 0000F8 000C+00 2/2 0/0 0/0 .data __vt__13daE_Bee_HIO_c */
SECTION_DATA extern void* __vt__13daE_Bee_HIO_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__13daE_Bee_HIO_cFv,
};
src/d/actor/d_a_e_vt.cpp
+152 -1968
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_e_yk.cpp
+136 -792
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_mg_fshop.cpp
+136 -983
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_myna.cpp
+104 -885
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc.cpp
+33 -529
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_ash.cpp
+98 -1216
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_ne.cpp
+38 -1311
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_the.cpp
+187 -1422
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_zra.cpp
+139 -8069
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_zra.inc
+3920
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_zrz.cpp
+645 -2249
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_kantera.cpp
+16 -300
View File
@@ -4,7 +4,10 @@
*/
#include "d/actor/d_a_obj_kantera.h"
#include "SSystem/SComponent/c_math.h"
#include "d/d_a_itembase_static.h"
#include "d/d_com_inf_game.h"
#include "d/d_item.h"
#include "d/d_item_data.h"
#include "d/d_procname.h"
#include "dol2asm.h"
@@ -268,167 +271,43 @@ extern actor_process_profile_definition g_profile_Obj_Kantera = {
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80C397AC-80C397B8 0000D0 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */
SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_AcchCirFv,
};
/* 80C397B8-80C397C4 0000DC 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */
SECTION_DATA extern void* __vt__10cCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10cCcD_GSttsFv,
};
/* 80C397C4-80C397D0 0000E8 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */
SECTION_DATA extern void* __vt__10dCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10dCcD_GSttsFv,
};
/* 80C397D0-80C397DC 0000F4 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */
SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGCylFv,
};
/* 80C397DC-80C397E8 000100 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 80C397E8-80C3980C 00010C 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */
SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_ObjAcchFv,
(void*)NULL,
(void*)NULL,
(void*)func_80C39638,
(void*)NULL,
(void*)NULL,
(void*)func_80C39630,
};
/* 80C3980C-80C39850 000130 0044+00 1/1 0/0 0/0 .data __vt__15daItemKantera_c */
SECTION_DATA extern void* __vt__15daItemKantera_c[17] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)DrawBase__12daItemBase_cFv,
(void*)setListStart__12daItemBase_cFv,
(void*)settingBeforeDraw__12daItemBase_cFv,
(void*)setTevStr__12daItemBase_cFv,
(void*)setShadow__12daItemBase_cFv,
(void*)animEntry__12daItemBase_cFv,
(void*)RotateYBase__12daItemBase_cFv,
(void*)clothCreate__12daItemBase_cFv,
(void*)__CreateHeap__15daItemKantera_cFv,
(void*)chkFlag__12daItemBase_cFi,
(void*)getTevFrm__12daItemBase_cFv,
(void*)getBtpFrm__12daItemBase_cFv,
(void*)getShadowSize__12daItemBase_cFv,
(void*)getCollisionH__12daItemBase_cFv,
(void*)getCollisionR__12daItemBase_cFv,
};
/* 80C39850-80C3985C 000174 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */
SECTION_DATA extern void* __vt__8cM3dGPla[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGPlaFv,
};
/* 80C38678-80C38974 000078 02FC+00 1/1 0/0 0/0 .text Reflect__FP4cXyzRC13cBgS_PolyInfof
*/
static f32 Reflect(cXyz* i_xyz, cBgS_PolyInfo const& param_1, f32 param_2) {
// NONMATCHING
}
/* 80C38974-80C389BC 000374 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGPlaFv */
// cM3dGPla::~cM3dGPla() {
extern "C" void __dt__8cM3dGPlaFv() {
// NONMATCHING
}
/* 80C389BC-80C389F8 0003BC 003C+00 1/1 0/0 0/0 .text initBaseMtx__15daItemKantera_cFv */
#ifdef NONMATCHING
void daItemKantera_c::initBaseMtx() {
mpModel->setBaseScale(scale);
setBaseMtx();
}
#else
void daItemKantera_c::initBaseMtx() {
// NONMATCHING
}
#endif
/* 80C389F8-80C38A64 0003F8 006C+00 2/2 0/0 0/0 .text setBaseMtx__15daItemKantera_cFv */
#ifdef NONMATCHING
void daItemKantera_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx);
}
#else
void daItemKantera_c::setBaseMtx() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80C396A8-80C396AC 000060 0004+00 0/1 0/0 0/0 .rodata @3910 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3910 = 30.0f;
COMPILER_STRIP_GATE(0x80C396A8, &lit_3910);
#pragma pop
/* 80C396AC-80C396B0 000064 0004+00 0/1 0/0 0/0 .rodata @3911 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3911 = -6.0f;
COMPILER_STRIP_GATE(0x80C396AC, &lit_3911);
#pragma pop
/* 80C396B0-80C396B8 000068 0008+00 0/1 0/0 0/0 .rodata @3913 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3913[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80C396B0, &lit_3913);
#pragma pop
/* 80C38A64-80C38BA8 000464 0144+00 1/1 0/0 0/0 .text Create__15daItemKantera_cFv */
#ifdef NONMATCHING
int daItemKantera_c::Create() {
initBaseMtx();
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
mAcchCir.SetWall(30.0f, 30.0f);
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir,
fopAcM_GetSpeed_p(this), NULL, NULL);
mColStatus.Init(0, 0xff, this);
mCollider.Set(l_cyl_src);
mCollider.SetStts(&mColStatus);
mCollider.SetR(dItem_data::getR(m_itemNo));
mCollider.SetH(dItem_data::getH(m_itemNo));
fopAcM_SetCullSize(this, 0x10);
mCcStts.Init(0, 0xff, this);
mCcCyl.Set(l_cyl_src);
mCcCyl.SetStts(&mCcStts);
mCcCyl.SetR(dItem_data::getR(m_itemNo));
mCcCyl.SetH(dItem_data::getH(m_itemNo));
fopAcM_SetCullSize(this, 0xF);
actionWaitInit();
fopAcM_SetGravity(this, -6.0f);
fopAcM_OnCarryType(this, fopAcM_CARRY_ITEM);
return 1;
}
#else
int daItemKantera_c::Create() {
// NONMATCHING
}
#endif
/* 80C38BA8-80C38BB0 0005A8 0008+00 1/0 0/0 0/0 .text __CreateHeap__15daItemKantera_cFv
*/
@@ -437,8 +316,6 @@ int daItemKantera_c::__CreateHeap() {
}
/* 80C38BB0-80C38DAC 0005B0 01FC+00 1/1 0/0 0/0 .text create__15daItemKantera_cFv */
#ifdef NONMATCHING
// vtable
int daItemKantera_c::create() {
fopAcM_SetupActor(this, daItemKantera_c);
@@ -459,7 +336,7 @@ int daItemKantera_c::create() {
}
int phase = dComIfG_resLoad(&mPhase, dItem_data::getFieldArc(m_itemNo));
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckFieldItemCreateHeap, 0x1940)) {
if (!fopAcM_entrySolidHeap(this, CheckFieldItemCreateHeap, 0x1940)) {
return cPhs_ERROR_e;
}
if (!Create()) {
@@ -468,74 +345,9 @@ int daItemKantera_c::create() {
}
return phase;
}
#else
int daItemKantera_c::create() {
// NONMATCHING
}
#endif
/* 80C38DAC-80C38DF4 0007AC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
// cM3dGCyl::~cM3dGCyl() {
extern "C" void __dt__8cM3dGCylFv() {
// NONMATCHING
}
/* 80C38DF4-80C38E3C 0007F4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 80C38E3C-80C38E98 00083C 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
// dCcD_GStts::~dCcD_GStts() {
extern "C" void __dt__10dCcD_GSttsFv() {
// NONMATCHING
}
/* 80C38E98-80C38F08 000898 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */
// dBgS_AcchCir::~dBgS_AcchCir()
extern "C" void __dt__12dBgS_AcchCirFv() {
// NONMATCHING
}
/* 80C38F08-80C38F78 000908 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */
// dBgS_ObjAcch::~dBgS_ObjAcch()
extern "C" void __dt__12dBgS_ObjAcchFv() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80C396B8-80C396BC 000070 0004+00 0/1 0/0 0/0 .rodata @4076 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4076 = 5.0f;
COMPILER_STRIP_GATE(0x80C396B8, &lit_4076);
#pragma pop
/* 80C396BC-80C396C0 000074 0004+00 0/2 0/0 0/0 .rodata @4077 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4077 = 1.0f;
COMPILER_STRIP_GATE(0x80C396BC, &lit_4077);
#pragma pop
/* 80C396C0-80C396C4 000078 0004+00 0/1 0/0 0/0 .rodata @4078 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4078 = 7.0f / 10.0f;
COMPILER_STRIP_GATE(0x80C396C0, &lit_4078);
#pragma pop
/* 80C396C4-80C396C8 00007C 0004+00 0/1 0/0 0/0 .rodata @4079 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4079 = 3.0f;
COMPILER_STRIP_GATE(0x80C396C4, &lit_4079);
#pragma pop
/* 80C38F78-80C39068 000978 00F0+00 1/1 0/0 0/0 .text bg_check__15daItemKantera_cFv */
#ifdef NONMATCHING
// lfs not correct
// NONMATCHING lfs not correct
void daItemKantera_c::bg_check() {
if (mAcch.ChkWallHit()) {
if (speedF > 5.0f) {
@@ -555,43 +367,26 @@ void daItemKantera_c::bg_check() {
field_0x936++;
}
}
#else
void daItemKantera_c::bg_check() {
// NONMATCHING
}
#endif
/* 80C39068-80C390A0 000A68 0038+00 1/0 0/0 0/0 .text actionInit__15daItemKantera_cFv */
#ifdef NONMATCHING
int daItemKantera_c::actionInit() {
show();
actionWaitInit();
return 1;
}
#else
int daItemKantera_c::actionInit() {
// NONMATCHING
}
#endif
/* 80C390A0-80C3911C 000AA0 007C+00 2/2 0/0 0/0 .text actionWaitInit__15daItemKantera_cFv
*/
#ifdef NONMATCHING
int daItemKantera_c::actionWaitInit() {
mCollider.OffTgSPrmBit(1);
mCollider.OffCoSPrmBit(1);
mCcCyl.OffTgSPrmBit(1);
mCcCyl.OffCoSPrmBit(1);
cLib_offBit<u32>(attention_info.flags, 0x10);
attention_info.distances[fopAc_attn_SPEAK_e] = 16;
attention_info.distances[fopAc_attn_CARRY_e] = 16;
attention_info.position = current.pos;
show();
setStatus(1);
return 1;
}
#else
int daItemKantera_c::actionWaitInit() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80C396C8-80C396CC 000080 0004+00 0/1 0/0 0/0 .rodata @4145 */
@@ -608,11 +403,10 @@ int daItemKantera_c::actionWait() {
/* 80C39234-80C392D0 000C34 009C+00 1/1 0/0 0/0 .text initActionOrderGetDemo__15daItemKantera_cFv
*/
#ifdef NONMATCHING
int daItemKantera_c::initActionOrderGetDemo() {
cLib_offBit<u32>(attention_info.flags, 0x10);
mCollider.OffTgSPrmBit(1);
mCollider.OffCoSPrmBit(1);
mCcCyl.OffTgSPrmBit(1);
mCcCyl.OffCoSPrmBit(1);
hide();
fopAcM_orderItemEvent(this, 0, 0);
eventInfo.i_onCondition(8);
@@ -621,14 +415,8 @@ int daItemKantera_c::initActionOrderGetDemo() {
setStatus(2);
return 1;
}
#else
int daItemKantera_c::initActionOrderGetDemo() {
// NONMATCHING
}
#endif
/* 80C392D0-80C3934C 000CD0 007C+00 1/0 0/0 0/0 .text actionOrderGetDemo__15daItemKantera_cFv */
#ifdef NONMATCHING
int daItemKantera_c::actionOrderGetDemo() {
if (eventInfo.checkCommandItem()) {
setStatus(3);
@@ -641,22 +429,9 @@ int daItemKantera_c::actionOrderGetDemo() {
}
return 1;
}
#else
int daItemKantera_c::actionOrderGetDemo() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80C396CC-80C396CC 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80C396CC = "DEFAULT_GETITEM";
#pragma pop
/* 80C3934C-80C393B0 000D4C 0064+00 1/0 0/0 0/0 .text actionGetDemo__15daItemKantera_cFv
*/
#ifdef NONMATCHING
int daItemKantera_c::actionGetDemo() {
if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
dComIfGp_event_reset();
@@ -664,11 +439,6 @@ int daItemKantera_c::actionGetDemo() {
}
return 1;
}
#else
int daItemKantera_c::actionGetDemo() {
// NONMATCHING
}
#endif
/* 80C393B0-80C394DC 000DB0 012C+00 1/1 0/0 0/0 .text execute__15daItemKantera_cFv */
int daItemKantera_c::execute() {
@@ -676,7 +446,6 @@ int daItemKantera_c::execute() {
}
/* 80C394DC-80C39530 000EDC 0054+00 1/1 0/0 0/0 .text draw__15daItemKantera_cFv */
#ifdef NONMATCHING
int daItemKantera_c::draw() {
if (!chkDraw()) {
return 1;
@@ -684,83 +453,30 @@ int daItemKantera_c::draw() {
DrawBase();
return 1;
}
#else
int daItemKantera_c::draw() {
// NONMATCHING
}
#endif
/* 80C39530-80C39568 000F30 0038+00 1/1 0/0 0/0 .text _delete__15daItemKantera_cFv */
#ifdef NONMATCHING
int daItemKantera_c::_delete() {
DeleteBase(dItem_data::getFieldArc(m_itemNo));
return 1;
}
#else
int daItemKantera_c::_delete() {
// NONMATCHING
}
#endif
/* 80C39568-80C39588 000F68 0020+00 1/0 0/0 0/0 .text daItemKantera_Draw__FP15daItemKantera_c */
#ifdef NONMATCHING
static int daItemKantera_Draw(daItemKantera_c* i_this) {
return i_this->draw();
}
#else
static int daItemKantera_Draw(daItemKantera_c* i_this) {
// NONMATCHING
}
#endif
/* 80C39588-80C395A8 000F88 0020+00 1/0 0/0 0/0 .text daItemKantera_Execute__FP15daItemKantera_c
*/
#ifdef NONMATCHING
static int daItemKantera_Execute(daItemKantera_c* i_this) {
return i_this->execute();
}
#else
static int daItemKantera_Execute(daItemKantera_c* i_this) {
// NONMATCHING
}
#endif
/* 80C395A8-80C395C8 000FA8 0020+00 1/0 0/0 0/0 .text daItemKantera_Delete__FP15daItemKantera_c */
#ifdef NONMATCHING
static int daItemKantera_Delete(daItemKantera_c* i_this) {
return i_this->_delete();
}
#else
static int daItemKantera_Delete(daItemKantera_c* i_this) {
// NONMATCHING
}
#endif
/* 80C395C8-80C395E8 000FC8 0020+00 1/0 0/0 0/0 .text daItemKantera_Create__FP10fopAc_ac_c */
#ifdef NONMATCHING
static int daItemKantera_Create(fopAc_ac_c* i_this) {
return static_cast<daItemKantera_c*>(i_this)->create();
}
#else
static int daItemKantera_Create(fopAc_ac_c* i_this) {
// NONMATCHING
}
#endif
/* 80C395E8-80C39630 000FE8 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
// cCcD_GStts::~cCcD_GStts() {
extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* 80C39630-80C39638 001030 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */
static void func_80C39630() {
// NONMATCHING
}
/* 80C39638-80C39640 001038 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */
static void func_80C39638() {
// NONMATCHING
}
/* 80C396CC-80C396CC 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_obj_mirror_table.cpp
+5 -214
View File
@@ -8,94 +8,6 @@
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" static void createSolidHeap__FP10fopAc_ac_c();
extern "C" void createHeap__18daObjMirrorTable_cFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" void isSwitch__18daObjMirrorTable_cFv();
extern "C" static void rideCallBack1__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c();
extern "C" static void rideCallBack2__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c();
extern "C" static void daObjMirrorTable_Draw__FP18daObjMirrorTable_c();
extern "C" void draw__18daObjMirrorTable_cFv();
extern "C" static void daObjMirrorTable_Execute__FP18daObjMirrorTable_c();
extern "C" void execute__18daObjMirrorTable_cFv();
extern "C" static bool daObjMirrorTable_IsDelete__FP18daObjMirrorTable_c();
extern "C" static void daObjMirrorTable_Delete__FP18daObjMirrorTable_c();
extern "C" void __dt__4dBgWFv();
extern "C" static void daObjMirrorTable_Create__FP10fopAc_ac_c();
extern "C" void create__18daObjMirrorTable_cFv();
extern "C" void create_init__18daObjMirrorTable_cFv();
extern "C" void initBaseMtx__18daObjMirrorTable_cFv();
extern "C" void func_80C9B220(void* _this, s8*);
extern "C" extern char const* const d_a_obj_mirror_table__stringBase0;
//
// External References:
//
extern "C" void push__14mDoMtx_stack_cFv();
extern "C" void pop__14mDoMtx_stack_cFv();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void play__14mDoExt_baseAnmFv();
extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss();
extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef();
extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss();
extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef();
extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb();
extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void onSwitch__12dSv_memBit_cFi();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void Release__4cBgSFP9dBgW_Base();
extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
extern "C" void __dt__4cBgWFv();
extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f();
extern "C" void __ct__4dBgWFv();
extern "C" void Move__4dBgWFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void __ct__5csXyzFsss();
extern "C" void ChkUsed__9cBgW_BgIdCFv();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void init__12J3DFrameCtrlFs();
extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey();
extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_29();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_29();
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__4dBgW[65];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
//
/* 80C9B2A4-80C9B2A8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char const* l_arcName = "MR-Table";
@@ -106,35 +18,14 @@ static Vec const l_minPos = {1672.183f, 4613.6299f, -21013.793f};
/* 80C9B250-80C9B25C 00000C 000C+00 1/1 0/0 0/0 .rodata l_maxPos */
static Vec const l_maxPos = {1926.217f, 4613.6299f, -20866.969f};
/* 80C9B25C-80C9B260 000018 0004+00 2/4 0/0 0/0 .rodata @3850 */
SECTION_RODATA static f32 const lit_3850 = 1.0f;
COMPILER_STRIP_GATE(0x80C9B25C, &lit_3850);
/* 80C9B260-80C9B264 00001C 0004+00 1/3 0/0 0/0 .rodata @3851 */
SECTION_RODATA static u8 const lit_3851[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80C9B260, &lit_3851);
/* 80C9B264-80C9B26C 000020 0008+00 1/3 0/0 0/0 .rodata @3853 */
SECTION_RODATA static u8 const lit_3853[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80C9B264, &lit_3853);
/* 80C99918-80C99938 000078 0020+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */
static int createSolidHeap(fopAc_ac_c* i_this) {
return static_cast<daObjMirrorTable_c*>(i_this)->createHeap();
}
extern void* __vt__12J3DFrameCtrl[3];
/* 80C99938-80C99F34 000098 05FC+00 1/1 0/0 0/0 .text createHeap__18daObjMirrorTable_cFv
*/
#ifdef NONMATCHING
// NONMATCHING error with mirror_res_id calculation
int daObjMirrorTable_c::createHeap() {
J3DModelData* table_model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 21);
mpTableModel = mDoExt_J3DModel__create(table_model_data, 0x80000, 0x11000084);
@@ -232,17 +123,6 @@ int daObjMirrorTable_c::createHeap() {
return 1;
}
#else
int daObjMirrorTable_c::createHeap() {
// NONMATCHING
}
#endif
/* 80C99F34-80C99F7C 000694 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */
// J3DFrameCtrl::~J3DFrameCtrl() {
extern "C" void __dt__12J3DFrameCtrlFv() {
// NONMATCHING
}
/* 80C99F7C-80C9A040 0006DC 00C4+00 1/1 0/0 0/0 .text isSwitch__18daObjMirrorTable_cFv */
bool daObjMirrorTable_c::isSwitch() {
@@ -416,42 +296,7 @@ static int daObjMirrorTable_Execute(daObjMirrorTable_c* i_this) {
return i_this->execute();
}
/* ############################################################################################## */
/* 80C9B26C-80C9B270 000028 0004+00 1/2 0/0 0/0 .rodata @4350 */
SECTION_RODATA static f32 const lit_4350 = -1.0f;
COMPILER_STRIP_GATE(0x80C9B26C, &lit_4350);
/* 80C9B270-80C9B274 00002C 0004+00 0/1 0/0 0/0 .rodata @4351 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4351 = 1800.0f;
COMPILER_STRIP_GATE(0x80C9B270, &lit_4351);
#pragma pop
/* 80C9B274-80C9B278 000030 0004+00 0/1 0/0 0/0 .rodata @4352 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4352 = 4700.0f;
COMPILER_STRIP_GATE(0x80C9B274, &lit_4352);
#pragma pop
/* 80C9B278-80C9B27C 000034 0004+00 0/1 0/0 0/0 .rodata @4353 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4353 = -21320.0f;
COMPILER_STRIP_GATE(0x80C9B278, &lit_4353);
#pragma pop
/* 80C9B27C-80C9B280 000038 0004+00 0/1 0/0 0/0 .rodata @4354 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4354 = 255.0f;
COMPILER_STRIP_GATE(0x80C9B27C, &lit_4354);
#pragma pop
/* 80C9A4D0-80C9A9D4 000C30 0504+00 1/1 0/0 0/0 .text execute__18daObjMirrorTable_cFv */
#ifdef NONMATCHING
// isStop regalloc
int daObjMirrorTable_c::execute() {
mpTableUpBckAnm->play();
if (!mpTableUpBckAnm->isStop()) {
@@ -474,15 +319,15 @@ int daObjMirrorTable_c::execute() {
mpStairBrkAnm->setPlaySpeed(1.0f);
if (!mBgW[2].ChkUsed()) {
dComIfG_Bgsp().Regist(&mBgW[2], this);
Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_MIRROR_STAIR_ON, &pos,
0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_OBJ_MIRROR_STAIR_ON, &pos,
0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
} else {
mpStairBrkAnm->setPlaySpeed(-1.0f);
if (mBgW[2].ChkUsed()) {
dComIfG_Bgsp().Release(&mBgW[2]);
Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_MIRROR_STAIR_OFF, &pos,
0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_OBJ_MIRROR_STAIR_OFF, &pos,
0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
}
@@ -502,11 +347,6 @@ int daObjMirrorTable_c::execute() {
setBaseMtx();
return 1;
}
#else
int daObjMirrorTable_c::execute() {
// NONMATCHING
}
#endif
/* 80C9A9D4-80C9A9DC 001134 0008+00 1/0 0/0 0/0 .text
* daObjMirrorTable_IsDelete__FP18daObjMirrorTable_c */
@@ -552,41 +392,6 @@ cPhs__Step daObjMirrorTable_c::create() {
return step;
}
/* ############################################################################################## */
/* 80C9B280-80C9B284 00003C 0004+00 0/1 0/0 0/0 .rodata @4509 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4509 = 1760.0f;
COMPILER_STRIP_GATE(0x80C9B280, &lit_4509);
#pragma pop
/* 80C9B284-80C9B288 000040 0004+00 0/1 0/0 0/0 .rodata @4510 */
#pragma push
#pragma force_active on
SECTION_RODATA static u32 const lit_4510 = 0x45935266;
COMPILER_STRIP_GATE(0x80C9B284, &lit_4510);
#pragma pop
/* 80C9B288-80C9B28C 000044 0004+00 0/1 0/0 0/0 .rodata @4511 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4511 = -20624.0f;
COMPILER_STRIP_GATE(0x80C9B288, &lit_4511);
#pragma pop
/* 80C9B28C-80C9B290 000048 0004+00 0/1 0/0 0/0 .rodata @4512 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4512 = 27.0f / 20.0f;
COMPILER_STRIP_GATE(0x80C9B28C, &lit_4512);
#pragma pop
/* 80C9B290-80C9B290 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80C9B299 = "F_SP125";
#pragma pop
/* 80C9ABFC-80C9AFD0 00135C 03D4+00 1/1 0/0 0/0 .text create_init__18daObjMirrorTable_cFv
*/
void daObjMirrorTable_c::create_init() {
@@ -641,7 +446,6 @@ void daObjMirrorTable_c::create_init() {
}
}
/* 80C9AFD0-80C9B220 001730 0250+00 1/1 0/0 0/0 .text initBaseMtx__18daObjMirrorTable_cFv
*/
void daObjMirrorTable_c::initBaseMtx() {
@@ -650,12 +454,6 @@ void daObjMirrorTable_c::initBaseMtx() {
setBaseMtx();
}
/* 80C9B220-80C9B23C 001980 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<Sc>__FPSc */
extern "C" void func_80C9B220(void* _this, s8* param_0) {
// NONMATCHING
}
/* 80C9B2A8-80C9B2C8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMirrorTable_Method */
static actor_method_class l_daObjMirrorTable_Method = {
(process_method_func)daObjMirrorTable_Create,
@@ -682,10 +480,3 @@ extern actor_process_profile_definition g_profile_Obj_MirrorTable = {
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
/* 80C9B2F8-80C9B304 000054 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */
SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12J3DFrameCtrlFv,
};
src/d/actor/d_a_obj_volcball.cpp
+24 -619
View File
@@ -9,193 +9,19 @@
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_event_lib.h"
#include "dol2asm.h"
#include "f_op/f_op_actor_mng.h"
#include "global.h"
//
// Forward References:
//
extern "C" void getData__15daObjVolcBall_cFv();
extern "C" static void CheckCreateHeap__FP10fopAc_ac_c();
extern "C" static void search_big_volc__FPvPv();
extern "C" void initBaseMtx__15daObjVolcBall_cFv();
extern "C" void setBaseMtx__15daObjVolcBall_cFv();
extern "C" void Create__15daObjVolcBall_cFv();
extern "C" void CreateHeap__15daObjVolcBall_cFv();
extern "C" void create__15daObjVolcBall_cFv();
extern "C" void __dt__Q215daObjVolcBall_c7vball_sFv();
extern "C" void __dt__19dPa_followEcallBackFv();
extern "C" void cleanup__18dPa_levelEcallBackFv();
extern "C" void __ct__Q215daObjVolcBall_c7vball_sFv();
extern "C" void __defctor__19dPa_followEcallBackFv();
extern "C" void __dt__8cM3dGSphFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void execute__15daObjVolcBall_cFv();
extern "C" void action__15daObjVolcBall_cFv();
extern "C" void initActionPlayerWait__15daObjVolcBall_cFv();
extern "C" void initActionWarning__15daObjVolcBall_cFv();
extern "C" void initActionSwWait__15daObjVolcBall_cFv();
extern "C" void actionPlayerWait__15daObjVolcBall_cFv();
extern "C" void actionSwWait__15daObjVolcBall_cFv();
extern "C" void actionStop__15daObjVolcBall_cFv();
extern "C" void actionWarning__15daObjVolcBall_cFv();
extern "C" void actionEruption__15daObjVolcBall_cFv();
extern "C" void initActionEnd__15daObjVolcBall_cFv();
extern "C" void actionEnd__15daObjVolcBall_cFv();
extern "C" void eventStart__15daObjVolcBall_cFv();
extern "C" void setEruptEffect__15daObjVolcBall_cFi();
extern "C" void setFallEffect__15daObjVolcBall_cFi();
extern "C" void endFallEffect__15daObjVolcBall_cFi();
extern "C" void createSearchBall__15daObjVolcBall_cFv();
extern "C" void createNormalBall__15daObjVolcBall_cFv();
extern "C" void executeBall__15daObjVolcBall_cFv();
extern "C" void startQuake__15daObjVolcBall_cFv();
extern "C" void draw__15daObjVolcBall_cFv();
extern "C" void _delete__15daObjVolcBall_cFv();
extern "C" static void daObjVolcBall_Draw__FP15daObjVolcBall_c();
extern "C" static void daObjVolcBall_Execute__FP15daObjVolcBall_c();
extern "C" static void daObjVolcBall_Delete__FP15daObjVolcBall_c();
extern "C" static void daObjVolcBall_Create__FP10fopAc_ac_c();
extern "C" void __dt__15daObjVolcBall_cFv();
extern "C" void __dt__17dEvLib_callback_cFv();
extern "C" int eventRun__17dEvLib_callback_cFv(void* this_);
extern "C" int eventEnd__17dEvLib_callback_cFv(void* this_);
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void __dt__18dPa_levelEcallBackFv();
extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0);
extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0);
extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0);
extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0);
extern "C" int eventStart__17dEvLib_callback_cFv(void* this_);
extern "C" u8 func_80D23D6C(u8*);
extern "C" u32 func_80D23D88(u32*);
extern "C" static void func_80D23DA4();
extern "C" static void func_80D23DAC();
extern "C" static void func_80D23DB4();
extern "C" static void func_80D23DBC();
extern "C" extern char const* const d_a_obj_volcball__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAc_IsActor__FPv();
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c();
extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz();
extern "C" void fpcSch_JudgeByID__FPvPv();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void
dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void eventUpdate__17dEvLib_callback_cFv();
extern "C" void orderEvent__17dEvLib_callback_cFiii();
extern "C" void __ct__19dPa_followEcallBackFUcUc();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void StartQuake__12dVibration_cFii4cXyz();
extern "C" void StopQuake__12dVibration_cFi();
extern "C" void CheckQuake__12dVibration_cFv();
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void SetWall__12dBgS_AcchCirFff();
extern "C" void __dt__9dBgS_AcchFv();
extern "C" void __ct__9dBgS_AcchFv();
extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz();
extern "C" void CrrPos__9dBgS_AcchFR4dBgS();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void __dt__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void cM_atan2s__Fff();
extern "C" void cM_rndF__Ff();
extern "C" void cM_rndFX__Ff();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void __dt__8cM3dGCirFv();
extern "C" void SetC__8cM3dGSphFRC4cXyz();
extern "C" void SetR__8cM3dGSphFf();
extern "C" void cLib_chaseF__FPfff();
extern "C" void __dt__18JPAEmitterCallBackFv();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
extern "C" void __cvt_fp2unsigned();
extern "C" void _savegpr_23();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_23();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__19dPa_followEcallBack[10];
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" extern u8 data_80D24100[4];
extern void* __vt__15daObjVolcBall_c[10];
extern void* __vt__12dBgS_AcchCir[3];
extern void* __vt__10cCcD_GStts[3];
extern void* __vt__10dCcD_GStts[3];
extern void* __vt__18dPa_levelEcallBack[9];
extern void* __vt__12dBgS_ObjAcch[9];
extern void* __vt__8cM3dGAab[3];
extern void* __vt__8cM3dGSph[3];
extern void* __vt__17dEvLib_callback_c[6];
//
// Declarations:
//
/* 80D23E8C-80D23E98 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80D23E98-80D23EAC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
@@ -203,10 +29,9 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x3FE00000,
0x00000000,
};
#pragma pop
/* 80D23EAC-80D23EB0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
SECTION_DATA static const char* l_arcName = "M_Volcbal";
static const char* l_arcName = "M_Volcbal";
/* 80D23EB0-80D23F58 000024 00A8+00 1/1 0/0 0/0 .data l_param */
static daObjVolcBall_c::volc_param_c l_param[] = {
@@ -258,7 +83,6 @@ void daObjVolcBall_c::setBaseMtx() {
MTXCopy(mDoMtx_stack_c::get(), field_0x28ec);
}
/* ############################################################################################## */
/* 80D23DCC-80D23E0C 000000 0040+00 7/7 0/0 0/0 .rodata l_sph_src */
static const dCcD_SrcSph l_sph_src = {
{
@@ -275,33 +99,6 @@ static const dCcD_SrcSph l_sph_src = {
}
};
/* 80D23E0C-80D23E10 000040 0004+00 2/6 0/0 0/0 .rodata @3715 */
SECTION_RODATA static f32 const lit_3715 = 30.0f;
COMPILER_STRIP_GATE(0x80D23E0C, &lit_3715);
/* 80D23E10-80D23E14 000044 0004+00 0/1 0/0 0/0 .rodata @3716 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3716 = -1000.0f;
COMPILER_STRIP_GATE(0x80D23E10, &lit_3716);
#pragma pop
/* 80D23E14-80D23E18 000048 0004+00 4/8 0/0 0/0 .rodata @3717 */
SECTION_RODATA static u8 const lit_3717[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80D23E14, &lit_3717);
/* 80D23E18-80D23E1C 00004C 0004+00 0/1 0/0 0/0 .rodata @3718 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3718 = 1000.0f;
COMPILER_STRIP_GATE(0x80D23E18, &lit_3718);
#pragma pop
/* 80D21C40-80D21D80 0001A0 0140+00 1/1 0/0 0/0 .text Create__15daObjVolcBall_cFv */
int daObjVolcBall_c::Create() {
initBaseMtx();
@@ -374,68 +171,6 @@ int daObjVolcBall_c::create() {
return phase;
}
/* 80D21FA8-80D220C4 000508 011C+00 2/2 0/0 0/0 .text __dt__Q215daObjVolcBall_c7vball_sFv
*/
daObjVolcBall_c::vball_s::~vball_s() {
// NONMATCHING
}
/* 80D220C4-80D22148 000624 0084+00 2/2 0/0 0/0 .text __dt__19dPa_followEcallBackFv */
// dPa_followEcallBack::~dPa_followEcallBack() {
extern "C" void __dt__19dPa_followEcallBackFv() {
// NONMATCHING
}
/* 80D22148-80D2214C 0006A8 0004+00 1/0 0/0 0/0 .text cleanup__18dPa_levelEcallBackFv */
// void dPa_levelEcallBack::cleanup() {
extern "C" void cleanup__18dPa_levelEcallBackFv() {
/* empty function */
}
/* 80D2214C-80D22230 0006AC 00E4+00 1/1 0/0 0/0 .text __ct__Q215daObjVolcBall_c7vball_sFv
*/
daObjVolcBall_c::vball_s::vball_s() {
// NONMATCHING
}
/* 80D22230-80D22258 000790 0028+00 1/1 0/0 0/0 .text __defctor__19dPa_followEcallBackFv
*/
// void dPa_followEcallBack::__defctor() {
extern "C" void __defctor__19dPa_followEcallBackFv() {
// NONMATCHING
}
/* 80D22258-80D222A0 0007B8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
// cM3dGSph::~cM3dGSph() {
extern "C" void __dt__8cM3dGSphFv() {
// NONMATCHING
}
/* 80D222A0-80D222E8 000800 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 80D222E8-80D22358 000848 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */
// dBgS_ObjAcch::~dBgS_ObjAcch() {
extern "C" void __dt__12dBgS_ObjAcchFv() {
// NONMATCHING
}
/* 80D22358-80D223B4 0008B8 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
// dCcD_GStts::~dCcD_GStts() {
extern "C" void __dt__10dCcD_GSttsFv() {
// NONMATCHING
}
/* 80D223B4-80D22424 000914 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */
// dBgS_AcchCir::~dBgS_AcchCir() {
extern "C" void __dt__12dBgS_AcchCirFv() {
// NONMATCHING
}
/* 80D22424-80D22484 000984 0060+00 1/1 0/0 0/0 .text execute__15daObjVolcBall_cFv */
int daObjVolcBall_c::execute() {
f32 ball_gravity = getData()->mGravity;
@@ -477,21 +212,6 @@ void daObjVolcBall_c::initActionSwWait() {
setAction(MODE_SWITCH_WAIT);
}
/* ############################################################################################## */
/* 80D23E1C-80D23E20 000050 0004+00 0/1 0/0 0/0 .rodata @3969 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3969 = 2500.0f;
COMPILER_STRIP_GATE(0x80D23E1C, &lit_3969);
#pragma pop
/* 80D23E20-80D23E24 000054 0004+00 0/1 0/0 0/0 .rodata @3970 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3970 = 300.0f;
COMPILER_STRIP_GATE(0x80D23E20, &lit_3970);
#pragma pop
/* 80D225B0-80D2267C 000B10 00CC+00 1/0 0/0 0/0 .text actionPlayerWait__15daObjVolcBall_cFv */
void daObjVolcBall_c::actionPlayerWait() {
daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -505,14 +225,12 @@ void daObjVolcBall_c::actionPlayerWait() {
}
}
/* 80D2267C-80D22724 000BDC 00A8+00 1/0 0/0 0/0 .text actionSwWait__15daObjVolcBall_cFv
*/
void daObjVolcBall_c::actionSwWait() {
if (fopAcM_isSwitch(this, getSwBit())) {
setAction(MODE_STOP);
mTime = getData()->mNormalWaitTime * FLOAT_LABEL(lit_3715) +
cM_rndFX(getData()->mRandWaitTime * FLOAT_LABEL(lit_3715));
mTime = getData()->mNormalWaitTime * 30.0f + cM_rndFX(getData()->mRandWaitTime * 30.0f);
}
}
@@ -522,25 +240,13 @@ void daObjVolcBall_c::actionStop() {
setAction(MODE_SWITCH_WAIT);
}
if (func_80D23D88(&mTime) == 0) {
mTime = getData()->mNormalWarningTime * FLOAT_LABEL(lit_3715) +
cM_rndFX(getData()->mRandWarningTime * FLOAT_LABEL(lit_3715));
if (cLib_calcTimer(&mTime) == 0) {
mTime = getData()->mNormalWarningTime * 30.0f +
cM_rndFX(getData()->mRandWarningTime * 30.0f);
initActionWarning();
}
}
/* ############################################################################################## */
/* 80D23E24-80D23E28 000058 0004+00 2/7 0/0 0/0 .rodata @4031 */
SECTION_RODATA static f32 const lit_4031 = 1.0f;
COMPILER_STRIP_GATE(0x80D23E24, &lit_4031);
/* 80D23E28-80D23E2C 00005C 0004+00 0/3 0/0 0/0 .rodata @4032 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4032 = -1.0f;
COMPILER_STRIP_GATE(0x80D23E28, &lit_4032);
#pragma pop
/* 80D227E4-80D22944 000D44 0160+00 1/0 0/0 0/0 .text actionWarning__15daObjVolcBall_cFv
*/
void daObjVolcBall_c::actionWarning() {
@@ -555,10 +261,10 @@ void daObjVolcBall_c::actionWarning() {
}
}
if (func_80D23D88(&mTime) == 0) {
if (cLib_calcTimer(&mTime) == 0) {
setAction(MODE_ERUPT);
mTime = getData()->mNormalEruptTime * FLOAT_LABEL(lit_3715) +
cM_rndFX(getData()->mRandEruptTime * FLOAT_LABEL(lit_3715));
mTime = getData()->mNormalEruptTime * 30.0f +
cM_rndFX(getData()->mRandEruptTime * 30.0f);
mSearchBallCreateTimer = getData()->mSearchBallCreateTime * 30;
}
@@ -567,39 +273,16 @@ void daObjVolcBall_c::actionWarning() {
dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
}
/* ############################################################################################## */
/* 80D23E2C-80D23E34 000060 0004+04 0/1 0/0 0/0 .rodata @4095 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4095[1 + 1 /* padding */] = {
100.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80D23E2C, &lit_4095);
#pragma pop
/* 80D23E34-80D23E3C 000068 0008+00 0/1 0/0 0/0 .rodata @4097 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4097[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D23E34, &lit_4097);
#pragma pop
/* 80D22944-80D22C6C 000EA4 0328+00 1/0 0/0 0/0 .text actionEruption__15daObjVolcBall_cFv
*/
// small regalloc / literals
#ifdef NONMATCHING
// NONMATCHING small regalloc
void daObjVolcBall_c::actionEruption() {
if (!dComIfGp_getVibration().CheckQuake()) {
startQuake();
}
daPy_py_c* player_p = daPy_getPlayerActorClass();
u32 timer = func_80D23D88(&mTime);
u32 timer = cLib_calcTimer(&mTime);
bool disable_ball_create = true;
if (timer != 0) {
@@ -614,11 +297,11 @@ void daObjVolcBall_c::actionEruption() {
}
if (!disable_ball_create) {
if (func_80D23D88(&mSearchBallCreateTimer) == 0) {
if (cLib_calcTimer(&mSearchBallCreateTimer) == 0) {
createSearchBall();
}
if (func_80D23D6C(&mNormalBallCreateTimer) == 0) {
if (cLib_calcTimer(&mNormalBallCreateTimer) == 0) {
createNormalBall();
}
}
@@ -649,8 +332,7 @@ void daObjVolcBall_c::actionEruption() {
if (!executeBall() && disable_ball_create) {
if (mIsBigVolc == 0) {
setAction(MODE_STOP);
mTime = getData()->mNormalWaitTime * FLOAT_LABEL(lit_3715) +
cM_rndFX(getData()->mRandWaitTime * FLOAT_LABEL(lit_3715));
mTime = getData()->mNormalWaitTime * 30.0f + cM_rndFX(getData()->mRandWaitTime * 30.0f);
} else if (mIsBigVolc == 1) {
initActionEnd();
}
@@ -661,11 +343,6 @@ void daObjVolcBall_c::actionEruption() {
mDoAud_seStartLevel(Z2SE_ENV_VOLCANO_SHAKE, NULL, 0,
dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
}
#else
void daObjVolcBall_c::actionEruption() {
// NONMATCHING
}
#endif
/* 80D22C6C-80D22CD4 0011CC 0068+00 1/1 0/0 0/0 .text initActionEnd__15daObjVolcBall_cFv
*/
@@ -731,7 +408,7 @@ void daObjVolcBall_c::setEruptEffect(int i_ballNo) {
for (int i = 0; i < 6; i++) {
dComIfGp_particle_setColor(l_effect_id[i], &ball->field_0x4, &tevStr, NULL, NULL,
FLOAT_LABEL(lit_3717), 0xFF, NULL, &ball->field_0x1c, NULL, -1,
0.0f, 0xFF, NULL, &ball->field_0x1c, NULL, -1,
NULL);
}
}
@@ -753,7 +430,7 @@ void daObjVolcBall_c::setFallEffect(int i_ballNo) {
}
dComIfGp_particle_setColor(l_fall_effect_id[i], &ball->field_0x4, &tevStr, NULL, NULL,
FLOAT_LABEL(lit_3717), 0xFF, &ball->field_0x34, &sp28,
0.0f, 0xFF, &ball->field_0x34, &sp28,
&ball->field_0x390[i], -1, NULL);
}
}
@@ -799,22 +476,6 @@ bool daObjVolcBall_c::createSearchBall() {
return var_r30;
}
/* ############################################################################################## */
/* 80D23E50-80D23E54 000084 0004+00 0/1 0/0 0/0 .rodata @4279 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4279 = 32767.0f;
COMPILER_STRIP_GATE(0x80D23E50, &lit_4279);
#pragma pop
/* 80D23E54-80D23E58 000088 0004+00 0/1 0/0 0/0 .rodata @4280 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4280 = 3000.0f;
COMPILER_STRIP_GATE(0x80D23E54, &lit_4280);
#pragma pop
/* 80D23188-80D23438 0016E8 02B0+00 1/1 0/0 0/0 .text createNormalBall__15daObjVolcBall_cFv */
bool daObjVolcBall_c::createNormalBall() {
daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -875,56 +536,7 @@ bool daObjVolcBall_c::createNormalBall() {
return bvar;
}
/* ############################################################################################## */
/* 80D23E58-80D23E5C 00008C 0004+00 0/1 0/0 0/0 .rodata @4407 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4407 = 1.0f / 10.0f;
COMPILER_STRIP_GATE(0x80D23E58, &lit_4407);
#pragma pop
/* 80D23E5C-80D23E64 000090 0004+04 0/1 0/0 0/0 .rodata @4408 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4408[1 + 1 /* padding */] = {
-1000000000.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80D23E5C, &lit_4408);
#pragma pop
/* 80D23E64-80D23E6C 000098 0008+00 0/1 0/0 0/0 .rodata @4409 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4409[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D23E64, &lit_4409);
#pragma pop
/* 80D23E6C-80D23E74 0000A0 0008+00 0/1 0/0 0/0 .rodata @4410 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4410[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D23E6C, &lit_4410);
#pragma pop
/* 80D23E74-80D23E7C 0000A8 0008+00 0/1 0/0 0/0 .rodata @4411 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4411[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D23E74, &lit_4411);
#pragma pop
/* 80D23438-80D23868 001998 0430+00 1/1 0/0 0/0 .text executeBall__15daObjVolcBall_cFv */
// literals
#ifdef NONMATCHING
int daObjVolcBall_c::executeBall() {
int ret = 0;
vball_s* ball = mBall;
@@ -947,8 +559,8 @@ int daObjVolcBall_c::executeBall() {
if (i != 8) {
cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f);
cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f);
cLib_chaseF(&ball->field_0x28.x, ball->field_0x1c.x, 0.1f);
cLib_chaseF(&ball->field_0x28.y, ball->field_0x1c.y, 0.1f);
cLib_chaseF(&ball->field_0x28.z, ball->field_0x1c.z, 0.1f);
}
mDoMtx_stack_c::transS(ball->field_0x4);
@@ -987,11 +599,6 @@ int daObjVolcBall_c::executeBall() {
return ret;
}
#else
int daObjVolcBall_c::executeBall() {
// NONMATCHING
}
#endif
/* 80D23868-80D23904 001DC8 009C+00 3/3 0/0 0/0 .text startQuake__15daObjVolcBall_cFv */
void daObjVolcBall_c::startQuake() {
@@ -1002,15 +609,6 @@ void daObjVolcBall_c::startQuake() {
}
}
/* ############################################################################################## */
/* 80D23E7C-80D23E80 0000B0 0004+00 0/1 0/0 0/0 .rodata @4447 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4447 = 2000.0f;
COMPILER_STRIP_GATE(0x80D23E7C, &lit_4447);
#pragma pop
/* 80D23904-80D23A0C 001E64 0108+00 1/1 0/0 0/0 .text draw__15daObjVolcBall_cFv */
int daObjVolcBall_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -1040,7 +638,6 @@ int daObjVolcBall_c::draw() {
return 1;
}
/* 80D23A0C-80D23AA4 001F6C 0098+00 1/1 0/0 0/0 .text _delete__15daObjVolcBall_cFv */
int daObjVolcBall_c::_delete() {
dComIfG_resDelete(&mPhase, l_arcName);
@@ -1079,11 +676,11 @@ static int daObjVolcBall_Create(fopAc_ac_c* i_this) {
/* 80D23FE8-80D24008 -00001 0020+00 1/0 0/0 0/0 .data l_daObjVolcBall_Method */
static actor_method_class l_daObjVolcBall_Method = {
(process_method_func)daObjVolcBall_Create__FP10fopAc_ac_c,
(process_method_func)daObjVolcBall_Delete__FP15daObjVolcBall_c,
(process_method_func)daObjVolcBall_Execute__FP15daObjVolcBall_c,
0,
(process_method_func)daObjVolcBall_Draw__FP15daObjVolcBall_c,
(process_method_func)daObjVolcBall_Create,
(process_method_func)daObjVolcBall_Delete,
(process_method_func)daObjVolcBall_Execute,
NULL,
(process_method_func)daObjVolcBall_Draw,
};
/* 80D24008-80D24038 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_VolcanicBall */
@@ -1103,195 +700,3 @@ extern actor_process_profile_definition g_profile_Obj_VolcanicBall = {
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80D24038-80D24060 0001AC 0028+00 2/2 0/0 0/0 .data __vt__15daObjVolcBall_c */
SECTION_DATA extern void* __vt__15daObjVolcBall_c[10] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)func_80D23DBC,
(void*)func_80D23DB4,
(void*)eventRun__17dEvLib_callback_cFv,
(void*)eventEnd__17dEvLib_callback_cFv,
(void*)eventStart__15daObjVolcBall_cFv,
(void*)__dt__15daObjVolcBall_cFv,
};
/* 80D24060-80D2406C 0001D4 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */
SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_AcchCirFv,
};
/* 80D2406C-80D24078 0001E0 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */
SECTION_DATA extern void* __vt__10cCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10cCcD_GSttsFv,
};
/* 80D24078-80D24084 0001EC 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */
SECTION_DATA extern void* __vt__10dCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10dCcD_GSttsFv,
};
/* 80D24084-80D240A8 0001F8 0024+00 2/2 0/0 0/0 .data __vt__18dPa_levelEcallBack */
SECTION_DATA extern void* __vt__18dPa_levelEcallBack[9] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__18dPa_levelEcallBackFv,
(void*)execute__18JPAEmitterCallBackFP14JPABaseEmitter,
(void*)executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter,
(void*)draw__18JPAEmitterCallBackFP14JPABaseEmitter,
(void*)drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter,
(void*)NULL,
(void*)cleanup__18dPa_levelEcallBackFv,
};
/* 80D240A8-80D240CC 00021C 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */
SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_ObjAcchFv,
(void*)NULL,
(void*)NULL,
(void*)func_80D23DAC,
(void*)NULL,
(void*)NULL,
(void*)func_80D23DA4,
};
/* 80D240CC-80D240D8 000240 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 80D240D8-80D240E4 00024C 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */
SECTION_DATA extern void* __vt__8cM3dGSph[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGSphFv,
};
/* 80D240E4-80D240FC 000258 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */
SECTION_DATA extern void* __vt__17dEvLib_callback_c[6] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__17dEvLib_callback_cFv,
(void*)eventStart__17dEvLib_callback_cFv,
(void*)eventRun__17dEvLib_callback_cFv,
(void*)eventEnd__17dEvLib_callback_cFv,
};
/* 80D23B24-80D23C40 002084 011C+00 2/1 0/0 0/0 .text __dt__15daObjVolcBall_cFv */
// daObjVolcBall_c::~daObjVolcBall_c() {
extern "C" void __dt__15daObjVolcBall_cFv() {
// NONMATCHING
}
/* 80D23C40-80D23C88 0021A0 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */
// dEvLib_callback_c::~dEvLib_callback_c() {
extern "C" void __dt__17dEvLib_callback_cFv() {
// NONMATCHING
}
/* 80D23C88-80D23C90 0021E8 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */
// int dEvLib_callback_c::eventRun() {
extern "C" int eventRun__17dEvLib_callback_cFv(void* this_) {
return true;
}
/* 80D23C90-80D23C98 0021F0 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */
// int dEvLib_callback_c::eventEnd() {
extern "C" int eventEnd__17dEvLib_callback_cFv(void* this_) {
return true;
}
/* 80D23C98-80D23CE0 0021F8 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
// cCcD_GStts::~cCcD_GStts() {
extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* 80D23CE0-80D23D54 002240 0074+00 1/0 0/0 0/0 .text __dt__18dPa_levelEcallBackFv */
// dPa_levelEcallBack::~dPa_levelEcallBack() {
extern "C" void __dt__18dPa_levelEcallBackFv() {
// NONMATCHING
}
/* 80D23D54-80D23D58 0022B4 0004+00 1/0 0/0 0/0 .text
* execute__18JPAEmitterCallBackFP14JPABaseEmitter */
// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) {
extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0) {
/* empty function */
}
/* 80D23D58-80D23D5C 0022B8 0004+00 1/0 0/0 0/0 .text
* executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter */
// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) {
extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0) {
/* empty function */
}
/* 80D23D5C-80D23D60 0022BC 0004+00 1/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter
*/
// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) {
extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0) {
/* empty function */
}
/* 80D23D60-80D23D64 0022C0 0004+00 1/0 0/0 0/0 .text
* drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter */
// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) {
extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(JPAEmitterCallBack* this_,
JPABaseEmitter* param_0) {
/* empty function */
}
/* 80D23D64-80D23D6C 0022C4 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv
*/
// bool dEvLib_callback_c::eventStart()() {
extern "C" int eventStart__17dEvLib_callback_cFv(void* this_) {
return true;
}
/* 80D23D6C-80D23D88 0022CC 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<Uc>__FPUc */
extern "C" u8 func_80D23D6C(u8* param_0) {
// NONMATCHING
}
/* 80D23D88-80D23DA4 0022E8 001C+00 3/3 0/0 0/0 .text cLib_calcTimer<Ul>__FPUl */
extern "C" u32 func_80D23D88(u32* param_0) {
// NONMATCHING
}
/* 80D23DA4-80D23DAC 002304 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */
static void func_80D23DA4() {
// NONMATCHING
}
/* 80D23DAC-80D23DB4 00230C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */
static void func_80D23DAC() {
// NONMATCHING
}
/* 80D23DB4-80D23DBC 002314 0008+00 1/0 0/0 0/0 .text @1384@eventStart__15daObjVolcBall_cFv */
static void func_80D23DB4() {
// NONMATCHING
}
/* 80D23DBC-80D23DC4 00231C 0008+00 1/0 0/0 0/0 .text @1384@__dt__15daObjVolcBall_cFv */
static void func_80D23DBC() {
// NONMATCHING
}
/* 80D23E80-80D23E80 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_obj_wchain.cpp
+29 -464
View File
@@ -7,105 +7,14 @@
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "dol2asm.h"
#include "SSystem/SComponent/c_math.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
//
// Forward References:
//
extern "C" void createHeap__13daObjWchain_cFv();
extern "C" static void daObjWchain_createHeap__FP10fopAc_ac_c();
extern "C" void create__13daObjWchain_cFv();
extern "C" void __dt__5csXyzFv();
extern "C" void __ct__5csXyzFv();
extern "C" void __ct__4cXyzFv();
extern "C" void __dt__4cXyzFv();
extern "C" static void daObjWchain_Create__FP10fopAc_ac_c();
extern "C" void __dt__13daObjWchain_cFv();
extern "C" static void daObjWchain_Delete__FP13daObjWchain_c();
extern "C" void setMatrix__13daObjWchain_cFv();
extern "C" void getChainAngleZ__13daObjWchain_cFP4cXyzi();
extern "C" void setChainPos__13daObjWchain_cFv();
extern "C" void execute__13daObjWchain_cFv();
extern "C" static void daObjWchain_Execute__FP13daObjWchain_c();
extern "C" void draw__19daObjWchain_shape_cFv();
extern "C" void draw__13daObjWchain_cFv();
extern "C" static void daObjWchain_Draw__FP13daObjWchain_c();
extern "C" void __dt__19daObjWchain_shape_cFv();
//
// External References:
//
extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_ZrotM__FPA4_fs();
extern "C" void transM__14mDoMtx_stack_cFfff();
extern "C" void transM__14mDoMtx_stack_cFRC4cXyz();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff();
extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff();
extern "C" void roofCheck__11fopAcM_rc_cFPC4cXyz();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void offSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void dKy_setLight_again__Fv();
extern "C" void dKy_GxFog_tevstr_set__FP12dKy_tevstr_c();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void __ml__4cXyzCFf();
extern "C" void normalizeZP__4cXyzFv();
extern "C" void atan2sY_XZ__4cXyzCFv();
extern "C" void __ct__5csXyzFsss();
extern "C" void cM_rad2s__Ff();
extern "C" void cM_atan2s__Fff();
extern "C" void cM_rnd__Fv();
extern "C" void cM_rndF__Ff();
extern "C" void cM_rndFX__Ff();
extern "C" void cLib_chaseF__FPfff();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer();
extern "C" void loadPreDrawSetting__8J3DShapeCFv();
extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void _savegpr_20();
extern "C" void _savegpr_22();
extern "C" void _restgpr_20();
extern "C" void _restgpr_22();
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" f32 Zero__4cXyz[3];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" f32 mRoofY__11fopAcM_rc_c;
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
//
// Declarations:
//
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
/* 80D31924-80D3192C 000000 0007+01 8/8 0/0 0/0 .rodata l_arcName */
static char const l_arcName[7] = "Wchain";
/* 80D2FEF8-80D2FF9C 000078 00A4+00 1/1 0/0 0/0 .text createHeap__13daObjWchain_cFv */
#ifdef NONMATCHING
// matches once daObjWchain_shape_c inheritance is resolved
int daObjWchain_c::createHeap() {
J3DModelData* handle_model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
mpHandleModel = mDoExt_J3DModel__create(handle_model_data, 0x80000, 0x11000084);
@@ -116,169 +25,13 @@ int daObjWchain_c::createHeap() {
mShape.setUserArea((u32)this);
return 1;
}
#else
int daObjWchain_c::createHeap() {
// NONMATCHING
}
#endif
/* 80D2FF9C-80D2FFBC 00011C 0020+00 1/1 0/0 0/0 .text daObjWchain_createHeap__FP10fopAc_ac_c */
static int daObjWchain_createHeap(fopAc_ac_c* i_this) {
return static_cast<daObjWchain_c*>(i_this)->createHeap();
}
/* ############################################################################################## */
/* 80D3192C-80D31930 000008 0004+00 0/1 0/0 0/0 .rodata @3744 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3744 = -200.0f;
COMPILER_STRIP_GATE(0x80D3192C, &lit_3744);
#pragma pop
/* 80D31930-80D31934 00000C 0004+00 0/1 0/0 0/0 .rodata @3745 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3745 = -45.0f;
COMPILER_STRIP_GATE(0x80D31930, &lit_3745);
#pragma pop
/* 80D31934-80D31938 000010 0004+00 0/1 0/0 0/0 .rodata @3746 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3746 = 200.0f;
COMPILER_STRIP_GATE(0x80D31934, &lit_3746);
#pragma pop
/* 80D31938-80D3193C 000014 0004+00 0/1 0/0 0/0 .rodata @3747 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3747 = 800.0f;
COMPILER_STRIP_GATE(0x80D31938, &lit_3747);
#pragma pop
/* 80D3193C-80D31940 000018 0004+00 0/2 0/0 0/0 .rodata @3748 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3748 = 53.75f;
COMPILER_STRIP_GATE(0x80D3193C, &lit_3748);
#pragma pop
/* 80D31940-80D31944 00001C 0004+00 0/1 0/0 0/0 .rodata @3749 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3749 = 280.0f;
COMPILER_STRIP_GATE(0x80D31940, &lit_3749);
#pragma pop
/* 80D31944-80D31948 000020 0004+00 0/2 0/0 0/0 .rodata @3750 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3750 = 100.0f;
COMPILER_STRIP_GATE(0x80D31944, &lit_3750);
#pragma pop
/* 80D31948-80D3194C 000024 0004+00 0/2 0/0 0/0 .rodata @3751 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3751 = 250.0f;
COMPILER_STRIP_GATE(0x80D31948, &lit_3751);
#pragma pop
/* 80D3194C-80D31950 000028 0004+00 0/2 0/0 0/0 .rodata @3752 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3752 = 600.0f;
COMPILER_STRIP_GATE(0x80D3194C, &lit_3752);
#pragma pop
/* 80D31950-80D31954 00002C 0004+00 0/5 0/0 0/0 .rodata @3753 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3753[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80D31950, &lit_3753);
#pragma pop
/* 80D31954-80D31958 000030 0004+00 0/1 0/0 0/0 .rodata @3754 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3754 = -7.0f;
COMPILER_STRIP_GATE(0x80D31954, &lit_3754);
#pragma pop
/* 80D31958-80D3195C 000034 0004+00 0/1 0/0 0/0 .rodata @3755 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3755 = 16384.0f;
COMPILER_STRIP_GATE(0x80D31958, &lit_3755);
#pragma pop
/* 80D3195C-80D31960 000038 0004+00 0/1 0/0 0/0 .rodata @3756 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3756 = 2048.0f;
COMPILER_STRIP_GATE(0x80D3195C, &lit_3756);
#pragma pop
/* 80D31960-80D31964 00003C 0004+00 0/3 0/0 0/0 .rodata @3757 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3757 = 17.5f;
COMPILER_STRIP_GATE(0x80D31960, &lit_3757);
#pragma pop
/* 80D31964-80D3196C 000040 0008+00 0/2 0/0 0/0 .rodata @3759 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3759[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D31964, &lit_3759);
#pragma pop
/* 80D319E4-80D31A04 -00001 0020+00 1/0 0/0 0/0 .data l_daObjWchain_Method */
static actor_method_class l_daObjWchain_Method = {
(process_method_func)daObjWchain_Create__FP10fopAc_ac_c,
(process_method_func)daObjWchain_Delete__FP13daObjWchain_c,
(process_method_func)daObjWchain_Execute__FP13daObjWchain_c,
0,
(process_method_func)daObjWchain_Draw__FP13daObjWchain_c,
};
/* 80D31A04-80D31A34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Wchain */
extern actor_process_profile_definition g_profile_Obj_Wchain = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_Wchain, // mProcName
&g_fpcLf_Method.mBase, // sub_method
0x000007BC, // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
247, // mPriority
&l_daObjWchain_Method, // sub_method
0x00060100, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80D31A34-80D31A48 000050 0014+00 3/3 0/0 0/0 .data __vt__19daObjWchain_shape_c */
SECTION_DATA extern void* __vt__19daObjWchain_shape_c[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)entry__9J3DPacketFP13J3DDrawBuffer,
(void*)draw__19daObjWchain_shape_cFv,
(void*)__dt__19daObjWchain_shape_cFv,
};
/* 80D2FFBC-80D30394 00013C 03D8+00 1/1 0/0 0/0 .text create__13daObjWchain_cFv */
#ifdef NONMATCHING
// matches once daObjWchain_shape_c inheritance is resolved
cPhs__Step daObjWchain_c::create() {
fopAcM_SetupActor(this, daObjWchain_c);
mSw = fopAcM_GetParam(this) & 0xff;
@@ -330,35 +83,6 @@ cPhs__Step daObjWchain_c::create() {
}
return step;
}
#else
cPhs__Step daObjWchain_c::create() {
// NONMATCHING
}
#endif
/* 80D30394-80D303D0 000514 003C+00 2/2 0/0 0/0 .text __dt__5csXyzFv */
// csXyz::~csXyz() {
extern "C" void __dt__5csXyzFv() {
// NONMATCHING
}
/* 80D303D0-80D303D4 000550 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */
// csXyz::csXyz() {
extern "C" void __ct__5csXyzFv() {
/* empty function */
}
/* 80D303D4-80D303D8 000554 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */
// cXyz::cXyz() {
extern "C" void __ct__4cXyzFv() {
/* empty function */
}
/* 80D303D8-80D30414 000558 003C+00 2/2 0/0 0/0 .text __dt__4cXyzFv */
// cXyz::~cXyz() {
extern "C" void __dt__4cXyzFv() {
// NONMATCHING
}
/* 80D30414-80D30434 000594 0020+00 1/0 0/0 0/0 .text daObjWchain_Create__FP10fopAc_ac_c
*/
@@ -367,16 +91,9 @@ static cPhs__Step daObjWchain_Create(fopAc_ac_c* i_this) {
}
/* 80D30434-80D3050C 0005B4 00D8+00 1/1 0/0 0/0 .text __dt__13daObjWchain_cFv */
#ifdef NONMATCHING
// matches once daObjWchain_shape_c inheritance is resolved
daObjWchain_c::~daObjWchain_c() {
dComIfG_resDelete(&mPhaseReq, l_arcName);
}
#else
daObjWchain_c::~daObjWchain_c() {
// NONMATCHING
}
#endif
/* 80D3050C-80D30534 00068C 0028+00 1/0 0/0 0/0 .text daObjWchain_Delete__FP13daObjWchain_c */
static int daObjWchain_Delete(daObjWchain_c* i_this) {
@@ -384,23 +101,6 @@ static int daObjWchain_Delete(daObjWchain_c* i_this) {
return 1;
}
/* ############################################################################################## */
/* 80D3196C-80D31978 000048 000C+00 0/1 0/0 0/0 .rodata eyeOffset$3803 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const eyeOffset[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x57, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D3196C, &eyeOffset);
#pragma pop
/* 80D31978-80D3197C 000054 0004+00 0/2 0/0 0/0 .rodata @3819 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3819 = 8.75f;
COMPILER_STRIP_GATE(0x80D31978, &lit_3819);
#pragma pop
/* 80D30534-80D305E4 0006B4 00B0+00 2/2 0/0 0/0 .text setMatrix__13daObjWchain_cFv */
void daObjWchain_c::setMatrix() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -412,49 +112,6 @@ void daObjWchain_c::setMatrix() {
mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
}
/* ############################################################################################## */
/* 80D3197C-80D31984 000058 0008+00 0/2 0/0 0/0 .rodata @3863 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3863[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D3197C, &lit_3863);
#pragma pop
/* 80D31984-80D3198C 000060 0008+00 0/2 0/0 0/0 .rodata @3864 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3864[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D31984, &lit_3864);
#pragma pop
/* 80D3198C-80D31994 000068 0008+00 0/2 0/0 0/0 .rodata @3865 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3865[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D3198C, &lit_3865);
#pragma pop
/* 80D31994-80D31998 000070 0004+00 0/1 0/0 0/0 .rodata @3866 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3866 = 512.0f;
COMPILER_STRIP_GATE(0x80D31994, &lit_3866);
#pragma pop
/* 80D31998-80D3199C 000074 0004+00 0/2 0/0 0/0 .rodata @3867 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3867 = 0.5f;
COMPILER_STRIP_GATE(0x80D31998, &lit_3867);
#pragma pop
/* 80D305E4-80D3080C 000764 0228+00 1/1 0/0 0/0 .text getChainAngleZ__13daObjWchain_cFP4cXyzi */
s16 daObjWchain_c::getChainAngleZ(cXyz* param_0, int param_1) {
cXyz vec(param_0->x, 0.0f, param_0->z);
@@ -470,85 +127,8 @@ s16 daObjWchain_c::getChainAngleZ(cXyz* param_0, int param_1) {
}
}
/* ############################################################################################## */
/* 80D3199C-80D319A8 000078 000C+00 0/1 0/0 0/0 .rodata currentOffset$3872 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const currentOffset[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x57, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D3199C, &currentOffset);
#pragma pop
/* 80D319A8-80D319B4 000084 000C+00 0/1 0/0 0/0 .rodata chainOffset$3873 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const chainOffset[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x8C, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D319A8, &chainOffset);
#pragma pop
/* 80D319B4-80D319B8 000090 0004+00 0/1 0/0 0/0 .rodata @4154 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4154 = 0.75f;
COMPILER_STRIP_GATE(0x80D319B4, &lit_4154);
#pragma pop
/* 80D319B8-80D319BC 000094 0004+00 0/2 0/0 0/0 .rodata @4155 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4155 = 1.0f;
COMPILER_STRIP_GATE(0x80D319B8, &lit_4155);
#pragma pop
/* 80D319BC-80D319C0 000098 0004+00 0/1 0/0 0/0 .rodata @4156 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4156 = 5.0f;
COMPILER_STRIP_GATE(0x80D319BC, &lit_4156);
#pragma pop
/* 80D319C0-80D319C4 00009C 0004+00 0/1 0/0 0/0 .rodata @4157 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4157 = 30.0f;
COMPILER_STRIP_GATE(0x80D319C0, &lit_4157);
#pragma pop
/* 80D319C4-80D319C8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4158 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4158 = 2.0f / 35.0f;
COMPILER_STRIP_GATE(0x80D319C4, &lit_4158);
#pragma pop
/* 80D319C8-80D319CC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4159 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4159 = 1.0f / 5.0f;
COMPILER_STRIP_GATE(0x80D319C8, &lit_4159);
#pragma pop
/* 80D319CC-80D319D0 0000A8 0004+00 0/1 0/0 0/0 .rodata @4160 */
#pragma push
#pragma force_active on
SECTION_RODATA static u32 const lit_4160 = 0x40C90FDB;
COMPILER_STRIP_GATE(0x80D319CC, &lit_4160);
#pragma pop
/* 80D319D0-80D319D4 0000AC 0004+00 0/1 0/0 0/0 .rodata @4161 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4161 = 1.0f / 25.0f;
COMPILER_STRIP_GATE(0x80D319D0, &lit_4161);
#pragma pop
/* 80D3080C-80D310AC 00098C 08A0+00 1/1 0/0 0/0 .text setChainPos__13daObjWchain_cFv */
#ifdef NONMATCHING
// regalloc, instruction ordering
// NONMATCHING regalloc, instruction ordering
void daObjWchain_c::setChainPos() {
cXyz prev_pos, vec1;
if (mRide) {
@@ -659,33 +239,6 @@ void daObjWchain_c::setChainPos() {
mHandleRotation = cM_atan2s(vec1.x, JMAFastSqrt(vec1.y * vec1.y + vec1.z * vec1.z));
}
}
#else
void daObjWchain_c::setChainPos() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80D319D4-80D319D8 0000B0 0004+00 0/1 0/0 0/0 .rodata @4252 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4252 = -1.0f;
COMPILER_STRIP_GATE(0x80D319D4, &lit_4252);
#pragma pop
/* 80D319D8-80D319DC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4253 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4253 = 1.0f / 10.0f;
COMPILER_STRIP_GATE(0x80D319D8, &lit_4253);
#pragma pop
/* 80D319DC-80D319E0 0000B8 0004+00 0/1 0/0 0/0 .rodata @4254 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4254 = 15.0f;
COMPILER_STRIP_GATE(0x80D319DC, &lit_4254);
#pragma pop
/* 80D310AC-80D313F8 00122C 034C+00 1/1 0/0 0/0 .text execute__13daObjWchain_cFv */
int daObjWchain_c::execute() {
@@ -748,14 +301,6 @@ static int daObjWchain_Execute(daObjWchain_c* i_this) {
return i_this->execute();
}
/* ############################################################################################## */
/* 80D319E0-80D319E4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4364 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4364 = -8.75f;
COMPILER_STRIP_GATE(0x80D319E0, &lit_4364);
#pragma pop
/* 80D31418-80D31810 001598 03F8+00 1/0 0/0 0/0 .text draw__19daObjWchain_shape_cFv */
void daObjWchain_shape_c::draw() {
daObjWchain_c* chain = (daObjWchain_c*)getUserArea();
@@ -816,8 +361,6 @@ void daObjWchain_shape_c::draw() {
/* 80D31810-80D318A0 001990 0090+00 1/1 0/0 0/0 .text draw__13daObjWchain_cFv */
#ifdef NONMATCHING
// matches once daObjWchain_shape_c inheritance is resolved
int daObjWchain_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpHandleModel, &tevStr);
@@ -826,14 +369,36 @@ int daObjWchain_c::draw() {
dComIfGd_getOpaList()->entryImm(&mShape, 0);
return 1;
}
#else
int daObjWchain_c::draw() {
// NONMATCHING
}
#endif
/* 80D318A0-80D318C0 001A20 0020+00 1/0 0/0 0/0 .text daObjWchain_Draw__FP13daObjWchain_c
*/
static int daObjWchain_Draw(daObjWchain_c* i_this) {
return i_this->draw();
}
/* 80D319E4-80D31A04 -00001 0020+00 1/0 0/0 0/0 .data l_daObjWchain_Method */
static actor_method_class l_daObjWchain_Method = {
(process_method_func)daObjWchain_Create,
(process_method_func)daObjWchain_Delete,
(process_method_func)daObjWchain_Execute,
NULL,
(process_method_func)daObjWchain_Draw,
};
/* 80D31A04-80D31A34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Wchain */
extern actor_process_profile_definition g_profile_Obj_Wchain = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_Wchain, // mProcName
&g_fpcLf_Method.mBase, // sub_method
0x000007BC, // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
247, // mPriority
&l_daObjWchain_Method, // sub_method
0x00060100, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
src/d/actor/d_a_obj_zraMark.cpp
+11 -121
View File
@@ -7,115 +7,13 @@
#include "SSystem/SComponent/c_lib.h"
#include "SSystem/SComponent/c_math.h"
#include "d/d_meter2_info.h"
#include "dol2asm.h"
#include "d/actor/d_a_npc_hoz.h"
#include "d/actor/d_a_npc_zra.h"
//
// Forward References:
//
extern "C" static void createSolidHeap__FP10fopAc_ac_c();
extern "C" void Create__14daObjZraMark_cFv();
extern "C" void CreateHeap__14daObjZraMark_cFv();
extern "C" void Execute__14daObjZraMark_cFv();
extern "C" void Draw__14daObjZraMark_cFv();
extern "C" void Delete__14daObjZraMark_cFv();
extern "C" void getType__14daObjZraMark_cFv();
extern "C" void setBaseMtx__14daObjZraMark_cFv();
extern "C" void col_init__14daObjZraMark_cFv();
extern "C" void col_set__14daObjZraMark_cFv();
extern "C" void schHoz__14daObjZraMark_cFv();
extern "C" void entryPointer__14daObjZraMark_cFP10fopAc_ac_c();
extern "C" void informBlast__14daObjZraMark_cFv();
extern "C" static void daObjZraMark_Execute__FP14daObjZraMark_c();
extern "C" static void daObjZraMark_Draw__FP14daObjZraMark_c();
extern "C" static bool daObjZraMark_IsDelete__FP14daObjZraMark_c();
extern "C" static void daObjZraMark_Delete__FP14daObjZraMark_c();
extern "C" static void daObjZraMark_create__FP10fopAc_ac_c();
extern "C" void create__16_ZraMark_Hahen_cFRC4cXyzScScScSc();
extern "C" void loadModel__16_ZraMark_Hahen_cFv();
extern "C" void init__16_ZraMark_Hahen_cFRC4cXyzScScSc();
extern "C" void calcSpeed__16_ZraMark_Hahen_cFv();
extern "C" void setMtx__16_ZraMark_Hahen_cFv();
extern "C" void draw__16_ZraMark_Hahen_cFv();
extern "C" void create__20_ZraMark_Hahen_Mng_cFRC4cXyzScScScSc();
extern "C" void calc__20_ZraMark_Hahen_Mng_cFv();
extern "C" void draw__20_ZraMark_Hahen_Mng_cFv();
extern "C" void func_80D43ACC(void* _this, int, int);
extern "C" void __dt__16_ZraMark_Hahen_cFv();
extern "C" void __ct__16_ZraMark_Hahen_cFv();
extern "C" void __ct__11J3DLightObjFv();
extern "C" void __dt__18daNpcF_ActorMngr_cFv();
extern "C" void __ct__18daNpcF_ActorMngr_cFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" extern char const* const d_a_obj_zraMark__stringBase0;
//
// External References:
//
extern "C" void scaleM__14mDoMtx_stack_cFfff();
extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz();
extern "C" void XYZrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_SearchByName__FsPP10fopAc_ac_c();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
extern "C" void GetTgHitObj__12dCcD_GObjInfFv();
extern "C" void GetTgHitObjSe__12dCcD_GObjInfFv();
extern "C" void getHitSeID__12dCcD_GObjInfFUci();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void initialize__18daNpcF_ActorMngr_cFv();
extern "C" void entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c();
extern "C" void getActorP__18daNpcF_ActorMngr_cFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void dKy_tevstr_init__FP12dKy_tevstr_cScUc();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __apl__5csXyzFR5csXyz();
extern "C" void cM_rndF__Ff();
extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void SetH__8cM3dGCylFf();
extern "C" void SetR__8cM3dGCylFf();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dt__14Z2SoundObjBaseFv();
extern "C" void deleteObject__14Z2SoundObjBaseFv();
extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase();
extern "C" void __ct__16Z2SoundObjSimpleFv();
extern "C" void __dl__FPv();
extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo();
extern "C" void __construct_array();
extern "C" void _savegpr_22();
extern "C" void _savegpr_25();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_22();
extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern void* __vt__16Z2SoundObjSimple[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
_ZraMark_Hahen_c::_ZraMark_Hahen_c() {
mpModel = NULL;
setColor(0);
}
/* 80D42658-80D42678 000078 0020+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */
static int createSolidHeap(fopAc_ac_c* i_this) {
@@ -149,16 +47,8 @@ static const dCcD_SrcCyl l_sph_src = {
/* 80D43DE0-80D43DF0 000058 0010+00 0/1 0/0 0/0 .rodata l_arcIdx */
static const int l_arcIdx[] = {3, 6, 5, 4};
/* 80D43FA0-80D43FA4 000000 0004+00 1/1 0/0 0/0 .data None */
/* SECTION_DATA static u8 data_80D43FA0[4] = {
0x00,
0x00,
0x00,
0x00,
}; */
/* 80D43FA4-80D43FA8 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */
SECTION_DATA static char* l_arcName[1] = {"buoy"};
static char* l_arcName[1] = {"buoy"};
/* 80D42678-80D4287C 000098 0204+00 1/1 0/0 0/0 .text Create__14daObjZraMark_cFv */
int daObjZraMark_c::Create() {
@@ -677,11 +567,11 @@ void _ZraMark_Hahen_Mng_c::draw() {
/* 80D43FA8-80D43FC8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjZraMark_Method */
static actor_method_class l_daObjZraMark_Method = {
(process_method_func)daObjZraMark_create__FP10fopAc_ac_c,
(process_method_func)daObjZraMark_Delete__FP14daObjZraMark_c,
(process_method_func)daObjZraMark_Execute__FP14daObjZraMark_c,
(process_method_func)daObjZraMark_IsDelete__FP14daObjZraMark_c,
(process_method_func)daObjZraMark_Draw__FP14daObjZraMark_c,
(process_method_func)daObjZraMark_create,
(process_method_func)daObjZraMark_Delete,
(process_method_func)daObjZraMark_Execute,
(process_method_func)daObjZraMark_IsDelete,
(process_method_func)daObjZraMark_Draw,
};
/* 80D43FC8-80D43FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_ZRA_MARK */
@@ -700,4 +590,4 @@ extern actor_process_profile_definition g_profile_ZRA_MARK = {
0x00044100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/d_drawlist.cpp
+11 -429
View File
@@ -10,6 +10,7 @@
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
#include "SSystem/SComponent/c_bg_s_shdw_draw.h"
#include "SSystem/SComponent/c_math.h"
#include "d/d_com_inf_game.h"
#include "dol2asm.h"
#include "m_Do/m_Do_graphic.h"
@@ -378,8 +379,6 @@ void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) {
}
/* 80051AF0-80051CF0 04C430 0200+00 1/0 0/0 0/0 .text draw__13dDlst_2DTri_cFv */
// vtable data
#ifdef NONMATCHING
void dDlst_2DTri_c::draw() {
f32 f2 = cM_scos(field_0xc);
f32 f3 = cM_ssin(field_0xc);
@@ -413,16 +412,8 @@ void dDlst_2DTri_c::draw() {
GXEnd();
dComIfGp_getCurrentGrafPort()->setup2D();
}
#else
// void dDlst_2DTri_c::draw() {
extern "C" void draw__13dDlst_2DTri_cFv() {
// NONMATCHING
}
#endif
/* 80051CF0-80051E5C 04C630 016C+00 1/0 0/0 0/0 .text draw__14dDlst_2DQuad_cFv */
// vtable
#ifdef NONMATCHING
void dDlst_2DQuad_c::draw() {
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -445,16 +436,8 @@ void dDlst_2DQuad_c::draw() {
GXEnd();
dComIfGp_getCurrentGrafPort()->setup2D();
}
#else
// void dDlst_2DQuad_c::draw() {
extern "C" void draw__14dDlst_2DQuad_cFv() {
// NONMATCHING
}
#endif
/* 80051E5C-80051F98 04C79C 013C+00 1/0 0/0 0/0 .text draw__15dDlst_2DPoint_cFv */
// vtable data
#ifdef NONMATCHING
void dDlst_2DPoint_c::draw() {
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -475,43 +458,10 @@ void dDlst_2DPoint_c::draw() {
GXEnd();
dComIfGp_getCurrentGrafPort()->setup2D();
}
#else
// void dDlst_2DPoint_c::draw() {
extern "C" void draw__15dDlst_2DPoint_cFv() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 80450648-8045064C 0000C8 0004+00 1/1 0/0 0/0 .sdata l_color$4033 */
SECTION_SDATA static _GXColor l_color_4033 = {
0xFF,
0xFF,
0xFF,
0xE0,
};
/* 80452008-8045200C 000608 0004+00 4/4 0/0 0/0 .sdata2 @4072 */
SECTION_SDATA2 static f32 lit_4072 = 0.5f;
/* 8045200C-80452010 00060C 0004+00 1/1 0/0 0/0 .sdata2 @4073 */
SECTION_SDATA2 static f32 lit_4073 = 32768.0f;
/* 80452010-80452018 000610 0004+04 10/10 0/0 0/0 .sdata2 @4074 */
SECTION_SDATA2 static f32 lit_4074[1 + 1 /* padding */] = {
0.0f,
/* padding */
0.0f,
};
/* 80452018-80452020 000618 0008+00 8/8 0/0 0/0 .sdata2 @4076 */
SECTION_SDATA2 static f64 lit_4076 = 4503599627370496.0 /* cast u32 to float */;
/* 80452020-80452028 000620 0008+00 5/5 0/0 0/0 .sdata2 @4079 */
SECTION_SDATA2 static f64 lit_4079 = 4503601774854144.0 /* cast s32 to float */;
/* 80051F98-80052354 04C8D8 03BC+00 1/0 0/0 0/0 .text draw__11dDlst_2DT_cFv */
void dDlst_2DT_c::draw() {
static GXColor l_color = {0xFF, 0xFF, 0xFF, 0xE0};
f32 var5 = field_0xe;
f32 var6 = field_0x10;
f32 var11 = (field_0x16 - field_0x12) * 0.5f / field_0x24;
@@ -534,7 +484,7 @@ void dDlst_2DT_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBX8, 0xf);
GXSetNumChans(1);
GXSetChanCtrl(GX_COLOR0A0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE);
l_color_4033.a = field_0xd;
l_color.a = field_0xd;
GXSetNumTexGens(1);
GXSetNumTevStages(1);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
@@ -547,7 +497,7 @@ void dDlst_2DT_c::draw() {
GXSetCullMode(GX_CULL_NONE);
GXSetDither(GX_TRUE);
GXLoadPosMtxImm(mDoMtx_getIdentity(), GX_PNMTX0);
GXSetChanMatColor(GX_COLOR0A0, l_color_4033);
GXSetChanMatColor(GX_COLOR0A0, l_color);
GXSetClipMode(GX_CLIP_DISABLE);
GXSetCurrentMtx(GX_PNMTX0);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
@@ -568,14 +518,7 @@ void dDlst_2DT_c::draw() {
dComIfGp_getCurrentGrafPort()->setup2D();
}
/* ############################################################################################## */
/* 80452028-8045202C 000628 0004+00 10/10 0/0 0/0 .sdata2 @4270 */
SECTION_SDATA2 static f32 lit_4270 = 1.0f;
/* 80052354-80052B00 04CC94 07AC+00 1/0 0/0 0/0 .text draw__12dDlst_2DT2_cFv */
// vtable data
#ifdef NONMATCHING
void dDlst_2DT2_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA6, 0);
@@ -771,12 +714,6 @@ void dDlst_2DT2_c::draw() {
GXSetClipMode(GX_CLIP_ENABLE);
dComIfGp_getCurrentGrafPort()->setup2D();
}
#else
// void dDlst_2DT2_c::draw() {
extern "C" void draw__12dDlst_2DT2_cFv() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 803A87A0-803A87C0 0058C0 000C+14 2/2 0/0 0/0 .data cNullVec__6Z2Calc */
@@ -842,7 +779,7 @@ SECTION_DATA static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFC, 0x61, 0xC1, 0x08, 0xFF, 0x90,
0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x0D, 0x61, 0x41, 0x00, 0x01, 0x35,
0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00,
0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
@@ -990,90 +927,6 @@ SECTION_DATA static Mtx mtx_adj = {
};
#pragma pop
/* 803A8DCC-803A8DDC 005EEC 0010+00 1/1 0/0 0/0 .data __vt__18dDlst_shadowPoly_c */
SECTION_DATA extern void* __vt__18dDlst_shadowPoly_c[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 803A8DDC-803A8DEC 005EFC 0010+00 2/2 0/0 0/0 .data __vt__22dDlst_shadowRealPoly_c */
SECTION_DATA extern void* __vt__22dDlst_shadowRealPoly_c[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)getTri__22dDlst_shadowRealPoly_cFv,
(void*)getTriMax__22dDlst_shadowRealPoly_cFv,
};
/* 803A8DEC-803A8DF8 005F0C 000C+00 2/2 0/0 0/0 .data __vt__14ShdwDrawPoly_c */
SECTION_DATA extern void* __vt__14ShdwDrawPoly_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14ShdwDrawPoly_cFv,
};
/* 803A8DF8-803A8E04 005F18 000C+00 0/0 2/2 0/0 .data __vt__18dDlst_effectLine_c */
SECTION_DATA extern void* __vt__18dDlst_effectLine_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__18dDlst_effectLine_cFv,
};
/* 803A8E04-803A8E14 005F24 0010+00 1/1 14/14 0/0 .data __vt__10J2DAnmBase */
SECTION_DATA extern void* __vt__10J2DAnmBase[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10J2DAnmBaseFv,
(void*)searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen,
};
/* 803A8E14-803A8E20 005F34 000C+00 0/0 0/0 0/0 .data __vt__11dDlst_blo_c */
SECTION_DATA extern void* __vt__11dDlst_blo_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__11dDlst_blo_cFv,
};
/* 803A8E20-803A8E2C 005F40 000C+00 1/1 1/1 0/0 .data __vt__10dDlst_2D_c */
SECTION_DATA extern void* __vt__10dDlst_2D_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__10dDlst_2D_cFv,
};
/* 803A8E2C-803A8E38 005F4C 000C+00 0/0 0/0 0/0 .data __vt__12dDlst_2DMt_c */
SECTION_DATA extern void* __vt__12dDlst_2DMt_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__12dDlst_2DMt_cFv,
};
/* 803A8E38-803A8E44 005F58 000C+00 0/0 0/0 0/0 .data __vt__11dDlst_2Dm_c */
SECTION_DATA extern void* __vt__11dDlst_2Dm_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__11dDlst_2Dm_cFv,
};
/* 803A8E44-803A8E5C 005F64 000C+0C 0/0 0/0 0/0 .data __vt__11dDlst_2DM_c */
SECTION_DATA extern void* __vt__11dDlst_2DM_c[3 + 3 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__11dDlst_2DM_cFv,
/* padding */
NULL,
NULL,
NULL,
};
/* 803A8E5C-803A8E68 005F7C 000C+00 1/1 0/0 0/0 .data __vt__12dDlst_2DT2_c */
SECTION_DATA extern void* __vt__12dDlst_2DT2_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__12dDlst_2DT2_cFv,
};
/* 80052B00-80052B4C 04D440 004C+00 1/1 0/0 0/0 .text __ct__12dDlst_2DT2_cFv */
dDlst_2DT2_c::dDlst_2DT2_c() {
field_0x40 = (GXColor){0, 0, 0, 0};
@@ -1105,10 +958,6 @@ void dDlst_2DT2_c::init(ResTIMG* i_timg, f32 param_1, f32 param_2, f32 param_3,
field_0x46 = param_5;
}
/* ############################################################################################## */
/* 80452030-80452034 000630 0004+00 2/2 0/0 0/0 .sdata2 @4360 */
SECTION_SDATA2 static f32 lit_4360 = 256.0f;
/* 80052C58-8005312C 04D598 04D4+00 1/0 0/0 0/0 .text draw__11dDlst_2DM_cFv */
void dDlst_2DM_c::draw() {
s16 r31 = field_0x22;
@@ -1239,8 +1088,6 @@ void dDlst_2Dm_c::draw() {
/* 8005364C-800539DC 04DF8C 0390+00 1/0 0/0 0/0 .text draw__12dDlst_2DMt_cFv */
// vtable
#ifdef NONMATCHING
void dDlst_2DMt_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
GXClearVtxDesc();
@@ -1311,12 +1158,6 @@ void dDlst_2DMt_c::draw() {
dComIfGp_getCurrentGrafPort()->setup2D();
}
}
#else
// void dDlst_2DMt_c::draw() {
extern "C" void draw__12dDlst_2DMt_cFv() {
// NONMATCHING
}
#endif
/* 800539DC-80053A00 04E31C 0024+00 0/0 1/0 0/0 .text getTexture__10J2DPictureCFUc */
// Should be inline
@@ -1396,19 +1237,6 @@ void cM_rnd_c::init(int s0, int s1, int s2) {
seed2 = s2;
}
/* ############################################################################################## */
/* 80452034-80452038 000634 0004+00 1/1 0/0 0/0 .sdata2 @4791 */
SECTION_SDATA2 static f32 lit_4791 = 30323.0f;
/* 80452038-8045203C 000638 0004+00 1/1 0/0 0/0 .sdata2 @4792 */
SECTION_SDATA2 static f32 lit_4792 = 30269.0f;
/* 8045203C-80452040 00063C 0004+00 1/1 0/0 0/0 .sdata2 @4793 */
SECTION_SDATA2 static f32 lit_4793 = 30307.0f;
/* 80452040-80452048 000640 0008+00 1/1 0/0 0/0 .sdata2 @4794 */
SECTION_SDATA2 static f64 lit_4794 = 1.0;
/* 80053CEC-80053DE0 04E62C 00F4+00 2/2 0/0 0/0 .text get__8cM_rnd_cFv */
f32 cM_rnd_c::get() {
seed0 = seed0 * 171 % 30269;
@@ -1425,13 +1253,9 @@ f32 cM_rnd_c::getF(f32 param_0) {
return get() * param_0;
}
/* ############################################################################################## */
/* 80452048-8045204C 000648 0004+00 5/5 0/0 0/0 .sdata2 @4806 */
SECTION_SDATA2 static f32 lit_4806 = 2.0f;
/* 80053E18-80053E60 04E758 0048+00 1/1 0/0 0/0 .text getFX__8cM_rnd_cFf */
f32 cM_rnd_c::getFX(f32 param_0) {
return ((get() - lit_4072) * param_0) * lit_4806;
return ((get() - 0.5f) * param_0) * 2.0f;
}
/* 80053E60-80053E9C 04E7A0 003C+00 1/1 0/0 0/0 .text getValue__8cM_rnd_cFff */
@@ -1439,13 +1263,7 @@ f32 cM_rnd_c::getValue(f32 param_0, f32 param_1) {
return param_0 + getF(param_1);
}
/* ############################################################################################## */
/* 8045204C-80452050 00064C 0004+00 1/1 0/0 0/0 .sdata2 @4876 */
SECTION_SDATA2 static f32 lit_4876 = 32767.0f;
/* 80053E9C-800541F4 04E7DC 0358+00 1/0 0/0 0/0 .text draw__18dDlst_effectLine_cFv */
// vtable data
#ifdef NONMATCHING
void dDlst_effectLine_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXClearVtxDesc();
@@ -1489,12 +1307,6 @@ void dDlst_effectLine_c::draw() {
GXEnd();
}
}
#else
// void dDlst_effectLine_c::draw() {
extern "C" void draw__18dDlst_effectLine_cFv() {
// NONMATCHING
}
#endif
/* 800541F4-80054288 04EB34 0094+00 0/0 1/1 0/0 .text
* update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff */
@@ -1613,13 +1425,6 @@ void dDlst_shadowReal_c::draw() {
mShadowRealPoly.draw();
}
/* ############################################################################################## */
/* 80452050-80452054 000650 0004+00 1/1 0/0 0/0 .sdata2 @5061 */
SECTION_SDATA2 static f32 lit_5061 = -1.0f / 5.0f;
/* 80452054-80452058 000654 0004+00 1/1 0/0 0/0 .sdata2 @5062 */
SECTION_SDATA2 static f32 lit_5062 = -90.0f;
/* 80054688-80054854 04EFC8 01CC+00 1/1 0/0 0/0 .text
* psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla */
static int psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int param_2,
@@ -1649,29 +1454,16 @@ static int psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int para
return 1;
}
/* ############################################################################################## */
/* 80452058-8045205C 000658 0004+00 1/1 0/0 0/0 .sdata2 @5127 */
SECTION_SDATA2 static f32 lit_5127 = 0.0020000000949949026f;
/* 8045205C-80452060 00065C 0004+00 1/1 0/0 0/0 .sdata2 @5128 */
SECTION_SDATA2 static f32 lit_5128 = 120.0f;
/* 80452060-80452064 000660 0004+00 1/1 0/0 0/0 .sdata2 @5129 */
SECTION_SDATA2 static f32 lit_5129 = 3.0f / 20.0f;
/* 80452064-80452068 000664 0004+00 3/3 0/0 0/0 .sdata2 @5130 */
SECTION_SDATA2 static f32 lit_5130 = 10000.0f;
/* 80054854-80054A6C 04F194 0218+00 1/1 0/0 0/0 .text
* realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c */
// vtable data
#ifdef NONMATCHING
static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
dDlst_shadowPoly_c* param_4) {
ShdwDrawPoly_c shdwDrawPoly;
cXyz local_8c;
cXyz local_98;
f32 var1 = param_1 + param_2 - cLib_maxLimit(param_1 * param_1 * 0.002f, 120.0f);
f32 tmp1 = param_1 * param_1 * 0.002f;
f32 tmp2 = cLib_maxLimit(tmp1, 120.0f);
f32 var1 = param_1 + param_2 - tmp2;
local_8c.y = param_0->y - var1;
local_98.y = param_0->y + param_1 * 0.15f;
local_98.x = param_0->x + param_3->x * var1;
@@ -1707,25 +1499,6 @@ static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* para
dComIfG_Bgsp().ShdwDraw(&shdwDrawPoly);
return TRUE;
}
#else
static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
dDlst_shadowPoly_c* param_4) {
// NONMATCHING
}
#endif
/* 80054A6C-80054ACC 04F3AC 0060+00 1/0 0/0 0/0 .text __dt__14ShdwDrawPoly_cFv */
// ShdwDrawPoly_c::~ShdwDrawPoly_c() {
extern "C" void __dt__14ShdwDrawPoly_cFv() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80452068-8045206C 000668 0004+00 1/1 0/0 0/0 .sdata2 @5155 */
SECTION_SDATA2 static f32 lit_5155 = 15.0f;
/* 8045206C-80452070 00066C 0004+00 1/1 0/0 0/0 .sdata2 @5156 */
SECTION_SDATA2 static f32 lit_5156 = 13.0f / 20.0f;
/* 80054ACC-80054BD0 04F40C 0104+00 2/2 0/0 0/0 .text setkankyoShadow__FP12dKy_tevstr_cPf
*/
@@ -1760,41 +1533,6 @@ static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) {
}
}
/* ############################################################################################## */
/* 80452070-80452074 000670 0004+00 1/1 0/0 0/0 .sdata2 @5267 */
SECTION_SDATA2 static f32 lit_5267 = 50.0f;
/* 80452074-80452078 000674 0004+00 1/1 0/0 0/0 .sdata2 @5268 */
SECTION_SDATA2 static f32 lit_5268 = 4.0f / 5.0f;
/* 80452078-80452080 000678 0004+04 1/1 0/0 0/0 .sdata2 @5269 */
SECTION_SDATA2 static f32 lit_5269[1 + 1 /* padding */] = {
255.0f,
/* padding */
0.0f,
};
/* 80452080-80452088 000680 0008+00 1/1 0/0 0/0 .sdata2 @5270 */
SECTION_SDATA2 static f64 lit_5270 = 0.5;
/* 80452088-80452090 000688 0008+00 1/1 0/0 0/0 .sdata2 @5271 */
SECTION_SDATA2 static f64 lit_5271 = 3.0;
/* 80452090-80452098 000690 0008+00 1/1 0/0 0/0 .sdata2 @5272 */
SECTION_SDATA2 static u8 lit_5272[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80452098-8045209C 000698 0004+00 1/1 0/0 0/0 .sdata2 @5273 */
SECTION_SDATA2 static f32 lit_5273 = 2.0f / 5.0f;
/* 8045209C-804520A0 00069C 0004+00 1/1 0/0 0/0 .sdata2 @5274 */
SECTION_SDATA2 static f32 lit_5274 = -1.0f;
/* 804520A0-804520A4 0006A0 0004+00 1/1 0/0 0/0 .sdata2 @5275 */
SECTION_SDATA2 static f32 lit_5275 = -0.5f;
/* 80054BD0-80055028 04F510 0458+00 1/1 0/0 0/0 .text
* setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c */
u8 dDlst_shadowReal_c::setShadowRealMtx(cXyz* param_0, cXyz* param_1, f32 param_2, f32 param_3,
@@ -1952,19 +1690,6 @@ void dDlst_shadowSimple_c::draw() {
GXCallDisplayList(l_shadowVolumeDL, 0x40);
}
/* ############################################################################################## */
/* 804520A4-804520A8 0006A4 0004+00 1/1 0/0 0/0 .sdata2 @5375 */
SECTION_SDATA2 static f32 lit_5375 = -255.0f;
/* 804520A8-804520AC 0006A8 0004+00 1/1 0/0 0/0 .sdata2 @5376 */
SECTION_SDATA2 static f32 lit_5376 = 0.000699999975040555f;
/* 804520AC-804520B0 0006AC 0004+00 1/1 0/0 0/0 .sdata2 @5377 */
SECTION_SDATA2 static f32 lit_5377 = 7.0f / 5.0f;
/* 804520B0-804520B4 0006B0 0004+00 1/1 0/0 0/0 .sdata2 @5378 */
SECTION_SDATA2 static f32 lit_5378 = 16.0f;
/* 800553EC-80055684 04FD2C 0298+00 1/1 0/0 0/0 .text
* set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj */
void dDlst_shadowSimple_c::set(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
@@ -2019,13 +1744,9 @@ void dDlst_shadowSimple_c::set(cXyz* param_0, f32 param_1, f32 param_2, cXyz* pa
mpTexObj = param_6;
}
/* ############################################################################################## */
/* 80450654-80450658 0000D4 0004+00 1/1 0/0 0/0 .sdata l_realImageSize$5383 */
SECTION_SDATA static u16 l_realImageSize[2] = {192, 64};
/* 80055684-80055768 04FFC4 00E4+00 1/1 0/0 0/0 .text init__21dDlst_shadowControl_cFv */
void dDlst_shadowControl_c::init() {
static u16 l_realImageSize[2] = {192, 64};
for (int i = 0; i < 2; i++) {
u16 size = l_realImageSize[i];
@@ -2103,14 +1824,6 @@ void dDlst_shadowControl_c::imageDraw(Mtx param_0) {
GXSetDither(GX_TRUE);
}
/* ############################################################################################## */
/* 80450658-8045065C 0000D8 0004+00 1/1 0/0 0/0 .sdata clearColor$5435 */
SECTION_SDATA static GXColor clearColor = {0x00, 0x00, 0x00, 0x40};
/* 804520B4-804520B8 0006B4 0004+00 1/1 0/0 0/0 .sdata2 @5433 */
SECTION_SDATA2 static u32 lit_5433 = 0x00000020;
/* 80055A14-80055C74 050354 0260+00 0/0 1/1 0/0 .text draw__21dDlst_shadowControl_cFPA4_f
*/
void dDlst_shadowControl_c::draw(Mtx param_0) {
@@ -2127,6 +1840,7 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
GXColor matColor = {0, 0, 0, 0x20};
GXSetChanMatColor(GX_ALPHA0, matColor);
static GXColor clearColor = {0x00, 0x00, 0x00, 0x40};
clearColor.a = mDoGph_gInf_c::getBackColor().a;
GXSetTevColor(GX_TEVREG1, clearColor);
GXSetTevColor(GX_TEVREG2, g_whiteColor);
@@ -2165,17 +1879,6 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
GXSetAlphaUpdate(GX_DISABLE);
}
/* ############################################################################################## */
/* 804520B8-804520BC 0006B8 0004+00 1/1 0/0 0/0 .sdata2 @5551 */
SECTION_SDATA2 static f32 lit_5551 = 0.003000000026077032f;
/* 804520BC-804520C0 0006BC 0004+00 1/1 0/0 0/0 .sdata2 @5552 */
SECTION_SDATA2 static f32 lit_5552 = -1000.0f;
/* 804520C0-804520C4 0006C0 0004+00 1/1 0/0 0/0 .sdata2 @5553 */
SECTION_SDATA2 static f32 lit_5553 = 0.0010000000474974513f;
/* 80055C74-80055F1C 0505B4 02A8+00 0/0 1/1 1/1 .text
* setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c */
int dDlst_shadowControl_c::setReal(u32 param_1, s8 param_2, J3DModel* param_3, cXyz* param_4,
@@ -2270,7 +1973,6 @@ int dDlst_shadowControl_c::setReal(u32 param_1, s8 param_2, J3DModel* param_3, c
return rv;
}
/* 80055F1C-80055F84 05085C 0068+00 0/0 1/1 45/45 .text
* addReal__21dDlst_shadowControl_cFUlP8J3DModel */
bool dDlst_shadowControl_c::addReal(u32 i_key, J3DModel* param_1) {
@@ -2300,7 +2002,6 @@ int dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_2, cX
return 1;
}
/* ############################################################################################## */
/* 804248D0-804248F0 0515F0 0020+00 1/1 6/6 173/173 .bss mSimpleTexObj__21dDlst_shadowControl_c */
GXTexObj dDlst_shadowControl_c::mSimpleTexObj;
@@ -2337,8 +2038,6 @@ void dDlst_peekZ_c::peekData() {
}
/* 800560F0-800561C8 050A30 00D8+00 0/0 1/1 0/0 .text __ct__12dDlst_list_cFv */
// TU vtable data order has to be fixed
#ifdef NONMATCHING
dDlst_list_c::dDlst_list_c() {
mpCopy2DEnd = &mpCopy2DDrawLists[4];
mp2DOpaTopEnd = &mp2DOpaTopDrawLists[16];
@@ -2351,41 +2050,6 @@ dDlst_list_c::dDlst_list_c() {
buffer++;
}
}
#else
dDlst_list_c::dDlst_list_c() {
// NONMATCHING
}
#endif
/* 800561C8-800561F8 050B08 0030+00 1/1 0/0 0/0 .text __ct__26mDoExt_3DlineMatSortPacketFv */
// mDoExt_3DlineMatSortPacket::mDoExt_3DlineMatSortPacket() {
extern "C" void __ct__26mDoExt_3DlineMatSortPacketFv() {
// NONMATCHING
}
/* 800561F8-80056270 050B38 0078+00 2/2 0/0 0/0 .text __dt__18dDlst_shadowReal_cFv */
// dDlst_shadowReal_c::~dDlst_shadowReal_c() {
extern "C" void __dt__18dDlst_shadowReal_cFv() {
// NONMATCHING
}
/* 80056270-800562D0 050BB0 0060+00 2/2 0/0 0/0 .text __dt__17dDlst_shadowTri_cFv */
// dDlst_shadowTri_c::~dDlst_shadowTri_c() {
extern "C" void __dt__17dDlst_shadowTri_cFv() {
// NONMATCHING
}
/* 800562D0-80056344 050C10 0074+00 1/1 0/0 0/0 .text __ct__18dDlst_shadowReal_cFv */
// dDlst_shadowReal_c::dDlst_shadowReal_c() {
extern "C" void __ct__18dDlst_shadowReal_cFv() {
// NONMATCHING
}
/* 80056344-8005638C 050C84 0048+00 1/1 0/0 0/0 .text __ct__17dDlst_shadowTri_cFv */
// dDlst_shadowTri_c::dDlst_shadowTri_c() {
extern "C" void __ct__17dDlst_shadowTri_cFv() {
// NONMATCHING
}
/* 8005638C-80056390 050CCC 0004+00 1/1 0/0 0/0 .text __ct__20dDlst_shadowSimple_cFv */
dDlst_shadowSimple_c::dDlst_shadowSimple_c() {}
@@ -2438,8 +2102,6 @@ void dDlst_list_c::init() {
}
/* 8005648C-80056538 050DCC 00AC+00 0/0 1/1 0/0 .text __dt__12dDlst_list_cFv */
// TU vtable data order has to be fixed
#ifdef NONMATCHING
dDlst_list_c::~dDlst_list_c() {
J3DDrawBuffer** buffer = mDrawBuffers;
for (int i = 0; i < 21; i++) {
@@ -2449,11 +2111,6 @@ dDlst_list_c::~dDlst_list_c() {
delete tmp;
}
}
#else
dDlst_list_c::~dDlst_list_c() {
// NONMATCHING
}
#endif
/* 80056538-800565EC 050E78 00B4+00 0/0 1/1 0/0 .text reset__12dDlst_list_cFv */
void dDlst_list_c::reset() {
@@ -2479,10 +2136,6 @@ void dDlst_list_c::reset() {
}
}
/* ############################################################################################## */
/* 804520CC-804520D0 0006CC 0004+00 1/1 0/0 0/0 .sdata2 @5747 */
SECTION_SDATA2 static f32 lit_5747 = 9999.0f;
/* 800565EC-800566D4 050F2C 00E8+00 0/0 2/2 0/0 .text
* entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz */
void dDlst_list_c::entryZSortXluDrawList(J3DDrawBuffer* param_0, J3DPacket* param_1,
@@ -2556,15 +2209,6 @@ void dDlst_list_c::draw(dDlst_base_c** p_start, dDlst_base_c** p_end) {
}
}
/* ############################################################################################## */
/* 8037A1B0-8037A1B0 006810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A1B0 = "wipe_00.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A1BC = "\0\0\0";
#pragma pop
/* 804248F0-80424938 051610 0048+00 3/3 0/0 0/0 .bss mWipeDlst__12dDlst_list_c */
dDlst_2DT2_c dDlst_list_c::mWipeDlst;
@@ -2580,15 +2224,6 @@ f32 dDlst_list_c::mWipeRate;
/* 80450ED8-80450EE0 0003D8 0004+04 2/2 0/0 0/0 .sbss mWipeSpeed__12dDlst_list_c */
f32 dDlst_list_c::mWipeSpeed;
/* 804520D0-804520D4 0006D0 0004+00 1/1 0/0 0/0 .sdata2 @5809 */
SECTION_SDATA2 static f32 lit_5809 = 608.0f;
/* 804520D4-804520D8 0006D4 0004+00 1/1 0/0 0/0 .sdata2 @5810 */
SECTION_SDATA2 static f32 lit_5810 = 448.0f;
/* 804520D8-804520DC 0006D8 0004+00 1/1 0/0 0/0 .sdata2 @5811 */
SECTION_SDATA2 static f32 lit_5811 = 2.436000108718872f;
/* 8005681C-800568D8 05115C 00BC+00 1/1 0/0 0/0 .text wipeIn__12dDlst_list_cFfR8_GXColor
*/
void dDlst_list_c::wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor) {
@@ -2610,10 +2245,6 @@ void dDlst_list_c::wipeIn(f32 i_wipeSpeed) {
wipeIn(-i_wipeSpeed, g_blackColor);
}
/* ############################################################################################## */
/* 804520DC-804520E0 0006DC 0004+00 1/1 0/0 0/0 .sdata2 @5838 */
SECTION_SDATA2 static f32 lit_5838 = 1.218000054359436f;
/* 80056900-800569A0 051240 00A0+00 0/0 1/1 0/0 .text calcWipe__12dDlst_list_cFv */
void dDlst_list_c::calcWipe() {
if (mWipe) {
@@ -2630,58 +2261,9 @@ void dDlst_list_c::calcWipe() {
}
}
/* 800569A0-800569A8 0512E0 0008+00 1/0 0/0 0/0 .text getTri__22dDlst_shadowRealPoly_cFv
*/
// vtable data
#ifdef NONMATCHING
dDlst_shadowTri_c * dDlst_shadowRealPoly_c::getTri() {
return mShadowTri;
}
#else
// dDlst_shadowTri_c * dDlst_shadowRealPoly_c::getTri() {
extern "C" dDlst_shadowTri_c * getTri__22dDlst_shadowRealPoly_cFv() {
// NONMATCHING
}
#endif
/* 800569A8-800569B0 0512E8 0008+00 1/0 0/0 0/0 .text getTriMax__22dDlst_shadowRealPoly_cFv */
s32 dDlst_shadowRealPoly_c::getTriMax() {
return 256;
}
/* 800569B0-800569B4 0512F0 0004+00 1/0 7/0 0/0 .text
* searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen */
// void J2DAnmBase::searchUpdateMaterialID(J2DScreen* param_0) {
extern "C" void searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen() {
/* empty function */
}
/* ############################################################################################## */
/* 803A8E68-803A8E74 005F88 000C+00 0/0 0/0 0/0 .data __vt__11dDlst_2DT_c */
SECTION_DATA extern void* __vt__11dDlst_2DT_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__11dDlst_2DT_cFv,
};
/* 803A8E74-803A8E80 005F94 000C+00 0/0 0/0 0/0 .data __vt__15dDlst_2DPoint_c */
SECTION_DATA extern void* __vt__15dDlst_2DPoint_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__15dDlst_2DPoint_cFv,
};
/* 803A8E80-803A8E8C 005FA0 000C+00 0/0 0/0 0/0 .data __vt__14dDlst_2DQuad_c */
SECTION_DATA extern void* __vt__14dDlst_2DQuad_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__14dDlst_2DQuad_cFv,
};
/* 803A8E8C-803A8E98 005FAC 000C+00 0/0 0/0 0/0 .data __vt__13dDlst_2DTri_c */
SECTION_DATA extern void* __vt__13dDlst_2DTri_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__13dDlst_2DTri_cFv,
};
src/d/d_kankyo.cpp
+171 -1134
View File
File diff suppressed because it is too large Load Diff
src/d/d_kankyo_rain.cpp
+47 -613
View File
@@ -187,20 +187,6 @@ extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
// Declarations:
//
/* ############################################################################################## */
/* 804521B0-804521B8 0007B0 0008+00 19/19 0/0 0/0 .sdata2 @3953 */
SECTION_SDATA2 static u8 lit_3953[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 804521B8-804521BC 0007B8 0004+00 31/31 0/0 0/0 .sdata2 @3954 */
SECTION_SDATA2 static u8 lit_3954[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 8005B660-8005B708 055FA0 00A8+00 3/3 0/0 0/0 .text vectle_calc__FP10DOUBLE_POSP4cXyz
*/
static void vectle_calc(DOUBLE_POS* i_pos, cXyz* o_out) {
@@ -217,7 +203,6 @@ static void vectle_calc(DOUBLE_POS* i_pos, cXyz* o_out) {
}
}
/* 8005B708-8005B760 056048 0058+00 7/7 0/0 0/0 .text get_vectle_calc__FP4cXyzP4cXyzP4cXyz */
static void get_vectle_calc(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
DOUBLE_POS pos;
@@ -234,17 +219,13 @@ void dKyr_get_vectle_calc(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
get_vectle_calc(param_0, param_1, param_2);
}
/* ############################################################################################## */
/* 804521BC-804521C0 0007BC 0004+00 4/4 0/0 0/0 .sdata2 @3970 */
SECTION_SDATA2 static f32 lit_3970 = 200.0f;
/* 8005B780-8005B830 0560C0 00B0+00 2/2 0/0 0/0 .text
* dKy_set_eyevect_calc__FP12camera_classP3Vecff */
static void dKy_set_eyevect_calc(camera_class* i_camera, Vec* param_1, f32 param_2, f32 param_3) {
cXyz tmp;
get_vectle_calc(&i_camera->mLookat.mEye, &i_camera->mLookat.mCenter, &tmp);
param_1->x = i_camera->mLookat.mEye.x + tmp.x * param_2;
param_1->y = (i_camera->mLookat.mEye.y + tmp.y * param_3) - lit_3970;
param_1->y = (i_camera->mLookat.mEye.y + tmp.y * param_3) - 200.0f;
param_1->z = i_camera->mLookat.mEye.z + tmp.z * param_2;
}
@@ -273,17 +254,6 @@ static void dKy_set_eyevect_calc2(camera_class* i_camera, Vec* param_1, f32 para
}
}
/* ############################################################################################## */
/* 804521C0-804521C4 0007C0 0004+00 1/1 0/0 0/0 .sdata2 @3992 */
SECTION_SDATA2 static f32 lit_3992 = 0.125f;
/* 804521C4-804521C8 0007C4 0004+00 9/9 0/0 0/0 .sdata2 @3993 */
SECTION_SDATA2 static f32 lit_3993 = 0.01f;
/* 804521C8-804521D0 0007C8 0008+00 15/15 0/0 0/0 .sdata2 @3995 */
SECTION_SDATA2 static f64 lit_3995 = 4503601774854144.0 /* cast s32 to float */;
/* 8005B92C-8005BA24 05626C 00F8+00 5/5 0/0 0/0 .text
* dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID */
static void dKyr_set_btitex_common(GXTexObj* i_obj, ResTIMG* i_img, GXTexMapID i_mapID) {
@@ -299,49 +269,11 @@ static void dKyr_set_btitex_common(GXTexObj* i_obj, ResTIMG* i_img, GXTexMapID i
GXLoadTexObj(i_obj, i_mapID);
}
/* 8005BA24-8005BA48 056364 0024+00 12/12 0/0 0/0 .text dKyr_set_btitex__FP9_GXTexObjP7ResTIMG */
static void dKyr_set_btitex(GXTexObj* i_obj, ResTIMG* i_img) {
dKyr_set_btitex_common(i_obj, i_img, GX_TEXMAP0);
}
/* ############################################################################################## */
/* 804521D0-804521D4 0007D0 0004+00 4/4 0/0 0/0 .sdata2 @4103 */
SECTION_SDATA2 static f32 lit_4103 = 0.0001;
/* 804521D4-804521D8 0007D4 0004+00 4/4 0/0 0/0 .sdata2 @4104 */
SECTION_SDATA2 static f32 lit_4104 = 4000.0f;
/* 804521D8-804521DC 0007D8 0004+00 2/2 0/0 0/0 .sdata2 @4105 */
SECTION_SDATA2 static f32 lit_4105 = 304.0f;
/* 804521DC-804521E0 0007DC 0004+00 2/2 0/0 0/0 .sdata2 @4106 */
SECTION_SDATA2 static f32 lit_4106 = 224.0f;
/* 804521E0-804521E4 0007E0 0004+00 2/2 0/0 0/0 .sdata2 @4107 */
SECTION_SDATA2 static f32 lit_4107 = 0.0054931640625f;
/* 804521E4-804521E8 0007E4 0004+00 6/6 0/0 0/0 .sdata2 @4108 */
SECTION_SDATA2 static f32 lit_4108 = 180.0f;
/* 804521E8-804521F0 0007E8 0008+00 17/17 0/0 0/0 .sdata2 @4109 */
SECTION_SDATA2 static f64 lit_4109 = 0.5;
/* 804521F0-804521F8 0007F0 0008+00 17/17 0/0 0/0 .sdata2 @4110 */
SECTION_SDATA2 static f64 lit_4110 = 3.0;
/* 804521F8-804521FC 0007F8 0004+00 6/6 0/0 0/0 .sdata2 @4111 */
SECTION_SDATA2 static f32 lit_4111 = 250.0f;
/* 804521FC-80452200 0007FC 0004+00 4/4 0/0 0/0 .sdata2 @4112 */
SECTION_SDATA2 static f32 lit_4112 = 600.0f;
/* 80452200-80452204 000800 0004+00 2/2 0/0 0/0 .sdata2 @4113 */
SECTION_SDATA2 static f32 lit_4113 = 110.0f;
/* 80452204-80452208 000804 0004+00 1/1 0/0 0/0 .sdata2 @4114 */
SECTION_SDATA2 static f32 lit_4114 = 4100.0f;
/* 8005BA48-8005BED8 056388 0490+00 0/0 1/1 0/0 .text dKyr_lenzflare_move__Fv */
void dKyr_lenzflare_move() {
dKankyo_sun_Packet* sun_p = g_env_light.mpSunPacket;
@@ -352,7 +284,7 @@ void dKyr_lenzflare_move() {
cXyz cStack_54;
cXyz local_60;
cXyz cStack_6c;
if (sun_p->mVisibility < 0.0001) {
if (sun_p->mVisibility < 0.0001f) {
return;
}
dKy_set_eyevect_calc(iVar6, &cStack_48, 4000.0f, 4000.0f);
@@ -365,10 +297,10 @@ void dKyr_lenzflare_move() {
mDoLib_project(lenz_p->mPositions, &cStack_84);
local_90.x = 304.0f;
local_90.y = 224.0f;
local_90.z = 0.0054931640625f; // Maybe 45 / 8192
local_90.z = 0.0f;
dKyr_get_vectle_calc(&local_90, &cStack_84, &local_78);
lenz_p->field_0x94 = cM_atan2s(local_78.x, local_78.y);
lenz_p->field_0x94 *= 0.0054931640625f;
lenz_p->field_0x94 *= 0.0054931640625f; // Maybe 45 / 8192
lenz_p->field_0x94 += 180.0f;
dKyr_get_vectle_calc(&iVar6->mLookat.mEye, &iVar6->mLookat.mCenter, &cStack_6c);
@@ -392,132 +324,16 @@ void dKyr_lenzflare_move() {
}
}
/* ############################################################################################## */
/* 80452208-8045220C 000808 0004+00 3/3 0/0 0/0 .sdata2 @4126 */
SECTION_SDATA2 static f32 lit_4126 = 285.0f;
/* 8005BED8-8005BF08 056818 0030+00 1/1 0/0 0/0 .text dKyr_moon_arrival_check__Fv */
static int dKyr_moon_arrival_check() {
int rv = 0;
if (g_env_light.mDaytime > lit_4126 || g_env_light.mDaytime < 67.5f) {
if (g_env_light.mDaytime > 285.0f || g_env_light.mDaytime < 67.5f) {
rv = 1;
}
return rv;
}
/* ############################################################################################## */
/* 8037A4C0-8037A4E8 006B20 0028+00 1/1 0/0 0/0 .rodata sun_chkpnt$4155 */
SECTION_RODATA static f32 const sun_chkpnt[5][2] = {
{0.0f, 0.0f}, {-10.0f, -20.0f}, {10.0f, 20.0f}, {-20.0f, 10.0f}, {20.0f, -10.0f},
};
COMPILER_STRIP_GATE(0x8037A4C0, &sun_chkpnt);
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A578 = "F_SP200";
SECTION_DEAD static char const* const stringBase_8037A580 = "D_MN09B";
#pragma pop
/* 803A9BA0-803A9BAC 006CC0 000C+00 1/1 0/0 0/0 .data sun_color$4213 */
SECTION_DATA static GXColor sun_color[3] = {
{255, 255, 253, 255},
{255, 255, 255, 255},
{255, 255, 253, 255},
};
/* 803A9BAC-803A9BB8 006CCC 000C+00 1/1 0/0 0/0 .data sun_color2$4214 */
SECTION_DATA static GXColor sun_color2[3] = {
{255, 110, 43, 255},
{156, 121, 92, 255},
{255, 78, 0, 255},
};
/* 80450EE8-80450EEC 0003E8 0004+00 1/1 0/0 0/0 .sbss S_parcent_bak$4131 */
static f32 S_parcent_bak;
/* 80450EEC-80450EF0 -00001 0004+00 2/2 0/0 0/0 .sbss None */
/* 80450EEC 0002+00 data_80450EEC None */
/* 80450EEE 0002+00 data_80450EEE S_rot_work1$7554 */
static s8 struct_80450EEC[4];
/* 80452210-80452214 000810 0004+00 4/4 0/0 0/0 .sdata2 @4353 */
SECTION_SDATA2 static f32 lit_4353 = 8000.0f;
/* 80452214-80452218 000814 0004+00 26/26 0/0 0/0 .sdata2 @4354 */
SECTION_SDATA2 static f32 lit_4354 = 1.0f;
/* 80452218-8045221C 000818 0004+00 1/1 0/0 0/0 .sdata2 @4355 */
SECTION_SDATA2 static f32 lit_4355 = 77.5f;
/* 8045221C-80452220 00081C 0004+00 5/5 0/0 0/0 .sdata2 @4356 */
SECTION_SDATA2 static f32 lit_4356 = 0.05f;
/* 80452220-80452224 000820 0004+00 14/14 0/0 0/0 .sdata2 @4357 */
SECTION_SDATA2 static f32 lit_4357 = 0.1f;
/* 80452224-80452228 000824 0004+00 2/2 0/0 0/0 .sdata2 @4358 */
SECTION_SDATA2 static f32 lit_4358 = 0.00001f;
/* 80452228-8045222C 000828 0004+00 2/2 0/0 0/0 .sdata2 @4359 */
SECTION_SDATA2 static f32 lit_4359 = 458.0f;
/* 8045222C-80452230 00082C 0004+00 2/2 0/0 0/0 .sdata2 @4360 */
SECTION_SDATA2 static f32 lit_4360 = 608.0f;
/* 80452230-80452234 000830 0004+00 3/3 0/0 0/0 .sdata2 @4361 */
SECTION_SDATA2 static f32 lit_4361 = 1000000000.0f;
/* 80452234-80452238 000834 0004+00 1/1 0/0 0/0 .sdata2 @4362 */
SECTION_SDATA2 static f32 lit_4362 = 450.0f;
/* 80452238-8045223C 000838 0004+00 10/10 0/0 0/0 .sdata2 @4363 */
SECTION_SDATA2 static f32 lit_4363 = 0.001f;
/* 8045223C-80452240 00083C 0004+00 18/18 0/0 0/0 .sdata2 @4364 */
SECTION_SDATA2 static f32 lit_4364 = 0.5f;
/* 80452240-80452244 000840 0004+00 13/13 0/0 0/0 .sdata2 @4365 */
SECTION_SDATA2 static f32 lit_4365 = 0.2f;
/* 80452244-80452248 000844 0004+00 11/11 0/0 0/0 .sdata2 @4366 */
SECTION_SDATA2 static f32 lit_4366 = 0.3f;
/* 80452248-8045224C 000848 0004+00 8/8 0/0 0/0 .sdata2 @4367 */
SECTION_SDATA2 static f32 lit_4367 = 0.8f;
/* 8045224C-80452250 00084C 0004+00 12/12 0/0 0/0 .sdata2 @4368 */
SECTION_SDATA2 static f32 lit_4368 = 255.0f;
/* 80452250-80452254 000850 0004+00 2/2 0/0 0/0 .sdata2 @4369 */
SECTION_SDATA2 static f32 lit_4369 = 90.0f;
/* 80452254-80452258 000854 0004+00 3/3 0/0 0/0 .sdata2 @4370 */
SECTION_SDATA2 static f32 lit_4370 = 105.0f;
/* 80452258-8045225C 000858 0004+00 1/1 0/0 0/0 .sdata2 @4371 */
SECTION_SDATA2 static f32 lit_4371 = 247.5f;
/* 8045225C-80452260 00085C 0004+00 1/1 0/0 0/0 .sdata2 @4372 */
SECTION_SDATA2 static f32 lit_4372 = 270.0f;
/* 80452260-80452264 000860 0004+00 1/1 0/0 0/0 .sdata2 @4373 */
SECTION_SDATA2 static f32 lit_4373 = -8000.0f;
/* 80452264-80452268 000864 0004+00 2/2 0/0 0/0 .sdata2 @4374 */
SECTION_SDATA2 static f32 lit_4374 = 6.0f;
/* 80452268-8045226C 000868 0004+00 1/1 0/0 0/0 .sdata2 @4375 */
SECTION_SDATA2 static f32 lit_4375 = 30160.0f;
/* 8045226C-80452270 00086C 0004+00 1/1 0/0 0/0 .sdata2 @4376 */
SECTION_SDATA2 static f32 lit_4376 = 21678.0f;
/* 80452270-80452278 000870 0008+00 9/9 0/0 0/0 .sdata2 @4379 */
SECTION_SDATA2 static f64 lit_4379 = 4503599627370496.0 /* cast u32 to float */;
/* 8005BF08-8005CC5C 056848 0D54+00 0/0 1/1 0/0 .text dKyr_sun_move__Fv */
void dKyr_sun_move() {
dKankyo_sun_Packet* sun_p = g_env_light.mpSunPacket;
@@ -585,6 +401,9 @@ void dKyr_sun_move() {
for (int i = 0; i < 5; i++) {
cXyz sp3C = sp48;
static f32 const sun_chkpnt[5][2] = {
{0.0f, 0.0f}, {-10.0f, -20.0f}, {10.0f, 20.0f}, {-20.0f, 10.0f}, {20.0f, -10.0f},
};
sp3C.x -= sun_chkpnt[i][0];
sp3C.y -= sun_chkpnt[i][1];
if (sp3C.x > 0.0f && sp3C.x < 608.0f && sp3C.y > var_f28 && sp3C.y < 458.0f - var_f28) {
@@ -691,6 +510,17 @@ void dKyr_sun_move() {
cLib_addCalc(&sun_p->field_0x6c, 0.0f, 0.5f, 0.1f, 0.001f);
}
static GXColor sun_color[3] = {
{255, 255, 253, 255},
{255, 255, 255, 255},
{255, 255, 253, 255},
};
static GXColor sun_color2[3] = {
{255, 110, 43, 255},
{156, 121, 92, 255},
{255, 78, 0, 255},
};
if (g_env_light.mDaytime < 180.0f) {
f32 var_f1_4;
if (g_env_light.mDaytime < 90.0f) {
@@ -766,14 +596,6 @@ void dKyr_sun_move() {
}
}
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A588 = "Always";
#pragma pop
/* 8005CC5C-8005CDA8 05759C 014C+00 0/0 1/1 0/0 .text dKyr_rain_init__Fv */
void dKyr_rain_init() {
camera_class* camera_p = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera;
@@ -798,29 +620,15 @@ void dKyr_rain_init() {
g_env_light.mpRainPacket->mRainCount = 0;
}
/* 8005CDA8-8005CDD0 0576E8 0028+00 1/1 0/0 0/0 .text rain_bg_chk__FP19dKankyo_rain_Packeti */
static void rain_bg_chk(dKankyo_rain_Packet* i_packet, int i_idx) {
i_packet->mRainEff[i_idx].field_0x30 = dComIfGp_getCamera(0)->mLookat.mCenter.y + -800.0f;
}
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A58F = "F_SP122";
#pragma pop
/* 8045227C-80452280 00087C 0004+00 9/9 0/0 0/0 .sdata2 @4467 */
SECTION_SDATA2 static f32 lit_4467 = 50.0f;
/* 80452280-80452284 000880 0004+00 4/4 0/0 0/0 .sdata2 @4468 */
SECTION_SDATA2 static f32 lit_4468 = 10000.0f;
/* 8005CDD0-8005CF78 057710 01A8+00 1/1 0/0 0/0 .text overhead_bg_chk__Fv */
static bool overhead_bg_chk() {
static BOOL overhead_bg_chk() {
camera_class* camera = dComIfGp_getCamera(0);
bool chk = false;
BOOL chk = false;
dBgS_ObjGndChk_All gndchk;
dBgS_RoofChk roofchk;
@@ -829,7 +637,7 @@ static bool overhead_bg_chk() {
chkPos.y += 50.0f;
roofchk.i_SetPos(chkPos);
if (dComIfG_Bgsp().RoofChk(&roofchk) != lit_4361) {
if (dComIfG_Bgsp().RoofChk(&roofchk) != 1.0e9f) {
chk = true;
// Outside East Castle Town
if (!strcmp(dComIfGp_getStartStageName(), "F_SP122") &&
@@ -848,7 +656,6 @@ static bool overhead_bg_chk() {
return chk;
}
/* 8005CF78-8005D18C 0578B8 0214+00 1/1 0/0 0/0 .text forward_overhead_bg_chk__FP4cXyzf
*/
static int forward_overhead_bg_chk(cXyz* param_0, f32 param_1) {
@@ -886,138 +693,8 @@ static int forward_overhead_bg_chk(cXyz* param_0, f32 param_1) {
return chk;
}
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A597 = "R_SP30";
SECTION_DEAD static char const* const stringBase_8037A59E = "R_SP107";
SECTION_DEAD static char const* const stringBase_8037A5A6 = "R_SP127";
SECTION_DEAD static char const* const stringBase_8037A5AE = "F_SP113";
SECTION_DEAD static char const* const stringBase_8037A5B6 = "D_MN09";
#pragma pop
/* 80452284-80452288 000884 0004+00 1/1 0/0 0/0 .sdata2 @5096 */
SECTION_SDATA2 static f32 lit_5096 = -2.5f;
/* 80452288-8045228C 000888 0004+00 6/6 0/0 0/0 .sdata2 @5097 */
SECTION_SDATA2 static f32 lit_5097 = 10.0f;
/* 8045228C-80452290 00088C 0004+00 8/8 0/0 0/0 .sdata2 @5098 */
SECTION_SDATA2 static f32 lit_5098 = 20.0f;
/* 80452290-80452294 000890 0004+00 6/6 0/0 0/0 .sdata2 @5099 */
SECTION_SDATA2 static f32 lit_5099 = 15.0f;
/* 80452294-80452298 000894 0004+00 5/5 0/0 0/0 .sdata2 @5100 */
SECTION_SDATA2 static f32 lit_5100 = 700.0f;
/* 80452298-8045229C 000898 0004+00 2/2 0/0 0/0 .sdata2 @5101 */
SECTION_SDATA2 static f32 lit_5101 = 1400.0f;
/* 8045229C-804522A0 00089C 0004+00 5/5 0/0 0/0 .sdata2 @5102 */
SECTION_SDATA2 static f32 lit_5102 = 1200.0f;
/* 804522A0-804522A4 0008A0 0004+00 1/1 0/0 0/0 .sdata2 @5103 */
SECTION_SDATA2 static f32 lit_5103 = 35.5f;
/* 804522A4-804522A8 0008A4 0004+00 4/4 0/0 0/0 .sdata2 @5104 */
SECTION_SDATA2 static f32 lit_5104 = 800.0f;
/* 804522A8-804522AC 0008A8 0004+00 5/5 0/0 0/0 .sdata2 @5105 */
SECTION_SDATA2 static f32 lit_5105 = 360.0f;
/* 804522AC-804522B0 0008AC 0004+00 4/4 0/0 0/0 .sdata2 @5106 */
SECTION_SDATA2 static f32 lit_5106 = 2.0f / 25.0f;
/* 804522B0-804522B4 0008B0 0004+00 2/2 0/0 0/0 .sdata2 @5107 */
SECTION_SDATA2 static f32 lit_5107 = -2.0f;
/* 804522B4-804522B8 0008B4 0004+00 2/2 0/0 0/0 .sdata2 @5108 */
SECTION_SDATA2 static f32 lit_5108 = 850.0f;
/* 804522B8-804522BC 0008B8 0004+00 8/8 0/0 0/0 .sdata2 @5109 */
SECTION_SDATA2 static f32 lit_5109 = 40.0f;
/* 804522BC-804522C0 0008BC 0004+00 2/2 0/0 0/0 .sdata2 @5110 */
SECTION_SDATA2 static f32 lit_5110 = 550.0f;
/* 804522C0-804522C4 0008C0 0004+00 1/1 0/0 0/0 .sdata2 @5111 */
SECTION_SDATA2 static f32 lit_5111 = -2680.0f;
/* 804522C4-804522C8 0008C4 0004+00 1/1 0/0 0/0 .sdata2 @5112 */
SECTION_SDATA2 static f32 lit_5112 = 2200.0f;
/* 804522C8-804522CC 0008C8 0004+00 2/2 0/0 0/0 .sdata2 @5113 */
SECTION_SDATA2 static f32 lit_5113 = 1600.0f;
/* 804522CC-804522D0 0008CC 0004+00 1/1 0/0 0/0 .sdata2 @5114 */
SECTION_SDATA2 static f32 lit_5114 = 27453.0f;
/* 804522D0-804522D4 0008D0 0004+00 1/1 0/0 0/0 .sdata2 @5115 */
SECTION_SDATA2 static f32 lit_5115 = 8528.0f;
/* 804522D4-804522D8 0008D4 0004+00 1/1 0/0 0/0 .sdata2 @5116 */
SECTION_SDATA2 static f32 lit_5116 = 1300.0f;
/* 804522D8-804522DC 0008D8 0004+00 2/2 0/0 0/0 .sdata2 @5117 */
SECTION_SDATA2 static f32 lit_5117 = 1100.0f;
/* 804522DC-804522E0 0008DC 0004+00 5/5 0/0 0/0 .sdata2 @5118 */
SECTION_SDATA2 static f32 lit_5118 = 80.0f;
/* 804522E0-804522E4 0008E0 0004+00 6/6 0/0 0/0 .sdata2 @5119 */
SECTION_SDATA2 static f32 lit_5119 = 500.0f;
/* 804522E4-804522E8 0008E4 0004+00 1/1 0/0 0/0 .sdata2 @5120 */
SECTION_SDATA2 static f32 lit_5120 = -228.0f;
/* 804522E8-804522EC 0008E8 0004+00 1/1 0/0 0/0 .sdata2 @5121 */
SECTION_SDATA2 static f32 lit_5121 = 795.0f;
/* 804522EC-804522F0 0008EC 0004+00 4/4 0/0 0/0 .sdata2 @5122 */
SECTION_SDATA2 static f32 lit_5122 = 1500.0f;
/* 804522F0-804522F4 0008F0 0004+00 2/2 0/0 0/0 .sdata2 @5123 */
SECTION_SDATA2 static f32 lit_5123 = 5100.0f;
/* 804522F4-804522F8 0008F4 0004+00 2/2 0/0 0/0 .sdata2 @5124 */
SECTION_SDATA2 static f32 lit_5124 = -3250.0f;
/* 804522F8-804522FC 0008F8 0004+00 3/3 0/0 0/0 .sdata2 @5125 */
SECTION_SDATA2 static f32 lit_5125 = -50.0f;
/* 804522FC-80452300 0008FC 0004+00 2/2 0/0 0/0 .sdata2 @5126 */
SECTION_SDATA2 static f32 lit_5126 = -2700.0f;
/* 80452300-80452304 000900 0004+00 2/2 0/0 0/0 .sdata2 @5127 */
SECTION_SDATA2 static f32 lit_5127 = 15750.0f;
/* 80452304-80452308 000904 0004+00 1/1 0/0 0/0 .sdata2 @5128 */
SECTION_SDATA2 static f32 lit_5128 = -3680.0f;
/* 80452308-8045230C 000908 0004+00 1/1 0/0 0/0 .sdata2 @5129 */
SECTION_SDATA2 static f32 lit_5129 = -11975.0f;
/* 8045230C-80452310 00090C 0004+00 1/1 0/0 0/0 .sdata2 @5130 */
SECTION_SDATA2 static f32 lit_5130 = -10530.0f;
/* 80452310-80452314 000910 0004+00 1/1 0/0 0/0 .sdata2 @5131 */
SECTION_SDATA2 static f32 lit_5131 = 3350.0f;
/* 80452314-80452318 000914 0004+00 1/1 0/0 0/0 .sdata2 @5132 */
SECTION_SDATA2 static f32 lit_5132 = -13027.0f;
/* 80452318-8045231C 000918 0004+00 1/1 0/0 0/0 .sdata2 @5133 */
SECTION_SDATA2 static f32 lit_5133 = -11430.0f;
/* 8045231C-80452320 00091C 0004+00 1/1 0/0 0/0 .sdata2 @5134 */
SECTION_SDATA2 static f32 lit_5134 = 36900.0f;
/* 8005D18C-8005E8B0 057ACC 1724+00 0/0 1/1 0/0 .text dKyr_rain_move__Fv */
// reg alloc, equivalent?
#ifdef NONMATCHING
// NONMATCHING reg alloc, equivalent?
void dKyr_rain_move() {
camera_class* camera_p;
@@ -1149,21 +826,21 @@ void dKyr_rain_move() {
}
if (var_r24) {
cLib_addCalc(&rain_p->mOverheadFade, 1.0f, 0.1f, 0.1f, 0.001f);
} else {
cLib_addCalc(&rain_p->mOverheadFade, 0.0f, 0.5f, 0.2f, 0.01f);
} else {
cLib_addCalc(&rain_p->mOverheadFade, 1.0f, 0.1f, 0.1f, 0.001f);
}
if (var_r23) {
cLib_addCalc(&rain_p->mFwdFade1, 1.0f, 0.1f, 0.1f, 0.001f);
} else {
cLib_addCalc(&rain_p->mFwdFade1, 0.0f, 0.5f, 0.2f, 0.01f);
} else {
cLib_addCalc(&rain_p->mFwdFade1, 1.0f, 0.1f, 0.1f, 0.001f);
}
if (var_r22) {
cLib_addCalc(&rain_p->mFwdFade2, 1.0f, 0.1f, 0.1f, 0.001f);
} else {
cLib_addCalc(&rain_p->mFwdFade2, 0.0f, 0.5f, 0.2f, 0.01f);
} else {
cLib_addCalc(&rain_p->mFwdFade2, 1.0f, 0.1f, 0.1f, 0.001f);
}
f32 temp_f30 = 1.0f;
@@ -1373,128 +1050,21 @@ void dKyr_rain_move() {
}
}
}
#else
void dKyr_rain_move() {
// NONMATCHING
}
#endif
/* 8005E8B0-8005E8F8 0591F0 0048+00 1/1 0/0 0/0 .text d_krain_cut_turn_check__Fv */
static bool d_krain_cut_turn_check() {
static BOOL d_krain_cut_turn_check() {
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
BOOL ret = FALSE;
return player != NULL && (player->getCutType() == daPy_py_c::CUT_TYPE_TURN_RIGHT ||
if (player != NULL && (player->getCutType() == daPy_py_c::CUT_TYPE_TURN_RIGHT ||
player->getCutType() == daPy_py_c::CUT_TYPE_TURN_LEFT ||
player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT ||
player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT);
player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT)) {
ret = TRUE;
}
return ret;
}
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5BD = "D_MN08";
#pragma pop
/* 80452320-80452324 000920 0004+00 1/1 0/0 0/0 .sdata2 @5716 */
SECTION_SDATA2 static f32 lit_5716 = -100000000.0f;
/* 80452324-80452328 000924 0004+00 2/2 0/0 0/0 .sdata2 @5717 */
SECTION_SDATA2 static f32 lit_5717 = 100000.0f;
/* 80452328-8045232C 000928 0004+00 1/1 0/0 0/0 .sdata2 @5718 */
SECTION_SDATA2 static f32 lit_5718 = 14.0f / 5.0f;
/* 8045232C-80452330 00092C 0004+00 1/1 0/0 0/0 .sdata2 @5719 */
SECTION_SDATA2 static f32 lit_5719 = -11.0f / 20.0f;
/* 80452330-80452334 000930 0004+00 9/9 0/0 0/0 .sdata2 @5720 */
SECTION_SDATA2 static f32 lit_5720 = 2.0f / 5.0f;
/* 80452334-80452338 000934 0004+00 6/6 0/0 0/0 .sdata2 @5721 */
SECTION_SDATA2 static f32 lit_5721 = 1.5f;
/* 80452338-8045233C 000938 0004+00 4/4 0/0 0/0 .sdata2 @5722 */
SECTION_SDATA2 static f32 lit_5722 = 65536.0f;
/* 8045233C-80452340 00093C 0004+00 5/5 0/0 0/0 .sdata2 @5723 */
SECTION_SDATA2 static f32 lit_5723 = 1000.0f;
/* 80452340-80452344 000940 0004+00 1/1 0/0 0/0 .sdata2 @5724 */
SECTION_SDATA2 static f32 lit_5724 = -100149.8984375f;
/* 80452344-80452348 000944 0004+00 1/1 0/0 0/0 .sdata2 @5725 */
SECTION_SDATA2 static f32 lit_5725 = -99999.8984375f;
/* 80452348-8045234C 000948 0004+00 2/2 0/0 0/0 .sdata2 @5726 */
SECTION_SDATA2 static f32 lit_5726 = 2.5f;
/* 8045234C-80452350 00094C 0004+00 7/7 0/0 0/0 .sdata2 @5727 */
SECTION_SDATA2 static f32 lit_5727 = 0.25f;
/* 80452350-80452354 000950 0004+00 6/6 0/0 0/0 .sdata2 @5728 */
SECTION_SDATA2 static f32 lit_5728 = 5.0f;
/* 80452354-80452358 000954 0004+00 7/7 0/0 0/0 .sdata2 @5729 */
SECTION_SDATA2 static f32 lit_5729 = 3.0f / 5.0f;
/* 80452358-8045235C 000958 0004+00 2/2 0/0 0/0 .sdata2 @5730 */
SECTION_SDATA2 static f32 lit_5730 = 3.0f;
/* 8045235C-80452360 00095C 0004+00 1/1 0/0 0/0 .sdata2 @5731 */
SECTION_SDATA2 static f32 lit_5731 = 4.5f;
/* 80452360-80452364 000960 0004+00 2/2 0/0 0/0 .sdata2 @5732 */
SECTION_SDATA2 static f32 lit_5732 = 0.75f;
/* 80452364-80452368 000964 0004+00 2/2 0/0 0/0 .sdata2 @5733 */
SECTION_SDATA2 static f32 lit_5733 = 3.0f / 100.0f;
/* 80452368-8045236C 000968 0004+00 2/2 0/0 0/0 .sdata2 @5734 */
SECTION_SDATA2 static f32 lit_5734 = 1.0f / 50.0f;
/* 8045236C-80452370 00096C 0004+00 5/5 0/0 0/0 .sdata2 @5735 */
SECTION_SDATA2 static f32 lit_5735 = 300.0f;
/* 80452370-80452374 000970 0004+00 1/1 0/0 0/0 .sdata2 @5736 */
SECTION_SDATA2 static f32 lit_5736 = 5600.0f;
/* 80452374-80452378 000974 0004+00 3/3 0/0 0/0 .sdata2 @5737 */
SECTION_SDATA2 static f32 lit_5737 = 130.0f;
/* 80452378-8045237C 000978 0004+00 7/7 0/0 0/0 .sdata2 @5738 */
SECTION_SDATA2 static f32 lit_5738 = 2.0f;
/* 8045237C-80452380 00097C 0004+00 4/4 0/0 0/0 .sdata2 @5739 */
SECTION_SDATA2 static f32 lit_5739 = 400.0f;
/* 80452380-80452384 000980 0004+00 3/3 0/0 0/0 .sdata2 @5740 */
SECTION_SDATA2 static f32 lit_5740 = 30.0f;
/* 80452384-80452388 000984 0004+00 3/3 0/0 0/0 .sdata2 @5741 */
SECTION_SDATA2 static f32 lit_5741 = 9.0f;
/* 80452388-8045238C 000988 0004+00 1/1 0/0 0/0 .sdata2 @5742 */
SECTION_SDATA2 static f32 lit_5742 = -99979.8984375f;
/* 8045238C-80452390 00098C 0004+00 1/1 0/0 0/0 .sdata2 @5743 */
SECTION_SDATA2 static f32 lit_5743 = 1050.0f;
/* 80452390-80452394 000990 0004+00 1/1 0/0 0/0 .sdata2 @5744 */
SECTION_SDATA2 static f32 lit_5744 = 3200.0f;
/* 80452394-80452398 000994 0004+00 1/1 0/0 0/0 .sdata2 @5745 */
SECTION_SDATA2 static f32 lit_5745 = 1700.0f;
/* 80452398-8045239C 000998 0004+00 1/1 0/0 0/0 .sdata2 @5746 */
SECTION_SDATA2 static f32 lit_5746 = 2800.0f;
/* 8045239C-804523A0 00099C 0004+00 1/1 0/0 0/0 .sdata2 @5747 */
SECTION_SDATA2 static f32 lit_5747 = 825.0f;
/* 804523A0-804523A4 0009A0 0004+00 3/3 0/0 0/0 .sdata2 @5748 */
SECTION_SDATA2 static f32 lit_5748 = 2000.0f;
/* 8005E8F8-8005FBDC 059238 12E4+00 0/0 1/1 0/0 .text dKyr_housi_move__Fv */
void dKyr_housi_move() {
dKankyo_housi_Packet* housi_p = g_env_light.mpHousiPacket;
@@ -1605,7 +1175,7 @@ void dKyr_housi_move() {
}
effect_p->field_0x3c = 0;
effect_p->field_0x4c = cM_rndFX(65535.0f);
effect_p->field_0x4c = cM_rndFX(65536.0f);
effect_p->mBasePos.x = sp84.x;
effect_p->mBasePos.y = sp84.y;
effect_p->mBasePos.z = sp84.z;
@@ -1676,9 +1246,9 @@ void dKyr_housi_move() {
effect_p->mStatus = 3;
}
effect_p->mScale.x += 0.3f;
effect_p->mScale.y += 0.2f;
effect_p->mScale.z += 0.1f;
effect_p->mScale.x += 0.03f;
effect_p->mScale.y += 0.02f;
effect_p->mScale.z += 0.01f;
sp6C.x = effect_p->mBasePos.x + effect_p->mPosition.x;
sp6C.y = effect_p->mBasePos.y + effect_p->mPosition.y;
@@ -1845,7 +1415,6 @@ void dKyr_housi_move() {
}
}
/* 8005FBDC-8005FD48 05A51C 016C+00 0/0 1/1 0/0 .text dKyr_snow_init__Fv */
void dKyr_snow_init() {
camera_class* camera_p = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera;
@@ -1873,63 +1442,8 @@ void dKyr_snow_init() {
g_env_light.mpSnowPacket->field_0x6d93 = 0;
}
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5C4 = "F_SP127";
#pragma pop
/* 804523A4-804523A8 0009A4 0004+00 8/8 0/0 0/0 .sdata2 @6355 */
SECTION_SDATA2 static f32 lit_6355 = 100.0f;
/* 804523A8-804523AC 0009A8 0004+00 2/2 0/0 0/0 .sdata2 @6356 */
SECTION_SDATA2 static f32 lit_6356 = 6.0f / 5.0f;
/* 804523AC-804523B0 0009AC 0004+00 1/1 0/0 0/0 .sdata2 @6357 */
SECTION_SDATA2 static f32 lit_6357 = 6.5f;
/* 804523B0-804523B4 0009B0 0004+00 3/3 0/0 0/0 .sdata2 @6358 */
SECTION_SDATA2 static f32 lit_6358 = 9.0f / 20.0f;
/* 804523B4-804523B8 0009B4 0004+00 1/1 0/0 0/0 .sdata2 @6359 */
SECTION_SDATA2 static f32 lit_6359 = 53.0f / 10.0f;
/* 804523B8-804523BC 0009B8 0004+00 2/2 0/0 0/0 .sdata2 @6360 */
SECTION_SDATA2 static f32 lit_6360 = 7.0f / 20.0f;
/* 804523BC-804523C0 0009BC 0004+00 2/2 0/0 0/0 .sdata2 @6361 */
SECTION_SDATA2 static f32 lit_6361 = 3000.0f;
/* 804523C0-804523C4 0009C0 0004+00 1/1 0/0 0/0 .sdata2 @6362 */
SECTION_SDATA2 static f32 lit_6362 = 27.5f;
/* 804523C4-804523C8 0009C4 0004+00 1/1 0/0 0/0 .sdata2 @6363 */
SECTION_SDATA2 static f32 lit_6363 = 1150.0f;
/* 804523C8-804523D0 0009C8 0004+04 1/1 0/0 0/0 .sdata2 @6364 */
SECTION_SDATA2 static f32 lit_6364[1 + 1 /* padding */] = {
55.0f,
/* padding */
0.0f,
};
/* 804523D0-804523D8 0009D0 0008+00 1/1 0/0 0/0 .sdata2 @6365 */
SECTION_SDATA2 static f64 lit_6365 = 1.0;
/* 804523D8-804523DC 0009D8 0004+00 1/1 0/0 0/0 .sdata2 @6366 */
SECTION_SDATA2 static f32 lit_6366 = -340.0f;
/* 804523DC-804523E0 0009DC 0004+00 1/1 0/0 0/0 .sdata2 @6367 */
SECTION_SDATA2 static f32 lit_6367 = 9800.0f;
/* 804523E0-804523E4 0009E0 0004+00 2/2 0/0 0/0 .sdata2 @6368 */
SECTION_SDATA2 static f32 lit_6368 = 19.0f / 50.0f;
/* 8005FD48-80061324 05A688 15DC+00 0/0 1/1 0/0 .text dKyr_snow_move__Fv */
// mostly matches, 1 out of order instruction
#ifdef NONMATCHING
// NONMATCHING mostly matches, 1 out of order instruction
void dKyr_snow_move() {
f32* temp_r26;
cXyz* temp_r25;
@@ -2002,7 +1516,7 @@ void dKyr_snow_move() {
snow_p->field_0x6d80 *= fabsf(snow_p->field_0x6d84);
for (int i = snow_p->field_0x6d88 - 1; i >= 0; i--) {
f32 temp_f27 = -(2.0f + cM_rndF(0.08f));
f32 temp_f27 = -(2.0f + cM_rndF(6.5f));
f32 temp_f26 = 2.0f * (5.0f + (f32)(i & 15));
effect_p = &snow_p->mSnowEff[i];
@@ -2097,7 +1611,7 @@ void dKyr_snow_move() {
effect_p->mPosition.y = spB8.y + cM_rndFX(550.0f);
effect_p->mPosition.z = spB8.z + cM_rndFX(550.0f);
} else {
f32 temp_f26_2 = cM_rndFX(27.5f);
f32 temp_f26_2 = cM_rndFX(55.0f);
get_vectle_calc(&sp7C, &spB8, &sp70);
effect_p->mPosition.x = spB8.x + sp70.x * (temp_f26_2 + 550.0f);
@@ -2204,11 +1718,6 @@ void dKyr_snow_move() {
}
}
}
#else
void dKyr_snow_move() {
// NONMATCHING
}
#endif
/* 80061324-8006140C 05BC64 00E8+00 0/0 1/1 0/0 .text dKyr_star_init__Fv */
void dKyr_star_init() {
@@ -2231,7 +1740,7 @@ void dKyr_star_move() {
packet->mEffectNum = g_env_light.mStarCount;
if (packet->mEffectNum != 0) {
packet->mEffect[0].field_0x28 = lit_4354;
packet->mEffect[0].field_0x28 = 1.0f;
}
}
@@ -2562,16 +2071,8 @@ void dKyr_drawRain(Mtx param_0, u8** param_1) {
// NONMATCHING
}
/* ############################################################################################## */
/* 804524C4-804524C8 000AC4 0004+00 1/1 0/0 0/0 .sdata2 @8360 */
SECTION_SDATA2 static f32 lit_8360 = 7000.0f;
/* 804524C8-804524CC 000AC8 0004+00 1/1 0/0 0/0 .sdata2 @8361 */
SECTION_SDATA2 static f32 lit_8361 = 3600.0f;
/* 80066048-8006653C 060988 04F4+00 0/0 1/1 0/0 .text dKyr_drawSibuki__FPA4_fPPUc */
// stack issues, double branch weirdness
#ifdef NONMATCHING
// NONMATCHING stack issues, double branch weirdness
void dKyr_drawSibuki(Mtx param_0, u8** param_1) {
camera_class* temp_r30 = (camera_class*)dComIfGp_getCamera(0);
dKankyo_rain_Packet* temp_r29 = g_env_light.mpRainPacket;
@@ -2707,67 +2208,9 @@ void dKyr_drawSibuki(Mtx param_0, u8** param_1) {
J3DShape::resetVcdVatCache();
}
}
#else
void dKyr_drawSibuki(Mtx param_0, u8** param_1) {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5F2 = "F_NW01";
#pragma pop
/* 80450F00-80450F04 000400 0004+00 1/1 0/0 0/0 .sbss rot$8366 */
static f32 rot_8366;
/* 80450F04-80450F08 000404 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450F04[4];
/* 804524CC-804524D0 000ACC 0004+00 1/1 0/0 0/0 .sdata2 @8393 */
SECTION_SDATA2 static u32 lit_8393 = 0x323232FF;
/* 804524D0-804524D4 000AD0 0004+00 1/1 0/0 0/0 .sdata2 @8394 */
SECTION_SDATA2 static u32 lit_8394 = 0xFFD7F0FF;
/* 804524D4-804524D8 000AD4 0004+00 1/1 0/0 0/0 .sdata2 @8917 */
SECTION_SDATA2 static f32 lit_8917 = 18.0f;
/* 804524D8-804524DC 000AD8 0004+00 1/1 0/0 0/0 .sdata2 @8918 */
SECTION_SDATA2 static f32 lit_8918 = -0.5f;
/* 804524DC-804524E0 000ADC 0004+00 1/1 0/0 0/0 .sdata2 @8919 */
SECTION_SDATA2 static f32 lit_8919 = 123.0f;
/* 804524E0-804524E4 000AE0 0004+00 1/1 0/0 0/0 .sdata2 @8920 */
SECTION_SDATA2 static f32 lit_8920 = 8.0f;
/* 804524E4-804524E8 000AE4 0004+00 1/1 0/0 0/0 .sdata2 @8921 */
SECTION_SDATA2 static f32 lit_8921 = -0.9f;
/* 804524E8-804524EC 000AE8 0004+00 1/1 0/0 0/0 .sdata2 @8922 */
SECTION_SDATA2 static f32 lit_8922 = 213.0f;
/* 804524EC-804524F0 000AEC 0004+00 1/1 0/0 0/0 .sdata2 @8923 */
SECTION_SDATA2 static f32 lit_8923 = 685.0f;
/* 804524F0-804524F4 000AF0 0004+00 1/1 0/0 0/0 .sdata2 @8924 */
SECTION_SDATA2 static f32 lit_8924 = 483.0f;
/* 804524F4-804524F8 000AF4 0004+00 1/1 0/0 0/0 .sdata2 @8925 */
SECTION_SDATA2 static f32 lit_8925 = 32765.0f;
/* 804524F8-804524FC 000AF8 0004+00 1/1 0/0 0/0 .sdata2 @8926 */
SECTION_SDATA2 static f32 lit_8926 = -16384.0f;
/* 804524FC-80452500 000AFC 0004+00 1/1 0/0 0/0 .sdata2 @8927 */
SECTION_SDATA2 static f32 lit_8927 = 16384.0f;
/* 8006653C-80067488 060E7C 0F4C+00 0/0 1/1 0/0 .text dKyr_drawHousi__FPA4_fPPUc */
// mostly match, weird double branch thing
#ifdef NONMATCHING
// NONMATCHING mostly match, weird double branch thing
void dKyr_drawHousi(Mtx param_0, u8** param_1) {
dKankyo_housi_Packet* housi_p = g_env_light.mpHousiPacket;
static f32 rot = 0.0f;
@@ -3125,11 +2568,6 @@ void dKyr_drawHousi(Mtx param_0, u8** param_1) {
}
}
}
#else
void dKyr_drawHousi(Mtx param_0, u8** param_1) {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
@@ -3640,10 +3078,6 @@ static void dKyr_evil_draw2(Mtx param_0, u8** param_1) {
// NONMATCHING
}
/* ############################################################################################## */
/* 804525F8-804525FC 000BF8 0004+00 1/1 0/0 0/0 .sdata2 @11953 */
SECTION_SDATA2 static f32 lit_11953 = 10000000.0f;
/* 8006E448-8006E6B0 068D88 0268+00 1/1 0/0 0/0 .text dKyr_near_bosslight_check__F4cXyz
*/
static f32 dKyr_near_bosslight_check(cXyz param_0) {
@@ -3705,4 +3139,4 @@ void dKyr_evil_draw(Mtx param_0, u8** param_1) {
*/
cXyz* daPy_py_c::getKandelaarFlamePos() {
return NULL;
}
}
src/d/d_menu_dmap.cpp
+36 -921
View File
File diff suppressed because it is too large Load Diff
src/d/d_menu_fmap_map.cpp
+1 -147
View File
@@ -107,17 +107,12 @@ extern "C" u8 sincosTable___5JMath[65536];
// Declarations:
//
/* ############################################################################################## */
/* 80454178-80454180 002778 0008+00 3/3 0/0 0/0 .sdata2 @3689 */
SECTION_SDATA2 static f64 lit_3689 = 4503599627370496.0 /* cast u32 to float */;
/* 801CE068-801CE0CC 1C89A8 0064+00 1/1 0/0 0/0 .text twoValueLineInterpolation__FUcUcf
*/
static u8 twoValueLineInterpolation(u8 i_value1, u8 i_value2, f32 i_param) {
return (u8)((f32)i_value1 + i_param * ((f32)i_value2 - (f32)i_value1));
}
/* 801CE0CC-801CE15C 1C8A0C 0090+00 2/2 0/0 0/0 .text
* twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor */
static void twoColorLineInterporation(GXColor const& i_color1, GXColor const& i_color2,
@@ -128,15 +123,6 @@ static void twoColorLineInterporation(GXColor const& i_color1, GXColor const& i_
o_color.a = twoValueLineInterpolation(i_color1.a, i_color2.a, i_param);
}
/* ############################################################################################## */
/* 80454180-80454184 002780 0004+00 3/3 0/0 0/0 .sdata2 @3703 */
SECTION_SDATA2 static u8 lit_3703[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 801CE15C-801CE188 1C8A9C 002C+00 1/1 0/0 0/0 .text init__15renderingFmap_cFPUcUsUsUsUs
*/
void renderingFmap_c::init(u8* param_0, u16 i_texWidth, u16 i_texHeight, u16 param_3, u16 param_4) {
@@ -150,11 +136,6 @@ void renderingFmap_c::init(u8* param_0, u16 i_texWidth, u16 i_texHeight, u16 par
mDrawEnable = false;
}
/* ############################################################################################## */
/* 80454184-80454188 002784 0004+00 3/3 0/0 0/0 .sdata2 @3711 */
SECTION_SDATA2 static f32 lit_3711 = 1.0f;
/* 801CE188-801CE224 1C8AC8 009C+00 1/1 0/0 0/0 .text
* entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff */
void renderingFmap_c::entry(dMenu_Fmap_world_data_c* i_worldData, int i_startStageNo,
@@ -169,7 +150,6 @@ void renderingFmap_c::entry(dMenu_Fmap_world_data_c* i_worldData, int i_startSta
dComIfGd_setCopy2D(this);
}
/* 801CE224-801CE288 1C8B64 0064+00 1/1 0/0 0/0 .text isSwitchSpecialOff__15renderingFmap_cFi */
bool renderingFmap_c::isSwitchSpecialOff(int i_swbit) {
return !strcmp(dComIfGp_getStartStageName(), "F_SP121") && i_swbit == 0xb2;
@@ -221,16 +201,6 @@ int renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* i_region
i_stageNo, o_stageNo, o_roomNo);
}
/* ############################################################################################## */
/* 80454188-8045418C 002788 0004+00 1/1 0/0 0/0 .sdata2 @3769 */
SECTION_SDATA2 static f32 lit_3769 = -5000.0f;
/* 8045418C-80454190 00278C 0004+00 1/1 0/0 0/0 .sdata2 @3770 */
SECTION_SDATA2 static f32 lit_3770 = 5000.0f;
/* 80454190-80454194 002790 0004+00 1/1 0/0 0/0 .sdata2 @3771 */
SECTION_SDATA2 static f32 lit_3771 = -1.0f;
/* 801CE410-801CE4D4 1C8D50 00C4+00 2/0 0/0 0/0 .text preDrawPath__15renderingFmap_cFv */
void renderingFmap_c::preDrawPath() {
mEye.x = mPosX;
@@ -251,7 +221,6 @@ void renderingFmap_c::preDrawPath() {
GXSetMisc(GX_MT_XF_FLUSH, 8);
}
/* 801CE4D4-801CE4DC 1C8E14 0008+00 2/0 0/0 0/0 .text isDrawPath__15renderingFmap_cFv */
bool renderingFmap_c::isDrawPath() {
return true;
@@ -520,17 +489,9 @@ dMenu_FmapMap_c::dMenu_FmapMap_c() {
/* 801CED38-801CEDE8 1C9678 00B0+00 1/0 0/0 0/0 .text __dt__15dMenu_FmapMap_cFv */
#ifdef NONMATCHING
// matches once ~renderingFmap_c() is inlined
dMenu_FmapMap_c::~dMenu_FmapMap_c() {
_delete();
}
#else
// dMenu_FmapMap_c::~dMenu_FmapMap_c() {
extern "C" asm void __dt__15dMenu_FmapMap_cFv() {
// NONMATCHING
}
#endif
/* 801CEDE8-801CEE3C 1C9728 0054+00 0/0 1/1 0/0 .text _create__15dMenu_FmapMap_cFUsUsUsUsPv */
void dMenu_FmapMap_c::_create(u16 i_texWidth, u16 i_texHeight, u16 param_2, u16 param_3, void* i_res) {
@@ -557,30 +518,12 @@ void dMenu_FmapMap_c::_delete() {
}
}
/* ############################################################################################## */
/* 80454194-80454198 002794 0001+03 2/2 0/0 0/0 .sdata2 m_other__22dMfm_HIO_prm_res_src_s
*/
const dMfm_HIO_prm_res_src_s dMfm_HIO_prm_res_src_s::m_other = {30};
/* 80454198-8045419C 002798 0004+00 1/1 0/0 0/0 .sdata2 @4104 */
SECTION_SDATA2 static f32 lit_4104 = 0.5f;
/* 8045419C-804541A0 00279C 0004+00 1/1 0/0 0/0 .sdata2 @4105 */
SECTION_SDATA2 static f32 lit_4105 = 65536.0f;
/* 804541A0-804541A8 0027A0 0004+04 1/1 0/0 0/0 .sdata2 @4106 */
SECTION_SDATA2 static f32 lit_4106[1 + 1 /* padding */] = {
32768.0f,
/* padding */
0.0f,
};
/* 804541A8-804541B0 0027A8 0008+00 2/2 0/0 0/0 .sdata2 @4108 */
SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */;
/* 801CEE94-801CF0B4 1C97D4 0220+00 1/0 0/0 0/0 .text draw__15dMenu_FmapMap_cFv */
#ifdef NONMATCHING
//? regalloc and instructions out of order
// NONMATCHING regalloc and instructions out of order
void dMenu_FmapMap_c::draw() {
f32 fVar3;
int iVar2 = mFlashTimer;
@@ -605,11 +548,6 @@ void dMenu_FmapMap_c::draw() {
renderingMap();
}
#else
void dMenu_FmapMap_c::draw() {
// NONMATCHING
}
#endif
/* 801CF0B4-801CF12C 1C99F4 0078+00 1/0 0/0 0/0 .text
* rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class */
@@ -623,36 +561,6 @@ void dMenu_FmapMap_c::rendering(dDrawPath_c::line_class const* i_line) {
}
}
/* ############################################################################################## */
/* 804541B0-804541B8 0027B0 0005+03 1/1 0/0 0/0 .sdata2 l_lineWidthPatData$4134 */
SECTION_SDATA2 static u8 l_lineWidthPatData[5 + 3 /* padding */] = {
0x00,
0x06,
0x0C,
0x00,
0x00,
/* padding */
0x00,
0x00,
0x00,
};
/* 804541B8-804541C0 0027B8 0005+03 1/1 0/0 0/0 .sdata2 l_lineWidthPatData2$4135 */
SECTION_SDATA2 static u8 l_lineWidthPatData2[5 + 3 /* padding */] = {
0x00,
0x00,
0x06,
0x00,
0x00,
/* padding */
0x00,
0x00,
0x00,
};
/* 804541C0-804541C4 0027C0 0004+00 1/1 0/0 0/0 .sdata2 @4152 */
SECTION_SDATA2 static f32 lit_4152 = 1.5f;
/* 801CF12C-801CF1D4 1C9A6C 00A8+00 1/0 0/0 0/0 .text getLineWidth__15dMenu_FmapMap_cFi
*/
int dMenu_FmapMap_c::getLineWidth(int param_0) {
@@ -679,7 +587,6 @@ int dMenu_FmapMap_c::getLineWidth(int param_0) {
}
}
/* 801CF1D4-801CF1E0 1C9B14 000C+00 1/0 0/0 0/0 .text isDrawType__15dMenu_FmapMap_cFi */
bool dMenu_FmapMap_c::isDrawType(int param_0) {
return (param_0 >> 6) & 1 ? false : true;
@@ -807,56 +714,3 @@ void dMenu_FmapMap_c::setRendering(dMenu_Fmap_world_data_c* i_worldData, int i_s
}
entry(i_worldData, i_startStageNo, i_posX, i_posY, i_scale);
}
/* 801CF4D0-801CF55C 1C9E10 008C+00 1/0 0/0 0/0 .text __dt__15renderingFmap_cFv */
renderingFmap_c::~renderingFmap_c() {
/* empty function */
}
/* 801CF55C-801CF564 1C9E9C 0008+00 2/0 0/0 0/0 .text isRenderingFloor__15renderingFmap_cFi */
bool renderingFmap_c::isRenderingFloor(int param_0) {
return true;
}
/* 801CF564-801CF568 1C9EA4 0004+00 2/0 0/0 0/0 .text beforeDrawPath__15renderingFmap_cFv
*/
void renderingFmap_c::beforeDrawPath() {
/* empty function */
}
/* 801CF568-801CF56C 1C9EA8 0004+00 2/0 0/0 0/0 .text afterDrawPath__15renderingFmap_cFv
*/
void renderingFmap_c::afterDrawPath() {
/* empty function */
}
/* ############################################################################################## */
/* 803BD680-803BD6E8 01A7A0 0068+00 2/2 0/0 0/0 .data __vt__15dMenu_FmapMap_c */
SECTION_DATA extern void* __vt__15dMenu_FmapMap_c[26] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__15dMenu_FmapMap_cFv,
(void*)__dt__15dMenu_FmapMap_cFv,
(void*)isDrawType__15dMenu_FmapMap_cFi,
(void*)getColor__15dMenu_FmapMap_cFi,
(void*)getLineColor__15dMenu_FmapMap_cFii,
(void*)getLineWidth__15dMenu_FmapMap_cFi,
(void*)isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class,
(void*)isRenderingFloor__15renderingFmap_cFi,
(void*)getFirstRoomPointer__15renderingFmap_cFv,
(void*)getNextRoomPointer__15renderingFmap_cFv,
(void*)drawPath__11dDrawPath_cFv,
(void*)rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class,
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class,
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class,
(void*)beforeDrawPath__15renderingFmap_cFv,
(void*)afterDrawPath__15renderingFmap_cFv,
(void*)preDrawPath__15renderingFmap_cFv,
(void*)postDrawPath__15renderingFmap_cFv,
(void*)isDrawPath__15renderingFmap_cFv,
(void*)preRenderingMap__18dRenderingFDAmap_cFv,
(void*)postRenderingMap__15renderingFmap_cFv,
(void*)getBackColor__15dMenu_FmapMap_cCFv,
(void*)getDecoLineColor__18dRenderingFDAmap_cFii,
(void*)getDecorationLineWidth__18dRenderingFDAmap_cFi,
};
src/d/d_menu_option.cpp
+123 -292
View File
@@ -22,7 +22,6 @@
#include "m_Do/m_Do_graphic.h"
#include "string.h"
/* ############################################################################################## */
/* 803BDBA8-803BDBB4 01ACC8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -87,54 +86,17 @@ dMenu_Option_c::~dMenu_Option_c() {}
/* 80396EA8-80396EB8 023508 000C+04 4/4 0/0 0/0 .rodata dMo_soundMode */
static const u32 dMo_soundMode[3] = {0, 1, 2};
/* 80396EB8-80396EE0 023518 0028+00 0/1 0/0 0/0 .rodata text_a_tag$3904 */
static const u64 text_a_tag_3904[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
};
/* 80396EE0-80396F08 023540 0028+00 0/1 0/0 0/0 .rodata text_b_tag$3905 */
static const u64 text_b_tag_3905[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
};
/* 80396F08-80396F18 023568 0010+00 0/1 0/0 0/0 .rodata l_tagName012$3918 */
static const u64 l_tagName012[2] = {
'w_no_n',
'w_yes_n',
};
/* 80396F18-80396F28 023578 0010+00 0/1 0/0 0/0 .rodata l_tagName013$3919 */
static const u64 l_tagName013[2] = {
'w_no_t',
'w_yes_t',
};
/* 80396F28-80396F38 023588 0010+00 0/1 0/0 0/0 .rodata l_tagName9$3928 */
static const u64 l_tagName9[2] = {
'w_no_m',
'w_yes_m',
};
/* 80396F38-80396F48 023598 0010+00 0/1 0/0 0/0 .rodata l_tagName10$3929 */
static const u64 l_tagName10[2] = {
'w_no_g',
'w_yes_g',
};
/* 80396F48-80396F58 0235A8 0010+00 0/1 0/0 0/0 .rodata l_tagName11$3930 */
static const u64 l_tagName11[2] = {
'w_no_gr',
'w_yes_gr',
};
/* 80454328-8045432C 002928 0002+02 1/1 0/0 0/0 .sdata2 l_msgNum2$3920 */
static const u8 l_msgNum2[2] = {
0x08,
0x07,
};
/* 801E205C-801E2C1C 1DC99C 0BC0+00 1/1 0/0 0/0 .text _create__14dMenu_Option_cFv */
void dMenu_Option_c::_create() {
static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
static const u64 l_tagName012[2] = {'w_no_n', 'w_yes_n'};
static const u64 l_tagName013[2] = {'w_no_t', 'w_yes_t'};
static const u64 l_tagName9[2] = {'w_no_m', 'w_yes_m'};
static const u64 l_tagName10[2] = {'w_no_g', 'w_yes_g'};
static const u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'};
static const u8 l_msgNum2[2] = {8, 7};
mpFont = mDoExt_getMesgFont();
mpString = new dMsgString_c();
mpMeterHaihai = new dMeterHaihai_c(3);
@@ -181,11 +143,11 @@ void dMenu_Option_c::_create() {
field_0x3dc = 0;
field_0x3de = 0;
for (int i = 0; i < 5; i++) {
((J2DTextBox*)(mpScreenIcon->search(text_a_tag_3904[i])))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)(mpScreenIcon->search(text_b_tag_3905[i])))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)(mpScreenIcon->search(text_a_tag[i])))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)(mpScreenIcon->search(text_b_tag[i])))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)(mpScreenIcon->search(text_a_tag_3904[i])))->setString(0x20, "");
((J2DTextBox*)(mpScreenIcon->search(text_b_tag_3905[i])))->setString(0x20, "");
((J2DTextBox*)(mpScreenIcon->search(text_a_tag[i])))->setString(0x20, "");
((J2DTextBox*)(mpScreenIcon->search(text_b_tag[i])))->setString(0x20, "");
}
setAButtonString(0x40C);
setBButtonString(0x3F9);
@@ -1234,227 +1196,109 @@ void dMenu_Option_c::menuHide(int index) {
}
}
/* ############################################################################################## */
/* 80396F58-80396F88 0235B8 0030+00 0/1 0/0 0/0 .rodata tag_frame$5201 */
static const u64 tag_frame[6] = {
'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05',
};
/* 80396F88-80396FB8 0235E8 0030+00 0/1 0/0 0/0 .rodata tag_menu0$5202 */
static const u64 tag_menu0[6] = {
'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5',
};
/* 80396FB8-80396FE8 023618 0030+00 0/1 0/0 0/0 .rodata let_n$5214 */
static const u64 let_n[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n',
};
/* 80396FE8-80397018 023648 0030+00 0/1 0/0 0/0 .rodata let2_n$5215 */
static const u64 let2_n[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n',
};
/* 80397018-80397048 023678 0030+00 0/1 0/0 0/0 .rodata menu_n$5216 */
static const u64 menu_n[6] = {
'menu_n0', 'menu_n1', 'menu_n2', 'menu_n3', 'menu_n4', 'menu_n5',
};
/* 80397048-80397078 0236A8 0030+00 0/1 0/0 0/0 .rodata menu2_n$5217 */
static const u64 menu2_n[6] = {
'mw_n_0', 'mw_n_1', 'mw_n_2', 'mw_n_3', 'mw_n_4',
};
/* 80397078-803970A8 0236D8 0030+00 0/1 0/0 0/0 .rodata al0_n$5218 */
static const u64 al0_n[6] = {
's_grr_00', 's_grr_01', 's_grr_02', 's_grr_03', 's_grr_04', 's_grr_05',
};
/* 803970A8-803970D8 023708 0030+00 0/1 0/0 0/0 .rodata al1_n$5219 */
static const u64 al1_n[6] = {
'c_grr_00', 'c_grr_01', 'c_grr_02', 'c_grr_03', 'c_grr_04', 'c_grr_05',
};
/* 803970D8-80397108 023738 0030+00 0/1 0/0 0/0 .rodata al2_n$5220 */
static const u64 al2_n[6] = {
's_grl_00', 's_grl_01', 's_grl_02', 's_grl_03', 's_grl_04', 's_grl_05',
};
/* 80397108-80397138 023768 0030+00 0/1 0/0 0/0 .rodata al3_n$5221 */
static const u64 al3_n[6] = {
'c_grl_00', 'c_grl_01', 'c_grl_02', 'c_grl_03', 'c_grl_04', 'c_grl_05',
};
/* 80397138-80397160 023798 0028+00 0/1 0/0 0/0 .rodata haihail_n$5238 */
static const u64 haihail_n[5] = {
'y_set_l0', 'y_set_l1', 'y_set_l2', 'y_set_l3', 'y_set_l4',
};
/* 80397160-80397188 0237C0 0028+00 0/1 0/0 0/0 .rodata haihair_n$5239 */
static const u64 haihair_n[5] = {
'y_set_r0', 'y_set_r1', 'y_set_r2', 'y_set_r3', 'y_set_r4',
};
/* 80397188-803971B8 0237E8 0030+00 0/1 0/0 0/0 .rodata menu3_n$5256 */
static const u64 menu3_n[6] = {
'menuapn0', 'menuapn1', 'menuapn2', 'menuapn3', 'menuapn4',
};
/* 803971B8-803971E0 023818 0028+00 0/1 0/0 0/0 .rodata tv_btnA$5275 */
static const u64 tv_btnA[5] = {
'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at',
};
/* 803971E0-80397208 023840 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$5276 */
static const u64 ftv_btnA[5] = {
'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at',
};
/* 80397208-80397218 023868 0010+00 0/1 0/0 0/0 .rodata fenu_t0$5282 */
static const u64 fenu_t0[2] = {
'fenu_t0s',
'fenu_t0',
};
/* 80397218-80397228 023878 0010+00 0/1 0/0 0/0 .rodata menu_t0$5283 */
static const u64 menu_t0[2] = {
'menu_t0s',
'menu_t0',
};
/* 80397228-80397238 023888 0010+00 0/1 0/0 0/0 .rodata fenu_t2$5289 */
static const u64 fenu_t2[2] = {
'fenu_t1s',
'fenu_t1',
};
/* 80397238-80397248 023898 0010+00 0/1 0/0 0/0 .rodata menu_t2$5290 */
static const u64 menu_t2[2] = {
'menu_t1s',
'menu_t1',
};
/* 80397248-80397258 0238A8 0010+00 0/1 0/0 0/0 .rodata fenu_t3$5296 */
static const u64 fenu_t3[2] = {'fenu_t2s', 'fenu_t2'};
/* 80397258-80397268 0238B8 0010+00 0/1 0/0 0/0 .rodata menu_t3$5297 */
static const u64 menu_t3[2] = {
'menu_t2s',
'menu_t2',
};
/* 80397268-80397278 0238C8 0010+00 0/1 0/0 0/0 .rodata fenu_t4$5303 */
static const u64 fenu_t4[2] = {
'fenu_t3s',
'fenu_t3',
};
/* 80397278-80397288 0238D8 0010+00 0/1 0/0 0/0 .rodata menu_t4$5304 */
static const u64 menu_t4[2] = {
'menu_t3s',
'menu_t3',
};
/* 80397288-80397298 0238E8 0010+00 0/1 0/0 0/0 .rodata fenu_t1$5310 */
static const u64 fenu_t1[2] = {
'fenu_t4s',
'fenu_t4',
};
/* 80397298-803972A8 0238F8 0010+00 0/1 0/0 0/0 .rodata menu_t1$5311 */
static const u64 menu_t1[2] = {
'menu_t4s',
'menu_t4',
};
/* 803972A8-803972B8 023908 0010+00 0/1 0/0 0/0 .rodata fenu_t5$5317 */
static const u64 fenu_t5[2] = {
'fenu_t5s',
'fenu_t5',
};
/* 803972B8-803972C8 023918 0010+00 0/1 0/0 0/0 .rodata menu_t5$5318 */
static const u64 menu_t5[2] = {
'menu_t5s',
'menu_t5',
};
/* 803972C8-803972F8 023928 0030+00 0/1 0/0 0/0 .rodata menut_0$5324 */
static const u64 menut_0[6] = {
'menut0as', 'menut0a', 'menut0a2', 'menut0a1', 'menut0a4', 'menut0a3',
};
/* 803972F8-80397328 023958 0030+00 0/1 0/0 0/0 .rodata fenut_0$5325 */
static const u64 fenut_0[6] = {
'menut010', 'menut0a9', 'menut0a8', 'menut0a7', 'menut0a6', 'menut0a5',
};
/* 80397328-80397358 023988 0030+00 0/1 0/0 0/0 .rodata menut_1$5332 */
static const u64 menut_1[6] = {
'menut1as', 'menut1a', 'menut1a2', 'menut1a1', 'menut1a4', 'menut1a3',
};
/* 80397358-80397388 0239B8 0030+00 0/1 0/0 0/0 .rodata fenut_1$5333 */
static const u64 fenut_1[6] = {
'menut110', 'menut1a9', 'menut1a8', 'menut1a7', 'menut1a6', 'menut1a5',
};
/* 80397388-803973B8 0239E8 0030+00 0/1 0/0 0/0 .rodata menut_2$5340 */
static const u64 menut_2[6] = {
'menut2as', 'menut2a', 'menut2a2', 'menut2a1', 'menut2a4', 'menut2a3',
};
/* 803973B8-803973E8 023A18 0030+00 0/1 0/0 0/0 .rodata fenut_2$5341 */
static const u64 fenut_2[6] = {
'menut210', 'menut2a9', 'menut2a8', 'menut2a7', 'menut2a6', 'menut2a5',
};
/* 803973E8-80397418 023A48 0030+00 0/1 0/0 0/0 .rodata menut_3$5348 */
static const u64 menut_3[6] = {
'menut3a5', 'menut3a6', 'menut3a7', 'menut3a8', 'menut3a9', 'menut310',
};
/* 80397418-80397448 023A78 0030+00 0/1 0/0 0/0 .rodata fenut_3$5349 */
static const u64 fenut_3[6] = {
'menut315', 'menut314', 'menut313', 'menut312', 'menut311', 'menut001',
};
/* 80397448-80397478 023AA8 0030+00 0/1 0/0 0/0 .rodata menut_4$5356 */
static const u64 menut_4[6] = {
'menut3as', 'menut3a', 'menut3a2', 'menut3a1', 'menut3a4', 'menut3a3',
};
/* 80397478-803974A8 023AD8 0030+00 0/1 0/0 0/0 .rodata fenut_4$5357 */
static const u64 fenut_4[6] = {
'menut321', 'menut320', 'menut319', 'menut318', 'menut317', 'menut316',
};
/* 803974A8-803974D8 023B08 0030+00 0/1 0/0 0/0 .rodata tx$5381 */
static const u64 tx[6] = {
'w_p_tex5', 'w_p_tex6', 'w_p_tex3', 'w_p_tex4', 'fps_tex1', 'f_p_tex1',
};
/* 803974D8-803974F8 023B38 0020+00 0/0 0/0 0/0 .rodata op_tx$5393 */
static const u64 op_tx[4] = {
'w_text_n',
'w_btn_n',
'w_k_t_n',
'w_abtn_n',
};
/* 803974F8-80397510 023B58 0018+00 0/1 0/0 0/0 .rodata z_tx$5399 */
static const u64 z_tx[3] = {
'z_gc_n',
};
/* 80397510-80397560 023B70 0050+00 0/1 0/0 0/0 .rodata txTV$5409 */
static const u64 txTV[10] = {
'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101',
'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4',
};
/* 801E5678-801E6FBC 1DFFB8 1944+00 1/1 0/0 0/0 .text screenSet__14dMenu_Option_cFv */
void dMenu_Option_c::screenSet() {
static const u64 tag_frame[6] = {
'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05',
};
static const u64 tag_menu0[6] = {
'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5',
};
static const u64 let_n[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n',
};
static const u64 let2_n[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n',
};
static const u64 menu_n[6] = {
'menu_n0', 'menu_n1', 'menu_n2', 'menu_n3', 'menu_n4', 'menu_n5',
};
static const u64 menu2_n[6] = {
'mw_n_0', 'mw_n_1', 'mw_n_2', 'mw_n_3', 'mw_n_4',
};
static const u64 al0_n[6] = {
's_grr_00', 's_grr_01', 's_grr_02', 's_grr_03', 's_grr_04', 's_grr_05',
};
static const u64 al1_n[6] = {
'c_grr_00', 'c_grr_01', 'c_grr_02', 'c_grr_03', 'c_grr_04', 'c_grr_05',
};
static const u64 al2_n[6] = {
's_grl_00', 's_grl_01', 's_grl_02', 's_grl_03', 's_grl_04', 's_grl_05',
};
static const u64 al3_n[6] = {
'c_grl_00', 'c_grl_01', 'c_grl_02', 'c_grl_03', 'c_grl_04', 'c_grl_05',
};
static const u64 haihail_n[5] = {
'y_set_l0', 'y_set_l1', 'y_set_l2', 'y_set_l3', 'y_set_l4',
};
static const u64 haihair_n[5] = {
'y_set_r0', 'y_set_r1', 'y_set_r2', 'y_set_r3', 'y_set_r4',
};
static const u64 menu3_n[6] = {
'menuapn0', 'menuapn1', 'menuapn2', 'menuapn3', 'menuapn4',
};
static const u64 tv_btnA[5] = {
'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at',
};
static const u64 ftv_btnA[5] = {
'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at',
};
static const u64 fenu_t0[2] = {'fenu_t0s', 'fenu_t0'};
static const u64 menu_t0[2] = {'menu_t0s', 'menu_t0'};
static const u64 fenu_t2[2] = {'fenu_t1s', 'fenu_t1'};
static const u64 menu_t2[2] = {'menu_t1s', 'menu_t1'};
static const u64 fenu_t3[2] = {'fenu_t2s', 'fenu_t2'};
static const u64 menu_t3[2] = {'menu_t2s', 'menu_t2'};
static const u64 fenu_t4[2] = {'fenu_t3s', 'fenu_t3'};
static const u64 menu_t4[2] = {'menu_t3s', 'menu_t3'};
static const u64 fenu_t1[2] = {'fenu_t4s', 'fenu_t4'};
static const u64 menu_t1[2] = {'menu_t4s', 'menu_t4'};
static const u64 fenu_t5[2] = {'fenu_t5s', 'fenu_t5'};
static const u64 menu_t5[2] = {'menu_t5s', 'menu_t5'};
static const u64 menut_0[6] = {
'menut0as', 'menut0a', 'menut0a2', 'menut0a1', 'menut0a4', 'menut0a3',
};
static const u64 fenut_0[6] = {
'menut010', 'menut0a9', 'menut0a8', 'menut0a7', 'menut0a6', 'menut0a5',
};
static const u64 menut_1[6] = {
'menut1as', 'menut1a', 'menut1a2', 'menut1a1', 'menut1a4', 'menut1a3',
};
static const u64 fenut_1[6] = {
'menut110', 'menut1a9', 'menut1a8', 'menut1a7', 'menut1a6', 'menut1a5',
};
static const u64 menut_2[6] = {
'menut2as', 'menut2a', 'menut2a2', 'menut2a1', 'menut2a4', 'menut2a3',
};
static const u64 fenut_2[6] = {
'menut210', 'menut2a9', 'menut2a8', 'menut2a7', 'menut2a6', 'menut2a5',
};
static const u64 menut_3[6] = {
'menut3a5', 'menut3a6', 'menut3a7', 'menut3a8', 'menut3a9', 'menut310',
};
static const u64 fenut_3[6] = {
'menut315', 'menut314', 'menut313', 'menut312', 'menut311', 'menut001',
};
static const u64 menut_4[6] = {
'menut3as', 'menut3a', 'menut3a2', 'menut3a1', 'menut3a4', 'menut3a3',
};
static const u64 fenut_4[6] = {
'menut321', 'menut320', 'menut319', 'menut318', 'menut317', 'menut316',
};
static const u64 tx[6] = {
'w_p_tex5', 'w_p_tex6', 'w_p_tex3', 'w_p_tex4', 'fps_tex1', 'f_p_tex1',
};
static const u64 op_tx[4] = {
'w_text_n', 'w_btn_n', 'w_k_t_n', 'w_abtn_n',
};
static const u64 z_tx[3] = {
'z_gc_n', 0, 0,
};
static const u64 txTV[10] = {
'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101',
'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4',
};
mpTitle = new CPaneMgr(mpBackScreen, 'title_n', 0, NULL);
Vec pos = mpTitle->getGlobalVtxCenter(mpTitle->mPane, false, 0);
mpWarning->mPosY = pos.y + g_drawHIO.mOptionScreen.mBackgroundPosY;
@@ -1996,54 +1840,45 @@ void dMenu_Option_c::changeTVCheck() {
}
}
/* 80397560-80397588 023BC0 0028+00 0/0 0/0 0/0 .rodata txTVhide$5410 */
static const u64 txTVhide[5] = {
'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n',
};
/* 80397588-803975B0 023BE8 0028+00 1/1 0/0 0/0 .rodata text_a_tag$6194 */
static const u64 text_a_tag_6194[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
};
static void dummy() {
static const u64 txTVhide[5] = {'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n'};
}
/* 801E7E98-801E7F9C 1E27D8 0104+00 11/11 0/0 0/0 .text setAButtonString__14dMenu_Option_cFUs */
void dMenu_Option_c::setAButtonString(u16 i_stringID) {
static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
u32 stringId = i_stringID;
if (stringId != field_0x3dc) {
field_0x3dc = i_stringID;
if (stringId == 0) {
for (int i = 0; i < 5; i++) {
J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_a_tag_6194[i]);
J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_a_tag[i]);
strcpy(textBox->getStringPtr(), "");
}
} else {
for (int i = 0; i < 5; i++) {
J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_a_tag_6194[i]);
J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_a_tag[i]);
dMeter2Info_getStringKanji(stringId, textBox->getStringPtr(), NULL);
}
}
}
}
/* 803975B0-803975D8 023C10 0028+00 1/1 0/0 0/0 .rodata text_b_tag$6217 */
static const u64 text_b_tag_6217[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
};
/* 801E7F9C-801E80A0 1E28DC 0104+00 11/11 0/0 0/0 .text setBButtonString__14dMenu_Option_cFUs */
void dMenu_Option_c::setBButtonString(u16 i_stringID) {
static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
u32 stringId = i_stringID;
if (stringId != field_0x3de) {
field_0x3de = i_stringID;
if (stringId == 0) {
for (int i = 0; i < 5; i++) {
J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_b_tag_6217[i]);
J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_b_tag[i]);
strcpy(textBox->getStringPtr(), "");
}
} else {
for (int i = 0; i < 5; i++) {
J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_b_tag_6217[i]);
J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_b_tag[i]);
dMeter2Info_getStringKanji(stringId, textBox->getStringPtr(), NULL);
}
}
@@ -2060,10 +1895,6 @@ bool dMenu_Option_c::dpdMenuMove() {
return false;
}
/* ############################################################################################## */
/* 80454378-8045437C 002978 0004+00 1/1 0/0 0/0 .sdata2 @6256 */
// SECTION_SDATA2 static f32 lit_6256 = 10.0f;
/* 801E80B4-801E8210 1E29F4 015C+00 1/1 0/0 0/0 .text paneResize__14dMenu_Option_cFUx */
void dMenu_Option_c::paneResize(u64 i_tag) {
f32 boundsY = mpClipScreen->search(i_tag)->getBounds().i.y;
src/d/d_msg_object.cpp
+25 -636
View File
@@ -33,295 +33,9 @@
#include "JSystem/JKernel/JKRExpHeap.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" s32 dMsgObject_getGroupID__Fv();
extern "C" static void dMsgObject_searchSSItem__FPvPv();
extern "C" void __ct__20dMsgObject_HowlHIO_cFv();
extern "C" void __ct__16dMsgObject_HIO_cFv();
extern "C" void _create__12dMsgObject_cFP9msg_class();
extern "C" void _execute__12dMsgObject_cFv();
extern "C" void _draw__12dMsgObject_cFv();
extern "C" void _delete__12dMsgObject_cFv();
extern "C" void setMessageIndex__12dMsgObject_cFUlUlb();
extern "C" void setMessageIndexDemo__12dMsgObject_cFUlb();
extern "C" void getMessageIndex__12dMsgObject_cFUl();
extern "C" void getRevoMessageIndex__12dMsgObject_cFUl();
extern "C" void getMessageIndexAlways__12dMsgObject_cFUl();
extern "C" void getMessageIDAlways__12dMsgObject_cFUl();
extern "C" void getMessageGroup__12dMsgObject_cFUl();
extern "C" void waitProc__12dMsgObject_cFv();
extern "C" void openProc__12dMsgObject_cFv();
extern "C" void outnowProc__12dMsgObject_cFv();
extern "C" void outwaitProc__12dMsgObject_cFv();
extern "C" void stopProc__12dMsgObject_cFv();
extern "C" void continueProc__12dMsgObject_cFv();
extern "C" void selectProc__12dMsgObject_cFv();
extern "C" void selectEndProc__12dMsgObject_cFv();
extern "C" void inputProc__12dMsgObject_cFv();
extern "C" void finishProc__12dMsgObject_cFv();
extern "C" void endProc__12dMsgObject_cFv();
extern "C" void deleteProc__12dMsgObject_cFv();
extern "C" void textmodeProc__12dMsgObject_cFv();
extern "C" void talkStartInit__12dMsgObject_cFv();
extern "C" void fukiPosCalc__12dMsgObject_cFb();
extern "C" void setStatusLocal__12dMsgObject_cFUs();
extern "C" void getStatusLocal__12dMsgObject_cFv();
extern "C" void delete_screen__12dMsgObject_cFb();
extern "C" void isSend__12dMsgObject_cFv();
extern "C" void readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c();
extern "C" void changeFlowGroupLocal__12dMsgObject_cFl();
extern "C" void demoMessageGroupLocal__12dMsgObject_cFv();
extern "C" void endFlowGroupLocal__12dMsgObject_cFv();
extern "C" void changeGroupLocal__12dMsgObject_cFs();
extern "C" void
getStringLocal__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs();
extern "C" void isGetItemMessage__12dMsgObject_cFv();
extern "C" void isKanbanMessage__12dMsgObject_cFv();
extern "C" void isHowlMessage__12dMsgObject_cFv();
extern "C" void isMidonaMessage__12dMsgObject_cFv();
extern "C" void isMidonaNormalTalkWait__12dMsgObject_cFv();
extern "C" void isMidonaTalkWait__12dMsgObject_cFv();
extern "C" void isPlaceMessage__12dMsgObject_cFv();
extern "C" void isBossMessage__12dMsgObject_cFv();
extern "C" bool isBookMessage__12dMsgObject_cFv();
extern "C" void isStaffMessage__12dMsgObject_cFv();
extern "C" void isSaveMessage__12dMsgObject_cFv();
extern "C" void isTalkMessage__12dMsgObject_cFv();
extern "C" void getSmellName__12dMsgObject_cFv();
extern "C" void getPortalName__12dMsgObject_cFv();
extern "C" void getBombName__12dMsgObject_cFv();
extern "C" void getInsectName__12dMsgObject_cFv();
extern "C" void getLetterName__12dMsgObject_cFv();
extern "C" void getSelectBombNum__12dMsgObject_cFv();
extern "C" void onMsgSendControlLocal__12dMsgObject_cFv();
extern "C" void offMsgSendControlLocal__12dMsgObject_cFv();
extern "C" void isMsgSendControlLocal__12dMsgObject_cFv();
extern "C" void onMsgSendLocal__12dMsgObject_cFv();
extern "C" void offMsgSendLocal__12dMsgObject_cFv();
extern "C" void isMsgSendLocal__12dMsgObject_cFv();
extern "C" void isMouthCheckLocal__12dMsgObject_cFv();
extern "C" void getBombBuyPriceLocal__12dMsgObject_cFUc();
extern "C" void addSelectBomBag__12dMsgObject_cFUc();
extern "C" void resetSelectBomBag__12dMsgObject_cFv();
extern "C" void getSelectBombBagIDLocal__12dMsgObject_cFv();
extern "C" void getSelectBombPriceLocal__12dMsgObject_cFv();
extern "C" void setEquipBombInfoLocal__12dMsgObject_cFv();
extern "C" void updateEquipBombInfoLocal__12dMsgObject_cFv();
extern "C" void setShopWaitTimer__12dMsgObject_cFUc();
extern "C" void setSelectWordFlagLocal__12dMsgObject_cFUc();
extern "C" void isHowlHearingModeLocal__12dMsgObject_cFv();
extern "C" void isCameraCancelFlag__12dMsgObject_cFv();
extern "C" void onCameraCancelFlag__12dMsgObject_cFv();
extern "C" void offCameraCancelFlag__12dMsgObject_cFv();
extern "C" void isKillMessageFlag__12dMsgObject_cFv();
extern "C" void onKillMessageFlag__12dMsgObject_cFv();
extern "C" void setKillMessageFlag__12dMsgObject_cFv();
extern "C" void setKillMessageFlagLocal__12dMsgObject_cFv();
extern "C" void setTalkPartner__12dMsgObject_cFP10fopAc_ac_c();
extern "C" void setNowTalkFlowNo__12dMsgObject_cFs();
extern "C" void getNowTalkFlowNo__12dMsgObject_cFv();
extern "C" void setDemoMessage__12dMsgObject_cFUl();
extern "C" void setTalkHeap__12dMsgObject_cFPv();
extern "C" void setTalkHeapLocal__12dMsgObject_cFPv();
extern "C" void getTalkHeap__12dMsgObject_cFv();
extern "C" void isDraw__12dMsgObject_cFv();
extern "C" void setButtonStatusLocal__12dMsgObject_cFv();
extern "C" void setDemoMessageLocal__12dMsgObject_cFUl();
extern "C" void getSmellTypeMessageIDLocal__12dMsgObject_cFv();
extern "C" void setSmellTypeLocal__12dMsgObject_cFUc();
extern "C" void getSelectCursorPosLocal__12dMsgObject_cFv();
extern "C" void setSelectCursorPosLocal__12dMsgObject_cFUc();
extern "C" void setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c();
extern "C" static void dMsgObject_Draw__FP12dMsgObject_c();
extern "C" static void dMsgObject_Execute__FP12dMsgObject_c();
extern "C" static bool dMsgObject_IsDelete__FP12dMsgObject_c();
extern "C" static void dMsgObject_Delete__FP12dMsgObject_c();
extern "C" static void dMsgObject_Create__FP9msg_class();
extern "C" void readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c();
extern "C" void changeFlowGroup__12dMsgObject_cFl();
extern "C" void demoMessageGroup__12dMsgObject_cFv();
extern "C" void endFlowGroup__12dMsgObject_cFv();
extern "C" void changeGroup__12dMsgObject_cFs();
extern "C" void
getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs();
extern "C" void getMsgDtPtr__12dMsgObject_cFv();
extern "C" void setProcessID__12dMsgObject_cFUi();
extern "C" void getActor__12dMsgObject_cFv();
extern "C" void getpTalkActor__12dMsgObject_cFv();
extern "C" void getIdx__12dMsgObject_cFv();
extern "C" void getNodeIdx__12dMsgObject_cFv();
extern "C" void setStatus__12dMsgObject_cFUs();
extern "C" void getStatus__12dMsgObject_cFv();
extern "C" void getScrnDrawPtr__12dMsgObject_cFv();
extern "C" void setTalkActor__12dMsgObject_cFP10fopAc_ac_c();
extern "C" void onMsgSendControl__12dMsgObject_cFv();
extern "C" void offMsgSendControl__12dMsgObject_cFv();
extern "C" void isMsgSendControl__12dMsgObject_cFv();
extern "C" void onMsgSend__12dMsgObject_cFv();
extern "C" void offMsgSend__12dMsgObject_cFv();
extern "C" void isMsgSend__12dMsgObject_cFv();
extern "C" void isMouthCheck__12dMsgObject_cFv();
extern "C" void getMessageID__12dMsgObject_cFv();
extern "C" void getSmellTypeMessageID__12dMsgObject_cFv();
extern "C" void setSmellType__12dMsgObject_cFUc();
extern "C" void getSelectCursorPos__12dMsgObject_cFv();
extern "C" void setSelectCursorPos__12dMsgObject_cFUc();
extern "C" void setPortalMessageID__12dMsgObject_cFUs();
extern "C" void setInsectItemNo__12dMsgObject_cFUc();
extern "C" void setLetterNameID__12dMsgObject_cFUs();
extern "C" void setArrowNum__12dMsgObject_cFUc();
extern "C" void setMsgOutputType__12dMsgObject_cFUc();
extern "C" void getMsgOutputType__12dMsgObject_cFv();
extern "C" void getWord__12dMsgObject_cFv();
extern "C" void getSelectWord__12dMsgObject_cFi();
extern "C" void setSelectWordFlag__12dMsgObject_cFUc();
extern "C" void getSelectWordFlag__12dMsgObject_cFv();
extern "C" void isHowlHearingMode__12dMsgObject_cFv();
extern "C" void getSelectBombBagID__12dMsgObject_cFv();
extern "C" void getSelectBombPrice__12dMsgObject_cFv();
extern "C" void setEquipBombInfo__12dMsgObject_cFv();
extern "C" void getItemEquipButton__12dMsgObject_cFv();
extern "C" void setSelectCancelPos__12dMsgObject_cFUc();
extern "C" void dMsgObject_getTotalPrice__Fv();
extern "C" void dMsgObject_setTotalPrice__FUs();
extern "C" void dMsgObject_addTotalPrice__Fs();
extern "C" void dMsgObject_getTotalPayment__Fv();
extern "C" void dMsgObject_setTotalPayment__FUs();
extern "C" static void dMsgObject_addTotalPayment__Fs();
extern "C" void dMsgObject_getFundRaising__Fv();
extern "C" void dMsgObject_setFundRaising__FUs();
extern "C" static void dMsgObject_addFundRaising__Fs();
extern "C" void dMsgObject_getOffering__Fv();
extern "C" void dMsgObject_addOffering__Fs();
extern "C" void __sinit_d_msg_object_cpp();
extern "C" void __dt__20dMsgObject_HowlHIO_cFv();
extern "C" void __dt__16dMsgObject_HIO_cFv();
extern "C" void exec__14dMsgScrnBase_cFv();
extern "C" void setSelectRubyString__14dMsgScrnBase_cFPcPcPc();
extern "C" void setSelectString__14dMsgScrnBase_cFPcPcPc();
extern "C" bool selectAnimeMove__14dMsgScrnBase_cFUcUcb();
extern "C" void selectAnimeInit__14dMsgScrnBase_cFUcUcfUc();
extern "C" void arwAnimeMove__14dMsgScrnBase_cFv();
extern "C" void arwAnimeInit__14dMsgScrnBase_cFv();
extern "C" void fukiPosCalc__14dMsgScrnBase_cFUc();
extern "C" bool isSelect__14dMsgScrnBase_cFv();
extern "C" bool selectAnimeEnd__14dMsgScrnBase_cFv();
extern "C" void dotAnimeMove__14dMsgScrnBase_cFv();
extern "C" void dotAnimeInit__14dMsgScrnBase_cFv();
extern "C" void setActorPos__19jmessage_tReferenceF4cXyz();
extern "C" extern char const* const d_msg_d_msg_object__stringBase0;
//
// External References:
//
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void mDoExt_getRubyFont__Fv();
extern "C" void mDoLib_project__FP3VecP3Vec();
extern "C" void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap();
extern "C" void fopAc_IsActor__FPv();
extern "C" void fopMsgM_setStageLayer__FPv();
extern "C" void fopMsgM_messageSet__FUlUl();
extern "C" void fpcEx_Search__FPFPvPv_PvPv();
extern "C" void dComIfGs_setSelectItemIndex__FiUc();
extern "C" void dComIfGp_setHeapLockFlag__FUc();
extern "C" void dComIfGp_offHeapLockFlag__Fi();
extern "C" void dComIfGp_getSubHeap2D__Fi();
extern "C" void getItem__17dSv_player_item_cCFib();
extern "C" void onFirstBit__21dSv_player_get_item_cFUc();
extern "C" void getBombNum__24dSv_player_item_record_cCFUc();
extern "C" void onEventBit__11dSv_event_cFUs();
extern "C" void offEventBit__11dSv_event_cFUs();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void setEventReg__11dSv_event_cFUsUc();
extern "C" void getEventReg__11dSv_event_cCFUs();
extern "C" void setPtT__14dEvt_control_cFPv();
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
extern "C" void __ct__Q28JUtility6TColorFv();
extern "C" void isFloatingMessageVisible__13dMeter2Info_cFv();
extern "C" void resetFloatingMessage__13dMeter2Info_cFv();
extern "C" void decMsgKeyWaitTimer__13dMeter2Info_cFv();
extern "C" void dMeter2Info_set2DVibration__Fv();
extern "C" void emphasisButtonDelete__9dMeter2_cFv();
extern "C" void __ct__10COutFont_cFUc();
extern "C" void __ct__19jmessage_tReferenceFv();
extern "C" void pageSend__19jmessage_tReferenceFv();
extern "C" void selectMessage__19jmessage_tReferenceFv();
extern "C" void inputNumber__19jmessage_tReferenceFv();
extern "C" void shiftCharCountBuffer__19jmessage_tReferenceFv();
extern "C" void resetCharCountBuffer__19jmessage_tReferenceFv();
extern "C" void isLightEnd__19jmessage_tReferenceFv();
extern "C" void __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl();
extern "C" void __ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference();
extern "C" void resetRendering__28jmessage_tRenderingProcessorFv();
extern "C" void setString__14dMsgScrnBase_cFPcPc();
extern "C" void setRubyString__14dMsgScrnBase_cFPc();
extern "C" void __ct__14dMsgScrnBoss_cFv();
extern "C" void __ct__14dMsgScrnItem_cFUcUcP10JKRExpHeap();
extern "C" void __ct__14dMsgScrnHowl_cFv();
extern "C" void isKeyCheck__14dMsgScrnHowl_cFv();
extern "C" void __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap();
extern "C" void __ct__16dMsgScrnKanban_cFP10JKRExpHeap();
extern "C" void __ct__15dMsgScrnPlace_cFv();
extern "C" void __ct__15dMsgScrnStaff_cFUc();
extern "C" void __ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap();
extern "C" void __ct__14dMsgScrnTree_cFP7JUTFontP10JKRExpHeap();
extern "C" void __ct__12dMsgString_cFv();
extern "C" void __dt__12dMsgString_cFv();
extern "C" bool __eq__4cXyzCFRC3Vec();
extern "C" void reset__Q28JMessage8TControlFv();
extern "C" void update__Q28JMessage8TControlFv();
extern "C" void render__Q28JMessage8TControlFv();
extern "C" void setMessageCode__Q28JMessage8TControlFUsUs();
extern "C" void setMessageID__Q28JMessage8TControlFUlUlPb();
extern "C" void __dt__Q38JMessage18TResourceContainer10TCResourceFv();
extern "C" void __ct__Q28JMessage18TResourceContainerFv();
extern "C" void __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void changeBgmStatus__8Z2SeqMgrFl();
extern "C" void talkIn__11Z2StatusMgrFv();
extern "C" void talkOut__11Z2StatusMgrFv();
extern "C" void setTextCount__12Z2SpeechMgr2Fs();
extern "C" void getTotalFreeSize__7JKRHeapFv();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl();
extern "C" void erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator();
extern "C" void __register_global_object();
extern "C" void __construct_array();
extern "C" void _savegpr_22();
extern "C" void _savegpr_23();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_22();
extern "C" void _restgpr_23();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_control__7dDemo_c[4];
extern "C" u8 m_mesgControl__7dDemo_c[4];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
//
static void dMsgObject_addFundRaising(s16 param_0);
static void dMsgObject_addTotalPayment(s16 param_0);
/* ############################################################################################## */
/* 804510C8-804510D0 0005C8 0002+06 5/4 0/0 0/0 .sbss s_groupID */
static s16 s_groupID;
@@ -342,125 +56,6 @@ static int dMsgObject_searchSSItem(void* param_1, void* param_2) {
return 0;
}
/* ############################################################################################## */
/* 803C0AE8-803C0B4C -00001 0064+00 1/1 0/0 0/0 .data @4486 */
SECTION_DATA static void* lit_4486[25] = {
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x1F4),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x200),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x218),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x20C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x224),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x23C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x23C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x284),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x230),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x260),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x26C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x278),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x23C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x254),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x28C),
(void*)(((char*)_execute__12dMsgObject_cFv) + 0x248),
};
/* 803C0B4C-803C0B9C -00001 0050+00 1/1 0/0 0/0 .data @5875 */
SECTION_DATA static void* lit_5875[20] = {
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x308),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x21C),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x308),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x254),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x278),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x1E8),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x338),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x2A4),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x2E4),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x340),
(void*)(((char*)talkStartInit__12dMsgObject_cFv) + 0x2C4),
};
/* 803C0B9C-803C0BB0 -00001 0014+00 1/0 0/0 0/0 .data l_dMsgObject_Method */
SECTION_DATA static void* l_dMsgObject_Method[5] = {
(void*)dMsgObject_Create__FP9msg_class, (void*)dMsgObject_Delete__FP12dMsgObject_c,
(void*)dMsgObject_Execute__FP12dMsgObject_c, (void*)dMsgObject_IsDelete__FP12dMsgObject_c,
(void*)dMsgObject_Draw__FP12dMsgObject_c,
};
/* 803C0BB0-803C0BD8 -00001 0028+00 0/0 0/0 1/0 .data g_profile_MSG_OBJECT */
SECTION_DATA extern void* g_profile_MSG_OBJECT[10] = {
(void*)0xFFFFFFFD, (void*)0x000CFFFD,
(void*)0x03130000, (void*)&g_fpcLf_Method,
(void*)0x000004D8, (void*)NULL,
(void*)NULL, (void*)&g_fopMsg_Method,
(void*)0x03020000, (void*)&l_dMsgObject_Method,
};
/* 803C0BD8-803C0BE4 01DCF8 000C+00 2/2 0/0 0/0 .data __vt__16dMsgObject_HIO_c */
SECTION_DATA extern void* __vt__16dMsgObject_HIO_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__16dMsgObject_HIO_cFv,
};
/* 803C0BE4-803C0BF0 01DD04 000C+00 3/3 0/0 0/0 .data __vt__20dMsgObject_HowlHIO_c */
SECTION_DATA extern void* __vt__20dMsgObject_HowlHIO_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__20dMsgObject_HowlHIO_cFv,
};
/* 80454AA0-80454AA4 0030A0 0004+00 2/2 0/0 0/0 .sdata2 @4076 */
SECTION_SDATA2 static f32 lit_4076 = 0.5f;
/* 80454AA4-80454AA8 0030A4 0004+00 1/1 0/0 0/0 .sdata2 @4077 */
SECTION_SDATA2 static f32 lit_4077 = 1.0f / 10.0f;
/* 80454AA8-80454AAC 0030A8 0004+00 2/2 0/0 0/0 .sdata2 @4078 */
SECTION_SDATA2 static f32 lit_4078 = 3.0f / 10.0f;
/* 80454AAC-80454AB0 0030AC 0004+00 2/2 0/0 0/0 .sdata2 @4079 */
SECTION_SDATA2 static f32 lit_4079 = 2.0f / 5.0f;
/* 80454AB0-80454AB4 0030B0 0004+00 1/1 0/0 0/0 .sdata2 @4080 */
SECTION_SDATA2 static f32 lit_4080 = 1.0f / 20.0f;
/* 80454AB4-80454AB8 0030B4 0004+00 2/2 0/0 0/0 .sdata2 @4081 */
SECTION_SDATA2 static f32 lit_4081 = 1.5f;
/* 80454AB8-80454ABC 0030B8 0004+00 1/1 0/0 0/0 .sdata2 @4082 */
SECTION_SDATA2 static f32 lit_4082 = 2.0f;
/* 80454ABC-80454AC0 0030BC 0004+00 7/7 0/0 0/0 .sdata2 @4083 */
SECTION_SDATA2 static u8 lit_4083[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80454AC0-80454AC4 0030C0 0004+00 12/12 0/0 0/0 .sdata2 @4084 */
SECTION_SDATA2 static f32 lit_4084 = 1.0f;
/* 80454AC4-80454AC8 0030C4 0004+00 1/1 0/0 0/0 .sdata2 @4085 */
SECTION_SDATA2 static f32 lit_4085 = 11.0f / 5.0f;
/* 80232AEC-80232D6C 22D42C 0280+00 1/1 0/0 0/0 .text __ct__20dMsgObject_HowlHIO_cFv */
dMsgObject_HowlHIO_c::dMsgObject_HowlHIO_c() {
mHighlightScale = 0.5f;
@@ -509,75 +104,6 @@ dMsgObject_HowlHIO_c::dMsgObject_HowlHIO_c() {
mLineSpaceOffset = 2.2f;
}
/* ############################################################################################## */
/* 80454AC8-80454ACC 0030C8 0004+00 1/1 0/0 0/0 .sdata2 @4127 */
SECTION_SDATA2 static f32 lit_4127 = 23.0f;
/* 80454ACC-80454AD0 0030CC 0004+00 1/1 0/0 0/0 .sdata2 @4128 */
SECTION_SDATA2 static f32 lit_4128 = 22.0f;
/* 80454AD0-80454AD4 0030D0 0004+00 1/1 0/0 0/0 .sdata2 @4129 */
SECTION_SDATA2 static f32 lit_4129 = 26.0f;
/* 80454AD4-80454AD8 0030D4 0004+00 1/1 0/0 0/0 .sdata2 @4130 */
SECTION_SDATA2 static f32 lit_4130 = 25.0f;
/* 80454AD8-80454ADC 0030D8 0004+00 1/1 0/0 0/0 .sdata2 @4131 */
SECTION_SDATA2 static f32 lit_4131 = 7.0f / 10.0f;
/* 80454ADC-80454AE0 0030DC 0004+00 1/1 0/0 0/0 .sdata2 @4132 */
SECTION_SDATA2 static f32 lit_4132 = 9.0f / 10.0f;
/* 80454AE0-80454AE4 0030E0 0004+00 1/1 0/0 0/0 .sdata2 @4133 */
SECTION_SDATA2 static f32 lit_4133 = 1.0f / 5.0f;
/* 80454AE4-80454AE8 0030E4 0004+00 1/1 0/0 0/0 .sdata2 @4134 */
SECTION_SDATA2 static f32 lit_4134 = 6.0f / 5.0f;
/* 80454AE8-80454AEC 0030E8 0004+00 1/1 0/0 0/0 .sdata2 @4135 */
SECTION_SDATA2 static f32 lit_4135 = 21.0f / 20.0f;
/* 80454AEC-80454AF0 0030EC 0004+00 1/1 0/0 0/0 .sdata2 @4136 */
SECTION_SDATA2 static f32 lit_4136 = 97.0f / 100.0f;
/* 80454AF0-80454AF4 0030F0 0004+00 1/1 0/0 0/0 .sdata2 @4137 */
SECTION_SDATA2 static f32 lit_4137 = 11.0f / 10.0f;
/* 80454AF4-80454AF8 0030F4 0004+00 1/1 0/0 0/0 .sdata2 @4138 */
SECTION_SDATA2 static f32 lit_4138 = 30.0f;
/* 80454AF8-80454AFC 0030F8 0004+00 1/1 0/0 0/0 .sdata2 @4139 */
SECTION_SDATA2 static f32 lit_4139 = 11.0f;
/* 80454AFC-80454B00 0030FC 0004+00 1/1 0/0 0/0 .sdata2 @4140 */
SECTION_SDATA2 static f32 lit_4140 = 17.0f / 10.0f;
/* 80454B00-80454B04 003100 0004+00 1/1 0/0 0/0 .sdata2 @4141 */
SECTION_SDATA2 static f32 lit_4141 = 4.5f;
/* 80454B04-80454B08 003104 0004+00 1/1 0/0 0/0 .sdata2 @4142 */
SECTION_SDATA2 static f32 lit_4142 = -45.0f;
/* 80454B08-80454B0C 003108 0004+00 1/1 0/0 0/0 .sdata2 @4143 */
SECTION_SDATA2 static f32 lit_4143 = 0.75f;
/* 80454B0C-80454B10 00310C 0004+00 1/1 0/0 0/0 .sdata2 @4144 */
SECTION_SDATA2 static f32 lit_4144 = -5.0f;
/* 80454B10-80454B14 003110 0004+00 7/7 0/0 0/0 .sdata2 @4145 */
SECTION_SDATA2 static f32 lit_4145 = -1.0f;
/* 80454B14-80454B18 003114 0004+00 1/1 0/0 0/0 .sdata2 @4146 */
SECTION_SDATA2 static f32 lit_4146 = 19.0f / 20.0f;
/* 80454B18-80454B20 003118 0004+04 1/1 0/0 0/0 .sdata2 @4147 */
SECTION_SDATA2 static f32 lit_4147[1 + 1 /* padding */] = {
-30.0f,
/* padding */
0.0f,
};
/* 80232D6C-80233284 22D6AC 0518+00 1/1 0/0 0/0 .text __ct__16dMsgObject_HIO_cFv */
dMsgObject_HIO_c::dMsgObject_HIO_c() {
mBoxMidna_fontSizeX = 23.0f;
@@ -783,7 +309,6 @@ dMsgObject_HIO_c::dMsgObject_HIO_c() {
mPikariAnmSpeed = 0.3f;
}
/* 80233284-80233590 22DBC4 030C+00 1/1 0/0 0/0 .text _create__12dMsgObject_cFP9msg_class
*/
int dMsgObject_c::_create(msg_class* param_1) {
@@ -884,8 +409,6 @@ int dMsgObject_c::_create(msg_class* param_1) {
return 4;
}
/* ############################################################################################## */
/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
@@ -1010,7 +533,6 @@ int dMsgObject_c::_execute() {
return 1;
}
/* 802339BC-80233AE8 22E2FC 012C+00 1/1 0/0 0/0 .text _draw__12dMsgObject_cFv */
int dMsgObject_c::_draw() {
u16 sVar7 = getStatusLocal();
@@ -1077,8 +599,7 @@ int dMsgObject_c::_delete() {
}
/* 80233D04-80233E70 22E644 016C+00 2/2 2/2 0/0 .text setMessageIndex__12dMsgObject_cFUlUlb */
// reg swap
#ifdef NONMATCHING
// NONMATCHING reg swap
void dMsgObject_c::setMessageIndex(u32 param_1, u32 param_2, bool param_3) {
field_0x158 = param_1;
u32 revoIndex = getRevoMessageIndex(param_1);
@@ -1116,15 +637,9 @@ void dMsgObject_c::setMessageIndex(u32 param_1, u32 param_2, bool param_3) {
mpCtrl->setMessageID(mMessageID, 0, NULL);
}
}
#else
void dMsgObject_c::setMessageIndex(u32 param_0, u32 param_1, bool param_2) {
// NONMATCHING
}
#endif
/* 80233E70-80233F84 22E7B0 0114+00 1/1 1/1 0/0 .text setMessageIndexDemo__12dMsgObject_cFUlb */
// reg swap
#ifdef NONMATCHING
// NONMATCHING reg swap
void dMsgObject_c::setMessageIndexDemo(u32 param_1, bool param_2) {
field_0x158 = param_1;
int revoMsgIndex = getRevoMessageIndex(param_1);
@@ -1153,11 +668,6 @@ void dMsgObject_c::setMessageIndexDemo(u32 param_1, bool param_2) {
mpCtrl->setMessageID(mMessageID, 0, NULL);
}
}
#else
void dMsgObject_c::setMessageIndexDemo(u32 param_0, bool param_1) {
// NONMATCHING
}
#endif
/* 80233F84-80233FD8 22E8C4 0054+00 4/4 0/0 0/0 .text getMessageIndex__12dMsgObject_cFUl
*/
@@ -1212,7 +722,6 @@ u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) {
return rv;
}
/* 802340D4-80234128 22EA14 0054+00 3/3 0/0 0/0 .text getMessageIndexAlways__12dMsgObject_cFUl */
u32 dMsgObject_c::getMessageIndexAlways(u32 param_0) {
u32 i = 0;
@@ -1286,11 +795,6 @@ void dMsgObject_c::waitProc() {
}
}
/* ############################################################################################## */
/* 80454B20-80454B28 003120 0008+00 6/6 0/0 0/0 .sdata2 @4965 */
SECTION_SDATA2 static f64 lit_4965 = 4503601774854144.0 /* cast s32 to float */;
/* 80234318-802349D8 22EC58 06C0+00 1/1 0/0 0/0 .text openProc__12dMsgObject_cFv */
void dMsgObject_c::openProc() {
if (isMidonaMessage()) {
@@ -1394,11 +898,6 @@ void dMsgObject_c::openProc() {
}
}
/* ############################################################################################## */
/* 80454B28-80454B2C 003128 0004+00 3/3 0/0 0/0 .sdata2 @5044 */
SECTION_SDATA2 static f32 lit_5044 = 10.0f;
/* 802349D8-80234CCC 22F318 02F4+00 1/1 0/0 0/0 .text outnowProc__12dMsgObject_cFv */
void dMsgObject_c::outnowProc() {
mpRefer->shiftCharCountBuffer();
@@ -1466,7 +965,6 @@ void dMsgObject_c::outnowProc() {
}
}
/* 80234CCC-80234FF0 22F60C 0324+00 1/1 0/0 0/0 .text outwaitProc__12dMsgObject_cFv */
void dMsgObject_c::outwaitProc() {
jmessage_tReference* pRef =
@@ -1507,7 +1005,6 @@ void dMsgObject_c::outwaitProc() {
}
}
/* 80234FF0-80234FF4 22F930 0004+00 1/1 0/0 0/0 .text stopProc__12dMsgObject_cFv */
void dMsgObject_c::stopProc() {
}
@@ -1554,7 +1051,6 @@ void dMsgObject_c::continueProc() {
}
}
/* 8023531C-8023587C 22FC5C 0560+00 1/1 0/0 0/0 .text selectProc__12dMsgObject_cFv */
void dMsgObject_c::selectProc() {
bool uVar7 = false;
@@ -1655,7 +1151,6 @@ void dMsgObject_c::selectProc() {
}
}
/* 8023587C-802358D4 2301BC 0058+00 1/1 0/0 0/0 .text selectEndProc__12dMsgObject_cFv */
void dMsgObject_c::selectEndProc() {
if (mpScrnDraw->selectAnimeEnd()) {
@@ -1740,7 +1235,6 @@ void dMsgObject_c::finishProc() {
}
}
/* 80235CC0-80235EBC 230600 01FC+00 1/1 0/0 0/0 .text endProc__12dMsgObject_cFv */
void dMsgObject_c::endProc() {
field_0x16a++;
@@ -1775,7 +1269,6 @@ void dMsgObject_c::endProc() {
}
}
/* 80235EBC-8023609C 2307FC 01E0+00 2/2 0/0 0/0 .text deleteProc__12dMsgObject_cFv */
void dMsgObject_c::deleteProc() {
if (field_0x148 != NULL) {
@@ -1986,24 +1479,6 @@ void dMsgObject_c::talkStartInit() {
}
}
/* ############################################################################################## */
/* 80454B2C-80454B30 00312C 0004+00 1/1 0/0 0/0 .sdata2 @5947 */
SECTION_SDATA2 static f32 lit_5947 = 608.0f;
/* 80454B30-80454B34 003130 0004+00 1/1 0/0 0/0 .sdata2 @5948 */
SECTION_SDATA2 static f32 lit_5948 = 448.0f;
/* 80454B34-80454B38 003134 0004+00 1/1 0/0 0/0 .sdata2 @5949 */
SECTION_SDATA2 static f32 lit_5949 = -200.0f;
/* 80454B38-80454B40 003138 0004+04 1/1 0/0 0/0 .sdata2 @5950 */
SECTION_SDATA2 static f32 lit_5950[1 + 1 /* padding */] = {
-100.0f,
/* padding */
0.0f,
};
/* 8023670C-802368E4 23104C 01D8+00 1/1 0/0 0/0 .text fukiPosCalc__12dMsgObject_cFb */
void dMsgObject_c::fukiPosCalc(bool param_1) {
if (param_1) {
@@ -2054,7 +1529,6 @@ void dMsgObject_c::fukiPosCalc(bool param_1) {
}
}
/* 802368E4-802368F8 231224 0014+00 15/15 0/0 0/0 .text setStatusLocal__12dMsgObject_cFUs
*/
void dMsgObject_c::setStatusLocal(u16 status) {
@@ -2294,7 +1768,6 @@ bool dMsgObject_c::getStringLocal(u32 param_1, J2DTextBox* param_2, J2DTextBox*
return false;
}
/* 802370A8-802370BC 2319E8 0014+00 0/0 1/1 0/0 .text isGetItemMessage__12dMsgObject_cFv
*/
u8 dMsgObject_c::isGetItemMessage() {
@@ -2385,8 +1858,6 @@ bool dMsgObject_c::isTalkMessage() {
}
/* 802372CC-80237334 231C0C 0068+00 0/0 5/5 0/0 .text getSmellName__12dMsgObject_cFv */
// regalloc
#ifdef NONMATCHING
const char* dMsgObject_c::getSmellName() {
JMSMesgHeader_c* info_header_p = (JMSMesgHeader_c*)((char*)mpMsgRes + 0x20);
char* data_ptr = (char*)info_header_p + info_header_p->sectionSize;
@@ -2395,11 +1866,6 @@ const char* dMsgObject_c::getSmellName() {
JMSMesgEntry_c* msg_entry = &info_entries[(u16)getMessageIndex(getSmellTypeMessageID())];
return data_ptr + msg_entry->mStringOffset + 8;
}
#else
const char* dMsgObject_c::getSmellName() {
// NONMATCHING
}
#endif
/* 80237334-8023738C 231C74 0058+00 0/0 5/5 0/0 .text getPortalName__12dMsgObject_cFv */
const char* dMsgObject_c::getPortalName() {
@@ -2553,7 +2019,6 @@ s16 dMsgObject_c::getSelectBombPriceLocal() {
return (num * uVar1) / 10.0f;
}
/* 8023773C-80237748 23207C 000C+00 1/1 0/0 0/0 .text setEquipBombInfoLocal__12dMsgObject_cFv */
void dMsgObject_c::setEquipBombInfoLocal() {
mEquipBombInfo = 1;
@@ -2755,10 +2220,8 @@ void dMsgObject_c::setDemoMessageLocal(u32 param_1) {
/* 80237DD8-80237E04 232718 002C+00 1/1 0/0 0/0 .text getSmellTypeMessageIDLocal__12dMsgObject_cFv
*/
// bgelr and bltlr issues.
#ifdef NONMATCHING
u16 dMsgObject_c::getSmellTypeMessageIDLocal() {
int msgId = 0;
u16 msgId = 0;
int smell = dComIfGs_getCollectSmell();
if (smell < SMELL_MEDICINE + 1 && smell >= SMELL_YELIA_POUCH) {
msgId = smell + 0x165;
@@ -2770,11 +2233,6 @@ u16 dMsgObject_c::getSmellTypeMessageIDLocal() {
}
return msgId;
}
#else
u16 dMsgObject_c::getSmellTypeMessageIDLocal() {
// NONMATCHING
}
#endif
/* 80237E04-80237E58 232744 0054+00 1/1 0/0 0/0 .text setSmellTypeLocal__12dMsgObject_cFUc */
void dMsgObject_c::setSmellTypeLocal(u8 smellType) {
@@ -2800,7 +2258,6 @@ void dMsgObject_c::setSelectCursorPosLocal(u8 param_1) {
pRef->setSelectPos(param_1);
}
/* 80237F10-80237F18 -00001 0008+00 0/0 0/0 0/0 .text
* setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c */
void dMsgObject_c::setTalkActorLocal(fopAc_ac_c* actor) {
@@ -2844,7 +2301,6 @@ int dMsgObject_Create(msg_class* param_1) {
return rv;
}
/* 8023800C-8023803C 23294C 0030+00 0/0 1/1 0/0 .text
* readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c */
void dMsgObject_c::readMessageGroup(mDoDvdThd_mountXArchive_c** p_arcMount) {
@@ -3174,93 +2630,26 @@ void dMsgObject_addOffering(s16 price) {
dComIfGs_setEventReg(0xf8ff, (u16)offering & 0xff);
}
/* 80238B58-80238B94 233498 003C+00 0/0 1/0 0/0 .text __sinit_d_msg_object_cpp */
void __sinit_d_msg_object_cpp(){// NONMATCHING
}
/* 803C0B9C-803C0BB0 -00001 0014+00 1/0 0/0 0/0 .data l_dMsgObject_Method */
static leafdraw_method_class l_dMsgObject_Method = {
(process_method_func)dMsgObject_Create,
(process_method_func)dMsgObject_Delete,
(process_method_func)dMsgObject_Execute,
(process_method_func)dMsgObject_IsDelete,
(process_method_func)dMsgObject_Draw,
};
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80238B58, __sinit_d_msg_object_cpp);
#pragma pop
/* 80238B94-80238BDC 2334D4 0048+00 1/0 0/0 0/0 .text __dt__20dMsgObject_HowlHIO_cFv */
// dMsgObject_HowlHIO_c::~dMsgObject_HowlHIO_c() {
extern "C" void __dt__20dMsgObject_HowlHIO_cFv() {
// NONMATCHING
}
/* 80238BDC-80238C3C 23351C 0060+00 2/1 0/0 0/0 .text __dt__16dMsgObject_HIO_cFv */
// dMsgObject_HIO_c::~dMsgObject_HIO_c() {
extern "C" void __dt__16dMsgObject_HIO_cFv() {
// NONMATCHING
}
/* 80238C3C-80238C40 23357C 0004+00 0/0 1/0 0/0 .text exec__14dMsgScrnBase_cFv */
void dMsgScrnBase_c::exec() {
/* empty function */
}
/* 80238C40-80238C44 233580 0004+00 0/0 8/0 0/0 .text setSelectRubyString__14dMsgScrnBase_cFPcPcPc
*/
void dMsgScrnBase_c::setSelectRubyString(char* param_0, char* param_1, char* param_2) {
/* empty function */
}
/* 80238C44-80238C48 233584 0004+00 0/0 8/0 0/0 .text setSelectString__14dMsgScrnBase_cFPcPcPc */
void dMsgScrnBase_c::setSelectString(char* param_0, char* param_1, char* param_2) {
/* empty function */
}
/* 80238C48-80238C50 233588 0008+00 0/0 8/0 0/0 .text selectAnimeMove__14dMsgScrnBase_cFUcUcb */
bool dMsgScrnBase_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) {
return true;
}
/* 80238C50-80238C54 233590 0004+00 0/0 8/0 0/0 .text selectAnimeInit__14dMsgScrnBase_cFUcUcfUc */
void dMsgScrnBase_c::selectAnimeInit(u8 param_0, u8 param_1, f32 param_2, u8 param_3) {
/* empty function */
}
/* 80238C54-80238C58 233594 0004+00 0/0 8/0 0/0 .text arwAnimeMove__14dMsgScrnBase_cFv */
void dMsgScrnBase_c::arwAnimeMove() {
/* empty function */
}
/* 80238C58-80238C5C 233598 0004+00 0/0 8/0 0/0 .text arwAnimeInit__14dMsgScrnBase_cFv */
void dMsgScrnBase_c::arwAnimeInit() {
/* empty function */
}
/* 80238C5C-80238C60 23359C 0004+00 0/0 8/0 0/0 .text fukiPosCalc__14dMsgScrnBase_cFUc */
void dMsgScrnBase_c::fukiPosCalc(u8 param_0) {
/* empty function */
}
/* 80238C60-80238C68 2335A0 0008+00 0/0 8/0 0/0 .text isSelect__14dMsgScrnBase_cFv */
bool dMsgScrnBase_c::isSelect() {
return true;
}
/* 80238C68-80238C70 2335A8 0008+00 0/0 8/0 0/0 .text selectAnimeEnd__14dMsgScrnBase_cFv
*/
bool dMsgScrnBase_c::selectAnimeEnd() {
return true;
}
/* 80238C70-80238C74 2335B0 0004+00 0/0 8/0 0/0 .text dotAnimeMove__14dMsgScrnBase_cFv */
void dMsgScrnBase_c::dotAnimeMove() {
/* empty function */
}
/* 80238C74-80238C78 2335B4 0004+00 0/0 8/0 0/0 .text dotAnimeInit__14dMsgScrnBase_cFv */
void dMsgScrnBase_c::dotAnimeInit() {
/* empty function */
}
/* 80238C78-80238C94 2335B8 001C+00 2/2 0/0 0/0 .text setActorPos__19jmessage_tReferenceF4cXyz */
// void jmessage_tReference::setActorPos(cXyz param_0) {
extern "C" void setActorPos__19jmessage_tReferenceF4cXyz() {
// NONMATCHING
}
/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 803C0BB0-803C0BD8 -00001 0028+00 0/0 0/0 1/0 .data g_profile_MSG_OBJECT */
extern msg_process_profile_definition g_profile_MSG_OBJECT = {
fpcLy_CURRENT_e, // mLayerID
12, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_MSG_OBJECT, // mProcName
&g_fpcLf_Method.mBase, // sub_method
sizeof(dMsgObject_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopMsg_Method, // sub_method
770, // mPriority
&l_dMsgObject_Method, // sub_method
};
src/d/d_particle.cpp
+49 -1054
View File
File diff suppressed because it is too large Load Diff