diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/fldeff_flash.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
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 d4d979239..fe219422d 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) |