diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
| commit | 78535eea89e8b71f37e188289793e3e18c9bb985 (patch) | |
| tree | c3d7ec29b849e810cc6bc90827f9053a4f486b64 /src/contest.c | |
| parent | f4e6816db9622dfa93466138ed075075009295b8 (diff) | |
| parent | 3f477dae36c99bcb03a38be251dbef2f7e344ebc (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/contest.c b/src/contest.c index 9652e999e..c41f25077 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2459,7 +2459,7 @@ u8 unref_sub_80AE908(void) &gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset, - (void *)0x02000000, + (void *)EWRAM, gUnknown_081FAF4C[1], species); LoadCompressedPalette(gMonPaletteTable[species].data, 0x110, 32); @@ -2485,7 +2485,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality) &gMonBackPicTable[species], gMonBackPicCoords[species].coords, gMonBackPicCoords[species].y_offset, - 0x02000000, + EWRAM, gUnknown_081FAF4C[0], species, personality); |