Merge remote-tracking branch 'garakmon/heal-loc-2'

2 files changed, 31 insertions, 13 deletions

diff --git a/include/constants/heal_locations.h b/include/constants/heal_locations.h
new file mode 100644
index 000000000..64c8956a9
--- /dev/null
+++ b/include/constants/heal_locations.h
@@ -0,0 +1,27 @@
+#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H
+#define GUARD_CONSTANTS_HEAL_LOCATIONS_H
+
+#define HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 1
+#define HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F 2
+#define HEAL_LOCATION_PETALBURG_CITY 3
+#define HEAL_LOCATION_SLATEPORT_CITY 4
+#define HEAL_LOCATION_MAUVILLE_CITY 5
+#define HEAL_LOCATION_RUSTBORO_CITY 6
+#define HEAL_LOCATION_FORTREE_CITY 7
+#define HEAL_LOCATION_LILYCOVE_CITY 8
+#define HEAL_LOCATION_MOSSDEEP_CITY 9
+#define HEAL_LOCATION_SOOTOPOLIS_CITY 10
+#define HEAL_LOCATION_EVER_GRANDE_CITY_1 11
+#define HEAL_LOCATION_LITTLEROOT_TOWN_1 12
+#define HEAL_LOCATION_LITTLEROOT_TOWN_2 13
+#define HEAL_LOCATION_OLDALE_TOWN 14
+#define HEAL_LOCATION_DEWFORD_TOWN 15
+#define HEAL_LOCATION_LAVARIDGE_TOWN 16
+#define HEAL_LOCATION_FALLARBOR_TOWN 17
+#define HEAL_LOCATION_VERDANTURF_TOWN 18
+#define HEAL_LOCATION_PACIFIDLOG_TOWN 19
+#define HEAL_LOCATION_EVER_GRANDE_CITY_2 20
+#define HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR 21
+#define HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST 22
+
+#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H
diff --git a/include/heal_location.h b/include/heal_location.h
index 1f966f1ae..46f0d785a 100644
--- a/include/heal_location.h
+++ b/include/heal_location.h
@@ -1,13 +1,6 @@
 #ifndef GUARD_HEAL_LOCATION_H
 #define GUARD_HEAL_LOCATION_H
 
-// Exported type declarations
-
-struct UnkStruct_0859F534 {
-    const union AffineAnimCmd *const *const affineAnims;
-    void (* callback)(struct Sprite *sprite);
-};
-
 struct HealLocation
 {
     s8 group;
@@ -16,10 +9,8 @@ struct HealLocation
     u16 y;
 };
 
-// Exported RAM declarations
-
-// Exported ROM declarations
-
-const struct HealLocation *GetHealLocationPointer(u32 loc);
+u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum);
+const struct HealLocation *GetHealLocationByMap(u16 mapGroup, u16 mapNum);
+const struct HealLocation *GetHealLocation(u32 index);
 
-#endif //GUARD_HEAL_LOCATION_H
+#endif // GUARD_HEAL_LOCATION_H