diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
| commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
| tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /src/fieldmap.c | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 4b5149878..f9f857f89 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -910,8 +910,8 @@ void sub_8056CBC(struct Tileset *tileset, int offset, int size) } else { - LZ77UnCompVram(tileset->palettes, (void*)0x2000000); - LoadPalette((void*)0x2000000, offset, size); + LZ77UnCompVram(tileset->palettes, (void*)EWRAM); + LoadPalette((void*)EWRAM, offset, size); } } } |