Sync heal location IDs, add NONE

pret · Sep 26, 2024 · 1045d02 · 1045d02
1 parent 4e0a4ec
commit 1045d02
Show file tree

Hide file tree

Showing 48 changed files with 185 additions and 177 deletions.
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
@@ -403,7 +403,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_CELADON_CITY",
+      "id": "HEAL_LOCATION_CELADON_CITY",
       "x": 48,
       "y": 12,
       "respawn_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",

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
@@ -416,7 +416,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_CERULEAN_CITY",
+      "id": "HEAL_LOCATION_CERULEAN_CITY",
       "x": 22,
       "y": 20,
       "respawn_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",

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
@@ -167,7 +167,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_CINNABAR_ISLAND",
+      "id": "HEAL_LOCATION_CINNABAR_ISLAND",
       "x": 14,
       "y": 12,
       "respawn_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",

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
@@ -106,7 +106,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_FIVE_ISLAND",
+      "id": "HEAL_LOCATION_FIVE_ISLAND",
       "x": 18,
       "y": 7,
       "respawn_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",

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
@@ -283,7 +283,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_FOUR_ISLAND",
+      "id": "HEAL_LOCATION_FOUR_ISLAND",
       "x": 18,
       "y": 21,
       "respawn_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F",

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
@@ -438,7 +438,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_FUCHSIA_CITY",
+      "id": "HEAL_LOCATION_FUCHSIA_CITY",
       "x": 25,
       "y": 32,
       "respawn_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F",

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
@@ -63,7 +63,7 @@
   "bg_events": [],
   "heal_locations": [
     {
-      "id": "SPAWN_INDIGO_PLATEAU",
+      "id": "HEAL_LOCATION_INDIGO_PLATEAU",
       "x": 11,
       "y": 7,
       "respawn_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F",

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
@@ -155,7 +155,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_LAVENDER_TOWN",
+      "id": "HEAL_LOCATION_LAVENDER_TOWN",
       "x": 6,
       "y": 6,
       "respawn_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F",

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
@@ -120,7 +120,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_ONE_ISLAND",
+      "id": "HEAL_LOCATION_ONE_ISLAND",
       "x": 14,
       "y": 6,
       "respawn_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F",

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
@@ -165,7 +165,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_PALLET_TOWN",
+      "id": "HEAL_LOCATION_PALLET_TOWN",
       "x": 6,
       "y": 8,
       "respawn_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F",

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
@@ -295,7 +295,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_PEWTER_CITY",
+      "id": "HEAL_LOCATION_PEWTER_CITY",
       "x": 17,
       "y": 26,
       "respawn_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F",

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
@@ -283,7 +283,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_ROUTE10",
+      "id": "HEAL_LOCATION_ROUTE10",
       "x": 13,
       "y": 21,
       "respawn_map": "MAP_ROUTE10_POKEMON_CENTER_1F",

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
@@ -193,7 +193,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_ROUTE4",
+      "id": "HEAL_LOCATION_ROUTE4",
       "x": 12,
       "y": 6,
       "respawn_map": "MAP_ROUTE4_POKEMON_CENTER_1F",

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
@@ -432,7 +432,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_SAFFRON_CITY",
+      "id": "HEAL_LOCATION_SAFFRON_CITY",
       "x": 24,
       "y": 39,
       "respawn_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F",

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
@@ -112,7 +112,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_SEVEN_ISLAND",
+      "id": "HEAL_LOCATION_SEVEN_ISLAND",
       "x": 12,
       "y": 4,
       "respawn_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F",

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::

diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json
@@ -103,7 +103,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_SIX_ISLAND",
+      "id": "HEAL_LOCATION_SIX_ISLAND",
       "x": 11,
       "y": 12,
       "respawn_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F",

diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,7 @@ SixIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 SixIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_SIX_ISLAND
+	setrespawn HEAL_LOCATION_SIX_ISLAND
 	call_if_eq VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, SixIsland_PokemonCenter_1F_EventScript_ShowRival
 	end
 

diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
@@ -388,7 +388,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_THREE_ISLAND",
+      "id": "HEAL_LOCATION_THREE_ISLAND",
       "x": 14,
       "y": 28,
       "respawn_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F",

diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ ThreeIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 ThreeIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_THREE_ISLAND
+	setrespawn HEAL_LOCATION_THREE_ISLAND
 	end
 
 ThreeIsland_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
@@ -207,7 +207,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_TWO_ISLAND",
+      "id": "HEAL_LOCATION_TWO_ISLAND",
       "x": 21,
       "y": 8,
       "respawn_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F",

diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ TwoIsland_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 TwoIsland_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_TWO_ISLAND
+	setrespawn HEAL_LOCATION_TWO_ISLAND
 	end
 
 TwoIsland_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json
@@ -303,7 +303,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_VERMILION_CITY",
+      "id": "HEAL_LOCATION_VERMILION_CITY",
       "x": 15,
       "y": 7,
       "respawn_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F",

diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ VermilionCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 VermilionCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_VERMILION_CITY
+	setrespawn HEAL_LOCATION_VERMILION_CITY
 	end
 
 VermilionCity_PokemonCenter_1F_EventScript_Nurse::

diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json
@@ -277,7 +277,7 @@
   ],
   "heal_locations": [
     {
-      "id": "SPAWN_VIRIDIAN_CITY",
+      "id": "HEAL_LOCATION_VIRIDIAN_CITY",
       "x": 26,
       "y": 27,
       "respawn_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F",

diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ ViridianCity_PokemonCenter_1F_MapScripts::
 	.byte 0
 
 ViridianCity_PokemonCenter_1F_OnTransition::
-	setrespawn SPAWN_VIRIDIAN_CITY
+	setrespawn HEAL_LOCATION_VIRIDIAN_CITY
 	end
 
 ViridianCity_PokemonCenter_1F_EventScript_Nurse::