diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 21:30:31 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-11 21:33:57 -0700 |
| commit | 4c5c98cb2a1bc747a0eb397cb75e48dc8a098494 (patch) | |
| tree | 2872a6436075c0d6132671e98af44f0a1429e498 /engine/trade.asm | |
| parent | Merge pull request #13 from YamaArashi/master (diff) | |
| download | pokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.tar.gz pokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.tar.xz pokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.zip | |
sync engine code with 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 |