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/pokedex.c | |
| parent | 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 (diff) | |
| parent | 804d0a4b6a12907974ffd8cb20f6ed6c527b663b (diff) | |
Merge branch 'master' into sprite-tags
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); |