summaryrefslogtreecommitdiff
path: root/include/d/com
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2024-01-29 07:39:51 -0800
committerGitHub <noreply@github.com>2024-01-29 17:39:51 +0200
commit36a29bc4fe6464d57d693ab24aedd97e4bb59310 (patch)
tree7f3b3979a7a4e385e0ef87dc5f6059e4ac5872da /include/d/com
parent7f0ba98c9f694234bd88cf1263840c5e8aaea390 (diff)
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
Diffstat (limited to 'include/d/com')
-rw-r--r--include/d/com/d_com_inf_game.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 2848f26ea5..27d6f06136 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -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();