summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-15 21:28:15 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-15 21:28:15 -0500
commitaba038a4a4b5a1ef9ab683a3683849809ef95467 (patch)
tree1e0e2d1372e05fb692d4564696e9e0d07c36b6e6 /macros
parent434c97a146d4416829a44955d325d023dacf9e54 (diff)
Fix some movement macro/function names
Diffstat (limited to 'macros')
-rw-r--r--macros/movement.asm22
1 files changed, 15 insertions, 7 deletions
diff --git a/macros/movement.asm b/macros/movement.asm
index 0b018f7d6..c354b0d5c 100644
--- a/macros/movement.asm
+++ b/macros/movement.asm
@@ -292,10 +292,9 @@ fix_facing: macro
db movement_fix_facing ; $3b
endm
- enum movement_return_dig
-return_dig: macro
- db movement_return_dig
- db \1
+ enum movement_show_person
+show_person: macro
+ db movement_show_person ; $3c
endm
enum movement_hide_person
@@ -354,6 +353,8 @@ step_end: macro
db movement_step_end ; $47
endm
+; Whatever Movement_48 is, it takes a one-byte parameter
+
__enum__ = $49
enum movement_remove_person
@@ -383,9 +384,10 @@ skyfall: macro
db movement_skyfall ; $4e
endm
- enum movement_step_wait5
-step_wait5: macro
- db movement_step_wait5 ; $4f
+ enum movement_step_dig
+step_dig: macro
+ db movement_step_dig ; $4f
+ db \1
endm
enum movement_step_bump
@@ -425,3 +427,9 @@ rock_smash: macro
db movement_rock_smash ; $57
db \1
endm
+
+ enum movement_return_dig
+return_dig: macro
+ db movement_return_dig ; $58
+ db \1
+ endm