diff options
Diffstat (limited to 'src/diploma.c')
| -rw-r--r-- | src/diploma.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/diploma.c b/src/diploma.c index 8e0b48ed3..f8556eb7d 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) { @@ -49,8 +44,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) { @@ -85,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); @@ -186,7 +181,7 @@ static void InitDiplomaBg(void) static const struct WindowTemplate sDiplomaWinTemplates[2] = { { - .priority = 0, + .bg = 0, .tilemapLeft = 5, .tilemapTop = 2, .width = 20, |