diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-05-26 03:30:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 03:30:25 +0100 |
| commit | 395de03637046068e1b4ad79f1c8b230b8f2b0c8 (patch) | |
| tree | c73803288addbc3256be6ca71a965670833c55fe /include | |
| parent | 73e48106d014792276f46e185b1a7ccd30bf4f00 (diff) | |
| parent | 7d10ba28169226bf00b741f7d01bc3386b383343 (diff) | |
Merge branch 'master' into unk_0208A300
Diffstat (limited to 'include')
| -rw-r--r-- | include/error_handling.h | 2 | ||||
| -rw-r--r-- | include/gf_rtc.h | 31 | ||||
| -rw-r--r-- | include/global.h | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/include/error_handling.h b/include/error_handling.h index 1299fcba..c14c93fe 100644 --- a/include/error_handling.h +++ b/include/error_handling.h @@ -1,6 +1,6 @@ #ifndef POKEDIAMOND_ERROR_HANDLING_H #define POKEDIAMOND_ERROR_HANDLING_H -void ErrorHandling(void); +void GF_AssertFail(void); #endif //POKEDIAMOND_ERROR_HANDLING_H diff --git a/include/gf_rtc.h b/include/gf_rtc.h new file mode 100644 index 00000000..f7a4e2a7 --- /dev/null +++ b/include/gf_rtc.h @@ -0,0 +1,31 @@ +#ifndef POKEDIAMOND_GF_RTC_H
+#define POKEDIAMOND_GF_RTC_H
+
+#include "RTC_api.h"
+
+enum RTC_Month
+{
+ RTC_MONTH_JANUARY = 1,
+ RTC_MONTH_FEBRUARY,
+ RTC_MONTH_MARCH,
+ RTC_MONTH_APRIL,
+ RTC_MONTH_MAY,
+ RTC_MONTH_JUNE,
+ RTC_MONTH_JULY,
+ RTC_MONTH_AUGUST,
+ RTC_MONTH_SEPTEMBER,
+ RTC_MONTH_OCTOBER,
+ RTC_MONTH_NOVEMBER,
+ RTC_MONTH_DECEMBER,
+};
+
+enum RTC_TimeOfDay
+{
+ RTC_TIMEOFDAY_MORN = 0,
+ RTC_TIMEOFDAY_DAY,
+ RTC_TIMEOFDAY_EVE,
+ RTC_TIMEOFDAY_NITE,
+ RTC_TIMEOFDAY_LATE,
+};
+
+#endif //POKEDIAMOND_GF_RTC_H
diff --git a/include/global.h b/include/global.h index 1c92a1ec..1853dbc3 100644 --- a/include/global.h +++ b/include/global.h @@ -11,7 +11,7 @@ #define NELEMS(a) (sizeof(a) / sizeof(*(a))) -#define GF_ASSERT(expr) do {if (!(expr)) ErrorHandling();} while (0) +#define GF_ASSERT(expr) do {if (!(expr)) GF_AssertFail();} while (0) #ifndef IN_MAIN_C extern const u8 gGameLanguage; |