summaryrefslogtreecommitdiff
path: root/engine/npctrade.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/npctrade.asm')
-rwxr-xr-xengine/npctrade.asm16
1 files changed, 7 insertions, 9 deletions
diff --git a/engine/npctrade.asm b/engine/npctrade.asm
index 1328efa4c..7e3fa4683 100755
--- a/engine/npctrade.asm
+++ b/engine/npctrade.asm
@@ -59,7 +59,7 @@ NPCTrade:: ; fcba8
push af
ld a, [wcf64]
push af
- predef TradeAnimation
+ predef Predef_TradeAnimation
pop af
ld [wcf64], a
pop af
@@ -80,12 +80,12 @@ CheckTradeGender: ; fcc23
cp TRADE_MALE_ONLY
jr z, .check_male
- farcall GetGender
+ farcall Predef_GetGender
jr nz, .not_matching
jr .matching
.check_male
- farcall GetGender
+ farcall Predef_GetGender
jr z, .not_matching
.matching
@@ -101,7 +101,7 @@ TradeFlagAction: ; fcc4a
ld hl, wTradeFlags
ld a, [wJumptableIndex]
ld c, a
- predef FlagPredef
+ predef Predef_SmallFarFlagAction
ld a, c
and a
ret
@@ -188,7 +188,7 @@ DoNPCTrade: ; fcc63
ld [MonType], a
ld [wPokemonWithdrawDepositParameter], a
callfar RemoveMonFromPartyOrBox
- predef TryAddMonToParty
+ predef Predef_TryAddMonToParty
ld e, TRADE_DIALOG
call GetTradeAttribute
@@ -324,8 +324,7 @@ CopyTradeName: ; fcdf4
ret
; fcdfb
-Functionfcdfb: ; fcdfb
-; unreferenced
+Unreferenced_Functionfcdfb: ; fcdfb
ld bc, 4
call CopyBytes
ld a, "@"
@@ -333,8 +332,7 @@ Functionfcdfb: ; fcdfb
ret
; fce05
-Functionfce05: ; fce05
-; unreferenced
+Unreferenced_Functionfce05: ; fce05
ld bc, 3
call CopyBytes
ld a, "@"