diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
| commit | ce3ec76762d9e2f0c560e2ea7868678418883143 (patch) | |
| tree | 13bd307196f870d59157ab803c858c205eba6921 /engine/trade.asm | |
| parent | Remove more address comments (diff) | |
| parent | Merge pull request #16 from YamaArashi/master (diff) | |
| download | pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.tar.gz pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.tar.xz pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.zip | |
Merge branch 'master' of https://github.com/pret/pokeyellow into merge-pokered
Diffstat (limited to 'engine/trade.asm')
| -rwxr-xr-x | engine/trade.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/trade.asm b/engine/trade.asm index bbd43779..2476ca78 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -253,7 +253,7 @@ Trade_ShowPlayerMon: ld [hSCX], a dec a dec a - and a ; useless since flags are updated with dec a + and a jr nz, .slideScreenLoop call Trade_Delay80 ld a, TRADE_BALL_POOF_ANIM |