Match all funcs in d_menu_ring (#2113)

* d_menu_ring OK but something is not matchin

* at least matching without NONMATCHING again

* add note

* some docs about items

* fix i_nameID and i_expID

* revert my setBlackWhite change

* remove unused asm

* update progress

* m_Do_graphic functions match but I'm not able to remove data
This commit is contained in:
Trueffel
2024-03-30 20:45:15 +01:00
committed by GitHub
parent 99facf7c94
commit 9f46b4bea2
11 changed files with 937 additions and 789 deletions
+6 -2
View File
@@ -386,6 +386,7 @@ public:
s16 getItemPachinkoNumCount() { return mItemPachinkoNumCount; }
void clearItemPachinkoNumCount() { mItemPachinkoNumCount = 0; }
u8 getNeedLightDropNum() { return mNeedLightDropNum; }
u8 getWolfAbility(int i_idx) { return mWolfAbility[i_idx]; }
const char* getStartStageName() { return mStartStage.getName(); }
s8 getStartStageRoomNo() { return mStartStage.getRoomNo(); }
@@ -731,8 +732,7 @@ public:
/* 0x04F58 */ u8 mSubHeapLockFlag[2];
/* 0x04F5A */ u8 mNowVibration;
/* 0x04F5B */ u8 field_0x4f5b[2];
/* 0x04F5D */ u8 mWolfAbility;
/* 0x04F5E */ u8 field_0x4f5e[11];
/* 0x04F5D */ u8 mWolfAbility[12];
/* 0x04F69 */ u8 mNeedLightDropNum;
/* 0x04F6A */ u8 field_0x4f6a[18];
/* 0x04F7C */ u8 mMesgBgm;
@@ -1081,6 +1081,10 @@ inline u8 dComIfGs_getPachinkoMax() {
return 50;
}
inline u8 dComIfGs_getWolfAbility(int i_idx) {
return g_dComIfG_gameInfo.play.getWolfAbility(i_idx);
}
inline void dComIfGs_setEmptyBombBag() {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag();
}