From 210e350ee02a8d6348fdddf0792ecd772ab7a784 Mon Sep 17 00:00:00 2001 From: robojumper Date: Thu, 2 May 2024 00:10:44 +0200 Subject: some crc --- include/m/m_heap.h | 2 +- include/toBeSorted/file_manager.h | 33 +++++++++++++++++++++--------- include/toBeSorted/save_file.h | 42 +++++++++++++++++++-------------------- 3 files changed, 46 insertions(+), 31 deletions(-) (limited to 'include') diff --git a/include/m/m_heap.h b/include/m/m_heap.h index 4ee94d11..65edc4e5 100644 --- a/include/m/m_heap.h +++ b/include/m/m_heap.h @@ -33,7 +33,7 @@ namespace mHeap { u32 unk); /* 802f1450 */ int getGameHeapNum(); /* 802f1460 */ EGG::ExpHeap *createGameHeap(s32 heapNum, size_t size, EGG::Heap *parentHeap); -/* 802f1510 */ EGG::Heap *createGameHeap1(s32 size, EGG::Heap *parentHeap); +/* 802f1510 */ EGG::ExpHeap *createGameHeap1(s32 size, EGG::Heap *parentHeap); /* 802f1560 */ EGG::ExpHeap *createArchiveHeap(size_t size, EGG::Heap *parentHeap); /* 802f1590 */ EGG::ExpHeap *createCommandHeap(size_t size, EGG::Heap *parentHeap); /* 802f15c0 */ EGG::ExpHeap *createDylinkHeap(size_t size, EGG::Heap *parentHeap); diff --git a/include/toBeSorted/file_manager.h b/include/toBeSorted/file_manager.h index 0bf79629..1be099b1 100644 --- a/include/toBeSorted/file_manager.h +++ b/include/toBeSorted/file_manager.h @@ -8,14 +8,29 @@ enum ITEM_ID {}; enum SAVE_ITEM_ID {}; +class SkipData { +public: + /** 0x00 */ u16 data[16]; + /** 0x20 */ u32 crc; +}; + +class SavedSaveFiles { +public: + /** 0x00 */ char regionCode[4]; + /** 0x04 */ u8 unk1[0x1C - 0x04]; + /** 0x1C */ u32 m_0x1C; + /** 0x20 */ SaveFile saveFiles[3]; + /** 0xfb60 */ SkipData skipData[3]; + /** 0xfbcc */ u8 unk2[0xfbe0 - 0xfb60]; +}; + class FileManager { public: - /* 0x0000 */ void *mpSavedSaveFiles; - /* 0x0004 */ void *mpSkipData; // skip data Arrary (3 entries ) + /* 0x0000 */ SavedSaveFiles *mpSavedSaveFiles; + /* 0x0004 */ SkipData *mpSkipData; // skip data Arrary (3 entries ) /* 0x0008 */ SaveFile mFileA; /* 0x53C8 */ SaveFile mFileB; - /* 0xA788 */ u16 mSkipFlags[16]; - /* 0xA7A8 */ u32 mSkipFlagsCRC; + /* 0xA788 */ SkipData mSkipData; /* 0xA7AC */ wchar_t mHeroNames[3][9]; // each name is 9 wchars /* 0xA7E2 */ wchar_t mHeroName[9]; // The current Hero Name /* 0xA7F4 */ char mCurrentArea[32]; @@ -219,7 +234,7 @@ public: /* 8000D040 */ u8 getSkykeepPuzzleTile(u32 spot); /* 8000D0B0 */ void checkFileStatus(); - /* 8000D1D0 */ void checkSkipDataCRCs(); + /* 8000D1D0 */ bool checkSkipDataCRCs(); /* 8000D270 */ void saveOrClearSelectedFileToFileA(); /* 8000D280 */ void saveOrClearToFileA(int fileNum); /* 8000D9C0 */ void copyFileBToCurrentFile(); @@ -230,7 +245,7 @@ public: /* 8000EF90 */ void saveFileAToFile(int fileNum); /* 8000F730 */ void copyCurrentToFileB(); /* 8000FDF0 */ void copySelectedFileSkipData(); - /* 8000FE00 */ void copySkipData(int fileNum); + /* 8000FE00 */ void copySkipData(u8 fileNum); /* 8000FEB0 */ void setInfo_FileB(); /* 8000FF60 */ void clearFileA(); @@ -247,14 +262,14 @@ public: /* 80011250 */ u16 *getSkipFlags2(); /* 80011260 */ SaveFile *getFileA(); /* 80011270 */ SaveFile *getFileB(); - /* 80011280 */ void calcFileCRC(const SaveFile *file, u32 length); + /* 80011280 */ u32 calcFileCRC(const void *data, u32 length); /* 80011290 */ void updateEmptyFiles(); /* 800112D0 */ void updateEmptyFileFlags(); /* 80011370 */ bool isFileEmpty(int fileNum); - /* 80011390 */ bool isFileUnk3(int fileNum); + /* 80011390 */ bool isFileDirty(int fileNum); /* 800113B0 */ u8 get_0xA84C(); /* 800113C0 */ bool checkRegionCode(); - /* 80011440 */ bool checkFileCRC(int fileNum); + /* 80011440 */ bool checkFileCRC(u8 fileNum); /* 80011490 */ bool isFileInactive() const; /* 80011500 */ void setPlayerInfoFileA(); /* 800115E0 */ void setT3Info(mVec3_c *pos, mAng3_c *rot); diff --git a/include/toBeSorted/save_file.h b/include/toBeSorted/save_file.h index 1a8fea8d..22c57de2 100644 --- a/include/toBeSorted/save_file.h +++ b/include/toBeSorted/save_file.h @@ -9,7 +9,7 @@ // non-offical name struct SaveFile { public: - /* 0x 0000 */ char field_0x0000[0x8 - 0x0]; + /* 0x 0000 */ s64 playTime; /* 0x 0008 */ s64 savedTime; /* 0x 0010 */ mVec3_c pos_t1; /* 0x 001c */ mVec3_c pos_t2; @@ -17,11 +17,11 @@ public: /* 0x 0034 */ mVec3_c beacon_pos[32][5]; /* 0x 07b4 */ s32 beedleShopPathSegment; /* 0x 07b8 */ f32 beedlShopPathSegFrac; - /* 0x 07bc */ char field_0x07BC[0x7c0 - 0x7bc]; + /* 0x 07bc */ u32 field_0x07BC; /* 0x 07c0 */ s32 pouch_items[8]; /* 0x 07e0 */ s32 item_check_items[60]; /* 0x 08d0 */ int file_area_index; - /* 0x 08d4 */ s16 player_name[8]; + /* 0x 08d4 */ wchar_t player_name[8]; /* 0x 08e4 */ u16 story_flags[128]; /* 0x 09e4 */ u16 item_flags[64]; /* 0x 0a64 */ u16 dungeon_flags[8][22]; @@ -34,15 +34,15 @@ public: /* 0x 302c */ u16 hitByEnemyCounts[100]; /* 0x 30f4 */ u16 temp_flags[4]; /* 0x 30fc */ u16 zone_flags[252]; - /* 0x 32f4 */ u16 unk_flags[4096]; // size guessed? (saw memset) - /* 0x 52f4 */ s16 air_potion_timer; - /* 0x 52f6 */ s16 air_potion_plus_timer; - /* 0x 52f8 */ s16 stamina_potion_timer; - /* 0x 52fa */ s16 stamina_potion_plus_timer; - /* 0x 52fc */ s16 gaurdian_potion_timer; - /* 0x 52fe */ s16 gaurdian_potion_plus_timer; - /* 0x 5300 */ s16 field_0x5300; - /* 0x 5302 */ s16 health_capacity; + /* 0x 32f4 */ u16 enemy_flags[4096]; + /* 0x 52f4 */ u16 air_potion_timer; + /* 0x 52f6 */ u16 air_potion_plus_timer; + /* 0x 52f8 */ u16 stamina_potion_timer; + /* 0x 52fa */ u16 stamina_potion_plus_timer; + /* 0x 52fc */ u16 gaurdian_potion_timer; + /* 0x 52fe */ u16 gaurdian_potion_plus_timer; + /* 0x 5300 */ u16 field_0x5300; + /* 0x 5302 */ u16 health_capacity; /* 0x 5304 */ u16 unused_heart_related; /* 0x 5306 */ u16 current_health; /* 0x 5308 */ u16 room_id_t1; @@ -88,20 +88,20 @@ public: /* 800099b0 */ u16 *getStoryFlags0(); /* 800099c0 */ const u16 *getStoryFlags1() const; /* 800099d0 */ u16 *getItemFlags0(); - /* 800099e0 */ u16 *getItemFlags1(); + /* 800099e0 */ const u16 *getItemFlags1() const; /* 800099F0 */ u16 *getDungeonFlags0(); - /* 80009A00 */ u16 *getDungeonFlags1(); + /* 80009A00 */ const u16 *getDungeonFlags1() const; /* 80009A10 */ u16 *getSceneFlags0(); - /* 80009A20 */ u16 *getSceneFlags1(); + /* 80009A20 */ const u16 *getSceneFlags1() const; /* 80009A30 */ u16 *getTboxFlags0(); - /* 80009A40 */ u16 *getTboxFlags1(); + /* 80009A40 */ const u16 *getTboxFlags1() const; /* 80009A50 */ u16 *getTempFlags0(); - /* 80009A60 */ u16 *getTempFlags1(); + /* 80009A60 */ const u16 *getTempFlags1() const; /* 80009A70 */ u16 *getZoneFlags0(); - /* 80009A80 */ u16 *getZoneFlags1(); - /* 80009A90 */ u16 *getUnkFlags0(); - /* 80009AA0 */ u16 *getUnkFlags1(); - /* 80009AB0 */ s16 *getPlayerName(); // UTF16-BE + /* 80009A80 */ const u16 *getZoneFlags1() const; + /* 80009A90 */ u16 *getEnemyFlags0(); + /* 80009AA0 */ const u16 *getEnemyFlags1() const; + /* 80009AB0 */ wchar_t *getPlayerName(); // UTF16-BE /* 80009AC0 */ void setAreaT1(char *name); /* 80009BE0 */ char *getAreaT1(); /* 80009BF0 */ void setAreaT2(char *name); -- cgit v1.2.3