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 /engine/overworld/scripting.asm | |
| parent | aa51dbc61245d5b4949c1872b3d3e915a981ded3 (diff) | |
| parent | 59c4d824e65409f6de211d6e0fd354ca4ef6c61e (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/overworld/scripting.asm')
| -rw-r--r-- | engine/overworld/scripting.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 9aaf98f39..a18be2e6c 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -112,8 +112,8 @@ ScriptCommandTable: dw Script_checkpoke ; 2c dw Script_givepoke ; 2d dw Script_giveegg ; 2e - dw Script_givepokeitem ; 2f - dw Script_checkpokeitem ; 30 + dw Script_givepokemail ; 2f + dw Script_checkpokemail ; 30 dw Script_checkevent ; 31 dw Script_clearevent ; 32 dw Script_setevent ; 33 @@ -2019,7 +2019,7 @@ Script_stringtotext: ld de, wStringBuffer2 jp ConvertMemToText -Script_givepokeitem: +Script_givepokemail: ; script command 0x2f ; parameters: pointer @@ -2037,10 +2037,10 @@ Script_givepokeitem: ld a, [wScriptBank] call FarCopyBytes pop bc - farcall GivePokeItem + farcall GivePokeMail ret -Script_checkpokeitem: +Script_checkpokemail: ; script command 0x30 ; parameters: pointer @@ -2050,7 +2050,7 @@ Script_checkpokeitem: ld d, a ld a, [wScriptBank] ld b, a - farcall CheckPokeItem + farcall CheckPokeMail ret Script_giveitem: |