diff --git a/pokegold.map b/pokegold.map
index 2bc3cab39..93dd04fdc 100644
--- a/pokegold.map
+++ b/pokegold.map
@@ -1523,10 +1523,10 @@ ROMX bank #1:
 	         $514a = Movement_fish_cast_rod
 	         $5157 = Movement_step_loop
 	         $5160 = Movement_step_end
-	         $517a = Movement_48
+	         $517a = Movement_step_wait_end
 	         $519c = Movement_remove_object
 	         $51a9 = Movement_remove_object.not_leading
-	         $51af = Movement_4b
+	         $51af = Movement_step_stop
 	         $51c1 = Movement_step_sleep_1
 	         $51c5 = Movement_step_sleep_2
 	         $51c9 = Movement_step_sleep_3
@@ -13462,7 +13462,7 @@ ROMX bank #37:
 	         $687e = CheckTimeEvents.do_daily
 	         $6897 = CheckTimeEvents.nothing
 	         $6899 = CheckTimeEvents.end_bug_contest
-	         $68a3 = CheckTimeEvents.unused
+	         $68a3 = CheckTimeEvents.hatch
 	         $68a7 = OWPlayerInput
 	         $68c0 = OWPlayerInput.NoAction
 	         $68c2 = OWPlayerInput.Action
diff --git a/pokegold.sym b/pokegold.sym
index a9b83e262..b847edcea 100644
--- a/pokegold.sym
+++ b/pokegold.sym
@@ -1491,10 +1491,10 @@
 01:514a Movement_fish_cast_rod
 01:5157 Movement_step_loop
 01:5160 Movement_step_end
-01:517a Movement_48
+01:517a Movement_step_wait_end
 01:519c Movement_remove_object
 01:51a9 Movement_remove_object.not_leading
-01:51af Movement_4b
+01:51af Movement_step_stop
 01:51c1 Movement_step_sleep_1
 01:51c5 Movement_step_sleep_2
 01:51c9 Movement_step_sleep_3
@@ -13247,7 +13247,7 @@
 25:687e CheckTimeEvents.do_daily
 25:6897 CheckTimeEvents.nothing
 25:6899 CheckTimeEvents.end_bug_contest
-25:68a3 CheckTimeEvents.unused
+25:68a3 CheckTimeEvents.hatch
 25:68a7 OWPlayerInput
 25:68c0 OWPlayerInput.NoAction
 25:68c2 OWPlayerInput.Action
diff --git a/pokegold_debug.map b/pokegold_debug.map
index 4f58b47dc..f944fab25 100644
--- a/pokegold_debug.map
+++ b/pokegold_debug.map
@@ -1523,10 +1523,10 @@ ROMX bank #1:
 	         $514a = Movement_fish_cast_rod
 	         $5157 = Movement_step_loop
 	         $5160 = Movement_step_end
-	         $517a = Movement_48
+	         $517a = Movement_step_wait_end
 	         $519c = Movement_remove_object
 	         $51a9 = Movement_remove_object.not_leading
-	         $51af = Movement_4b
+	         $51af = Movement_step_stop
 	         $51c1 = Movement_step_sleep_1
 	         $51c5 = Movement_step_sleep_2
 	         $51c9 = Movement_step_sleep_3
@@ -13463,7 +13463,7 @@ ROMX bank #37:
 	         $687e = CheckTimeEvents.do_daily
 	         $6897 = CheckTimeEvents.nothing
 	         $6899 = CheckTimeEvents.end_bug_contest
-	         $68a3 = CheckTimeEvents.unused
+	         $68a3 = CheckTimeEvents.hatch
 	         $68a7 = OWPlayerInput
 	         $68c0 = OWPlayerInput.NoAction
 	         $68c2 = OWPlayerInput.Action
diff --git a/pokegold_debug.sym b/pokegold_debug.sym
index 83c970728..56f964997 100644
--- a/pokegold_debug.sym
+++ b/pokegold_debug.sym
@@ -1491,10 +1491,10 @@
 01:514a Movement_fish_cast_rod
 01:5157 Movement_step_loop
 01:5160 Movement_step_end
-01:517a Movement_48
+01:517a Movement_step_wait_end
 01:519c Movement_remove_object
 01:51a9 Movement_remove_object.not_leading
-01:51af Movement_4b
+01:51af Movement_step_stop
 01:51c1 Movement_step_sleep_1
 01:51c5 Movement_step_sleep_2
 01:51c9 Movement_step_sleep_3
@@ -13248,7 +13248,7 @@
 25:687e CheckTimeEvents.do_daily
 25:6897 CheckTimeEvents.nothing
 25:6899 CheckTimeEvents.end_bug_contest
-25:68a3 CheckTimeEvents.unused
+25:68a3 CheckTimeEvents.hatch
 25:68a7 OWPlayerInput
 25:68c0 OWPlayerInput.NoAction
 25:68c2 OWPlayerInput.Action
