diff --git a/pokecrystal.map b/pokecrystal.map index 1385554d029..39b467593b6 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -1545,10 +1545,10 @@ ROMX bank #1: $51ab = Movement_fish_cast_rod $51b8 = Movement_step_loop $51c1 = Movement_step_end - $51db = Movement_48 + $51db = Movement_step_wait_end $51fd = Movement_remove_object $520a = Movement_remove_object.not_leading - $5210 = Movement_4b + $5210 = Movement_stop $5222 = Movement_step_sleep_1 $5226 = Movement_step_sleep_2 $522a = Movement_step_sleep_3 @@ -19144,7 +19144,7 @@ ROMX bank #37: $6951 = CheckTimeEvents.do_daily $6964 = CheckTimeEvents.nothing $6966 = CheckTimeEvents.end_bug_contest - $6970 = CheckTimeEvents.unused + $6970 = CheckTimeEvents.hatch $6974 = OWPlayerInput $698d = OWPlayerInput.NoAction $698f = OWPlayerInput.Action diff --git a/pokecrystal.sym b/pokecrystal.sym index 4f90a08c8aa..0f97f6aa65a 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -1505,10 +1505,10 @@ 01:51ab Movement_fish_cast_rod 01:51b8 Movement_step_loop 01:51c1 Movement_step_end -01:51db Movement_48 +01:51db Movement_step_wait_end 01:51fd Movement_remove_object 01:520a Movement_remove_object.not_leading -01:5210 Movement_4b +01:5210 Movement_stop 01:5222 Movement_step_sleep_1 01:5226 Movement_step_sleep_2 01:522a Movement_step_sleep_3 @@ -18914,7 +18914,7 @@ 25:6951 CheckTimeEvents.do_daily 25:6964 CheckTimeEvents.nothing 25:6966 CheckTimeEvents.end_bug_contest -25:6970 CheckTimeEvents.unused +25:6970 CheckTimeEvents.hatch 25:6974 OWPlayerInput 25:698d OWPlayerInput.NoAction 25:698f OWPlayerInput.Action diff --git a/pokecrystal11.map b/pokecrystal11.map index c626569a29f..03fb2192a73 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -1545,10 +1545,10 @@ ROMX bank #1: $51ab = Movement_fish_cast_rod $51b8 = Movement_step_loop $51c1 = Movement_step_end - $51db = Movement_48 + $51db = Movement_step_wait_end $51fd = Movement_remove_object $520a = Movement_remove_object.not_leading - $5210 = Movement_4b + $5210 = Movement_stop $5222 = Movement_step_sleep_1 $5226 = Movement_step_sleep_2 $522a = Movement_step_sleep_3 @@ -19144,7 +19144,7 @@ ROMX bank #37: $6951 = CheckTimeEvents.do_daily $6964 = CheckTimeEvents.nothing $6966 = CheckTimeEvents.end_bug_contest - $6970 = CheckTimeEvents.unused + $6970 = CheckTimeEvents.hatch $6974 = OWPlayerInput $698d = OWPlayerInput.NoAction $698f = OWPlayerInput.Action diff --git a/pokecrystal11.sym b/pokecrystal11.sym index f1a061edc05..ecfde983832 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -1505,10 +1505,10 @@ 01:51ab Movement_fish_cast_rod 01:51b8 Movement_step_loop 01:51c1 Movement_step_end -01:51db Movement_48 +01:51db Movement_step_wait_end 01:51fd Movement_remove_object 01:520a Movement_remove_object.not_leading -01:5210 Movement_4b +01:5210 Movement_stop 01:5222 Movement_step_sleep_1 01:5226 Movement_step_sleep_2 01:522a Movement_step_sleep_3 @@ -18914,7 +18914,7 @@ 25:6951 CheckTimeEvents.do_daily 25:6964 CheckTimeEvents.nothing 25:6966 CheckTimeEvents.end_bug_contest -25:6970 CheckTimeEvents.unused +25:6970 CheckTimeEvents.hatch 25:6974 OWPlayerInput 25:698d OWPlayerInput.NoAction 25:698f OWPlayerInput.Action diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index dce226b10ea..d20d345446b 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -1548,10 +1548,10 @@ ROMX bank #1: $51ab = Movement_fish_cast_rod $51b8 = Movement_step_loop $51c1 = Movement_step_end - $51db = Movement_48 + $51db = Movement_step_wait_end $51fd = Movement_remove_object $520a = Movement_remove_object.not_leading - $5210 = Movement_4b + $5210 = Movement_stop $5222 = Movement_step_sleep_1 $5226 = Movement_step_sleep_2 $522a = Movement_step_sleep_3 @@ -19156,7 +19156,7 @@ ROMX bank #37: $6951 = CheckTimeEvents.do_daily $6964 = CheckTimeEvents.nothing $6966 = CheckTimeEvents.end_bug_contest - $6970 = CheckTimeEvents.unused + $6970 = CheckTimeEvents.hatch $6974 = OWPlayerInput $698d = OWPlayerInput.NoAction $698f = OWPlayerInput.Action diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index 6e7bd72a59f..bff01dc05b0 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -1508,10 +1508,10 @@ 01:51ab Movement_fish_cast_rod 01:51b8 Movement_step_loop 01:51c1 Movement_step_end -01:51db Movement_48 +01:51db Movement_step_wait_end 01:51fd Movement_remove_object 01:520a Movement_remove_object.not_leading -01:5210 Movement_4b +01:5210 Movement_stop 01:5222 Movement_step_sleep_1 01:5226 Movement_step_sleep_2 01:522a Movement_step_sleep_3 @@ -18926,7 +18926,7 @@ 25:6951 CheckTimeEvents.do_daily 25:6964 CheckTimeEvents.nothing 25:6966 CheckTimeEvents.end_bug_contest -25:6970 CheckTimeEvents.unused +25:6970 CheckTimeEvents.hatch 25:6974 OWPlayerInput 25:698d OWPlayerInput.NoAction 25:698f OWPlayerInput.Action diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index 9a6345bfc37..bca1cbfe6f4 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -1551,10 +1551,10 @@ ROMX bank #1: $51ab = Movement_fish_cast_rod $51b8 = Movement_step_loop $51c1 = Movement_step_end - $51db = Movement_48 + $51db = Movement_step_wait_end $51fd = Movement_remove_object $520a = Movement_remove_object.not_leading - $5210 = Movement_4b + $5210 = Movement_stop $5222 = Movement_step_sleep_1 $5226 = Movement_step_sleep_2 $522a = Movement_step_sleep_3 @@ -19193,7 +19193,7 @@ ROMX bank #37: $6951 = CheckTimeEvents.do_daily $6964 = CheckTimeEvents.nothing $6966 = CheckTimeEvents.end_bug_contest - $6970 = CheckTimeEvents.unused + $6970 = CheckTimeEvents.hatch $6974 = OWPlayerInput $698d = OWPlayerInput.NoAction $698f = OWPlayerInput.Action diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 2aa9bf9a05f..a2394aa7eab 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -1511,10 +1511,10 @@ 01:51ab Movement_fish_cast_rod 01:51b8 Movement_step_loop 01:51c1 Movement_step_end -01:51db Movement_48 +01:51db Movement_step_wait_end 01:51fd Movement_remove_object 01:520a Movement_remove_object.not_leading -01:5210 Movement_4b +01:5210 Movement_stop 01:5222 Movement_step_sleep_1 01:5226 Movement_step_sleep_2 01:522a Movement_step_sleep_3 @@ -18963,7 +18963,7 @@ 25:6951 CheckTimeEvents.do_daily 25:6964 CheckTimeEvents.nothing 25:6966 CheckTimeEvents.end_bug_contest -25:6970 CheckTimeEvents.unused +25:6970 CheckTimeEvents.hatch 25:6974 OWPlayerInput 25:698d OWPlayerInput.NoAction 25:698f OWPlayerInput.Action diff --git a/pokecrystal_au.map b/pokecrystal_au.map index b6365a65149..c15bcba3bed 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -1545,10 +1545,10 @@ ROMX bank #1: $51ab = Movement_fish_cast_rod $51b8 = Movement_step_loop $51c1 = Movement_step_end - $51db = Movement_48 + $51db = Movement_step_wait_end $51fd = Movement_remove_object $520a = Movement_remove_object.not_leading - $5210 = Movement_4b + $5210 = Movement_stop $5222 = Movement_step_sleep_1 $5226 = Movement_step_sleep_2 $522a = Movement_step_sleep_3 @@ -19144,7 +19144,7 @@ ROMX bank #37: $6951 = CheckTimeEvents.do_daily $6964 = CheckTimeEvents.nothing $6966 = CheckTimeEvents.end_bug_contest - $6970 = CheckTimeEvents.unused + $6970 = CheckTimeEvents.hatch $6974 = OWPlayerInput $698d = OWPlayerInput.NoAction $698f = OWPlayerInput.Action diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index dd5287c8d87..2aa8ed47c47 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -1505,10 +1505,10 @@ 01:51ab Movement_fish_cast_rod 01:51b8 Movement_step_loop 01:51c1 Movement_step_end -01:51db Movement_48 +01:51db Movement_step_wait_end 01:51fd Movement_remove_object 01:520a Movement_remove_object.not_leading -01:5210 Movement_4b +01:5210 Movement_stop 01:5222 Movement_step_sleep_1 01:5226 Movement_step_sleep_2 01:522a Movement_step_sleep_3 @@ -18914,7 +18914,7 @@ 25:6951 CheckTimeEvents.do_daily 25:6964 CheckTimeEvents.nothing 25:6966 CheckTimeEvents.end_bug_contest -25:6970 CheckTimeEvents.unused +25:6970 CheckTimeEvents.hatch 25:6974 OWPlayerInput 25:698d OWPlayerInput.NoAction 25:698f OWPlayerInput.Action diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index 8052cf31ff9..ff8ab7c239a 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -1548,10 +1548,10 @@ ROMX bank #1: $51ab = Movement_fish_cast_rod $51b8 = Movement_step_loop $51c1 = Movement_step_end - $51db = Movement_48 + $51db = Movement_step_wait_end $51fd = Movement_remove_object $520a = Movement_remove_object.not_leading - $5210 = Movement_4b + $5210 = Movement_stop $5222 = Movement_step_sleep_1 $5226 = Movement_step_sleep_2 $522a = Movement_step_sleep_3 @@ -19156,7 +19156,7 @@ ROMX bank #37: $6951 = CheckTimeEvents.do_daily $6964 = CheckTimeEvents.nothing $6966 = CheckTimeEvents.end_bug_contest - $6970 = CheckTimeEvents.unused + $6970 = CheckTimeEvents.hatch $6974 = OWPlayerInput $698d = OWPlayerInput.NoAction $698f = OWPlayerInput.Action diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index afd08735123..f714d45357c 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -1508,10 +1508,10 @@ 01:51ab Movement_fish_cast_rod 01:51b8 Movement_step_loop 01:51c1 Movement_step_end -01:51db Movement_48 +01:51db Movement_step_wait_end 01:51fd Movement_remove_object 01:520a Movement_remove_object.not_leading -01:5210 Movement_4b +01:5210 Movement_stop 01:5222 Movement_step_sleep_1 01:5226 Movement_step_sleep_2 01:522a Movement_step_sleep_3 @@ -18926,7 +18926,7 @@ 25:6951 CheckTimeEvents.do_daily 25:6964 CheckTimeEvents.nothing 25:6966 CheckTimeEvents.end_bug_contest -25:6970 CheckTimeEvents.unused +25:6970 CheckTimeEvents.hatch 25:6974 OWPlayerInput 25:698d OWPlayerInput.NoAction 25:698f OWPlayerInput.Action