diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-06 22:45:07 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-06 22:45:07 -0400 |
| commit | 8acc8d6e30392a30a8353923219db71527f3a9bb (patch) | |
| tree | e0249b97485ddae4fdc0a410c5ad5add6f711d3e /macros/scripts | |
| parent | aa51dbc61245d5b4949c1872b3d3e915a981ded3 (diff) | |
| parent | 59c4d824e65409f6de211d6e0fd354ca4ef6c61e (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/events.asm | 14 | ||||
| -rw-r--r-- | macros/scripts/movement.asm | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 3723a3a8d..a8f6c2015 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -1,4 +1,4 @@ -; ScriptCommandTable indexes (see engine/scripting.asm) +; ScriptCommandTable indexes (see engine/overworld/scripting.asm) enum_start enum scall_command ; $00 @@ -315,15 +315,15 @@ giveegg: MACRO db \2 ; level ENDM - enum givepokeitem_command ; $2f -givepokeitem: MACRO - db givepokeitem_command + enum givepokemail_command ; $2f +givepokemail: MACRO + db givepokemail_command dw \1 ; pointer ENDM - enum checkpokeitem_command ; $30 -checkpokeitem: MACRO - db checkpokeitem_command + enum checkpokemail_command ; $30 +checkpokemail: MACRO + db checkpokemail_command dw \1 ; pointer ENDM diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index 451608723..83d1ad0e6 100644 --- a/macros/scripts/movement.asm +++ b/macros/scripts/movement.asm @@ -1,4 +1,4 @@ -; MovementPointers indexes (see engine/movement.asm) +; MovementPointers indexes (see engine/overworld/movement.asm) enum_start ; Directional movements |