diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-02-16 16:06:11 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-02-16 16:06:11 -0500 |
| commit | 8e359978d63d88574b3f0fa3c040c570089b4c52 (patch) | |
| tree | 5615d775740d972f05ebc8671e222265f174de26 | |
| parent | 1dad1b48d46cd5610eba5d778c8774f13d46e8d7 (diff) | |
passtoengine -> autoinput
| -rw-r--r-- | docs/event_commands.md | 2 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 6 | ||||
| -rw-r--r-- | macros/legacy.asm | 1 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 9 |
4 files changed, 10 insertions, 8 deletions
diff --git a/docs/event_commands.md b/docs/event_commands.md index 21c49dfee..49130c792 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -279,7 +279,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii ## `$88`: `specialsound` -## `$89`: <code>passtoengine <i>data_pointer</i></code> +## `$89`: <code>autoinput <i>input_pointer</i></code> ## `$8A`: <code>newloadmap <i>which_method</i></code> diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index f500d3c0e..e998da7c3 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -202,7 +202,7 @@ endc dw Script_waitsfx ; 86 dw Script_warpsound ; 87 dw Script_specialsound ; 88 - dw Script_passtoengine ; 89 + dw Script_autoinput ; 89 dw Script_newloadmap ; 8a dw Script_pause ; 8b dw Script_deactivatefacing ; 8c @@ -2653,9 +2653,9 @@ Script_closetext: call CloseText ret -Script_passtoengine: +Script_autoinput: ; script command 0x89 -; parameters: data_pointer +; parameters: input_pointer call GetScriptByte push af diff --git a/macros/legacy.asm b/macros/legacy.asm index 0aa4d5e4d..dad18ebb3 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -53,6 +53,7 @@ storetext EQUS "battletowertext" displaylocation EQUS "landmarktotext" givepokeitem EQUS "givepokemail" checkpokeitem EQUS "checkpokemail" +passtoengine EQUS "autoinput" ; macros/scripts/maps.asm diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index a8f6c2015..c2173335a 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -857,10 +857,11 @@ specialsound: MACRO db specialsound_command ENDM - enum passtoengine_command ; $89 -passtoengine: MACRO - db passtoengine_command - db \1 ; data_pointer + enum autoinput_command ; $89 +autoinput: MACRO + db autoinput_command + db BANK(\1) ; input_bank + dw \1 ; input_pointer ENDM enum newloadmap_command ; $8a |