Debug d_a_e_ym (#3003)

This commit is contained in:
YunataSavior 2025-12-26 16:23:14 -08:00 committed by GitHub
parent 09280ae00b
commit 6e3b22adee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 627 additions and 406 deletions

View File

@ -8,8 +8,8 @@ checkBck__8daE_YM_cFPCci = .text:0x00000144; // type:function size:0x5C scope:gl
bckSet__8daE_YM_cFiUcff = .text:0x000001A0; // type:function size:0x148 scope:global
bckSetFly__8daE_YM_cFiUcff = .text:0x000002E8; // type:function size:0xA4 scope:global
draw__8daE_YM_cFv = .text:0x0000038C; // type:function size:0x2AC scope:global
daE_YM_Draw__FP8daE_YM_c = .text:0x00000638; // type:function size:0x20 scope:global
s_obj_sub__FPvPv = .text:0x00000658; // type:function size:0xD0 scope:global
daE_YM_Draw__FP8daE_YM_c = .text:0x00000638; // type:function size:0x20 scope:local
s_obj_sub__FPvPv = .text:0x00000658; // type:function size:0xD0 scope:local
setDigEffect__8daE_YM_cFv = .text:0x00000728; // type:function size:0x11C scope:global
setElecEffect1__8daE_YM_cFv = .text:0x00000844; // type:function size:0x158 scope:global
setElecEffect2__8daE_YM_cFv = .text:0x0000099C; // type:function size:0x160 scope:global
@ -59,20 +59,20 @@ executeFire__8daE_YM_cFv = .text:0x000097F8; // type:function size:0x878 scope:g
setRiverAttention__8daE_YM_cFv = .text:0x0000A070; // type:function size:0x314 scope:global
setLockByCargo__8daE_YM_cFv = .text:0x0000A384; // type:function size:0xC scope:global
executeRiver__8daE_YM_cFv = .text:0x0000A390; // type:function size:0xB3C scope:global
s_ym_sub__FPvPv = .text:0x0000AECC; // type:function size:0xC0 scope:global
s_ym_sub__FPvPv = .text:0x0000AECC; // type:function size:0xC0 scope:local
checkFrinedSamePos__8daE_YM_cFv = .text:0x0000AF8C; // type:function size:0x40 scope:global
action__8daE_YM_cFv = .text:0x0000AFCC; // type:function size:0x51C scope:global
mtx_set__8daE_YM_cFv = .text:0x0000B4E8; // type:function size:0x88 scope:global
cc_set__8daE_YM_cFv = .text:0x0000B570; // type:function size:0x2FC scope:global
execute__8daE_YM_cFv = .text:0x0000B86C; // type:function size:0x164 scope:global
daE_YM_Execute__FP8daE_YM_c = .text:0x0000B9D0; // type:function size:0x20 scope:global
daE_YM_IsDelete__FP8daE_YM_c = .text:0x0000B9F0; // type:function size:0x8 scope:global
daE_YM_Execute__FP8daE_YM_c = .text:0x0000B9D0; // type:function size:0x20 scope:local
daE_YM_IsDelete__FP8daE_YM_c = .text:0x0000B9F0; // type:function size:0x8 scope:local
_delete__8daE_YM_cFv = .text:0x0000B9F8; // type:function size:0x98 scope:global
daE_YM_Delete__FP8daE_YM_c = .text:0x0000BA90; // type:function size:0x20 scope:global
daE_YM_Delete__FP8daE_YM_c = .text:0x0000BA90; // type:function size:0x20 scope:local
CreateHeap__8daE_YM_cFv = .text:0x0000BAB0; // type:function size:0x348 scope:global
__ct__4cXyzFv = .text:0x0000BDF8; // type:function size:0x4 scope:global
__dt__12J3DFrameCtrlFv = .text:0x0000BDFC; // type:function size:0x48 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x0000BE44; // type:function size:0x20 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x0000BE44; // type:function size:0x20 scope:local
checkBeforeBg__8daE_YM_cFs = .text:0x0000BE64; // type:function size:0x4FC scope:global
checkBeforeGround__8daE_YM_cFv = .text:0x0000C360; // type:function size:0x138 scope:global
checkInitialWall__8daE_YM_cFv = .text:0x0000C498; // type:function size:0x280 scope:global
@ -84,7 +84,7 @@ __dt__8cM3dGAabFv = .text:0x0000D22C; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x0000D274; // type:function size:0x5C scope:global
__dt__12dBgS_ObjAcchFv = .text:0x0000D2D0; // type:function size:0x70 scope:global
__dt__12dBgS_AcchCirFv = .text:0x0000D340; // type:function size:0x70 scope:global
daE_YM_Create__FP8daE_YM_c = .text:0x0000D3B0; // type:function size:0x20 scope:global
daE_YM_Create__FP8daE_YM_c = .text:0x0000D3B0; // type:function size:0x20 scope:local
__dt__10cCcD_GSttsFv = .text:0x0000D3D0; // type:function size:0x48 scope:global
__dt__12daE_YM_HIO_cFv = .text:0x0000D418; // type:function size:0x48 scope:global
__sinit_d_a_e_ym_cpp = .text:0x0000D460; // type:function size:0x3C scope:local
@ -180,7 +180,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@9420 = .rodata:0x00000150; // type:object size:0x8 scope:local
@stringBase0 = .rodata:0x00000158; // type:object size:0x17 scope:local data:string_table
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double
@ -194,7 +194,7 @@ w_eff_id$5427 = .data:0x00000078; // type:object size:0x8 scope:local
YM_DIG_POS_Y$7355 = .data:0x000000CC; // type:object size:0xC scope:local
@8522 = .data:0x000000D8; // type:object size:0x4C scope:local
@9421 = .data:0x00000124; // type:object size:0x20 scope:local
l_daE_YM_Method = .data:0x00000144; // type:object size:0x20 scope:global
l_daE_YM_Method = .data:0x00000144; // type:object size:0x20 scope:local
g_profile_E_YM = .data:0x00000164; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x00000194; // type:object size:0xC scope:global
__vt__10cCcD_GStts = .data:0x000001A0; // type:object size:0xC scope:global
@ -206,8 +206,8 @@ __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global
__vt__8cM3dGPla = .data:0x00000200; // type:object size:0xC scope:global
__vt__12daE_YM_HIO_c = .data:0x0000020C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_253_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
lbl_253_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
@3941 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte
m_near_obj = .bss:0x0000003C; // type:object size:0x4 scope:global data:4byte
m_obj_dist = .bss:0x00000040; // type:object size:0x4 scope:global align:4 data:float
l_HIO = .bss:0x00000018; // type:object size:0x24 scope:local data:byte
m_near_obj = .bss:0x0000003C; // type:object size:0x4 scope:local data:4byte
m_obj_dist = .bss:0x00000040; // type:object size:0x4 scope:local align:4 data:float

View File

@ -36,10 +36,11 @@ struct cXyz : Vec {
this->y = vec.y;
this->z = vec.z;
}
void operator=(const Vec& vec) {
cXyz& operator=(const Vec& vec) {
this->x = vec.x;
this->y = vec.y;
this->z = vec.z;
return *this;
}
cXyz operator+(Vec const&) const;
cXyz operator-(Vec const&) const;

View File

@ -8,6 +8,7 @@
#include "d/d_cc_d.h"
#include "d/d_cc_uty.h"
#include "d/d_path.h"
#include "m_Do/m_Do_ext.h"
class daKago_c;
@ -49,19 +50,20 @@ public:
void setTagPosP() { mTagPosP = &mTagPos; }
u8 checkBck(char const*, int);
bool checkBck(char const*, int);
void bckSet(int, u8, f32, f32);
void bckSetFly(int, u8, f32, f32);
int draw();
void setWaterEffect(); // unused
void setDigEffect();
void setElecEffect1();
void setElecEffect2();
void setFireEffect();
bool checkWallCrash();
u8 checkWolfBark();
u8 checkSurpriseLock();
u8 checkRailSurprise();
u8 checkSurpriseNear();
bool checkWolfBark();
bool checkSurpriseLock();
bool checkRailSurprise();
bool checkSurpriseNear();
void setNormalCc();
void setAppear();
void setMoveSound(int);
@ -80,17 +82,17 @@ public:
void executeBack();
void executeFall();
void executeAttack();
u8 checkAttackEnd();
u8 setAttackMotion();
bool checkAttackEnd();
bool setAttackMotion();
void executeAttackWall();
void executeDefense();
u8 checkFlyTerritory();
bool checkFlyTerritory();
void initFly();
void executeFly();
void setInclination();
void executeFlyAttack();
void setNextPathPoint();
u8 checkRailDig();
bool checkRailDig();
void executeRail();
void executeBackRail();
void checkElectricStart();
@ -108,8 +110,8 @@ public:
int execute();
int _delete();
int CreateHeap();
u8 checkBeforeBg(s16);
u8 checkBeforeGround();
bool checkBeforeBg(s16);
bool checkBeforeGround();
void checkInitialWall();
u8 checkWall();
void setHideType();
@ -132,7 +134,7 @@ private:
/* 0x670 */ cXyz mPrevPos;
/* 0x67C */ cXyz field_0x67c;
/* 0x688 */ f32 field_0x688;
/* 0x68C */ f32 field_0x68c;
/* 0x68C */ f32 field_0x68c; // model size?
/* 0x690 */ int mAction;
/* 0x694 */ int mLastAction;
/* 0x698 */ int mMode;

View File

@ -120,10 +120,10 @@ public:
MtxP getLegR3Mtx() { return mLegR3Mtx; }
MtxP getMidnaLocaterMtx() { return mpMorf->getModel()->getAnmMtx(4); }
s8 getPathDir() { return mPathDir; }
bool isFlying() { return mIsFlying; }
u8 isFlying() { return mIsFlying; }
fopAc_ac_c* getLockActor() { return mpLockActor; }
void setLockActor(fopAc_ac_c* actor) { mpLockActor = actor; }
void setEatYm() { field_0x6d8 |= 4; }
void setEatYm() { field_0x6d8 |= (u8) 4; }
MtxP getMouthMtx() { return mpMorf->getModel()->getAnmMtx(7); }
private:
@ -156,7 +156,7 @@ private:
/* 0x6DE */ u8 field_0x6de;
/* 0x6DF */ u8 field_0x6df;
/* 0x6E0 */ u8 field_0x6e0;
/* 0x6E1 */ bool mIsFlying;
/* 0x6E1 */ u8 mIsFlying;
/* 0x6E2 */ u8 field_0x6e2[0x6e3 - 0x6e2];
/* 0x6E3 */ u8 field_0x6e3;
/* 0x6E4 */ u8 field_0x6e4;

View File

@ -203,6 +203,7 @@ public:
s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; }
s16 GetShieldRange() { return mShieldRange; }
u8 GetSpl() { return mSpl; }
void SetSpl(dCcG_Tg_Spl tg_spl) { mSpl = tg_spl; }
void SetSpl(u8 tg_spl) { mSpl = tg_spl; }
u8 GetHitMark() { return mHitMark; }
void SetRVec(cXyz& vec) { mRVec = vec; }
@ -387,6 +388,7 @@ public:
bool ChkTgHookShotNoHitMark() { return mGObjTg.ChkSPrm(0x400); }
bool ChkTgArrowNoHitMark() { return mGObjTg.ChkSPrm(0x1000); }
dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); }
void SetTgSpl(dCcG_Tg_Spl tg_spl) { mGObjTg.SetSpl(tg_spl); }
void SetTgSpl(u8 tg_spl) { mGObjTg.SetSpl(tg_spl); }
int GetTgHitMark() { return mGObjTg.GetHitMark(); }
int GetAtHitMark() { return mGObjAt.GetHitMark(); }

File diff suppressed because it is too large Load Diff