diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 5 | ||||
| -rw-r--r-- | include/contest_painting.h | 2 | ||||
| -rw-r--r-- | include/ewram.h | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/battle.h b/include/battle.h index 8911218eb..af0a9a43e 100644 --- a/include/battle.h +++ b/include/battle.h @@ -297,10 +297,7 @@ struct BattleStruct /* 0x2000000 */ struct LinkPartnerHeader linkPartnerHeader; struct MultiBattlePokemonTx multiBattleMons[3]; } multiBuffer; - u8 filler60[0x15D7E]; - /*0x15DDE*/ u8 contestWinnerSaveIdx; - /*0x15DDF*/ u8 contestWinnerIsForArtist; - /*0x15DE0*/ u8 filler15DE0[0x220]; + u8 filler60[0x15FA0]; /*0x16000*/ u8 turnEffectsTracker; /*0x16001*/ u8 turnEffectsBattlerId; /*0x16002*/ u8 animTurn; diff --git a/include/contest_painting.h b/include/contest_painting.h index d3f13478d..fda6e963a 100644 --- a/include/contest_painting.h +++ b/include/contest_painting.h @@ -44,7 +44,7 @@ struct LabelPair const u8 *suffix; }; -void sub_8106630(u32); +void SetContestWinnerForPainting(u32 contestWinnerId); void CB2_ContestPainting(void); #endif diff --git a/include/ewram.h b/include/ewram.h index 181ab141b..c3a830247 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -87,7 +87,10 @@ extern u8 gSharedMem[]; #define ewram15000 (&gSharedMem[0x15000]) #define ewram15000arr(i, data) (gSharedMem[0x15000 + data + i]) #define ewram15800 (&gSharedMem[0x15800]) -#define eContestPaintingWinner ((*(struct ContestWinner*)(gSharedMem + 0x15DE0))) + +#define eCurContestWinnerSaveIdx (gSharedMem[0x15DDE]) +#define eCurContestWinnerIsForArtist (gSharedMem[0x15DDF]) +#define eCurContestWinner ((*(struct ContestWinner*)(gSharedMem + 0x15DE0))) #define ewram15E00 ((*(struct ContestPaintingBuffers*)(gSharedMem + 0x15E00))) #define ewram16000 (gSharedMem[0x16000]) #define ewram16000_2 (&gSharedMem[0x16000]) |