diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-31 14:25:20 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-31 14:25:20 -0400 |
| commit | 5787ba96ba2bcb0860422c3e66c179e63368acac (patch) | |
| tree | 38ff48e4d286804b19f920af382351d4d11a13d0 /include | |
| parent | 00cbfe2e138c842d9c0bce4e1848d3eaa88a39b8 (diff) | |
| parent | bf25a361cd0d013beb86a936b516957b66cfa011 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
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 |