summaryrefslogtreecommitdiff
path: root/src/fieldmap.c
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-12-31 02:34:42 -0600
committerGitHub <noreply@github.com>2018-12-31 02:34:42 -0600
commit935a098843b1176db8e4b4f8f82f70086a0ed92f (patch)
tree2c20338324f10a553e78e731d999dd58669266c3 /src/fieldmap.c
parent58f130d007b97623dd5c7a3b373800c138f75c5e (diff)
parentd004ce065c9cc6425df6f567dff39eb831f84875 (diff)
Merge pull request #456 from Diegoisawesome/trade
trade.c
Diffstat (limited to 'src/fieldmap.c')
-rw-r--r--src/fieldmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c
index b1feed4bf..d2ff34b1c 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -993,7 +993,7 @@ void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u1
}
else
{
- LoadCompressedPalette((u16*)tileset->palettes, destOffset, size);
+ LoadCompressedPalette((u32*)tileset->palettes, destOffset, size);
nullsub_3(destOffset, size >> 1);
}
}