From d071b532e5b4ca71d2b5b5c93da18f9b15025a51 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Mon, 29 May 2023 21:13:57 +0100
Subject: [PATCH] a little cleanup

---
 src/communication_error.c   | 10 +++++-----
 src/error_message_reset.c   | 14 +++++++-------
 src/font.c                  |  2 +-
 src/gf_rtc.c                |  1 +
 src/msgdata.c               | 10 +++++-----
 src/save_data_read_error.c  | 18 +++++++++---------
 src/save_data_write_error.c | 10 +++++-----
 7 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/communication_error.c b/src/communication_error.c
index ea9a4d57a..cb68a2808 100644
--- a/src/communication_error.c
+++ b/src/communication_error.c
@@ -52,7 +52,7 @@ static const BGTEMPLATE sCommunicationErrorBgTemplate = {
 };
 
 static const WINDOWTEMPLATE sCommunicationErrorWindowTemplate = {
-    .bgId = 0,
+    .bgId = GF_BG_LYR_MAIN_0,
     .left = 3,
     .top = 3,
     .width = 26,
@@ -120,8 +120,8 @@ void ShowCommunicationError(HeapID heap_id, u32 error, u32 error_code) {
         break;
     }
 
-    sub_0200FBF4(0, 0);
-    sub_0200FBF4(1, 0);
+    sub_0200FBF4(PM_LCD_TOP, 0);
+    sub_0200FBF4(PM_LCD_BOTTOM, 0);
 
     OS_DisableIrqMask(OS_IE_VBLANK);
     OS_SetIrqFunction(OS_IE_VBLANK, VBlankIntr);
@@ -176,8 +176,8 @@ void ShowCommunicationError(HeapID heap_id, u32 error, u32 error_code) {
     // BUG: tmp_str is never destroyed.
 
     GX_BothDispOn();
-    SetMasterBrightnessNeutral(0);
-    SetMasterBrightnessNeutral(1);
+    SetMasterBrightnessNeutral(PM_LCD_TOP);
+    SetMasterBrightnessNeutral(PM_LCD_BOTTOM);
     SetBlendBrightness(0, 0x3F, 3);
 
     RemoveWindow(&window);
diff --git a/src/error_message_reset.c b/src/error_message_reset.c
index 1c3becc2d..432e441db 100644
--- a/src/error_message_reset.c
+++ b/src/error_message_reset.c
@@ -55,7 +55,7 @@ static const BGTEMPLATE sErrorMessageBgTemplate = {
 };
 
 static const WINDOWTEMPLATE sErrorMessageWindowTemplate = {
-    .bgId = 0,
+    .bgId = GF_BG_LYR_MAIN_0,
     .left = 3,
     .top = 3,
     .width = 26,
@@ -89,8 +89,8 @@ void PrintErrorMessageAndReset(void) {
     OS_SetArenaLo(OS_ARENA_MAIN, OS_GetInitArenaLo(OS_ARENA_MAIN));
     InitHeapSystem(&sErrorMessageHeapParams, 1, 1, 0);
 
-    sub_0200FBF4(0, 0);
-    sub_0200FBF4(1, 0);
+    sub_0200FBF4(PM_LCD_TOP, 0);
+    sub_0200FBF4(PM_LCD_BOTTOM, 0);
 
     OS_DisableIrqMask(OS_IE_VBLANK);
     OS_SetIrqFunction(OS_IE_VBLANK, VBlankIntr);
@@ -139,8 +139,8 @@ void PrintErrorMessageAndReset(void) {
     String_dtor(error_str);
 
     GX_BothDispOn();
-    SetMasterBrightnessNeutral(0);
-    SetMasterBrightnessNeutral(1);
+    SetMasterBrightnessNeutral(PM_LCD_TOP);
+    SetMasterBrightnessNeutral(PM_LCD_BOTTOM);
     SetBlendBrightness(0, 0x3F, 3);
 
     sub_02038D90();
@@ -166,8 +166,8 @@ void PrintErrorMessageAndReset(void) {
         OS_WaitIrq(TRUE, OS_IE_VBLANK);
     }
 
-    sub_0200FBF4(0, 0x7FFF);
-    sub_0200FBF4(1, 0x7FFF);
+    sub_0200FBF4(PM_LCD_TOP, 0x7FFF);
+    sub_0200FBF4(PM_LCD_BOTTOM, 0x7FFF);
 
     RemoveWindow(&window);
     DestroyMsgData(error_msgdata);
diff --git a/src/font.c b/src/font.c
index b55df367b..649be9c5e 100644
--- a/src/font.c
+++ b/src/font.c
@@ -168,7 +168,7 @@ u8 GetFontAttribute(FontID fontId, int attr) {
     return ret;
 }
 
-void LoadFontPal0(enum GFBgLayer layer, u32 baseAddr, HeapID heapId) {
+void LoadFontPal0(enum GFBgLayer layer, u32 baseAddr, HeapID heapId) { //todo sync with diamond
     GfGfxLoader_GXLoadPal(NARC_graphic_font, 7, layer, baseAddr, 0x20, heapId);
 }
 
diff --git a/src/gf_rtc.c b/src/gf_rtc.c
index 5a4d2d0e3..a0f0d083f 100644
--- a/src/gf_rtc.c
+++ b/src/gf_rtc.c
@@ -1,3 +1,4 @@
+#include "global.h"
 #include "gf_rtc.h"
 
 #define MAX_SECONDS (3155759999ll)
diff --git a/src/msgdata.c b/src/msgdata.c
index 6bb0d16b4..adb0eb0e9 100644
--- a/src/msgdata.c
+++ b/src/msgdata.c
@@ -42,7 +42,7 @@ static void ReadMsgData_ExistingTable_ExistingArray(MAT *table, u32 num, u16 *de
         CopyEncryptedMessage16(dest, (const u16 *)((u8 *)table + sp0.offset), &sp0);
         Decrypt2(dest, sp0.length, num);
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
     }
 }
 
@@ -78,7 +78,7 @@ static void ReadMsgData_ExistingTable_ExistingString(MAT * table, u32 num, STRIN
             FreeToHeap(buf);
         }
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
         StringSetEmpty(dest);
     }
 }
@@ -103,7 +103,7 @@ static STRING * ReadMsgData_ExistingTable_NewString(MAT * table, u32 num, u32 he
             return NULL;
         }
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
         return String_ctor(4, heap_id);
     }
 }
@@ -136,7 +136,7 @@ static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32
             return;
         }
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
         StringSetEmpty(dest);
     }
 }
