diff options
author | Marcus Huderle <huderlem@gmail.com> | 2019-10-12 15:39:17 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2019-10-12 15:39:17 -0500 |
commit | 8df4982b3ff827ec0e7909484a67dc5923fac53d (patch) | |
tree | e9b98e2ce622ab500e13b784cab807e4b5b3e615 /asm/macros | |
parent | 3514f9dd6b48f1a0c42a4ea6cb1ab5317fa88c50 (diff) | |
parent | 4e2be7ff5e4e4f6b7f664bfee4f1d4433c7f238f (diff) |
Merge remote-tracking branch 'upstream/master' into document-trade
Diffstat (limited to 'asm/macros')
-rw-r--r-- | asm/macros/movement.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 99b5c8f84..e26a00d76 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -102,8 +102,8 @@ create_movement_action clear_fixed_priority create_movement_action init_affine_anim create_movement_action clear_affine_anim - create_movement_action unknown_movement_1 - create_movement_action unknown_movement_2 + create_movement_action hide_reflection + create_movement_action show_reflection create_movement_action walk_down_start_affine create_movement_action walk_down_affine |