mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-18 23:37:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

move d_a_alink and some related stuff (#130)

Browse Source 
* clean up d_a_player

* move some of daalink

* more daalink / daplayer

* setup some daalink members

* rest of daalink members setup

* remove comment

* few more matches

* remove asm

* more matches

* more matches + move e_wb_class

* fix some d_save classes

Co-authored-by: lepelog <lepelog@users.noreply.github.com>
This commit is contained in:
TakaRikka
2021-05-23 03:09:59 -07:00
committed by GitHub
parent 462d71cbef
commit e915df66c8
196 changed files with 5322 additions and 6569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+661 -3934
View File
File diff suppressed because it is too large Load Diff
src/d/a/d_a_horse_static.cpp
+43 -100
View File
@@ -7,117 +7,60 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct e_wb_class {
/* 80037C7C */ void checkWait();
/* 80037C90 */ void setPlayerRideNow();
/* 80037CB0 */ void setPlayerRide();
/* 80037CF4 */ void getOff();
/* 80037D68 */ void checkDownDamage();
/* 80037D94 */ void checkNormalRideMode() const;
/* 80037DBC */ void setRunRideMode();
};
struct daTagHstop_c {
static u8 m_top[4 + 4 /* padding */];
};
//
// Forward References:
//
extern "C" void checkWait__10e_wb_classFv();
extern "C" void setPlayerRideNow__10e_wb_classFv();
extern "C" void setPlayerRide__10e_wb_classFv();
extern "C" void getOff__10e_wb_classFv();
extern "C" void checkDownDamage__10e_wb_classFv();
extern "C" void checkNormalRideMode__10e_wb_classCFv();
extern "C" void setRunRideMode__10e_wb_classFv();
extern "C" u8 m_top__12daTagHstop_c[4 + 4 /* padding */];
//
// External References:
//
extern "C" void setLinkRiding__14Z2CreatureRideFb();
//
// Declarations:
//
/* 80037C7C-80037C90 0325BC 0014+00 0/0 1/1 0/0 .text checkWait__10e_wb_classFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void e_wb_class::checkWait() {
nofralloc
#include "asm/d/a/d_a_horse_static/checkWait__10e_wb_classFv.s"
BOOL e_wb_class::checkWait() {
return unk1460 == 0x2A;
}
#pragma pop
/* 80037C90-80037CB0 0325D0 0020+00 0/0 2/2 0/0 .text setPlayerRideNow__10e_wb_classFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void e_wb_class::setPlayerRideNow() {
nofralloc
#include "asm/d/a/d_a_horse_static/setPlayerRideNow__10e_wb_classFv.s"
void e_wb_class::setPlayerRideNow() {
unk1680 = 0x67;
unk1460 = 0;
unk1726 |= 3;
}
#pragma pop
/* 80037CB0-80037CF4 0325F0 0044+00 0/0 3/3 0/0 .text setPlayerRide__10e_wb_classFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void e_wb_class::setPlayerRide() {
nofralloc
#include "asm/d/a/d_a_horse_static/setPlayerRide__10e_wb_classFv.s"
void e_wb_class::setPlayerRide() {
unk1680 = 0x65;
unk1460 = 0;
unk1726 |= 3;
mZ2Ride.setLinkRiding(true);
}
#pragma pop
/* 80037CF4-80037D68 032634 0074+00 0/0 1/1 0/0 .text getOff__10e_wb_classFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void e_wb_class::getOff() {
nofralloc
#include "asm/d/a/d_a_horse_static/getOff__10e_wb_classFv.s"
void e_wb_class::getOff() {
if (!checkDownDamage() || unk1680 == 0x67) {
unk1680 = 0;
} else {
unk1682 = 0;
}
unk1460 = 0;
unk1726 &= 0xfffc;
mZ2Ride.setLinkRiding(false);
}
#pragma pop
/* 80037D68-80037D94 0326A8 002C+00 1/1 2/2 0/0 .text checkDownDamage__10e_wb_classFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void e_wb_class::checkDownDamage() {
nofralloc
#include "asm/d/a/d_a_horse_static/checkDownDamage__10e_wb_classFv.s"
BOOL e_wb_class::checkDownDamage() {
bool downDamage = false;
s16 tmp = unk1680;
if (tmp != 0x65 && tmp != 0x66 && tmp != 0x15) {
downDamage = true;
}
return downDamage;
}
#pragma pop
/* 80037D94-80037DBC 0326D4 0028+00 0/0 2/2 0/0 .text checkNormalRideMode__10e_wb_classCFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void e_wb_class::checkNormalRideMode() const {
nofralloc
#include "asm/d/a/d_a_horse_static/checkNormalRideMode__10e_wb_classCFv.s"
u8 e_wb_class::checkNormalRideMode() const {
bool normalRideMode = false;
if (unk1680 != 0x66 || unk1460 < 1) {
normalRideMode = 1;
}
return normalRideMode;
}
#pragma pop
/* 80037DBC-80037DE4 0326FC 0028+00 0/0 1/1 0/0 .text setRunRideMode__10e_wb_classFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void e_wb_class::setRunRideMode() {
nofralloc
#include "asm/d/a/d_a_horse_static/setRunRideMode__10e_wb_classFv.s"
void e_wb_class::setRunRideMode() {
if (unk1680 == 0x65) {
unk1460 = 0;
unk1680 = 0x15;
unk1682 = 0x65;
}
}
#pragma pop
/* ############################################################################################## */
/* 80450DF8-80450E00 0002F8 0004+04 0/0 1/1 3/3 .sbss m_top__12daTagHstop_c */
u8 daTagHstop_c::m_top[4 + 4 /* padding */];
daTagHstop_c* daTagHstop_c::m_top;
src/d/a/d_a_player.cpp
+47 -58
View File
@@ -7,6 +7,7 @@
#include "dol2asm.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
//
// Types:
@@ -18,21 +19,6 @@ struct mDoMtx_stack_c {
static u8 now[48];
};
struct ResTIMG {};
struct daPy_sightPacket_c {
/* 80140CDC */ ~daPy_sightPacket_c();
/* 8015F1A0 */ void draw();
/* 8015F2FC */ void setSight();
/* 8015F384 */ void setSightImage(ResTIMG*);
};
struct daPy_boomerangMove_c {
/* 8015E5B0 */ void initOffset(cXyz const*);
/* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16);
/* 8015E87C */ void bgCheckAfterOffset(cXyz const*);
};
struct daAlink_c {
/* 800A0744 */ void setLookPosFromOut(cXyz*);
/* 800BDF60 */ void startRestartRoom(u32, int, int, int);
@@ -43,27 +29,15 @@ struct daAlink_c {
/* 800E7AEC */ void setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int);
};
struct dStage_roomControl_c {
static u8 mDemoArcName[10 + 2 /* padding */];
};
struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
/* 8003C400 */ void getIDRes(char const*, u16, dRes_info_c*, int);
};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRSolidHeap {};
struct J3DSys {
/* 8031073C */ void reinitGX();
};
@@ -373,7 +347,7 @@ BOOL daPy_py_c::checkFishingRodItem(int i_item_id) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::checkFishingRodItem(int param_0) {
asm BOOL daPy_py_c::checkFishingRodItem(int param_0) {
nofralloc
#include "asm/d/a/d_a_player/checkFishingRodItem__9daPy_py_cFi.s"
}
@@ -415,7 +389,7 @@ asm void daPy_py_c::checkDrinkBottleItem(int param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::checkOilBottleItem(int param_0) {
asm BOOL daPy_py_c::checkOilBottleItem(int param_0) {
nofralloc
#include "asm/d/a/d_a_player/checkOilBottleItem__9daPy_py_cFi.s"
}
@@ -497,14 +471,14 @@ asm void daPy_actorKeep_c::setActor() {
/* 8015ECB8-8015ECFC 1595F8 0044+00 0/0 59/59 4/4 .text setData__16daPy_actorKeep_cFP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_actorKeep_c::setData(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/a/d_a_player/setData__16daPy_actorKeep_cFP10fopAc_ac_c.s"
void daPy_actorKeep_c::setData(fopAc_ac_c* pActor) {
if (pActor != NULL) {
mActor = pActor;
mID = fopAcM_GetID(pActor);
} else {
clearData();
}
}
#pragma pop
void daPy_actorKeep_c::clearData() {
mID = 0xffffffff;
@@ -680,42 +654,57 @@ SECTION_SDATA2 static u8 pigGanonArcName[6 + 2 /* padding */] = {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_anmHeap_c::loadData(u16 param_0) {
asm J3DAnmBase* daPy_anmHeap_c::loadData(u16 param_0) {
nofralloc
#include "asm/d/a/d_a_player/loadData__14daPy_anmHeap_cFUs.s"
}
#pragma pop
/* 8015F068-8015F0D0 1599A8 0068+00 0/0 9/9 5/5 .text loadDataIdx__14daPy_anmHeap_cFUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_anmHeap_c::loadDataIdx(u16 param_0) {
nofralloc
#include "asm/d/a/d_a_player/loadDataIdx__14daPy_anmHeap_cFUs.s"
J3DAnmBase* daPy_anmHeap_c::loadDataIdx(u16 pID) {
J3DAnmBase* tmp;
if (pID == mIdx && mArcNo == 0xffff) {
tmp = NULL;
} else {
mIdx = pID;
mArcNo = 0xffff;
if (mPriIdx == 0xffff) {
tmp = loadData(pID);
} else {
tmp = NULL;
}
}
return tmp;
}
#pragma pop
/* 8015F0D0-8015F118 159A10 0048+00 0/0 3/3 0/0 .text loadDataPriIdx__14daPy_anmHeap_cFUs
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_anmHeap_c::loadDataPriIdx(u16 param_0) {
nofralloc
#include "asm/d/a/d_a_player/loadDataPriIdx__14daPy_anmHeap_cFUs.s"
J3DAnmBase* daPy_anmHeap_c::loadDataPriIdx(u16 pID) {
J3DAnmBase* tmp;
if (pID == mPriIdx || mArcNo != 0xffff) {
tmp = NULL;
} else {
mPriIdx = pID;
tmp = loadData(pID);
}
return tmp;
}
#pragma pop
/* 8015F118-8015F168 159A58 0050+00 0/0 5/5 5/5 .text loadDataDemoRID__14daPy_anmHeap_cFUsUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_anmHeap_c::loadDataDemoRID(u16 param_0, u16 param_1) {
nofralloc
#include "asm/d/a/d_a_player/loadDataDemoRID__14daPy_anmHeap_cFUsUs.s"
J3DAnmBase* daPy_anmHeap_c::loadDataDemoRID(u16 pID, u16 pArcNo) {
J3DAnmBase* tmp;
if (pID == mIdx && pArcNo == mArcNo) {
tmp = NULL;
} else {
mIdx = pID;
mArcNo = pArcNo;
tmp = loadData(pID);
}
return tmp;
}
#pragma pop
/* 8015F168-8015F1A0 159AA8 0038+00 1/1 4/4 0/0 .text setAnimeHeap__14daPy_anmHeap_cFv */
#pragma push
src/d/bg/d_bg_s_lin_chk.cpp
-59
View File
@@ -11,54 +11,11 @@
// Types:
//
struct fopAc_ac_c {};
struct dBgS_RopeLinChk {
/* 8007838C */ dBgS_RopeLinChk();
/* 800783E8 */ ~dBgS_RopeLinChk();
};
struct dBgS_PolyPassChk {
/* 80078E68 */ void SetObj();
/* 80078E80 */ void SetCam();
/* 80078E98 */ void SetLink();
/* 80078EB0 */ void SetArrow();
/* 80078EBC */ void SetBomb();
/* 80078ED4 */ void SetBoomerang();
/* 80078EE0 */ void SetRope();
/* 80078EF8 */ void SetHorse();
};
struct dBgS_ObjLinChk {
/* 80077F5C */ dBgS_ObjLinChk();
/* 80077FB8 */ ~dBgS_ObjLinChk();
};
struct dBgS_LinkLinChk {
/* 80078030 */ dBgS_LinkLinChk();
/* 8007808C */ ~dBgS_LinkLinChk();
};
struct cXyz {};
struct dBgS_LinChk {
/* 80077C68 */ dBgS_LinChk();
/* 80077CDC */ ~dBgS_LinChk();
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct dBgS_HorseLinChk {
/* 80078460 */ dBgS_HorseLinChk();
/* 800784BC */ ~dBgS_HorseLinChk();
};
struct dBgS_Chk {
/* 8007749C */ dBgS_Chk();
/* 800774E8 */ ~dBgS_Chk();
/* 80077560 */ void GetPolyPassChkInfo();
/* 80077564 */ void GetGrpPassChkInfo();
};
struct dBgS_CamLinChk_NorWtr {
/* 80077E78 */ dBgS_CamLinChk_NorWtr();
/* 80077EE4 */ ~dBgS_CamLinChk_NorWtr();
@@ -69,27 +26,11 @@ struct dBgS_CamLinChk {
/* 80077E00 */ ~dBgS_CamLinChk();
};
struct dBgS_BoomerangLinChk {
/* 800782B8 */ dBgS_BoomerangLinChk();
/* 80078314 */ ~dBgS_BoomerangLinChk();
};
struct dBgS_BombLinChk {
/* 80078104 */ dBgS_BombLinChk();
/* 80078160 */ ~dBgS_BombLinChk();
};
struct dBgS_ArrowLinChk {
/* 800781D8 */ dBgS_ArrowLinChk();
/* 80078240 */ ~dBgS_ArrowLinChk();
};
struct cBgS_LinChk {
/* 80267D5C */ cBgS_LinChk();
/* 80267DBC */ ~cBgS_LinChk();
/* 80267ED0 */ void Set2(cXyz const*, cXyz const*, unsigned int);
};
//
// Forward References:
//
src/d/com/d_com_inf_game.cpp
-3
View File
@@ -55,8 +55,6 @@ struct dMapInfo_n {
/* 8003EE5C */ void getMapPlayerPos();
};
struct dKy_tevstr_c {};
struct _GXTexObj {};
struct dDlst_shadowControl_c {
@@ -276,7 +274,6 @@ extern "C" extern u32 g_saftyWhiteColor;
// External References:
//
extern "C" void OSReport_Error();
extern "C" void mDoAud_setSceneName__FPCcll();
extern "C" void mDoAud_resetProcess__Fv();
extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap();
src/d/d_attention.cpp
-4
View File
@@ -39,8 +39,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRSolidHeap {};
struct J3DGXColor {};
struct J3DTevBlock {
@@ -136,7 +134,6 @@ extern "C" extern u8 data_80450688[8];
// External References:
//
SECTION_INIT void memcpy();
extern "C" void play__14mDoExt_baseAnmFv();
extern "C" void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss();
extern "C" void entry__13mDoExt_bpkAnmFP16J3DMaterialTablef();
@@ -190,7 +187,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" void tan();
extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3];
extern "C" u8 dist_table__12dAttention_c[6552];
src/d/d_drawlist.cpp
-4
View File
@@ -184,10 +184,6 @@ struct J3DSys {
/* 8031073C */ void reinitGX();
};
struct J3DShapePacket {
/* 80312FBC */ void drawFast();
};
struct J3DShape {
/* 80315300 */ void loadPreDrawSetting() const;
src/d/d_eye_hl.cpp
-15
View File
@@ -11,21 +11,6 @@
// Types:
//
struct J3DModelData {};
struct dEyeHL_c {
/* 8009C964 */ void entry(J3DModelData*, char const*);
/* 8009CA28 */ void remove();
};
struct dEyeHL_mng_c {
/* 8009CA48 */ void update();
/* 8009CB14 */ void entry(dEyeHL_c*);
/* 8009CB34 */ void remove(dEyeHL_c*);
static u8 m_obj[4 + 4 /* padding */];
};
struct JUTNameTab {
/* 802DEAF8 */ void getName(u16) const;
};
src/d/d_jnt_col.cpp
+1 -45
View File
@@ -11,22 +11,6 @@
// Types:
//
struct csXyz {};
struct Vec {};
struct cXyz {
/* 80266AE4 */ void operator+(Vec const&) const;
/* 80266B34 */ void operator-(Vec const&) const;
/* 80266B84 */ void operator*(f32) const;
/* 80266C18 */ void operator/(f32) const;
/* 80266F48 */ void normalizeZP();
/* 80267128 */ void atan2sX_Z() const;
/* 80267150 */ void atan2sY_XZ() const;
static u8 BaseZ[12];
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
@@ -35,27 +19,6 @@ struct mDoMtx_stack_c {
static u8 now[48];
};
struct fopAc_ac_c {};
struct cM3dGLin {
/* 80036A5C */ ~cM3dGLin();
/* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&);
};
struct dJntColData_c {};
struct J3DModel {};
struct dJntCol_c {
/* 80035C8C */ dJntCol_c();
/* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
/* 80035CC8 */ void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*);
/* 80035DC8 */ void searchNearPos(cM3dGLin const*, cXyz const*, cXyz*, int) const;
/* 80036AEC */ void getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
/* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
/* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*);
};
struct cM3dGSph {
/* 80036AA4 */ ~cM3dGSph();
/* 8026F664 */ void Set(cXyz const&, f32);
@@ -113,13 +76,6 @@ extern "C" void crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz();
extern "C" void SetupNP0__8cM3dGPlaFRC3VecRC3Vec();
extern "C" void Set__8cM3dGSphFRC4cXyzf();
extern "C" void __dl__FPv();
extern "C" void PSMTXCopy();
extern "C" void PSMTXInverse();
extern "C" void PSMTXMultVec();
extern "C" void PSMTXMultVecSR();
extern "C" void PSVECSquareMag();
extern "C" void PSVECDotProduct();
extern "C" void PSVECSquareDistance();
extern "C" void _savegpr_19();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
@@ -241,7 +197,7 @@ asm void dJntCol_c::searchNearPos(cM3dGLin const* param_0, cXyz const* param_1,
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cM3dGLin::~cM3dGLin() {
extern "C" asm void __dt__8cM3dGLinFv() {
nofralloc
#include "asm/d/d_jnt_col/__dt__8cM3dGLinFv.s"
}
src/d/d_resorce.cpp
-6
View File
@@ -63,8 +63,6 @@ struct JUTNameTab {
/* 802DEAF8 */ void getName(u16) const;
};
struct JKRSolidHeap {};
struct JKRMemBreakFlag {};
struct JKRMemArchive {
@@ -216,8 +214,6 @@ extern "C" extern char const* const d_d_resorce__stringBase0;
// External References:
//
extern "C" void OSReport_Error();
extern "C" void OSReport_Warning();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void setTevStageInfo__11J3DTevStageFRC15J3DTevStageInfo();
extern "C" void mDoExt_getGameHeap__Fv();
@@ -258,8 +254,6 @@ extern "C" void load__22J3DModelLoaderDataBaseFPCvUl();
extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag();
extern "C" void setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv();
extern "C" void DCStoreRangeNoSync();
extern "C" void OSLockMutex();
extern "C" void OSUnlockMutex();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void _savegpr_20();
src/d/kankyo/d_kankyo.cpp
-20
View File
@@ -79,17 +79,6 @@ struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct Vec {};
struct cXyz {
/* 80009184 */ ~cXyz();
/* 80266AE4 */ void operator+(Vec const&) const;
/* 80266B34 */ void operator-(Vec const&) const;
/* 80266B84 */ void operator*(f32) const;
};
struct _GXColorS10 {};
struct dScnKy_env_light_c {
/* 8019F2E8 */ dScnKy_env_light_c();
/* 8019F4FC */ void setDaytime();
@@ -128,8 +117,6 @@ struct dPa_levelEcallBack {};
struct csXyz {};
struct _GXColor {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
@@ -194,11 +181,6 @@ struct WIND_INF_ENTITY {
/* 8019F4F4 */ WIND_INF_ENTITY();
};
struct LIGHT_INFLUENCE {
/* 800CFC7C */ ~LIGHT_INFLUENCE();
/* 8019F4F8 */ LIGHT_INFLUENCE();
};
struct JUTNameTab {
/* 802DEAF8 */ void getName(u16) const;
};
@@ -547,8 +529,6 @@ extern "C" void PSMTXConcat();
extern "C" void PSMTXTrans();
extern "C" void C_MTXLightPerspective();
extern "C" void PSMTXMultVec();
extern "C" void PSVECSquareMag();
extern "C" void PSVECSquareDistance();
extern "C" void GXInitLightAttn();
extern "C" void GXInitLightSpot();
extern "C" void GXInitLightDistAttn();
src/d/msg/d_msg_flow.cpp
-141
View File
@@ -11,20 +11,12 @@
// Types:
//
struct mesg_flow_node_event {};
struct mesg_flow_node_branch {};
struct mesg_flow_node {};
struct _GXColor {};
struct mDoGph_gInf_c {
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
};
struct fopAc_ac_c {};
struct daPy_py_c {
/* 8015F3FC */ void getAttentionOffsetY();
/* 8015F954 */ void setMidnaMotionNum(int);
@@ -130,133 +122,6 @@ struct dMsgObject_c {
/* 8023864C */ void setSelectCancelPos(u8);
};
struct dMsgFlow_c {
/* 80249F00 */ dMsgFlow_c();
/* 80249F48 */ ~dMsgFlow_c();
/* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
/* 8024A13C */ void checkOpenDoor(fopAc_ac_c*, int*);
/* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
/* 8024A424 */ void checkEventRender(int*, int*, int*, int*);
/* 8024A4C4 */ void remove();
/* 8024A528 */ void getEventId(int*);
/* 8024A538 */ void getMsgNo();
/* 8024A540 */ void getNowMsgNo();
/* 8024A548 */ void getMsg();
/* 8024A580 */ void setInitValue(int);
/* 8024A618 */ void setInitValueGroupChange(int, fopAc_ac_c**);
/* 8024A6EC */ void getMsgDataBlock(char const*);
/* 8024A784 */ void getInitNodeIndex(u16);
/* 8024A7CC */ void setNodeIndex(u16, fopAc_ac_c**);
/* 8024A95C */ void setSelectMsg(mesg_flow_node*, mesg_flow_node*, fopAc_ac_c*);
/* 8024AA50 */ void setNormalMsg(mesg_flow_node*, fopAc_ac_c*);
/* 8024AB30 */ void messageNodeProc(fopAc_ac_c*, fopAc_ac_c**);
/* 8024AD54 */ void branchNodeProc(fopAc_ac_c*, fopAc_ac_c**);
/* 8024ADEC */ void eventNodeProc(fopAc_ac_c*, fopAc_ac_c**);
/* 8024AFF8 */ void nodeProc(fopAc_ac_c*, fopAc_ac_c**);
/* 8024B0F0 */ void getParam(u16*, u16*, u8*);
/* 8024B108 */ void getParam(u8*, u8*);
/* 8024B130 */ void getParam(u8*);
/* 8024B138 */ void query001(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B180 */ void query002(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B208 */ void query003(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B250 */ void query004(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B2C0 */ void query005(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B2F8 */ void query006(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B32C */ void query007(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B45C */ void query008(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B4A4 */ void query009(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B4D0 */ void query010(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B504 */ void query011(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B54C */ void query012(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B584 */ void query013(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B5BC */ void query014(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B5F4 */ void query015(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B62C */ void query016(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B664 */ void query017(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B6A8 */ void query018(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B6EC */ void query019(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B730 */ void query020(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B774 */ void query021(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B8E4 */ void query022(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B918 */ void query023(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B954 */ void query024(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B974 */ void query025(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B9BC */ void query026(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024B9E8 */ void query027(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BA4C */ void query028(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BAA0 */ void query029(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BAE0 */ void query030(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BB18 */ void query031(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BB74 */ void query032(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BB9C */ void query033(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BBE4 */ void query034(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BC14 */ void query035(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BC3C */ void query036(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BC80 */ void query037(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BCC4 */ void query038(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BDB0 */ void query039(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BE4C */ void query040(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BF50 */ void query041(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024BFEC */ void query042(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C0A8 */ void query043(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C144 */ void query044(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C18C */ void query045(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C218 */ void query046(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C248 */ bool query047(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C250 */ void query048(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C2A0 */ void query049(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C2FC */ void query050(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C340 */ void query051(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C3A0 */ void query052(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C3D4 */ void query053(mesg_flow_node_branch*, fopAc_ac_c*, int);
/* 8024C3FC */ void event000(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C488 */ void event001(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C514 */ void event002(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C550 */ void event003(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C590 */ void event004(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C5F0 */ void event005(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C654 */ void event006(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C694 */ void event007(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C6D8 */ void event008(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C744 */ void event009(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C76C */ void event010(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C7F8 */ void event011(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C884 */ bool event012(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C88C */ void event013(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C8CC */ void event014(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024C994 */ void event015(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CA5C */ void event016(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CA94 */ void event017(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CBB0 */ void event018(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CCA4 */ bool event019(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CCAC */ void event020(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CD84 */ void event021(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CDAC */ void event022(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CE40 */ void event023(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CF2C */ void event024(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CF54 */ void event025(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024CF9C */ void event026(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D004 */ void event027(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D3C4 */ void event028(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D500 */ void event029(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D544 */ void event030(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D5BC */ void event031(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D5EC */ void event032(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D6BC */ void event033(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D788 */ void event034(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D7C8 */ void event035(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D870 */ void event036(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D8C4 */ void event037(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D918 */ void event038(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D93C */ void event039(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024D970 */ void event040(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024DA78 */ void event041(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024DAA8 */ bool event042(mesg_flow_node_event*, fopAc_ac_c*);
static u8 mQueryList[636];
static u8 mEventList[516];
};
struct dMeter2Info_c {
/* 8021E0C4 */ void resetMiniGameItem(bool);
};
@@ -265,12 +130,6 @@ struct dComIfG_play_c {
/* 8002B36C */ void setItemBombNumCount(u8, s16);
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dAttention_c {
/* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
/* 8014B010 */ void getDistTable(int);
src/d/particle/d_particle.cpp
-54
View File
@@ -27,13 +27,6 @@ struct mDoDvdThd_toMainRam_c {
/* 80016394 */ void create(char const*, u8, JKRHeap*);
};
struct fopAc_ac_c {};
struct cXyz {
/* 80266B84 */ void operator*(f32) const;
/* 80267128 */ void atan2sX_Z() const;
};
struct fopAcM_wt_c {
/* 8001DD84 */ void waterCheck(cXyz const*);
@@ -44,15 +37,6 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct _GXTexMapID {};
struct JPABaseEmitter {
/* 8027EA40 */ void createParticle();
/* 8027EF30 */ void getCurrentCreateNumber() const;
/* 8027EF40 */ void getDrawCount() const;
/* 8027EF50 */ void loadTexture(u8, _GXTexMapID);
};
struct JPABaseParticle {
/* 80280548 */ void getWidth(JPABaseEmitter const*) const;
/* 80280568 */ void getHeight(JPABaseEmitter const*) const;
@@ -68,22 +52,8 @@ struct dPa_wbPcallBack_c {
/* 8004FECC */ ~dPa_wbPcallBack_c();
};
struct JPAParticleCallBack {
/* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*);
/* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 8027EFA4 */ ~JPAParticleCallBack();
};
struct JPADrawInfo {};
struct JPAEmitterCallBack {
/* 80050368 */ void execute(JPABaseEmitter*);
/* 8005036C */ void draw(JPABaseEmitter*);
/* 80050370 */ void drawAfter(JPABaseEmitter*);
/* 80050374 */ void executeAfter(JPABaseEmitter*);
/* 8027E6A4 */ ~JPAEmitterCallBack();
};
struct ResTIMG {};
struct JPAResourceManager {
@@ -131,8 +101,6 @@ struct dPa_simpleData_c {
/* 8004B060 */ dPa_simpleData_c();
};
struct csXyz {};
struct dPa_setColorEcallBack {
/* 800502B0 */ void draw(JPABaseEmitter*);
/* 800502E0 */ void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
@@ -208,18 +176,6 @@ struct dPa_light8EcallBack {
/* 800501E0 */ void drawAfter(JPABaseEmitter*);
};
struct dPa_levelEcallBack {
/* 8004FB18 */ ~dPa_levelEcallBack();
/* 8004FB8C */ void cleanup();
};
struct dPa_hermiteEcallBack_c {
/* 8004F6B8 */ void setOldPosP(cXyz const*, cXyz const*);
/* 8004F6C4 */ void executeAfter(JPABaseEmitter*);
/* 8004FABC */ void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
/* 8004FCC8 */ ~dPa_hermiteEcallBack_c();
};
struct dPa_gen_d_light8PcallBack {
/* 8004DD18 */ void execute(JPABaseEmitter*, JPABaseParticle*);
/* 8004ED44 */ void draw(JPABaseEmitter*, JPABaseParticle*);
@@ -355,8 +311,6 @@ struct cBgS {
/* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
};
struct Vec {};
struct JMath {
static u8 sincosTable_[65536];
};
@@ -665,15 +619,7 @@ extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
extern "C" void entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
extern "C" void PSMTXIdentity();
extern "C" void PSMTXConcat();
extern "C" void PSMTXRotRad();
extern "C" void PSMTXRotAxisRad();
extern "C" void PSMTXScale();
extern "C" void PSMTXMultVec();
extern "C" void PSVECSquareMag();
extern "C" void PSVECCrossProduct();
extern "C" void PSVECSquareDistance();
extern "C" void GXSetVtxDesc();
extern "C" void GXClearVtxDesc();
extern "C" void GXSetVtxAttrFmt();
src/d/particle/d_particle_copoly.cpp
-22
View File
@@ -11,14 +11,6 @@
// Types:
//
struct dKy_tevstr_c {};
struct cBgS_PolyInfo {};
struct csXyz {};
struct cXyz {};
struct dPa_control_c {
struct level_c {
/* 8004B918 */ void getEmitter(u32);
@@ -31,20 +23,6 @@ struct dPa_control_c {
dKy_tevstr_c const*, u32, u32, csXyz const*, cXyz const*, s8);
};
struct dBgS_Acch {};
struct dPaPo_c {
/* 80050C9C */ void init(dBgS_Acch*, f32, f32);
/* 80050CC4 */ void checkWaterIn(cXyz*, cXyz const*, dKy_tevstr_c const*, u32, s8, f32, f32);
/* 80050E7C */ void setEffect(u32*, int, dKy_tevstr_c const*, cXyz const*, u32, u32,
cXyz const*, csXyz const*, s8, u8*, u8*);
/* 80051008 */ void setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
csXyz const*, cXyz const*, s8, f32, f32);
/* 8005113C */ void clearID(u32*, u8*);
/* 80051488 */ void getCenterEffType(int) const;
/* 80051524 */ void getCenterEmitter(int, int);
};
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,
src/d/save/d_save.cpp
+195 -197
View File
@@ -287,11 +287,11 @@ static u8 dSv_item_rename(u8 item_id) {
}
void dSv_player_status_a_c::init() {
mMaxHealth = 15;
mCurrentHealth = 12;
mCurrentRupees = 0;
mMaxLanternOil = 0;
mCurrentLanternOil = 0;
mMaxLife = 15;
mLife = 12;
mRupee = 0;
mMaxOil = 0;
mOil = 0;
unk10 = 0;
for (int i = 0; i < 4; i++) {
@@ -301,20 +301,20 @@ void dSv_player_status_a_c::init() {
}
for (int i = 0; i < 6; i++) {
mEquipment[i] = 0;
mSelectEquip[i] = 0;
}
mEquipment[0] = WEARS_CASUAL;
mEquipment[1] = NO_ITEM;
mEquipment[2] = NO_ITEM;
mEquipment[3] = NO_ITEM;
mEquipment[4] = NO_ITEM;
mCurrentWallet = WALLET;
mSelectEquip[COLLECT_CLOTHING] = WEARS_CASUAL;
mSelectEquip[COLLECT_SWORD] = NO_ITEM;
mSelectEquip[COLLECT_SHIELD] = NO_ITEM;
mSelectEquip[COLLECT_SMELL] = NO_ITEM;
mSelectEquip[B_BUTTON_ITEM] = NO_ITEM;
mWalletSize = WALLET;
mMaxMagic = 0;
mCurrentMagic = 0;
mMagic = 0;
mMagicFlag = 0;
unk29 = 0;
unk30 = 0;
mTransformStatus = 0;
for (int i = 0; i < 3; i++) {
unk31[i] = 0;
@@ -348,8 +348,8 @@ u8 dSv_player_status_a_c::getMixItemIndex(signed int i_no) const {
}
u16 dSv_player_status_a_c::getRupeeMax(void) const {
if (mCurrentWallet < 3) { // if you make this a default, it wont match. Compiler, pls.
switch (mCurrentWallet) {
if (mWalletSize < 3) { // if you make this a default, it wont match. Compiler, pls.
switch (mWalletSize) {
case WALLET:
return 300;
case BIG_WALLET:
@@ -381,13 +381,12 @@ asm BOOL dSv_player_status_a_c::isMagicFlag(u8 param_0) const {
#endif
void dSv_player_status_b_c::init() {
unk4 = 0;
unk0 = 0;
mDateIpl = 0;
mTransformLevelFlag = 0;
mDarkClearLevelFlag = 0;
unk10 = 0;
mTimeOfDay = 255.0f;
unk16 = 0;
mTime = 255.0f;
mDate = 0;
for (int i = 0; i < 3; i++) {
unk18[i] = 0;
@@ -481,17 +480,17 @@ void dSv_player_return_place_c::set(const char* i_name, s8 i_room_id, u8 i_spawn
void dSv_player_field_last_stay_info_c::init() {
f32 position_val;
strcpy(mLastStage, (char*)lbl_80379234);
strcpy(mName, (char*)lbl_80379234);
position_val = lbl_80451D5C;
mLastPosition.x = lbl_80451D5C;
mLastPosition.y = position_val;
mLastPosition.z = position_val;
mLastAngle = 0;
mPos.x = lbl_80451D5C;
mPos.y = position_val;
mPos.z = position_val;
mAngleY = 0;
mLastSpawnId = 0;
mLastRoomId = 1;
unk24 = 0;
mLastRegion = 0;
mRegionNo = 1;
mFieldDataExistFlag = false;
mRegion = 0;
for (int i = 0; i < 2; i++) {
unk26[i] = 0;
@@ -511,12 +510,12 @@ asm void dSv_player_field_last_stay_info_c::init() {
void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_last_position,
s16 i_last_angle, signed char i_last_spawn_id,
u8 i_last_room_id) {
strcpy(mLastStage, i_name);
strcpy(mName, i_name);
mLastPosition = i_last_position;
mLastAngle = i_last_angle;
mPos = i_last_position;
mAngleY = i_last_angle;
mLastSpawnId = i_last_spawn_id;
mLastRoomId = i_last_room_id;
mRegionNo = i_last_room_id;
}
void dSv_player_field_last_stay_info_c::onRegionBit(int i_region_bit) {
@@ -526,12 +525,12 @@ void dSv_player_field_last_stay_info_c::onRegionBit(int i_region_bit) {
if (8 <= i_region_bit) {
return;
}
mLastRegion |= (u8)(1 << i_region_bit);
mRegion |= (u8)(1 << i_region_bit);
}
BOOL dSv_player_field_last_stay_info_c::isRegionBit(int param_1) const {
if ((param_1 >= 0) && (param_1 < 8)) {
return (mLastRegion & (u8)(1 << param_1)) ? TRUE : FALSE;
return (mRegion & (u8)(1 << param_1)) ? TRUE : FALSE;
}
return false;
}
@@ -2778,17 +2777,17 @@ asm int dSv_player_get_item_c::isFirstBit(u8 param_0) const {
#pragma pop
void dSv_player_item_record_c::init(void) {
mBow = 0;
mArrowNum = 0;
for (int i = 0; i < 3; i++) {
mBombBags[i] = 0;
mBombNum[i] = 0;
}
for (int i = 0; i < 4; i++) {
mBottles[i] = 0;
mBottleNum[i] = 0;
}
mSlingshot = 0;
mPachinkoNum = 0;
for (int i = 0; i < 3; i++) {
unk5[i] = 0;
@@ -2796,15 +2795,15 @@ void dSv_player_item_record_c::init(void) {
}
void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 bag_id) {
mBombBags[i_bagIdx] = bag_id;
mBombNum[i_bagIdx] = bag_id;
}
u8 dSv_player_item_record_c::getBombNum(u8 i_bagIdx) const {
return mBombBags[i_bagIdx];
return mBombNum[i_bagIdx];
}
void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) {
mBottles[i_bottleIdx] = bottle_num;
mBottleNum[i_bottleIdx] = bottle_num;
}
/* 80033F9C-80034030 02E8DC 0094+00 0/0 1/1 0/0 .text addBottleNum__24dSv_player_item_record_cFUcs
@@ -2812,18 +2811,18 @@ void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) {
// need gameinfo inline
#ifdef NONMATCHING
u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 param_2) {
int iVar3 = mBottles[i_bottleIdx] + param_2;
int iVar3 = mBottleNum[i_bottleIdx] + param_2;
dComIfGs_getItem((u8)(i_bottleIdx + 0xB), true);
if (iVar3 < 0) {
mBottles[i_bottleIdx] = 0;
mBottleNum[i_bottleIdx] = 0;
} else if (iVar3 > dComIfGs_getBottleMax__Fv()) {
mBottles[i_bottleIdx] = dComIfGs_getBottleMax__Fv();
mBottleNum[i_bottleIdx] = dComIfGs_getBottleMax__Fv();
} else {
mBottles[i_bottleIdx] = iVar3;
mBottleNum[i_bottleIdx] = iVar3;
}
return mBottles[i_bottleIdx];
return mBottleNum[i_bottleIdx];
}
#else
#pragma push
@@ -2837,29 +2836,29 @@ asm u8 dSv_player_item_record_c::addBottleNum(u8 param_0, s16 param_1) {
#endif
u8 dSv_player_item_record_c::getBottleNum(u8 i_bottleIdx) const {
return mBottles[i_bottleIdx];
return mBottleNum[i_bottleIdx];
}
void dSv_player_item_max_c::init(void) {
for (int i = 0; i < 7; i++) {
mItemCapacities[i] = 30;
mItemMax[i] = 30;
}
setBombNum(NORMAL_BOMB, 30);
setBombNum(WATER_BOMB, 15);
setBombNum(POKE_BOMB, 10);
mItemCapacities[7] = 0;
mItemMax[7] = 0;
}
void dSv_player_item_max_c::setBombNum(u8 bomb_id, u8 bomb_max) {
switch (bomb_id) {
case NORMAL_BOMB:
mItemCapacities[1] = bomb_max;
mItemMax[NORMAL_BOMB_MAX] = bomb_max;
return;
case WATER_BOMB:
mItemCapacities[2] = bomb_max;
mItemMax[WATER_BOMB_MAX] = bomb_max;
return;
case POKE_BOMB:
mItemCapacities[6] = bomb_max;
mItemMax[POKE_BOMB_MAX] = bomb_max;
return;
}
}
@@ -2877,11 +2876,11 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const {
switch (param_1) {
case NORMAL_BOMB:
return (u8)(mItemCapacities[0x1] * iVar3);
return (u8)(mItemMax[NORMAL_BOMB_MAX] * iVar3);
case WATER_BOMB:
return (u8)(mItemCapacities[0x2] * iVar3);
return (u8)(mItemMax[WATER_BOMB_MAX] * iVar3);
case POKE_BOMB:
return (u8)(mItemCapacities[0x6] * iVar3);
return (u8)(mItemMax[POKE_BOMB_MAX] * iVar3);
default:
return 0;
}
@@ -2899,22 +2898,22 @@ asm u8 dSv_player_item_max_c::getBombNum(u8 param_0) const {
void dSv_player_collect_c::init(void) {
for (int i = 0; i < 8; i++) {
unk0[i] = 0;
mItem[i] = 0;
}
unk8 = 0;
mCrystal = 0;
mMirror = 0;
unk11 = 0xFF;
mPoeCount = 0;
mPohNum = 0;
}
void dSv_player_collect_c::setCollect(int param_1, u8 i_item) {
unk0[param_1] |= (u8)(1 << i_item);
void dSv_player_collect_c::setCollect(int i_item_type, u8 i_item) {
mItem[i_item_type] |= (u8)(1 << i_item);
}
BOOL dSv_player_collect_c::isCollect(int param_1, u8 i_item) const {
return unk0[param_1] & (u8)(1 << i_item) ? TRUE : FALSE;
BOOL dSv_player_collect_c::isCollect(int i_item_type, u8 i_item) const {
return mItem[i_item_type] & (u8)(1 << i_item) ? TRUE : FALSE;
}
void dSv_player_collect_c::onCollectCrystal(u8 i_item) {
@@ -2943,7 +2942,7 @@ void dSv_player_wolf_c::init(void) {
void dSv_light_drop_c::init(void) {
for (int i = 0; i < 4; i++) {
mLightDropCounts[i] = 0;
mLightDropNum[i] = 0;
}
mLightDropGetFlag = 0;
@@ -2955,7 +2954,7 @@ void dSv_light_drop_c::init(void) {
void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 param_2) {
if ((i_nowLevel < LIGHT_DROP_STAGE) || (i_nowLevel > 6)) {
mLightDropCounts[i_nowLevel] = param_2;
mLightDropNum[i_nowLevel] = param_2;
}
}
@@ -2963,7 +2962,7 @@ u8 dSv_light_drop_c::getLightDropNum(u8 i_nowLevel) const {
if ((i_nowLevel >= LIGHT_DROP_STAGE) && (i_nowLevel <= 6)) {
return 0;
}
return mLightDropCounts[i_nowLevel];
return mLightDropNum[i_nowLevel];
}
void dSv_light_drop_c::onLightDropGetFlag(u8 i_nowLevel) {
@@ -3009,7 +3008,7 @@ BOOL dSv_letter_info_c::isLetterReadFlag(int i_no) const {
void dSv_fishing_info_c::init(void) {
for (int i = 0; i < 16; i++) {
mFishCount[i] = 0;
unk32[i] = 0;
mMaxSize[i] = 0;
}
}
@@ -3031,16 +3030,15 @@ void dSv_player_info_c::init(void) {
d_meter2_info::dMeter2Info_c ok;
ok.getString(a, (char*)link_name, c);
ok.getString(b, (char*)epona_name, d);
ok.getString(a, (char*)mPlayerName, c);
ok.getString(b, (char*)mHorseName, d);
unk4 = 0;
unk0 = 0;
unk12 = 0;
unk8 = 0;
mTotalTime = 0;
unk16 = 0;
unk18 = 0;
unk54 = 0;
mDeathCount = 0;
mClearCount = 0;
for (int i = 0; i < 5; i++) {
unk55[i] = 0;
@@ -3073,15 +3071,15 @@ void dSv_player_config_c::init(void) {
lbl_80451368->setOutputMode(SOUND_MODE_STEREO);
}
unk2 = 0;
mVibrationStatus = 1;
mAttentionType = 0;
mVibration = 1;
unk4 = 0;
unk5 = 0;
unk9 = 0;
unk6 = 0x15e;
unk8 = 0;
unk10 = 0;
unk11 = 1;
mShortCut = 0;
mCalibrateDist = 0x15e;
mCalValue = 0;
mCameraControl = 0;
mPointer = 1;
}
#else
#pragma push
@@ -3120,11 +3118,11 @@ void dSv_player_config_c::setSound(u8 i_mSoundMode) {
}
u8 dSv_player_config_c::getVibration(void) {
return mVibrationStatus;
return mVibration;
}
void dSv_player_config_c::setVibration(u8 i_mVibrationStatus) {
mVibrationStatus = i_mVibrationStatus;
mVibration = i_mVibrationStatus;
}
void dSv_player_c::init(void) {
@@ -3149,39 +3147,39 @@ void dSv_player_c::init(void) {
void dSv_memBit_c::init(void) {
for (int i = 0; i < 2; i++) {
area_flags_bitfields1[i] = 0;
mTbox[i] = 0;
}
for (int i = 0; i < 4; i++) {
area_flags_bitfields2[i] = 0;
mSwitch[i] = 0;
}
rupee_flags_bitfields = 0;
small_key_flags = 0;
dungeons_flags = 0;
mItem[0] = 0;
mKeyNum = 0;
mDungeonItem = 0;
}
void dSv_memBit_c::onTbox(int i_no) {
area_flags_bitfields1[i_no >> 5] |= 1 << (i_no & 0x1F);
mTbox[i_no >> 5] |= 1 << (i_no & 0x1F);
}
void dSv_memBit_c::offTbox(int i_no) {
area_flags_bitfields1[i_no >> 5] &= ~(1 << (i_no & 0x1F));
mTbox[i_no >> 5] &= ~(1 << (i_no & 0x1F));
}
BOOL dSv_memBit_c::isTbox(int i_no) const {
return 1 << (i_no & 0x1f) & area_flags_bitfields1[i_no >> 0x5] ? TRUE : FALSE;
return 1 << (i_no & 0x1f) & mTbox[i_no >> 0x5] ? TRUE : FALSE;
}
void dSv_memBit_c::onSwitch(int i_no) {
(area_flags_bitfields1 + (i_no >> 0x5))[0x2] |= 0x1 << (i_no & 0x1F);
mSwitch[i_no >> 5] |= 1 << (i_no & 0x1F);
}
void dSv_memBit_c::offSwitch(int i_no) {
(area_flags_bitfields1 + (i_no >> 0x5))[0x2] &= ~(0x1 << (i_no & 0x1F));
mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F));
}
BOOL dSv_memBit_c::isSwitch(int i_no) const {
return (area_flags_bitfields2[i_no >> 0x5] & 0x1 << (i_no & 0x1F)) ? TRUE : FALSE;
return (mSwitch[i_no >> 0x5] & 0x1 << (i_no & 0x1F)) ? TRUE : FALSE;
}
/* 8003488C-800348C4 02F1CC 0038+00 1/1 0/0 0/0 .text revSwitch__12dSv_memBit_cFi */
@@ -3189,8 +3187,8 @@ BOOL dSv_memBit_c::isSwitch(int i_no) const {
#ifdef NONMATCHING
BOOL dSv_memBit_c::revSwitch(int i_no) {
unsigned int tmp = 1 << (i_no & 0x1F);
(area_flags_bitfields1 + (i_no >> 0x5))[0x2] ^= tmp;
return (area_flags_bitfields1 + (i_no >> 0x5))[0x2] & tmp ? TRUE : FALSE;
(mTbox + (i_no >> 0x5))[0x2] ^= tmp;
return (mTbox + (i_no >> 0x5))[0x2] & tmp ? TRUE : FALSE;
}
#else
#pragma push
@@ -3204,48 +3202,48 @@ asm int dSv_memBit_c::revSwitch(int param_0) {
#endif
void dSv_memBit_c::onItem(int i_no) {
(area_flags_bitfields1 + (i_no >> 0x5))[0x6] |= 0x1 << (i_no & 0x1F);
mItem[i_no >> 5] |= 1 << (i_no & 0x1F);
}
BOOL dSv_memBit_c::isItem(int i_no) const {
return (&rupee_flags_bitfields)[i_no >> 0x5] & 0x1 << (i_no & 0x1F) ? TRUE : FALSE;
return (mItem[i_no >> 0x5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE;
}
void dSv_memBit_c::onDungeonItem(int i_no) {
dungeons_flags |= (u8)(1 << i_no);
mDungeonItem |= (u8)(1 << i_no);
}
bool dSv_memBit_c::isDungeonItem(int i_no) const {
return dungeons_flags & (u8)(1 << i_no) ? true : false;
return mDungeonItem & (u8)(1 << i_no) ? true : false;
}
void dSv_event_c::init(void) {
for (int i = 0; i < MAX_EVENTS; i++) {
events[i] = 0;
mEvent[i] = 0;
}
setInitEventBit__Fv();
}
void dSv_event_c::onEventBit(u16 i_no) {
events[(i_no >> 8)] |= (u8)i_no;
mEvent[(i_no >> 8)] |= (u8)i_no;
}
void dSv_event_c::offEventBit(u16 i_no) {
events[(i_no >> 8)] &= ~(u8)i_no;
mEvent[(i_no >> 8)] &= ~(u8)i_no;
}
BOOL dSv_event_c::isEventBit(u16 i_no) const {
return events[(i_no >> 8)] & (i_no & 0xFF) ? TRUE : FALSE;
return mEvent[(i_no >> 8)] & (i_no & 0xFF) ? TRUE : FALSE;
}
void dSv_event_c::setEventReg(u16 param_1, u8 param_2) {
u8 uVar1 = (param_1 >> 8);
events[uVar1] &= ~(u8)param_1;
events[uVar1] |= param_2;
mEvent[uVar1] &= ~(u8)param_1;
mEvent[uVar1] |= param_2;
}
u8 dSv_event_c::getEventReg(u16 param_1) const {
return (u8)param_1 & events[param_1 >> 8];
return (u8)param_1 & mEvent[param_1 >> 8];
}
void dSv_MiniGame_c::init(void) {
@@ -3254,43 +3252,43 @@ void dSv_MiniGame_c::init(void) {
unk1[i] = 0;
}
unk4 = 120000;
unk8 = 0;
unk12 = 0;
mBalloonScore = 0;
mRaceGameTime = 0;
unk16 = 0;
unk20 = 0;
}
void dSv_memory_c::init(void) {
temp_flags.init();
mMemBit.init();
}
void dSv_memory2_c::init(void) {
for (int i = 0; i < 2; i++) {
unk0[i] = 0;
mVisitedRoom[i] = 0;
}
}
void dSv_memory2_c::onVisitedRoom(int i_no) {
unk0[i_no >> 5] |= 1 << (i_no & 0x1F);
mVisitedRoom[i_no >> 5] |= 1 << (i_no & 0x1F);
}
void dSv_memory2_c::offVisitedRoom(int i_no) {
unk0[i_no >> 5] &= ~(1 << (i_no & 0x1F));
mVisitedRoom[i_no >> 5] &= ~(1 << (i_no & 0x1F));
}
BOOL dSv_memory2_c::isVisitedRoom(int param_1) {
return (1 << (param_1 & 0x1F) & unk0[param_1 >> 5]) ? TRUE : FALSE;
return (1 << (param_1 & 0x1F) & mVisitedRoom[param_1 >> 5]) ? TRUE : FALSE;
}
bool dSv_danBit_c::init(s8 i_stage) {
if (i_stage != mStageNum) {
switch_bitfield[0] = 0;
switch_bitfield[1] = 0;
item_bitfield[0] = 0;
item_bitfield[1] = 0;
item_bitfield[2] = 0;
item_bitfield[3] = 0;
mStageNum = i_stage;
if (i_stage != mStageNo) {
mSwitch[0] = 0;
mSwitch[1] = 0;
mItem[0] = 0;
mItem[1] = 0;
mItem[2] = 0;
mItem[3] = 0;
mStageNo = i_stage;
unk1 = 0;
for (int i = 0; i < 16; i++) {
@@ -3307,62 +3305,62 @@ bool dSv_danBit_c::init(s8 i_stage) {
}
void dSv_danBit_c::onSwitch(int i_no) {
switch_bitfield[i_no >> 5] |= 1 << (i_no & 0x1F);
mSwitch[i_no >> 5] |= 1 << (i_no & 0x1F);
}
void dSv_danBit_c::offSwitch(int i_no) {
switch_bitfield[i_no >> 5] &= ~(1 << (i_no & 0x1F));
mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F));
}
BOOL dSv_danBit_c::isSwitch(int i_no) const {
return switch_bitfield[i_no >> 0x5] & (0x1 << (i_no & 0x1F)) ? TRUE : FALSE;
return mSwitch[i_no >> 0x5] & (0x1 << (i_no & 0x1F)) ? TRUE : FALSE;
}
BOOL dSv_danBit_c::revSwitch(int i_no) {
int uVar1 = 1 << (i_no & 0x1F);
switch_bitfield[i_no >> 5] ^= uVar1;
return switch_bitfield[i_no >> 5] & uVar1 ? TRUE : FALSE;
mSwitch[i_no >> 5] ^= uVar1;
return mSwitch[i_no >> 5] & uVar1 ? TRUE : FALSE;
}
void dSv_danBit_c::onItem(int i_no) {
item_bitfield[i_no >> 5] |= 1 << (i_no & 0x1F);
mItem[i_no >> 5] |= 1 << (i_no & 0x1F);
}
BOOL dSv_danBit_c::isItem(int i_no) const {
return item_bitfield[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE;
return mItem[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE;
}
void dSv_zoneBit_c::init(void) {
for (int i = 0; i < 2; i++) {
switch_bitfield[i] = 0;
mSwitch[i] = 0;
}
for (int i = 0; i < 2; i++) {
item_bitfield[i] = 0;
mItem[i] = 0;
}
room_switch = 0;
room_item = 0;
mRoomSwitch = 0;
mRoomItem = 0;
}
void dSv_zoneBit_c::clearRoomSwitch(void) {
room_switch = 0;
mRoomSwitch = 0;
}
void dSv_zoneBit_c::clearRoomItem(void) {
room_item = 0;
mRoomItem = 0;
}
void dSv_zoneBit_c::onSwitch(int i_no) {
switch_bitfield[i_no >> 4] |= (u16)(1 << (i_no & 0xF));
mSwitch[i_no >> 4] |= (u16)(1 << (i_no & 0xF));
}
void dSv_zoneBit_c::offSwitch(int i_no) {
switch_bitfield[i_no >> 4] &= ~(1 << (i_no & 0xF));
mSwitch[i_no >> 4] &= ~(1 << (i_no & 0xF));
}
BOOL dSv_zoneBit_c::isSwitch(int i_no) const {
return switch_bitfield[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE;
return mSwitch[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE;
}
/* 80034D78-80034DAC 02F6B8 0034+00 1/1 0/0 0/0 .text revSwitch__13dSv_zoneBit_cFi */
@@ -3385,37 +3383,37 @@ asm int dSv_zoneBit_c::revSwitch(int param_0) {
#endif
void dSv_zoneBit_c::onOneSwitch(int i_no) {
room_switch |= (u16)(1 << i_no);
mRoomSwitch |= (u16)(1 << i_no);
}
void dSv_zoneBit_c::offOneSwitch(int i_no) {
room_switch &= ~(1 << i_no);
mRoomSwitch &= ~(1 << i_no);
}
BOOL dSv_zoneBit_c::isOneSwitch(int i_no) const {
return room_switch & 1 << i_no ? TRUE : FALSE;
return mRoomSwitch & 1 << i_no ? TRUE : FALSE;
}
BOOL dSv_zoneBit_c::revOneSwitch(int i_no) {
int iVar1 = 1 << i_no;
room_switch ^= iVar1;
return room_switch & iVar1 ? TRUE : FALSE;
mRoomSwitch ^= iVar1;
return mRoomSwitch & iVar1 ? TRUE : FALSE;
}
void dSv_zoneBit_c::onItem(int i_no) {
item_bitfield[i_no >> 4] |= (u16)(1 << (i_no & 0xF));
mItem[i_no >> 4] |= (u16)(1 << (i_no & 0xF));
}
BOOL dSv_zoneBit_c::isItem(int i_no) const {
return item_bitfield[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE;
return mItem[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE;
}
void dSv_zoneBit_c::onOneItem(int i_no) {
room_item |= (u16)(1 << i_no);
mRoomItem |= (u16)(1 << i_no);
}
BOOL dSv_zoneBit_c::isOneItem(int i_no) const {
return room_item & 1 << i_no ? TRUE : FALSE;
return mRoomItem & 1 << i_no ? TRUE : FALSE;
}
void dSv_zoneActor_c::init(void) {
@@ -3436,49 +3434,49 @@ BOOL dSv_zoneActor_c::is(int i_id) const {
return actor_bitfield[i_id >> 5] & 1 << (i_id & 0x1F) ? TRUE : FALSE;
}
void dSv_zone_c::init(int param_1) {
unk0 = param_1;
zone_bit.init();
zone_actor.init();
void dSv_zone_c::init(int i_roomNo) {
mRoomNo = i_roomNo;
mBit.init();
mActor.init();
}
void dSv_restart_c::setRoom(const cXyz& i_position, s16 i_x_rotation, s8 param_3) {
unk0 = param_3;
mPosition = i_position;
mXRotation = i_x_rotation;
void dSv_restart_c::setRoom(const cXyz& i_position, s16 i_angleY, s8 i_roomNo) {
mRoomNo = i_roomNo;
mRoomPos = i_position;
mRoomAngleY = i_angleY;
}
void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_x_rotation, s8 param_3, u32 param_4) {
void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_angleY, s8 param_3, u32 i_param) {
mPosition = i_position;
mXRotation = i_x_rotation;
mAngleY = i_angleY;
unk18 = param_3;
unk12 = param_4;
mParam = i_param;
}
void dSv_info_c::init(void) {
save_file.init();
memory.init();
dungeon_bit.init(-1);
mSavedata.init();
mMemory.init();
mDan.init(-1);
initZone();
events.init();
mTmp.init();
}
void dSv_save_c::init(void) {
player.init();
for (int i = 0; i < 0x20; i++) {
area_flags[i].init();
mPlayer.init();
for (int i = 0; i < STAGE_MAX; i++) {
mSave[i].init();
}
for (int i = 0; i < 0x40; i++) {
unk_flags[i].init();
for (int i = 0; i < STAGE2_MAX; i++) {
mSave2[i].init();
}
event_flags.init();
minigame_flags.init();
mEvent.init();
mMiniGame.init();
}
dSv_memory2_c* dSv_save_c::getSave2(int i_stage2No) {
return unk_flags + i_stage2No;
return &mSave2[i_stage2No];
}
/* 800350BC-800350F0 02F9FC 0034+00 0/0 1/1 0/0 .text getSave__10dSv_info_cFi */
@@ -3503,14 +3501,14 @@ asm void dSv_info_c::putSave(int param_0) {
void dSv_info_c::initZone(void) {
for (int i = 0; i < 0x20; i++) {
zones[i].init(-1);
mZone[i].init(-1);
}
}
u32 dSv_info_c::createZone(int param_1) {
dSv_zone_c* zone = zones;
dSv_zone_c* zone = mZone;
for (int i = 0; i < 0x20; zone++, i++) {
if (zone->getUnk0() < 0) {
if (zone->getRoomNo() < 0) {
zone->init(param_1);
return i;
}
@@ -3524,15 +3522,15 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) {
}
if (i_no < 0x80) {
memory.getTempFlags().onSwitch(i_no);
mMemory.getMemBit().onSwitch(i_no);
} else if (i_no < 0xc0) {
dungeon_bit.onSwitch(i_no - 0x80);
mDan.onSwitch(i_no - 0x80);
} else {
int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xE0) {
zones[zoneId].getZoneBit().onSwitch(i_no - 0xC0);
mZone[zoneId].getZoneBit().onSwitch(i_no - 0xC0);
} else {
zones[zoneId].getZoneBit().onOneSwitch(i_no - 0xE0);
mZone[zoneId].getZoneBit().onOneSwitch(i_no - 0xE0);
}
}
}
@@ -3543,15 +3541,15 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) {
}
if (i_no < 0x80) {
memory.getTempFlags().offSwitch(i_no);
mMemory.getMemBit().offSwitch(i_no);
} else if (i_no < 0xc0) {
dungeon_bit.offSwitch(i_no - 0x80);
mDan.offSwitch(i_no - 0x80);
} else {
int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xE0) {
zones[zoneId].getZoneBit().offSwitch(i_no - 0xC0);
mZone[zoneId].getZoneBit().offSwitch(i_no - 0xC0);
} else {
zones[zoneId].getZoneBit().offOneSwitch(i_no - 0xE0);
mZone[zoneId].getZoneBit().offOneSwitch(i_no - 0xE0);
}
}
}
@@ -3563,18 +3561,18 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const {
}
if (i_no < 0x80) {
value = memory.getTempFlagsConst().isSwitch(i_no);
value = mMemory.getMemBitConst().isSwitch(i_no);
} else if (i_no < 0xc0) {
value = dungeon_bit.isSwitch(i_no - 0x80);
value = mDan.isSwitch(i_no - 0x80);
} else {
int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo);
if ((zoneId < 0) || (zoneId >= 0x20)) {
value = FALSE;
} else {
if (i_no < 0xE0) {
value = zones[zoneId].getZoneBitConst().isSwitch(i_no - 0xC0);
value = mZone[zoneId].getZoneBitConst().isSwitch(i_no - 0xC0);
} else {
value = zones[zoneId].getZoneBitConst().isOneSwitch(i_no - 0xE0);
value = mZone[zoneId].getZoneBitConst().isOneSwitch(i_no - 0xE0);
}
}
}
@@ -3588,15 +3586,15 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) {
}
if (i_no < 0x80) {
value = memory.getTempFlags().revSwitch(i_no);
value = mMemory.getMemBit().revSwitch(i_no);
} else if (i_no < 0xC0) {
value = dungeon_bit.revSwitch(i_no - 0x80);
value = mDan.revSwitch(i_no - 0x80);
} else {
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xE0) {
value = zones[zoneNo].getZoneBit().revSwitch(i_no - 0xC0);
value = mZone[zoneNo].getZoneBit().revSwitch(i_no - 0xC0);
} else {
value = zones[zoneNo].getZoneBit().revOneSwitch(i_no - 0xE0);
value = mZone[zoneNo].getZoneBit().revOneSwitch(i_no - 0xE0);
}
}
@@ -3609,15 +3607,15 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) {
}
if (i_no < 0x80) {
dungeon_bit.onItem(i_no);
mDan.onItem(i_no);
} else if (i_no < 0xA0) {
memory.getTempFlags().onItem(i_no - 0x80);
mMemory.getMemBit().onItem(i_no - 0x80);
} else {
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xC0) {
zones[zoneNo].getZoneBit().onItem(i_no - 0xA0);
mZone[zoneNo].getZoneBit().onItem(i_no - 0xA0);
} else {
zones[zoneNo].getZoneBit().onOneItem(i_no - 0xC0);
mZone[zoneNo].getZoneBit().onOneItem(i_no - 0xC0);
}
}
}
@@ -3629,15 +3627,15 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const {
}
if (i_no < 0x80) {
value = dungeon_bit.isItem(i_no);
value = mDan.isItem(i_no);
} else if (i_no < 0xA0) {
value = memory.getTempFlagsConst().isItem(i_no - 0x80);
value = mMemory.getMemBitConst().isItem(i_no - 0x80);
} else {
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xC0) {
value = zones[zoneNo].getZoneBitConst().isItem(i_no - 0xA0);
value = mZone[zoneNo].getZoneBitConst().isItem(i_no - 0xA0);
} else {
value = zones[zoneNo].getZoneBitConst().isOneItem(i_no - 0xC0);
value = mZone[zoneNo].getZoneBitConst().isOneItem(i_no - 0xC0);
}
}
@@ -3650,7 +3648,7 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) {
}
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
zones[zoneNo].getZoneActor().on(i_id);
mZone[zoneNo].getZoneActor().on(i_id);
}
void dSv_info_c::offActor(int i_id, int i_roomNo) {
@@ -3659,7 +3657,7 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) {
}
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
zones[zoneNo].getZoneActor().off(i_id);
mZone[zoneNo].getZoneActor().off(i_id);
}
BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const {
@@ -3668,7 +3666,7 @@ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const {
}
int ActorZoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
return zones[ActorZoneNo].getZoneActorConst().is(i_id);
return mZone[ActorZoneNo].getZoneActorConst().is(i_id);
}
/* ############################################################################################## */
src/m_Do/m_Do_ext.cpp
-37
View File
@@ -18,8 +18,6 @@ struct mDoExt_morf_c {
/* 8000FBC0 */ void frameUpdate();
};
struct Vec {};
struct cXyz {
/* 80009184 */ ~cXyz();
/* 800125DC */ cXyz();
@@ -49,10 +47,6 @@ struct mDoExt_btpAnm {
struct J3DAnmCluster {};
struct J3DDeformData {
/* 8032E364 */ void setAnm(J3DAnmCluster*);
};
struct mDoExt_blkAnm {
/* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16);
};
@@ -213,21 +207,10 @@ struct Z2SoundObjAnime {
struct ResFONT {};
struct Quaternion {};
struct JUtility {
struct TColor {};
};
struct JKRHeap {
/* 802CE438 */ void becomeCurrentHeap();
/* 802CE448 */ void destroy();
/* 802CE500 */ void free(void*, JKRHeap*);
/* 802CEB78 */ void setErrorFlag(bool);
static u8 sCurrentHeap[4];
};
struct JUTResFont {
/* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*);
};
@@ -247,19 +230,10 @@ struct JUTCacheFont {
/* 802DD188 */ JUTCacheFont(ResFONT const*, u32, JKRHeap*);
};
struct JKRSolidHeap {
/* 802D0A24 */ void create(u32, JKRHeap*, bool);
/* 802D0BF4 */ void adjustSize();
};
struct JKRFileLoader {
/* 802D4308 */ void removeResource(void*, JKRFileLoader*);
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct JKRAssertHeap {
/* 802D1368 */ void create(JKRHeap*);
};
@@ -727,8 +701,6 @@ extern "C" extern char const* const m_Do_m_Do_ext__stringBase0;
// External References:
//
extern "C" void OSReport_FatalError();
extern "C" void OSReport_Error();
extern "C" void __dt__4cXyzFv();
extern "C" void dComIfG_getStageRes__FPCc();
extern "C" void entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz();
@@ -806,15 +778,6 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
extern "C" void JMAEulerToQuat__FsssP10Quaternion();
extern "C" void JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion();
extern "C" void DCStoreRangeNoSync();
extern "C" void OSDisableInterrupts();
extern "C" void OSRestoreInterrupts();
extern "C" void OSGetCurrentThread();
extern "C" void PSMTXCopy();
extern "C" void PSMTXConcat();
extern "C" void PSMTXQuat();
extern "C" void PSVECAdd();
extern "C" void PSVECScale();
extern "C" void PSVECSquareMag();
extern "C" void GXSetVtxDesc();
extern "C" void GXClearVtxDesc();
extern "C" void GXSetVtxAttrFmt();