From fb423f957dc8944edf0b822a7aaa1949434ac65e Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 9 Apr 2019 14:30:54 -0400
Subject: sub_812EB58; port scanline_effect

---
 src/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 068cc8578..bfab49c49 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,7 +29,7 @@ extern void MapMusicMain(void);
 extern void EnableInterrupts(u16);
 extern void sub_800DD28(void);
 extern u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
-extern void remove_some_task(void);
+extern void ScanlineEffect_Stop(void);
 extern void sub_80F50F4(void);
 extern bool32 sub_80F5118(void);
 extern bool8 sub_813B870(void);
@@ -441,7 +441,7 @@ void DoSoftReset(void)
 {
     REG_IME = 0;
     m4aSoundVSyncOff();
-    remove_some_task();
+    ScanlineEffect_Stop();
     DmaStop(1);
     DmaStop(2);
     DmaStop(3);
-- 
cgit v1.2.3


From b26196e1f874fe5ebe9fe306e7ce18c06fa23715 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 12 Jun 2019 21:14:51 -0400
Subject: EWRAM symbols in main.c

---
 src/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index bfab49c49..ad03860f3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -96,13 +96,13 @@ u8 gUnknown_3003D84;
 
 static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7;
 
-extern u16 gTrainerId;
+EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0};
+EWRAM_DATA u16 gTrainerId = 0;
+
 extern bool8 gUnknown_3005ECC;
 extern bool8 gWirelessCommType;
 extern bool8 gUnknown_3005E88;
 
-EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL;
-
 static void UpdateLinkAndCallCallbacks(void);
 static void InitMainCallbacks(void);
 static void CallCallbacks(void);
@@ -116,7 +116,7 @@ void EnableVCountIntrAtLine150(void);
 void AgbMain()
 {
     RegisterRamReset(RESET_ALL);
-    *(vu16 *)BG_PLTT = 0x7FFF;
+    *(vu16 *)BG_PLTT = RGB_WHITE;
     InitGpuRegManager();
     REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3;
     InitKeys();
-- 
cgit v1.2.3


From 9aac6112a2205a84cc89022a9dcb7140ad060c66 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 13 Jun 2019 16:34:18 -0400
Subject: Some symbol renaming

---
 src/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index ad03860f3..ae9a33e81 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,6 +5,7 @@
 #include "dma3.h"
 #include "gba/flash_internal.h"
 #include "battle.h"
+#include "help_system.h"
 
 extern u16 GetGpuReg(u8);
 extern void SetGpuReg(u8, u16);
@@ -32,7 +33,6 @@ extern u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
 extern void ScanlineEffect_Stop(void);
 extern void sub_80F50F4(void);
 extern bool32 sub_80F5118(void);
-extern bool8 sub_813B870(void);
 
 extern struct SoundInfo gSoundInfo;
 extern u32 gFlashMemoryPresent;
@@ -206,7 +206,7 @@ static void InitMainCallbacks(void)
 
 static void CallCallbacks(void)
 {
-    if (!sub_80F5118() && !sub_813B870())
+    if (!sub_80F5118() && !RunHelpSystemCallback())
     {
         if (gMain.callback1)
             gMain.callback1();
-- 
cgit v1.2.3