mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-01 12:18:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_Do / d_a_npc work

Browse Source
This commit is contained in:
TakaRikka
2022-06-01 03:49:32 -07:00
parent 36e62e0b80
commit 3f22fa4483
63 changed files with 925 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+178 -137
View File
@@ -13,6 +13,7 @@
#include "d/a/d_a_horse_static.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_bomb.h"
#include "d/d_procname.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
@@ -3307,7 +3308,6 @@ extern "C" u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */];
extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" extern u8 g_env_light[4880];
extern "C" f32 Zero__4cXyz[3];
extern "C" u8 BaseX__4cXyz[12];
extern "C" u8 BaseY__4cXyz[12];
@@ -3347,6 +3347,10 @@ inline BOOL i_dComIfGs_isEventBit(u16 id) {
return g_dComIfG_gameInfo.info.getEvent().isEventBit(id);
}
inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag);
}
/* 8009D87C-8009D884 0981BC 0008+00 0/0 1/1 0/0 .text getE3Zhint__9daAlink_cFv */
bool daAlink_c::getE3Zhint() {
return false;
@@ -15665,8 +15669,8 @@ BOOL daAlink_c::itemButtonCheck(u8 pButton) {
return mItemButton & pButton;
}
void daAlink_c::itemButton() {
itemButtonCheck(1 << mSelectItemId);
BOOL daAlink_c::itemButton() {
return itemButtonCheck(1 << mSelectItemId);
}
void daAlink_c::itemTrigger() {
@@ -17152,7 +17156,7 @@ asm J3DModelData* daAlink_c::loadAramBmd(u16 param_0, u32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::loadAram(u16 param_0, u32 param_1) {
asm void* daAlink_c::loadAram(u16 param_0, u32 param_1) {
nofralloc
#include "asm/d/a/d_a_alink/loadAram__9daAlink_cFUsUl.s"
}
@@ -28031,164 +28035,141 @@ asm void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* param_0, fopAc_ac_c* par
/* 8010859C-801085BC 102EDC 0020+00 1/1 0/0 0/0 .text
* daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daAlink_hookshotAtHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
static void daAlink_hookshotAtHitCallBack(fopAc_ac_c* player, dCcD_GObjInf* param_1,
fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
nofralloc
#include "asm/d/a/d_a_alink/daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s"
((daAlink_c*)player)->hookshotAtHitCallBack(param_1, param_2, param_3);
}
#pragma pop
/* 801085BC-80108600 102EFC 0044+00 1/0 0/0 0/0 .text getHookshotTopPos__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool daAlink_c::getHookshotTopPos() {
nofralloc
#include "asm/d/a/d_a_alink/getHookshotTopPos__9daAlink_cFv.s"
cXyz* daAlink_c::getHookshotTopPos() {
if (checkHookshotItem(mEquipItem)) {
return &mHookshotTopPos;
}
return NULL;
}
#pragma pop
/* 80108600-80108668 102F40 0068+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daAlink_cCFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool daAlink_c::checkHookshotReturnMode() const {
nofralloc
#include "asm/d/a/d_a_alink/checkHookshotReturnMode__9daAlink_cCFv.s"
bool daAlink_c::checkHookshotReturnMode() const {
return checkHookshotItem(mEquipItem) && (mHookshotMode == 4 || mHookshotMode == 5 || mHookshotMode == 6);
}
#pragma pop
/* 80108668-801086DC 102FA8 0074+00 1/0 0/0 0/0 .text checkHookshotShootReturnMode__9daAlink_cCFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool daAlink_c::checkHookshotShootReturnMode() const {
nofralloc
#include "asm/d/a/d_a_alink/checkHookshotShootReturnMode__9daAlink_cCFv.s"
bool daAlink_c::checkHookshotShootReturnMode() const {
return (checkHookshotItem(mEquipItem) && mHookshotMode == 3) || checkHookshotReturnMode();
}
#pragma pop
/* 801086DC-8010871C 10301C 0040+00 6/6 0/0 0/0 .text resetHookshotMode__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::resetHookshotMode() {
nofralloc
#include "asm/d/a/d_a_alink/resetHookshotMode__9daAlink_cFv.s"
void daAlink_c::resetHookshotMode() {
mHookshotMode = 0;
initLockAt();
mSearchBallScale = __float_max[0];
}
#pragma pop
/* 8010871C-80108784 10305C 0068+00 0/0 0/0 1/1 .text
* setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::setEnemyBombHookshot(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/a/d_a_alink/setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c.s"
bool daAlink_c::setEnemyBombHookshot(fopAc_ac_c* actor) {
if (field_0x284c.getActor() != NULL) {
cancelHookshotCarry();
field_0x284c.setData(actor);
fopAcM_setHookCarryNow(actor);
return true;
}
return false;
}
#pragma pop
/* 80108784-801087B0 1030C4 002C+00 3/3 0/0 0/0 .text checkLv7BossRoom__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::checkLv7BossRoom() {
nofralloc
#include "asm/d/a/d_a_alink/checkLv7BossRoom__9daAlink_cFv.s"
bool daAlink_c::checkLv7BossRoom() {
return checkStageName("D_MN07A");
}
#pragma pop
/* 801087B0-80108828 1030F0 0078+00 6/6 0/0 0/0 .text
* checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::checkHookshotStickBG(cBgS_PolyInfo& param_0) {
nofralloc
#include "asm/d/a/d_a_alink/checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo.s"
bool daAlink_c::checkHookshotStickBG(cBgS_PolyInfo& poly) {
if (dComIfG_Bgsp().ChkPolyHSStick(poly)) {
dBgW_Base* bgw = dComIfG_Bgsp().GetBgWBasePointer(poly);
if (bgw != NULL && bgw->ChkPushPullOk()) {
return true;
}
}
return false;
}
#pragma pop
/* 80108828-80108864 103168 003C+00 4/4 0/0 0/0 .text cancelHookshotCarry__9daAlink_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::cancelHookshotCarry() {
nofralloc
#include "asm/d/a/d_a_alink/cancelHookshotCarry__9daAlink_cFv.s"
void daAlink_c::cancelHookshotCarry() {
if (field_0x284c.getActor() != NULL) {
fopAcM_cancelHookCarryNow(field_0x284c.getActor());
field_0x284c.clearData();
}
}
#pragma pop
/* 80108864-801088A0 1031A4 003C+00 2/2 0/0 0/0 .text changeHookshotDrawModel__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::changeHookshotDrawModel() {
nofralloc
#include "asm/d/a/d_a_alink/changeHookshotDrawModel__9daAlink_cFv.s"
void daAlink_c::changeHookshotDrawModel() {
if (mEquipItem == HOOKSHOT && field_0x3020 == 1) {
J3DModel* old_item = mHeldItemModel;
mHeldItemModel = field_0x0710;
field_0x0710 = old_item;
J3DModel* old_item2 = field_0x070c;
field_0x070c = field_0x0714;
field_0x0714 = old_item2;
}
}
#pragma pop
/* 801088A0-801088C8 1031E0 0028+00 6/6 0/0 0/0 .text checkHookshotRoofLv7Boss__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::checkHookshotRoofLv7Boss() {
nofralloc
#include "asm/d/a/d_a_alink/checkHookshotRoofLv7Boss__9daAlink_cFv.s"
BOOL daAlink_c::checkHookshotRoofLv7Boss() {
return mCargoCarryActor.getActor() != NULL && fopAcM_GetName(mCargoCarryActor.getActor()) == PROC_B_DR;
}
#pragma pop
/* 801088C8-80108980 103208 00B8+00 2/2 0/0 0/0 .text checkChaseHookshot__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::checkChaseHookshot() {
nofralloc
#include "asm/d/a/d_a_alink/checkChaseHookshot__9daAlink_cFv.s"
BOOL daAlink_c::checkChaseHookshot() {
if (field_0x2804 == NULL) {
if (mTargetedActor != NULL) {
field_0x2804 = mTargetedActor;
} else {
field_0x2804 = this;
}
} else if (field_0x2804 != mTargetedActor) {
field_0x2804 = this;
}
if (mTargetedActor != NULL) {
s16 actorName = fopAcM_GetName(mTargetedActor);
return field_0x2804 == mTargetedActor && (checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj || actorName == PROC_B_DR || actorName == PROC_E_PH);
}
return false;
}
#pragma pop
/* 80108980-801089E8 1032C0 0068+00 2/2 0/0 0/0 .text checkOctaIealSpecialCollect__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::checkOctaIealSpecialCollect() {
nofralloc
#include "asm/d/a/d_a_alink/checkOctaIealSpecialCollect__9daAlink_cFv.s"
BOOL daAlink_c::checkOctaIealSpecialCollect() {
return mActionID == 0xC6 && checkHookshotItem(mEquipItem) && checkBossOctaIealRoom();
}
#pragma pop
/* 801089E8-80108A18 103328 0030+00 5/5 0/0 0/0 .text checkBossOctaIealRoom__9daAlink_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::checkBossOctaIealRoom() {
nofralloc
#include "asm/d/a/d_a_alink/checkBossOctaIealRoom__9daAlink_cFv.s"
BOOL daAlink_c::checkBossOctaIealRoom() {
return checkStageName("D_MN01A");
}
#pragma pop
/* 80108A18-80108A3C 103358 0024+00 19/19 0/0 0/0 .text checkHookshotWait__9daAlink_cCFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::checkHookshotWait() const {
nofralloc
#include "asm/d/a/d_a_alink/checkHookshotWait__9daAlink_cCFv.s"
BOOL daAlink_c::checkHookshotWait() const {
return mHookshotMode == 0 || mHookshotMode == 1;
}
#pragma pop
/* 80108A3C-80108A90 10337C 0054+00 1/1 0/0 0/0 .text setHookshotCatchNow__9daAlink_cFv
*/
// matches with literals
#ifdef NONMATCHING
void daAlink_c::setHookshotCatchNow() {
field_0x3026 = 5;
dComIfGp_getVibration().StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f));
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -28197,27 +28178,78 @@ asm void daAlink_c::setHookshotCatchNow() {
#include "asm/d/a/d_a_alink/setHookshotCatchNow__9daAlink_cFv.s"
}
#pragma pop
#endif
/* 80108A90-80108B34 1033D0 00A4+00 1/0 0/0 0/0 .text setHookshotCarryOffset__9daAlink_cFUiPC4cXyz
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool daAlink_c::setHookshotCarryOffset(unsigned int param_0, cXyz const* param_1) {
nofralloc
#include "asm/d/a/d_a_alink/setHookshotCarryOffset__9daAlink_cFUiPC4cXyz.s"
bool daAlink_c::setHookshotCarryOffset(unsigned int actorID, cXyz const* offset) {
if (i_dComIfGp_checkPlayerStatus1(0, 0x10000)) {
fopAc_ac_c* carryActor = mCargoCarryActor.getActor();
if (carryActor != NULL && fopAcM_checkHookCarryNow(carryActor) && actorID == mCargoCarryActor.getID()) {
field_0x37c8 = *offset;
return true;
}
}
fopAc_ac_c* actor = field_0x284c.getActor();
if (actor != NULL && fopAcM_checkHookCarryNow(actor) && actorID == field_0x284c.getID()) {
field_0x37f8 = *offset;
return true;
}
return false;
}
#pragma pop
/* 80108B34-80108DB4 103474 0280+00 1/1 0/0 0/0 .text setHookshotModel__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::setHookshotModel() {
nofralloc
#include "asm/d/a/d_a_alink/setHookshotModel__9daAlink_cFv.s"
void daAlink_c::setHookshotModel() {
J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x17E);
JKRHeap* heap = setItemHeap();
field_0x730.init(bck, 0, 2, lit_6040, 0, -1, false);
J3DModelData* heldItem_modelData = loadAramBmd(0x316, 0x5C00);
mHeldItemModel = initModel(heldItem_modelData, 0x80000, 0);
J3DModelData* modelData = loadAramBmd(0x318, 0x3800);
field_0x070c = initModel(modelData, 0x80000, 0);
field_0x0710 = initModel(mHeldItemModel->getModelData(), 0x80000, 0);
field_0x0714 = initModel(field_0x070c->getModelData(), 0x80000, 0);
field_0x0768 = loadAramBmd(0x317, 0x1000);
field_0x770 = new hsChainShape_c();
field_0x076c = new Z2SoundObjSimple();
mpHookshotLinChk = new dBgS_ObjLinChk();
mpHookshotLinChk->OffFullGrp();
mpHookshotLinChk->OnWaterGrp();
J3DAnmTransform* bck2 = (J3DAnmTransform*)loadAram(0x17F, 0x800);
field_0x74C.init(bck2, 0, 2, lit_6040, 0, -1, false);
mDoExt_setCurrentHeap(heap);
resetHookshotMode();
field_0x770->setUserArea((u32)this);
field_0x2f94 = 1;
if (mEquipItem == W_HOOKSHOT) {
field_0x2f95 = 6;
}
field_0x3020 = 0;
field_0x3024 = 0;
field_0x122C[0].SetAtSpl(dCcG_At_Spl_UNK_0);
field_0x122C[0].OffAtNoHitMark();
field_0x122C[0].SetAtAtp(0);
field_0x122C[0].SetR(lit_7808);
field_0x122C[0].SetAtSe(8);
field_0x122C[0].SetAtType(0x4000);
field_0x122C[0].SetAtHitMark(1);
field_0x122C[0].OnAtSetBit();
field_0x122C[0].SetAtHitCallback(daAlink_hookshotAtHitCallBack);
field_0x122C[0].SetAtMtrl(0);
field_0x076c->init(&mHookshotTopPos, 1);
}
#pragma pop
/* 80108DB4-80108EEC 1036F4 0138+00 6/6 0/0 0/0 .text setHookshotSight__9daAlink_cFv */
#pragma push
@@ -28230,24 +28262,37 @@ asm void daAlink_c::setHookshotSight() {
#pragma pop
/* 80108EEC-80108F64 10382C 0078+00 1/1 0/0 0/0 .text cancelHookshotShot__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::cancelHookshotShot() {
nofralloc
#include "asm/d/a/d_a_alink/cancelHookshotShot__9daAlink_cFv.s"
void daAlink_c::cancelHookshotShot() {
if (checkHookshotItem(mEquipItem) && (mHookshotMode == 3 || mHookshotMode == 5 || mHookshotMode == 4)) {
if (mActionID != 0xC5 && mActionID != 0xC6 && mActionID != 0xC4) {
mHookshotMode = 6;
}
}
}
#pragma pop
/* 80108F64-8010903C 1038A4 00D8+00 4/4 0/0 0/0 .text cancelHookshotMove__9daAlink_cFv */
// checkAttentionLock has weird codegen
#ifdef NONMATCHING
bool daAlink_c::cancelHookshotMove() {
if (mFastShotTime == 0 && mHookshotMode == 0) {
if (checkHookshotAnime() && (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) {
resetUpperAnime(UPPER_NOW, -1.0f);
return 1;
}
}
return 0;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::cancelHookshotMove() {
asm bool daAlink_c::cancelHookshotMove() {
nofralloc
#include "asm/d/a/d_a_alink/cancelHookshotMove__9daAlink_cFv.s"
}
#pragma pop
#endif
/* 8010903C-80109070 10397C 0034+00 2/2 0/0 0/0 .text
* checkHookshotReadyMaterialOffMode__9daAlink_cCFv */
@@ -32159,10 +32204,6 @@ asm void daAlink_c::checkWolfLandAction(int param_0) {
}
#pragma pop
inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag);
}
/* 80129958-801299A8 124298 0050+00 1/1 0/0 1/1 .text checkMidnaUseAbility__9daAlink_cCFv
*/
BOOL daAlink_c::checkMidnaUseAbility() const {
@@ -35893,8 +35934,8 @@ bool daPy_py_c::getDpdFarFlg() const {
}
/* 8014188C-80141894 13C1CC 0008+00 1/0 0/0 0/0 .text getHookshotTopPos__9daPy_py_cFv */
bool daPy_py_c::getHookshotTopPos() {
return false;
cXyz* daPy_py_c::getHookshotTopPos() {
return NULL;
}
/* 80141894-8014189C 13C1D4 0008+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daPy_py_cCFv */
src/d/a/d_a_npc.cpp
+4 -85
View File
@@ -37,80 +37,6 @@ struct daNpcT_MatAnm_c {
/* 8014D24C */ ~daNpcT_MatAnm_c();
};
struct daNpcF_c {
struct daNpcF_anmPlayData {};
/* 80152014 */ void execute();
/* 801522AC */ void draw(int, int, f32, _GXColorS10*, int);
/* 80152614 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80152654 */ void srchAttnActor1(void*, void*);
/* 801526E8 */ void srchActor(void*, void*);
/* 8015276C */ void setMtx();
/* 801527FC */ void setMtx2();
/* 801528C8 */ void initialize();
/* 80152B2C */ void getTrnsfrmKeyAnmP(char*, int);
/* 80152B68 */ void getTexPtrnAnmP(char*, int);
/* 80152BA4 */ void getTexSRTKeyAnmP(char*, int);
/* 80152BE0 */ void getTevRegKeyAnmP(char*, int);
/* 80152C1C */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
/* 80152C80 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 80152CC4 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
/* 80152D04 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
/* 80152D44 */ void setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int);
/* 80152D84 */ void setEnvTevColor();
/* 80152DE0 */ void setRoomNo();
/* 80152E24 */ void chkEndAnm(f32);
/* 80152EC4 */ void chkEndAnm(J3DFrameCtrl*, f32);
/* 80152F40 */ void playAllAnm();
/* 80153150 */ void playExpressionAnm(daNpcF_c::daNpcF_anmPlayData***);
/* 80153264 */ void playMotionAnm(daNpcF_c::daNpcF_anmPlayData***);
/* 8015337C */ void setLookatMtx(int, int*, f32);
/* 80153578 */ void hitChk2(dCcD_Cyl*, int, int);
/* 80153658 */ void setDamage(int, int, int);
/* 80153718 */ void ctrlMsgAnm(int&, int&, fopAc_ac_c*, int);
/* 8015387C */ void orderEvent(int, char*, u16, u16, u8, u16);
/* 80153954 */ void changeEvent(char*, char*, u16, u16);
/* 801539F0 */ void chkActorInSight(fopAc_ac_c*, f32);
/* 80153A78 */ void chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16);
/* 80153BDC */ void chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int);
/* 80153D1C */ void initTalk(int, fopAc_ac_c**);
/* 80153D84 */ void talkProc(int*, int, fopAc_ac_c**);
/* 80153EF4 */ void turn(s16, f32, int);
/* 801540A4 */ void step(s16, int, int, int);
/* 80154250 */ void setAngle(s16);
/* 80154278 */ void getDistTableIdx(int, int);
/* 801542A0 */ void getEvtAreaTagP(int, int);
/* 8015436C */ void getAttnActorP(int, void* (*)(void*, void*), f32, f32, f32, f32, s16, int,
int);
/* 80154730 */ void chkActorInSight2(fopAc_ac_c*, f32, s16);
/* 80154834 */ void chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
/* 801548F4 */ void chkPointInArea(cXyz, cXyz, cXyz, s16);
/* 8015496C */ void getAttentionPos(fopAc_ac_c*);
/* 801549E0 */ void chkFindPlayer2(int, s16);
/* 80154BD8 */ void setHitodamaPrtcl();
/* 80155BB4 */ void setCollisions();
/* 80155BB8 */ void setAttnPos();
/* 80155BBC */ void adjustShapeAngle();
/* 80155BC0 */ bool main();
/* 80155BC8 */ void setParam();
/* 80155BCC */ void drawOtherMdls();
/* 80155BD0 */ bool drawDbgInfo();
/* 80155BD8 */ bool ctrlBtk();
/* 80155BE0 */ bool setExpressionAnm(int, bool);
/* 80155BE8 */ void setMotionAnm(int, f32);
/* 80155BEC */ void setMotion(int, f32, int);
/* 80155BF0 */ void setExpression(int, f32);
/* 80155BF4 */ ~daNpcF_c();
/* 80155EC8 */ bool setExpressionBtp(int);
static u8 const mCcDObjInfo[48];
static u8 mCcDCyl[68];
static u8 mCcDSph[64];
static u8 mFindActorPList[400];
static u8 mFindCount[4];
static u8 mSrchActorName[2 + 2 /* padding */];
};
struct dPath {};
struct daNpcF_SPCurve_c {
@@ -163,15 +89,6 @@ struct daNpcF_Lookat_c {
/* 80151FE0 */ void clrRotAngle();
};
struct daNpcF_ActorMngr_c {
/* 801506B0 */ void initialize();
/* 801506D8 */ void entry(unsigned int);
/* 801506BC */ void entry(fopAc_ac_c*);
/* 801506E0 */ void remove();
/* 801506EC */ void getActorP();
/* 80155E40 */ ~daNpcF_ActorMngr_c();
};
struct daBaseNpc_path_c {
/* 8014D998 */ daBaseNpc_path_c();
/* 8014D9A8 */ void isPath();
@@ -4762,7 +4679,8 @@ void daNpcF_c::setExpression(int param_0, f32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daNpcF_c::~daNpcF_c() {
// asm daNpcF_c::~daNpcF_c() {
extern "C" asm void __dt__8daNpcF_cFv() {
nofralloc
#include "asm/d/a/d_a_npc/__dt__8daNpcF_cFv.s"
}
@@ -4772,7 +4690,8 @@ asm daNpcF_c::~daNpcF_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() {
// asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() {
extern "C" asm void __dt__18daNpcF_ActorMngr_cFv() {
nofralloc
#include "asm/d/a/d_a_npc/__dt__18daNpcF_ActorMngr_cFv.s"
}
src/d/bg/d_bg_s.cpp
+1 -1
View File
@@ -671,7 +671,7 @@ bool dBgS::GetPolyAttackThrough(cBgS_PolyInfo const& poly) {
}
/* 800751F8-8007524C 06FB38 0054+00 0/0 1/1 0/0 .text ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo */
bool dBgS::ChkPolyHSStick(cBgS_PolyInfo const& poly) {
u32 dBgS::ChkPolyHSStick(cBgS_PolyInfo const& poly) {
int bg_index = poly.GetBgIndex();
if (m_chk_element[bg_index].ChkUsed()) {
return m_chk_element[bg_index].m_bgw_base_ptr->GetPolyHSStick(poly.GetPolyIndex());
src/d/bg/d_bg_w.cpp
+1 -1
View File
@@ -1076,7 +1076,7 @@ asm void dBgW::GetPolyArrowThrough(int param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool dBgW::GetPolyHSStick(int param_0) {
asm u32 dBgW::GetPolyHSStick(int param_0) {
nofralloc
#include "asm/d/bg/d_bg_w/GetPolyHSStick__4dBgWFi.s"
}
src/d/bg/d_bg_w_kcol.cpp
+1 -1
View File
@@ -686,7 +686,7 @@ asm void dBgWKCol::GetPolyArrowThrough(int param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBgWKCol::GetPolyHSStick(int param_0) {
asm u32 dBgWKCol::GetPolyHSStick(int param_0) {
nofralloc
#include "asm/d/bg/d_bg_w_kcol/GetPolyHSStick__8dBgWKColFi.s"
}
src/d/d_drawlist.cpp
-1
View File
@@ -263,7 +263,6 @@ extern "C" extern void* __vt__9J3DPacket[5];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mClipper__14mDoLib_clipper[92];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_envHIO[68];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mBackColor__13mDoGph_gInf_c[4];
src/d/d_lib.cpp
+4 -4
View File
@@ -163,19 +163,19 @@ asm void STControl::Yinit() {
#endif
f32 STControl::getValueStick() {
return mDoCPd_c::getStickValue(mDoCPd_c::PAD_0);
return mDoCPd_c::getStickValue(PAD_1);
}
s16 STControl::getAngleStick() {
return mDoCPd_c::getStickAngle(mDoCPd_c::PAD_0);
return mDoCPd_c::getStickAngle(PAD_1);
}
f32 CSTControl::getValueStick() {
return mDoCPd_c::getSubStickValue(mDoCPd_c::PAD_0);
return mDoCPd_c::getSubStickValue(PAD_1);
}
s16 CSTControl::getAngleStick() {
return mDoCPd_c::getSubStickAngle(mDoCPd_c::PAD_0);
return mDoCPd_c::getSubStickAngle(PAD_1);
}
/* 8003219C-8003242C 02CADC 0290+00 0/0 24/24 0/0 .text checkTrigger__9STControlFv */
src/d/d_resorce.cpp
-1
View File
@@ -154,7 +154,6 @@ extern "C" void _restgpr_29();
extern "C" void memcmp();
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_env_light[4880];
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 mZbufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
src/d/kankyo/d_kankyo.cpp
-2
View File
@@ -5,7 +5,6 @@
#include "d/kankyo/d_kankyo.h"
#include "MSL_C/MSL_Common/Src/mem.h"
#include "Z2AudioLib/Z2EnvSeMgr.h"
#include "d/com/d_com_inf_game.h"
#include "d/kankyo/d_kankyo_data.h"
#include "d/msg/d_msg_object.h"
@@ -1934,7 +1933,6 @@ asm void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* param_0, dKy_
#pragma pop
/* 8042DD70-8042E07C 05AA90 030C+00 1/2 8/8 9/9 .bss g_mEnvSeMgr */
extern Z2EnvSeMgr g_mEnvSeMgr;
Z2EnvSeMgr g_mEnvSeMgr;
/* 8042E07C-8042E7BC 05AD9C 0740+00 5/4 0/0 0/0 .bss lightStatusData */
src/d/menu/d_menu_collect.cpp
-1
View File
@@ -427,7 +427,6 @@ extern "C" extern void* __vt__8J3DModel[9];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" f32 Zero__4cXyz[3];
src/d/menu/d_menu_window.cpp
+10 -10
View File
@@ -277,15 +277,15 @@ inline BOOL dComIfGp_event_runCheck() {
}
BOOL dMw_UP_TRIGGER() {
return (bool)mDoCPd_c::getTrigUp(mDoCPd_c::PAD_0);
return (bool)mDoCPd_c::getTrigUp(PAD_1);
}
bool dMw_DOWN_TRIGGER() {
return mDoCPd_c::getTrigDown(mDoCPd_c::PAD_0);
return mDoCPd_c::getTrigDown(PAD_1);
}
BOOL dMw_LEFT_TRIGGER() {
if (mDoCPd_c::getTrigLeft(mDoCPd_c::PAD_0) && !dMw_UP_TRIGGER()) {
if (mDoCPd_c::getTrigLeft(PAD_1) && !dMw_UP_TRIGGER()) {
return true;
} else {
return false;
@@ -293,7 +293,7 @@ BOOL dMw_LEFT_TRIGGER() {
}
BOOL dMw_RIGHT_TRIGGER() {
if (mDoCPd_c::getTrigRight(mDoCPd_c::PAD_0) && !dMw_UP_TRIGGER()) {
if (mDoCPd_c::getTrigRight(PAD_1) && !dMw_UP_TRIGGER()) {
return true;
} else {
return false;
@@ -301,19 +301,19 @@ BOOL dMw_RIGHT_TRIGGER() {
}
bool dMw_A_TRIGGER() {
return mDoCPd_c::getTrigA(mDoCPd_c::PAD_0);
return mDoCPd_c::getTrigA(PAD_1);
}
BOOL dMw_B_TRIGGER() {
return (bool)mDoCPd_c::getTrigB(mDoCPd_c::PAD_0);
return (bool)mDoCPd_c::getTrigB(PAD_1);
}
bool dMw_Z_TRIGGER() {
return mDoCPd_c::getTrigZ(mDoCPd_c::PAD_0);
return mDoCPd_c::getTrigZ(PAD_1);
}
BOOL dMw_START_TRIGGER() {
return (bool)mDoCPd_c::getTrigStart(mDoCPd_c::PAD_0);
return (bool)mDoCPd_c::getTrigStart(PAD_1);
}
void dMw_onPauseWindow() {
@@ -2011,9 +2011,9 @@ void dMw_c::dMw_collect_create() {
mpMenuCollect = new dMenu_Collect_c(mpHeap, mpStick, mpCStick);
mpMenuCollect->_create();
if (mDoCPd_c::getHoldLockL(mDoCPd_c::PAD_0)) {
if (mDoCPd_c::getHoldLockL(PAD_1)) {
dMw_onButtonBit(1);
} else if (mDoCPd_c::getHoldLockR(mDoCPd_c::PAD_0)) {
} else if (mDoCPd_c::getHoldLockR(PAD_1)) {
dMw_onButtonBit(2);
}
}
src/d/particle/d_particle.cpp
-1
View File
@@ -474,7 +474,6 @@ extern "C" u8 j_o_id__8dPa_name[10 + 2 /* padding */];
extern "C" u8 s_o_id__8dPa_name[28];
extern "C" u8 mClipper__14mDoLib_clipper[92];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 g_whiteColor;
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];