Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-12-12 07:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move diploma data to C

Browse Source
This commit is contained in:
ProjectRevoTPP 2017-03-18 03:52:30 +01:00
parent a008bf19eb
commit 823496db76
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/diploma.s
View File

@ -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"

12
src/diploma.c
View File

@ -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();