pret · GriffinRichards · Oct 11, 2024 · Sep 18, 2024 · Sep 19, 2024 · Sep 19, 2024
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ ld_script_ruby.txt
 ld_script_sapphire.txt
 sound/**/*.bin
 sound/songs/midi/*.s
+src/data/heal_locations.h
 src/data/items.h
 src/data/wild_encounters.h
 src/data/region_map/region_map_entries.h

diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
@@ -400,5 +400,14 @@
       "quantity": 1,
       "underfoot": false
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_CELADON_CITY",
+      "x": 48,
+      "y": 12,
+      "respawn_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ CeladonCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 CeladonCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_CELADON_CITY
+	setrespawn HEAL_LOCATION_CELADON_CITY
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json
@@ -413,5 +413,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_CERULEAN_CITY",
+      "x": 22,
+      "y": 20,
+      "respawn_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc
@@ -13,7 +13,7 @@ CeruleanCity_Gym_EventScript_MistyDefeated::
 	famechecker FAMECHECKER_MISTY, 1
 	setflag FLAG_DEFEATED_MISTY
 	setflag FLAG_BADGE02_GET
-	setrespawn SPAWN_CERULEAN_CITY
+	setrespawn HEAL_LOCATION_CERULEAN_CITY
 	set_gym_trainers 2
 	goto CeruleanCity_Gym_EventScript_GiveTM03
 	end

diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ CeruleanCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 CeruleanCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_CERULEAN_CITY
+	setrespawn HEAL_LOCATION_CERULEAN_CITY
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json
@@ -164,5 +164,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "CinnabarIsland_EventScript_PokemonLabSign"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_CINNABAR_ISLAND",
+      "x": 14,
+      "y": 12,
+      "respawn_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -64,7 +64,7 @@ CinnabarIsland_Gym_EventScript_DefeatedBlaine::
 	famechecker FAMECHECKER_BLAINE, 1
 	setflag FLAG_DEFEATED_BLAINE
 	setflag FLAG_BADGE07_GET
-	setrespawn SPAWN_CINNABAR_ISLAND
+	setrespawn HEAL_LOCATION_CINNABAR_ISLAND
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
 	clearflag FLAG_HIDE_CINNABAR_BILL
 	set_gym_trainers 7

diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
@@ -6,7 +6,7 @@ CinnabarIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 CinnabarIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_CINNABAR_ISLAND
+	setrespawn HEAL_LOCATION_CINNABAR_ISLAND
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json
@@ -103,5 +103,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "FiveIsland_EventScript_IslandSign"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_FIVE_ISLAND",
+      "x": 18,
+      "y": 7,
+      "respawn_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ FiveIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 FiveIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_FIVE_ISLAND
+	setrespawn HEAL_LOCATION_FIVE_ISLAND
 	end
 
 FiveIsland_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
@@ -280,5 +280,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "FourIsland_EventScript_LoreleisHouseSign"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_FOUR_ISLAND",
+      "x": 18,
+      "y": 21,
+      "respawn_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ FourIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 FourIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_FOUR_ISLAND
+	setrespawn HEAL_LOCATION_FOUR_ISLAND
 	end
 
 FourIsland_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json
@@ -435,5 +435,14 @@
       "quantity": 1,
       "underfoot": false
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_FUCHSIA_CITY",
+      "x": 25,
+      "y": 32,
+      "respawn_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ FuchsiaCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 FuchsiaCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_FUCHSIA_CITY
+	setrespawn HEAL_LOCATION_FUCHSIA_CITY
 	end
 
 FuchsiaCity_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json
@@ -60,5 +60,14 @@
     }
   ],
   "coord_events": [],
-  "bg_events": []
+  "bg_events": [],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_INDIGO_PLATEAU",
+      "x": 11,
+      "y": 7,
+      "respawn_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F",
+      "respawn_npc": 2
+    }
+  ]
 }
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
@@ -6,7 +6,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 IndigoPlateau_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_INDIGO_PLATEAU
+	setrespawn HEAL_LOCATION_INDIGO_PLATEAU
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	call_if_eq VAR_RESULT, TRUE, IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
 	end

diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json
@@ -152,5 +152,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "LavenderTown_EventScript_VolunteerHouseSign"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_LAVENDER_TOWN",
+      "x": 6,
+      "y": 6,
+      "respawn_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ LavenderTown_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 LavenderTown_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_LAVENDER_TOWN
+	setrespawn HEAL_LOCATION_LAVENDER_TOWN
 	end
 
 LavenderTown_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json
@@ -117,5 +117,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "OneIsland_EventScript_PokemonNetCenterSign"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_ONE_ISLAND",
+      "x": 14,
+      "y": 6,
+      "respawn_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -28,7 +28,7 @@ OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn::
 	return
 
 OneIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_ONE_ISLAND
+	setrespawn HEAL_LOCATION_ONE_ISLAND
 	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6, OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone
 	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos
 	call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2, OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos

diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
@@ -162,5 +162,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "PalletTown_EventScript_TrainerTips"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_PALLET_TOWN",
+      "x": 6,
+      "y": 8,
+      "respawn_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
@@ -8,7 +8,7 @@ PalletTown_PlayersHouse_2F_OnTransition::
 	end
 
 PalletTown_PlayersHouse_2F_EventScript_SetRespawn::
-	setrespawn SPAWN_PALLET_TOWN
+	setrespawn HEAL_LOCATION_PALLET_TOWN
 	return
 
 PalletTown_PlayersHouse_2F_OnWarp::

diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json
@@ -292,5 +292,14 @@
       "quantity": 1,
       "underfoot": false
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_PEWTER_CITY",
+      "x": 17,
+      "y": 26,
+      "respawn_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F",
+      "respawn_npc": 3
+    }
   ]
 }
diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ PewterCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 PewterCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_PEWTER_CITY
+	setrespawn HEAL_LOCATION_PEWTER_CITY
 	end
 
 PewterCity_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc
@@ -37,7 +37,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom::
 	delay 40
 	setvar VAR_TEMP_1, 1
 	call EventScript_SetDefeatedEliteFourFlagsVars
-	setrespawn SPAWN_PALLET_TOWN
+	setrespawn HEAL_LOCATION_PALLET_TOWN
 	fadescreenspeed FADE_TO_BLACK, 24
 	special EnterHallOfFame
 	waitstate

diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json
@@ -280,5 +280,14 @@
       "quantity": 1,
       "underfoot": false
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_ROUTE10",
+      "x": 13,
+      "y": 21,
+      "respawn_map": "MAP_ROUTE10_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,7 @@ Route10_PokemonCenter_1F_MapScripts::
 
 Route10_PokemonCenter_1F_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F
-	setrespawn SPAWN_ROUTE10
+	setrespawn HEAL_LOCATION_ROUTE10
 	end
 
 Route10_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
@@ -190,5 +190,14 @@
       "quantity": 1,
       "underfoot": false
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_ROUTE4",
+      "x": 12,
+      "y": 6,
+      "respawn_map": "MAP_ROUTE4_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,7 @@ Route4_PokemonCenter_1F_MapScripts::
 
 Route4_PokemonCenter_1F_OnTransition::
 	setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F
-	setrespawn SPAWN_ROUTE4
+	setrespawn HEAL_LOCATION_ROUTE4
 	end
 
 Route4_PokemonCenter_1F_EventScript_Boy::

diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
@@ -429,5 +429,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "SaffronCity_EventScript_TrainerFanClubSign"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_SAFFRON_CITY",
+      "x": 24,
+      "y": 39,
+      "respawn_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ SaffronCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 SaffronCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_SAFFRON_CITY
+	setrespawn HEAL_LOCATION_SAFFRON_CITY
 	end
 
 SaffronCity_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json
@@ -109,5 +109,14 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "SevenIsland_EventScript_IslandSign"
     }
+  ],
+  "heal_locations": [
+    {
+      "id": "HEAL_LOCATION_SEVEN_ISLAND",
+      "x": 12,
+      "y": 4,
+      "respawn_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F",
+      "respawn_npc": 1
+    }
   ]
 }
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ SevenIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 SevenIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_SEVEN_ISLAND
+	setrespawn HEAL_LOCATION_SEVEN_ISLAND
 	end
 
 SevenIsland_PokemonCenter_1F_EventScript_Nurse::