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 From 94d6a327218fc56753238b424df208245092d96c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 12:00:01 -0500 Subject: Use maskbits some more --- engine/npctrade.asm | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'engine/npctrade.asm') diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 1455dce62..1328efa4c 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -1,11 +1,3 @@ -; Trade dialogs - const_def - const TRADE_INTRO - const TRADE_CANCEL - const TRADE_WRONG - const TRADE_COMPLETE - const TRADE_AFTER - NPCTrade:: ; fcba8 ld a, e ld [wJumptableIndex], a @@ -83,9 +75,9 @@ CheckTradeGender: ; fcc23 ld e, TRADE_GENDER call GetTradeAttribute ld a, [hl] - and a + and a ; TRADE_EITHER_GENDER jr z, .matching - cp 1 + cp TRADE_MALE_ONLY jr z, .check_male farcall GetGender @@ -178,10 +170,10 @@ DoNPCTrade: ; fcc63 ld e, TRADE_DIALOG call GetTradeAttribute ld a, [hl] - cp 3 - ld a, 1 + cp TRADE_DIALOG_GIRL + ld a, CAUGHT_BY_GIRL jr c, .okay - ld a, 2 + ld a, CAUGHT_BY_BOY .okay ld [wOTTrademonCaughtData], a @@ -400,7 +392,7 @@ GetTradeMonNames: ; fce1b and a ret z - cp 1 + cp TRADE_MALE_ONLY ld a, "♂" jr z, .done ld a, "♀" @@ -433,31 +425,28 @@ PrintTradeText: ; fcf38 ; fcf53 TradeTexts: ; fcf53 -; intro +; entries correspond to TRADE_* × TRADE_DIALOG_* constants +; TRADE_INTRO dw TradeIntroText1 dw TradeIntroText2 dw TradeIntroText3 dw TradeIntroText4 - -; cancel +; TRADE_CANCEL dw TradeCancelText1 dw TradeCancelText2 dw TradeCancelText3 dw TradeCancelText4 - -; wrong mon +; TRADE_WRONG dw TradeWrongText1 dw TradeWrongText2 dw TradeWrongText3 dw TradeWrongText4 - -; completed +; TRADE_COMPLETE dw TradeCompleteText1 dw TradeCompleteText2 dw TradeCompleteText3 dw TradeCompleteText4 - -; after +; TRADE_AFTER dw TradeAfterText1 dw TradeAfterText2 dw TradeAfterText3 -- cgit v1.2.3 From 80480821142d7a7b16dd2b1a98a213e7b389af0f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 14:30:10 -0500 Subject: Remove Predef_ prefix from routines listed in PredefPointers --- 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 7e3fa4683..a9055a15d 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -59,7 +59,7 @@ NPCTrade:: ; fcba8 push af ld a, [wcf64] push af - predef Predef_TradeAnimation + predef TradeAnimation pop af ld [wcf64], a pop af @@ -80,12 +80,12 @@ CheckTradeGender: ; fcc23 cp TRADE_MALE_ONLY jr z, .check_male - farcall Predef_GetGender + farcall GetGender jr nz, .not_matching jr .matching .check_male - farcall Predef_GetGender + farcall GetGender jr z, .not_matching .matching @@ -101,7 +101,7 @@ TradeFlagAction: ; fcc4a ld hl, wTradeFlags ld a, [wJumptableIndex] ld c, a - predef Predef_SmallFarFlagAction + predef SmallFarFlagAction ld a, c and a ret @@ -188,7 +188,7 @@ DoNPCTrade: ; fcc63 ld [MonType], a ld [wPokemonWithdrawDepositParameter], a callfar RemoveMonFromPartyOrBox - predef Predef_TryAddMonToParty + predef TryAddMonToParty ld e, TRADE_DIALOG call GetTradeAttribute -- cgit v1.2.3 From 05382d3e3c03616d6edf21833e89a8264a8cd10a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 20 Jan 2018 12:25:55 -0500 Subject: PARTY_LENGTH; MON_NAME; sgb_border.bin --- 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 a9055a15d..40f6dd638 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -206,7 +206,7 @@ DoNPCTrade: ; fcc63 call CopyTradeName ld hl, PartyMonNicknames - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH call Trade_GetAttributeOfLastPartymon ld hl, wOTTrademonNickname call CopyTradeName -- cgit v1.2.3