SEAGALLOP constants in event scripts

11 files changed, 34 insertions, 35 deletions

diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc
index 487cae2f1..ea213a771 100644
--- a/data/maps/BirthIsland_Harbor/scripts.inc
+++ b/data/maps/BirthIsland_Harbor/scripts.inc
@@ -6,23 +6,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 10
-	multichoice 20, 8, 61, 0
-	switch VAR_RESULT
-	case 0, EventScript_1A91D5
-	case 1, EventScript_1A90F6
-	case 127, EventScript_1A90F6
-	end
-
-NavelRock_Harbor_MapScripts:: @ 8165420
-	.byte 0
-
-NavelRock_Harbor_EventScript_165421:: @ 8165421
-	lock
-	faceplayer
-	message Text_181726
-	waitmessage
-	setvar VAR_0x8004, 9
+	setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND
 	multichoice 20, 8, 61, 0
 	switch VAR_RESULT
 	case 0, EventScript_1A91D5
diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc
index 504b79cae..2ebce51b7 100644
--- a/data/maps/CinnabarIsland/scripts.inc
+++ b/data/maps/CinnabarIsland/scripts.inc
@@ -219,8 +219,8 @@ EventScript_1670E6:: @ 81670E6
 	delay 40
 	setflag FLAG_HIDE_CINNABAR_SEAGALLOP
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8006, 1
+	setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND
+	setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
 	goto EventScript_1A90DA
 	end
 
diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc
index f5d12f8a4..9ab26aa3a 100644
--- a/data/maps/FiveIsland_Harbor/scripts.inc
+++ b/data/maps/FiveIsland_Harbor/scripts.inc
@@ -6,6 +6,6 @@ FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND
 	goto EventScript_1A900F
 	end
diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc
index 2c7fce02f..b9c632972 100644
--- a/data/maps/FourIsland_Harbor/scripts.inc
+++ b/data/maps/FourIsland_Harbor/scripts.inc
@@ -6,6 +6,6 @@ FourIsland_Harbor_EventScript_171C99:: @ 8171C99
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND
 	goto EventScript_1A900F
 	end
diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc
index 6e630ca01..8cb8dd796 100644
--- a/data/maps/NavelRock_Harbor/scripts.inc
+++ b/data/maps/NavelRock_Harbor/scripts.inc
@@ -1 +1,16 @@
-@	.include "data/maps/NavelRock_Harbor/scripts.inc"
+
+NavelRock_Harbor_MapScripts:: @ 8165420
+	.byte 0
+
+NavelRock_Harbor_EventScript_165421:: @ 8165421
+	lock
+	faceplayer
+	message Text_181726
+	waitmessage
+	setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK
+	multichoice 20, 8, 61, 0
+	switch VAR_RESULT
+	case 0, EventScript_1A91D5
+	case 1, EventScript_1A90F6
+	case 127, EventScript_1A90F6
+	end
diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc
index 44c18ff60..75e74dad7 100644
--- a/data/maps/OneIsland_Harbor/scripts.inc
+++ b/data/maps/OneIsland_Harbor/scripts.inc
@@ -37,6 +37,6 @@ OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
 	goto EventScript_1A8EC5
 	end
diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc
index c4777e1ac..8fa30cfa5 100644
--- a/data/maps/SevenIsland_Harbor/scripts.inc
+++ b/data/maps/SevenIsland_Harbor/scripts.inc
@@ -6,6 +6,6 @@ SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 7
+	setvar VAR_0x8004, SEAGALLOP_SEVEN_ISLAND
 	goto EventScript_1A900F
 	end
diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc
index 1e4e34a16..0730e3b72 100644
--- a/data/maps/SixIsland_Harbor/scripts.inc
+++ b/data/maps/SixIsland_Harbor/scripts.inc
@@ -6,6 +6,6 @@ SixIsland_Harbor_EventScript_171E48:: @ 8171E48
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, SEAGALLOP_SIX_ISLAND
 	goto EventScript_1A900F
 	end
diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc
index 3678385c0..9fd44c116 100644
--- a/data/maps/ThreeIsland_Harbor/scripts.inc
+++ b/data/maps/ThreeIsland_Harbor/scripts.inc
@@ -6,6 +6,6 @@ ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, SEAGALLOP_THREE_ISLAND
 	goto EventScript_1A900F
 	end
diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc
index 0fd4e9789..919239a0b 100644
--- a/data/maps/TwoIsland_Harbor/scripts.inc
+++ b/data/maps/TwoIsland_Harbor/scripts.inc
@@ -6,6 +6,6 @@ TwoIsland_Harbor_EventScript_171806:: @ 8171806
 	faceplayer
 	message Text_181726
 	waitmessage
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, SEAGALLOP_TWO_ISLAND
 	goto EventScript_1A8F54
 	end
diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc
index 23631777c..d1d312add 100644
--- a/data/maps/VermilionCity/scripts.inc
+++ b/data/maps/VermilionCity/scripts.inc
@@ -76,7 +76,7 @@ EventScript_166977:: @ 8166977
 	end
 
 EventScript_166996:: @ 8166996
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
 	goto_if ge, EventScript_1669BB
 	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
@@ -96,7 +96,7 @@ EventScript_1669BB:: @ 81669BB
 	call EventScript_166977
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_166A5F
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	message Text_17FBB8
 	waitmessage
 	goto EventScript_1A911E
@@ -159,22 +159,22 @@ EventScript_166AB1:: @ 8166AB1
 
 EventScript_166B0B:: @ 8166B0B
 	msgbox gUnknown_817FCEC
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8006, 9
+	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
+	setvar VAR_0x8006, SEAGALLOP_NAVEL_ROCK
 	goto EventScript_1A90DA
 	end
 
 EventScript_166B23:: @ 8166B23
 	msgbox gUnknown_817FD5F
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8006, 10
+	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
+	setvar VAR_0x8006, SEAGALLOP_BIRTH_ISLAND
 	goto EventScript_1A90DA
 	end
 
 EventScript_166B3B:: @ 8166B3B
 	message Text_17FB23
 	waitmessage
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	multichoice 19, 5, 57, 0
 	switch VAR_RESULT
 	case 0, EventScript_1A8FEE
@@ -226,7 +226,7 @@ EventScript_166BDE:: @ 8166BDE
 	end
 
 EventScript_166BED:: @ 8166BED
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
 	goto_if ge, EventScript_1669BB
 	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1