diff options
| -rw-r--r-- | data/diploma.s | 12 | ||||
| -rw-r--r-- | src/diploma.c | 12 |
2 files changed, 9 insertions, 15 deletions
diff --git a/data/diploma.s b/data/diploma.s index c4edb83d8..508e86c63 100644 --- a/data/diploma.s +++ b/data/diploma.s @@ -3,15 +3,3 @@ .section .rodata - .align 2 -gDiplomaPalettes:: @ 840CB0C - .incbin "graphics/misc/diploma_national.gbapal" - .incbin "graphics/misc/diploma_hoenn.gbapal" - - .align 2 -gDiplomaTilemap:: @ 840CB4C - .incbin "graphics/misc/diploma_map.bin.lz" - - .align 2 -gDiplomaTiles:: @ 840D288 - .incbin "graphics/misc/diploma.4bpp.lz" diff --git a/src/diploma.c b/src/diploma.c index 270d69ce1..649f4a33d 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -10,9 +10,6 @@ #include "task.h" #include "text.h" -extern u8 gDiplomaTiles[]; -extern u8 gDiplomaTilemap[]; -extern u8 gDiplomaPalettes[]; extern u8 gOtherText_NationalDex[]; extern u8 gOtherText_HoennDex[]; extern u8 gOtherText_DiplomaCertificationGameFreak[]; @@ -24,6 +21,15 @@ static void Task_DiplomaWaitForKeyPress(u8); static void Task_DiplomaFadeOut(u8); static void DisplayDiplomaText(void); +static const u16 gDiplomaPalettes[][16] = +{ + INCBIN_U16("graphics/misc/diploma_national.gbapal"), + INCBIN_U16("graphics/misc/diploma_hoenn.gbapal"), +}; + +static const u8 gDiplomaTilemap[] = INCBIN_U8("graphics/misc/diploma_map.bin.lz"); +static const u8 gDiplomaTiles[] = INCBIN_U8("graphics/misc/diploma.4bpp.lz"); + static void VBlankCB(void) { LoadOam(); |