atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

port InitPaintingMonOamData fakematch fix

Browse source
This commit is contained in:
Kurausukun 2020-10-26 00:26:15 -04:00
parent 9e033fa554
commit e8fd0bd2c3
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/contest_painting.c
View file

@ -501,21 +501,20 @@ static void LoadContestPaintingFrame(u8 contestWinnerId, bool8 arg1)
static void InitPaintingMonOamData(u8 contestWinnerId) static void InitPaintingMonOamData(u8 contestWinnerId)
{ {
//Some hacks just to get the asm to match
#ifndef NONMATCHING
asm(""::"r"(contestWinnerId));
#endif
gMain.oamBuffer[0] = sContestPaintingMonOamData; gMain.oamBuffer[0] = sContestPaintingMonOamData;
gMain.oamBuffer[0].tileNum = 0; gMain.oamBuffer[0].tileNum = 0;
#ifndef NONMATCHING if (contestWinnerId > 1)
if (contestWinnerId) contestWinnerId = gMain.oamBuffer[0].tileNum; {
#endif
gMain.oamBuffer[0].x = 88; gMain.oamBuffer[0].x = 88;
gMain.oamBuffer[0].y = 24; gMain.oamBuffer[0].y = 24;
} }
else
{
gMain.oamBuffer[0].x = 88; // Duplicated code
gMain.oamBuffer[0].y = 24;
}
}
static u8 GetImageEffectForContestWinner(u8 contestWinnerId) static u8 GetImageEffectForContestWinner(u8 contestWinnerId)
{ {