diff --git a/pokegold_vc.map b/pokegold_vc.map
index 0076c3652..37fb02e03 100644
--- a/pokegold_vc.map
+++ b/pokegold_vc.map
@@ -1529,10 +1529,10 @@ ROMX bank #1:
 	         $514a = Movement_fish_cast_rod
 	         $5157 = Movement_step_loop
 	         $5160 = Movement_step_end
-	         $517a = Movement_48
+	         $517a = Movement_step_wait_end
 	         $519c = Movement_remove_object
 	         $51a9 = Movement_remove_object.not_leading
-	         $51af = Movement_4b
+	         $51af = Movement_step_stop
 	         $51c1 = Movement_step_sleep_1
 	         $51c5 = Movement_step_sleep_2
 	         $51c9 = Movement_step_sleep_3
@@ -13527,7 +13527,7 @@ ROMX bank #37:
 	         $687e = CheckTimeEvents.do_daily
 	         $6897 = CheckTimeEvents.nothing
 	         $6899 = CheckTimeEvents.end_bug_contest
-	         $68a3 = CheckTimeEvents.unused
+	         $68a3 = CheckTimeEvents.hatch
 	         $68a7 = OWPlayerInput
 	         $68c0 = OWPlayerInput.NoAction
 	         $68c2 = OWPlayerInput.Action
diff --git a/pokegold_vc.sym b/pokegold_vc.sym
index baba34d11..d23d5b99a 100644
--- a/pokegold_vc.sym
+++ b/pokegold_vc.sym
@@ -1497,10 +1497,10 @@
 01:514a Movement_fish_cast_rod
 01:5157 Movement_step_loop
 01:5160 Movement_step_end
-01:517a Movement_48
+01:517a Movement_step_wait_end
 01:519c Movement_remove_object
 01:51a9 Movement_remove_object.not_leading
-01:51af Movement_4b
+01:51af Movement_step_stop
 01:51c1 Movement_step_sleep_1
 01:51c5 Movement_step_sleep_2
 01:51c9 Movement_step_sleep_3
@@ -13312,7 +13312,7 @@
 25:687e CheckTimeEvents.do_daily
 25:6897 CheckTimeEvents.nothing
 25:6899 CheckTimeEvents.end_bug_contest
-25:68a3 CheckTimeEvents.unused
+25:68a3 CheckTimeEvents.hatch
 25:68a7 OWPlayerInput
 25:68c0 OWPlayerInput.NoAction
 25:68c2 OWPlayerInput.Action
diff --git a/pokesilver.map b/pokesilver.map
index a87acbc97..af939a7ca 100644
--- a/pokesilver.map
+++ b/pokesilver.map
@@ -1523,10 +1523,10 @@ ROMX bank #1:
 	         $514a = Movement_fish_cast_rod
 	         $5157 = Movement_step_loop
 	         $5160 = Movement_step_end
-	         $517a = Movement_48
+	         $517a = Movement_step_wait_end
 	         $519c = Movement_remove_object
 	         $51a9 = Movement_remove_object.not_leading
-	         $51af = Movement_4b
+	         $51af = Movement_step_stop
 	         $51c1 = Movement_step_sleep_1
 	         $51c5 = Movement_step_sleep_2
 	         $51c9 = Movement_step_sleep_3
@@ -13462,7 +13462,7 @@ ROMX bank #37:
 	         $687e = CheckTimeEvents.do_daily
 	         $6897 = CheckTimeEvents.nothing
 	         $6899 = CheckTimeEvents.end_bug_contest
-	         $68a3 = CheckTimeEvents.unused
+	         $68a3 = CheckTimeEvents.hatch
 	         $68a7 = OWPlayerInput
 	         $68c0 = OWPlayerInput.NoAction
 	         $68c2 = OWPlayerInput.Action
diff --git a/pokesilver.sym b/pokesilver.sym
index 3670c9ec6..e61b808e7 100644
--- a/pokesilver.sym
+++ b/pokesilver.sym
@@ -1491,10 +1491,10 @@
 01:514a Movement_fish_cast_rod
 01:5157 Movement_step_loop
 01:5160 Movement_step_end
-01:517a Movement_48
+01:517a Movement_step_wait_end
 01:519c Movement_remove_object
 01:51a9 Movement_remove_object.not_leading
-01:51af Movement_4b
+01:51af Movement_step_stop
 01:51c1 Movement_step_sleep_1
 01:51c5 Movement_step_sleep_2
 01:51c9 Movement_step_sleep_3
@@ -13245,7 +13245,7 @@
 25:687e CheckTimeEvents.do_daily
 25:6897 CheckTimeEvents.nothing
 25:6899 CheckTimeEvents.end_bug_contest
-25:68a3 CheckTimeEvents.unused
+25:68a3 CheckTimeEvents.hatch
 25:68a7 OWPlayerInput
 25:68c0 OWPlayerInput.NoAction
 25:68c2 OWPlayerInput.Action
