diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/npctrade.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/npctrade.asm')
| -rwxr-xr-x | engine/npctrade.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/npctrade.asm b/engine/npctrade.asm index fab504ab3..1455dce62 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -24,7 +24,7 @@ NPCTrade:: ; fcba8 ; Select givemon from party ld b, PARTYMENUACTION_GIVE_MON - callba SelectTradeOrDayCareMon + farcall SelectTradeOrDayCareMon ld a, TRADE_CANCEL jr c, .done @@ -88,12 +88,12 @@ CheckTradeGender: ; fcc23 cp 1 jr z, .check_male - callba GetGender + farcall GetGender jr nz, .not_matching jr .matching .check_male - callba GetGender + farcall GetGender jr z, .not_matching .matching @@ -171,7 +171,7 @@ DoNPCTrade: ; fcc63 call Trade_GetAttributeOfCurrentPartymon ld b, h ld c, l - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wPlayerTrademonCaughtData], a @@ -195,7 +195,7 @@ DoNPCTrade: ; fcc63 xor a ld [MonType], a ld [wPokemonWithdrawDepositParameter], a - callab RemoveMonFromPartyOrBox + callfar RemoveMonFromPartyOrBox predef TryAddMonToParty ld e, TRADE_DIALOG @@ -206,7 +206,7 @@ DoNPCTrade: ; fcc63 jr c, .incomplete ld b, SET_FLAG .incomplete - callba SetGiftPartyMonCaughtData + farcall SetGiftPartyMonCaughtData ld e, TRADE_NICK call GetTradeAttribute @@ -275,7 +275,7 @@ DoNPCTrade: ; fcc63 ld a, [PartyCount] dec a ld [CurPartyMon], a - callba ComputeNPCTrademonStats + farcall ComputeNPCTrademonStats pop af ld [CurPartyMon], a pop hl |