ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

21
src/contest_painting.c
View File

@ -501,20 +501,19 @@ 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].y = 24;
gMain.oamBuffer[0].x = 88; }
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)