From 02fea36a2e43523c9e9401897ac2fdbeb37ed3d4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 7 Jan 2018 22:25:16 -0500
Subject: through sub_8096C68

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

(limited to 'src/scene')

diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index 1751ee99c..812c28137 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -17,6 +17,7 @@
 #include "decompress.h"
 #include "random.h"
 #include "trig.h"
+#include "pc_screen_effect.h"
 #include "ewram.h"
 
 static EWRAM_DATA u32 sUnknown_0203931C = 0;
@@ -89,7 +90,6 @@ static bool8 sub_81438C4(void);
 
 // functions from different files
 void sub_81439D0(void);
-void sub_80C5CD4(void*); // ?
 void sub_80C5E38(void*); // ?
 bool8 sub_80C5DCC(void);
 bool8 sub_80C5F98(void);
@@ -811,7 +811,7 @@ void sub_81428CC(void)
             fameMons = eHallOfFameMons1;
             fameMons->mons[0] = sDummyFameMon;
 
-            sub_80C5CD4(fameMons);
+            sub_80C5CD4((struct PCScreenEffectStruct *)fameMons);
             gMain.state++;
         }
         break;
-- 
cgit v1.2.3


From e2ff8b73c7e17777be8c4065a93e8727768bb914 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Jan 2018 22:05:43 -0500
Subject: through sub_8097BA0; fix calls to pc_screen_effect from
 scene/hall_of_fame

---
 src/scene/hall_of_fame.c | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'src/scene')

diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index 812c28137..ef5e6f873 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -90,11 +90,7 @@ static bool8 sub_81438C4(void);
 
 // functions from different files
 void sub_81439D0(void);
-void sub_80C5E38(void*); // ?
-bool8 sub_80C5DCC(void);
-bool8 sub_80C5F98(void);
 void ReturnFromHallOfFamePC(void);
-u16 SpeciesToPokedexNum(u16 species);
 void remove_some_task(void);
 
 // data and gfx
@@ -130,9 +126,10 @@ static const s16 sHallOfFame_MonsHalfTeamPositions[3][4] =
     {-41,   214,    184,    64}
 };
 
-static const struct HallofFameMon sDummyFameMon =
+static const struct PCScreenEffectStruct sDummyFameMon =
 {
-    0x3EA03EA, 0, 0, 0, {0}
+    .tileTag = 0x3ea,
+    .paletteTag = 0x3ea
 };
 
 static const u8 sUnused2[6] = {2, 1, 3, 6, 4, 5};
@@ -800,20 +797,15 @@ void sub_81428CC(void)
         }
         break;
     case 3:
-        {
-            struct HallofFameMons* fameMons;
-
-            REG_BLDCNT = 0;
-            REG_BLDALPHA = 0;
-            REG_BLDY = 0;
-            sub_81435B8();
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        REG_BLDY = 0;
+        sub_81435B8();
 
-            fameMons = eHallOfFameMons1;
-            fameMons->mons[0] = sDummyFameMon;
+        eHOFPCScreenEffect = sDummyFameMon;
 
-            sub_80C5CD4((struct PCScreenEffectStruct *)fameMons);
-            gMain.state++;
-        }
+        sub_80C5CD4(&eHOFPCScreenEffect);
+        gMain.state++;
         break;
     case 4:
         AnimateSprites();
@@ -1022,12 +1014,9 @@ static void sub_8142DF4(u8 taskID)
 
 static void sub_8142F78(u8 taskID)
 {
-    struct HallofFameMons* fameMons;
-
     CpuSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x200);
-    fameMons = eHallOfFameMons1;
-    fameMons->mons[0] = sDummyFameMon;
-    sub_80C5E38(fameMons);
+    eHOFPCScreenEffect = sDummyFameMon;
+    sub_80C5E38(&eHOFPCScreenEffect);
     gTasks[taskID].func = sub_8142FCC;
 }
 
-- 
cgit v1.2.3


From ca2fbbad15daa12858d01eb87ab17a8d41eeffa5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Jan 2018 22:25:48 -0500
Subject: sDummyPCScreenEffect --> sPCScreenEffectTemplate

---
 src/scene/hall_of_fame.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/scene')

diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index ef5e6f873..4740c086d 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -126,8 +126,7 @@ static const s16 sHallOfFame_MonsHalfTeamPositions[3][4] =
     {-41,   214,    184,    64}
 };
 
-static const struct PCScreenEffectStruct sDummyFameMon =
-{
+static const struct PCScreenEffectStruct sPCScreenEffectTemplate = {
     .tileTag = 0x3ea,
     .paletteTag = 0x3ea
 };
@@ -802,7 +801,7 @@ void sub_81428CC(void)
         REG_BLDY = 0;
         sub_81435B8();
 
-        eHOFPCScreenEffect = sDummyFameMon;
+        eHOFPCScreenEffect = sPCScreenEffectTemplate;
 
         sub_80C5CD4(&eHOFPCScreenEffect);
         gMain.state++;
@@ -1015,7 +1014,7 @@ static void sub_8142DF4(u8 taskID)
 static void sub_8142F78(u8 taskID)
 {
     CpuSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x200);
-    eHOFPCScreenEffect = sDummyFameMon;
+    eHOFPCScreenEffect = sPCScreenEffectTemplate;
     sub_80C5E38(&eHOFPCScreenEffect);
     gTasks[taskID].func = sub_8142FCC;
 }
-- 
cgit v1.2.3