diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/contest.h | 15 | ||||
| -rw-r--r-- | include/graphics.h | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/include/contest.h b/include/contest.h index 9b4ecc10a..c4e752072 100644 --- a/include/contest.h +++ b/include/contest.h @@ -1,7 +1,10 @@ #ifndef GUARD_CONTEST_H #define GUARD_CONTEST_H +#include "palette.h" + #define CONTESTANT_COUNT 4 +#define APPLAUSE_METER_SIZE 5 #define CONTEST_DEBUG_MODE_OFF 0 // Prints the totalPoints value for each contestant. @@ -247,10 +250,10 @@ struct ContestPokemon struct Shared1A004 { - /*0x18004*/ u16 unk18004[16][16]; - /*0x18204*/ u16 unk18204[0x200]; - /*0x18604*/ u16 unk18604[0x200]; - /*0x18A04*/ u8 unk18A04[0x800]; + u16 unk18004[16][16]; // Saved palette data before a move happens? + u16 unk18204[PLTT_BUFFER_SIZE]; // Saved copy of gPlttBufferUnfaded + u16 unk18604[PLTT_BUFFER_SIZE]; // Saved copy of gPlttBufferFaded + u8 savedJunk[0x800]; }; struct ContestStruct_field_18 @@ -274,8 +277,8 @@ struct Contest u16 unk1920A_2:1; u16 unk1920A_3:1; u16 unk1920A_4:1; - u16 unk1920A_5:1; - u16 unk1920A_6:1; + u16 isShowingApplauseMeter:1; + u16 applauseMeterIsMoving:1; u16 unk1920A_7:1; /*0x7*/ u16 unk1920B_0:1; u16 unk1920B_1:1; diff --git a/include/graphics.h b/include/graphics.h index 2584e713e..39c2895bd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4761,8 +4761,8 @@ extern const u32 gContestAudienceGfx[]; extern const u8 gContestApplauseMeterGfx[]; extern const u8 gContestNextTurnNumbersGfx[]; extern const u8 gContestNextTurnRandomGfx[]; -extern const u32 gUnknown_08C16FA8[]; -extern const u32 gUnknown_08C16E90[]; +extern const u32 gOldContestGfx[]; +extern const u32 gOldContestPalette[]; extern const u32 gUnknown_08C17170[]; extern const u32 gUnknown_08C17980[]; extern const u32 gTiles_8C19450[]; |