mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-03 00:16:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

move d_a_itembase_static / d_a_item_static / Z2StatusMgr (#123)

Browse Source 
* move d_a_itembase_static

* move d_a_item_static

* moved Z2StatusMgr

* clang

* fixes

* clang?

* move d_save

* move d_meter2_info

* some d_meter2_info fixes

* move most d_a_player

* move d_bg_s stuff

* move c_cc_s stuff

* move d_cc stuff

* move d_attention / d_event / d_stage
This commit is contained in:
TakaRikka
2021-05-02 10:13:14 -07:00
committed by GitHub
parent 941be0e47b
commit 894b1d43fe
234 changed files with 5861 additions and 6762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_item_static.cpp
+9 -42
View File
@@ -7,16 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct daItem_c {
/* 80037BE0 */ void startCtrl();
/* 80037BF4 */ void startControl();
/* 80037C04 */ void endControl();
};
//
// Forward References:
//
@@ -25,40 +15,17 @@ extern "C" void startCtrl__8daItem_cFv();
extern "C" void startControl__8daItem_cFv();
extern "C" void endControl__8daItem_cFv();
//
// External References:
//
//
// Declarations:
//
/* 80037BE0-80037BF4 032520 0014+00 0/0 0/0 1/1 .text startCtrl__8daItem_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItem_c::startCtrl() {
nofralloc
#include "asm/d/a/d_a_item_static/startCtrl__8daItem_cFv.s"
u32 daItem_c::startCtrl() {
setFlag(4);
return 1;
}
#pragma pop
/* 80037BF4-80037C04 032534 0010+00 0/0 0/0 1/1 .text startControl__8daItem_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItem_c::startControl() {
nofralloc
#include "asm/d/a/d_a_item_static/startControl__8daItem_cFv.s"
u32 daItem_c::startControl() {
unk2378 = 1;
return 1;
}
#pragma pop
/* 80037C04-80037C14 032544 0010+00 0/0 0/0 1/1 .text endControl__8daItem_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItem_c::endControl() {
nofralloc
#include "asm/d/a/d_a_item_static/endControl__8daItem_cFv.s"
u32 daItem_c::endControl() {
unk2378 = 0;
return 1;
}
#pragma pop
src/d/a/d_a_itembase.cpp
-23
View File
@@ -58,29 +58,6 @@ struct mDoExt_baseAnm {
struct fopAc_ac_c {};
struct daItemBase_c {
/* 80144724 */ void DeleteBase(char const*);
/* 8014474C */ bool clothCreate();
/* 80144754 */ bool __CreateHeap();
/* 8014475C */ void CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16);
/* 80144B94 */ void DrawBase();
/* 80144C30 */ void RotateYBase();
/* 80144C7C */ void setListStart();
/* 80144CA0 */ void setListEnd();
/* 80144CC4 */ void settingBeforeDraw();
/* 80144D18 */ void setTevStr();
/* 80144D70 */ void setShadow();
/* 80144EDC */ void animEntry();
/* 8014503C */ void animPlay(f32, f32, f32, f32, f32, f32);
/* 80145144 */ void chkFlag(int);
/* 80145164 */ void getTevFrm();
/* 80145180 */ void getBtpFrm();
/* 8014519C */ void getShadowSize();
/* 801451B4 */ void getCollisionH();
/* 801451D0 */ void getCollisionR();
/* 8015B0B8 */ void getData();
};
struct dKy_tevstr_c {};
struct cXyz {};
src/d/a/d_a_itembase_static.cpp
+19 -69
View File
@@ -4,6 +4,7 @@
//
#include "d/a/d_a_itembase_static.h"
#include "SSystem/SComponent/c_lib.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -13,19 +14,6 @@
struct fopAc_ac_c {};
struct daItemBase_c {
/* 80037A5C */ void getItemNo();
/* 80037A64 */ void hide();
/* 80037A74 */ void show();
/* 80037A84 */ void changeDraw();
/* 80037ACC */ void chkDraw();
/* 80037AE4 */ void dead();
/* 80037AF4 */ void chkDead();
/* 8014475C */ void CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16);
static u8 const m_data[56];
};
struct dItem_data {
static void* item_resource[1530];
static void* field_item_res[1020];
@@ -58,75 +46,37 @@ extern "C" void* field_item_res__10dItem_data[1020];
// Declarations:
//
/* 80037A5C-80037A64 03239C 0008+00 2/2 2/2 2/2 .text getItemNo__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::getItemNo() {
nofralloc
#include "asm/d/a/d_a_itembase_static/getItemNo__12daItemBase_cFv.s"
u8 daItemBase_c::getItemNo() {
return mItemNo;
}
#pragma pop
/* 80037A64-80037A74 0323A4 0010+00 1/1 5/5 12/12 .text hide__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::hide() {
nofralloc
#include "asm/d/a/d_a_itembase_static/hide__12daItemBase_cFv.s"
void daItemBase_c::hide() {
cLib_offBit(unk2347, 1);
}
#pragma pop
/* 80037A74-80037A84 0323B4 0010+00 1/1 7/7 13/13 .text show__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::show() {
nofralloc
#include "asm/d/a/d_a_itembase_static/show__12daItemBase_cFv.s"
void daItemBase_c::show() {
cLib_onBit(unk2347, 1);
}
#pragma pop
/* 80037A84-80037ACC 0323C4 0048+00 0/0 1/1 0/0 .text changeDraw__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::changeDraw() {
nofralloc
#include "asm/d/a/d_a_itembase_static/changeDraw__12daItemBase_cFv.s"
void daItemBase_c::changeDraw() {
if (chkDraw()) {
hide();
} else {
show();
}
}
#pragma pop
/* 80037ACC-80037AE4 03240C 0018+00 1/1 1/1 9/9 .text chkDraw__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::chkDraw() {
nofralloc
#include "asm/d/a/d_a_itembase_static/chkDraw__12daItemBase_cFv.s"
u8 daItemBase_c::chkDraw() {
return cLib_checkBit(unk2347, 1) != 0;
}
#pragma pop
/* 80037AE4-80037AF4 032424 0010+00 0/0 3/3 0/0 .text dead__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::dead() {
nofralloc
#include "asm/d/a/d_a_itembase_static/dead__12daItemBase_cFv.s"
void daItemBase_c::dead() {
cLib_onBit(unk2347, 2);
}
#pragma pop
/* 80037AF4-80037B0C 032434 0018+00 0/0 0/0 1/1 .text chkDead__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::chkDead() {
nofralloc
#include "asm/d/a/d_a_itembase_static/chkDead__12daItemBase_cFv.s"
u8 daItemBase_c::chkDead() {
return cLib_checkBit(unk2347, 2) != 0;
}
#pragma pop
/* 80037B0C-80037B78 03244C 006C+00 0/0 0/0 1/1 .text CheckItemCreateHeap__FP10fopAc_ac_c
*/
src/d/a/d_a_player.cpp
+71 -135
View File
@@ -17,8 +17,6 @@ struct mDoMtx_stack_c {
static u8 now[48];
};
struct fopAc_ac_c {};
struct ResTIMG {};
struct daPy_sightPacket_c {
@@ -28,80 +26,12 @@ struct daPy_sightPacket_c {
/* 8015F384 */ void setSightImage(ResTIMG*);
};
struct cXyz {};
struct daPy_py_c {
/* 8015EA0C */ void setParamData(int, int, int, int);
/* 8015EA20 */ void checkFishingRodItem(int);
/* 8015EA48 */ void checkBombItem(int);
/* 8015EA88 */ void checkBottleItem(int);
/* 8015EAD8 */ void checkDrinkBottleItem(int);
/* 8015EB40 */ void checkOilBottleItem(int);
/* 8015EB68 */ void checkOpenBottleItem(int);
/* 8015EB90 */ void checkBowItem(int);
/* 8015EBB8 */ void checkHookshotItem(int);
/* 8015EBD8 */ void checkTradeItem(int);
/* 8015EC28 */ void checkDungeonWarpItem(int);
/* 8015F398 */ void checkMasterSwordEquip();
/* 8015F3C4 */ void checkWoodShieldEquip();
/* 8015F3FC */ void getAttentionOffsetY();
/* 8015F424 */ void checkNowWolfEyeUp();
/* 8015F438 */ void forceRestartRoom(int, u32, int);
/* 8015F478 */ void setFmChainPos(fopAc_ac_c*, cXyz*, int);
/* 8015F4B8 */ void cancelFmChainGrab();
/* 8015F4F0 */ void setLookPos(cXyz*);
/* 8015F520 */ void setPlayerSe(u32);
/* 8015F55C */ void linkGrabSubjectNoDraw(fopAc_ac_c*);
/* 8015F60C */ void wolfGrabSubjectNoDraw(fopAc_ac_c*);
/* 8015F660 */ void checkRoomRestartStart();
/* 8015F698 */ void checkCarryStartLightBallA();
/* 8015F730 */ void checkCarryStartLightBallB();
/* 8015F7C8 */ void getSpinnerRideSpeed() const;
/* 8015F814 */ void checkSpinnerReflectEffect();
/* 8015F89C */ void checkBoomerangCharge();
/* 8015F8C8 */ bool checkBoomerangChargeTime();
/* 8015F8D0 */ void getThrowBoomerangActor();
/* 8015F8E4 */ void cancelBoomerangLockActor(fopAc_ac_c*);
/* 8015F914 */ void setPlayerDamage(int, int);
/* 8015F954 */ void setMidnaMotionNum(int);
/* 8015F968 */ void setMidnaFaceNum(int);
static u8 m_midnaActor[4];
};
struct daPy_frameCtrl_c {
/* 8015E4CC */ void checkAnmEnd();
/* 8015E510 */ void updateFrame();
/* 8015E544 */ void setFrameCtrl(u8, s16, s16, f32, f32);
};
struct daPy_boomerangMove_c {
/* 8015E5B0 */ void initOffset(cXyz const*);
/* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16);
/* 8015E87C */ void bgCheckAfterOffset(cXyz const*);
};
struct daPy_anmHeap_c {
struct daAlinkHEAP_TYPE {};
/* 8015ED10 */ daPy_anmHeap_c(u32);
/* 8015ED50 */ ~daPy_anmHeap_c();
/* 8015EDAC */ void initData();
/* 8015EDC4 */ void mallocBuffer();
/* 8015EE00 */ void createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE);
/* 8015EF84 */ void loadData(u16);
/* 8015F068 */ void loadDataIdx(u16);
/* 8015F0D0 */ void loadDataPriIdx(u16);
/* 8015F118 */ void loadDataDemoRID(u16, u16);
/* 8015F168 */ void setAnimeHeap();
};
struct daPy_actorKeep_c {
/* 8015EC48 */ void setActor();
/* 8015ECB8 */ void setData(fopAc_ac_c*);
/* 8015ECFC */ void clearData();
};
struct daAlink_c {
/* 800A0744 */ void setLookPosFromOut(cXyz*);
/* 800BDF60 */ void startRestartRoom(u32, int, int, int);
@@ -129,18 +59,12 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct Vec {};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRSolidHeap {};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
};
struct JKRArchive {
/* 802D5ECC */ void readIdxResource(void*, u32, u32);
};
@@ -153,10 +77,6 @@ struct J3DShape {
static u8 sOldVcdVatCmd[4];
};
struct J3DFrameCtrl {
/* 803289CC */ void update();
};
struct J3DAnmTransform {
/* 80328E40 */ J3DAnmTransform(s16, f32*, s16*, f32*);
};
@@ -276,9 +196,6 @@ extern "C" void __ct__15J3DAnmTransformFsPfPsPf();
extern "C" void __ct__19J3DAnmTextureSRTKeyFv();
extern "C" void __ct__16J3DAnmTexPatternFv();
extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag();
extern "C" void PSMTXCopy();
extern "C" void PSMTXTrans();
extern "C" void PSVECSquareDistance();
extern "C" void GXSetVtxDesc();
extern "C" void GXClearVtxDesc();
extern "C" void GXSetVtxAttrFmt();
@@ -317,32 +234,43 @@ SECTION_SDATA2 static f32 lit_4215[1 + 1 /* padding */] = {
0.0f,
};
/* 8015E4CC-8015E510 158E0C 0044+00 0/0 235/235 6/6 .text checkAnmEnd__16daPy_frameCtrl_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_frameCtrl_c::checkAnmEnd() {
nofralloc
#include "asm/d/a/d_a_player/checkAnmEnd__16daPy_frameCtrl_cFv.s"
bool daPy_frameCtrl_c::checkAnmEnd() {
if (getEndFlg() != 0 && getNowSetFlg() == 0) {
return true;
}
if (getRate() == lit_4215[0]) {
onEndFlg();
onNowSetFlg();
}
return false;
}
#pragma pop
/* 8015E510-8015E544 158E50 0034+00 0/0 1/1 2/2 .text updateFrame__16daPy_frameCtrl_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_frameCtrl_c::updateFrame() {
nofralloc
#include "asm/d/a/d_a_player/updateFrame__16daPy_frameCtrl_cFv.s"
void daPy_frameCtrl_c::updateFrame() {
update();
offNowSetFlg();
}
#pragma pop
/* ############################################################################################## */
/* 80453608-80453610 001C08 0008+00 2/2 0/0 0/0 .sdata2 @4237 */
SECTION_SDATA2 static f64 lit_4237 = 4503601774854144.0 /* cast s32 to float */;
/* 8015E544-8015E5B0 158E84 006C+00 0/0 1/1 6/6 .text setFrameCtrl__16daPy_frameCtrl_cFUcssff */
// compiler generated literal from short to float conversion
#ifdef NONMATCHING
void daPy_frameCtrl_c::setFrameCtrl(u8 pAttribute, s16 pStart, s16 pEnd, f32 pRate, f32 pFrame) {
setAttribute(pAttribute);
setEnd(pEnd);
setRate(pRate);
setStart(pStart);
setFrame(pFrame);
if (pRate >= lit_4215[0]) {
setLoop(pStart);
} else {
setLoop(pEnd);
}
offEndFlg();
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -352,6 +280,7 @@ asm void daPy_frameCtrl_c::setFrameCtrl(u8 param_0, s16 param_1, s16 param_2, f3
#include "asm/d/a/d_a_player/setFrameCtrl__16daPy_frameCtrl_cFUcssff.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 80453610-80453614 001C10 0004+00 1/1 0/0 0/0 .sdata2 @4247 */
@@ -447,6 +376,17 @@ asm void daPy_py_c::setParamData(int param_0, int param_1, int param_2, int para
/* 8015EA20-8015EA48 159360 0028+00 0/0 10/10 3/3 .text checkFishingRodItem__9daPy_py_cFi
*/
#ifdef NONMATCHING
BOOL daPy_py_c::checkFishingRodItem(int i_item_id) {
bool is_fishing_item = false;
if (i_item_id == FISHING_ROD_1 || i_item_id < BEE_ROD || i_item_id <= JEWEL_WORM_ROD) {
is_fishing_item = true;
}
return is_fishing_item;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -455,6 +395,7 @@ asm void daPy_py_c::checkFishingRodItem(int param_0) {
#include "asm/d/a/d_a_player/checkFishingRodItem__9daPy_py_cFi.s"
}
#pragma pop
#endif
/* 8015EA48-8015EA88 159388 0040+00 0/0 3/3 0/0 .text checkBombItem__9daPy_py_cFi */
#pragma push
@@ -541,14 +482,25 @@ asm void daPy_py_c::checkTradeItem(int param_0) {
/* 8015EC28-8015EC48 159568 0020+00 0/0 2/2 0/0 .text checkDungeonWarpItem__9daPy_py_cFi
*/
// regalloc
#ifdef NONMATCHING
BOOL daPy_py_c::checkDungeonWarpItem(int i_item_id) {
bool isDungeonWarpItem = false;
if (i_item_id == DUNGEON_EXIT || i_item_id == DUNGEON_BACK) {
isDungeonWarpItem = true;
}
return isDungeonWarpItem;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::checkDungeonWarpItem(int param_0) {
asm BOOL daPy_py_c::checkDungeonWarpItem(int param_0) {
nofralloc
#include "asm/d/a/d_a_player/checkDungeonWarpItem__9daPy_py_cFi.s"
}
#pragma pop
#endif
/* 8015EC48-8015ECB8 159588 0070+00 0/0 10/10 3/3 .text setActor__16daPy_actorKeep_cFv */
#pragma push
@@ -571,26 +523,15 @@ asm void daPy_actorKeep_c::setData(fopAc_ac_c* param_0) {
}
#pragma pop
/* 8015ECFC-8015ED10 15963C 0014+00 2/2 41/41 12/12 .text clearData__16daPy_actorKeep_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_actorKeep_c::clearData() {
nofralloc
#include "asm/d/a/d_a_player/clearData__16daPy_actorKeep_cFv.s"
void daPy_actorKeep_c::clearData() {
mID = 0xffffffff;
mActor = NULL;
}
#pragma pop
/* 8015ED10-8015ED50 159650 0040+00 0/0 2/2 2/2 .text __ct__14daPy_anmHeap_cFUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daPy_anmHeap_c::daPy_anmHeap_c(u32 param_0) {
nofralloc
#include "asm/d/a/d_a_player/__ct__14daPy_anmHeap_cFUl.s"
daPy_anmHeap_c::daPy_anmHeap_c(u32 pBufferSize) {
initData();
mBufferSize = pBufferSize;
}
#pragma pop
/* 8015ED50-8015EDAC 159690 005C+00 0/0 2/2 2/2 .text __dt__14daPy_anmHeap_cFv */
#pragma push
@@ -602,15 +543,11 @@ asm daPy_anmHeap_c::~daPy_anmHeap_c() {
}
#pragma pop
/* 8015EDAC-8015EDC4 1596EC 0018+00 1/1 0/0 1/1 .text initData__14daPy_anmHeap_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_anmHeap_c::initData() {
nofralloc
#include "asm/d/a/d_a_player/initData__14daPy_anmHeap_cFv.s"
void daPy_anmHeap_c::initData() {
resetIdx();
resetPriIdx();
resetArcNo();
}
#pragma pop
/* 8015EDC4-8015EE00 159704 003C+00 0/0 1/1 1/1 .text mallocBuffer__14daPy_anmHeap_cFv */
#pragma push
@@ -1153,16 +1090,15 @@ asm void daPy_py_c::checkCarryStartLightBallB() {
}
#pragma pop
/* 8015F7C8-8015F814 15A108 004C+00 0/0 0/0 2/2 .text getSpinnerRideSpeed__9daPy_py_cCFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::getSpinnerRideSpeed() const {
nofralloc
#include "asm/d/a/d_a_player/getSpinnerRideSpeed__9daPy_py_cCFv.s"
float daPy_py_c::getSpinnerRideSpeed() const {
float rideSpeed;
if (checkSpinnerRide()) {
rideSpeed = mSpeedF;
} else {
rideSpeed = lit_4215[0];
}
return rideSpeed;
}
#pragma pop
/* 8015F814-8015F89C 15A154 0088+00 0/0 0/0 1/1 .text checkSpinnerReflectEffect__9daPy_py_cFv */
#pragma push
src/d/bg/d_bg_s.cpp
-140
View File
@@ -7,143 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {};
struct dBgW_Base {
struct PushPullLabel {};
/* 80074AB4 */ void SetOldShapeAngleY(s16);
/* 8007E6E0 */ void CalcDiffShapeAngleY(s16);
};
struct dBgW {};
struct dBgS_SplGrpChk {
/* 80078D0C */ void Init();
};
struct dBgS_SphChk {};
struct dBgS_RoofChk {
/* 80079124 */ void Init();
};
struct dBgS_Acch {
/* 80077278 */ void SetNowActorInfo(int, void*, unsigned int);
/* 800772E8 */ void CalcMovePosWork();
/* 8007732C */ void CalcWallRR();
};
struct cBgS_PolyInfo {
/* 802680F8 */ void ChkSetInfo() const;
/* 80268120 */ void ClearPi();
/* 8026816C */ void SetActorInfo(int, void*, unsigned int);
/* 8026817C */ void ChkSafe(void const*, unsigned int) const;
/* 802681AC */ void ChkBgIndex() const;
};
struct csXyz {};
struct cXyz {};
struct dBgS {
/* 80030C50 */ ~dBgS();
/* 800748FC */ void Ct();
/* 8007491C */ void Dt();
/* 8007493C */ void ClrMoveFlag();
/* 800749A8 */ void Move();
/* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*);
/* 80074ABC */ void ChkMoveBG(cBgS_PolyInfo const&);
/* 80074B40 */ void ChkMoveBG_NoDABg(cBgS_PolyInfo const&);
/* 80074B98 */ void GetExitId(cBgS_PolyInfo const&);
/* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&);
/* 80074C6C */ void GetHorseNoEntry(cBgS_PolyInfo const&);
/* 80074CBC */ void GetSpecialCode(cBgS_PolyInfo const&);
/* 80074D0C */ void GetMagnetCode(cBgS_PolyInfo const&);
/* 80074D5C */ void GetMonkeyBarsCode(cBgS_PolyInfo const&);
/* 80074DAC */ void GetUnderwaterRoofCode(cBgS_PolyInfo const&);
/* 80074E00 */ void GetWallCode(cBgS_PolyInfo const&);
/* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&);
/* 80074EA0 */ void GetPolyAtt1(cBgS_PolyInfo const&);
/* 80074EF0 */ void GetGroundCode(cBgS_PolyInfo const&);
/* 80074F40 */ void GetCamMoveBG(cBgS_PolyInfo const&);
/* 80074F90 */ void GetRoomCamId(cBgS_PolyInfo const&);
/* 80074FE0 */ void GetRoomPathId(cBgS_PolyInfo const&);
/* 80075030 */ void GetRoomPathPntNo(cBgS_PolyInfo const&);
/* 80075080 */ void GetGrpSoundId(cBgS_PolyInfo const&);
/* 800750D0 */ void ChkGrpInf(cBgS_PolyInfo const&, u32);
/* 80075100 */ void GetRoomId(cBgS_PolyInfo const&);
/* 8007519C */ void GetPolyAttackThrough(cBgS_PolyInfo const&);
/* 800751F8 */ void ChkPolyHSStick(cBgS_PolyInfo const&);
/* 8007524C */ void WallCorrect(dBgS_Acch*);
/* 80075374 */ void WallCorrectSort(dBgS_Acch*);
/* 8007549C */ void RoofChk(dBgS_RoofChk*);
/* 80075564 */ void SplGrpChk(dBgS_SplGrpChk*);
/* 80075688 */ void SphChk(dBgS_SphChk*, void*);
/* 80075774 */ void MoveBgCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*, bool, bool);
/* 80075880 */ void MoveBgTransPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*);
/* 8007595C */ void MoveBgMatrixCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*);
/* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*);
/* 80075BF4 */ void ArrowStickCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, cXyz&);
/* 80075C6C */ void PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16,
dBgW_Base::PushPullLabel);
};
struct cM3dGPla {};
struct cBgW_BgId {
/* 802681C8 */ void Release();
/* 802681D4 */ void ChkUsed() const;
};
struct cBgW {
/* 8007B17C */ void GetTrans(cXyz*) const;
};
struct cBgS_ShdwDraw {};
struct cBgS_LinChk {
/* 80267F40 */ void PreCalc();
};
struct cBgS_GndChk {
/* 80267D44 */ void PreCheck();
};
struct cBgS_ChkElm {
/* 8002FEF8 */ ~cBgS_ChkElm();
/* 800740F4 */ void Init();
/* 80074110 */ void Regist2(dBgW_Base*, unsigned int, void*);
/* 80074128 */ void Release();
};
struct cBgS_Chk {
/* 80267BDC */ void ChkSameActorPid(unsigned int) const;
};
struct cBgS {
/* 80030CCC */ ~cBgS();
/* 80074144 */ void Regist(dBgW_Base*, unsigned int, void*);
/* 80074250 */ void Release(dBgW_Base*);
/* 800742E4 */ void Ct();
/* 80074338 */ void Dt();
/* 800743B4 */ void LineCross(cBgS_LinChk*);
/* 800744A0 */ void GroundCross(cBgS_GndChk*);
/* 80074578 */ void ConvDzb(void*);
/* 80074618 */ void GetActorPointer(int) const;
/* 80074628 */ void GetBgWBasePointer(cBgS_PolyInfo const&) const;
/* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&);
/* 800746F4 */ void GetGrpRoomId(cBgS_PolyInfo const&) const;
/* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
/* 800747F0 */ void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const;
/* 80074840 */ void ShdwDraw(cBgS_ShdwDraw*);
/* 800748AC */ void GetGrpInf(cBgS_PolyInfo const&) const;
};
//
// Forward References:
//
@@ -247,9 +110,6 @@ extern "C" void ChkUsed__9cBgW_BgIdCFv();
extern "C" void cBgW_CheckBGround__Ff();
extern "C" void cBgW_CheckBRoof__Ff();
extern "C" void cBgW_CheckBWall__Ff();
extern "C" void PSMTXInverse();
extern "C" void PSMTXMultVec();
extern "C" void PSVECAdd();
extern "C" void _savegpr_22();
extern "C" void _savegpr_24();
extern "C" void _savegpr_25();
src/d/bg/d_bg_s_acch.cpp
+1 -150
View File
@@ -7,153 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {};
struct daPy_py_c {
/* 80077494 */ bool checkPlayerFly() const;
};
struct dBgS_WtrChk {
/* 80079164 */ dBgS_WtrChk();
};
struct cXyz {};
struct dBgS_SplGrpChk {
/* 80078B90 */ void Set(cXyz&, f32);
/* 80078C78 */ ~dBgS_SplGrpChk();
};
struct dBgS_RoofChk {
/* 80078FF4 */ dBgS_RoofChk();
/* 80079090 */ ~dBgS_RoofChk();
};
struct dBgS_PolyPassChk {
/* 80078E0C */ void SetPassChkInfo(dBgS_PolyPassChk&);
/* 80078EEC */ void SetUnderwaterRoof();
};
struct dBgS_GndChk {
/* 8007757C */ dBgS_GndChk();
/* 800775F0 */ ~dBgS_GndChk();
};
struct dBgS_Chk {
/* 8007749C */ dBgS_Chk();
/* 800774E8 */ ~dBgS_Chk();
/* 80077560 */ void GetPolyPassChkInfo();
/* 80077564 */ void GetGrpPassChkInfo();
};
struct dBgS_AcchCir {
/* 80075EAC */ dBgS_AcchCir();
/* 80075F14 */ void ClrWallHit();
/* 80075F40 */ void SetWallR(f32);
/* 80075F48 */ void CalcWallRR();
/* 80075F58 */ void SetWall(f32, f32);
/* 80075F80 */ void SetWallHDirect(f32);
/* 80077414 */ ~dBgS_AcchCir();
};
struct csXyz {};
struct Vec {};
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
/* 80268120 */ void ClearPi();
/* 8026816C */ void SetActorInfo(int, void*, unsigned int);
};
struct dBgS_Acch;
struct dBgS {
/* 8007524C */ void WallCorrect(dBgS_Acch*);
/* 80075374 */ void WallCorrectSort(dBgS_Acch*);
/* 8007549C */ void RoofChk(dBgS_RoofChk*);
/* 80075564 */ void SplGrpChk(dBgS_SplGrpChk*);
/* 80075774 */ void MoveBgCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*, bool, bool);
/* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*);
};
struct dBgS_Acch {
/* 80075F94 */ ~dBgS_Acch();
/* 800760A0 */ dBgS_Acch();
/* 800761CC */ void Init();
/* 80076288 */ void Set(fopAc_ac_c*, int, dBgS_AcchCir*);
/* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
/* 800762D8 */ void GroundCheckInit(dBgS&);
/* 80076350 */ void GroundCheck(dBgS&);
/* 8007654C */ void GroundRoofProc(dBgS&);
/* 80076624 */ void LineCheck(dBgS&);
/* 80076AAC */ void CrrPos(dBgS&);
/* 80076F84 */ void GetWallAllR();
/* 80076FC0 */ void SetWallCir();
/* 8007703C */ void CalcWallBmdCyl();
/* 80077114 */ void SetGroundUpY(f32);
/* 80077128 */ void GetWallAllLowH();
/* 80077178 */ void GetWallAllLowH_R();
/* 800771E4 */ void GetSpeedY();
/* 80077200 */ void GetWallAddY(Vec&);
/* 80077278 */ void SetNowActorInfo(int, void*, unsigned int);
/* 80077288 */ void SetWallPolyIndex(int, int);
/* 800772E8 */ void CalcMovePosWork();
/* 8007732C */ void CalcWallRR();
/* 80077388 */ void SetMoveBGOnly();
/* 800773A4 */ void ClrMoveBGOnly();
/* 800773C0 */ void SetGndThinCellingOff();
/* 800773D0 */ void ClrGndThinCellingOff();
/* 800773E0 */ void ChkGndThinCellingOff();
/* 800773EC */ void OnWallSort();
/* 800773FC */ void ChkWallSort();
/* 80077408 */ void ChkLineDown();
};
struct cM3dGPla {
/* 8026F5D4 */ void getCrossYLessD(Vec const&, f32*) const;
};
struct cM3dGLin {
/* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&);
};
struct cM3dGCyl {
/* 8026F180 */ void Set(cXyz const&, f32, f32);
};
struct cM3dGCir {
/* 8026EEB4 */ cM3dGCir();
/* 8026EF18 */ ~cM3dGCir();
/* 8026EF74 */ void Set(f32, f32, f32, f32);
};
struct cBgS_LinChk {
/* 80267D5C */ cBgS_LinChk();
/* 80267DBC */ ~cBgS_LinChk();
/* 80267ED0 */ void Set2(cXyz const*, cXyz const*, unsigned int);
};
struct cBgS_GndChk {
/* 80267D28 */ void SetPos(cXyz const*);
};
struct cBgS_Chk {
/* 80267B4C */ cBgS_Chk();
/* 80267B70 */ ~cBgS_Chk();
/* 80267BB8 */ void SetExtChk(cBgS_Chk&);
};
struct cBgS {
/* 800743B4 */ void LineCross(cBgS_LinChk*);
/* 800744A0 */ void GroundCross(cBgS_GndChk*);
/* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
};
//
// Forward References:
//
@@ -245,8 +98,6 @@ extern "C" void Set__8cM3dGCylFRC4cXyzff();
extern "C" void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz();
extern "C" void getCrossYLessD__8cM3dGPlaCFRC3VecPf();
extern "C" void __dl__FPv();
extern "C" void PSVECAdd();
extern "C" void PSVECSquareDistance();
extern "C" void __register_global_object();
extern "C" void _savegpr_25();
extern "C" void _savegpr_29();
@@ -258,7 +109,7 @@ extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern void* __vt__8cM3dGLin[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 data_80450F68[8];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; //
//
// Declarations:
src/d/bg/d_bg_s_chk.cpp
-21
View File
@@ -7,27 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct dBgS_PolyPassChk {
/* 80078D64 */ dBgS_PolyPassChk();
/* 80078DB0 */ ~dBgS_PolyPassChk();
};
struct dBgS_GrpPassChk {
/* 80077BA0 */ dBgS_GrpPassChk();
/* 80077BC4 */ ~dBgS_GrpPassChk();
};
struct dBgS_Chk {
/* 8007749C */ dBgS_Chk();
/* 800774E8 */ ~dBgS_Chk();
/* 80077560 */ void GetPolyPassChkInfo();
/* 80077564 */ void GetGrpPassChkInfo();
};
//
// Forward References:
//
src/d/bg/d_bg_s_gnd_chk.cpp
-22
View File
@@ -11,11 +11,6 @@
// Types:
//
struct dBgS_PolyPassChk {
/* 80078E68 */ void SetObj();
/* 80078E80 */ void SetCam();
};
struct dBgS_ObjGndChk_Wtr {
/* 80077678 */ dBgS_ObjGndChk_Wtr();
/* 80077710 */ ~dBgS_ObjGndChk_Wtr();
@@ -30,18 +25,6 @@ struct dBgS_ObjGndChk_All {
/* 800778E8 */ ~dBgS_ObjGndChk_All();
};
struct dBgS_GndChk {
/* 8007757C */ dBgS_GndChk();
/* 800775F0 */ ~dBgS_GndChk();
};
struct dBgS_Chk {
/* 8007749C */ dBgS_Chk();
/* 800774E8 */ ~dBgS_Chk();
/* 80077560 */ void GetPolyPassChkInfo();
/* 80077564 */ void GetGrpPassChkInfo();
};
struct dBgS_CamGndChk_Wtr {
/* 80077A00 */ dBgS_CamGndChk_Wtr();
/* 80077A98 */ ~dBgS_CamGndChk_Wtr();
@@ -51,11 +34,6 @@ struct dBgS_CamGndChk {
/* 80077988 */ ~dBgS_CamGndChk();
};
struct cBgS_GndChk {
/* 80267C1C */ cBgS_GndChk();
/* 80267C94 */ ~cBgS_GndChk();
};
//
// Forward References:
//
src/d/bg/d_bg_s_grp_pass_chk.cpp
-13
View File
@@ -7,19 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct dBgS_GrpPassChk {
/* 80077BA0 */ dBgS_GrpPassChk();
/* 80077BC4 */ ~dBgS_GrpPassChk();
};
struct cBgS_GrpPassChk {
/* 80077C20 */ ~cBgS_GrpPassChk();
};
//
// Forward References:
//
src/d/bg/d_bg_s_poly_pass_chk.cpp
+1 -33
View File
@@ -7,38 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct dBgS_PolyPassChk {
/* 80078D64 */ dBgS_PolyPassChk();
/* 80078DB0 */ ~dBgS_PolyPassChk();
/* 80078E0C */ void SetPassChkInfo(dBgS_PolyPassChk&);
/* 80078E68 */ void SetObj();
/* 80078E74 */ void ClrObj();
/* 80078E80 */ void SetCam();
/* 80078E8C */ void ClrCam();
/* 80078E98 */ void SetLink();
/* 80078EA4 */ void ClrLink();
/* 80078EB0 */ void SetArrow();
/* 80078EBC */ void SetBomb();
/* 80078EC8 */ void ClrBomb();
/* 80078ED4 */ void SetBoomerang();
/* 80078EE0 */ void SetRope();
/* 80078EEC */ void SetUnderwaterRoof();
/* 80078EF8 */ void SetHorse();
/* 80078F04 */ void ChkNoHorse();
/* 80078F7C */ void SetStatue();
/* 80078F88 */ void ClrStatue();
/* 80078F94 */ void SetIronBall();
/* 80078FA0 */ void ClrIronBall();
};
struct cBgS_PolyPassChk {
/* 80078FAC */ ~cBgS_PolyPassChk();
};
//
// Forward References:
//
@@ -258,7 +226,7 @@ asm void dBgS_PolyPassChk::SetHorse() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBgS_PolyPassChk::ChkNoHorse() {
asm bool dBgS_PolyPassChk::ChkNoHorse() {
nofralloc
#include "asm/d/bg/d_bg_s_poly_pass_chk/ChkNoHorse__16dBgS_PolyPassChkFv.s"
}
src/d/bg/d_bg_s_roof_chk.cpp
-28
View File
@@ -7,34 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct dBgS_RoofChk {
/* 80078FF4 */ dBgS_RoofChk();
/* 80079090 */ ~dBgS_RoofChk();
/* 80079124 */ void Init();
};
struct dBgS_Chk {
/* 8007749C */ dBgS_Chk();
/* 800774E8 */ ~dBgS_Chk();
/* 80077560 */ void GetPolyPassChkInfo();
/* 80077564 */ void GetGrpPassChkInfo();
};
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
/* 80268120 */ void ClearPi();
};
struct cBgS_Chk {
/* 80267B4C */ cBgS_Chk();
/* 80267B70 */ ~cBgS_Chk();
};
//
// Forward References:
//
src/d/bg/d_bg_s_spl_grp_chk.cpp
-31
View File
@@ -7,37 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct cXyz {};
struct dBgS_SplGrpChk {
/* 80078B90 */ void Set(cXyz&, f32);
/* 80078BB0 */ dBgS_SplGrpChk();
/* 80078C78 */ ~dBgS_SplGrpChk();
/* 80078D0C */ void Init();
};
struct dBgS_Chk {
/* 8007749C */ dBgS_Chk();
/* 800774E8 */ ~dBgS_Chk();
/* 80077560 */ void GetPolyPassChkInfo();
/* 80077564 */ void GetGrpPassChkInfo();
};
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
/* 80268120 */ void ClearPi();
};
struct cBgS_Chk {
/* 80267B4C */ cBgS_Chk();
/* 80267B70 */ ~cBgS_Chk();
};
//
// Forward References:
//
src/d/bg/d_bg_s_wtr_chk.cpp
-12
View File
@@ -7,18 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct dBgS_WtrChk {
/* 80079164 */ dBgS_WtrChk();
};
struct dBgS_SplGrpChk {
/* 80078BB0 */ dBgS_SplGrpChk();
};
//
// Forward References:
//
src/d/bg/d_bg_w.cpp
-229
View File
@@ -11,230 +11,6 @@
// Types:
//
struct fopAc_ac_c {};
struct cXyz {};
struct dBgW_Base {
/* 8007E5A8 */ dBgW_Base();
/* 8007E640 */ ~dBgW_Base();
/* 8007E6D8 */ void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
/* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
};
struct cBgS_PolyInfo {};
struct csXyz {};
struct cBgS_GrpPassChk {};
struct cBgS_PolyPassChk {};
struct dBgS_CaptPoly {};
struct Vec {};
struct dBgS_Acch {
/* 800771E4 */ void GetSpeedY();
/* 80077200 */ void GetWallAddY(Vec&);
/* 80077288 */ void SetWallPolyIndex(int, int);
/* 800772E8 */ void CalcMovePosWork();
};
struct dBgS_SphChk {};
struct dBgS_RoofChk {};
struct cM3dGPla {
/* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
};
struct dBgS_SplGrpChk {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
/* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&);
/* 8007B404 */ void GetHorseNoEntry(cBgS_PolyInfo const&);
/* 8007B430 */ void GetSpecialCode(cBgS_PolyInfo const&);
/* 8007B460 */ void GetSpecialCode(int);
/* 8007B488 */ void GetMagnetCode(cBgS_PolyInfo const&);
/* 8007B4B4 */ void GetMonkeyBarsCode(cBgS_PolyInfo const&);
/* 8007B4E0 */ void GetPolyObjThrough(int);
/* 8007B504 */ void GetPolyCamThrough(int);
/* 8007B52C */ void GetPolyLinkThrough(int);
/* 8007B550 */ void GetPolyArrowThrough(int);
/* 8007B574 */ void GetPolyHSStick(int);
/* 8007B598 */ void GetPolyBoomerangThrough(int);
/* 8007B5BC */ void GetPolyRopeThrough(int);
/* 8007B5E0 */ void GetPolyBombThrough(int);
/* 8007B604 */ void GetShdwThrough(int);
/* 8007B630 */ void GetUnderwaterRoofCode(int);
/* 8007B6AC */ void GetLinkNo(cBgS_PolyInfo const&);
/* 8007B6D8 */ void GetWallCode(cBgS_PolyInfo const&);
/* 8007B704 */ void GetPolyAtt0(cBgS_PolyInfo const&);
/* 8007B734 */ void GetPolyAtt1(cBgS_PolyInfo const&);
/* 8007B760 */ void GetGroundCode(cBgS_PolyInfo const&);
/* 8007B7DC */ void GetIronBallThrough(int);
/* 8007B800 */ void GetAttackThrough(int);
/* 8007B87C */ void GetCamMoveBG(cBgS_PolyInfo const&);
/* 8007B8A8 */ void GetRoomCamId(cBgS_PolyInfo const&);
/* 8007B8D8 */ void GetRoomPathId(cBgS_PolyInfo const&);
/* 8007B904 */ void GetRoomPathPntNo(cBgS_PolyInfo const&);
/* 8007B970 */ dBgW();
/* 8007B9C0 */ void Move();
/* 8007B9EC */ void positionWallCorrect(dBgS_Acch*, f32, cM3dGPla&, cXyz*, f32);
/* 8007BA40 */ void RwgWallCorrect(dBgS_Acch*, u16);
/* 8007C234 */ void WallCorrectRp(dBgS_Acch*, int);
/* 8007C360 */ void WallCorrectGrpRp(dBgS_Acch*, int, int);
/* 8007C484 */ void WallCorrect(dBgS_Acch*);
/* 8007C4AC */ void RwgWallCorrectSort(dBgS_Acch*, u16);
/* 8007C714 */ void WallCorrectRpSort(dBgS_Acch*, int);
/* 8007C808 */ void WallCorrectGrpRpSort(dBgS_Acch*, int, int);
/* 8007C910 */ void WallCorrectSort(dBgS_Acch*);
/* 8007D0DC */ void RwgRoofChk(u16, dBgS_RoofChk*);
/* 8007D208 */ void RoofChkRp(dBgS_RoofChk*, int);
/* 8007D330 */ void RoofChkGrpRp(dBgS_RoofChk*, int, int);
/* 8007D470 */ void RoofChk(dBgS_RoofChk*);
/* 8007D498 */ void RwgSplGrpChk(u16, dBgS_SplGrpChk*);
/* 8007D5C4 */ void SplGrpChkRp(dBgS_SplGrpChk*, int);
/* 8007D6F0 */ void SplGrpChkGrpRp(dBgS_SplGrpChk*, int, int);
/* 8007D830 */ void SplGrpChk(dBgS_SplGrpChk*);
/* 8007D858 */ void RwgCaptPoly(int, dBgS_CaptPoly&);
/* 8007D8E8 */ void CaptPolyRp(dBgS_CaptPoly&, int);
/* 8007DA04 */ void CaptPolyGrpRp(dBgS_CaptPoly&, int, int);
/* 8007DAF8 */ void CaptPoly(dBgS_CaptPoly&);
/* 8007DB20 */ void RwgSphChk(u16, dBgS_SphChk*, void*);
/* 8007DC70 */ void SphChkRp(dBgS_SphChk*, void*, int);
/* 8007DDE0 */ void SphChkGrpRp(dBgS_SphChk*, void*, int, int);
/* 8007DF00 */ void SphChk(dBgS_SphChk*, void*);
/* 8007DF28 */ void GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
/* 8007DF58 */ void GetGrpSoundId(cBgS_PolyInfo const&);
/* 8007DF88 */ void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
/* 8007DFC4 */ void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
/* 8007E000 */ void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
/* 8007E02C */ void ChkPolyThrough(int, cBgS_PolyPassChk*);
/* 8007E360 */ void ChkShdwDrawThrough(int, cBgS_PolyPassChk*);
/* 8007E3D8 */ void ChkGrpThrough(int, cBgS_GrpPassChk*, int);
/* 8007E444 */ void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
/* 8007E474 */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
/* 8007E4A4 */ void OffMoveFlag();
/* 8007E4B4 */ void ChkMoveFlag() const;
/* 8007E548 */ ~dBgW();
};
struct dBgS_PolyPassChk {
/* 80078F04 */ void ChkNoHorse();
};
struct cM3dGTri {
/* 8007A344 */ ~cM3dGTri();
/* 8026F85C */ void setBg(Vec const*, Vec const*, Vec const*, cM3dGPla const*);
};
struct cM3dGSph {};
struct cM3dGLin {
/* 8026F3C0 */ void SetEnd(cXyz const&);
};
struct cM3dGCyl {};
struct cM3dGAab {
/* 8026EC88 */ void CrossY(cXyz const*) const;
/* 8026ECD0 */ void UnderPlaneYUnder(f32) const;
/* 8026ECE4 */ void TopPlaneYUnder(f32) const;
/* 8026ECF8 */ void ClearForMinMax();
/* 8026ED1C */ void SetMinMax(cXyz const&);
/* 8026EDA4 */ void SetMin(cXyz const&);
/* 8026EDE4 */ void SetMax(cXyz const&);
};
struct cM2dGCir {};
struct cBgW_TriElm {
/* 800796F8 */ ~cBgW_TriElm();
/* 80079754 */ cBgW_TriElm();
};
struct cBgW_RwgElm {
/* 800791C4 */ cBgW_RwgElm();
/* 800791D4 */ ~cBgW_RwgElm();
};
struct cBgW_NodeTree {
/* 8007921C */ cBgW_NodeTree();
/* 80079238 */ ~cBgW_NodeTree();
};
struct cBgW_GrpElm {
/* 8007A184 */ ~cBgW_GrpElm();
/* 8007A1E4 */ cBgW_GrpElm();
};
struct cBgS_ShdwDraw {};
struct cBgS_LinChk {};
struct cBgS_GndChk {};
struct cBgD_t {};
struct cBgW {
/* 80079294 */ cBgW();
/* 8007933C */ ~cBgW();
/* 800793A4 */ void FreeArea();
/* 800793C4 */ void GlobalVtx();
/* 80079484 */ void SetVtx();
/* 80079564 */ void CalcPlane();
/* 80079668 */ void SetTri();
/* 80079770 */ void BlckConnect(u16*, int*, int);
/* 800797BC */ void ClassifyPlane();
/* 8007998C */ void MakeBlckTransMinMax(cXyz*, cXyz*);
/* 800799E0 */ void MakeBlckMinMax(int, cXyz*, cXyz*);
/* 80079A68 */ void MakeBlckBnd(int, cXyz*, cXyz*);
/* 80079BDC */ void MakeNodeTreeRp(int);
/* 80079CC4 */ void MakeNodeTreeGrpRp(int);
/* 80079DF0 */ void MakeNodeTree();
/* 80079EEC */ void ChkMemoryError();
/* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]);
/* 8007A200 */ void RwgLineCheck(u16, cBgS_LinChk*);
/* 8007A3A0 */ void LineCheckRp(cBgS_LinChk*, int);
/* 8007A52C */ void LineCheckGrpRp(cBgS_LinChk*, int, int);
/* 8007A658 */ void LineCheck(cBgS_LinChk*);
/* 8007A680 */ void RwgGroundCheckCommon(f32, u16, cBgS_GndChk*);
/* 8007A774 */ void RwgGroundCheckGnd(u16, cBgS_GndChk*);
/* 8007A824 */ void RwgGroundCheckWall(u16, cBgS_GndChk*);
/* 8007A8F4 */ void GroundCrossRp(cBgS_GndChk*, int);
/* 8007AA50 */ void GroundCrossGrpRp(cBgS_GndChk*, int, int);
/* 8007AB9C */ void GroundCross(cBgS_GndChk*);
/* 8007ABC4 */ void CopyOldMtx();
/* 8007AC10 */ void Move();
/* 8007ADF0 */ void RwgShdwDraw(int, cBgS_ShdwDraw*);
/* 8007AEA4 */ void ShdwDrawRp(cBgS_ShdwDraw*, int);
/* 8007AFC0 */ void ShdwDrawGrpRp(cBgS_ShdwDraw*, int);
/* 8007B084 */ void ShdwDraw(cBgS_ShdwDraw*);
/* 8007B0A8 */ bool ChkPolyThrough(int, cBgS_PolyPassChk*);
/* 8007B0B0 */ void ChkShdwDrawThrough(int, cBgS_PolyPassChk*);
/* 8007B0DC */ bool ChkGrpThrough(int, cBgS_GrpPassChk*, int);
/* 8007B0E4 */ void GetGrpRoomIndex(cBgS_PolyInfo const&) const;
/* 8007B164 */ void GetBnd() const;
/* 8007B17C */ void GetTrans(cXyz*) const;
/* 8007B1B4 */ void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const;
/* 8007B240 */ void GetTopUnder(f32*, f32*) const;
/* 8007B270 */ void GetTriPla(cBgS_PolyInfo const&) const;
/* 8007B2B0 */ void GetGrpInf(cBgS_PolyInfo const&) const;
/* 8007B2F4 */ void GetPolyInfId(int) const;
/* 8007B30C */ void GetPolyInf0(int, u32, u32) const;
/* 8007B360 */ void GetMaskPolyInf0_NoShift(int, u32) const;
/* 8007B654 */ void GetPolyInf1(int, u32, u32) const;
/* 8007B78C */ void GetMaskPolyInf1_NoShift(int, u32) const;
/* 8007B824 */ void GetPolyInf2(int, u32, u32) const;
/* 8007B930 */ void GetTriGrp(int) const;
/* 8007B948 */ void ChkNotReady() const;
/* 8007B958 */ void ChkLock() const;
/* 8007B964 */ void ChkMoveBg() const;
};
struct JMath {
static u8 sincosTable_[65536];
};
@@ -420,11 +196,6 @@ extern "C" void setBg__8cM3dGTriFPC3VecPC3VecPC3VecPC8cM3dGPla();
extern "C" void* __nw__FUl();
extern "C" void* __nwa__FUl();
extern "C" void __dl__FPv();
extern "C" void PSMTXIdentity();
extern "C" void PSMTXCopy();
extern "C" void PSMTXMultVec();
extern "C" void PSVECAdd();
extern "C" void PSVECDotProduct();
extern "C" void __construct_new_array();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_22();
src/d/cc/d_cc_d.cpp
-308
View File
@@ -7,313 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {};
struct dCcD_SrcTri {};
struct dCcD_Tri {
/* 80084884 */ void Set(dCcD_SrcTri const&);
/* 800848A4 */ void GetShapeAttr();
/* 80084EF4 */ ~dCcD_Tri();
};
struct dCcD_Stts {
/* 80083850 */ void GetGStts();
/* 80083860 */ void Init(int, int, fopAc_ac_c*);
/* 800838F4 */ void Ct();
/* 80083928 */ void ClrAt();
/* 80083934 */ void ClrTg();
/* 800851AC */ ~dCcD_Stts();
};
struct dCcD_SrcSph {};
struct dCcD_SrcGObjTg {};
struct dCcD_SrcGObjInf {};
struct dCcD_SrcGObjAt {};
struct dCcD_SrcGAtTgCoCommonBase {};
struct dCcD_SrcCyl {};
struct dCcD_SrcCps {};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
static f32 Zero[3];
};
struct dCcD_Sph {
/* 80084A34 */ void Set(dCcD_SrcSph const&);
/* 80084A78 */ void StartCAt(cXyz&);
/* 80084AC4 */ void MoveCAt(cXyz&);
/* 80084B34 */ void GetShapeAttr();
/* 80084BF4 */ ~dCcD_Sph();
};
struct dCcD_GStts {
/* 80083760 */ dCcD_GStts();
/* 800837F8 */ void Ct();
/* 80083830 */ void Move();
/* 8008523C */ ~dCcD_GStts();
};
struct dCcD_GObjTg {
/* 800839A0 */ void Set(dCcD_SrcGObjTg const&);
/* 80083BE8 */ ~dCcD_GObjTg();
};
struct dCcD_GObjInf {
/* 80083A28 */ dCcD_GObjInf();
/* 800840E4 */ ~dCcD_GObjInf();
/* 80084268 */ void GetGObjInf();
/* 8008426C */ void ClrAtHit();
/* 800842C0 */ void ChkAtHit();
/* 80084318 */ void ResetAtHit();
/* 80084358 */ void GetAtHitObj();
/* 800843A8 */ void GetAtHitGObj();
/* 800843DC */ void ChkAtNoGuard();
/* 800843FC */ void ClrTgHit();
/* 80084460 */ void ChkTgHit();
/* 800844B8 */ void ResetTgHit();
/* 800844F8 */ void GetTgHitObj();
/* 80084548 */ void GetTgHitGObj();
/* 8008457C */ void GetTgHitObjSe();
/* 800845B0 */ void getHitSeID(u8, int);
/* 8008460C */ void ClrCoHit();
/* 80084658 */ void ChkCoHit();
/* 800846B0 */ void ResetCoHit();
/* 800846F0 */ void GetCoHitObj();
/* 80084740 */ void Set(dCcD_SrcGObjInf const&);
static u8 const m_hitSeID[96];
};
struct dCcD_GObjCo {
/* 80083B8C */ ~dCcD_GObjCo();
};
struct dCcD_GObjAt {
/* 80083944 */ void Set(dCcD_SrcGObjAt const&);
/* 80083C44 */ ~dCcD_GObjAt();
};
struct dCcD_GAtTgCoCommonBase {
/* 8008364C */ void ClrActorInfo();
/* 80083660 */ void ct();
/* 80083678 */ void SetHitApid(unsigned int);
/* 80083688 */ void GetAc();
/* 80083704 */ void Set(dCcD_SrcGAtTgCoCommonBase const&);
/* 80083718 */ void SetEffCounterTimer();
/* 80083724 */ void SubtractEffCounter();
/* 80083748 */ void ChkEffCounter();
/* 80083CA0 */ ~dCcD_GAtTgCoCommonBase();
};
struct dCcD_Cyl {
/* 800848B4 */ void Set(dCcD_SrcCyl const&);
/* 800848F8 */ void GetShapeAttr();
/* 80084908 */ void StartCAt(cXyz&);
/* 80084954 */ void MoveCAt(cXyz&);
/* 800849C4 */ void MoveCTg(cXyz&);
/* 80084D60 */ ~dCcD_Cyl();
};
struct dCcD_Cps {
/* 800847D0 */ void Set(dCcD_SrcCps const&);
/* 80084814 */ void GetShapeAttr();
/* 80084824 */ void CalcAtVec();
/* 80084854 */ void CalcTgVec();
/* 8008506C */ ~dCcD_Cps();
};
struct cM3dGSphS {};
struct cM3dGSph {
/* 8026F648 */ void SetC(cXyz const&);
/* 8026F6A8 */ void Set(cM3dGSphS const&);
};
struct cM3dGCylS {};
struct cM3dGCyl {
/* 8026F114 */ void Set(cM3dGCylS const&);
/* 8026F1DC */ void SetC(cXyz const&);
};
struct cM3dGCpsS {};
struct cM3dGCps {
/* 8026EFA4 */ ~cM3dGCps();
/* 8026F03C */ void Set(cM3dGCpsS const&);
};
struct cCcD_ShapeAttr {
struct Shape {};
/* 80084E38 */ void GetCoCP() const;
/* 80084E2C */ void GetCoCP();
/* 80263A64 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
static f32 m_virtual_center[3];
};
struct cCcD_TriAttr;
struct cCcD_PntAttr {};
struct cCcD_AabAttr {};
struct cCcD_SphAttr;
struct cCcD_CpsAttr;
struct cCcD_CylAttr {
/* 80084CC0 */ void GetCoCP() const;
/* 80037A4C */ void GetCoCP();
/* 8026420C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084CC8 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 802641C8 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084CD0 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80264250 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084CD8 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 8026417C */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80264288 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80084D10 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80264310 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084D18 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084D20 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084D28 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 802642CC */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80264368 */ void CalcAabBox();
/* 802643D0 */ void GetNVec(cXyz const&, cXyz*) const;
/* 802644B8 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_CpsAttr {
/* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80263FC4 */ void CalcAabBox();
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_SphAttr {
/* 80084B44 */ void GetCoCP() const;
/* 80037A54 */ void GetCoCP();
/* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 802646E0 */ void CalcAabBox();
/* 8026476C */ void GetNVec(cXyz const&, cXyz*) const;
/* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_TriAttr {
/* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80084E4C */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80263BCC */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80263B90 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084E54 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80263B58 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084EBC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80084EA4 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084E8C */ bool CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80084EAC */ bool CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084E94 */ bool CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80084EB4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084E9C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80263C04 */ void CalcAabBox();
/* 80263C9C */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_Stts {
/* 80263894 */ bool GetGStts() const;
/* 802638A4 */ void Init(int, int, void*, unsigned int);
/* 80263904 */ void Ct();
};
struct cCcD_SrcObj {};
struct cCcD_ObjTg {
/* 80083FE4 */ ~cCcD_ObjTg();
/* 802648B0 */ void ClrHit();
};
struct cCcD_ObjHitInf {
/* 80083EC8 */ ~cCcD_ObjHitInf();
};
struct cCcD_ObjCommonBase {
/* 8008409C */ ~cCcD_ObjCommonBase();
/* 802639B0 */ void ct();
};
struct cCcD_ObjCo {
/* 80083F88 */ ~cCcD_ObjCo();
/* 802648E8 */ void ClrHit();
};
struct cCcD_ObjAt {
/* 80084040 */ ~cCcD_ObjAt();
/* 80264868 */ void ClrHit();
};
struct _GXColor {};
struct cCcD_Obj {
/* 80083DE0 */ ~cCcD_Obj();
/* 800851A4 */ bool GetGObjInf() const;
/* 800847C8 */ bool GetGObjInf();
/* 80084BE8 */ bool GetShapeAttr() const;
/* 80085130 */ bool GetShapeAttr();
/* 80084BF0 */ void Draw(_GXColor const&);
/* 80263A10 */ void ct();
/* 80263A1C */ void Set(cCcD_SrcObj const&);
};
struct cCcD_GStts {
/* 800837B0 */ ~cCcD_GStts();
};
struct cCcD_GObjInf {
/* 80083CE8 */ ~cCcD_GObjInf();
/* 800851A0 */ void GetGObjInf();
/* 80084BE4 */ void GetGObjInf() const;
/* 80085138 */ void ClrAtHit();
/* 80085158 */ void ClrTgHit();
/* 8008517C */ void ClrCoHit();
};
//
// Forward References:
//
@@ -508,7 +201,6 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void SetC__8cM3dGSphFRC4cXyz();
extern "C" void Set__8cM3dGSphFRC9cM3dGSphS();
extern "C" void __dl__FPv();
extern "C" void PSVECSubtract();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8cM3dGPla[3];
src/d/cc/d_cc_mass_s.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
// Translation Unit: d/cc/d_cc_mass_s
//
#include "d/cc/d_cc_mass_s.h"
//#include "d/cc/d_cc_mass_s.h"
#include "dol2asm.h"
#include "dolphin/types.h"
src/d/cc/d_cc_s.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
// Translation Unit: d/cc/d_cc_s
//
#include "d/cc/d_cc_s.h"
//#include "d/cc/d_cc_s.h"
#include "dol2asm.h"
#include "dolphin/types.h"
src/d/d_attention.cpp
-172
View File
@@ -11,185 +11,21 @@
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
struct J3DMaterialTable {};
struct J3DAnmTextureSRTKey {};
struct mDoExt_btkAnm {
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTevRegKey {};
struct mDoExt_brkAnm {
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmColor {};
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);
/* 8000D9CC */ void entry(J3DModelData*, f32);
};
struct mDoExt_baseAnm {
/* 8000D428 */ void play();
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct daPy_py_c {
/* 8015F3FC */ void getAttentionOffsetY();
};
struct dSv_danBit_c {
/* 80034BE8 */ void isSwitch(int) const;
};
struct dRes_info_c {};
struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct cSAngle {
/* 80270F68 */ cSAngle(cSAngle const&);
/* 80270F98 */ cSAngle(s16);
/* 802710E8 */ void Inv() const;
/* 80271228 */ void operator-(s16) const;
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dAttention_c {
/* 80070198 */ dAttention_c(fopAc_ac_c*, u32);
/* 80070774 */ ~dAttention_c();
/* 80070844 */ void GetLockonList(s32);
/* 80070880 */ void getActionBtnB();
/* 80070974 */ void getActionBtnXY();
/* 80070A70 */ void chkAttMask(u32, u32);
/* 80070E90 */ void calcWeight(int, fopAc_ac_c*, f32, s16, s16, u32*);
/* 800710C0 */ void setList(int, fopAc_ac_c*, f32, f32, cSAngle, u32);
/* 80071240 */ void initList(u32);
/* 800713CC */ void makeList();
/* 80071424 */ void setOwnerAttentionPos();
/* 80071488 */ void SelectAttention(fopAc_ac_c*);
/* 800716B8 */ void sortList();
/* 800718A4 */ void stockAttention();
/* 80071960 */ void nextAttention();
/* 80071A68 */ void freeAttention();
/* 80071A98 */ void chaseAttention();
/* 80071CC0 */ void EnemyDistance(fopAc_ac_c*);
/* 80071DEC */ void runSoundProc();
/* 80071E84 */ void runDrawProc();
/* 800720F4 */ void runDebugDisp();
/* 800720F8 */ void checkButton();
/* 800722A0 */ void triggerProc();
/* 800722EC */ void lostCheck();
/* 80072344 */ void judgementStatus4Hold();
/* 800725F0 */ void judgementStatus4Switch();
/* 80072924 */ void Run();
/* 80072BD4 */ void Draw();
/* 80072D80 */ void lockSoundStart(u32);
/* 8007353C */ void LockonTarget(s32);
/* 800735DC */ void LockonReleaseDistanse();
/* 800736CC */ void LockonTargetPId(s32);
/* 80073734 */ void ActionTarget(s32);
/* 8007378C */ void CheckObjectTarget(s32);
/* 800737E4 */ void LockonTruth();
/* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
static u8 loc_type_tbl[12];
static u8 act_type_tbl[20];
static u8 dist_table[6552];
static u32 loc_type_num;
static u32 act_type_num;
static u32 chk_type_tbl;
static u32 chk_type_num;
};
struct dAttParam_c {
/* 80070038 */ dAttParam_c(s32);
/* 80070110 */ ~dAttParam_c();
};
struct dAttLook_c {
/* 80073CA4 */ void convPId(unsigned int);
/* 80073CD4 */ void init();
/* 80073CEC */ void proc();
/* 80073D08 */ void request(fopAc_ac_c*, f32, f32, f32, s16, int);
};
struct dAttList_c {
/* 800304D0 */ ~dAttList_c();
/* 8003050C */ dAttList_c();
/* 80073864 */ void getActor();
/* 80073898 */ void setActor(fopAc_ac_c*);
};
struct dAttHint_c {
/* 800738B4 */ void getPId(void*);
/* 800738CC */ void convPId(unsigned int);
/* 800738FC */ void request(fopAc_ac_c*, int);
/* 80073958 */ void init();
/* 80073970 */ void proc();
};
struct dAttDraw_c {
/* 8003054C */ ~dAttDraw_c();
/* 800307F0 */ dAttDraw_c();
/* 80072DD8 */ void setAnm(u8, f32);
/* 80072FE8 */ void setAlphaAnm(u8, u8);
/* 80073004 */ void alphaAnm();
/* 800732B0 */ void draw(cXyz&, f32 (*)[4]);
};
struct J3DTransformInfo {};
struct dAttDraw_CallBack_c {
/* 80070178 */ void execute(u16, J3DTransformInfo*);
};
struct dAttDrawParam_c {
/* 80070158 */ dAttDrawParam_c();
/* 80073FC4 */ ~dAttDrawParam_c();
};
struct dAttCatch_c {
/* 8007398C */ void convPId(unsigned int);
/* 800739BC */ void init();
/* 800739DC */ void proc();
/* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
};
struct cSGlobe {
/* 8007167C */ ~cSGlobe();
/* 80271880 */ cSGlobe(cXyz const&);
};
struct Z2SeqMgr {
/* 802B5E88 */ void bgmNowBattle(f32);
};
@@ -212,8 +48,6 @@ struct J3DTevBlock {
/* 800732AC */ void setTevKColor(u32, J3DGXColor const*);
};
struct J3DModel {};
//
// Forward References:
//
@@ -340,12 +174,6 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void bgmNowBattle__8Z2SeqMgrFf();
extern "C" void __dl__FPv();
extern "C" void DCStoreRangeNoSync();
extern "C" void PSMTXCopy();
extern "C" void PSMTXConcat();
extern "C" void PSMTXInverse();
extern "C" void PSMTXTrans();
extern "C" void PSMTXMultVec();
extern "C" void PSVECSquareMag();
extern "C" void __register_global_object();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
src/d/d_stage.cpp
+89 -415
View File
File diff suppressed because it is too large Load Diff
src/d/event/d_event.cpp
-80
View File
@@ -19,39 +19,14 @@ struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct daPy_py_c {
static u8 m_midnaActor[4];
};
struct daItemBase_c {
/* 80037AE4 */ void dead();
};
struct dVibration_c {
/* 8006FD94 */ void StopQuake(int);
};
struct dSv_info_c {
/* 80035200 */ void onSwitch(int, int);
/* 80035360 */ void isSwitch(int, int) const;
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_c {
/* 800349A4 */ void offEventBit(u16);
};
struct dStage_roomControl_c {
/* 80024384 */ void getStatusRoomDt(int);
static u8 mDemoArcName[10 + 2 /* padding */];
};
struct dRes_info_c {};
struct dRes_control_c {
@@ -64,11 +39,6 @@ struct dMsgObject_c {
/* 80238098 */ void endFlowGroup();
};
struct dEvt_order_c {
/* 80030154 */ ~dEvt_order_c();
/* 800415D4 */ dEvt_order_c();
};
struct dEvt_info_c {
/* 800433F0 */ dEvt_info_c();
/* 80043428 */ void setEventName(char*);
@@ -76,56 +46,6 @@ struct dEvt_info_c {
/* 800434CC */ void beforeProc();
};
struct dEvt_control_c {
/* 80041580 */ dEvt_control_c();
/* 800415D8 */ void orderOld(u16, u16, u16, u16, void*, void*, void const*);
/* 80041668 */ void order(u16, u16, u16, u16, void*, void*, s16, u8);
/* 80041804 */ void setParam(dEvt_order_c*);
/* 80041934 */ void beforeFlagProc(dEvt_order_c*);
/* 80041964 */ void afterFlagProc(dEvt_order_c*);
/* 800419A8 */ void commonCheck(dEvt_order_c*, u16, u16);
/* 80041A20 */ void talkCheck(dEvt_order_c*);
/* 80041B58 */ void talkXyCheck(dEvt_order_c*);
/* 80041C90 */ void catchCheck(dEvt_order_c*);
/* 80041D34 */ void talkEnd();
/* 80041DDC */ void demoCheck(dEvt_order_c*);
/* 80041F18 */ void demoEnd();
/* 80041FA0 */ void potentialCheck(dEvt_order_c*);
/* 80042014 */ void doorCheck(dEvt_order_c*);
/* 8004212C */ void itemCheck(dEvt_order_c*);
/* 800421C0 */ void endProc();
/* 80042254 */ void change();
/* 800422C0 */ void entry();
/* 80042518 */ void reset(void*);
/* 80042468 */ void reset();
/* 800425B4 */ void clearSkipSystem();
/* 8004290C */ void getSkipEventName();
/* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
/* 80042958 */ void setSkipZev(void*, char*);
/* 800429A8 */ void onSkipFade();
/* 800429B4 */ void offSkipFade();
/* 800429D4 */ void skipper();
/* 80042BBC */ void Step();
/* 80042FA8 */ void moveApproval(void*);
/* 8004316C */ void compulsory(void*, char const*, u16);
/* 800431E8 */ void remove();
/* 80043278 */ void getStageEventDt();
/* 80043280 */ void sceneChange(int);
/* 800432C8 */ void getPId(void*);
/* 800432EC */ void convPId(unsigned int);
/* 8004331C */ void getStbDemoData(char*);
/* 80043500 */ void searchMapEventData(u8, s32);
/* 800434D8 */ void searchMapEventData(u8);
/* 8004360C */ void runningEventID(s16);
/* 8004362C */ void setPt1(void*);
/* 8004365C */ void setPt2(void*);
/* 8004368C */ void setPtT(void*);
/* 800436BC */ void setPtI(void*);
/* 800436EC */ void setPtI_Id(unsigned int);
/* 800436F4 */ void setPtD(void*);
/* 80043724 */ void setGtItm(u8);
};
struct dEvent_manager_c {
/* 80046800 */ void setObjectArchive(char*);
/* 80046DAC */ void endProc(s16, int);
src/d/event/d_event_data.cpp
-54
View File
@@ -20,10 +20,6 @@ struct mDoGph_gInf_c {
static f32 mFadeRate;
};
struct fopAc_ac_c {};
struct cXyz {};
struct dVibration_c {
/* 8006FA24 */ void StartShock(int, int, cXyz);
/* 8006FB10 */ void StartQuake(int, int, cXyz);
@@ -39,16 +35,6 @@ 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 dMsgObject_c {
/* 8023806C */ void demoMessageGroup();
};
@@ -75,46 +61,10 @@ struct dEvent_manager_c {
/* 8004817C */ void cutEnd(int);
};
struct dEvDtStaff_c {
/* 80043FD8 */ void specialProc_WaitStart(int);
/* 8004403C */ void specialProc_WaitProc(int);
/* 80044080 */ void specialProc();
/* 80044134 */ void init();
/* 80044170 */ void advanceCut(int);
/* 80044190 */ void specialProcLight();
/* 80044324 */ void specialProcMessage();
/* 80044A58 */ void specialProcSound();
/* 80044CB8 */ void specialProcCreate();
/* 80044EE4 */ void specialProcDirector();
/* 80045878 */ void specialProcPackage();
/* 80045AFC */ void specialProcTimekeeper();
/* 80045C34 */ void specialProcEffect();
};
struct dEvDtFlag_c {
/* 80043D60 */ void flagCheck(int);
/* 80043DC8 */ void flagSet(int);
/* 80043E30 */ void flagMaxCheck(int);
/* 80043E58 */ void init();
};
struct dEvDtEvent_c {
/* 80043E78 */ void finishCheck();
/* 80043EFC */ void forceFinish();
/* 80043F70 */ void specialStaffProc(dEvDtStaff_c*);
};
struct dEvDtCut_c {
/* 800460A8 */ void startCheck();
};
struct dEvDtBase_c {
/* 80046138 */ void init();
/* 8004616C */ void init(char*, int);
/* 8004628C */ void advanceCut(dEvDtEvent_c*);
/* 800462FC */ void advanceCutLocal(dEvDtStaff_c*);
};
struct dDlst_list_c {
/* 800568D8 */ void wipeIn(f32);
@@ -134,8 +84,6 @@ struct dCamera_c {
/* 80181170 */ void StartBlure(int, fopAc_ac_c*, f32, f32);
};
struct csXyz {};
struct Z2SeqMgr {
/* 802AF408 */ void bgmStop(u32, s32);
/* 802AFE18 */ void bgmStreamPlay();
@@ -143,8 +91,6 @@ struct Z2SeqMgr {
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
src/d/event/d_event_manager.cpp
-95
View File
@@ -11,18 +11,6 @@
// Types:
//
struct fopAc_ac_c {};
struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dStage_roomControl_c {
/* 80024384 */ void getStatusRoomDt(int);
static u8 mDemoArcName[10 + 2 /* padding */];
};
struct dRes_info_c {};
struct dRes_control_c {
@@ -43,88 +31,6 @@ struct dEvt_control_c {
/* 800436F4 */ void setPtD(void*);
};
struct dEvDtStaff_c {
/* 80044134 */ void init();
};
struct dEvDtEvent_c {
/* 80043E78 */ void finishCheck();
/* 80043F70 */ void specialStaffProc(dEvDtStaff_c*);
};
struct dEvDtData_c {};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dEvent_manager_c {
/* 800465E8 */ void getSubstance(dEvDtData_c*, int);
/* 80046688 */ dEvent_manager_c();
/* 80046710 */ void create();
/* 80046800 */ void setObjectArchive(char*);
/* 80046888 */ void demoInit();
/* 80046904 */ void roomInit(int);
/* 800469EC */ void roomFinish(int);
/* 80046A58 */ void orderStartDemo();
/* 80046C0C */ void remove();
/* 80046CB8 */ void startProc(dEvDtEvent_c*);
/* 80046DA0 */ void closeProc(dEvDtEvent_c*);
/* 80046DAC */ void endProc(s16, int);
/* 80046E64 */ void Sequencer();
/* 800473FC */ void Experts();
/* 800474BC */ void getEventData(s16);
/* 80047454 */ void getEventData(s16, int);
/* 80047514 */ void getEventIdx(char const*, u8, s32);
/* 80047698 */ void getEventIdx(fopAc_ac_c*, u8);
/* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8);
/* 80047930 */ void isMapToolCamera(u8, s32);
/* 80047984 */ void order(s16);
/* 800479F8 */ void startCheck(s16);
/* 80047A38 */ void startCheckOld(char const*);
/* 80047A78 */ void endCheck(s16);
/* 80047ADC */ void endCheckOld(char const*);
/* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int);
/* 80047D4C */ void getIsAddvance(int);
/* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int);
/* 80047F5C */ void getMyNowCutName(int);
/* 80047FC8 */ void getMyDataP(int, char const*, int);
/* 800480EC */ void getMySubstanceP(int, char const*, int);
/* 80048144 */ void getMySubstanceNum(int, char const*);
/* 8004817C */ void cutEnd(int);
/* 800481F4 */ void getEventPrio(fopAc_ac_c*, s16);
/* 800482CC */ void issueStaff(char const*);
/* 80048348 */ void cancelStaff(char const*);
/* 800483C4 */ void setGoal(cXyz*);
/* 800483E0 */ void getGoal();
/* 800483E8 */ void getRunEventName();
/* 80048520 */ void specialCast_Shutter(s16, int);
/* 80048618 */ void specialCast(char const*, int);
/* 800487F0 */ void ChkPresentEnd();
/* 8004882C */ void checkStartDemo();
};
struct dEvent_exception_c {
/* 800463DC */ void init();
/* 800463F0 */ void setStartDemo(int);
/* 80046480 */ void getEventName();
};
struct dEvDtFlag_c {
/* 80043DC8 */ void flagSet(int);
/* 80043E58 */ void init();
};
struct dEvDtBase_c {
/* 80030190 */ ~dEvDtBase_c();
/* 8004616C */ void init(char*, int);
/* 80046138 */ void init();
/* 8004628C */ void advanceCut(dEvDtEvent_c*);
/* 800466E0 */ dEvDtBase_c();
};
struct dCamera_c {
/* 80180A40 */ void EventRecoverNotime();
/* 80181E98 */ void Center();
@@ -250,7 +156,6 @@ extern "C" void Center__9dCamera_cFv();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void setDemoName__11Z2StatusMgrFPc();
extern "C" void PSVECSquareMag();
extern "C" void __construct_array();
extern "C" void _savegpr_20();
extern "C" void _savegpr_22();
src/d/meter/d_meter2_info.cpp
+253 -323
View File
@@ -4,139 +4,10 @@
//
#include "d/meter/d_meter2_info.h"
#include "d/save/d_save.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {};
struct dSv_player_status_a_c {
/* 80032A5C */ void getSelectItemIndex(int) const;
};
struct dSv_player_item_record_c {
/* 80033F6C */ void setBombNum(u8, u8);
/* 80033F7C */ void getBombNum(u8) const;
};
struct dSv_player_item_c {
/* 80032FB8 */ void setItem(int, u8);
/* 80033030 */ void getItem(int, bool) const;
};
struct dSv_player_get_item_c {
/* 80033E94 */ void offFirstBit(u8);
};
struct dSv_light_drop_c {
/* 8003439C */ void isLightDropGetFlag(u8) const;
};
struct dSv_letter_info_c {
/* 80034428 */ void onLetterGetFlag(int);
/* 8003444C */ void isLetterGetFlag(int) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct dMsgObject_c {
/* 802384C4 */ void setLetterNameID(u16);
};
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);
/* 8024A538 */ void getMsgNo();
};
struct dMeterMap_c {
/* 8020D900 */ void isMapOpenCheck();
};
struct J2DPicture {};
struct JMSMesgEntry_c {};
struct J2DTextBox {
/* 8021C7F4 */ void getFont() const;
};
struct JUTFont {};
struct cXyz {};
struct dMeter2Info_c {
/* 8021BDDC */ dMeter2Info_c();
/* 8021BE20 */ ~dMeter2Info_c();
/* 8021BE68 */ void init();
/* 8021C0E0 */ void setFloatingMessage(u16, s16, bool);
/* 8021C11C */ void setFloatingFlow(u16, s16, bool);
/* 8021C1DC */ void isFloatingMessageVisible();
/* 8021C1F0 */ void decFloatingMessageTimer();
/* 8021C218 */ void resetFloatingMessage();
/* 8021C238 */ void decMsgKeyWaitTimer();
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C370 */ void getStringKana(u32, char*, JMSMesgEntry_c*);
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
/* 8021C6A4 */ void getStringLength(J2DTextBox*, char*);
/* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*);
/* 8021C934 */ void onDirectUseItem(int);
/* 8021C950 */ void isDirectUseItem(int);
/* 8021C970 */ void setMeterString(s32);
/* 8021C9DC */ void resetWarpStatus();
/* 8021CA04 */ void warpInProc();
/* 8021CA70 */ void warpOutProc();
/* 8021CC00 */ void resetMeterString();
/* 8021CC0C */ void setWarpInfo(char const*, cXyz const&, s16, u8, u8, u8);
/* 8021CC80 */ void getItemType(u8);
/* 8021CF08 */ void readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*,
J2DPicture*, void*, J2DPicture*, int);
/* 8021D36C */ void setItemColor(u8, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*);
/* 8021D44C */ void get2ndTexture(u8);
/* 8021D4B8 */ void get3rdTexture(u8);
/* 8021D4FC */ void get4thTexture(u8);
/* 8021D524 */ void set1stColor(u8, J2DPicture*);
/* 8021D644 */ void set2ndColor(u8, J2DPicture*);
/* 8021D764 */ void set3rdColor(u8, J2DPicture*);
/* 8021DB64 */ void set4thColor(u8, J2DPicture*);
/* 8021DCC4 */ void setHotSpringTimer(u8);
/* 8021DCE0 */ void decHotSpringTimer();
/* 8021DD5C */ void changeWater(u8);
/* 8021DE18 */ void setMiniGameItem(u8);
/* 8021E0C4 */ void resetMiniGameItem(bool);
/* 8021E268 */ void setMiniGameCount(s8);
/* 8021E290 */ void setSaveStageName(char const*);
};
struct dMenu_Letter {
static u8 letter_data[512];
};
struct dItem_data {
static void* item_resource[1530];
};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct ResTIMG {};
struct JKRArchive {
/* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
/* 802D5ECC */ void readIdxResource(void*, u32, u32);
};
#include "msl_c/string.h"
//
// Forward References:
@@ -208,7 +79,6 @@ extern "C" u8 letter_data__12dMenu_Letter[512];
// External References:
//
SECTION_INIT void memcpy();
extern "C" void dComIfGs_setSelectItemIndex__FiUc();
extern "C" void dComIfGs_setMixItemIndex__FiUc();
extern "C" void dComIfGs_getMixItemIndex__Fi();
@@ -253,8 +123,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 strcpy();
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" void* item_resource__10dItem_data[1530];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
@@ -335,17 +203,17 @@ SECTION_DATA static void* lit_4572[37] = {
};
/* 803BF7F4-803BF81C -00001 0028+00 1/1 0/0 0/0 .data tex_name$5183 */
SECTION_DATA static void* tex_name_5183[10] = {
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x1A),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x43),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x6C),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x95),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0xBE),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0xE7),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x110),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x139),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x162),
(void*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x18B),
SECTION_DATA static char* tex_name_5183[10] = {
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x1A),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x43),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x6C),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x95),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0xBE),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0xE7),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x110),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x139),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x162),
(char*)(((char*)&d_meter_d_meter2_info__stringBase0) + 0x18B),
};
/* 803BF81C-803BFA1C 01C93C 0200+00 3/3 6/6 0/0 .data letter_data__12dMenu_Letter */
@@ -392,14 +260,10 @@ SECTION_DATA extern void* __vt__13dMeter2Info_c[3] = {
};
/* 8021BDDC-8021BE20 21671C 0044+00 1/1 0/0 0/0 .text __ct__13dMeter2Info_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMeter2Info_c::dMeter2Info_c() {
nofralloc
#include "asm/d/meter/d_meter2_info/__ct__13dMeter2Info_cFv.s"
dMeter2Info_c::dMeter2Info_c() {
init();
mTempBits = 0;
}
#pragma pop
/* 8021BE20-8021BE68 216760 0048+00 2/1 0/0 0/0 .text __dt__13dMeter2Info_cFv */
#pragma push
@@ -477,7 +341,7 @@ asm void dMeter2Info_c::setFloatingFlow(u16 param_0, s16 param_1, bool param_2)
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::isFloatingMessageVisible() {
asm int dMeter2Info_c::isFloatingMessageVisible() {
nofralloc
#include "asm/d/meter/d_meter2_info/isFloatingMessageVisible__13dMeter2Info_cFv.s"
}
@@ -485,34 +349,31 @@ asm void dMeter2Info_c::isFloatingMessageVisible() {
/* 8021C1F0-8021C218 216B30 0028+00 0/0 1/1 0/0 .text decFloatingMessageTimer__13dMeter2Info_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::decFloatingMessageTimer() {
nofralloc
#include "asm/d/meter/d_meter2_info/decFloatingMessageTimer__13dMeter2Info_cFv.s"
int dMeter2Info_c::decFloatingMessageTimer() {
if (mFloatingMessageTimer > 0) {
mFloatingMessageTimer--;
} else {
mFloatingMessageTimer = 0;
}
return mFloatingMessageTimer;
}
#pragma pop
/* 8021C218-8021C238 216B58 0020+00 0/0 3/3 0/0 .text resetFloatingMessage__13dMeter2Info_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::resetFloatingMessage() {
nofralloc
#include "asm/d/meter/d_meter2_info/resetFloatingMessage__13dMeter2Info_cFv.s"
void dMeter2Info_c::resetFloatingMessage() {
mFloatingFlowID = -1;
mFloatingMessageID = -1;
mFloatingMessageTimer = 0;
mFloatingMessageWakuVisible = 0;
}
#pragma pop
/* 8021C238-8021C250 216B78 0018+00 0/0 2/2 0/0 .text decMsgKeyWaitTimer__13dMeter2Info_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::decMsgKeyWaitTimer() {
nofralloc
#include "asm/d/meter/d_meter2_info/decMsgKeyWaitTimer__13dMeter2Info_cFv.s"
void dMeter2Info_c::decMsgKeyWaitTimer() {
if (mMsgKeyWaitTimer <= 0) {
return;
}
mMsgKeyWaitTimer--;
}
#pragma pop
/* 8021C250-8021C370 216B90 0120+00 0/0 16/16 0/0 .text
* getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c */
@@ -556,7 +417,7 @@ SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::getStringLength(J2DTextBox* param_0, char* param_1) {
asm double dMeter2Info_c::getStringLength(J2DTextBox* param_0, char* param_1) {
nofralloc
#include "asm/d/meter/d_meter2_info/getStringLength__13dMeter2Info_cFP10J2DTextBoxPc.s"
}
@@ -577,7 +438,8 @@ asm void J2DTextBox::getFont() const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::getStringLength(JUTFont* param_0, f32 param_1, f32 param_2, char* param_3) {
asm dMeter2Info_c* dMeter2Info_c::getStringLength(JUTFont* param_0, f32 param_1, f32 param_2,
char* param_3) {
nofralloc
#include "asm/d/meter/d_meter2_info/getStringLength__13dMeter2Info_cFP7JUTFontffPc.s"
}
@@ -585,40 +447,25 @@ asm void dMeter2Info_c::getStringLength(JUTFont* param_0, f32 param_1, f32 param
/* 8021C934-8021C950 217274 001C+00 0/0 2/2 0/0 .text onDirectUseItem__13dMeter2Info_cFi
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::onDirectUseItem(int param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/onDirectUseItem__13dMeter2Info_cFi.s"
void dMeter2Info_c::onDirectUseItem(int param_0) {
mDirectUseItem |= (u8)(1 << param_0);
}
#pragma pop
/* 8021C950-8021C970 217290 0020+00 0/0 4/4 0/0 .text isDirectUseItem__13dMeter2Info_cFi
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::isDirectUseItem(int param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/isDirectUseItem__13dMeter2Info_cFi.s"
bool dMeter2Info_c::isDirectUseItem(int param_0) {
return (mDirectUseItem & (u8)(1 << param_0)) != 0;
}
#pragma pop
/* ############################################################################################## */
/* 80430178-80430188 05CE98 000C+04 1/1 0/0 0/0 .bss @3846 */
static u8 lit_3846[12 + 4 /* padding */];
/* 80430188-80430280 05CEA8 00F8+00 4/4 267/267 70/70 .bss g_meter2_info */
extern u8 g_meter2_info[248];
u8 g_meter2_info[248];
dMeter2Info_c g_meter2_info;
/* 8021C970-8021C9DC 2172B0 006C+00 0/0 0/0 5/5 .text setMeterString__13dMeter2Info_cFl
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::setMeterString(s32 param_0) {
asm int dMeter2Info_c::setMeterString(s32 param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/setMeterString__13dMeter2Info_cFl.s"
}
@@ -657,32 +504,27 @@ asm void dMeter2Info_c::warpOutProc() {
/* 8021CC00-8021CC0C 217540 000C+00 0/0 1/1 1/1 .text resetMeterString__13dMeter2Info_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::resetMeterString() {
nofralloc
#include "asm/d/meter/d_meter2_info/resetMeterString__13dMeter2Info_cFv.s"
void dMeter2Info_c::resetMeterString() {
mMeterString = 0;
}
#pragma pop
/* 8021CC0C-8021CC80 21754C 0074+00 1/1 1/1 0/0 .text
* setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::setWarpInfo(char const* param_0, cXyz const& param_1, s16 param_2,
u8 param_3, u8 param_4, u8 param_5) {
nofralloc
#include "asm/d/meter/d_meter2_info/setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc.s"
void dMeter2Info_c::setWarpInfo(const char* i_stageName, const cXyz& i_position, s16 i_angle,
u8 i_roomNo, u8 p5, u8 i_warpPlayerNo) {
strcpy(mWarpInfo.mStageName, i_stageName);
mWarpInfo.mPosition = i_position;
mWarpInfo.mAngle = i_angle;
mWarpInfo.mRoomNo = i_roomNo;
mWarpInfo.unk79 = p5;
mWarpInfo.mWarpPlayerNo = i_warpPlayerNo;
}
#pragma pop
/* 8021CC80-8021CF08 2175C0 0288+00 2/2 0/0 0/0 .text getItemType__13dMeter2Info_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::getItemType(u8 param_0) {
asm u8 dMeter2Info_c::getItemType(u8 param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/getItemType__13dMeter2Info_cFUc.s"
}
@@ -694,10 +536,9 @@ asm void dMeter2Info_c::getItemType(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::readItemTexture(u8 param_0, void* param_1, J2DPicture* param_2,
void* param_3, J2DPicture* param_4, void* param_5,
J2DPicture* param_6, void* param_7, J2DPicture* param_8,
int param_9) {
asm u8 dMeter2Info_c::readItemTexture(u8 param_0, void* param_1, J2DPicture* param_2, void* param_3,
J2DPicture* param_4, void* param_5, J2DPicture* param_6,
void* param_7, J2DPicture* param_8, int param_9) {
nofralloc
#include "asm/d/meter/d_meter2_info/func_8021CF08.s"
}
@@ -717,67 +558,179 @@ asm void dMeter2Info_c::setItemColor(u8 param_0, J2DPicture* param_1, J2DPicture
/* 8021D44C-8021D4B8 217D8C 006C+00 2/1 0/0 0/0 .text get2ndTexture__13dMeter2Info_cFUc
*/
// switch label weirdness
#ifdef NONMATCHING
s8 dMeter2Info_c::get2ndTexture(u8 param_0) {
switch (param_0) {
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
return 0x2e;
case 8:
case 9:
case 10:
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:
case 17:
case 18:
case 19:
case 20:
case 21:
case 22:
case 23:
case 24:
case 25:
case 26:
case 31:
return 0xe;
case 27:
return 0x14;
case 28:
return 0x27;
case 29:
return 0xf;
case 30:
return 0x10;
case 33:
case 34:
case 35:
return 0x69;
case 36:
return 0x2a;
case 32:
default:
return -1;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::get2ndTexture(u8 param_0) {
asm s8 dMeter2Info_c::get2ndTexture(u8 param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/get2ndTexture__13dMeter2Info_cFUc.s"
}
#pragma pop
#endif
/* 8021D4B8-8021D4FC 217DF8 0044+00 1/1 0/0 0/0 .text get3rdTexture__13dMeter2Info_cFUc
*/
// one instruction off
#ifdef NONMATCHING
s8 dMeter2Info_c::get3rdTexture(u8 p1) {
switch (p1) {
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
return 0x2e;
case 8:
case 9:
case 10:
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:
case 17:
case 18:
case 19:
case 20:
case 21:
case 22:
case 23:
case 24:
case 25:
case 26:
case 31:
return 0x0e;
default:
return -1;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::get3rdTexture(u8 param_0) {
asm s8 dMeter2Info_c::get3rdTexture(u8 param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/get3rdTexture__13dMeter2Info_cFUc.s"
}
#pragma pop
#endif
/* 8021D4FC-8021D524 217E3C 0028+00 1/1 0/0 0/0 .text get4thTexture__13dMeter2Info_cFUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::get4thTexture(u8 param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/get4thTexture__13dMeter2Info_cFUc.s"
s8 dMeter2Info_c::get4thTexture(u8 p1) {
switch (p1) {
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
return 0x2e;
default:
return -1;
}
}
#pragma pop
struct TColor {
u8 r;
u8 g;
u8 b;
u8 a;
};
/* ############################################################################################## */
/* 80398A78-80398B0C 0250D8 0094+00 2/2 0/0 0/0 .rodata black_color$4634 */
SECTION_RODATA static u8 const black_color_4634[148] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0xA0, 0x60, 0x00,
0x00, 0xA0, 0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x40, 0x40,
0x40, 0x00, 0x6E, 0x6E, 0x64, 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00,
0x00, 0x7F, 0x00, 0xAF, 0x9B, 0x6E, 0x00, 0xAA, 0x9B, 0x6E, 0x00, 0x55, 0x37, 0x14, 0x00,
0x6E, 0x6E, 0x6E, 0x00, 0x6E, 0x6E, 0x6E, 0x00, 0xFF, 0x58, 0x00, 0x00, 0x6C, 0x3E, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x7F,
0x00, 0x00, 0x55, 0x37, 0x14, 0x00, 0x00, 0x00, 0x22, 0x00, 0x2B, 0x18, 0x22, 0x00, 0x00,
0x00, 0x00, 0x00, 0x46, 0x46, 0x41, 0x00, 0x46, 0x46, 0x41, 0x00, 0x46, 0x46, 0x41, 0x00,
0x46, 0x46, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
SECTION_RODATA static TColor const black_color_4634[37] = {
{0x00, 0x00, 0x00, 0x00}, {0x00, 0x60, 0x00, 0x00}, {0x00, 0x00, 0xC0, 0x00},
{0xA0, 0x60, 0x00, 0x00}, {0xA0, 0x00, 0x00, 0x00}, {0x40, 0x00, 0x60, 0x00},
{0xE0, 0x00, 0x00, 0x00}, {0x40, 0x40, 0x40, 0x00}, {0x6E, 0x6E, 0x64, 0x00},
{0x32, 0x00, 0x00, 0x00}, {0x00, 0x7F, 0x00, 0x00}, {0x00, 0x00, 0x7F, 0x00},
{0xAF, 0x9B, 0x6E, 0x00}, {0xAA, 0x9B, 0x6E, 0x00}, {0x55, 0x37, 0x14, 0x00},
{0x6E, 0x6E, 0x6E, 0x00}, {0x6E, 0x6E, 0x6E, 0x00}, {0xFF, 0x58, 0x00, 0x00},
{0x6C, 0x3E, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00}, {0x32, 0x00, 0x00, 0x00},
{0x00, 0x00, 0x7F, 0x00}, {0x00, 0x7F, 0x00, 0x00}, {0x55, 0x37, 0x14, 0x00},
{0x00, 0x00, 0x22, 0x00}, {0x2B, 0x18, 0x22, 0x00}, {0x00, 0x00, 0x00, 0x00},
{0x46, 0x46, 0x41, 0x00}, {0x46, 0x46, 0x41, 0x00}, {0x46, 0x46, 0x41, 0x00},
{0x46, 0x46, 0x41, 0x00}, {0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00},
{0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00},
{0x00, 0x00, 0x00, 0x00},
};
COMPILER_STRIP_GATE(0x80398A78, &black_color_4634);
/* 80398B0C-80398BA0 02516C 0094+00 0/1 0/0 0/0 .rodata white_color$4635 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const white_color_4635[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0x60, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
0xFF, 0xFF, 0x80, 0x80, 0xFF, 0xBE, 0x40, 0xFF, 0xFF, 0xFF, 0xC0, 0x00, 0xFF, 0xC0, 0xC0,
0xC0, 0xFF, 0xF5, 0xF5, 0xFF, 0xFF, 0xFF, 0xD2, 0xAA, 0xFF, 0xEF, 0xF5, 0xC9, 0xFF, 0xB0,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xFF, 0xFF, 0xFF, 0xF0, 0xFF, 0xFF, 0xFF, 0xD7, 0xFF,
0xF5, 0xF5, 0xFF, 0xFF, 0xF5, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0xFF, 0xFF, 0x9D, 0x00,
0xFF, 0xC8, 0xC8, 0xC8, 0xFF, 0xFF, 0xD2, 0xAA, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xEF, 0xF5,
0xC9, 0xFF, 0xFF, 0xFF, 0xD7, 0xFF, 0xD7, 0xCF, 0xF5, 0xFF, 0xFF, 0xFF, 0x33, 0xFF, 0xC8,
0xC8, 0xC8, 0xFF, 0xF5, 0xF5, 0xFF, 0xFF, 0xF5, 0xF5, 0xFF, 0xFF, 0xF5, 0xF5, 0xFF, 0xFF,
0xF5, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
SECTION_RODATA static TColor const white_color_4635[37] = {
{0xFF, 0xFF, 0xFF, 0xFF}, {0x60, 0xFF, 0x00, 0xFF}, {0x00, 0xFF, 0xFF, 0xFF},
{0xFF, 0xFF, 0x00, 0xFF}, {0xFF, 0x80, 0x80, 0xFF}, {0xBE, 0x40, 0xFF, 0xFF},
{0xFF, 0xC0, 0x00, 0xFF}, {0xC0, 0xC0, 0xC0, 0xFF}, {0xF5, 0xF5, 0xFF, 0xFF},
{0xFF, 0xD2, 0xAA, 0xFF}, {0xEF, 0xF5, 0xC9, 0xFF}, {0xB0, 0xFF, 0xFF, 0xFF},
{0xFF, 0xFF, 0xF0, 0xFF}, {0xFF, 0xFF, 0xF0, 0xFF}, {0xFF, 0xFF, 0xD7, 0xFF},
{0xF5, 0xF5, 0xFF, 0xFF}, {0xF5, 0xF5, 0xFF, 0xFF}, {0xFF, 0xFF, 0xC2, 0xFF},
{0xFF, 0x9D, 0x00, 0xFF}, {0xC8, 0xC8, 0xC8, 0xFF}, {0xFF, 0xD2, 0xAA, 0xFF},
{0xB0, 0xFF, 0xFF, 0xFF}, {0xEF, 0xF5, 0xC9, 0xFF}, {0xFF, 0xFF, 0xD7, 0xFF},
{0xD7, 0xCF, 0xF5, 0xFF}, {0xFF, 0xFF, 0x33, 0xFF}, {0xC8, 0xC8, 0xC8, 0xFF},
{0xF5, 0xF5, 0xFF, 0xFF}, {0xF5, 0xF5, 0xFF, 0xFF}, {0xF5, 0xF5, 0xFF, 0xFF},
{0xF5, 0xF5, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF},
{0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF},
{0xFF, 0xFF, 0xFF, 0xFF},
};
COMPILER_STRIP_GATE(0x80398B0C, &white_color_4635);
#pragma pop
@@ -1008,24 +961,22 @@ asm void dMeter2Info_c::set4thColor(u8 param_0, J2DPicture* param_1) {
#pragma pop
/* 8021DCC4-8021DCE0 218604 001C+00 0/0 2/2 0/0 .text setHotSpringTimer__13dMeter2Info_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::setHotSpringTimer(u8 param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/setHotSpringTimer__13dMeter2Info_cFUc.s"
void dMeter2Info_c::setHotSpringTimer(u8 p1) {
int i_bottleIdx = p1 - 11;
mHotSpringTimer[i_bottleIdx] = 900;
}
#pragma pop
/* 8021DCE0-8021DD5C 218620 007C+00 0/0 1/1 0/0 .text decHotSpringTimer__13dMeter2Info_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::decHotSpringTimer() {
nofralloc
#include "asm/d/meter/d_meter2_info/decHotSpringTimer__13dMeter2Info_cFv.s"
void dMeter2Info_c::decHotSpringTimer() {
for (int i = 0; i < 4; i++) {
if (mHotSpringTimer[i] != 0) {
mHotSpringTimer[i]--;
if (mHotSpringTimer[i] == 0) {
changeWater(i + 11);
}
}
}
}
#pragma pop
/* 8021DD5C-8021DE18 21869C 00BC+00 2/2 1/1 0/0 .text changeWater__13dMeter2Info_cFUc */
#pragma push
@@ -1059,24 +1010,20 @@ asm void dMeter2Info_c::resetMiniGameItem(bool param_0) {
#pragma pop
/* 8021E268-8021E290 218BA8 0028+00 0/0 0/0 5/5 .text setMiniGameCount__13dMeter2Info_cFSc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::setMiniGameCount(s8 param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/setMiniGameCount__13dMeter2Info_cFSc.s"
void dMeter2Info_c::setMiniGameCount(s8 pCount) {
if (pCount < -99) {
pCount = -99;
}
if (pCount > 99) {
pCount = 99;
}
mMiniGameCount = pCount;
}
#pragma pop
/* 8021E290-8021E2B4 218BD0 0024+00 1/1 2/2 0/0 .text setSaveStageName__13dMeter2Info_cFPCc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_c::setSaveStageName(char const* param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/setSaveStageName__13dMeter2Info_cFPCc.s"
void dMeter2Info_c::setSaveStageName(const char* i_stageName) {
strcpy(mSaveStageName, i_stageName);
}
#pragma pop
/* 8021E2B4-8021E2C8 218BF4 0014+00 0/0 0/0 1/1 .text dMeter2Info_getNowLifeGauge__Fv */
#pragma push
@@ -1089,38 +1036,23 @@ asm void dMeter2Info_getNowLifeGauge() {
#pragma pop
/* 8021E2C8-8021E2DC 218C08 0014+00 0/0 11/11 3/3 .text dMeter2Info_getNumberTextureName__Fi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_getNumberTextureName(int param_0) {
nofralloc
#include "asm/d/meter/d_meter2_info/dMeter2Info_getNumberTextureName__Fi.s"
}
#pragma pop
/* ############################################################################################## */
/* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039931C = "im_plus_metal_24ｘ24_00.bti";
#pragma pop
char* dMeter2Info_getNumberTextureName(int pIndex) {
return tex_name_5183[pIndex];
} //
/* 804510B8-804510BC 0005B8 0004+00 1/1 0/0 0/0 .sbss tex_name$5188 */
static u8 tex_name_5188[4];
static char* tex_name_5188;
/* 804510BC-804510C0 0005BC 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_804510BC[4];
static s8 data_804510BC;
/* 8021E2DC-8021E308 218C1C 002C+00 0/0 0/0 1/1 .text dMeter2Info_getPlusTextureName__Fv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_getPlusTextureName() {
nofralloc
#include "asm/d/meter/d_meter2_info/dMeter2Info_getPlusTextureName__Fv.s"
char* dMeter2Info_getPlusTextureName() {
if (data_804510BC == 0) {
tex_name_5188 = "im_plus_metal_24ｘ24_00.bti";
data_804510BC = 1;
}
return tex_name_5188;
}
#pragma pop
/* ############################################################################################## */
/* 804549C0-804549C8 002FC0 0008+00 1/1 0/0 0/0 .sdata2 @5206 */
@@ -1174,6 +1106,11 @@ bool dMeter2Info_is2DActiveTouchArea() {
}
/* 8021E668-8021E688 218FA8 0020+00 0/0 1/1 0/0 .text dMeter2Info_isMapOpenCheck__Fv */
#ifdef NONMATCHING
bool dMeter2Info_isMapOpenCheck() {
return dMeter2Info_getMeterMapClass()->isMapOpenCheck();
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -1182,8 +1119,19 @@ asm void dMeter2Info_isMapOpenCheck() {
#include "asm/d/meter/d_meter2_info/dMeter2Info_isMapOpenCheck__Fv.s"
}
#pragma pop
#endif
/* 8021E688-8021E6E4 218FC8 005C+00 0/0 2/2 0/0 .text dMeter2Info_isItemOpenCheck__Fv */
#ifdef NONMATCHING
bool dMeter2Info_isItemOpenCheck() {
if (!daPy_getPlayerActorClass()->checkCanoeSlider()) {
if (!daPy_getPlayerActorClass()->getSumouMode() && !dMeter2Info_isSub2DStatus(1)) {
return true;
}
}
return false;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -1192,6 +1140,7 @@ asm void dMeter2Info_isItemOpenCheck() {
#include "asm/d/meter/d_meter2_info/dMeter2Info_isItemOpenCheck__Fv.s"
}
#pragma pop
#endif
/* 8021E6E4-8021E754 219024 0070+00 1/1 2/2 0/0 .text dMeter2Info_getRecieveLetterNum__Fv
*/
@@ -1236,29 +1185,10 @@ asm void dMeter2Info_recieveLetter() {
#pragma pop
/* 8021E9D0-8021E9D4 219310 0004+00 0/0 33/33 0/0 .text dMeter2Info_set2DVibration__Fv */
void dMeter2Info_set2DVibration() {
/* empty function */
}
void dMeter2Info_set2DVibration() {}
/* 8021E9D4-8021E9D8 219314 0004+00 0/0 12/12 0/0 .text dMeter2Info_set2DVibrationM__Fv
*/
void dMeter2Info_set2DVibrationM() {
/* empty function */
}
/* 8021E9D8-8021EA14 219318 003C+00 0/0 1/0 0/0 .text __sinit_d_meter2_info_cpp */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void __sinit_d_meter2_info_cpp() {
nofralloc
#include "asm/d/meter/d_meter2_info/__sinit_d_meter2_info_cpp.s"
}
#pragma pop
#pragma push
#pragma force_active on
REGISTER_CTORS(0x8021E9D8, __sinit_d_meter2_info_cpp);
#pragma pop
void dMeter2Info_set2DVibrationM() {}
/* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/save/d_save.cpp
+1245 -1370
View File
File diff suppressed because it is too large Load Diff
src/m_Do/m_Do_ext.cpp
-72
View File
@@ -18,17 +18,6 @@ struct mDoExt_morf_c {
/* 8000FBC0 */ void frameUpdate();
};
struct J3DModelData {};
struct J3DModel {
/* 80327100 */ void initialize();
/* 80327184 */ void entryModelData(J3DModelData*, u32, u32);
/* 803275FC */ void newDifferedDisplayList(u32);
/* 8032767C */ void lock();
/* 803276B4 */ void unlock();
/* 803279A0 */ void diff();
};
struct Vec {};
struct cXyz {
@@ -53,50 +42,11 @@ struct mDoExt_invJntPacket {
/* 80012220 */ void draw();
};
struct J3DMaterialTable;
struct J3DAnmTextureSRTKey {
/* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTexPattern {
/* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTevRegKey {
/* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmColor {
/* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DMaterialTable {
/* 8032FAF4 */ void entryMatColorAnimator(J3DAnmColor*);
/* 8032FBC8 */ void entryTexNoAnimator(J3DAnmTexPattern*);
/* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*);
/* 8032FE70 */ void entryTevRegAnimator(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 J3DAnmCluster {};
struct J3DDeformData {
@@ -107,20 +57,6 @@ struct mDoExt_blkAnm {
/* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16);
};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
/* 8000D9CC */ void entry(J3DModelData*, f32);
/* 8000D9E8 */ void entryJoint(J3DModelData*, u16, f32);
};
struct mDoExt_baseAnm {
/* 8000D320 */ void initPlay(s16, int, f32, s16, s16);
/* 8000D428 */ void play();
};
struct mDoExt_MtxCalcOldFrame {
/* 8000F848 */ void initOldFrameMorf(f32, u16, u16);
/* 8000F8CC */ void decOldFrameMorfCounter();
@@ -140,8 +76,6 @@ struct J3DTransformInfo {};
struct mDoExt_McaMorfCallBack2_c {};
struct mDoExt_McaMorfCallBack1_c {};
struct Z2Creature {
/* 802C0628 */ void initAnime(void*, bool, f32, f32);
/* 802C06D0 */ void updateAnime(f32, f32);
@@ -529,12 +463,6 @@ struct J3DIndBlock {
/* 8000E0A0 */ void setIndTexStageNum(u8);
};
struct J3DFrameCtrl {
/* 8000F9D8 */ ~J3DFrameCtrl();
/* 803283FC */ void init(s16);
/* 803289CC */ void update();
};
struct J3DDisplayListObj {
/* 80312618 */ void callDL() const;