From 8c6005055310ba044db7a1c0312f77e11dc8af0e Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Wed, 24 Aug 2022 19:02:46 -0400 Subject: [PATCH] Added proper movement actions for exiting/entering pokeball. --- asm/macros/movement.inc | 2 ++ data/scripts/follower.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 62618379b6..8ce8330371 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -162,5 +162,7 @@ create_movement_action figure_8, MOVEMENT_ACTION_FIGURE_8 create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN + create_movement_action exit_pokeball, MOVEMENT_ACTION_EXIT_POKEBALL + create_movement_action enter_pokeball, MOVEMENT_ACTION_ENTER_POKEBALL create_movement_action step_end, MOVEMENT_ACTION_STEP_END diff --git a/data/scripts/follower.inc b/data/scripts/follower.inc index a8303e5ba3..77e2da5cb4 100644 --- a/data/scripts/follower.inc +++ b/data/scripts/follower.inc @@ -74,7 +74,7 @@ EventScript_FollowerJump:: return EnterPokeballMovement:: - .byte 0x9F @ EnterPokeball + enter_pokeball step_end @ Movement scripts below, movements are defined in movement.inc