From b03a51e034df8513456043dabf23596c8daba2c1 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 16 Jul 2017 10:35:31 -0500
Subject: labeling

---
 include/region_map.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 59 insertions(+), 7 deletions(-)

(limited to 'include/region_map.h')

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
-- 
cgit v1.2.3


From d4bd4c393e59bb66a8d4f69f23dce694982723e1 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 16 Jul 2017 12:41:13 -0500
Subject: more labeling and use static

---
 include/region_map.h | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'include/region_map.h')

diff --git a/include/region_map.h b/include/region_map.h
index 88e0ee21f..3d970fa0a 100755
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -8,7 +8,7 @@ struct RegionMap
     u8 unk16;
     u8 everGrandeCityArea;
     u8 (*inputCallback)(void);
-    struct Sprite *cursorIconSprite;
+    struct Sprite *cursorSprite;
     struct Sprite *playerIconSprite;
     s32 bg2x;
     s32 bg2y;
@@ -24,8 +24,8 @@ struct RegionMap
     s32 unk50;
     u16 cursorPosX;
     u16 cursorPosY;
-    u16 cursorIconTileTag;
-    u16 cursorIconPaletteTag;
+    u16 cursorTileTag;
+    u16 cursorPaletteTag;
     s16 scrollX;
     s16 scrollY;
     s16 unk60;
@@ -48,15 +48,22 @@ struct RegionMap
     bool8 needUpdateVideoRegs;
     bool8 blinkPlayerIcon;
     bool8 playerIsInCave;
-    u8 filler80[0x100];
-    u8 unk180[0x100];
-    u8 unk280[0x600];
+    /*0x080*/ u8 filler80[0x100];
+    /*0x180*/ u8 cursorSmallImage[0x100];
+    /*0x280*/ u8 cursorLargeImage[0x600];
 };
 
-void InitRegionMap(struct RegionMap *regionMap, bool8 b);
+void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed);
+void sub_80FA904(struct RegionMap *regionMap, bool8 zoomed);
+bool8 sub_80FA940(void);
 void FreeRegionMapIconResources(void);
 u8 sub_80FAB60(void);
-void CreateRegionMapCursorIcon(u16, u16);
+void sub_80FAEC4(void);
+u8 sub_80FAFC0(void);
+void UpdateRegionMapVideoRegs(void);
+void sub_80FB2A4(s16, s16);
+u16 sub_80FBA04(u16 mapSecId);
+void CreateRegionMapCursor(u16, u16);
 void CreateRegionMapPlayerIcon(u16, u16);
 const u8 *GetMapSectionName(u8 *dest, u16 mapSecId, u16 length);
 const u8 *CopyMapName(u8 *dest, u16 b);
-- 
cgit v1.2.3