1 files changed, 23 insertions, 22 deletions
diff --git a/include/region_map.h b/include/region_map.h
index 0d219643d..97364abd8 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -4,20 +4,21 @@
 #include "bg.h"
 
 // Exported type declarations
+#define MAP_NAME_LENGTH 16
 
 enum
 {
-    INPUT_EVENT_NONE,
-    INPUT_EVENT_MOVE_START,
-    INPUT_EVENT_MOVE_CONT,
-    INPUT_EVENT_MOVE_END,
-    INPUT_EVENT_A_BUTTON,
-    INPUT_EVENT_B_BUTTON,
+    MAP_INPUT_NONE,
+    MAP_INPUT_MOVE_START,
+    MAP_INPUT_MOVE_CONT,
+    MAP_INPUT_MOVE_END,
+    MAP_INPUT_A_BUTTON,
+    MAP_INPUT_B_BUTTON,
 };
 
 enum {
     MAPSECTYPE_NONE,
-    MAPSECTYPE_PLAIN,
+    MAPSECTYPE_ROUTE,
     MAPSECTYPE_CITY_CANFLY,
     MAPSECTYPE_CITY_CANTFLY,
     MAPSECTYPE_BATTLE_FRONTIER
@@ -25,9 +26,9 @@ enum {
 
 struct RegionMap {
     /*0x000*/ u16 mapSecId;
-    /*0x002*/ u8 iconDrawType;
+    /*0x002*/ u8 mapSecType;
     /*0x003*/ u8 posWithinMapSec;
-    /*0x004*/ u8 mapSecName[0x14];
+    /*0x004*/ u8 mapSecName[20];
     /*0x018*/ u8 (*inputCallback)(void);
     /*0x01c*/ struct Sprite *cursorSprite;
     /*0x020*/ struct Sprite *playerIconSprite;
@@ -90,28 +91,28 @@ struct RegionMapLocation
 // Exported RAM declarations
 
 // Exported ROM declarations
-void sub_8122CF8(struct RegionMap *regionMap, const struct BgTemplate *template, bool8 zoomed);
-bool8 sub_8122DB0(void);
+void InitRegionMapData(struct RegionMap *regionMap, const struct BgTemplate *template, bool8 zoomed);
+bool8 LoadRegionMapGfx(void);
 void UpdateRegionMapVideoRegs(void);
 void InitRegionMap(struct RegionMap *regionMap, u8 argument);
-u8 sub_81230AC(void);
-bool8 sub_8123514(void);
+u8 DoRegionMapInputCallback(void);
+bool8 UpdateRegionMapZoom(void);
 void FreeRegionMapIconResources(void);
-u16 GetRegionMapSectionIdAt(u16 x, u16 y);
+u16 GetRegionMapSecIdAt(u16 x, u16 y);
 void CreateRegionMapPlayerIcon(u16 x, u16 y);
 void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
+bool32 IsEventIslandMapSecId(u8 mapSecId);
 u8 *GetMapName(u8 *, u16, u16);
-bool32 sub_8124668(u8 mapSecId);
 u8 *GetMapNameGeneric(u8 *dest, u16 mapSecId);
-u8 *sub_8124610(u8 *dest, u16 mapSecId);
+u8 *GetMapNameHandleAquaHideout(u8 *dest, u16 mapSecId);
 u16 CorrectSpecialMapSecId(u16 mapSecId);
-void sub_8122D88(struct RegionMap *regionMap);
+void ShowRegionMapForPokedexAreaScreen(struct RegionMap *regionMap);
 void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y);
-void MCB2_FlyMap(void);
-bool8 sub_8124658(void);
-void sub_812454C(void);
-void sub_8123030(u16 a0, u32 a1);
-void sub_8123418(void);
+void CB2_OpenFlyMap(void);
+bool8 IsRegionMapZoomed(void);
+void TrySetPlayerIconBlink(void);
+void sub_8123030(u16 color, u32 coeff);
+void SetRegionMapDataForZoom(void);
 
 extern const struct RegionMapLocation gRegionMapEntries[];