Merge branch 'region_map' of github.com:PikalaxALT/pokefirered into region_map

common_syms/image_processing_effects.txt

@@ -0,0 +1,10 @@
+gCanvasColumnStart
+gCanvasPixels
+gCanvasRowEnd
+gCanvasHeight
+gCanvasColumnEnd
+gCanvasRowStart
+gCanvasMonPersonality
+gCanvasWidth
+gCanvasPalette
+gCanvasPaletteStart

include/image_processing_effects.h

@@ -0,0 +1,53 @@
+#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 effect;
+    void *canvasPixels;
+    u16 *canvasPalette;
+    u8 fillerC[0x4];
+    void *dest;
+    u16 quantizeEffect;
+    u16 var_16;
+    u8 paletteStart;
+    u8 columnStart;
+    u8 rowStart;
+    u8 columnEnd;
+    u8 rowEnd;
+    u8 canvasWidth;
+    u8 canvasHeight;
+    u8 personality;
+};
+
+void ApplyImageProcessingEffects(struct ImageProcessingContext *);
+void ApplyImageProcessingQuantization(struct ImageProcessingContext *);
+void ConvertImageProcessingToGBA(struct ImageProcessingContext *);
+
+#endif

include/strings.h

@@ -1013,5 +1013,24 @@ extern const u8 gUnknown_8418EA7[];
 extern const u8 gUnknown_8418EB0[];
 extern const u8 gUnknown_8418EBC[];
 extern const u8 gUnknown_8418EC3[];
+extern const u8 gUnknown_8418ECB[];
+extern const u8 gUnknown_8418F3A[];
+extern const u8 gUnknown_8418FB8[];
+extern const u8 gUnknown_841901C[];
+extern const u8 gUnknown_841908E[];
+extern const u8 gUnknown_8419103[];
+extern const u8 gUnknown_841917D[];
+extern const u8 gUnknown_8419201[];
+extern const u8 gUnknown_841926D[];
+extern const u8 gUnknown_84192E2[];
+extern const u8 gUnknown_841935B[];
+extern const u8 gUnknown_84193D5[];
+extern const u8 gUnknown_8419444[];
+extern const u8 gUnknown_84194C9[];
+extern const u8 gUnknown_841953F[];
+extern const u8 gUnknown_84195AC[];
+extern const u8 gUnknown_8419629[];
+extern const u8 gUnknown_841969D[];
+extern const u8 gUnknown_841971A[];
 
 #endif //GUARD_STRINGS_H

ld_script.txt

@@ -479,7 +479,6 @@ SECTIONS {
         src/mail.o(.rodata);
         src/heal_location.o(.rodata);
         src/region_map.o(.rodata);
-        data/region_map.o(.rodata);
         data/image_processing_effects.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);
         data/fldeff_flash.o(.rodata);