From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 14:53:51 +0200
Subject: Add headers

---
 src/credits.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'src/credits.c')

diff --git a/src/credits.c b/src/credits.c
index 5af2d1e3c..247a69dbd 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -1,5 +1,7 @@
+#include "task.h"
+#include "intro_credits_graphics.h"
+#include "hall_of_fame.h"
 #include "global.h"
-#include "asm.h"
 #include "data2.h"
 #include "decompress.h"
 #include "event_data.h"
@@ -21,8 +23,6 @@ asm(".set OFFSET_REG_BLDALPHA,    0x52");
 asm(".set REG_BLDCNT,      REG_BASE + OFFSET_REG_BLDCNT");
 asm(".set REG_BLDALPHA,    REG_BASE + OFFSET_REG_BLDALPHA");
 
-extern void *species_and_otid_get_pal(u32, u16, u16);
-
 enum
 {
     PAGE_TITLE,
@@ -187,11 +187,6 @@ extern s16 gUnknown_0203935C;
 
 extern u8 gReservedSpritePaletteCount;
 
-// data/starter_choose
-extern u16 gBirchBagGrassPal[32];
-extern u8 gBirchGrassTilemap[];
-extern u8 gBirchHelpGfx[];
-
 // data/hall_of_fame
 extern void *gUnknown_0840B5A0[];
 
@@ -211,14 +206,6 @@ extern const union AnimCmd *const gSpriteAnimTable_0840CA54[];
 extern const union AnimCmd *const gSpriteAnimTable_0840CA94[];
 extern struct SpriteTemplate gSpriteTemplate_840CAEC;
 
-// data/intro_credits_graphics
-extern const struct SpriteSheet gIntro2BrendanSpriteSheet;
-extern const struct SpriteSheet gIntro2MaySpriteSheet;
-extern const struct SpriteSheet gIntro2BicycleSpriteSheet;
-extern const struct SpritePalette gIntro2SpritePalettes[];
-extern const struct SpriteSheet gUnknown_08416E24;
-extern const struct SpriteSheet gUnknown_08416E34;
-
 // graphics
 extern u8 gCreditsCopyrightEnd_Gfx[];
 extern u16 gIntroCopyright_Pal[16];
-- 
cgit v1.2.3


From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:01:42 +0200
Subject: Sort includes

---
 src/credits.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/credits.c')

diff --git a/src/credits.c b/src/credits.c
index 247a69dbd..e66fbe1e7 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -1,10 +1,9 @@
-#include "task.h"
-#include "intro_credits_graphics.h"
-#include "hall_of_fame.h"
 #include "global.h"
 #include "data2.h"
 #include "decompress.h"
 #include "event_data.h"
+#include "hall_of_fame.h"
+#include "intro_credits_graphics.h"
 #include "m4a.h"
 #include "main.h"
 #include "menu.h"
@@ -15,6 +14,7 @@
 #include "sound.h"
 #include "species.h"
 #include "starter_choose.h"
+#include "task.h"
 #include "trig.h"
 
 asm(".set REG_BASE, 0x4000000");
-- 
cgit v1.2.3


From b4aa5dfd4053ed2de5d046f06884376641c6e8b5 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 16:50:46 +0200
Subject: Make rom match checksum

---
 src/credits.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/credits.c')

diff --git a/src/credits.c b/src/credits.c
index e66fbe1e7..6355a17e9 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -448,7 +448,7 @@ void task_a_8143D04(u8 taskIdA)
         gReservedSpritePaletteCount = 8;
         LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM);
         LZ77UnCompVram(&gBirchGrassTilemap, (void *)(VRAM + 0x3800));
-        LoadPalette(gBirchBagGrassPal + 1, 1, 31 * 2);
+        LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2);
 
         for (i = 0; i < 0x800; i++)
             HALL_OF_FAME_SHEET_0[i] = 0x11;
-- 
cgit v1.2.3