diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/contest_painting.h | 17 | ||||
| -rw-r--r-- | include/ewram.h | 4 | ||||
| -rw-r--r-- | include/image_processing_effects.h (renamed from include/contest_painting_effects.h) | 8 |
3 files changed, 9 insertions, 20 deletions
diff --git a/include/contest_painting.h b/include/contest_painting.h index 81535ec8b..d3f13478d 100644 --- a/include/contest_painting.h +++ b/include/contest_painting.h @@ -32,21 +32,10 @@ enum CONTESTRESULT_TOUGH = 6, }; -struct Unk2015E00 +struct ContestPaintingBuffers { - u16 unk2015e00[128][32]; - u16 unk2017e00[0]; -}; - -struct ContestEntry -{ - /*0x00*/ u32 personality; - /*0x04*/ u32 otId; - /*0x08*/ u16 species; - /*0x0A*/ u8 contestType; - /*0x0B*/ u8 pokemon_name[POKEMON_NAME_LENGTH]; - /*0x15*/ u8 pad15; - /*0x16*/ u8 trainer_name[OT_NAME_LENGTH]; + u16 pixels[0x1000]; + u16 palette[0x100]; }; struct LabelPair diff --git a/include/ewram.h b/include/ewram.h index 0efac7bda..181ab141b 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -87,8 +87,8 @@ extern u8 gSharedMem[]; #define ewram15000 (&gSharedMem[0x15000]) #define ewram15000arr(i, data) (gSharedMem[0x15000 + data + i]) #define ewram15800 (&gSharedMem[0x15800]) -#define ewram15DE0 ((*(struct ContestEntry*)(gSharedMem + 0x15DE0))) -#define ewram15E00 ((*(struct Unk2015E00*)(gSharedMem + 0x15E00))) +#define eContestPaintingWinner ((*(struct ContestWinner*)(gSharedMem + 0x15DE0))) +#define ewram15E00 ((*(struct ContestPaintingBuffers*)(gSharedMem + 0x15E00))) #define ewram16000 (gSharedMem[0x16000]) #define ewram16000_2 (&gSharedMem[0x16000]) #define ewram16003 (gSharedMem[0x16003]) diff --git a/include/contest_painting_effects.h b/include/image_processing_effects.h index 8b99ba692..d465e0b95 100644 --- a/include/contest_painting_effects.h +++ b/include/image_processing_effects.h @@ -1,7 +1,7 @@ #ifndef GUARD_CUTE_SKETCH_H #define GUARD_CUTE_SKETCH_H -struct Unk03005E20 +struct ImageProcessingContext { u8 var_0; u8 pad1[3]; @@ -21,8 +21,8 @@ struct Unk03005E20 u8 var_1F; }; -void sub_80FC7A0(struct Unk03005E20 *); -void sub_80FD8CC(struct Unk03005E20 *); -void sub_80FDA18(struct Unk03005E20 *); +void sub_80FC7A0(struct ImageProcessingContext *); +void sub_80FD8CC(struct ImageProcessingContext *); +void sub_80FDA18(struct ImageProcessingContext *); #endif // GUARD_CUTE_SKETCH_H |