d_shop_system, d_s_name, s_save_HIO (#343)

* d_s_name OK

* d_save_HIO ok

* d_shop_system functions matching except sinit order issue
This commit is contained in:
hatal175
2023-06-02 23:28:29 +03:00
committed by GitHub
parent 7b7dba2c12
commit 598aa4aa8c
65 changed files with 419 additions and 5286 deletions
+43
View File
@@ -2,5 +2,48 @@
#define D_S_D_S_NAME_H
#include "dolphin/types.h"
#include "f_op/f_op_camera_mng.h"
#include "f_op/f_op_scene.h"
class JKRExpHeap;
class dFile_select_c;
class dBrightCheck_c;
class dScnName_camera_c : public camera_process_class {
public:
dScnName_camera_c() { field_0x22f = 84; }
/* 80259294 */ virtual ~dScnName_camera_c() {}
};
class dScnName_c : public scene_class {
public:
dScnName_c() {}
/* 802588A0 */ s32 create();
/* 80258B2C */ void setView();
/* 80258BC8 */ s32 execute();
/* 80258C5C */ s32 draw();
/* 80258CC8 */ ~dScnName_c();
/* 80258DD0 */ void FileSelectOpen();
/* 80258E34 */ void FileSelectMain();
/* 80258E78 */ void FileSelectMainNormal();
/* 80258F20 */ void FileSelectClose();
/* 80258FD4 */ void brightCheckOpen();
/* 80259008 */ void brightCheck();
/* 802590F8 */ void changeGameScene();
private:
/* 0x1C4 */ request_of_phase_process_class field_0x1c4;
/* 0x1CC */ JKRExpHeap* mHeap;
/* 0x1D0 */ JKRExpHeap* field_0x1d0;
/* 0x1D4 */ dScnName_camera_c mCamera;
/* 0x414 */ dFile_select_c* dFs_c;
/* 0x418 */ dBrightCheck_c* mBrightCheck;
/* 0x41C */ u8 field_0x41c;
/* 0x41D */ u8 field_0x41d;
/* 0x41E */ u8 field_0x41e;
/* 0x41F */ u8 field_0x41f;
/* 0x420 */ u8 field_0x420;
};
#endif /* D_S_D_S_NAME_H */
+53 -38
View File
@@ -9,12 +9,12 @@ public:
/* 8025C0A0 */ dSvBit_childTransformHIO_c();
/* 8025C0D4 */ void init();
/* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c();
/* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool WF[4];
/* 0x09 */ bool field_0x9[4];
/* 0x05 */ u8 WF[4];
/* 0x09 */ u8 field_0x9[4];
};
class dSvBit_childDarknessHIO_c {
@@ -22,12 +22,12 @@ public:
/* 8025C004 */ dSvBit_childDarknessHIO_c();
/* 8025C038 */ void init();
/* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c();
/* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool TW[6];
/* 0x0B */ bool field_0x9[6];
/* 0x05 */ u8 TW[6];
/* 0x0B */ u8 field_0xB[6];
};
class dSvBit_childOtherHIO_c {
@@ -35,14 +35,14 @@ public:
/* 8025C13C */ dSvBit_childOtherHIO_c();
/* 8025C178 */ void init();
/* 8025C29C */ virtual ~dSvBit_childOtherHIO_c();
/* 8025C29C */ virtual ~dSvBit_childOtherHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ u8 mDropNum;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ bool mLightVessel[4];
/* 0x0B */ bool field_0xb[4];
/* 0x07 */ u8 mLightVessel[4];
/* 0x0B */ u8 field_0xb[4];
};
class dSvBit_childTbPerfectionHIO_c {
@@ -50,17 +50,20 @@ public:
/* 8025BF68 */ dSvBit_childTbPerfectionHIO_c();
/* 8025BF9C */ void init();
/* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c();
/* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x40];
/* 0x45 */ bool field_0x45[0x40];
/* 0x05 */ u8 field_0x5[0x40];
/* 0x45 */ u8 field_0x45[0x40];
};
class dSvBit_childTreasureHIO_c {
public:
/* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c();
/* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c() {}
void init() {
mPerfectSave.init();
}
private:
/* 0x04 */ u8 field_0x4;
@@ -72,7 +75,7 @@ public:
/* 8025BCB0 */ dSvBit_childSwZoneHIO_c();
/* 8025BCE4 */ void init();
/* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c();
/* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
@@ -85,12 +88,12 @@ public:
/* 8025BB78 */ dSvBit_childSwPerfectionHIO_c();
/* 8025BBAC */ void init();
/* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c();
/* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x80];
/* 0x85 */ bool field_0x85[0x80];
/* 0x05 */ u8 field_0x5[0x80];
/* 0x85 */ u8 field_0x85[0x80];
};
class dSvBit_childSwOneZoneHIO_c {
@@ -98,7 +101,7 @@ public:
/* 8025BD10 */ dSvBit_childSwOneZoneHIO_c();
/* 8025BD44 */ void init();
/* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c();
/* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
@@ -111,17 +114,23 @@ public:
/* 8025BC14 */ dSvBit_childSwDungeonHIO_c();
/* 8025BC48 */ void init();
/* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c();
/* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x40];
/* 0x45 */ bool field_0x45[0x40];
/* 0x05 */ u8 field_0x5[0x40];
/* 0x45 */ u8 field_0x45[0x40];
};
class dSvBit_childSwitchHIO_c {
public:
/* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c();
/* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c() {}
void init() {
field_0x8.init();
field_0x110.init();
field_0x198.init();
field_0x1e0.init();
}
private:
/* 0x004 */ u8 field_0x4;
@@ -136,12 +145,12 @@ public:
/* 8025BEA8 */ dSvBit_childItZoneHIO_c();
/* 8025BEDC */ void init();
/* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c();
/* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x20];
/* 0x25 */ bool field_0x25[0x20];
/* 0x05 */ u8 field_0x5[0x20];
/* 0x25 */ u8 field_0x25[0x20];
};
class dSvBit_childItPerfectionHIO_c {
@@ -149,12 +158,12 @@ public:
/* 8025BD70 */ dSvBit_childItPerfectionHIO_c();
/* 8025BDA4 */ void init();
/* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c();
/* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x20];
/* 0x25 */ bool field_0x25[0x20];
/* 0x05 */ u8 field_0x5[0x20];
/* 0x25 */ u8 field_0x25[0x20];
};
class dSvBit_childItOneZoneHIO_c {
@@ -162,12 +171,12 @@ public:
/* 8025BF08 */ dSvBit_childItOneZoneHIO_c();
/* 8025BF3C */ void init();
/* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c();
/* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x10];
/* 0x15 */ bool field_0x15[0x10];
/* 0x05 */ u8 field_0x5[0x10];
/* 0x15 */ u8 field_0x15[0x10];
};
class dSvBit_childItDungeonHIO_c {
@@ -175,17 +184,23 @@ public:
/* 8025BE0C */ dSvBit_childItDungeonHIO_c();
/* 8025BE40 */ void init();
/* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c();
/* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x05 */ bool field_0x5[0x80];
/* 0x85 */ bool field_0x85[0x80];
/* 0x05 */ u8 field_0x5[0x80];
/* 0x85 */ u8 field_0x85[0x80];
};
class dSvBit_childItemHIO_c {
public:
/* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c();
/* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c() {}
void init() {
mFullSave.init();
mDungeonSave.init();
mZoneSave.init();
mOneZoneSave.init();
}
private:
/* 0x004 */ u8 field_0x4;
@@ -199,7 +214,7 @@ class dSvBit_HIO_c {
public:
/* 8025C1F8 */ void init();
/* 8025C6FC */ virtual ~dSvBit_HIO_c();
/* 8025C6FC */ virtual ~dSvBit_HIO_c() {}
/* 0x004 */ s8 field_0x4;
/* 0x008 */ dSvBit_childSwitchHIO_c mSwitch;
@@ -208,8 +223,8 @@ public:
/* 0x468 */ dSvBit_childDarknessHIO_c mDarkness;
/* 0x47C */ dSvBit_childTransformHIO_c mTransform;
/* 0x48C */ dSvBit_childOtherHIO_c mOther;
/* 0x49C */ bool mTransformFlag;
/* 0x49D */ bool field_0x49d;
/* 0x49C */ u8 mTransformFlag;
/* 0x49D */ u8 field_0x49d;
};
STATIC_ASSERT(sizeof(dSvBit_HIO_c) == 0x4A0);
+1
View File
@@ -16,6 +16,7 @@ public:
void setItemIndex(int i, u32 index) { mItemIndex[i] = index; }
u32 getItemIndex(int i) { return mItemIndex[i]; }
void setMessageIndex(int i, u16 messageIndex) { mMessageIndex[i] = messageIndex; }
u16 getMessageIndex(int i) { return mMessageIndex[i]; }
private:
+1 -1
View File
@@ -120,7 +120,7 @@ public:
/* 8019A364 */ void setSoldOut();
/* 8019A4F4 */ void setSoldOutItemHide();
/* 8019A564 */ void deleteObject();
/* 8019A5D0 */ void searchItemActor();
/* 8019A5D0 */ int searchItemActor();
/* 8019AB00 */ int getFlowNodeNum();
/* 8019AB1C */ void setSellItemMax(u8);
/* 8019AB24 */ bool checkShopOpen();
@@ -16,6 +16,7 @@ public:
/* 80D61050 */ u8 getSwitchBit2();
/* 80D6105C */ void initialize();
/* 80D61168 */ virtual ~daTag_ShopItem_c();
s32 getProcessID() { return field_0x56c; }
/* 0x56C */ s32 field_0x56c;
/* 0x570 */ s16 field_0x570;