diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-10 09:14:53 -0400 |
|---|---|---|
| committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-10 09:14:53 -0400 |
| commit | eb25b951c32b71b98773698ae5286f75bd679d09 (patch) | |
| tree | e3009a04cbafd23595138f26be4520a466c278ad | |
| parent | 50a6b73edc134993b4c89227f1d72d421882035d (diff) | |
InitPaintingMonOamData fix
| -rw-r--r-- | src/contest_painting.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/contest_painting.c b/src/contest_painting.c index 292b11bf4..ceef8a902 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -501,20 +501,20 @@ static void LoadContestPaintingFrame(u8 contestWinnerId, bool8 arg1) 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].tileNum = 0; -#ifndef NONMATCHING - if (contestWinnerId) contestWinnerId = gMain.oamBuffer[0].tileNum; -#endif - - gMain.oamBuffer[0].x = 88; - gMain.oamBuffer[0].y = 24; + if (contestWinnerId > 1) + { + 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) |