From 3c89d769dca2795130747aae4f395fe5fc2ad888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 21 Mar 2021 19:23:10 +0100 Subject: use headers --- arm9/global.inc | 1 - arm9/src/error_handling.c | 2 +- arm9/src/error_message_reset.c | 2 +- arm9/src/heap.c | 2 +- include/error_message_reset.h | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arm9/global.inc b/arm9/global.inc index d269aed4..337d2c0c 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -5478,7 +5478,6 @@ .extern FUN_0208A330 .extern FUN_0208A334 .extern FUN_0208A338 -.extern PrintErrorMessageAndReset .extern FUN_0208AC14 .extern FUN_0208AC58 .extern FUN_0208ACEC diff --git a/arm9/src/error_handling.c b/arm9/src/error_handling.c index 9052773f..a01894f6 100644 --- a/arm9/src/error_handling.c +++ b/arm9/src/error_handling.c @@ -1,8 +1,8 @@ #include "global.h" #include "error_handling.h" +#include "error_message_reset.h" extern u32 FUN_02031810(void); -extern void PrintErrorMessageAndReset(void); THUMB_FUNC void ErrorHandling(void) { diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index bbab7899..7d1caccb 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -143,4 +143,4 @@ THUMB_FUNC void PrintErrorMessageAndReset() OS_ResetSystem(0); } -} \ No newline at end of file +} diff --git a/arm9/src/heap.c b/arm9/src/heap.c index c27a40c0..84abc834 100644 --- a/arm9/src/heap.c +++ b/arm9/src/heap.c @@ -1,11 +1,11 @@ #include "heap.h" +#include "error_message_reset.h" extern void *tempName_NNS_FndCreateExpHeapEx(void *param0, u32 param1, u32 param2); extern void *tempName_NNS_FndAllocFromExpHeapEx(void *param0, u32 param1, s32 param2); extern void thunk_FUN_020adc8c(); extern void FUN_020ADDF0(void *ptr1, void *ptr2); extern u32 FUN_02031810(void); -extern void PrintErrorMessageAndReset(void); extern u32 FUN_020ADDC8(void *param0); extern void FUN_020AE82C(u32 param0, void *param1, u32 param2); extern u32 FUN_020ADDC0(void *param0); diff --git a/include/error_message_reset.h b/include/error_message_reset.h index 90e70465..d8542df5 100644 --- a/include/error_message_reset.h +++ b/include/error_message_reset.h @@ -36,4 +36,4 @@ struct GraphicsModes { THUMB_FUNC void VBlankHandler(); THUMB_FUNC void PrintErrorMessageAndReset(); -#endif //POKEDIAMOND_ERROR_MESSAGE_RESET_H \ No newline at end of file +#endif //POKEDIAMOND_ERROR_MESSAGE_RESET_H -- cgit v1.2.3