diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 4 | ||||
| -rw-r--r-- | data/scripts/magma_chimney.inc | 10 | ||||
| -rw-r--r-- | data/scripts/movement.inc | 71 | ||||
| -rw-r--r-- | data/scripts/pkmn_center_nurse.inc | 4 | ||||
| -rw-r--r-- | data/scripts/players_house.inc | 34 | ||||
| -rw-r--r-- | data/scripts/pokeblocks.inc | 6 |
6 files changed, 100 insertions, 29 deletions
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 867e41661..60852bf2f 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -220,13 +220,13 @@ Route111_EventScript_1AE5E0:: @ 81AE5E0 Route111_EventScript_1AE5EB:: @ 81AE5EB applymovement VAR_0x8004, Route111_Movement_1AE69B - applymovement VAR_0x8005, Route111_Movement_1A0841 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return Route111_EventScript_1AE5FD:: @ 81AE5FD applymovement VAR_0x8004, Route111_Movement_1AE69D - applymovement VAR_0x8005, Route111_Movement_1A083F + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 11837cbc6..5b946fbdb 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -4,7 +4,7 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CB9 call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CC2 closemessage - applymovement 1, MtChimney_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -33,12 +33,12 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .else msgbox MtChimney_Text_1B37BB, MSGBOX_DEFAULT .endif - applymovement 2, MtChimney_Movement_1A0839 + applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 2, MtChimney_Movement_1A0833 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, MtChimney_Movement_1A0835 + applymovement 2, Common_Movement_Delay48 waitmovement 0 .ifdef SAPPHIRE msgbox MtChimney_Text_1B2ED9, MSGBOX_DEFAULT @@ -69,7 +69,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB call_if_eq MtChimney_EventScript_1B2D7D compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_1B2D88 - applymovement 255, MtChimney_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox MtChimney_Text_1B3608, MSGBOX_DEFAULT diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc new file mode 100644 index 000000000..fb2d1ae2c --- /dev/null +++ b/data/scripts/movement.inc @@ -0,0 +1,71 @@ +Common_Movement_QuestionMark:: @ 81A0831 + emote_question_mark + step_end + +Common_Movement_ExclamationMark:: @ 81A0833 + emote_exclamation_mark + step_end + +Common_Movement_Delay48:: @ 81A0835 + delay_16 + delay_16 + delay_16 + step_end + +Common_Movement_FacePlayer:: @ 81A0839 + face_player + step_end + +Common_Movement_FaceAwayPlayer:: @ 81A083B + face_away_player + step_end + +Common_Movement_FaceOriginalDirection:: @ 81A083D + face_original_direction + step_end + +Common_Movement_WalkInPlaceFastestLeft:: @ 81A083F + walk_in_place_fastest_left + step_end + +Common_Movement_WalkInPlaceFastestUp:: @ 81A0841 + walk_in_place_fastest_up + step_end + +Common_Movement_WalkInPlaceFastestRight:: @ 81A0843 + walk_in_place_fastest_right + step_end + +Common_Movement_WalkInPlaceFastestDown:: @ 81A0845 + walk_in_place_fastest_down + step_end + +Common_Movement_WalkUp6:: @ 81A0847 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +Common_Movement_WalkUp4:: @ 81A084E + walk_up + walk_up + walk_up + walk_up + step_end + +Common_Movement_Delay32:: @ 81A0853 + delay_16 + delay_16 + step_end + +Common_Movement_WalkUp:: @ 81A0856 + walk_up + step_end + +Common_Movement_WalkUp2:: @ 81A0858 + walk_up + walk_up + step_end diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 27a3a0aba..79359ae55 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -12,11 +12,11 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 819FD7C incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_1A083F + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_1A0845 + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special ScrSpecial_HealPlayerParty goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index d86ef0b03..a74342b7b 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8005, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F @@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_1B699F:: @ 81B699F - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 msgbox LittlerootTown_BrendansHouse_1F_Text_172531, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC waitmovement 0 releaseall @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT closemessage @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT closemessage @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC @@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_172644, MSGBOX_DEFAULT @@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF end LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1A083F + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_172644, MSGBOX_DEFAULT @@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D playse SE_PIN - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, MSGBOX_DEFAULT closemessage @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT fadedefaultbgm @@ -366,12 +366,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_0x8009, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_0x8008, 0 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 0622da0cc..b764a2274 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -9,7 +9,7 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E setvar VAR_0x8008, 2 setvar VAR_0x8009, 2 - applymovement 6, SlateportCity_ContestLobby_Movement_1A083D + applymovement 6, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, SlateportCity_ContestLobby_Movement_1B7821 waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 @@ -26,8 +26,8 @@ VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 setvar VAR_0x8008, 3 setvar VAR_0x8009, 3 - applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D - applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D + applymovement 9, Common_Movement_FaceOriginalDirection + applymovement 10, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 |