diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-29 22:07:02 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-29 22:07:02 -0500 |
| commit | a5f9a15d0dad0e7392120558907e783254eb0aa8 (patch) | |
| tree | ce9a705a88cef1b5560313c97d41907df282efe9 /include | |
| parent | cc1767cbc116d26d954d50c6e7642138f012540c (diff) | |
| parent | 1416a4c4efe8b926c809664eb63dd2c3d0f86728 (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'include')
| -rw-r--r-- | include/contest.h | 12 | ||||
| -rw-r--r-- | include/ewram.h | 1 | ||||
| -rw-r--r-- | include/fldeff_poison.h | 4 | ||||
| -rw-r--r-- | include/link.h | 2 |
4 files changed, 16 insertions, 3 deletions
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 diff --git a/include/ewram.h b/include/ewram.h index ba376440e..cafb418fb 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -259,6 +259,7 @@ extern u8 gSharedMem[]; #define eHallOfFame (struct HallOfFame *)(gSharedMem + 0x1E000) #define HALL_OF_FAME_SHEET_0 ((u8 *)(gSharedMem + 0x1E000)) #define ewram1E000_2 (const u8 *)(gSharedMem + 0x1E000) +#define eContestLinkSendBuffer gSharedMem + 0x1E000 #define HALL_OF_FAME_SHEET_1 ((u8 *)(gSharedMem + 0x1E800)) #define ewram_1f000 (*(struct DecoPCPointers *)(gSharedMem + 0x1f000)) #define ewramSavedPokeballsPocket ((struct ItemSlot *)(gSharedMem + 0x1F000)) // saved Pokeballs pocket (for Wally battle) diff --git a/include/fldeff_poison.h b/include/fldeff_poison.h index fe3308ba9..abcacbd03 100644 --- a/include/fldeff_poison.h +++ b/include/fldeff_poison.h @@ -1,7 +1,7 @@ #ifndef GUARD_FLDEFF_POISON_H #define GUARD_FLDEFF_POISON_H -void DoFieldPoisonEffect(void); -bool32 FieldPoisonEffectIsRunning(void); +void FldeffPoison_Start(void); +bool32 FldeffPoison_IsActive(void); #endif // GUARD_FLDEFF_POISON_H diff --git a/include/link.h b/include/link.h index 367add625..6581fdbba 100644 --- a/include/link.h +++ b/include/link.h @@ -167,7 +167,7 @@ u8 GetMultiplayerId(void); u8 bitmask_all_link_players_but_self(void); bool8 SendBlock(u8, void *, u16); bool8 sub_8007E9C(u8); -bool8 sub_8007ECC(void); +bool8 IsLinkTaskFinished(void); u8 GetBlockReceivedStatus(void); void ResetBlockReceivedFlags(void); void ResetBlockReceivedFlag(u8); |