diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 02:01:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 02:01:55 -0400 |
| commit | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (patch) | |
| tree | 291912dbcf0f77d6c88b7e691efa18dcd9d4bc53 /src/diploma.c | |
| parent | 515ae5e00f2661559583a4720d9944755e23d141 (diff) | |
| parent | d507cdcebb39e2ec43c4d0f756570a5734fcb42e (diff) | |
Merge pull request #241 from ProjectRevoTPP/master
decompile fldeff_cut.c, script_pokemon_util_80C4BF0.c, document save.c, move data to C files, decompile the next 3 functions in item_use.c, and a lot of labeling
Diffstat (limited to 'src/diploma.c')
| -rw-r--r-- | src/diploma.c | 12 |
1 files changed, 9 insertions, 3 deletions
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(); |