diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
| commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
| tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /engine/in_game_trades.asm | |
| parent | Is this an OAM printer? (diff) | |
| parent | Clean up main.asm (diff) | |
| download | pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.gz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.xz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/in_game_trades.asm')
| -rwxr-xr-x | engine/in_game_trades.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index 80cb27f3..ff739ef0 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -223,7 +223,7 @@ InGameTrade_FlagActionPredef: ; 71ded (1c:5ded) ld a,[wWhichTrade] ld c,a predef_jump FlagActionPredef - + InGameTrade_CheckForTradeEvo: ; 71df9 (1c:5df9) ld a,[wInGameTradeReceiveMonSpecies] cp KADABRA @@ -235,7 +235,7 @@ InGameTrade_CheckForTradeEvo: ; 71df9 (1c:5df9) cp HAUNTER jr z,.tradeEvo ret - + .tradeEvo ld a,[wPartyCount] dec a @@ -248,7 +248,7 @@ InGameTrade_CheckForTradeEvo: ; 71df9 (1c:5df9) xor a ; LINK_STATE_NONE ld [wLinkState],a jp PlayDefaultMusic - + InGameTrade_TrainerString: ; 71e2d (1c:5e2d) ; "TRAINER@@@@@@@@@@" db $5d, "@@@@@@@@@@" |