Replace unusual heal location member names

GriffinRichards · Sep 24, 2024 · e301b9a · e301b9a
1 parent a722e8a
commit e301b9a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/include/heal_location.h b/include/heal_location.h
@@ -3,8 +3,8 @@
 
 struct HealLocation
 {
-    s8 group;
-    s8 map;
+    s8 mapGroup;
+    s8 mapNum;
     u16 x;
     u16 y;
 };

diff --git a/src/heal_location.c b/src/heal_location.c
@@ -11,7 +11,7 @@ u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum)
 
     for (i = 0; i < ARRAY_COUNT(sHealLocations); i++)
     {
-        if (sHealLocations[i].group == mapGroup && sHealLocations[i].map == mapNum)
+        if (sHealLocations[i].mapGroup == mapGroup && sHealLocations[i].mapNum == mapNum)
             return i + 1;
     }
     return 0;

diff --git a/src/overworld.c b/src/overworld.c
@@ -477,7 +477,7 @@ void sub_8053538(u8 a1)
     const struct HealLocation *warp = GetHealLocation(a1);
 
     if (warp)
-        Overworld_SetWarpDestination(warp->group, warp->map, -1, warp->x, warp->y);
+        Overworld_SetWarpDestination(warp->mapGroup, warp->mapNum, -1, warp->x, warp->y);
 }
 
 void Overworld_SetWarpDestToLastHealLoc(void)
@@ -490,7 +490,7 @@ void Overworld_SetHealLocationWarp(u8 healLocationId)
     const struct HealLocation *healLocation = GetHealLocation(healLocationId);
 
     if (healLocation != NULL)
-        SetWarpData(&gSaveBlock1.lastHealLocation, healLocation->group, healLocation->map, -1, healLocation->x, healLocation->y);
+        SetWarpData(&gSaveBlock1.lastHealLocation, healLocation->mapGroup, healLocation->mapNum, -1, healLocation->x, healLocation->y);
 }
 
 void sub_80535C4(s16 a1, s16 a2)
@@ -548,7 +548,7 @@ void sub_80537CC(u8 a1)
 {
     const struct HealLocation *warp = GetHealLocation(a1);
     if (warp)
-        SetWarpData(&gSaveBlock1.warp1, warp->group, warp->map, -1, warp->x, warp->y);
+        SetWarpData(&gSaveBlock1.warp1, warp->mapGroup, warp->mapNum, -1, warp->x, warp->y);
 }
 
 void gpu_sync_bg_hide()

diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
@@ -395,10 +395,10 @@ void process_heal_locations(const vector<string> &map_filepaths, string output_f
 
             // Add element to main heal locations array
             heal_locations_text << index_text << "\n\t{\n"
-                                << "\t\tMAP_GROUP(" << map_id << "),\n"
-                                << "\t\tMAP_NUM(" << map_id << "),\n"
-                                << "\t\t" << json_to_string(heal_location, "x") << ",\n"
-                                << "\t\t" << json_to_string(heal_location, "y") << ",\n"
+                                << "\t\t.mapGroup = MAP_GROUP(" << map_id << "),\n"
+                                << "\t\t.mapNum = MAP_NUM(" << map_id << "),\n"
+                                << "\t\t.x = " << json_to_string(heal_location, "x") << ",\n"
+                                << "\t\t.y = " << json_to_string(heal_location, "y") << ",\n"
                                 << "\t},\n";
 
             // Add element to respawn map array (if field is present)