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

shop_system stuff

Browse Source
This commit is contained in:
TakaRikka
2022-02-24 14:04:56 -08:00
parent 9ba9d7c06c
commit fdaeb3437d
30 changed files with 2110 additions and 1614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_npc.cpp
+8 -483
View File
@@ -11,27 +11,6 @@
// Types:
//
struct request_of_phase_process_class {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
static u8 Zero[4];
};
struct Vec {};
struct cXyz {
/* 80009184 */ ~cXyz();
/* 800125DC */ cXyz();
/* 80266AE4 */ void operator+(Vec const&) const;
/* 80266B34 */ void operator-(Vec const&) const;
/* 80266EF4 */ void normalize();
/* 802670AC */ void isZero() const;
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
@@ -44,59 +23,6 @@ struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoExt_morf_c {
/* 8000FB7C */ void setMorf(f32);
};
struct J3DAnmTextureSRTKey {};
struct J3DAnmTexPattern {};
struct J3DAnmTevRegKey {};
struct J3DAnmColor {};
struct J3DMaterialTable {
/* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*);
/* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*);
/* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*);
/* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);
};
struct mDoExt_btpAnm {
/* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
};
struct mDoExt_btkAnm {
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
};
struct mDoExt_brkAnm {
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
};
struct mDoExt_bpkAnm {
/* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16);
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
/* 8000D9E8 */ void entryJoint(J3DModelData*, u16, f32);
};
struct mDoExt_baseAnm {
/* 8000D428 */ void play();
};
struct mDoExt_McaMorfSO {
/* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
/* 800110B0 */ void play(u32, s8);
@@ -104,147 +30,6 @@ struct mDoExt_McaMorfSO {
/* 800111EC */ void modelCalc();
};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
};
struct daPy_py_c {
/* 8015F3FC */ void getAttentionOffsetY();
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct daNpcT_pntData_c {};
struct daNpcT_motionAnmData_c {};
struct daNpcT_faceMotionAnmData_c {};
struct dCcD_GObjInf {
/* 80084460 */ void ChkTgHit();
};
struct J3DAnmTransformKey {};
struct _GXColorS10 {};
struct J3DModel {};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
};
struct J3DJoint {};
struct daNpcT_c {
/* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80147FD4 */ void srchActor(void*, void*);
/* 80148058 */ void getTrnsfrmAnmP(char const*, int);
/* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int);
/* 801480D0 */ void getTexPtrnAnmP(char const*, int);
/* 8014810C */ void getTexSRTKeyAnmP(char const*, int);
/* 80148148 */ void getTevRegKeyAnmP(char const*, int);
/* 80148184 */ void getColorAnmP(char const*, int);
/* 801481C0 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 80148204 */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
/* 801482F8 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
/* 80148338 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
/* 80148378 */ void setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int);
/* 801483B8 */ void setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int);
/* 801483F8 */ void loadRes(s8 const*, char const**);
/* 801484AC */ void deleteRes(s8 const*, char const**);
/* 8014852C */ void execute();
/* 8014886C */ void draw(int, int, f32, _GXColorS10*, f32, int, int, int);
/* 80148C70 */ void setEnvTevColor();
/* 80148CCC */ void setRoomNo();
/* 80148D10 */ void checkEndAnm(f32);
/* 80148DD0 */ void checkEndAnm(J3DFrameCtrl*, f32);
/* 80148E4C */ void playAllAnm();
/* 801490D4 */ void ctrlBtk();
/* 80149190 */ void setMtx();
/* 8014924C */ void ctrlFaceMotion();
/* 80149300 */ void ctrlMotion();
/* 801493B8 */ void ctrlMsgAnm(int*, int*, fopAc_ac_c*, int);
/* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 8014997C */ void evtProc();
/* 80149BB4 */ void setFootPos();
/* 80149D7C */ void setFootPrtcl(cXyz*, f32, f32);
/* 8014A05C */ bool checkCullDraw();
/* 8014A064 */ void twilight();
/* 8014A0B0 */ void evtOrder();
/* 8014A224 */ void evtChange();
/* 8014A324 */ void clrParam();
/* 8014A388 */ void setFaceMotionAnm(int, bool);
/* 8014A628 */ void setMotionAnm(int, f32, int);
/* 8014A908 */ void setPos(cXyz);
/* 8014AA18 */ void setAngle(s16);
/* 8014A99C */ void setAngle(csXyz);
/* 8014AA40 */ void hitChk(dCcD_GObjInf*, u32);
/* 8014AAD0 */ void setDamage(int, int, int);
/* 8014ABD0 */ void chkActorInSight(fopAc_ac_c*, f32, s16);
/* 8014ACF0 */ void chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
/* 8014ADA0 */ void chkPointInArea(cXyz, cXyz, cXyz, s16);
/* 8014AE1C */ void chkFindActor(fopAc_ac_c*, int, s16);
/* 8014B024 */ void chkWolfAction();
/* 8014B0C8 */ void chkFindWolf(s16, int, int, f32, f32, f32, f32, int);
/* 8014B338 */ void srchPlayerActor();
/* 8014B3EC */ void getAttnPos(fopAc_ac_c*);
/* 8014B4A4 */ void turn(s16, int, int);
/* 8014B648 */ void step(s16, int, int, int, int);
/* 8014B808 */ void calcSpeedAndAngle(cXyz, int, s16, s16);
/* 8014BB00 */ void getActorDistance(fopAc_ac_c*, int, int);
/* 8014BBF0 */ void initTalk(int, fopAc_ac_c**);
/* 8014BC78 */ void talkProc(int*, int, fopAc_ac_c**, int);
/* 8014BE2C */ void getNearestActorP(s16);
/* 8014BEE4 */ void getEvtAreaTagP(int, int);
/* 8014BFB0 */ void getShopItemTagP();
/* 8014C030 */ void setHitodamaPrtcl();
/* 8014CBF4 */ void decTmr();
/* 8014CC0C */ void setCollision();
/* 8014CC10 */ void setAttnPos();
/* 8014CC14 */ void ctrlSubFaceMotion(int);
/* 8014CC18 */ void afterMoved();
/* 8014CC1C */ void beforeMove();
/* 8014CC20 */ void action();
/* 8014CC24 */ void setParam();
/* 8014CC28 */ void drawOtherMdl();
/* 8014CC2C */ void drawGhost();
/* 8014CC30 */ bool drawDbgInfo();
/* 8014CC38 */ bool checkRemoveJoint(int);
/* 8014CC40 */ bool checkChangeJoint(int);
/* 8014CC48 */ void afterJntAnm(int);
/* 8014CC4C */ s32 getHeadJointNo();
/* 8014CC54 */ s32 getNeckJointNo();
/* 8014CC5C */ s32 getBackboneJointNo();
/* 8014CC64 */ void setAfterTalkMotion();
/* 8014CC68 */ bool evtCutProc();
/* 8014CC70 */ bool evtEndProc();
/* 8014CC78 */ bool evtTalk();
/* 8014CC80 */ bool checkChangeEvt();
/* 8014CC88 */ s32 getFootRJointNo();
/* 8014CC90 */ s32 getFootLJointNo();
/* 8014CC98 */ bool chkXYItems();
/* 8014CCA0 */ bool afterSetFaceMotionAnm(int, int, f32, int);
/* 8014CCA8 */ void changeBtp(int*, int*);
/* 8014CCAC */ void changeBck(int*, int*);
/* 8014CCB0 */ void getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
/* 8014CCE0 */ bool afterSetMotionAnm(int, int, f32, int);
/* 8014CCE8 */ void changeBtk(int*, int*);
/* 8014CCEC */ void changeAnm(int*, int*);
/* 8014CCF0 */ void getMotionAnm(daNpcT_motionAnmData_c);
/* 8014CD20 */ ~daNpcT_c();
/* 8014D0A8 */ bool getEyeballLMaterialNo();
/* 8014D0B0 */ bool getEyeballRMaterialNo();
/* 8014D0B8 */ bool getEyeballMaterialNo();
static u8 const mCcDObjData[48];
static u8 mCcDCyl[68];
static u8 mCcDSph[64];
static u8 mFindActorPtrs[200];
static u8 mSrchName[2 + 2 /* padding */];
static u8 mFindCount[4];
};
struct daNpcT_Hermite_c {
/* 8014CBAC */ ~daNpcT_Hermite_c();
};
@@ -262,45 +47,12 @@ struct daNpcT_Path_c {
/* 801464D8 */ void chkPassed2(cXyz, cXyz*, int, int);
};
struct daNpcT_MotionSeqMngr_c {
/* 80145898 */ void initialize();
/* 801458C0 */ void play(u16, int*, f32*);
/* 80145A24 */ void checkEndSequence();
/* 8014D0C0 */ ~daNpcT_MotionSeqMngr_c();
};
struct J3DMaterial {};
struct daNpcT_MatAnm_c {
/* 80145764 */ void initialize();
/* 80145788 */ void calc(J3DMaterial*) const;
/* 8014D24C */ ~daNpcT_MatAnm_c();
};
struct daNpcT_JntAnm_c {
/* 80146C98 */ void initialize();
/* 80146CD8 */ void setParam(fopAc_ac_c*, J3DModel*, cXyz*, int, int, int, f32, f32, f32, f32,
f32, f32, f32, f32, f32, f32, cXyz*);
/* 80147858 */ void calc(f32);
/* 80147C38 */ void calcJntRad(f32, f32, f32);
/* 8014D150 */ ~daNpcT_JntAnm_c();
};
struct daNpcT_DmgStagger_c {
/* 80147DCC */ void setParam(fopAc_ac_c*, fopAc_ac_c*, s16);
/* 80147E3C */ void calc(int);
};
struct daNpcT_ActorMngr_c {
/* 801456D4 */ void initialize();
/* 801456E0 */ void entry(fopAc_ac_c*);
/* 801456FC */ void remove();
/* 80145708 */ void getActorP();
/* 8014D108 */ ~daNpcT_ActorMngr_c();
};
struct dCcD_Cyl {};
struct daNpcF_c {
struct daNpcF_anmPlayData {};
@@ -449,15 +201,6 @@ struct daBaseNpc_path_c {
/* 801503FC */ ~daBaseNpc_path_c();
};
struct cBgS_PolyInfo {
/* 802680B0 */ ~cBgS_PolyInfo();
};
struct dBgW {
/* 8007B970 */ dBgW();
/* 8007B9C0 */ void Move();
};
struct daBaseNpc_moveBgActor_c {
/* 8014F4B4 */ daBaseNpc_moveBgActor_c();
/* 8014F518 */ void MoveBGCreateHeap();
@@ -537,59 +280,8 @@ struct daBaseNpc_acMngr_c {
/* 80150524 */ ~daBaseNpc_acMngr_c();
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 800349A4 */ void offEventBit(u16);
/* 800349BC */ void isEventBit(u16) const;
};
struct dStage_roomControl_c {
/* 80024384 */ void getStatusRoomDt(int);
};
struct dKy_tevstr_c {};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
};
struct dRes_info_c {};
struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct dPnt {};
struct dPa_levelEcallBack {};
struct _GXColor {};
struct dPa_control_c {
struct level_c {
/* 8004B918 */ void getEmitter(u32);
};
/* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
_GXColor const*, cXyz const*, f32);
};
struct dPaPoT_c {
/* 8005115C */ void setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32,
f32);
};
struct dMsgObject_c {
/* 8023819C */ void getActor();
/* 802382C8 */ void offMsgSendControl();
@@ -597,166 +289,10 @@ struct dMsgObject_c {
/* 802383A4 */ void isMouthCheck();
};
struct dMsgFlow_c {
/* 80249F00 */ dMsgFlow_c();
/* 80249F48 */ ~dMsgFlow_c();
/* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
/* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
/* 8024A424 */ void checkEventRender(int*, int*, int*, int*);
/* 8024A538 */ void getMsgNo();
/* 8024A548 */ void getMsg();
};
struct dEvt_control_c {
/* 80042468 */ void reset();
/* 80042518 */ void reset(void*);
/* 800432EC */ void convPId(unsigned int);
/* 8004368C */ void setPtT(void*);
};
struct dEvent_manager_c {
/* 80046800 */ void setObjectArchive(char*);
/* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8);
/* 80047A78 */ void endCheck(s16);
/* 800483E8 */ void getRunEventName();
};
struct dDlst_shadowControl_c {
static u8 mSimpleTexObj[32];
};
struct dCcD_GStts {
/* 80083760 */ dCcD_GStts();
/* 80083830 */ void Move();
};
struct dCcD_GAtTgCoCommonBase {
/* 80083688 */ void GetAc();
};
struct dBgW_Base {};
struct dBgS_PolyPassChk {
/* 80078E68 */ void SetObj();
};
struct dBgS_LinChk {
/* 80077CDC */ ~dBgS_LinChk();
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct dBgS_GndChk {
/* 800775F0 */ ~dBgS_GndChk();
};
struct dBgS_AcchCir {
/* 80075EAC */ dBgS_AcchCir();
};
struct dBgS {
/* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*);
/* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&);
/* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&);
/* 80075100 */ void GetRoomId(cBgS_PolyInfo const&);
};
struct dBgS_Acch {
/* 80075F94 */ ~dBgS_Acch();
/* 800760A0 */ dBgS_Acch();
/* 80076AAC */ void CrrPos(dBgS&);
};
struct dAttention_c {
/* 80070880 */ void getActionBtnB();
/* 8007353C */ void LockonTarget(s32);
/* 80073734 */ void ActionTarget(s32);
/* 8014B010 */ void getDistTable(int);
static u8 dist_table[6552];
};
struct cSGlobe {
/* 80271880 */ cSGlobe(cXyz const&);
};
struct cSAngle {
/* 80270F68 */ cSAngle(cSAngle const&);
/* 80270F98 */ cSAngle(s16);
/* 802710E8 */ void Inv() const;
/* 80271228 */ void operator-(s16) const;
};
struct cM3dGPla {};
struct cM3dGCir {
/* 8026EF18 */ ~cM3dGCir();
};
struct cBgW_BgId {
/* 802681D4 */ void ChkUsed() const;
};
struct cBgD_t {};
struct cBgW {
/* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]);
};
struct cBgS_LinChk {};
struct cBgS_GndChk {
/* 80267C1C */ cBgS_GndChk();
/* 80267C94 */ ~cBgS_GndChk();
/* 80267D28 */ void SetPos(cXyz const*);
};
struct cBgS {
/* 80074250 */ void Release(dBgW_Base*);
/* 800743B4 */ void LineCross(cBgS_LinChk*);
/* 800744A0 */ void GroundCross(cBgS_GndChk*);
/* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&);
/* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
};
struct _GXTexObj {};
struct Z2Creature {
/* 802C03C8 */ Z2Creature();
/* 802C0420 */ ~Z2Creature();
};
struct JMath {
static u8 sincosTable_[65536];
};
struct J3DTexNoAnm {
/* 8003B1F8 */ ~J3DTexNoAnm();
};
struct J3DTexMtxAnm {
/* 8003B264 */ ~J3DTexMtxAnm();
};
struct J3DTevKColorAnm {
/* 8003B150 */ ~J3DTevKColorAnm();
};
struct J3DTevColorAnm {
/* 8003B1A4 */ ~J3DTevColorAnm();
};
struct J3DSys {
static u8 mCurrentMtx[48];
};
struct J3DMaterialAnm {
/* 8032C3C4 */ void calc(J3DMaterial*) const;
};
struct J3DMatColorAnm {
/* 8003B2B8 */ ~J3DMatColorAnm();
};
//
// Forward References:
//
@@ -1131,7 +667,6 @@ extern "C" extern u8 data_80450FF8[8];
// External References:
//
SECTION_INIT void memset();
extern "C" void __dt__4cXyzFv();
extern "C" void mDoMtx_ZXYrotS__FPA4_fsss();
extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
@@ -1297,13 +832,6 @@ extern "C" void removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor();
extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey();
extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
extern "C" void PSMTXCopy();
extern "C" void PSMTXConcat();
extern "C" void PSMTXInverse();
extern "C" void PSMTXMultVec();
extern "C" void PSMTXMultVecArray();
extern "C" void PSVECAdd();
extern "C" void PSVECSquareMag();
extern "C" void __register_global_object();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
@@ -1331,9 +859,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void abs();
extern "C" void strcmp();
extern "C" void strlen();
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__8cM3dGPla[3];
@@ -1347,16 +872,12 @@ extern "C" extern void* __vt__12dBgS_ObjAcch[9];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" u8 Zero__5csXyz[4];
extern "C" extern u8 data_80451164[4];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
//
// Declarations:
@@ -3163,7 +2684,8 @@ asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daNpcT_c::~daNpcT_c() {
//asm daNpcT_c::~daNpcT_c() {
extern "C" asm void __dt__8daNpcT_cFv() {
nofralloc
#include "asm/d/a/d_a_npc/__dt__8daNpcT_cFv.s"
}
@@ -3191,7 +2713,8 @@ bool daNpcT_c::getEyeballMaterialNo() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() {
// asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() {
extern "C" asm void __dt__22daNpcT_MotionSeqMngr_cFv() {
nofralloc
#include "asm/d/a/d_a_npc/__dt__22daNpcT_MotionSeqMngr_cFv.s"
}
@@ -3201,7 +2724,8 @@ asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() {
// asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() {
extern "C" asm void __dt__18daNpcT_ActorMngr_cFv() {
nofralloc
#include "asm/d/a/d_a_npc/__dt__18daNpcT_ActorMngr_cFv.s"
}
@@ -3211,7 +2735,8 @@ asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daNpcT_JntAnm_c::~daNpcT_JntAnm_c() {
// asm daNpcT_JntAnm_c::~daNpcT_JntAnm_c() {
extern "C" asm void __dt__15daNpcT_JntAnm_cFv() {
nofralloc
#include "asm/d/a/d_a_npc/__dt__15daNpcT_JntAnm_cFv.s"
}
src/d/a/d_a_shop_item_static.cpp
+36 -403
View File
@@ -7,23 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {};
struct daShopItem_c {
/* 80037C14 */ void getRotateP();
/* 80037C1C */ void getPosP();
static void* const mData[276];
};
struct daItemBase_c {
/* 8014475C */ void CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16);
};
//
// Forward References:
//
@@ -45,402 +28,52 @@ extern "C" void CreateItemHeap__12daItemBase_cFPCcsssssss();
//
/* 80037C14-80037C1C 032554 0008+00 0/0 1/1 0/0 .text getRotateP__12daShopItem_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daShopItem_c::getRotateP() {
nofralloc
#include "asm/d/a/d_a_shop_item_static/getRotateP__12daShopItem_cFv.s"
csXyz* daShopItem_c::getRotateP() {
return &mCurrent.mAngle;
}
#pragma pop
/* 80037C1C-80037C24 03255C 0008+00 0/0 2/2 0/0 .text getPosP__12daShopItem_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daShopItem_c::getPosP() {
nofralloc
#include "asm/d/a/d_a_shop_item_static/getPosP__12daShopItem_cFv.s"
cXyz* daShopItem_c::getPosP() {
return &mCurrent.mPosition;
}
#pragma pop
/* ############################################################################################## */
/* 80379738-80379742 005D98 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379738;
/* 80379742-8037974B 005DA2 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379742;
/* 8037974B-80379754 005DAB 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037974B;
/* 80379754-8037975E 005DB4 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379754;
/* 8037975E-80379768 005DBE 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037975E;
/* 80379768-80379771 005DC8 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379768;
/* 80379771-8037977A 005DD1 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379771;
/* 8037977A-80379783 005DDA 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037977A;
/* 80379783-8037978D 005DE3 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379783;
/* 8037978D-80379795 005DED 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037978D;
/* 80379795-8037979D 005DF5 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379795;
/* 8037979D-803797A7 005DFD 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037979D;
/* 803797A7-803797B1 005E07 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797A7;
/* 803797B1-803797BB 005E11 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797B1;
/* 803797BB-803797C5 005E1B 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797BB;
/* 803797C5-803797CF 005E25 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797C5;
/* 803797CF-803797D9 005E2F 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797CF;
/* 803797D9-803797E3 005E39 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797D9;
/* 803797E3-803797ED 005E43 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797E3;
/* 803797ED-803797F8 005E4D 000A+01 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797ED;
/* 803792E8-80379738 -00001 0450+00 1/1 0/0 9/9 .rodata mData__12daShopItem_c */
SECTION_RODATA void* const daShopItem_c::mData[276] = {
(void*)&d_a_d_a_shop_item_static__stringBase0,
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)0x80000000,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xA),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x13),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFF50000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x1C),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x26),
(void*)0x0006000C,
(void*)0xFFFFFFFF,
(void*)0xFFFF0009,
(void*)0x000F0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)0x00000004,
(void*)0x00000003,
(void*)0x01000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x30),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x39),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)0x41F00000,
(void*)0x3F800000,
(void*)NULL,
(void*)0x7FFF0000,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x42),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)0x41F00000,
(void*)0x3F800000,
(void*)NULL,
(void*)0x7FFF0000,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x4B),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x55),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x5D),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x65),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x6F),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x79),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x26),
(void*)0x0006000C,
(void*)0xFFFFFFFF,
(void*)0xFFFF0009,
(void*)0x000F0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)0x00000004,
(void*)0x00000001,
(void*)NULL,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x83),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x8D),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x97),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFF50000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xA1),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xAB),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xAB),
(void*)0x0004FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xB5),
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFFFFFF,
(void*)0xFFFF0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)0x000000FF,
(void*)0xFF000000,
(void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x26),
(void*)0x0006000C,
(void*)0xFFFFFFFF,
(void*)0xFFFF0009,
(void*)0x000F0000,
(void*)NULL,
(void*)0x3F800000,
(void*)NULL,
(void*)NULL,
(void*)0x00000004,
(void*)0x0000000C,
(void*)NULL,
SECTION_RODATA ResourceData const daShopItem_c::mData[23] = {
{"B_mD_sold", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0x8000, 0}, 0, 0, 0, 0, -1, -1},
{"B_mD_oil", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_red", 3, -1, -1, -1, -1, -1, -11, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"B_mD_milk", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_bott", 6, 12, -1, -1, -1, 9, 15, 0.0f, 1.0f, 0, {0, 0, 0}, 4, 0, 0, 0, 3, 1},
{"O_mD_arw", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_SHB", 3, -1, -1, -1, -1, -1, -1, 30.0f, 1.0f, 0, {0, 0x7FFF, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_SHA", 3, -1, -1, -1, -1, -1, -1, 30.0f, 1.0f, 0, {0, 0x7FFF, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_bomb", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1},
{"O_mD_pg", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1},
{"O_mD_bi", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1},
{"O_mD_bmcs", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1},
{"O_mD_bmc2", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1},
{"O_mD_jira", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1},
{"O_mD_bott", 6, 12, -1, -1, -1, 9, 15, 0.0f, 1.0f, 0, {0, 0, 0}, 4, 0, 0, 0, 1, 0},
{"O_mD_hati", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_pach", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_blue", 3, -1, -1, -1, -1, -1, -11, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_hawk", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_marm", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_marm", 4, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_gren", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
{"O_mD_bott", 6, 12, -1, -1, -1, 9, 15, 0.0f, 1.0f, 0, {0, 0, 0}, 4, 0, 0, 0, 12, 0},
};
COMPILER_STRIP_GATE(0x803792E8, &daShopItem_c::mData);
/* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379738 = "B_mD_sold";
SECTION_DEAD static char const* const stringBase_80379742 = "B_mD_oil";
SECTION_DEAD static char const* const stringBase_8037974B = "O_mD_red";
SECTION_DEAD static char const* const stringBase_80379754 = "B_mD_milk";
SECTION_DEAD static char const* const stringBase_8037975E = "O_mD_bott";
SECTION_DEAD static char const* const stringBase_80379768 = "O_mD_arw";
SECTION_DEAD static char const* const stringBase_80379771 = "O_mD_SHB";
SECTION_DEAD static char const* const stringBase_8037977A = "O_mD_SHA";
SECTION_DEAD static char const* const stringBase_80379783 = "O_mD_bomb";
SECTION_DEAD static char const* const stringBase_8037978D = "O_mD_pg";
SECTION_DEAD static char const* const stringBase_80379795 = "O_mD_bi";
SECTION_DEAD static char const* const stringBase_8037979D = "O_mD_bmcs";
SECTION_DEAD static char const* const stringBase_803797A7 = "O_mD_bmc2";
SECTION_DEAD static char const* const stringBase_803797B1 = "O_mD_jira";
SECTION_DEAD static char const* const stringBase_803797BB = "O_mD_hati";
SECTION_DEAD static char const* const stringBase_803797C5 = "O_mD_pach";
SECTION_DEAD static char const* const stringBase_803797CF = "O_mD_blue";
SECTION_DEAD static char const* const stringBase_803797D9 = "O_mD_hawk";
SECTION_DEAD static char const* const stringBase_803797E3 = "O_mD_marm";
SECTION_DEAD static char const* const stringBase_803797ED = "O_mD_gren";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803797F7 = "";
#pragma pop
/* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void CheckShopItemCreateHeap(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s"
void CheckShopItemCreateHeap(fopAc_ac_c* actor) {
daShopItem_c* item = static_cast<daShopItem_c*>(actor);
u8 item_id = item->getShopItemID();
item->CreateItemHeap(daShopItem_c::mData[item_id].get_arcName(), daShopItem_c::mData[item_id].get_bmdName(),
daShopItem_c::mData[item_id].get_btk1Name(), daShopItem_c::mData[item_id].get_bpk1Name(),
daShopItem_c::mData[item_id].get_bck1Name(), daShopItem_c::mData[item_id].get_bxa1Name(),
daShopItem_c::mData[item_id].get_brk1Name(), daShopItem_c::mData[item_id].get_btp1Name());
}
#pragma pop
/* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/msg/d_msg_flow.cpp
+3 -3
View File
@@ -1514,7 +1514,7 @@ asm void dMsgFlow_c::checkOpenDoor(fopAc_ac_c* param_0, int* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgFlow_c::doFlow(fopAc_ac_c* param_0, fopAc_ac_c** param_1, int param_2) {
asm int dMsgFlow_c::doFlow(fopAc_ac_c* param_0, fopAc_ac_c** param_1, int param_2) {
nofralloc
#include "asm/d/msg/d_msg_flow/doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci.s"
}
@@ -1544,7 +1544,7 @@ asm void dMsgFlow_c::remove() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgFlow_c::getEventId(int* param_0) {
asm u16 dMsgFlow_c::getEventId(int* param_0) {
nofralloc
#include "asm/d/msg/d_msg_flow/getEventId__10dMsgFlow_cFPi.s"
}
@@ -1797,7 +1797,7 @@ asm void dMsgFlow_c::query004(mesg_flow_node_branch* param_0, fopAc_ac_c* param_
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgFlow_c::query005(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) {
asm u16 dMsgFlow_c::query005(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) {
nofralloc
#include "asm/d/msg/d_msg_flow/query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s"
}
src/d/msg/d_msg_object.cpp
+2 -2
View File
@@ -1905,7 +1905,7 @@ asm void dMsgObject_c::offMsgSendControl() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::isMsgSendControl() {
asm int dMsgObject_c::isMsgSendControl() {
nofralloc
#include "asm/d/msg/d_msg_object/isMsgSendControl__12dMsgObject_cFv.s"
}
@@ -1955,7 +1955,7 @@ asm void dMsgObject_c::isMouthCheck() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getMessageID() {
asm u32 dMsgObject_c::getMessageID() {
nofralloc
#include "asm/d/msg/d_msg_object/getMessageID__12dMsgObject_cFv.s"
}
src/d/particle/d_particle_copoly.cpp
-14
View File
@@ -23,20 +23,6 @@ struct dPa_control_c {
dKy_tevstr_c const*, u32, u32, csXyz const*, cXyz const*, s8);
};
struct dPaPoT_c {
/* 8005115C */ void setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32,
f32);
/* 80051294 */ void clearTwoAllID();
/* 80051470 */ void getRightEffType(int) const;
/* 8005147C */ void getLeftEffType(int) const;
/* 80051494 */ void getRightEmitter(int, int);
/* 800514DC */ void getLeftEmitter(int, int);
static u8 m_typeTwoData[36];
static u8 m_emitterTwoData[36];
};
struct dPaPoF_c {
/* 800512E8 */ void setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
cXyz const*, cXyz const*, cXyz const*, cXyz const*,
src/d/shop/d_shop_item_ctrl.cpp
+49 -72
View File
@@ -7,30 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct daShopItem_c {
/* 80037C14 */ void getRotateP();
/* 80037C1C */ void getPosP();
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dShopItemCtrl_c {
/* 80196914 */ dShopItemCtrl_c();
/* 80196958 */ ~dShopItemCtrl_c();
/* 801969A0 */ void getCurrentPos(int);
/* 80196A3C */ void isHomePos(int);
/* 80196AF0 */ void setRotateAnime(int);
/* 80196BA4 */ void setZoomAnime(int, cXyz*, s16, bool);
};
//
// Forward References:
//
@@ -54,46 +30,25 @@ extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void cLib_addCalcPos2__FP4cXyzRC4cXyzff();
extern "C" void cLib_addCalcAngleS__FPsssss();
extern "C" void __dl__FPv();
extern "C" void PSVECSquareMag();
extern "C" void _savegpr_23();
extern "C" void _savegpr_27();
extern "C" void _restgpr_23();
extern "C" void _restgpr_27();
extern "C" extern u32 __float_nan;
//
// Declarations:
//
/* ############################################################################################## */
/* 803BB888-803BB898 0189A8 000C+04 2/2 0/0 0/0 .data __vt__15dShopItemCtrl_c */
SECTION_DATA extern void* __vt__15dShopItemCtrl_c[3 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__15dShopItemCtrl_cFv,
/* padding */
NULL,
};
/* 80196914-80196958 191254 0044+00 0/0 0/0 10/10 .text __ct__15dShopItemCtrl_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dShopItemCtrl_c::dShopItemCtrl_c() {
nofralloc
#include "asm/d/shop/d_shop_item_ctrl/__ct__15dShopItemCtrl_cFv.s"
dShopItemCtrl_c::dShopItemCtrl_c() {
for (int i = 0; i < 7; i++) {
mItemIndex[i] = -1;
mMessageIndex[i] = 0;
}
}
#pragma pop
/* 80196958-801969A0 191298 0048+00 1/0 1/1 0/0 .text __dt__15dShopItemCtrl_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dShopItemCtrl_c::~dShopItemCtrl_c() {
nofralloc
#include "asm/d/shop/d_shop_item_ctrl/__dt__15dShopItemCtrl_cFv.s"
}
#pragma pop
dShopItemCtrl_c::~dShopItemCtrl_c() {}
/* ############################################################################################## */
/* 80453AD0-80453AD8 0020D0 0004+04 2/2 0/0 0/0 .sdata2 @3659 */
@@ -105,35 +60,57 @@ SECTION_SDATA2 static f32 lit_3659[1 + 1 /* padding */] = {
/* 801969A0-80196A3C 1912E0 009C+00 0/0 3/3 3/3 .text getCurrentPos__15dShopItemCtrl_cFi
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dShopItemCtrl_c::getCurrentPos(int param_0) {
nofralloc
#include "asm/d/shop/d_shop_item_ctrl/getCurrentPos__15dShopItemCtrl_cFi.s"
cXyz dShopItemCtrl_c::getCurrentPos(int item_index) {
f32 tmp = lit_3659[0];
cXyz item_pos(tmp, tmp, tmp);
if (mItemIndex[item_index] != -1) {
fopAc_ac_c* item = fopAcM_SearchByID(mItemIndex[item_index]);
if (item != NULL) {
item_pos.set(item->mCurrent.mPosition);
}
}
return item_pos;
}
#pragma pop
/* 80196A3C-80196AF0 19137C 00B4+00 0/0 2/2 0/0 .text isHomePos__15dShopItemCtrl_cFi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dShopItemCtrl_c::isHomePos(int param_0) {
nofralloc
#include "asm/d/shop/d_shop_item_ctrl/isHomePos__15dShopItemCtrl_cFi.s"
bool dShopItemCtrl_c::isHomePos(int item_index) {
if (item_index >= 0 && item_index < 7 && mItemIndex[item_index] != -1) {
daShopItem_c* item = (daShopItem_c*)fopAcM_SearchByID(mItemIndex[item_index]);
if (item != NULL) {
cXyz* item_pos = item->getPosP();
cXyz item_home = item->mOrig.mPosition;
if (item_pos->x == item_home.x &&
item_pos->y == item_home.y &&
item_pos->z == item_home.z) {
return true;
}
}
}
return false;
}
#pragma pop
/* 80196AF0-80196BA4 191430 00B4+00 0/0 1/1 0/0 .text setRotateAnime__15dShopItemCtrl_cFi
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dShopItemCtrl_c::setRotateAnime(int param_0) {
nofralloc
#include "asm/d/shop/d_shop_item_ctrl/setRotateAnime__15dShopItemCtrl_cFi.s"
void dShopItemCtrl_c::setRotateAnime(int item_index) {
for (int i = 0; i < 7; i++) {
if (mItemIndex[i] != -1) {
daShopItem_c* item = (daShopItem_c*)fopAcM_SearchByID(mItemIndex[i]);
if (item != NULL) {
csXyz* item_rot = item->getRotateP();
if (i == item_index - 1) {
item_rot->y += 0x200;
} else {
cLib_addCalcAngleS(&item_rot->y, item->mOrig.mAngle.y, 4, 0x800, 0x80);
}
}
}
}
}
#pragma pop
/* ############################################################################################## */
/* 80453AD8-80453AE0 0020D8 0008+00 1/1 0/0 0/0 .sdata2 @3838 */
src/d/shop/d_shop_system.cpp
+1286 -526
View File
File diff suppressed because it is too large Load Diff
src/f_op/f_op_actor.cpp
+1 -1
View File
@@ -218,7 +218,7 @@ static u8 g_fopAc_type[4];
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void fopAc_IsActor(void* param_0) {
asm s32 fopAc_IsActor(void* param_0) {
nofralloc
#include "asm/f_op/f_op_actor/fopAc_IsActor__FPv.s"
}