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/pokedex.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index d27f0d89c..48bf64338 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -3429,7 +3429,7 @@ void blockset_load_palette_to_gpu(u8 taskId) u32 otId; u32 personality; u8 paletteNum; - const u8 *lzPaletteData; + const u32 *lzPaletteData; void *buffer; SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); |