From bd4835f73f7e9f12eb8e3bf6ba2ca70edccd4c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 21 Mar 2021 19:21:39 +0100 Subject: [PATCH] rename --- arm9/arm9.lsf | 2 +- arm9/global.inc | 8 +------- arm9/src/{unk_0208A998.c => error_message_reset.c} | 6 +++--- include/{unk_0208A998.h => error_message_reset.h} | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) rename arm9/src/{unk_0208A998.c => error_message_reset.c} (97%) rename include/{unk_0208A998.h => error_message_reset.h} (87%) diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 1b6a6d668..9bd6cb074 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -317,7 +317,7 @@ Static arm9 Object unk_0208A258.o Object unk_0208A300.o Object unk_0208A338.o - Object unk_0208A998.o + Object error_message_reset.o ### Third-party libraries ### Object unk_0208AC14.o Object custom_allocator.o diff --git a/arm9/global.inc b/arm9/global.inc index eb2a9be3d..d269aed47 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8518,10 +8518,4 @@ .extern CARDi_InitCommon .extern MonNotFaintedOrEgg .extern CountAlivePokemon -.extern UNK_020FF49C -.extern UNK_020FF4A4 -.extern UNK_020FF4AC -.extern UNK_020FF4BC -.extern UNK_020FF4D8 -.extern sErrorMessagePrinterLock -.extern FUN_0208A998 + diff --git a/arm9/src/unk_0208A998.c b/arm9/src/error_message_reset.c similarity index 97% rename from arm9/src/unk_0208A998.c rename to arm9/src/error_message_reset.c index 2112fbd1f..bbab7899e 100644 --- a/arm9/src/unk_0208A998.c +++ b/arm9/src/error_message_reset.c @@ -1,4 +1,4 @@ -#include "unk_0208A998.h" +#include "error_message_reset.h" const u32 UNK_020FF49C[2] = { 0x1a030300, 0x00230112 }; @@ -36,7 +36,7 @@ extern BOOL FUN_02033678(void); extern void FUN_02019178(u32 *param0); extern void FUN_0201E740(); -THUMB_FUNC void FUN_0208A998() +THUMB_FUNC void VBlankHandler() { *(vu32 *)HW_INTR_CHECK_BUF |= 1; @@ -60,7 +60,7 @@ THUMB_FUNC void PrintErrorMessageAndReset() FUN_0200E3A0(PM_LCD_BOTTOM, 0); OS_DisableIrqMask(1); - OS_SetIrqFunction(1, &FUN_0208A998); + OS_SetIrqFunction(1, &VBlankHandler); OS_EnableIrqMask(1); Main_SetVBlankIntrCB(NULL, NULL); diff --git a/include/unk_0208A998.h b/include/error_message_reset.h similarity index 87% rename from include/unk_0208A998.h rename to include/error_message_reset.h index a3266398d..90e70465a 100644 --- a/include/unk_0208A998.h +++ b/include/error_message_reset.h @@ -33,7 +33,7 @@ struct GraphicsModes { }; -THUMB_FUNC void FUN_0208A998(); +THUMB_FUNC void VBlankHandler(); THUMB_FUNC void PrintErrorMessageAndReset(); #endif //POKEDIAMOND_ERROR_MESSAGE_RESET_H \ No newline at end of file