mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 07:25:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match all funcs in d_menu_ring (#2113)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPicture.h
+1 -5
View File
@@ -97,11 +97,7 @@ public:
/* 802FF634 */ virtual u8 getTextureCount() const;
/* 80053C6C */ virtual bool setBlack(JUtility::TColor);
/* 80053C44 */ virtual bool setWhite(JUtility::TColor);
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
mBlack = i_black;
mWhite = i_white;
return 1;
}
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white);
/* 801DFA4C */ virtual JUtility::TColor getBlack() const;
/* 801DFA40 */ virtual JUtility::TColor getWhite() const;
/* 8025603C */ virtual bool getMaterial() const;
include/d/com/d_com_inf_game.h
+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();
}
include/d/menu/d_menu_ring.h
+10 -6
View File
@@ -41,7 +41,7 @@ public:
/* 801ED2BC */ void stick_wait_init();
/* 801ED31C */ void stick_wait_proc();
/* 801ED490 */ void stick_move_init();
/* 801ED53C */ f32 stick_move_proc();
/* 801ED53C */ void stick_move_proc();
/* 801ED934 */ void stick_explain_init();
/* 801ED938 */ void stick_explain_force_init();
/* 801ED93C */ void stick_explain_proc();
@@ -69,7 +69,11 @@ public:
/* 801EF484 */ bool dpdMove();
/* 801EF48C */ u8 openExplain(u8);
#ifdef NONMATCHING
virtual void draw() { _draw(); }
#else
/* 801EF560 */ virtual void draw();
#endif
/* 801EA708 */ virtual ~dMenu_Ring_c();
void drawFlag0() { mDrawFlag = 0; }
@@ -133,9 +137,9 @@ private:
/* 0x620 */ f32 field_0x620;
/* 0x624 */ f32 field_0x624;
/* 0x628 */ u32 field_0x628;
/* 0x62C */ u32 field_0x62c;
/* 0x630 */ u32 field_0x630;
/* 0x634 */ u32 field_0x634;
/* 0x62C */ u32 mPlayerIsWolf;
/* 0x630 */ u32 mNameStringID;
/* 0x634 */ s32 field_0x634;
/* 0x638 */ s16 field_0x638;
/* 0x63A */ s16 field_0x63a;
/* 0x63C */ s16 field_0x63c;
@@ -152,7 +156,7 @@ private:
/* 0x686 */ s16 field_0x686[4];
/* 0x68E */ s16 field_0x68e;
/* 0x690 */ u8 field_0x690[MAX_ITEM_SLOTS];
/* 0x6A8 */ u8 mStatus;
/* 0x6A8 */ u8 field_0x6a8;
/* 0x6A9 */ u8 field_0x6a9;
/* 0x6AA */ u8 field_0x6aa;
/* 0x6AB */ u8 field_0x6ab;
@@ -160,7 +164,7 @@ private:
/* 0x6AD */ u8 field_0x6ad;
/* 0x6AE */ u8 field_0x6ae;
/* 0x6AF */ u8 field_0x6af;
/* 0x6B0 */ u8 field_0x6b0;
/* 0x6B0 */ u8 mStatus;
/* 0x6B1 */ u8 field_0x6b1;
/* 0x6B2 */ u8 field_0x6b2;
/* 0x6B3 */ u8 field_0x6b3;