work on daalink, fop actor, mDo machine, msg_scrn, + various (#201)

* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress
This commit is contained in:
TakaRikka
2022-06-29 13:19:09 -07:00
committed by GitHub
parent cd5b02450c
commit 046d178003
412 changed files with 12030 additions and 16833 deletions
+5 -2
View File
@@ -384,7 +384,7 @@ public:
int isMagicFlag(u8 i_magic) const;
u16 getMaxLife() { return mMaxLife; }
u16 getLife() { return mLife; }
u16 getLife() const { return mLife; }
u16 getRupee() { return mRupee; }
u16 getOil() { return mOil; }
u16 getMaxOil() const { return mMaxOil; }
@@ -515,6 +515,7 @@ public:
s8 getRoomNo() { return mRoomNo; }
char getWarpAcceptStage() { return mWarpAcceptStage; }
void resetWarpAcceptStage() { mWarpAcceptStage = -1; }
void setWarpAcceptStage(s8 accept) { mWarpAcceptStage = accept; }
private:
/* 0x00 */ cXyz mPos;
@@ -522,7 +523,7 @@ private:
/* 0x0E */ char mName[8];
/* 0x16 */ u8 mSpawnId;
/* 0x17 */ s8 mRoomNo;
/* 0x18 */ char mWarpAcceptStage;
/* 0x18 */ s8 mWarpAcceptStage;
/* 0x19 */ u8 unk25[3];
}; // Size: 0x1C
@@ -813,6 +814,7 @@ public:
onDungeonItem(STAGE_BOSS_ENEMY);
onDungeonItem(OOCCOO_NOTE);
}
s32 isStageBossEnemy() const { return isDungeonItem(STAGE_BOSS_ENEMY); }
s32 isDungeonItemWarp() const { return isDungeonItem(OOCCOO_NOTE); }
void onStageLife() { onDungeonItem(STAGE_LIFE); }
@@ -1085,6 +1087,7 @@ public:
u8 getDataNum() const { return mDataNum; }
void removeZone(int zoneNo) { mZone[zoneNo].reset(); }
void setNoFile(u8 file) { mNoFile = file; }
u8 getNewFile() const { return mNewFile; }
static const int MEMORY_SWITCH = 0x80;
static const int DAN_SWITCH = 0x40;
+1 -2
View File
@@ -201,8 +201,7 @@ public:
/* 8025C6FC */ virtual ~dSvBit_HIO_c();
private:
/* 0x004 */ u8 field_0x4;
/* 0x004 */ s8 field_0x4;
/* 0x008 */ dSvBit_childSwitchHIO_c mSwitch;
/* 0x210 */ dSvBit_childItemHIO_c mItem;
/* 0x3D8 */ dSvBit_childTreasureHIO_c mTreasure;