summaryrefslogtreecommitdiff
path: root/macros/movement.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-08-17 11:58:57 -0400
committeryenatch <yenatch@gmail.com>2015-08-17 11:58:57 -0400
commit3cd79c55a3e1b50c8a71ad76692342e52382c700 (patch)
tree32a9feb55a0eadc24c4690cef4fd0d26b2032f00 /macros/movement.asm
parent9974a2c7014cbe7db3d0e516580fea48001ab3df (diff)
parent4831b4429eab57f56cce4736b6930a54f07314f7 (diff)
Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
Diffstat (limited to 'macros/movement.asm')
-rw-r--r--macros/movement.asm11
1 files changed, 9 insertions, 2 deletions
diff --git a/macros/movement.asm b/macros/movement.asm
index a647e4176..d0b97fb8c 100644
--- a/macros/movement.asm
+++ b/macros/movement.asm
@@ -359,12 +359,12 @@ __enum__ = $51
enum movement_fish_got_bite
fish_got_bite: macro
- db movement_fish_got_bite
+ db movement_fish_got_bite ; $51
endm
enum movement_fish_got_bite_2
fish_got_bite_2: macro
- db movement_fish_got_bite_2
+ db movement_fish_got_bite_2 ; $52
endm
enum movement_hide_emote
@@ -382,3 +382,10 @@ step_shake: macro
db movement_step_shake ; $55
db \1 ; displacement
endm
+
+__enum__ = $57
+ enum movement_rock_smash
+rock_smash: macro
+ db movement_rock_smash ; $57
+ db \1
+ endm