Rename some flags, and use map ID macros

3 files changed, 4 insertions, 17 deletions

diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 2edf13661..291d6abec 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -10,79 +10,66 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_UseCutOnTree
 	.4byte gFieldEffectScript_Shadow
 	.4byte gFieldEffectScript_TallGrass
-
 	.4byte gFieldEffectScript_Ripple
 	.4byte gFieldEffectScript_FieldMoveShowMon
 	.4byte gFieldEffectScript_Ash
 	.4byte gFieldEffectScript_SurfBlob
 	.4byte gFieldEffectScript_UseSurf
-	
 	.4byte gFieldEffectScript_GroundImpactDust
 	.4byte gFieldEffectScript_Unknown11
 	.4byte gFieldEffectScript_BikeHopTallGrass
 	.4byte gFieldEffectScript_SandFootprints
 	.4byte gFieldEffectScript_BikeHopBigSplash
-	
 	.4byte gFieldEffectScript_Splash
 	.4byte gFieldEffectScript_BikeHopSmallSplash
 	.4byte gFieldEffectScript_LongGrass
 	.4byte gFieldEffectScript_Unknown18
 	.4byte gFieldEffectScript_Unknown19
-	
 	.4byte gFieldEffectScript_Unknown20
 	.4byte gFieldEffectScript_Unknown21
 	.4byte gFieldEffectScript_Unknown22
 	.4byte gFieldEffectScript_BerryTreeGrowthSparkle
 	.4byte gFieldEffectScript_DeepSandFootprints
-	
 	.4byte gFieldEffectScript_Unknown25
 	.4byte gFieldEffectScript_Unknown26
 	.4byte gFieldEffectScript_Unknown27
 	.4byte gFieldEffectScript_TreeDisguise
 	.4byte gFieldEffectScript_MountainDisguise
-	
 	.4byte gFieldEffectScript_Unknown30
 	.4byte gFieldEffectScript_UseFly
 	.4byte gFieldEffectScript_FlyIn
 	.4byte gFieldEffectScript_QuestionMarkIcon
 	.4byte gFieldEffectScript_FeetInFlowingWater
-	
 	.4byte gFieldEffectScript_BikeTireTracks
 	.4byte gFieldEffectScript_SandDisguisePlaceholder
 	.4byte gFieldEffectScript_UseRockSmash
 	.4byte gFieldEffectScript_Unknown38
 	.4byte gFieldEffectScript_Unknown39
-	
 	.4byte gFieldEffectScript_Unknown40
 	.4byte gFieldEffectScript_ShortGrass
 	.4byte gFieldEffectScript_HotSpringsWater
 	.4byte gFieldEffectScript_Unknown43
 	.4byte gFieldEffectScript_Unknown44
-	
 	.4byte gFieldEffectScript_Unknown45
 	.4byte gFieldEffectScript_HeartIcon
 	.4byte gFieldEffectScript_Unknown47
 	.4byte gFieldEffectScript_Unknown48
 	.4byte gFieldEffectScript_JumpOutOfAsh
-	
 	.4byte gFieldEffectScript_Unknown50
 	.4byte gFieldEffectScript_Unknown51
 	.4byte gFieldEffectScript_Unknown52
 	.4byte gFieldEffectScript_Bubbles
 	.4byte gFieldEffectScript_Unknown54
-	
 	.4byte gFieldEffectScript_Unknown55
 	.4byte gFieldEffectScript_Unknown56
 	.4byte gFieldEffectScript_Unknown57
 	.4byte gFieldEffectScript_Unknown58
 	.4byte gFieldEffectScript_FieldMoveShowMonInit
-	
 	.4byte gFieldEffectScript_UsePuzzleEffect
 	.4byte gFieldEffectScript_Unknown61
 	.4byte gFieldEffectScript_Unknown62
 	.4byte gFieldEffectScript_Unknown63
 	.4byte gFieldEffectScript_Rayquaza
-	
 	.4byte gFieldEffectScript_Unknown65
 	.4byte gFieldEffectScript_Unknown66
 
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 7e9b027b2..241cb50f1 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -25,7 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE
 	return
 
 AncientTomb_MapScript1_238FF2: @ 8238FF2
-	call_if_unset FLAG_SYS_BRAILLE_REGISTEEL_HM, AncientTomb_EventScript_238FFC
+	call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_238FFC
 	end
 
 AncientTomb_EventScript_238FFC:: @ 8238FFC
@@ -39,7 +39,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC
 
 AncientTomb_EventScript_239033:: @ 8239033
 	lockall
-	goto_if_set FLAG_SYS_BRAILLE_REGISTEEL_HM, AncientTomb_EventScript_239046
+	goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_239046
 	braillemessage AncientTomb_Braille_2A6D06
 	waitbuttonpress
 	hidebox2
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index ff58b3ba5..ac0b547af 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -16,7 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975
 	return
 
 DesertRuins_MapScript1_22D989: @ 822D989
-	call_if_unset FLAG_SYS_BRAILLE_REGIROCK_HM, DesertRuins_EventScript_22D993
+	call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETE, DesertRuins_EventScript_22D993
 	end
 
 DesertRuins_EventScript_22D993:: @ 822D993
@@ -39,7 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7
 
 DesertRuins_EventScript_22D9DB:: @ 822D9DB
 	lockall
-	goto_if_set FLAG_SYS_BRAILLE_REGIROCK_HM, DesertRuins_EventScript_22D9EE
+	goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETE, DesertRuins_EventScript_22D9EE
 	braillemessage DesertRuins_Braille_2A6CA0
 	waitbuttonpress
 	hidebox2