From 6f0b81504d6471afe7df6adae83791cc81933ca6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 16:04:21 +0100 Subject: More unreferenced labels cleanup --- engine/npctrade.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'engine/npctrade.asm') diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 1455dce62..49c22829e 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -332,8 +332,7 @@ CopyTradeName: ; fcdf4 ret ; fcdfb -Functionfcdfb: ; fcdfb -; unreferenced +Unreferenced_Functionfcdfb: ; fcdfb ld bc, 4 call CopyBytes ld a, "@" @@ -341,8 +340,7 @@ Functionfcdfb: ; fcdfb ret ; fce05 -Functionfce05: ; fce05 -; unreferenced +Unreferenced_Functionfce05: ; fce05 ld bc, 3 call CopyBytes ld a, "@" -- cgit v1.2.3 From d7970f749ac23786728926109be430ab732f19e6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 18:49:25 +0100 Subject: Consistent predef function names --- engine/npctrade.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/npctrade.asm') diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 49c22829e..c1726ed04 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -67,7 +67,7 @@ NPCTrade:: ; fcba8 push af ld a, [wcf64] push af - predef TradeAnimation + predef Predef_TradeAnimation pop af ld [wcf64], a pop af @@ -88,12 +88,12 @@ CheckTradeGender: ; fcc23 cp 1 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 @@ -109,7 +109,7 @@ TradeFlagAction: ; fcc4a ld hl, wTradeFlags ld a, [wJumptableIndex] ld c, a - predef FlagPredef + predef Predef_Flag ld a, c and a ret @@ -196,7 +196,7 @@ DoNPCTrade: ; fcc63 ld [MonType], a ld [wPokemonWithdrawDepositParameter], a callfar RemoveMonFromPartyOrBox - predef TryAddMonToParty + predef Predef_TryAddMonToParty ld e, TRADE_DIALOG call GetTradeAttribute -- cgit v1.2.3 From e9e8bf6eb14020d4a88a7cd4bca8539a2b45803e Mon Sep 17 00:00:00 2001 From: xCrystal Date: Fri, 5 Jan 2018 11:05:01 +0100 Subject: Predef_Flag -> Predef_FlagAction --- engine/npctrade.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/npctrade.asm') diff --git a/engine/npctrade.asm b/engine/npctrade.asm index c1726ed04..25d47e6be 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -109,7 +109,7 @@ TradeFlagAction: ; fcc4a ld hl, wTradeFlags ld a, [wJumptableIndex] ld c, a - predef Predef_Flag + predef Predef_FlagAction ld a, c and a ret -- cgit v1.2.3 From 2c789b64b1bfa9ec33d805d06ad3a7141e3871f1 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Sun, 7 Jan 2018 11:53:20 +0100 Subject: Predef_FlagAction -> Predef_SmallFarFlagAction --- engine/npctrade.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/npctrade.asm') diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 25d47e6be..bd77f21c3 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -109,7 +109,7 @@ TradeFlagAction: ; fcc4a ld hl, wTradeFlags ld a, [wJumptableIndex] ld c, a - predef Predef_FlagAction + predef Predef_SmallFarFlagAction ld a, c and a ret -- cgit v1.2.3