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/contest_painting.c | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'src/contest_painting.c')
| -rw-r--r-- | src/contest_painting.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/contest_painting.c b/src/contest_painting.c index 0c5cdcd49..e3cc6cdae 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -341,7 +341,7 @@ static void sub_8106AC4(u16 species, u8 arg1) &gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset, - 0x2000000, + EWRAM, gUnknown_081FAF4C[1], species, (u32)gUnknown_03005E8C->personality @@ -354,7 +354,7 @@ static void sub_8106AC4(u16 species, u8 arg1) &gMonBackPicTable[species], gMonBackPicCoords[species].coords, gMonBackPicCoords[species].y_offset, - 0x2000000, + EWRAM, gUnknown_081FAF4C[0], species, (u32)gUnknown_03005E8C->personality |