From 2b65a30c6af22ee5c74e75c7021ac27991b0d21c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 28 Jul 2019 13:37:19 -0500 Subject: combine bg2.pal and blank_pal.pal --- src/main_menu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/main_menu.c b/src/main_menu.c index 93d9be77a..13fdf9f7f 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -138,7 +138,6 @@ static const u16 gUnknown_081E764C[][16] = static const u8 gBirchIntroShadowGfx[] = INCBIN_U8("graphics/birch_speech/shadow.4bpp.lz"); static const u8 gUnknown_081E7834[] = INCBIN_U8("graphics/birch_speech/map.bin.lz"); static const u16 gUnknown_081E795C[] = INCBIN_U16("graphics/birch_speech/bg2.gbapal"); -static const u16 gUnknown_081E796C[] = INCBIN_U16("graphics/birch_speech/blank_pal.gbapal"); static const u16 gMainMenuPalette[] = INCBIN_U16("graphics/misc/main_menu.gbapal"); static const union AffineAnimCmd gSpriteAffineAnim_81E799C[] = @@ -760,7 +759,7 @@ static void Task_NewGameSpeech1(u8 taskId) LZ77UnCompVram(gBirchIntroShadowGfx, (void *)BG_VRAM); LZ77UnCompVram(gUnknown_081E7834, (void *)(BG_VRAM + 0x3800)); LoadPalette(gUnknown_081E764C, 0, 0x40); - LoadPalette(gUnknown_081E796C, 1, 0x10); + LoadPalette(gUnknown_081E795C + 8, 1, 0x10); ScanlineEffect_Stop(); ResetSpriteData(); FreeAllSpritePalettes(); -- cgit v1.2.3 From 5b12c6f1e7f1d02c4a47d0069c87b795bf5c2ccc Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 28 Jul 2019 14:00:31 -0500 Subject: combine battle interface graphics files --- src/data/graphics.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src') diff --git a/src/data/graphics.c b/src/data/graphics.c index 7aa3a4384..ce2f02b2c 100644 --- a/src/data/graphics.c +++ b/src/data/graphics.c @@ -289,16 +289,7 @@ const u8 unused_basic_frame_bin[] = INCBIN_U8("graphics/unused/basic_frame.bin.l const u8 gUnknown_08D1212C[] = INCBIN_U8("graphics/battle_interface/window.gbapal"); const u8 gUnknown_08D1214C[] = INCBIN_U8("graphics/battle_interface/hpbar.gbapal"); -const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpbar.4bpp"); -const u8 gHealthboxElementsGfxTable_ExpBar[] = INCBIN_U8("graphics/battle_interface/expbar.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusPsn[] = INCBIN_U8("graphics/battle_interface/status_psn.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusPar[] = INCBIN_U8("graphics/battle_interface/status_par.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusSlp[] = INCBIN_U8("graphics/battle_interface/status_slp.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusFrz[] = INCBIN_U8("graphics/battle_interface/status_frz.4bpp"); -const u8 gHealthboxElementsGfxTable_StatusBrn[] = INCBIN_U8("graphics/battle_interface/status_brn.4bpp"); -const u8 gHealthboxElementsGfxTable_Misc[] = INCBIN_U8("graphics/battle_interface/misc.4bpp"); -const u8 gHealthboxElementsGfxTable_HpBarAnim[] = INCBIN_U8("graphics/battle_interface/hpbar_anim.4bpp"); -const u8 gHealthboxElementsGfxTable_MiscFrameEnd[] = INCBIN_U8("graphics/battle_interface/misc_frameend.4bpp"); +const u8 gHealthboxElementsGfxTable[][32] = INCBIN_U8("graphics/battle_interface/healthbox_elements.4bpp"); const u8 Tiles_D129AC[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp"); -- cgit v1.2.3