diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-08-31 14:25:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 14:25:08 -0400 |
| commit | bf25a361cd0d013beb86a936b516957b66cfa011 (patch) | |
| tree | a43d3b7f6f6c7bf163ec6183a3682ec047163ad5 /include | |
| parent | 0a880566f5889cdeb6fa3f96f5916c39dbb16b38 (diff) | |
| parent | e20f0ad32ec45564d4ad8c0c3ed07d9c21744588 (diff) | |
Merge pull request #275 from red031000/master
arm9 MI_init, MI_wram and MI_uncompress + error_handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/error_handling.h | 6 | ||||
| -rw-r--r-- | include/global.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/error_handling.h b/include/error_handling.h new file mode 100644 index 00000000..1299fcba --- /dev/null +++ b/include/error_handling.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_ERROR_HANDLING_H +#define POKEDIAMOND_ERROR_HANDLING_H + +void ErrorHandling(void); + +#endif //POKEDIAMOND_ERROR_HANDLING_H diff --git a/include/global.h b/include/global.h index 3b377e5e..e0e8cb22 100644 --- a/include/global.h +++ b/include/global.h @@ -8,11 +8,10 @@ #include "nitro.h" #include "global.fieldmap.h" #include "constants/global.h" +#include "error_handling.h" #define NELEMS(a) (sizeof(a) / sizeof(*(a))) -extern void ErrorHandling(void); - #define GF_ASSERT(expr) do {if (!(expr)) ErrorHandling();} while (0) #ifndef IN_MAIN_C |