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/lance.asm | |
| parent | Revert "Revert "data/facing.asm, titlescreen functions, oam/sprite related fu... (diff) | |
| download | pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.gz pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.xz pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.zip | |
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/lance.asm')
| -rwxr-xr-x | scripts/lance.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lance.asm b/scripts/lance.asm index e2c43614..4d9d393c 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -85,7 +85,7 @@ CoordsData_5a33e: ; 5a33e (16:633e) LanceScript2: ; 5a349 (16:6349) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, LanceScript_5a2f5 ld a, $1 |