From 59581b3c574453ee38e86020adb5745d21471ef4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Dec 2019 13:33:06 -0500 Subject: region_map through sub_80BFFD0 --- include/constants/region_map.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/constants/region_map.h b/include/constants/region_map.h index 0957a72ee..e096f08a2 100644 --- a/include/constants/region_map.h +++ b/include/constants/region_map.h @@ -89,6 +89,8 @@ #define MAPSEC_SKY_PILLAR 0x55 #define MAPSEC_SECRET_BASE 0x56 #define MAPSEC_DYNAMIC 0x57 + +// Kanto landmarks #define MAPSEC_PALLET_TOWN 0x58 #define MAPSEC_VIRIDIAN_CITY 0x59 #define MAPSEC_PEWTER_CITY 0x5A @@ -144,6 +146,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 -- cgit v1.2.3 From 5a4ffc9a8e2a953a0de699733a809f44ed00bb44 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 2 Jan 2020 10:48:43 -0500 Subject: sub_80C04E4 --- include/strings.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 90fd49b52..6cca52507 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1003,4 +1003,12 @@ extern const u8 gText_UnionRoomTradesBattles[]; extern const u8 gText_LinkBattles[]; extern const u8 gText_LinkCableBattles[]; +// region_map +extern const u8 gUnknown_8418EB5[]; +extern const u8 gUnknown_8418E8B[]; +extern const u8 gUnknown_8418E8D[]; +extern const u8 gUnknown_8418E8B[]; +extern const u8 gUnknown_8418EA7[]; +extern const u8 gUnknown_8418E95[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 3535cf2ebc0ff5cb408bb018ade68ae8cfcb0c5c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 3 Jan 2020 09:09:02 -0500 Subject: through sub_80C0E5C --- include/constants/region_map.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/constants/region_map.h b/include/constants/region_map.h index e096f08a2..bd087bd60 100644 --- a/include/constants/region_map.h +++ b/include/constants/region_map.h @@ -90,7 +90,8 @@ #define MAPSEC_SECRET_BASE 0x56 #define MAPSEC_DYNAMIC 0x57 -// Kanto landmarks +#define MAPSECS_KANTO 0x58 + #define MAPSEC_PALLET_TOWN 0x58 #define MAPSEC_VIRIDIAN_CITY 0x59 #define MAPSEC_PEWTER_CITY 0x5A -- cgit v1.2.3 From 20c5160bf7cc192ccd2957e497aa7b13c8e0546c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 3 Jan 2020 10:22:37 -0500 Subject: through sub_80C1058 --- include/strings.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 6cca52507..4e8abffc3 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1007,8 +1007,8 @@ extern const u8 gText_LinkCableBattles[]; extern const u8 gUnknown_8418EB5[]; extern const u8 gUnknown_8418E8B[]; extern const u8 gUnknown_8418E8D[]; -extern const u8 gUnknown_8418E8B[]; -extern const u8 gUnknown_8418EA7[]; extern const u8 gUnknown_8418E95[]; +extern const u8 gUnknown_8418EA7[]; +extern const u8 gUnknown_8418EB0[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From e2fb677742395ed35e08e89f8c1bdfea5555438a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 3 Jan 2020 11:00:37 -0500 Subject: through sub_80C144C --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 4e8abffc3..9895ffbf8 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1010,5 +1010,6 @@ extern const u8 gUnknown_8418E8D[]; extern const u8 gUnknown_8418E95[]; extern const u8 gUnknown_8418EA7[]; extern const u8 gUnknown_8418EB0[]; +extern const u8 gUnknown_8418EBC[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From e58e6689b83d1bbcdae1009bc752aa37680a744f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 3 Jan 2020 16:04:43 -0500 Subject: through sub_80C1920 --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 9895ffbf8..56aa2ec1a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1011,5 +1011,6 @@ extern const u8 gUnknown_8418E95[]; extern const u8 gUnknown_8418EA7[]; extern const u8 gUnknown_8418EB0[]; extern const u8 gUnknown_8418EBC[]; +extern const u8 gUnknown_8418EC3[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 2c825017e6a2e78374ccd97337580c15c2503a23 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 4 Jan 2020 13:12:22 -0500 Subject: through sub_80C1A94 --- include/map_preview_screen.h | 1 + include/strings.h | 1 + 2 files changed, 2 insertions(+) (limited to 'include') diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index 5ab5584e5..c4e2fa70c 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 * sub_80F8544(u8 mapsec); #endif //GUARD_MAP_PREVIEW_SCREEN_H diff --git a/include/strings.h b/include/strings.h index 56aa2ec1a..cf26e63fd 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1008,6 +1008,7 @@ extern const u8 gUnknown_8418EB5[]; extern const u8 gUnknown_8418E8B[]; extern const u8 gUnknown_8418E8D[]; extern const u8 gUnknown_8418E95[]; +extern const u8 gUnknown_8418E9E[]; extern const u8 gUnknown_8418EA7[]; extern const u8 gUnknown_8418EB0[]; extern const u8 gUnknown_8418EBC[]; -- cgit v1.2.3 From ce44eb021c16246d2f6ff2b564b70ccc24c98e30 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 7 Jan 2020 15:37:15 -0500 Subject: through sub_80C4E08 --- include/region_map.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/region_map.h b/include/region_map.h index 67287b6c4..76195a3af 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -92,9 +92,9 @@ 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); +u8 *GetMapName(u8 *dest, u16 mapsec, u16 fill); bool32 sub_8124668(u8 mapSecId); -void GetMapNameGeneric(u8 *, u8); +u8 *GetMapNameGeneric(u8 *dest, u16 mapsec); void sub_80BFF50(u8 a0, void (*a1)(void)); void MCB2_FlyMap(void); -- cgit v1.2.3 From 1235d7c50643f925a30e0e4dfa299ea6ff624dc2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 7 Jan 2020 16:25:13 -0500 Subject: through sub_80C527C --- include/field_effect.h | 1 + include/overworld.h | 1 + include/region_map.h | 66 -------------------------------------------------- 3 files changed, 2 insertions(+), 66 deletions(-) (limited to 'include') 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/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 76195a3af..bc5f789bd 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -24,76 +24,10 @@ 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 - // 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 *dest, u16 mapsec, u16 fill); -bool32 sub_8124668(u8 mapSecId); u8 *GetMapNameGeneric(u8 *dest, u16 mapsec); void sub_80BFF50(u8 a0, void (*a1)(void)); void MCB2_FlyMap(void); -- cgit v1.2.3 From b3bb58267b2f3406c8c6d795ec8466107eef133e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 7 Jan 2020 17:03:36 -0500 Subject: Port image_processing_effects from Emerald --- include/image_processing_effects.h | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 include/image_processing_effects.h (limited to 'include') 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 -- cgit v1.2.3 From f257e2006afa37f5b2b96be93abc198363bc1c0a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 7 Jan 2020 20:51:12 -0500 Subject: Port region_map rodata to C --- include/strings.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index cf26e63fd..e8b4f1b38 100644 --- a/include/strings.h +++ b/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 -- cgit v1.2.3 From f8e911bcf57ec6f2b2e7ec1c0c09e467793b94ab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 8 Jan 2020 16:03:42 -0500 Subject: Partial documentation of region map --- include/map_preview_screen.h | 2 +- include/region_map.h | 14 +++++++++++ include/strings.h | 56 ++++++++++++++++++++++---------------------- 3 files changed, 43 insertions(+), 29 deletions(-) (limited to 'include') diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index c4e2fa70c..ea85baf71 100644 --- a/include/map_preview_screen.h +++ b/include/map_preview_screen.h @@ -49,6 +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 * sub_80F8544(u8 mapsec); +const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec); #endif //GUARD_MAP_PREVIEW_SCREEN_H diff --git a/include/region_map.h b/include/region_map.h index bc5f789bd..dd4fe491b 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -24,6 +24,20 @@ enum { MAPSECTYPE_CITY_CANTFLY, }; +enum { + MAPPERM_0, + MAPPERM_1, + MAPPERM_2, + MAPPERM_3 +}; + +enum { + REGIONMAP_KANTO, + REGIONMAP_SEVII123, + REGIONMAP_SEVII45, + REGIONMAP_SEVII67 +}; + // Exported RAM declarations // Exported ROM declarations diff --git a/include/strings.h b/include/strings.h index e8b4f1b38..8911a7c93 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1004,33 +1004,33 @@ extern const u8 gText_LinkBattles[]; extern const u8 gText_LinkCableBattles[]; // region_map -extern const u8 gUnknown_8418EB5[]; -extern const u8 gUnknown_8418E8B[]; -extern const u8 gUnknown_8418E8D[]; -extern const u8 gUnknown_8418E95[]; -extern const u8 gUnknown_8418E9E[]; -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[]; +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 -- cgit v1.2.3