diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 13:37:19 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 13:37:19 -0500 |
| commit | 2b65a30c6af22ee5c74e75c7021ac27991b0d21c (patch) | |
| tree | b890142f0e2e9cdd828bfd85bd16a926fed6375a | |
| parent | c9bf136d8a3b77e4c3fd9749112b641e7332bbe7 (diff) | |
combine bg2.pal and blank_pal.pal
| -rw-r--r-- | graphics/birch_speech/bg2.pal | 10 | ||||
| -rw-r--r-- | graphics/birch_speech/blank_pal.pal | 11 | ||||
| -rw-r--r-- | src/main_menu.c | 3 |
3 files changed, 10 insertions, 14 deletions
diff --git a/graphics/birch_speech/bg2.pal b/graphics/birch_speech/bg2.pal index 3457f9b45..33f619ee4 100644 --- a/graphics/birch_speech/bg2.pal +++ b/graphics/birch_speech/bg2.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -8 +16 255 255 164 255 255 106 222 222 90 @@ -9,3 +9,11 @@ JASC-PAL 123 123 49 90 90 32 57 57 16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/birch_speech/blank_pal.pal b/graphics/birch_speech/blank_pal.pal deleted file mode 100644 index 7dc528e38..000000000 --- a/graphics/birch_speech/blank_pal.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 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(); |