diff --git a/pokesilver_debug.map b/pokesilver_debug.map
index f6aeef515..b59e81278 100644
--- a/pokesilver_debug.map
+++ b/pokesilver_debug.map
@@ -1523,10 +1523,10 @@ ROMX bank #1:
 	         $514a = Movement_fish_cast_rod
 	         $5157 = Movement_step_loop
 	         $5160 = Movement_step_end
-	         $517a = Movement_48
+	         $517a = Movement_step_wait_end
 	         $519c = Movement_remove_object
 	         $51a9 = Movement_remove_object.not_leading
-	         $51af = Movement_4b
+	         $51af = Movement_step_stop
 	         $51c1 = Movement_step_sleep_1
 	         $51c5 = Movement_step_sleep_2
 	         $51c9 = Movement_step_sleep_3
@@ -13463,7 +13463,7 @@ ROMX bank #37:
 	         $687e = CheckTimeEvents.do_daily
 	         $6897 = CheckTimeEvents.nothing
 	         $6899 = CheckTimeEvents.end_bug_contest
-	         $68a3 = CheckTimeEvents.unused
+	         $68a3 = CheckTimeEvents.hatch
 	         $68a7 = OWPlayerInput
 	         $68c0 = OWPlayerInput.NoAction
 	         $68c2 = OWPlayerInput.Action
diff --git a/pokesilver_debug.sym b/pokesilver_debug.sym
index 5cc69fad5..58dbf61da 100644
--- a/pokesilver_debug.sym
+++ b/pokesilver_debug.sym
@@ -1491,10 +1491,10 @@
 01:514a Movement_fish_cast_rod
 01:5157 Movement_step_loop
 01:5160 Movement_step_end
-01:517a Movement_48
+01:517a Movement_step_wait_end
 01:519c Movement_remove_object
 01:51a9 Movement_remove_object.not_leading
-01:51af Movement_4b
+01:51af Movement_step_stop
 01:51c1 Movement_step_sleep_1
 01:51c5 Movement_step_sleep_2
 01:51c9 Movement_step_sleep_3
@@ -13246,7 +13246,7 @@
 25:687e CheckTimeEvents.do_daily
 25:6897 CheckTimeEvents.nothing
 25:6899 CheckTimeEvents.end_bug_contest
-25:68a3 CheckTimeEvents.unused
+25:68a3 CheckTimeEvents.hatch
 25:68a7 OWPlayerInput
 25:68c0 OWPlayerInput.NoAction
 25:68c2 OWPlayerInput.Action
diff --git a/pokesilver_vc.map b/pokesilver_vc.map
index c66614049..10ac420e5 100644
--- a/pokesilver_vc.map
+++ b/pokesilver_vc.map
@@ -1529,10 +1529,10 @@ ROMX bank #1:
 	         $514a = Movement_fish_cast_rod
 	         $5157 = Movement_step_loop
 	         $5160 = Movement_step_end
-	         $517a = Movement_48
+	         $517a = Movement_step_wait_end
 	         $519c = Movement_remove_object
 	         $51a9 = Movement_remove_object.not_leading
-	         $51af = Movement_4b
+	         $51af = Movement_step_stop
 	         $51c1 = Movement_step_sleep_1
 	         $51c5 = Movement_step_sleep_2
 	         $51c9 = Movement_step_sleep_3
@@ -13527,7 +13527,7 @@ ROMX bank #37:
 	         $687e = CheckTimeEvents.do_daily
 	         $6897 = CheckTimeEvents.nothing
 	         $6899 = CheckTimeEvents.end_bug_contest
-	         $68a3 = CheckTimeEvents.unused
+	         $68a3 = CheckTimeEvents.hatch
 	         $68a7 = OWPlayerInput
 	         $68c0 = OWPlayerInput.NoAction
 	         $68c2 = OWPlayerInput.Action
diff --git a/pokesilver_vc.sym b/pokesilver_vc.sym
index 02aac12a3..db1c01791 100644
--- a/pokesilver_vc.sym
+++ b/pokesilver_vc.sym
@@ -1497,10 +1497,10 @@
 01:514a Movement_fish_cast_rod
 01:5157 Movement_step_loop
 01:5160 Movement_step_end
-01:517a Movement_48
+01:517a Movement_step_wait_end
 01:519c Movement_remove_object
 01:51a9 Movement_remove_object.not_leading
-01:51af Movement_4b
+01:51af Movement_step_stop
 01:51c1 Movement_step_sleep_1
 01:51c5 Movement_step_sleep_2
 01:51c9 Movement_step_sleep_3
@@ -13310,7 +13310,7 @@
 25:687e CheckTimeEvents.do_daily
 25:6897 CheckTimeEvents.nothing
 25:6899 CheckTimeEvents.end_bug_contest
-25:68a3 CheckTimeEvents.unused
+25:68a3 CheckTimeEvents.hatch
 25:68a7 OWPlayerInput
 25:68c0 OWPlayerInput.NoAction
 25:68c2 OWPlayerInput.Action