diff options
author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
---|---|---|
committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /scripts/silphco11.asm | |
parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'scripts/silphco11.asm')
-rwxr-xr-x | scripts/silphco11.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 4c83c20d..6cb2e7ed 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -205,7 +205,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a) jp SetSpriteFacingDirectionAndDelay SilphCo11Script5: ; 62227 (18:6227) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SilphCo11Script_621c4 ld a, [wcf0d] |