diff options
| -rw-r--r-- | data/data2.s | 6 | ||||
| -rw-r--r-- | src/diploma.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/data2.s b/data/data2.s index e9e48e8d7..8eea57806 100644 --- a/data/data2.s +++ b/data/data2.s @@ -28070,16 +28070,16 @@ gUnknown_0840CB04:: @ 840CB04 .incbin "baserom.gba", 0x0040cb04, 0x8 .align 2 -gUnknown_0840CB0C:: @ 840CB0C +gDiplomaPalettes:: @ 840CB0C .incbin "graphics/misc/diploma_national.gbapal" .incbin "graphics/misc/diploma_hoenn.gbapal" .align 2 -gUnknown_0840CB4C:: @ 840CB4C +gDiplomaTilemap:: @ 840CB4C .incbin "graphics/misc/diploma_map.bin.lz" .align 2 -gUnknown_0840D288:: @ 840D288 +gDiplomaTiles:: @ 840D288 .incbin "graphics/misc/diploma.4bpp.lz" gExpandedPlaceholder_Empty:: @ 840DC80 diff --git a/src/diploma.c b/src/diploma.c index f9e154cf3..44e55010e 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -12,9 +12,9 @@ extern void remove_some_task(void); extern void sub_80546F0(void); extern u16 sub_8090FF4(void); -extern u8 gUnknown_0840D288[]; -extern u8 gUnknown_0840CB4C[]; -extern u8 gUnknown_0840CB0C[]; +extern u8 gDiplomaTiles[]; +extern u8 gDiplomaTilemap[]; +extern u8 gDiplomaPalettes[]; extern u8 gStringVar1[]; extern u8 gOtherText_NationalDex[]; extern u8 gOtherText_HoennDex[]; @@ -58,15 +58,15 @@ void sub_8145D88(void) DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - LZ77UnCompVram(gUnknown_0840D288, (void *)VRAM); - LZ77UnCompVram(gUnknown_0840CB4C, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gDiplomaTiles, (void *)VRAM); + LZ77UnCompVram(gDiplomaTilemap, (void *)(VRAM + 0x3000)); remove_some_task(); ResetTasks(); ResetSpriteData(); ResetPaletteFade(); FreeAllSpritePalettes(); - LoadPalette(gUnknown_0840CB0C, 0, 64); + LoadPalette(gDiplomaPalettes, 0, 64); SetUpWindowConfig(&gWindowConfig_81E6C3C); InitMenuWindow(&gWindowConfig_81E6CE4); DisplayDiplomaText(); |