setrespawn

24 files changed, 43 insertions, 43 deletions

diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
index 3810803bc..92bde48ad 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC
 	.byte 0
 
 CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7
-	setrespawn 7
+	setrespawn SPAWN_CELADON_CITY
 	end
 
 CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB
diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc
index b21b6af7a..d8fe70407 100644
--- a/data/maps/CeruleanCity_Gym/scripts.inc
+++ b/data/maps/CeruleanCity_Gym/scripts.inc
@@ -18,7 +18,7 @@ EventScript_16AAD3:: @ 816AAD3
 	special SetFlavorTextFlagFromSpecialVars
 	setflag FLAG_0x4B1
 	setflag FLAG_0x821
-	setrespawn 4
+	setrespawn SPAWN_CERULEAN_CITY
 	setvar VAR_0x8008, 2
 	call EventScript_1A6B18
 	goto EventScript_16AAF9
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
index e5f26eb25..dcace7aee 100644
--- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D
 	.byte 0
 
 CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38
-	setrespawn 4
+	setrespawn SPAWN_CERULEAN_CITY
 	end
 
 CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
index ab4967fe5..87461a536 100644
--- a/data/maps/CinnabarIsland_Gym/scripts.inc
+++ b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -69,7 +69,7 @@ EventScript_16DA06:: @ 816DA06
 	special SetFlavorTextFlagFromSpecialVars
 	setflag FLAG_0x4B6
 	setflag FLAG_UNK826
-	setrespawn 9
+	setrespawn SPAWN_CINNABAR_ISLAND
 	setvar VAR_0x4071, 1
 	clearflag FLAG_0x062
 	setvar VAR_0x8008, 7
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
index f356f6106..53eb545d6 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7
 	.byte 0
 
 CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2
-	setrespawn 9
+	setrespawn SPAWN_CINNABAR_ISLAND
 	end
 
 CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
index 831a9d326..a16cb37d1 100644
--- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1
 	.byte 0
 
 FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC
-	setrespawn 18
+	setrespawn SPAWN_FIVE_ISLAND
 	end
 
 FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00
diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
index 9d085d183..cc4cb5ffa 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA
 	.byte 0
 
 FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5
-	setrespawn 17
+	setrespawn SPAWN_FOUR_ISLAND
 	end
 
 FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
index 6c231ac16..062f93acc 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1
 	.byte 0
 
 FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC
-	setrespawn 8
+	setrespawn SPAWN_FUCHSIA_CITY
 	end
 
 FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
index 56a3cdcb3..7dae5f353 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A
 	.byte 0
 
 IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65
-	setrespawn 10
+	setrespawn SPAWN_INDIGO_PLATEAU
 	specialvar VAR_RESULT, sub_806E25C
 	compare_var_to_value VAR_RESULT, 1
 	call_if 1, EventScript_16EA79
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
index 55c186fdf..f7341b8f9 100644
--- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF
 	.byte 0
 
 LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA
-	setrespawn 5
+	setrespawn SPAWN_LAVENDER_TOWN
 	end
 
 LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index 61efea315..7a1941f72 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -27,7 +27,7 @@ EventScript_170C36:: @ 8170C36
 	return
 
 OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E
-	setrespawn 14
+	setrespawn SPAWN_ONE_ISLAND
 	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
 	call_if 1, EventScript_170C73
 	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
index ec105ea63..3700d06be 100644
--- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
@@ -9,7 +9,7 @@ PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE
 	end
 
 EventScript_168CBA:: @ 8168CBA
-	setrespawn 1
+	setrespawn SPAWN_PALLET_TOWN
 	return
 
 PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE
diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc
index 8e536e195..525eef027 100644
--- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760
 	.byte 0
 
 PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B
-	setrespawn 3
+	setrespawn SPAWN_PEWTER_CITY
 	end
 
 PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F
diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc
index 30d239fd8..faadadcda 100644
--- a/data/maps/PokemonLeague_HallOfFame/scripts.inc
+++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc
@@ -35,7 +35,7 @@ EventScript_162D70:: @ 8162D70
 	delay 40
 	setvar VAR_0x4001, 1
 	call EventScript_1A651A
-	setrespawn 1
+	setrespawn SPAWN_PALLET_TOWN
 	fadescreenspeed 1, 24
 	special sub_80CA2E4
 	waitstate
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc
index f9ec2bec4..15889ad8f 100644
--- a/data/maps/Route10_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc
@@ -5,7 +5,7 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F
 
 Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A
 	setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F
-	setrespawn 13
+	setrespawn SPAWN_ROUTE10
 	end
 
 Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41
diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc
index 3019e152f..6788cc0c8 100644
--- a/data/maps/Route4_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc
@@ -5,7 +5,7 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739
 
 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744
 	setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F
-	setrespawn 12
+	setrespawn SPAWN_ROUTE4
 	end
 
 Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
index 17e583372..65c37eaf3 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC
 	.byte 0
 
 SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7
-	setrespawn 11
+	setrespawn SPAWN_SAFFRON_CITY
 	end
 
 SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
index 09e035316..170459099 100644
--- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89
 	.byte 0
 
 SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94
-	setrespawn 19
+	setrespawn SPAWN_SEVEN_ISLAND
 	end
 
 SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98
diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
index ea59d73bc..593f9f979 100644
--- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
@@ -5,7 +5,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A
 	.byte 0
 
 SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A
-	setrespawn 20
+	setrespawn SPAWN_SIX_ISLAND
 	compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0
 	call_if 1, EventScript_171D89
 	end
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
index 8041d604d..559b2a03c 100644
--- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832
 	.byte 0
 
 ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D
-	setrespawn 16
+	setrespawn SPAWN_THREE_ISLAND
 	end
 
 ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
index e9578c088..813b5d595 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4
 	.byte 0
 
 TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF
-	setrespawn 15
+	setrespawn SPAWN_TWO_ISLAND
 	end
 
 TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3
diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
index 7f8857c68..f65681dc3 100644
--- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424
 	.byte 0
 
 VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F
-	setrespawn 6
+	setrespawn SPAWN_VERMILION_CITY
 	end
 
 VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
index a3bb38219..507b2bfe4 100644
--- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0
 	.byte 0
 
 ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB
-	setrespawn 2
+	setrespawn SPAWN_VIRIDIAN_CITY
 	end
 
 ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF
diff --git a/include/constants/spawn_points.h b/include/constants/spawn_points.h
index 9ab89f26d..eea133bd1 100644
--- a/include/constants/spawn_points.h
+++ b/include/constants/spawn_points.h
@@ -1,26 +1,26 @@
 #ifndef GUARD_CONSTANTS_SPAWN_POINTS_H
 #define GUARD_CONSTANTS_SPAWN_POINTS_H
 
-#define SPAWN_PALLET_TOWN      0
-#define SPAWN_VIRIDIAN_CITY    1
-#define SPAWN_PEWTER_CITY      2
-#define SPAWN_CERULEAN_CITY    3
-#define SPAWN_LAVENDER_TOWN    4
-#define SPAWN_VERMILION_CITY   5
-#define SPAWN_CELADON_CITY     6
-#define SPAWN_FUCHSIA_CITY     7
-#define SPAWN_CINNABAR_ISLAND  8
-#define SPAWN_INDIGO_PLATEAU   9
-#define SPAWN_SAFFRON_CITY    10
-#define SPAWN_ROUTE4          11
-#define SPAWN_ROUTE10         12
-#define SPAWN_ONE_ISLAND      13
-#define SPAWN_TWO_ISLAND      14
-#define SPAWN_THREE_ISLAND    15
-#define SPAWN_FOUR_ISLAND     16
-#define SPAWN_FIVE_ISLAND     17
-#define SPAWN_SEVEN_ISLAND    18
-#define SPAWN_SIX_ISLAND      19
+#define SPAWN_PALLET_TOWN      1
+#define SPAWN_VIRIDIAN_CITY    2
+#define SPAWN_PEWTER_CITY      3
+#define SPAWN_CERULEAN_CITY    4
+#define SPAWN_LAVENDER_TOWN    5
+#define SPAWN_VERMILION_CITY   6
+#define SPAWN_CELADON_CITY     7
+#define SPAWN_FUCHSIA_CITY     8
+#define SPAWN_CINNABAR_ISLAND  9
+#define SPAWN_INDIGO_PLATEAU  10
+#define SPAWN_SAFFRON_CITY    11
+#define SPAWN_ROUTE4          12
+#define SPAWN_ROUTE10         13
+#define SPAWN_ONE_ISLAND      14
+#define SPAWN_TWO_ISLAND      15
+#define SPAWN_THREE_ISLAND    16
+#define SPAWN_FOUR_ISLAND     17
+#define SPAWN_FIVE_ISLAND     18
+#define SPAWN_SEVEN_ISLAND    19
+#define SPAWN_SIX_ISLAND      20
 #define NUM_SPAWN_POINTS      20
 
 #endif //GUARD_CONSTANTS_SPAWN_POINTS_H