diff options
| author | garak <garakmon@gmail.com> | 2018-10-21 15:12:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 15:12:18 -0400 |
| commit | 7a9c7e5f068a2ec88ce6fe24a5c72f4b4ae7f48b (patch) | |
| tree | b8e391c9e856a2546075d44cba353c4b100a52ef /src/main_menu.c | |
| parent | 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 (diff) | |
| parent | 804d0a4b6a12907974ffd8cb20f6ed6c527b663b (diff) | |
Merge branch 'master' into sprite-tags
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index bcc4f9af5..521b92b35 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -127,8 +127,8 @@ static const u16 sBirchSpeechBgPals[][16] = { INCBIN_U16("graphics/birch_speech/bg1.gbapal") }; -static const u8 sBirchSpeechShadowGfx[] = INCBIN_U8("graphics/birch_speech/shadow.4bpp.lz"); -static const u8 sBirchSpeechBgMap[] = INCBIN_U8("graphics/birch_speech/map.bin.lz"); +static const u32 sBirchSpeechShadowGfx[] = INCBIN_U32("graphics/birch_speech/shadow.4bpp.lz"); +static const u32 sBirchSpeechBgMap[] = INCBIN_U32("graphics/birch_speech/map.bin.lz"); static const u16 sBirchSpeechBgGradientPal[] = INCBIN_U16("graphics/birch_speech/bg2.gbapal"); static const u16 sBirchSpeechPlatformBlackPal[] = {RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK}; |