diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2023-08-03 07:39:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-03 10:39:54 -0400 |
| commit | 462cd091eeff35bb95fcf1fedfd24dff7ba038b3 (patch) | |
| tree | 3b0b87dc2cafd457f668bc039be1480378cdfab6 /include | |
| parent | bc0475f78d4fd5d35ca2e824f870980eb29c765b (diff) | |
m_common_data OK (#27)
* m_common_data OK
* Respond to review
Diffstat (limited to 'include')
| -rw-r--r-- | include/68AAF0.h | 2 | ||||
| -rw-r--r-- | include/m_common_data.h | 22 | ||||
| -rw-r--r-- | include/m_field_info.h | 4 |
3 files changed, 23 insertions, 5 deletions
diff --git a/include/68AAF0.h b/include/68AAF0.h index 34f7311..0c5cb84 100644 --- a/include/68AAF0.h +++ b/include/68AAF0.h @@ -3,6 +3,6 @@ #include "ultra64.h" -// void clip_clear(); +void clip_clear(void); #endif diff --git a/include/m_common_data.h b/include/m_common_data.h index 3da880f..1c74775 100644 --- a/include/m_common_data.h +++ b/include/m_common_data.h @@ -3,8 +3,24 @@ #include "ultra64.h" -// void common_data_reinit(); -// void common_data_init(); -// void common_data_clear(); +typedef struct CommonData { + /* 0x00000 */ u8 unk_00000[0x10000]; + /* 0x10000 */ u8 unk_10000; // named "game_started" in AC GCN decomp + /* 0x10001 */ u8 unk_10001[0x3]; + /* 0x10004 */ s32 unk_10004; // named "last_scene_no" in AC GCN decomp + /* 0x10008 */ u8 unk_10008[0x143]; + /* 0x1014B */ u8 unk_1014B; // named "wipeType" in AC GCN decomp + /* 0x1014C */ u8 unk_1014C[0x66A]; + /* 0x107B6 */ s16 unk_107B6; // named "demo_profile" in AC GCN decomp (though it's an array of two s16s in that game) + /* 0x107B8 */ u8 unk_107B8[0x2F8]; + /* 0x10AB0 */ u8 unk_10AB0; // named "pad_connected" in AC GCN decomp + /* 0x10AB1 */ u8 unk_10AB1[0x7]; +} CommonData; // size = 0x10AB8 + +void common_data_reinit(void); +void common_data_init(void); +void common_data_clear(void); + +extern CommonData common_data; #endif diff --git a/include/m_field_info.h b/include/m_field_info.h index 7735958..a007926 100644 --- a/include/m_field_info.h +++ b/include/m_field_info.h @@ -3,6 +3,8 @@ #include "ultra64.h" +struct CommonData; + // void func_80087C30_jp(); // void func_80087C40_jp(); // void func_80087C64_jp(); @@ -203,7 +205,7 @@ // void func_8008EEE8_jp(); // void func_8008EF0C_jp(); // void mFRm_CheckSaveData(); -// void mFRm_ClearSaveCheckData(); +void mFRm_ClearSaveCheckData(CommonData* common_data); // void func_8008EFDC_jp(); // void func_8008F020_jp(); // void func_8008F040_jp(); |