dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge conflicts

Browse Source
This commit is contained in:
golem galvanize
2018-12-07 14:47:20 -05:00
parent 18124740a4 6df2042b3b
commit 53fac4417b
1142 changed files with 128897 additions and 161276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/contest.h
View File

@@ -226,6 +226,11 @@ extern u8 gUnknown_02039F24;
extern u16 gSpecialVar_ContestCategory;
extern u16 gSpecialVar_ContestRank;
extern u8 gUnknown_02039F30;
extern u8 gContestFinalStandings[4];
extern u8 gContestPlayerMonIndex;
extern s16 gUnknown_02039F08[4];
extern s16 gContestMonConditions[4];
extern u8 gIsLinkContest;
struct Shared18000
{
@@ -239,7 +244,7 @@ struct Shared18000
struct ContestStruct_field_18
{
u16 unk0;
u16 species;
u16 unk2;
u8 unk4_0:1;
u8 unk5;
@@ -428,5 +433,6 @@ bool8 sub_80DE1E8(u8 a);
void SetStartledString(u8 a, u8 b);
s8 Contest_GetMoveExcitement(u16);
u8 sub_80DAE0C(struct Pokemon *);
void sub_80DEDA8(u8);
#endif //GUARD_CONTEST_H