diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-26 23:55:36 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-26 23:55:36 +0200 |
| commit | 52be8eeaf15da7b281d48c51b1f4d06740a86c76 (patch) | |
| tree | ac1c7d0a092f4d16c9ebef0b2538ef46b80c44d5 /src/fldeff_flash.c | |
| parent | dc273cc19d842e8831548a1342af857aae2886c9 (diff) | |
| parent | 2778e9ad3dc249eb4cce84be3ac1dfcc7ab850d5 (diff) | |
Merge branch 'master' into battle_tower
Diffstat (limited to 'src/fldeff_flash.c')
| -rw-r--r-- | src/fldeff_flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 654f02c23..0c6fdd8b8 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -69,8 +69,8 @@ static const u16 gCaveTransitionPalette_Black[] = INCBIN_U16("graphics/misc/cave static const u16 gUnknown_085B2890[] = INCBIN_U16("graphics/misc/85B2890.gbapal"); static const u16 gUnknown_085B28A0[] = INCBIN_U16("graphics/misc/85B28A0.gbapal"); -static const u16 gCaveTransitionTilemap[] = INCBIN_U16("graphics/misc/cave_transition_map.bin.lz"); -static const u8 gCaveTransitionTiles[] = INCBIN_U8("graphics/misc/cave_transition.4bpp.lz"); +static const u32 gCaveTransitionTilemap[] = INCBIN_U32("graphics/misc/cave_transition_map.bin.lz"); +static const u32 gCaveTransitionTiles[] = INCBIN_U32("graphics/misc/cave_transition.4bpp.lz"); // text bool8 SetUpFieldMove_Flash(void) |