labeling

3 files changed, 81 insertions, 8 deletions

diff --git a/include/flags.h b/include/flags.h
index 0e408a833..e8c23b538 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -22,6 +22,24 @@
 #define BADGE07_GET 0x80D
 #define BADGE08_GET 0x80E
 
+// cities and towns 
+#define FLAG_VISITED_LITTLEROOT_TOWN  0x80F
+#define FLAG_VISITED_OLDALE_TOWN      0x810
+#define FLAG_VISITED_DEWFORD_TOWN     0x811
+#define FLAG_VISITED_LAVARIDGE_TOWN   0x812
+#define FLAG_VISITED_FALLARBOR_TOWN   0x813
+#define FLAG_VISITED_VERDANTURF_TOWN  0x814
+#define FLAG_VISITED_PACIFIDLOG_TOWN  0x815
+#define FLAG_VISITED_PETALBURG_CITY   0x816
+#define FLAG_VISITED_SLATEPORT_CITY   0x817
+#define FLAG_VISITED_MAUVILLE_CITY    0x818
+#define FLAG_VISITED_RUSTBORO_CITY    0x819
+#define FLAG_VISITED_FORTREE_CITY     0x81A
+#define FLAG_VISITED_LILYCOVE_CITY    0x81B
+#define FLAG_VISITED_MOSSDEEP_CITY    0x81C
+#define FLAG_VISITED_SOOTOPOLIS_CITY  0x81D
+#define FLAG_VISITED_EVER_GRANDE_CITY 0x81E
+
 #define SYS_USE_FLASH        0x828
 #define SYS_USE_STRENGTH     0x829
 #define SYS_WEATHER_CTRL     0x82A
@@ -42,6 +60,9 @@
 #define SYS_SHOAL_TIDE       0x83A
 #define SYS_RIBBON_GET       0x83B
 
+#define FLAG_UNLOCK_BATTLE_TOWER    0x848
+#define FLAG_UNLOCK_SOUTHERN_ISLAND 0x849
+
 #define SYS_PC_LANETTE       0x84B
 #define SYS_EXDATA_ENABLE    0x84C
 #define SYS_ENC_UP_ITEM      0x84D
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 7589de029..4029132e8 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -166,7 +166,7 @@ struct MapHeader
     /* 0x0C */ struct MapConnections *connections;
     /* 0x10 */ u16 music;
     /* 0x12 */ u16 mapDataId;
-    /* 0x14 */ u8 name;
+    /* 0x14 */ u8 regionMapSectionId;
     /* 0x15 */ u8 cave;
     /* 0x16 */ u8 weather;
     /* 0x17 */ u8 mapType;
diff --git a/include/region_map.h b/include/region_map.h
index 6dfa4dcf0..88e0ee21f 100755
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -1,13 +1,65 @@
 #ifndef GUARD_REGION_MAP_H
 #define GUARD_REGION_MAP_H
 
-void sub_80FA8EC(u32, u8);
-void sub_80FAB10(void);
+struct RegionMap
+{
+    u8 mapSecName[0x14];
+    u16 mapSecId;
+    u8 unk16;
+    u8 everGrandeCityArea;
+    u8 (*inputCallback)(void);
+    struct Sprite *cursorIconSprite;
+    struct Sprite *playerIconSprite;
+    s32 bg2x;
+    s32 bg2y;
+    u32 unk2C;  //
+    u32 unk30;  //  Map rotation parameters
+    u32 unk34;  //  Likely a scrapped feature
+    u32 unk38;  //
+    s32 unk3C;
+    s32 unk40;
+    s32 unk44;
+    s32 unk48;
+    s32 unk4C;
+    s32 unk50;
+    u16 cursorPosX;
+    u16 cursorPosY;
+    u16 cursorIconTileTag;
+    u16 cursorIconPaletteTag;
+    s16 scrollX;
+    s16 scrollY;
+    s16 unk60;
+    s16 unk62;
+    u16 unk64;
+    u16 unk66;
+    u16 unk68;
+    u16 unk6A;
+    u16 unk6C;
+    u16 unk6E;
+    u16 playerIconTileTag;
+    u16 playerIconPaletteTag;
+    u16 unk74;
+    u16 unk76;
+    bool8 zoomed;
+    u8 initStep;
+    s8 unk7A;
+    s8 cursorDeltaX;
+    s8 cursorDeltaY;
+    bool8 needUpdateVideoRegs;
+    bool8 blinkPlayerIcon;
+    bool8 playerIsInCave;
+    u8 filler80[0x100];
+    u8 unk180[0x100];
+    u8 unk280[0x600];
+};
+
+void InitRegionMap(struct RegionMap *regionMap, bool8 b);
+void FreeRegionMapIconResources(void);
 u8 sub_80FAB60(void);
-void sub_80FBB3C(u16, u16);
-void sub_80FBCF0(u32, u8);
-void sub_80FBFB4(u8 *str, u16 region, u8);
-void CopyMapName();
-u8 *CopyLocationName(u8 *dest, u8 location);
+void CreateRegionMapCursorIcon(u16, u16);
+void CreateRegionMapPlayerIcon(u16, u16);
+const u8 *GetMapSectionName(u8 *dest, u16 mapSecId, u16 length);
+const u8 *CopyMapName(u8 *dest, u16 b);
+const u8 *CopyLocationName(u8 *dest, u16 b);
 
 #endif // GUARD_REGION_MAP_H