diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/data2.h | 4 | ||||
| -rw-r--r-- | include/ewram.h | 15 | ||||
| -rw-r--r-- | include/image_processing_effects.h | 69 | ||||
| -rw-r--r-- | include/text.h | 2 |
4 files changed, 61 insertions, 29 deletions
diff --git a/include/data2.h b/include/data2.h index ed23a10ce..8ba1294ac 100644 --- a/include/data2.h +++ b/include/data2.h @@ -48,8 +48,8 @@ extern const u8 gUnknown_081F96C8[]; extern const struct CompressedSpriteSheet gUnknown_081FAEA4; extern const struct CompressedSpritePalette gUnknown_081FAEAC; extern const struct SpriteTemplate gSpriteTemplate_81FAF0C; -extern u8 *const gUnknown_081FAF4C[]; -//extern u8 (*const gUnknown_081FAF4C[])[0x800]; +extern u8 *const gMonSpriteGfx_Sprite_ptr[]; +//extern u8 (*const gMonSpriteGfx_Sprite_ptr[])[0x800]; extern const struct BattleMove gBattleMoves[]; // data/graphics/trainers/front_pic_coords.inc diff --git a/include/ewram.h b/include/ewram.h index c3a830247..00aed71d3 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -88,12 +88,17 @@ extern u8 gSharedMem[]; #define ewram15000arr(i, data) (gSharedMem[0x15000 + data + i]) #define ewram15800 (&gSharedMem[0x15800]) +#define ewram16000_2 (&gSharedMem[0x16000]) + #define eCurContestWinnerSaveIdx (gSharedMem[0x15DDE]) #define eCurContestWinnerIsForArtist (gSharedMem[0x15DDF]) #define eCurContestWinner ((*(struct ContestWinner*)(gSharedMem + 0x15DE0))) -#define ewram15E00 ((*(struct ContestPaintingBuffers*)(gSharedMem + 0x15E00))) +#define eContestPaintingBuffers ((*(struct ContestPaintingBuffers*)(gSharedMem + 0x15E00))) + +// Battle Struct +// For matching purposes, the struct is placed at 0x02000000 and +// there's a ton of filler. #define ewram16000 (gSharedMem[0x16000]) -#define ewram16000_2 (&gSharedMem[0x16000]) #define ewram16003 (gSharedMem[0x16003]) #define ewram16004arr(i, battler) (gSharedMem[0x16004 + i + battler * 2]) #define ewram16010arr(battler) (gSharedMem[0x16010 + battler]) @@ -159,7 +164,11 @@ extern u8 gSharedMem[]; #define B_FUNCTION_STACK ((struct BattleCallbacksStack *) (gSharedMem + 0x17140)) #define gBattleResources_statsBeforeLvlUp ((struct StatsArray *)(gSharedMem + 0x17180)) +// roulette_gfx.c #define ewram17000 (&gSharedMem[0x17000]) +#define ewram17E00 ((u16 *)(gSharedMem + 0x17E00)) +#define ewram18000 ((u16 *)(gSharedMem + 0x18000)) + #define eMoveTutorMenu (struct MoveTutorMenu *)(gSharedMem + 0x17000) #define eCableCar1 ((struct CableCarEwramStruct1 *)(gSharedMem + 0x17000)) #define gBattleSpriteInfo ((struct BattleSpriteInfo *) (gSharedMem + 0x17800)) @@ -170,10 +179,8 @@ extern u8 gSharedMem[]; #define EWRAM_17810 ((struct UnknownStruct3 *)(gSharedMem + 0x17810)) #define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840)) #define ewram17850 ((struct UnknownStruct5 *)(gSharedMem + 0x17850)) -#define ewram17E00 ((u16 *)(gSharedMem + 0x17E00)) #define ewram_2018000 (*(struct PlayerRecords *)(gSharedMem + 0x18000)) #define EWRAM_18000 ((u16 *)(gSharedMem + 0x18000)) -#define ewram18000 ((u16 *)(gSharedMem + 0x18000)) #define ewram18000_2 (&gSharedMem[0x18000]) #define ewram18000_3 *(struct Pokemon **)(gSharedMem + 0x18000) #define eBerryBlenderData (struct BerryBlenderData*)(&gSharedMem[0x18000]) diff --git a/include/image_processing_effects.h b/include/image_processing_effects.h index d465e0b95..47153023b 100644 --- a/include/image_processing_effects.h +++ b/include/image_processing_effects.h @@ -1,28 +1,53 @@ -#ifndef GUARD_CUTE_SKETCH_H -#define GUARD_CUTE_SKETCH_H +#ifndef GUARD_IMAGE_PROCESSING_EFFECTS_H +#define GUARD_IMAGE_PROCESSING_EFFECTS_H + +enum +{ + IMAGE_EFFECT_POINTILLISM = 2, + IMAGE_EFFECT_GRAYSCALE_LIGHT = 6, + IMAGE_EFFECT_BLUR = 8, + IMAGE_EFFECT_OUTLINE_COLORED = 9, + IMAGE_EFFECT_INVERT_BLACK_WHITE = 10, + IMAGE_EFFECT_THICK_BLACK_WHITE = 11, + IMAGE_EFFECT_SHIMMER = 13, + IMAGE_EFFECT_OUTLINE = 30, + IMAGE_EFFECT_INVERT = 31, + IMAGE_EFFECT_BLUR_RIGHT = 32, + IMAGE_EFFECT_BLUR_DOWN = 33, + IMAGE_EFFECT_CHARCOAL = 36, +}; + +enum +{ + QUANTIZE_EFFECT_STANDARD, + QUANTIZE_EFFECT_STANDARD_LIMITED_COLORS, + QUANTIZE_EFFECT_PRIMARY_COLORS, + QUANTIZE_EFFECT_GRAYSCALE, + QUANTIZE_EFFECT_GRAYSCALE_SMALL, + QUANTIZE_EFFECT_BLACK_WHITE, +}; struct ImageProcessingContext { - u8 var_0; - u8 pad1[3]; - u16 (*var_4)[][32]; - u16 *var_8; - u8 pad0C[4]; - u16 (*var_10)[][32]; - u16 var_14; - u16 var_16; - u8 var_18; - u8 var_19; - u8 var_1A; - u8 var_1B; - u8 var_1C; - u8 var_1D; - u8 var_1E; - u8 var_1F; + u8 effect; + void *canvasPixels; + u16 *canvasPalette; + u8 fillerC[0x4]; + void *dest; + u16 quantizeEffect; + u16 bgType; + u8 paletteStart; + u8 columnStart; + u8 rowStart; + u8 columnEnd; + u8 rowEnd; + u8 canvasWidth; + u8 canvasHeight; + u8 personality; }; -void sub_80FC7A0(struct ImageProcessingContext *); -void sub_80FD8CC(struct ImageProcessingContext *); -void sub_80FDA18(struct ImageProcessingContext *); +void ApplyImageProcessingEffects(struct ImageProcessingContext *); +void ConvertImageProcessingToGBA(struct ImageProcessingContext *); +void ApplyImageProcessingQuantization(struct ImageProcessingContext *); -#endif // GUARD_CUTE_SKETCH_H +#endif // GUARD_IMAGE_PROCESSING_EFFECTS_H diff --git a/include/text.h b/include/text.h index 8b5df9280..920093a1d 100644 --- a/include/text.h +++ b/include/text.h @@ -206,7 +206,7 @@ extern const struct WindowTemplate gWindowTemplate_81E70F0; extern const struct WindowTemplate gWindowTemplate_81E710C; extern const struct WindowTemplate gWindowTemplate_81E7128; extern const struct WindowTemplate gWindowTemplate_81E7144; -extern const struct WindowTemplate gWindowTemplate_81E7160; +extern const struct WindowTemplate gWindowTemplate_ContestPainting; extern const struct WindowTemplate gWindowTemplate_81E717C; extern const struct WindowTemplate gWindowTemplate_81E7198; extern const struct WindowTemplate gWindowTemplate_81E71B4; |