d_file_select matching for JPN and demo

This commit is contained in:
LagoLunatic
2025-06-14 19:09:05 -04:00
parent 3fbb9b5e74
commit 92a094ef6d
8 changed files with 591 additions and 225 deletions
+16
View File
@@ -903,6 +903,10 @@ inline void dComIfGs_init() {
g_dComIfG_gameInfo.save.init();
}
inline void dComIfGs_reinit() {
g_dComIfG_gameInfo.save.reinit();
}
inline u8 dComIfGs_checkReserveItem(u8 i_itemNo) {
return g_dComIfG_gameInfo.save.getPlayer().getBagItem().checkReserveItem(i_itemNo);
}
@@ -1400,6 +1404,14 @@ inline void dComIfGs_setTurnRestart(const cXyz& i_pos, s16 i_angle, s8 i_roomNo,
g_dComIfG_gameInfo.save.getTurnRestart().set(i_pos, i_angle, i_roomNo, i_param, i_shipPos, i_shipAngle, i_hasShip);
}
inline void dComIfGs_setMemoryToCard(u8* i_cardPtr, int i_dataNum) {
g_dComIfG_gameInfo.save.memory_to_card((char*)i_cardPtr, i_dataNum);
}
inline void dComIfGs_setInitDataToCard(u8* i_cardPtr, int i_dataNum) {
g_dComIfG_gameInfo.save.initdata_to_card((char*)i_cardPtr, i_dataNum);
}
inline u8 dComIfGs_getDataNum() {
return g_dComIfG_gameInfo.save.getDataNum();
}
@@ -1424,6 +1436,10 @@ inline u8 dComIfGs_getNewFile() {
return g_dComIfG_gameInfo.save.getNewFile();
}
inline void dComIfGs_setNewFile(u8 file) {
g_dComIfG_gameInfo.save.setNewFile(file);
}
inline void dComIfGs_setMemCardCheckID(u64 id) {
g_dComIfG_gameInfo.save.setMemCardCheckID(id);
}
+4 -1
View File
@@ -14,7 +14,7 @@ public:
dFs_HIO_c();
virtual ~dFs_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x05;
/* 0x06 */ u8 field_0x06;
/* 0x07 */ u8 field_0x07;
@@ -109,6 +109,9 @@ public:
dFile_select_c() {}
void _create();
void initial();
#if VERSION == VERSION_DEMO
void _deleteSp();
#endif
void _delete();
void _move();
bool _open();
+9 -9
View File
@@ -931,13 +931,13 @@ public:
void initDan(s8 i_stage) { mDan.init(i_stage); }
u8 getDataNum() { return mDataNum; }
u64 getMemCardCheckID() { return field_0x1298; }
u8 getNewFile() { return field_0x1292; }
u8 getNoFile() { return field_0x1291; }
void setDataNum(u8 num) { mDataNum = num; }
void setMemCardCheckID(u64 id) { field_0x1298 = id; }
void setNewFile(u8) {}
void setNoFile(u8 no) { field_0x1291 = no; }
u8 getNoFile() { return mNoFile; }
void setNoFile(u8 no) { mNoFile = no; }
u8 getNewFile() { return mNewFile; }
void setNewFile(u8 file) {mNewFile = file; }
u64 getMemCardCheckID() { return mMemCardCheckID; }
void setMemCardCheckID(u64 id) { mMemCardCheckID = id; }
static const int MEMORY_SWITCH = 0x80;
static const int DAN_SWITCH = 0x40;
@@ -956,9 +956,9 @@ public:
/* 0x1158 */ dSv_event_c mTmp;
/* 0x1258 */ dSv_turnRestart_c mTurnRestart;
/* 0x1290 */ u8 mDataNum;
/* 0x1291 */ u8 field_0x1291;
/* 0x1292 */ u8 field_0x1292;
/* 0x1298 */ u64 field_0x1298;
/* 0x1291 */ u8 mNoFile;
/* 0x1292 */ u8 mNewFile;
/* 0x1298 */ u64 mMemCardCheckID;
}; // Size: 0x12A0
#if VERSION > VERSION_DEMO