various fixes / matches (#2052)

* some fixes in d/s, d_item, d_shop

* fix for dKankyo_DayProc weak generation

* d_cc_uty fix

* some d_name / d_com_inf_game / f_op_actor_mng matches

* fix some player inline virtuals

* remove asm
This commit is contained in:
TakaRikka
2024-01-29 07:39:51 -08:00
committed by GitHub
parent 7f0ba98c9f
commit 36a29bc4fe
52 changed files with 2407 additions and 7166 deletions
+15 -3
View File
@@ -72,9 +72,9 @@ public:
/* 8002F3B4 */ int load(char const**, JKRHeap*);
private:
/* 0x0 */ const char** field_0x0;
/* 0x4 */ request_of_phase_process_class field_0x4;
/* 0xC */ u8 field_0xc;
/* 0x0 */ const char** mResNameTable;
/* 0x4 */ request_of_phase_process_class mPhase;
/* 0xC */ u8 mLoadIndex;
};
enum PlayerPtr { LINK_PTR, HORSE_PTR };
@@ -1840,6 +1840,18 @@ inline void dComIfGs_offPlayerFieldLastStayFieldDataExistFlag() {
g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().offFieldDataExistFlag();
}
inline void dComIfGs_onPlayerFieldLastStayFieldDataExistFlag() {
g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().onFieldDataExistFlag();
}
inline cXyz& dComIfGs_getPlayerFieldLastStayPos() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().getPos();
}
inline u8 dComIfGs_getPlayerFieldLastStayRegionNo() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().getRegionNo();
}
void dComIfGp_setSelectItem(int index);
s32 dComIfGp_offHeapLockFlag(int flag);
void dComIfGp_createSubExpHeap2D();