summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/region_map.h6
-rw-r--r--include/field_effect.h1
-rw-r--r--include/image_processing_effects.h53
-rw-r--r--include/map_preview_screen.h1
-rw-r--r--include/overworld.h1
-rw-r--r--include/region_map.h82
-rw-r--r--include/strings.h30
7 files changed, 107 insertions, 67 deletions
diff --git a/include/constants/region_map.h b/include/constants/region_map.h
index 0957a72ee..bd087bd60 100644
--- a/include/constants/region_map.h
+++ b/include/constants/region_map.h
@@ -89,6 +89,9 @@
#define MAPSEC_SKY_PILLAR 0x55
#define MAPSEC_SECRET_BASE 0x56
#define MAPSEC_DYNAMIC 0x57
+
+#define MAPSECS_KANTO 0x58
+
#define MAPSEC_PALLET_TOWN 0x58
#define MAPSEC_VIRIDIAN_CITY 0x59
#define MAPSEC_PEWTER_CITY 0x5A
@@ -144,6 +147,9 @@
#define MAPSEC_POKEMON_TOWER 0x8C
#define MAPSEC_CERULEAN_CAVE 0x8D
#define MAPSEC_POWER_PLANT 0x8E
+
+#define MAPSECS_SEVII_123 0x8F
+
#define MAPSEC_ONE_ISLAND 0x8F
#define MAPSEC_TWO_ISLAND 0x90
#define MAPSEC_THREE_ISLAND 0x91
diff --git a/include/field_effect.h b/include/field_effect.h
index 4afc5cace..c2d14d43c 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -23,5 +23,6 @@ void sub_80853CC(u8 a0);
void sub_8083598(u8 a0);
void sub_8083A5C(struct Sprite * sprite, u8 spriteId);
u8 sub_8083970(u16 species, s16 x, s16 y, bool8 unused);
+void sub_80842C8(void);
#endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/image_processing_effects.h b/include/image_processing_effects.h
new file mode 100644
index 000000000..7f726707c
--- /dev/null
+++ b/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
diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h
index 5ab5584e5..ea85baf71 100644
--- a/include/map_preview_screen.h
+++ b/include/map_preview_screen.h
@@ -49,5 +49,6 @@ void sub_80F85BC(u16 a0);
u16 sub_80F856C(u8 id);
bool8 sub_80F8110(u8 mapsec, bool8 forceFirstTime);
bool32 sub_80F83B0(void);
+const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec);
#endif //GUARD_MAP_PREVIEW_SCREEN_H
diff --git a/include/overworld.h b/include/overworld.h
index 04d28701c..324150779 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -149,5 +149,6 @@ void sub_8055778(int);
void sub_8055738(u8 loc);
void sub_8056078(void *, void *);
+void sub_805546C(u8 a0);
#endif //GUARD_OVERWORLD_H
diff --git a/include/region_map.h b/include/region_map.h
index 67287b6c4..dd4fe491b 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -24,77 +24,25 @@ enum {
MAPSECTYPE_CITY_CANTFLY,
};
-struct RegionMap {
- /*0x000*/ u16 mapSecId;
- /*0x002*/ u8 iconDrawType;
- /*0x003*/ u8 posWithinMapSec;
- /*0x004*/ u8 mapSecName[0x14];
- /*0x018*/ u8 (*inputCallback)(void);
- /*0x01c*/ struct Sprite *cursorSprite;
- /*0x020*/ struct Sprite *playerIconSprite;
- /*0x024*/ s32 bg2x;
- /*0x028*/ s32 bg2y;
- /*0x02c*/ u32 bg2pa;
- /*0x034*/ u32 bg2pc;
- /*0x030*/ u32 bg2pb;
- /*0x038*/ u32 bg2pd;
- /*0x03c*/ s32 unk_03c;
- /*0x040*/ s32 unk_040;
- /*0x044*/ s32 unk_044;
- /*0x048*/ s32 unk_048;
- /*0x04c*/ s32 unk_04c;
- /*0x050*/ s32 unk_050;
- /*0x054*/ u16 cursorPosX;
- /*0x056*/ u16 cursorPosY;
- /*0x058*/ u16 cursorTileTag;
- /*0x05a*/ u16 cursorPaletteTag;
- /*0x05c*/ s16 scrollX;
- /*0x05e*/ s16 scrollY;
- /*0x060*/ s16 unk_060;
- /*0x062*/ s16 unk_062;
- /*0x064*/ u16 zoomedCursorPosX;
- /*0x066*/ u16 zoomedCursorPosY;
- /*0x068*/ s16 zoomedCursorDeltaY;
- /*0x06a*/ s16 zoomedCursorDeltaX;
- /*0x06c*/ u16 zoomedCursorMovementFrameCounter;
- /*0x06e*/ u16 unk_06e;
- /*0x070*/ u16 playerIconTileTag;
- /*0x072*/ u16 playerIconPaletteTag;
- /*0x074*/ u16 playerIconSpritePosX;
- /*0x076*/ u16 playerIconSpritePosY;
- /*0x078*/ bool8 zoomed;
- /*0x079*/ u8 initStep;
- /*0x07a*/ s8 cursorMovementFrameCounter;
- /*0x07b*/ s8 cursorDeltaX;
- /*0x07c*/ s8 cursorDeltaY;
- /*0x07d*/ bool8 needUpdateVideoRegs;
- /*0x07e*/ bool8 blinkPlayerIcon;
- /*0x07f*/ bool8 playerIsInCave;
- /*0x080*/ u8 bgNum;
- /*0x081*/ u8 charBaseIdx;
- /*0x082*/ u8 mapBaseIdx;
- /*0x083*/ bool8 bgManaged;
- /*0x084*/ u8 filler_084[0x100];
- /*0x184*/ u8 cursorSmallImage[0x100];
- /*0x284*/ u8 cursorLargeImage[0x600];
-}; // size = 0x884
+enum {
+ MAPPERM_0,
+ MAPPERM_1,
+ MAPPERM_2,
+ MAPPERM_3
+};
+
+enum {
+ REGIONMAP_KANTO,
+ REGIONMAP_SEVII123,
+ REGIONMAP_SEVII45,
+ REGIONMAP_SEVII67
+};
// Exported RAM declarations
// Exported ROM declarations
-void sub_8122CF8(struct RegionMap *regionMap, struct BgTemplate *template, bool8 zoomed);
-bool8 sub_8122DB0(void);
-void UpdateRegionMapVideoRegs(void);
-void InitRegionMap(struct RegionMap *regionMap, u8 argument);
-u8 sub_81230AC(void);
-bool8 sub_8123514(void);
-void FreeRegionMapIconResources(void);
-u16 GetRegionMapSectionIdAt(u16 x, u16 y);
-void CreateRegionMapPlayerIcon(u16 x, u16 y);
-void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
-u8 *GetMapName(u8 *, u16, u16);
-bool32 sub_8124668(u8 mapSecId);
-void GetMapNameGeneric(u8 *, u8);
+u8 *GetMapName(u8 *dest, u16 mapsec, u16 fill);
+u8 *GetMapNameGeneric(u8 *dest, u16 mapsec);
void sub_80BFF50(u8 a0, void (*a1)(void));
void MCB2_FlyMap(void);
diff --git a/include/strings.h b/include/strings.h
index 90fd49b52..8911a7c93 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1003,4 +1003,34 @@ extern const u8 gText_UnionRoomTradesBattles[];
extern const u8 gText_LinkBattles[];
extern const u8 gText_LinkCableBattles[];
+// region_map
+extern const u8 gText_RegionMap_DPadMove[];
+extern const u8 gText_RegionMap_Space[];
+extern const u8 gText_RegionMap_AButtonGuide[];
+extern const u8 gText_RegionMap_AButtonCancel[];
+extern const u8 gText_RegionMap_AButtonCancel2[];
+extern const u8 gText_RegionMap_AButtonSwitch[];
+extern const u8 gText_RegionMap_AButtonOK[];
+extern const u8 gText_RegionMap_UpDownPick[];
+extern const u8 gText_RegionMap_NoData[];
+extern const u8 gText_RegionMap_AreaDesc_ViridianForest[];
+extern const u8 gText_RegionMap_AreaDesc_MtMoon[];
+extern const u8 gText_RegionMap_AreaDesc_DiglettsCave[];
+extern const u8 gText_RegionMap_AreaDesc_VictoryRoad[];
+extern const u8 gText_RegionMap_AreaDesc_PokemonMansion[];
+extern const u8 gText_RegionMap_AreaDesc_SafariZone[];
+extern const u8 gText_RegionMap_AreaDesc_RockTunnel[];
+extern const u8 gText_RegionMap_AreaDesc_SeafoamIslands[];
+extern const u8 gText_RegionMap_AreaDesc_PokemonTower[];
+extern const u8 gText_RegionMap_AreaDesc_CeruleanCave[];
+extern const u8 gText_RegionMap_AreaDesc_PowerPlant[];
+extern const u8 gText_RegionMap_AreaDesc_MtEmber[];
+extern const u8 gText_RegionMap_AreaDesc_BerryForest[];
+extern const u8 gText_RegionMap_AreaDesc_IcefallCave[];
+extern const u8 gText_RegionMap_AreaDesc_LostCave[];
+extern const u8 gText_RegionMap_AreaDesc_TanobyRuins[];
+extern const u8 gText_RegionMap_AreaDesc_AlteringCave[];
+extern const u8 gText_RegionMap_AreaDesc_PatternBush[];
+extern const u8 gText_RegionMap_AreaDesc_DottedHole[];
+
#endif //GUARD_STRINGS_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 01:20:27 +0000