Merge pull request #255 from red031000/master

cleanup error handling

include/assert.h

@@ -1,6 +1,8 @@
 #ifndef POKEHEARTGOLD_ASSERT_H
 #define POKEHEARTGOLD_ASSERT_H
 
+#include "error_handling.h"
+
 /*
  * Assert statements. If the expression evaluates false,
  * the software will terminate.
@@ -13,13 +15,4 @@
 #define GF_ASSERT(...) ((void)0)
 #endif //PM_KEEP_ASSERTS
 
-/*
- * void GF_AssertFail(void)
- *
- * Called when an assertion fails.
- * Do not use this directly.
- * Instead, use the GF_ASSERT macro defined above.
- */
-void GF_AssertFail(void);
-
 #endif //POKEHEARTGOLD_ASSERT_H

include/error_handling.h

@@ -1,6 +1,13 @@
 #ifndef POKEHEARTGOLD_ERROR_HANDLING_H
 #define POKEHEARTGOLD_ERROR_HANDLING_H
 
-void PrintErrorMessageAndReset(void);
+/*
+ * void GF_AssertFail(void)
+ *
+ * Called when an assertion fails.
+ * Do not use this directly.
+ * Instead, use the GF_ASSERT macro defined above.
+ */
+void GF_AssertFail(void);
 
 #endif //POKEHEARTGOLD_ERROR_HANDLING_H

src/error_handling.c

@@ -1,6 +1,7 @@
 #include "global.h"
-#include "unk_02037C94.h"
 #include "error_handling.h"
+#include "error_message_reset.h"
+#include "unk_02037C94.h"
 
 void GF_AssertFail(void) {
     if (!sub_02037D78()) {

src/heap.c

@@ -2,6 +2,7 @@
 #include "heap.h"
 #include "unk_02037C94.h"
 #include "error_handling.h"
+#include "error_message_reset.h"
 
 struct HeapInfo {
     NNSFndHeapHandle *heapHandles;