From 67152b92424419a470ed2bb0cf5e5f8a8ced38de Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 28 Sep 2019 02:37:01 -0400 Subject: Split off more files from event_scripts --- data/scripts/movement.inc | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 data/scripts/movement.inc (limited to 'data/scripts/movement.inc') diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc new file mode 100644 index 000000000..26b509d5b --- /dev/null +++ b/data/scripts/movement.inc @@ -0,0 +1,101 @@ +SlateportCity_Movement_272596: @ 8272596 + emote_question_mark + step_end + +Common_Movement_ExclamationMark: @ 8272598 + emote_exclamation_mark + step_end + +Common_Movement_Delay48: @ 827259A + delay_16 + delay_16 + delay_16 + step_end + +Common_Movement_FacePlayer: @ 827259E + face_player + step_end + +Common_Movement_FaceAwayPlayer: @ 82725A0 + face_away_player + step_end + +Common_Movement_FaceOriginalDirection: @ 82725A2 + face_original_direction + step_end + +Common_Movement_WalkInPlaceLeft: @ 82725A4 + walk_in_place_fastest_left + step_end + +Common_Movement_WalkInPlaceUp: @ 82725A6 + walk_in_place_fastest_up + step_end + +Common_Movement_WalkInPlaceRight: @ 82725A8 + walk_in_place_fastest_right + step_end + +Common_Movement_WalkInPlaceDown: @ 82725AA + walk_in_place_fastest_down + step_end + +RustboroCity_Movement_2725AC: @ 82725AC + face_right + step_end + +RustboroCity_Movement_2725AE: @ 82725AE + face_left + step_end + +Common_Movement_FaceDown: @ 82725B0 + face_down + step_end + +Common_Movement_FaceUp: @ 82725B2 + face_up + step_end + +BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 +MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 + walk_in_place_down + step_end + +BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 +BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 + walk_in_place_left + step_end + +Route121_Movement_2725B8: @ 82725B8 + walk_in_place_right + step_end + +EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 + walk_up + walk_up + walk_up + walk_up + step_end + +EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 + delay_16 + delay_16 + step_end + +Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 + walk_up + step_end + +Movement_2725CB:: @ 82725CB + walk_up + walk_up + step_end -- cgit v1.2.3 From 749247b9104426fc8c652c5454fc1508b35c43b0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 5 Oct 2019 10:52:48 -0400 Subject: Convert 4 spaces in .inc to tab --- data/scripts/movement.inc | 112 +++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 56 deletions(-) (limited to 'data/scripts/movement.inc') diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index 26b509d5b..b7abceae4 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -1,101 +1,101 @@ SlateportCity_Movement_272596: @ 8272596 - emote_question_mark - step_end + emote_question_mark + step_end Common_Movement_ExclamationMark: @ 8272598 - emote_exclamation_mark - step_end + emote_exclamation_mark + step_end Common_Movement_Delay48: @ 827259A - delay_16 - delay_16 - delay_16 - step_end + delay_16 + delay_16 + delay_16 + step_end Common_Movement_FacePlayer: @ 827259E - face_player - step_end + face_player + step_end Common_Movement_FaceAwayPlayer: @ 82725A0 - face_away_player - step_end + face_away_player + step_end Common_Movement_FaceOriginalDirection: @ 82725A2 - face_original_direction - step_end + face_original_direction + step_end Common_Movement_WalkInPlaceLeft: @ 82725A4 - walk_in_place_fastest_left - step_end + walk_in_place_fastest_left + step_end Common_Movement_WalkInPlaceUp: @ 82725A6 - walk_in_place_fastest_up - step_end + walk_in_place_fastest_up + step_end Common_Movement_WalkInPlaceRight: @ 82725A8 - walk_in_place_fastest_right - step_end + walk_in_place_fastest_right + step_end Common_Movement_WalkInPlaceDown: @ 82725AA - walk_in_place_fastest_down - step_end + walk_in_place_fastest_down + step_end RustboroCity_Movement_2725AC: @ 82725AC - face_right - step_end + face_right + step_end RustboroCity_Movement_2725AE: @ 82725AE - face_left - step_end + face_left + step_end Common_Movement_FaceDown: @ 82725B0 - face_down - step_end + face_down + step_end Common_Movement_FaceUp: @ 82725B2 - face_up - step_end + face_up + step_end BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 - walk_in_place_down - step_end + walk_in_place_down + step_end BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 - walk_in_place_left - step_end + walk_in_place_left + step_end Route121_Movement_2725B8: @ 82725B8 - walk_in_place_right - step_end + walk_in_place_right + step_end EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 - walk_up - walk_up - walk_up - walk_up - step_end + walk_up + walk_up + walk_up + walk_up + step_end EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 - delay_16 - delay_16 - step_end + delay_16 + delay_16 + step_end Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 - walk_up - step_end + walk_up + step_end Movement_2725CB:: @ 82725CB - walk_up - walk_up - step_end + walk_up + walk_up + step_end -- cgit v1.2.3 From d914c1d659f2d7076079487e5c5df8ee617ec144 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 6 Oct 2019 13:55:30 -0400 Subject: Document common movements --- data/scripts/movement.inc | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'data/scripts/movement.inc') diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index b7abceae4..3dd1a8144 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -1,4 +1,4 @@ -SlateportCity_Movement_272596: @ 8272596 +Common_Movement_QuestionMark: @ 8272596 emote_question_mark step_end @@ -24,27 +24,27 @@ Common_Movement_FaceOriginalDirection: @ 82725A2 face_original_direction step_end -Common_Movement_WalkInPlaceLeft: @ 82725A4 +Common_Movement_WalkInPlaceFastestLeft: @ 82725A4 walk_in_place_fastest_left step_end -Common_Movement_WalkInPlaceUp: @ 82725A6 +Common_Movement_WalkInPlaceFastestUp: @ 82725A6 walk_in_place_fastest_up step_end -Common_Movement_WalkInPlaceRight: @ 82725A8 +Common_Movement_WalkInPlaceFastestRight: @ 82725A8 walk_in_place_fastest_right step_end -Common_Movement_WalkInPlaceDown: @ 82725AA +Common_Movement_WalkInPlaceFastestDown: @ 82725AA walk_in_place_fastest_down step_end -RustboroCity_Movement_2725AC: @ 82725AC +Common_Movement_FaceRight: @ 82725AC face_right step_end -RustboroCity_Movement_2725AE: @ 82725AE +Common_Movement_FaceLeft: @ 82725AE face_left step_end @@ -56,21 +56,19 @@ Common_Movement_FaceUp: @ 82725B2 face_up step_end -BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 -MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 +Common_Movement_WalkInPlaceDown: @ 82725B4 walk_in_place_down step_end -BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 -BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 +Common_Movement_WalkInPlaceLeft: @ 82725B6 walk_in_place_left step_end -Route121_Movement_2725B8: @ 82725B8 +Common_Movement_WalkInPlaceRight: @ 82725B8 walk_in_place_right step_end -EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA +Common_Movement_WalkUp6: @ 82725BA walk_up walk_up walk_up @@ -79,23 +77,24 @@ EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 +Common_Movement_WalkUp4: @ 82725C1 walk_up walk_up walk_up walk_up step_end -EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 +Common_Movement_Delay32: @ 82725C6 delay_16 delay_16 step_end -Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 +Common_Movement_WalkUp: @ 82725C9 walk_up step_end -Movement_2725CB:: @ 82725CB +@ Unused +Common_Movement_WalkUp2:: @ 82725CB walk_up walk_up step_end -- cgit v1.2.3