diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
| commit | 794410352fd92ccf06974763e4b3be0b807641ab (patch) | |
| tree | 05f5dd861966762db9556082229cee82e8b5eed9 /macros/movement.asm | |
| parent | 9c5473e965520f672640daf4ee76622640e0de15 (diff) | |
| parent | 4bcd71e3227181baa536357af3d87a8d02af3890 (diff) | |
Merge pull request #328 from PikalaxALT/master
Split out most of main.asm
Diffstat (limited to 'macros/movement.asm')
| -rw-r--r-- | macros/movement.asm | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/macros/movement.asm b/macros/movement.asm index 2b5720832..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,12 +384,16 @@ 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__ = $51 + enum movement_step_bump +step_bump: macro + db movement_step_bump ; $50 + endm enum movement_fish_got_bite fish_got_bite: macro @@ -422,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 |