Finish off labelling flags

1 files changed, 18 insertions, 19 deletions

diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 226f89708..7e4ab53de 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -20,39 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C
-	goto_if_set FLAG_0x3B8, ShoalCave_LowTideInnerRoom_EventScript_236F3D
+	goto_if_set FLAG_RECIEVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D
 	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D
 	setmetatile 31, 8, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F3D
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D
-	goto_if_set FLAG_0x3B9, ShoalCave_LowTideInnerRoom_EventScript_236F5E
+	goto_if_set FLAG_RECIEVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E
 	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E
 	setmetatile 14, 26, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F5E
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E
-	goto_if_set FLAG_0x3BC, ShoalCave_LowTideInnerRoom_EventScript_236F76
+	goto_if_set FLAG_RECIEVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76
 	setmetatile 41, 20, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F76
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76
-	goto_if_set FLAG_0x3BD, ShoalCave_LowTideInnerRoom_EventScript_236F8E
+	goto_if_set FLAG_RECIEVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E
 	setmetatile 41, 10, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F8E
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E
-	goto_if_set FLAG_0x3BE, ShoalCave_LowTideInnerRoom_EventScript_236FA6
+	goto_if_set FLAG_RECIEVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6
 	setmetatile 6, 9, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236FA6
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6
-	goto_if_set FLAG_0x3BF, ShoalCave_LowTideInnerRoom_EventScript_236FB9
+	goto_if_set FLAG_RECIEVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9
 	setmetatile 16, 13, 857, 1
 	return
 
@@ -61,13 +61,13 @@ ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9
 
 ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
 	lockall
-	goto_if_set FLAG_0x3BC, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECIEVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
 	setmetatile 41, 20, 859, 0
 	special DrawWholeMapView
-	setflag FLAG_0x3BC
+	setflag FLAG_RECIEVED_SHOAL_SHELL_1
 	releaseall
 	end
 
@@ -78,49 +78,49 @@ ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC
 
 ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
 	lockall
-	goto_if_set FLAG_0x3BD, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECIEVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
 	setmetatile 41, 10, 859, 0
 	special DrawWholeMapView
-	setflag FLAG_0x3BD
+	setflag FLAG_RECIEVED_SHOAL_SHELL_2
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
 	lockall
-	goto_if_set FLAG_0x3BE, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECIEVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
 	setmetatile 6, 9, 859, 0
 	special DrawWholeMapView
-	setflag FLAG_0x3BE
+	setflag FLAG_RECIEVED_SHOAL_SHELL_3
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
 	lockall
-	goto_if_set FLAG_0x3BF, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECIEVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
 	setmetatile 16, 13, 859, 0
 	special DrawWholeMapView
-	setflag FLAG_0x3BF
+	setflag FLAG_RECIEVED_SHOAL_SHELL_4
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
 	lockall
-	goto_if_set FLAG_0x3B8, ShoalCave_LowTideInnerRoom_EventScript_2370BE
+	goto_if_set FLAG_RECIEVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE
 	giveitem_std ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
 	setmetatile 31, 8, 858, 0
 	special DrawWholeMapView
-	setflag FLAG_0x3B8
+	setflag FLAG_RECIEVED_SHOAL_SALT_1
 	releaseall
 	end
 
@@ -131,13 +131,12 @@ ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE
 
 ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8
 	lockall
-	goto_if_set FLAG_0x3B9, ShoalCave_LowTideInnerRoom_EventScript_2370BE
+	goto_if_set FLAG_RECIEVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE
 	giveitem_std ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054
 	setmetatile 14, 26, 858, 0
 	special DrawWholeMapView
-	setflag FLAG_0x3B9
+	setflag FLAG_RECIEVED_SHOAL_SALT_2
 	releaseall
 	end
-