diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-23 12:25:04 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-23 12:25:04 -0500 |
| commit | 49ff4ad4e8f5cf8cea984e255ba3bb5051ff91e6 (patch) | |
| tree | 8fbdd739bdb2586c62c8a057135ebe165e00cdba /include | |
| parent | 0ec2cb85de36a636a96f24101cd5a20ffb53f5ea (diff) | |
through sub_80C2340
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/contest.h | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h index fd60ced79..7d8878018 100644 --- a/include/battle.h +++ b/include/battle.h @@ -721,6 +721,8 @@ extern u16 gBattle_WIN0V; extern u16 gBattle_WIN1H; extern u16 gBattle_WIN1V; +extern u8 gDisplayedStringBattle[]; + // asm/battle_1.o void sub_800D6D4(); void sub_800D74C(); diff --git a/include/contest.h b/include/contest.h index 6b1f1f520..b0bdd7f61 100644 --- a/include/contest.h +++ b/include/contest.h @@ -271,4 +271,16 @@ struct UnknownContestStruct6 #define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338)) #define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348)) +extern u8 gContestPlayerMonIndex; +extern u8 gIsLinkContest; +extern u32 gContestRngValue; +extern u8 gUnknown_02038696[4]; +extern s16 gUnknown_02038670[4]; +extern s16 gUnknown_02038678[4]; +extern s16 gUnknown_02038680[4]; +extern u16 gUnknown_02038688[4]; +extern u8 gContestFinalStandings[4]; +extern u8 gUnknown_02038696[4]; +extern u8 gUnknown_0203869B; + #endif // GUARD_CONTEST_H |