diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-24 19:49:19 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-24 19:49:19 -0400 |
| commit | 4d17f6e1f6d41b91f5a5de71984a7c6f2bd0041c (patch) | |
| tree | f0e965465c782622f47a9394a03f25836c76f71a /engine/scripting.asm | |
| parent | 69ee070021bfbc36cf30df446c802f3648b3d5fe (diff) | |
Address comments on PR 322
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 82414a427..2dadafee1 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -529,7 +529,7 @@ Script_interpretmenu: ; 0x96f41 ld a, [ScriptBank] ld hl, InterpretMenu rst FarCall - ld a, [wPocketPointerLocationBuffer] + ld a, [wPocketCursorBuffer] jr nc, .ok xor a .ok @@ -1585,7 +1585,7 @@ Script_reloadmap: ; 0x97491 xor a ld [wd459], a - ld a, ($f << 4) + MAPSETUP_03 + ld a, MAPSETUP_RELOADMAP ld [hMapEntryMethod], a ld a, $1 call LoadMapStatus @@ -2840,7 +2840,7 @@ Script_warp: ; 0x97a1d ld [YCoord], a ld a, -1 ld [wd001], a - ld a, ($f << 4) + MAPSETUP_01 + ld a, MAPSETUP_WARP ld [hMapEntryMethod], a ld a, 1 call LoadMapStatus @@ -2852,7 +2852,7 @@ Script_warp: ; 0x97a1d call GetScriptByte ld a, -1 ld [wd001], a - ld a, ($f << 4) + MAPSETUP_11 + ld a, MAPSETUP_BADWARP ld [hMapEntryMethod], a ld a, 1 call LoadMapStatus |