diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-08-20 19:49:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-08-20 19:49:02 -0400 |
| commit | 36eef8e744976e708abc3652a95f662346ee7072 (patch) | |
| tree | 32d153f833a19450161220039116316fb3dd2f18 /include | |
| parent | bcf0ab205d42d5653215da7b19ece57d74438417 (diff) | |
| parent | c1fe116810ccce4cf5bd1c15559ba1e2ffe57663 (diff) | |
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'include')
| -rw-r--r-- | include/main.h | 2 | ||||
| -rw-r--r-- | include/save_data_read_error.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/main.h b/include/main.h index ba4d7bc2..87110de5 100644 --- a/include/main.h +++ b/include/main.h @@ -94,7 +94,7 @@ struct Main u16 touchNew; u16 touchHeld; u8 touchpadReadAuto; - u8 unk65; + u8 screensFlipped; u8 unk66; u8 unk67; u8 softResetDisabled; diff --git a/include/save_data_read_error.h b/include/save_data_read_error.h new file mode 100644 index 00000000..482e78d7 --- /dev/null +++ b/include/save_data_read_error.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_SAVE_DATA_READ_ERROR_H +#define POKEDIAMOND_SAVE_DATA_READ_ERROR_H + +void ShowSaveDataReadError(u32 heap_id); + +#endif |