diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/contest.h | 42 | ||||
| -rw-r--r-- | include/global.h | 8 |
2 files changed, 25 insertions, 25 deletions
diff --git a/include/contest.h b/include/contest.h index e2b16ff1d..ae2767aef 100644 --- a/include/contest.h +++ b/include/contest.h @@ -39,13 +39,13 @@ struct ContestEffect struct ContestPokemon { - /*0x00*/ u16 species; - /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; - /*0x0D*/ u8 trainerName[8]; - /*0x15*/ u8 trainerGfxId; - /*0x16*/ u8 unk16; - /*0x17*/ u8 filler17; - /*0x18*/ u32 flags; + /*0x00*/ u16 species; + /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x0D*/ u8 trainerName[8]; + /*0x15*/ u8 trainerGfxId; + /*0x16*/ u8 unk16; + /*0x17*/ u8 filler17; + /*0x18*/ u32 flags; /*0x1C*/ u8 unk1C_0:2; u8 unk1C_2:1; u8 unk1C_3:1; @@ -54,17 +54,17 @@ struct ContestPokemon u8 unk1C_6:1; u8 unk1C_7:1; u8 filler1D; - /*0x1E*/ u16 moves[4]; // moves - /*0x26*/ u8 cool; // cool - /*0x27*/ u8 beauty; // beauty - /*0x28*/ u8 cute; // cute - /*0x29*/ u8 smart; // smart - /*0x2A*/ u8 tough; // tough - /*0x2B*/ u8 sheen; // sheen - /*0x2C*/ u8 unk2C; - /*0x2D*/ u8 unk2D[11]; - /*0x38*/ u32 personality; // personality - /*0x3C*/ u32 otId; // otId + /*0x1E*/ u16 moves[4]; // moves + /*0x26*/ u8 cool; // cool + /*0x27*/ u8 beauty; // beauty + /*0x28*/ u8 cute; // cute + /*0x29*/ u8 smart; // smart + /*0x2A*/ u8 tough; // tough + /*0x2B*/ u8 sheen; // sheen + /*0x2C*/ u8 unk2C; + /*0x2D*/ u8 unk2D[11]; + /*0x38*/ u32 personality; // personality + /*0x3C*/ u32 otId; // otId }; // wow extern struct ContestPokemon gContestMons[]; @@ -75,15 +75,15 @@ extern const u8 *const gContestEffectStrings[]; void ResetLinkContestBoolean(void); void sub_80AB2AC(void); void CB2_StartContest(void); -void CreatePlayerContestMon(u8); -void sub_80AE398(u8, u8); +void Contest_CreatePlayerMon(u8); +void Contest_InitAllPokemon(u8, u8); u8 sub_80AE47C(struct Pokemon *party); u16 sub_80AE770(u8, u8); void sub_80AE82C(u8); u8 sub_80AEB1C(u16); void sub_80AF668(void); void sub_80B0F28(u8); -bool8 sub_80B2A7C(u8); +bool8 Contest_SaveWinner(u8); u8 sub_80B2C4C(u8, u8); void Contest_ResetWinners(void); diff --git a/include/global.h b/include/global.h index a8c185731..a4e71852c 100644 --- a/include/global.h +++ b/include/global.h @@ -50,9 +50,9 @@ fndec\ // dim access enums enum { - B_8 = 1, - B_16 = 2, - B_32 = 4 + B_8 = 1, + B_16 = 2, + B_32 = 4 }; // There are many quirks in the source code which have overarching behavioral differences from @@ -694,7 +694,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2D90*/ u8 filler_2D90[0x4]; /*0x2D94*/ union MauvilleMan mauvilleMan; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff - /*0x2DFC*/ struct ContestWinner contestWinners[8]; + /*0x2DFC*/ struct ContestWinner contestWinners[8]; /*0x2EFC*/ struct ContestWinner museumPortraits[5]; /*0x2F9C*/ struct DayCare daycare; /*0x30B8*/ struct LinkBattleRecord linkBattleRecords[5]; |