Doc field move scripts completely, use fldeff constants for dofieldeffect

Fix labels

Fix labels again

Delete extra boulder scripts

Now it should build fine

46 files changed, 284 insertions, 316 deletions

diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
index 1c517735e..2d6f7ee77 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
@@ -42,11 +42,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
 	setfieldeffectargument 0, 10
 	setfieldeffectargument 1, 10
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
 	compare VAR_RESULT, 0
 	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
-	waitfieldeffect 54
+	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	end
 
@@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
 	delay 20
 	compare VAR_RESULT, 0
 	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
-	waitfieldeffect 54
+	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	end
 
@@ -72,15 +72,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
 	setfieldeffectargument 0, 8
 	setfieldeffectargument 1, 5
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	setfieldeffectargument 0, 11
 	setfieldeffectargument 1, 3
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
 	compare VAR_RESULT, 0
 	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
-	waitfieldeffect 54
+	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	end
 
@@ -89,19 +89,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
 	setfieldeffectargument 0, 16
 	setfieldeffectargument 1, 3
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	setfieldeffectargument 0, 25
 	setfieldeffectargument 1, 2
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	setfieldeffectargument 0, 24
 	setfieldeffectargument 1, 6
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
 	compare VAR_RESULT, 0
 	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
-	waitfieldeffect 54
+	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	end
 
@@ -112,28 +112,28 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3
 	setfieldeffectargument 0, 42
 	setfieldeffectargument 1, 10
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	return
 
 AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3
 	setfieldeffectargument 0, 20
 	setfieldeffectargument 1, 5
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	return
 
 AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3
 	setfieldeffectargument 0, 1
 	setfieldeffectargument 1, 12
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	return
 
 AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3
 	setfieldeffectargument 0, 1
 	setfieldeffectargument 1, 2
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
 	return
 
 AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 594790ff3..4b5a8ef36 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -68,9 +68,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
 	setfieldeffectargument 0, 1
 	setfieldeffectargument 1, 58
 	setfieldeffectargument 2, 26
-	dofieldeffect 65
+	dofieldeffect FLDEFF_65
 	playbgm MUS_RG_DEOEYE, 0
-	waitfieldeffect 65
+	waitfieldeffect FLDEFF_65
 	addobject 2
 	applymovement 2, BirthIsland_Exterior_Movement_268054
 	waitmovement 0
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index f61547c14..343614d85 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -38,8 +38,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 20
-	dofieldeffect 62
-	waitfieldeffect 62
+	dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
+	waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
 	delay 40
 	setvar VAR_TEMP_1, 1
 	call EverGrandeCity_HallOfFame_EventScript_2717C1
diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json
index 9bb09fe5a..70d1a2cfd 100644
--- a/data/maps/FieryPath/map.json
+++ b/data/maps/FieryPath/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FieryPath_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FieryPath_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FieryPath_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FieryPath_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FieryPath_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FieryPath_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_16"
     },
     {
diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json
index 73a13d6d2..72e403046 100644
--- a/data/maps/GraniteCave_B2F/map.json
+++ b/data/maps/GraniteCave_B2F/map.json
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_B2F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
     }
   ],
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 7f4c9e3fd..09fb56cfd 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -391,10 +391,10 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
-	dofieldeffect 30
+	dofieldeffect FLDEFF_NPCFLY_OUT
 	delay 15
 	removeobject VAR_LAST_TALKED
-	waitfieldeffect 30
+	waitfieldeffect FLDEFF_NPCFLY_OUT
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	setflag FLAG_MET_RIVAL_LILYCOVE
diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json
index 2bbcf77a0..350c52b4f 100644
--- a/data/maps/MagmaHideout_1F/map.json
+++ b/data/maps/MagmaHideout_1F/map.json
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_13"
     }
   ],
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 77c339b11..e6464a7f9 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -12,8 +12,8 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	setfieldeffectargument 0, 18
 	setfieldeffectargument 1, 42
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	waitfieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
+	waitfieldeffect FLDEFF_SPARKLE
 	setvar VAR_RESULT, 1
 	playfanfare MUS_ME_TAMA
 	playse SE_TAMA
diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json
index a653c6e52..c24e2a006 100644
--- a/data/maps/MirageTower_3F/map.json
+++ b/data/maps/MirageTower_3F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MirageTower_3F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MirageTower_3F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     }
   ],
diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json
index d6b69a14c..45e5fa62b 100644
--- a/data/maps/MirageTower_4F/map.json
+++ b/data/maps/MirageTower_4F/map.json
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MirageTower_4F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     }
   ],
diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json
index 6d1bc22a5..7e7de784a 100644
--- a/data/maps/PetalburgWoods/map.json
+++ b/data/maps/PetalburgWoods/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgWoods_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgWoods_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 91004d1ab..bf207ec2f 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -204,7 +204,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index 7bfe6e164..d2c7cc146 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -417,7 +417,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route104_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_11"
     },
     {
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index 46610937e..aae615a62 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -759,8 +759,8 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
 	setfieldeffectargument 0, VAR_0x8004
 	setfieldeffectargument 1, VAR_0x8005
 	setfieldeffectargument 2, VAR_0x8006
-	dofieldeffect 54
-	waitfieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
+	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	return
 
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json
index c6609d103..18dc10027 100644
--- a/data/maps/Route110_TrickHousePuzzle1/map.json
+++ b/data/maps/Route110_TrickHousePuzzle1/map.json
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_1B"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_1C"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_1E"
     }
   ],
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json
index e69580793..a37498fd2 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.json
+++ b/data/maps/Route110_TrickHousePuzzle3/map.json
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     }
   ],
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json
index 47238a559..f77fa9b22 100644
--- a/data/maps/Route110_TrickHousePuzzle4/map.json
+++ b/data/maps/Route110_TrickHousePuzzle4/map.json
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_1A"
     }
   ],
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index d3428f8c6..ef7e29999 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -222,7 +222,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -378,7 +378,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 08f2996d2..1aee2d422 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index 484699ec6..53ce80ce7 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -217,7 +217,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     },
     {
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
index 0745af08c..8a369e407 100644
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -360,7 +360,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_15"
     },
     {
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index efaad2802..b29b58639 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_11"
     },
     {
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index 0a3fee210..e7737bf1e 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -183,7 +183,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_11"
     },
     {
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 1bdbd0bca..fccf5c88e 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -295,7 +295,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -438,7 +438,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -451,7 +451,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 40c9ee09a..b484b064d 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -245,10 +245,10 @@ Route120_EventScript_1F572C:: @ 81F572C
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
-	dofieldeffect 30
+	dofieldeffect FLDEFF_NPCFLY_OUT
 	delay 15
 	removeobject 31
-	waitfieldeffect 30
+	waitfieldeffect FLDEFF_NPCFLY_OUT
 	setmetatile 13, 15, 663, 0
 	setmetatile 12, 16, 671, 0
 	setmetatile 12, 17, 161, 0
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
index f1152b465..9382ab375 100644
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -222,7 +222,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -313,7 +313,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index 1e562420d..c13d17a0c 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -256,7 +256,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route123_EventScript_2906BB",
+      "script": "EventScript_CutTree",
       "flag": "FLAG_TEMP_13"
     },
     {
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index 84091ac3a..d06abe297 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -48,8 +48,8 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	removeobject 4
 	delay 100
 	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	waitfieldeffect 30
+	dofieldeffect FLDEFF_NPCFLY_OUT
+	waitfieldeffect FLDEFF_NPCFLY_OUT
 	addobject 3
 	applymovement 3, Route128_Movement_1F6C87
 	waitmovement 0
@@ -69,10 +69,10 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
-	dofieldeffect 30
+	dofieldeffect FLDEFF_NPCFLY_OUT
 	delay 15
 	removeobject 3
-	waitfieldeffect 30
+	waitfieldeffect FLDEFF_NPCFLY_OUT
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_ROUTE128_STATE, 2
 	releaseall
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
index 9fc378729..bd5c8206d 100644
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2"
     },
     {
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index 967e55f3e..0dafeb180 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -66,7 +66,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json
index 94c2c268f..798563263 100644
--- a/data/maps/SafariZone_Northeast/map.json
+++ b/data/maps/SafariZone_Northeast/map.json
@@ -61,7 +61,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_12"
     },
     {
diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json
index bcac09256..88db72b4a 100644
--- a/data/maps/SeafloorCavern_Room1/map.json
+++ b/data/maps/SeafloorCavern_Room1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room1_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room1_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room1_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_13"
     },
     {
diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json
index 3e5d6b127..f402b50d0 100644
--- a/data/maps/SeafloorCavern_Room2/map.json
+++ b/data/maps/SeafloorCavern_Room2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room2_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room2_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room2_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_17"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json
index c7a90b42d..2a33c44cf 100644
--- a/data/maps/SeafloorCavern_Room3/map.json
+++ b/data/maps/SeafloorCavern_Room3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room3_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_19"
     },
     {
diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json
index 975fc6a98..b9c85c9bf 100644
--- a/data/maps/SeafloorCavern_Room5/map.json
+++ b/data/maps/SeafloorCavern_Room5/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room5_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room5_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room5_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room5_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room5_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room5_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_14"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json
index 88ea40e3a..c1d3b6cc2 100644
--- a/data/maps/SeafloorCavern_Room8/map.json
+++ b/data/maps/SeafloorCavern_Room8/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_15"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_18"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_1A"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_1B"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SeafloorCavern_Room8_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_1C"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 4c630a1d4..b5e5034e7 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -40,8 +40,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setfieldeffectargument 0, 16
 	setfieldeffectargument 1, 42
 	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	waitfieldeffect 54
+	dofieldeffect FLDEFF_SPARKLE
+	waitfieldeffect FLDEFF_SPARKLE
 	closemessage
 	setvar VAR_RESULT, 0
 	playfanfare MUS_ME_TAMA
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json
index 92f0fd11a..fad5ddc00 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/map.json
+++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json
index 74bd3dbf8..b8f00f4fb 100644
--- a/data/maps/VictoryRoad_B1F/map.json
+++ b/data/maps/VictoryRoad_B1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_13"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_14"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_11"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_12"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_17"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_16"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_1E"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_19"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1A"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1B"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1C"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_1D"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2908BA",
+      "script": "EventScript_StrengthBoulder",
       "flag": "FLAG_TEMP_1F"
     },
     {
@@ -232,7 +232,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_B1F_EventScript_2907A6",
+      "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_15"
     },
     {
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index e9ef97122..fa64783b5 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -1,221 +1,189 @@
-PetalburgWoods_EventScript_2906BB:: @ 82906BB
-Route103_EventScript_2906BB:: @ 82906BB
-Route104_EventScript_2906BB:: @ 82906BB
-Route110_TrickHousePuzzle1_EventScript_2906BB:: @ 82906BB
-Route111_EventScript_2906BB:: @ 82906BB
-Route116_EventScript_2906BB:: @ 82906BB
-Route117_EventScript_2906BB:: @ 82906BB
-Route118_EventScript_2906BB:: @ 82906BB
-Route120_EventScript_2906BB:: @ 82906BB
-Route121_EventScript_2906BB:: @ 82906BB
-Route123_EventScript_2906BB:: @ 82906BB
+
+EventScript_CutTree:: @ 82906BB
 	lockall
-	goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_CheckTreeCantCut
+	goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
 	checkpartymove MOVE_CUT
 	compare VAR_RESULT, 6
-	goto_if_eq Route103_EventScript_290721
+	goto_if_eq EventScript_CheckTreeCantCut
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_CUT
-	msgbox Route103_Text_29072E, MSGBOX_YESNO
+	msgbox Text_WantToCut, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq Route103_EventScript_29072B
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	goto_if_eq EventScript_CancelCut
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
-	dofieldeffect 2
+	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
-	goto Route103_EventScript_290710
+	goto EventScript_CutTreeDown
 	end
 
-Route103_EventScript_290705:: @ 8290705
+EventScript_FldEffCut:: @ 8290705
 	lockall
-	dofieldeffect 2
+	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
-	goto Route103_EventScript_290710
+	goto EventScript_CutTreeDown
 	end
 
-Route103_EventScript_290710:: @ 8290710
-	applymovement VAR_LAST_TALKED, Route103_Movement_29071F
+EventScript_CutTreeDown:: @ 8290710
+	applymovement VAR_LAST_TALKED, Movement_CutTreeDown
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
 	releaseall
 	end
 
-Route103_Movement_29071F: @ 829071F
+Movement_CutTreeDown: @ 829071F
 	cut_tree
 	step_end
 
-Route103_EventScript_CheckTreeCantCut:: @ 8290721
-	msgbox Route103_Text_29077D, MSGBOX_DEFAULT
+EventScript_CheckTreeCantCut:: @ 8290721
+	msgbox Text_CantCut, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route103_EventScript_29072B:: @ 829072B
+EventScript_CancelCut:: @ 829072B
 	closemessage
 	releaseall
 	end
 
-Route103_Text_29072E: @ 829072E
+Text_WantToCut: @ 829072E
 	.string "This tree looks like it can be\n"
 	.string "CUT down!\p"
 	.string "Would you like to CUT it?$"
 
-Route103_Text_290771: @ 8290771
-Route111_Text_290771: @ 8290771
+Text_MonUsedHM: @ 8290771
 	.string "{STR_VAR_1} used {STR_VAR_2}!$"
 
-Route103_Text_29077D: @ 829077D
+Text_CantCut: @ 829077D
 	.string "This tree looks like it can be\n"
 	.string "CUT down!$"
 
-GraniteCave_B2F_EventScript_2907A6:: @ 82907A6
-MirageTower_3F_EventScript_2907A6:: @ 82907A6
-MirageTower_4F_EventScript_2907A6:: @ 82907A6
-Route110_TrickHousePuzzle3_EventScript_2907A6:: @ 82907A6
-Route111_EventScript_2907A6:: @ 82907A6
-Route114_EventScript_2907A6:: @ 82907A6
-Route115_EventScript_2907A6:: @ 82907A6
-RusturfTunnel_EventScript_2907A6:: @ 82907A6
-SafariZone_North_EventScript_2907A6:: @ 82907A6
-SafariZone_Northeast_EventScript_2907A6:: @ 82907A6
-SeafloorCavern_Room1_EventScript_2907A6:: @ 82907A6
-SeafloorCavern_Room2_EventScript_2907A6:: @ 82907A6
-SeafloorCavern_Room5_EventScript_2907A6:: @ 82907A6
-VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6
+EventScript_RockSmash:: @ 82907A6
 	lockall
-	goto_if_unset FLAG_BADGE03_GET, Route111_EventScript_29082D
+	goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
 	checkpartymove MOVE_ROCK_SMASH
 	compare VAR_RESULT, 6
-	goto_if_eq Route111_EventScript_29082D
+	goto_if_eq EventScript_CantSmashRock
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_ROCK_SMASH
-	msgbox Route111_Text_29083A, MSGBOX_YESNO
+	msgbox Text_WantToSmash, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_290837
-	msgbox Route111_Text_290771, MSGBOX_DEFAULT
+	goto_if_eq EventScript_CancelSmash
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
-	dofieldeffect 37
+	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
-	goto Route111_EventScript_2907FB
+	goto EventScript_RockSmash
 	end
 
-Route111_EventScript_2907F0:: @ 82907F0
+EventScript_FldEffRockSmash:: @ 82907F0
 	lockall
-	dofieldeffect 37
+	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
-	goto Route111_EventScript_2907FB
+	goto EventScript_RockSmash
 	end
 
-Route111_EventScript_2907FB:: @ 82907FB
-	applymovement VAR_LAST_TALKED, Route111_Movement_29082B
+EventScript_SmashRock:: @ 82907FB
+	applymovement VAR_LAST_TALKED, Movement_SmashRock
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
 	specialvar VAR_RESULT, TryUpdateRusturfTunnelState
 	compare VAR_RESULT, 1
-	goto_if_eq Route111_EventScript_290829
+	goto_if_eq EventScript_EndSmash
 	special RockSmashWildEncounter
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_290829
+	goto_if_eq EventScript_EndSmash
 	waitstate
 	releaseall
 	end
 
-Route111_EventScript_290829:: @ 8290829
+EventScript_EndSmash:: @ 8290829
 	releaseall
 	end
 
-Route111_Movement_29082B: @ 829082B
+Movement_SmashRock: @ 829082B
 	rock_smash_break
 	step_end
 
-Route111_EventScript_29082D:: @ 829082D
-	msgbox Route111_Text_29087F, MSGBOX_DEFAULT
+EventScript_CantSmashRock:: @ 829082D
+	msgbox Text_CantSmash, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route111_EventScript_290837:: @ 8290837
+EventScript_CancelSmash:: @ 8290837
 	closemessage
 	releaseall
 	end
 
-Route111_Text_29083A: @ 829083A
+Text_WantToSmash: @ 829083A
 	.string "This rock appears to be breakable.\n"
 	.string "Would you like to use ROCK SMASH?$"
 
-Route111_Text_29087F: @ 829087F
+Text_CantSmash: @ 829087F
 	.string "It's a rugged rock, but a POKéMON\n"
 	.string "may be able to smash it.$"
 
-FieryPath_EventScript_2908BA:: @ 82908BA
-MagmaHideout_1F_EventScript_2908BA:: @ 82908BA
-Route110_TrickHousePuzzle4_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room1_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room2_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room3_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room5_EventScript_2908BA:: @ 82908BA
-SeafloorCavern_Room8_EventScript_2908BA:: @ 82908BA
-ShoalCave_LowTideLowerRoom_EventScript_2908BA:: @ 82908BA
-VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA
+EventScript_StrengthBoulder:: @ 82908BA
 	lockall
-	goto_if_unset FLAG_BADGE04_GET, FieryPath_EventScript_290915
-	goto_if_set FLAG_SYS_USE_STRENGTH, FieryPath_EventScript_29091F
+	goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
+	goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
 	checkpartymove MOVE_STRENGTH
 	compare VAR_RESULT, 6
-	goto_if_eq FieryPath_EventScript_290915
+	goto_if_eq EventScript_CantStrength
 	setfieldeffectargument 0, VAR_RESULT
-	msgbox FieryPath_Text_29092C, MSGBOX_YESNO
+	msgbox Text_WantToStrength, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq FieryPath_EventScript_290929
+	goto_if_eq EventScript_CancelStrength
 	closemessage
-	dofieldeffect 40
+	dofieldeffect FLDEFF_USE_STRENGTH
 	waitstate
-	goto FieryPath_EventScript_290908
+	goto EventScript_ActivateStrength
 	end
 
-FieryPath_EventScript_2908FD:: @ 82908FD
+EventScript_FldEffStrength:: @ 82908FD
 	lockall
-	dofieldeffect 40
+	dofieldeffect FLDEFF_USE_STRENGTH
 	waitstate
-	goto FieryPath_EventScript_290908
+	goto EventScript_ActivateStrength
 	end
 
-FieryPath_EventScript_290908:: @ 8290908
+EventScript_ActivateStrength:: @ 8290908
 	setflag FLAG_SYS_USE_STRENGTH
-	msgbox FieryPath_Text_29098C, MSGBOX_DEFAULT
+	msgbox Text_MonUsedStrength, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FieryPath_EventScript_290915:: @ 8290915
-	msgbox FieryPath_Text_2909D6, MSGBOX_DEFAULT
+EventScript_CantStrength:: @ 8290915
+	msgbox Text_CantStrength, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FieryPath_EventScript_29091F:: @ 829091F
-	msgbox FieryPath_Text_290A16, MSGBOX_DEFAULT
+EventScript_CheckActivatedBoulder:: @ 829091F
+	msgbox Text_StrengthActivated, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FieryPath_EventScript_290929:: @ 8290929
+EventScript_CancelStrength:: @ 8290929
 	closemessage
 	releaseall
 	end
 
-FieryPath_Text_29092C: @ 829092C
+Text_WantToStrength: @ 829092C
 	.string "It's a big boulder, but a POKéMON\n"
 	.string "may be able to push it aside.\p"
 	.string "Would you like to use STRENGTH?$"
 
-FieryPath_Text_29098C: @ 829098C
+Text_MonUsedStrength: @ 829098C
 	.string "{STR_VAR_1} used STRENGTH!\p"
 	.string "{STR_VAR_1}'s STRENGTH made it\n"
 	.string "possible to move boulders around!$"
 
-FieryPath_Text_2909D6: @ 82909D6
+Text_CantStrength: @ 82909D6
 	.string "It's a big boulder, but a POKéMON\n"
 	.string "may be able to push it aside.$"
 
-FieryPath_Text_290A16: @ 8290A16
+Text_StrengthActivated: @ 8290A16
 	.string "STRENGTH made it possible to move\n"
 	.string "boulders around.$"
 
@@ -223,59 +191,59 @@ EventScript_UseWaterfall:: @ 8290A49
 	lockall
 	checkpartymove MOVE_WATERFALL
 	compare VAR_RESULT, 6
-	goto_if_eq EventScript_290A84
+	goto_if_eq EventScript_CantWaterfall
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
-	msgbox Text_290AC3, MSGBOX_YESNO
+	msgbox Text_WantToWaterfall, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_290A8C
-	msgbox Text_290AFC, MSGBOX_DEFAULT
-	dofieldeffect 43
-	goto EventScript_290A8C
+	goto_if_eq EventScript_EndWaterfall
+	msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT
+	dofieldeffect FLDEFF_USE_WATERFALL
+	goto EventScript_EndWaterfall
 
 EventScript_CannotUseWaterfall:: @ 8290A83
 	lockall
 
-EventScript_290A84:: @ 8290A84
-	msgbox Text_290A8E, MSGBOX_DEFAULT
+EventScript_CantWaterfall:: @ 8290A84
+	msgbox Text_CantWaterfall, MSGBOX_DEFAULT
 
-EventScript_290A8C:: @ 8290A8C
+EventScript_EndWaterfall:: @ 8290A8C
 	releaseall
 	end
 
-Text_290A8E: @ 8290A8E
+Text_CantWaterfall: @ 8290A8E
 	.string "A wall of water is crashing down with\n"
 	.string "a mighty roar.$"
 
-Text_290AC3: @ 8290AC3
+Text_WantToWaterfall: @ 8290AC3
 	.string "It's a large waterfall.\n"
 	.string "Would you like to use WATERFALL?$"
 
-Text_290AFC: @ 8290AFC
+Text_MonUsedWaterfall: @ 8290AFC
 	.string "{STR_VAR_1} used WATERFALL.$"
 
 EventScript_UseDive:: @ 8290B0F
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, 6
-	goto_if_eq EventScript_290B4E
+	goto_if_eq EventScript_CantDive
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
-	msgbox Text_290BE8, MSGBOX_YESNO
+	msgbox Text_WantToDive, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_290B58
-	msgbox Text_290C1A, MSGBOX_DEFAULT
-	dofieldeffect 44
-	goto EventScript_290B58
+	goto_if_eq EventScript_EndDive
+	msgbox Text_MonUsedDive, MSGBOX_DEFAULT
+	dofieldeffect FLDEFF_USE_DIVE
+	goto EventScript_EndDive
 	end
 
-EventScript_290B4E:: @ 8290B4E
-	msgbox Text_290BAA, MSGBOX_DEFAULT
+EventScript_CantDive:: @ 8290B4E
+	msgbox Text_CantDive, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_290B58:: @ 8290B58
+EventScript_EndDive:: @ 8290B58
 	releaseall
 	end
 
@@ -283,50 +251,50 @@ EventScript_UseDiveUnderwater:: @ 8290B5A
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, 6
-	goto_if_eq EventScript_290B99
+	goto_if_eq EventScript_CantSurface
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
-	msgbox Text_290C6E, MSGBOX_YESNO
+	msgbox Text_WantToSurface, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_290BA8
-	msgbox Text_290C1A, MSGBOX_DEFAULT
-	dofieldeffect 44
-	goto EventScript_290BA8
+	goto_if_eq EventScript_EndSurface
+	msgbox Text_MonUsedDive, MSGBOX_DEFAULT
+	dofieldeffect FLDEFF_USE_DIVE
+	goto EventScript_EndSurface
 	end
 
-EventScript_290B99:: @ 8290B99
+EventScript_CantSurface:: @ 8290B99
 	lockall
-	msgbox Text_290C28, MSGBOX_DEFAULT
-	goto EventScript_290BA8
+	msgbox Text_CantSurface, MSGBOX_DEFAULT
+	goto EventScript_EndSurface
 	end
 
-EventScript_290BA8:: @ 8290BA8
+EventScript_EndSurface:: @ 8290BA8
 	releaseall
 	end
 
-Text_290BAA: @ 8290BAA
+Text_CantDive: @ 8290BAA
 	.string "The sea is deep here. A POKéMON\n"
 	.string "may be able to go underwater.$"
 
-Text_290BE8: @ 8290BE8
+Text_WantToDive: @ 8290BE8
 	.string "The sea is deep here.\n"
 	.string "Would you like to use DIVE?$"
 
-Text_290C1A: @ 8290C1A
+Text_MonUsedDive: @ 8290C1A
 	.string "{STR_VAR_1} used DIVE.$"
 
-Text_290C28: @ 8290C28
+Text_CantSurface: @ 8290C28
 	.string "Light is filtering down from above.\n"
 	.string "A POKéMON may be able to surface.$"
 
-Text_290C6E: @ 8290C6E
+Text_WantToSurface: @ 8290C6E
 	.string "Light is filtering down from above.\n"
 	.string "Would you like to use DIVE?$"
 
-EventScript_290CAE:: @ 8290CAE
-	msgbox Text_290CB7, MSGBOX_SIGN
+EventScript_FailSweetScent:: @ 8290CAE
+	msgbox Text_FailSweetScent, MSGBOX_SIGN
 	end
 
-Text_290CB7: @ 8290CB7
+Text_FailSweetScent: @ 8290CB7
 	.string "Looks like there's nothing here…$"
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index a20469345..81bd388f8 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -339,7 +339,7 @@ EventScript_275A50:: @ 8275A50
 	msgbox gText_23B704, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275CDE
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
 	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
 	waitstate
@@ -371,7 +371,7 @@ EventScript_275AA9:: @ 8275AA9
 	msgbox Text_274779, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275CDE
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
 	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
 	waitstate
@@ -403,7 +403,7 @@ EventScript_275B02:: @ 8275B02
 	msgbox Text_274825, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq EventScript_275CDE
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
 	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
 	waitstate
@@ -508,7 +508,7 @@ EventScript_275BE8:: @ 8275BE8
 	goto_if_eq EventScript_275CDE
 	bufferpartymonnick 0, VAR_0x8004
 	buffermovename 1, MOVE_SECRET_POWER
-	msgbox Route103_Text_290771, MSGBOX_DEFAULT
+	msgbox Text_MonUsedHM, MSGBOX_DEFAULT
 	closemessage
 	closemessage
 	compare VAR_0x8007, 1
diff --git a/include/event_scripts.h b/include/event_scripts.h
index d35bf962d..da96d29d8 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -381,10 +381,10 @@ extern const u8 SecretBase_RedCave1_Text_2758CC[];
 extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[];
 
 //field effects
-extern const u8 FieryPath_EventScript_2908FD[];
-extern const u8 EventScript_290CAE[];
+extern const u8 EventScript_FldEffStrength[];
+extern const u8 EventScript_FailSweetScent[];
 extern const u8 EventScript_2926F8[];
-extern const u8 Route111_EventScript_2907F0[];
+extern const u8 EventScript_FldEffRockSmash[];
 
 //player pc
 extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_1F863F[];
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 3da1a9217..be655b86a 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -23,7 +23,7 @@
 
 extern struct MapPosition gPlayerFacingPosition;
 
-extern const u8 Route103_EventScript_290705[];
+extern const u8 EventScript_FldEffCut[];
 extern const u8 FarawayIsland_Interior_EventScript_267EDB[];
 
 extern const u8 gFieldEffectPic_CutGrass[];
@@ -327,7 +327,7 @@ bool8 FldEff_UseCutOnGrass(void)
 static void FieldCallback_CutTree(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(Route103_EventScript_290705);
+    ScriptContext1_SetupScript(EventScript_FldEffCut);
 }
 
 bool8 FldEff_UseCutOnTree(void)
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index a9077f2ff..18cebdf11 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -140,7 +140,7 @@ bool8 SetUpFieldMove_RockSmash(void)
 static void sub_81356C4(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(Route111_EventScript_2907F0);
+    ScriptContext1_SetupScript(EventScript_FldEffRockSmash);
 }
 
 bool8 FldEff_UseRockSmash(void)
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index c57ab8cdc..47fc7061c 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -30,7 +30,7 @@ bool8 SetUpFieldMove_Strength(void)
 static void FldEff_UseStrength(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
+    ScriptContext1_SetupScript(EventScript_FldEffStrength);
 }
 
 bool8 sub_8145E2C(void)
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index a187353ff..788310b5d 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -93,7 +93,7 @@ static void FailSweetScentEncounter(u8 taskId)
     {
         CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
         sub_80AC3E4();
-        ScriptContext1_SetupScript(EventScript_290CAE);
+        ScriptContext1_SetupScript(EventScript_FailSweetScent);
         DestroyTask(taskId);
     }
 }