@@ -177,7 +177,7 @@ static STRING * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group, u32 n
         }
         return dest;
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
         return String_ctor(4, heap_id);
     }
 }
diff --git a/src/save_data_read_error.c b/src/save_data_read_error.c
index cfeb9ad1d..3107415cc 100644
--- a/src/save_data_read_error.c
+++ b/src/save_data_read_error.c
@@ -52,7 +52,7 @@ static const BGTEMPLATE sDataReadErrorBgTemplate = {
 };
 
 static const WINDOWTEMPLATE sDataReadErrorWindowTemplate = {
-    .bgId = 0,
+    .bgId = GF_BG_LYR_MAIN_0,
     .left = 3,
     .top = 3,
     .width = 26,
@@ -64,8 +64,8 @@ static const WINDOWTEMPLATE sDataReadErrorWindowTemplate = {
 void ShowSaveDataReadError(HeapID heap_id) {
     WINDOW window;
 
-    sub_0200FBF4(0, 0);
-    sub_0200FBF4(1, 0);
+    sub_0200FBF4(PM_LCD_TOP, 0);
+    sub_0200FBF4(PM_LCD_BOTTOM, 0);
 
     Main_SetVBlankIntrCB(NULL, NULL);
     Main_SetHBlankIntrCB(NULL, NULL);
@@ -110,8 +110,8 @@ void ShowSaveDataReadError(HeapID heap_id) {
     String_dtor(error_str);
 
     GX_BothDispOn();
-    SetMasterBrightnessNeutral(0);
-    SetMasterBrightnessNeutral(1);
+    SetMasterBrightnessNeutral(PM_LCD_TOP);
+    SetMasterBrightnessNeutral(PM_LCD_BOTTOM);
     SetBlendBrightness(0, 0x3F, 3);
 
     while (TRUE) {
@@ -123,8 +123,8 @@ void ShowSaveDataReadError(HeapID heap_id) {
 void ShowGBACartRemovedError(HeapID heap_id) {
     WINDOW window;
 
-    sub_0200FBF4(0, 0);
-    sub_0200FBF4(1, 0);
+    sub_0200FBF4(PM_LCD_TOP, 0);
+    sub_0200FBF4(PM_LCD_BOTTOM, 0);
 
     Main_SetVBlankIntrCB(NULL, NULL);
     Main_SetHBlankIntrCB(NULL, NULL);
@@ -169,8 +169,8 @@ void ShowGBACartRemovedError(HeapID heap_id) {
     String_dtor(error_str);
 
     GX_BothDispOn();
-    SetMasterBrightnessNeutral(0);
-    SetMasterBrightnessNeutral(1);
+    SetMasterBrightnessNeutral(PM_LCD_TOP);
+    SetMasterBrightnessNeutral(PM_LCD_BOTTOM);
     SetBlendBrightness(0, 0x3F, 3);
 
     while (TRUE) {
diff --git a/src/save_data_write_error.c b/src/save_data_write_error.c
index dc230abc5..446ad4023 100644
--- a/src/save_data_write_error.c
+++ b/src/save_data_write_error.c
@@ -52,7 +52,7 @@ static const BGTEMPLATE sDataWriteErrorBgTemplate = {
 };
 
 static const WINDOWTEMPLATE sDataWriteErrorWindowTemplate = {
-    .bgId = 0,
+    .bgId = GF_BG_LYR_MAIN_0,
     .left = 3,
     .top = 3,
     .width = 26,
@@ -71,8 +71,8 @@ void ShowSaveDataWriteError(HeapID heap_id, int code) {
         msg_no = msg_0009_00000;
     }
 
-    sub_0200FBF4(0, 0);
-    sub_0200FBF4(1, 0);
+    sub_0200FBF4(PM_LCD_TOP, 0);
+    sub_0200FBF4(PM_LCD_BOTTOM, 0);
 
     sub_0201A0E0();
 
@@ -119,8 +119,8 @@ void ShowSaveDataWriteError(HeapID heap_id, int code) {
     String_dtor(error_str);
 
     GX_BothDispOn();
-    SetMasterBrightnessNeutral(0);
-    SetMasterBrightnessNeutral(1);
+    SetMasterBrightnessNeutral(PM_LCD_TOP);
+    SetMasterBrightnessNeutral(PM_LCD_BOTTOM);
     SetBlendBrightness(0, 0x3F, 3);
 
     while (TRUE) {