From 8e7202ec3d289305190aedc66d02435571747a76 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sun, 21 Oct 2018 02:24:57 -0500
Subject: Fix LZ compressed data alignment

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

(limited to 'src/diploma.c')

diff --git a/src/diploma.c b/src/diploma.c
index 8e0b48ed3..a1d37a70d 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -49,8 +49,8 @@ static const u16 sDiplomaPalettes[][16] =
     INCBIN_U16("graphics/misc/diploma_hoenn.gbapal"),
 };
 
-static const u8 sDiplomaTilemap[] = INCBIN_U8("graphics/misc/diploma_map.bin.lz");
-static const u8 sDiplomaTiles[] = INCBIN_U8("graphics/misc/diploma.4bpp.lz");
+static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/misc/diploma_map.bin.lz");
+static const u32 sDiplomaTiles[] = INCBIN_U32("graphics/misc/diploma.4bpp.lz");
 
 void CB2_ShowDiploma(void)
 {
-- 
cgit v1.2.3


From b252bd029279b6f28518c59df1ba03caf44d756f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 27 Oct 2018 00:53:07 +0200
Subject: Window priority to window bg

---
 src/diploma.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'src/diploma.c')

diff --git a/src/diploma.c b/src/diploma.c
index a1d37a70d..e2f2c6d07 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -11,19 +11,14 @@
 #include "window.h"
 #include "string_util.h"
 #include "text.h"
+#include "overworld.h"
+#include "menu.h"
 
-extern void reset_temp_tile_data_buffers(void);
-extern int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size, u16 offset, u8 mode);
-extern bool8 free_temp_tile_data_buffers_if_possible(void);
-extern void sub_80861E8(void); // rom4
 extern bool16 sub_80C0944(void);
-extern void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 *color, s8 speed, u8 *str);
 
-extern u16 gUnknown_0860F074[];
-
-extern u8 gText_DexNational[];
-extern u8 gText_DexHoenn[];
-extern u8 gText_PokedexDiploma[];
+extern const u8 gText_DexNational[];
+extern const u8 gText_DexHoenn[];
+extern const u8 gText_PokedexDiploma[];
 
 static void MainCB2(void);
 static void Task_DiplomaFadeIn(u8);
@@ -34,7 +29,7 @@ static void InitDiplomaBg(void);
 static void InitDiplomaWindow(void);
 static void PrintDiplomaText(u8 *, u8, u8);
 
-EWRAM_DATA static void **sDiplomaTilemapPtr = {NULL};
+EWRAM_DATA static u8 *sDiplomaTilemapPtr = NULL;
 
 static void VBlankCB(void)
 {
@@ -186,7 +181,7 @@ static void InitDiplomaBg(void)
 static const struct WindowTemplate sDiplomaWinTemplates[2] =
 {
     {
-        .priority = 0,
+        .bg = 0,
         .tilemapLeft = 5,
         .tilemapTop = 2,
         .width = 20,
-- 
cgit v1.2.3


From 9f50ba1ce38dfad92477acf16e2f159c9f410072 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Wed, 7 Nov 2018 12:35:31 -0600
Subject: Fix incorrect compressed types, part 2

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

(limited to 'src/diploma.c')

diff --git a/src/diploma.c b/src/diploma.c
index e2f2c6d07..f8556eb7d 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -80,7 +80,7 @@ void CB2_ShowDiploma(void)
     decompress_and_copy_tile_data_to_vram(1, &sDiplomaTiles, 0, 0, 0);
     while (free_temp_tile_data_buffers_if_possible())
         ;
-    LZDecompressWram(&sDiplomaTilemap, sDiplomaTilemapPtr);
+    LZDecompressWram(sDiplomaTilemap, sDiplomaTilemapPtr);
     CopyBgTilemapBufferToVram(1);
     DisplayDiplomaText();
     BlendPalettes(-1, 16, 0);
-- 
cgit v1.2.3