pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Address comments on PR 322

Browse Source
This commit is contained in:
PikalaxALT
2015-10-24 19:49:19 -04:00
parent 69ee070021
commit 4d17f6e1f6
28 changed files with 754 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/scripting.asm
View File

@ -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