#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions

engine/events/npc_trade.asm

@@ -34,7 +34,7 @@ NPCTrade::
 	ld b, SET_FLAG
 	call TradeFlagAction
 
-	ld hl, ConnectLinkCableText
+	ld hl, NPCTradeCableText
 	call PrintText
 
 	call DoNPCTrade
@@ -405,39 +405,38 @@ PrintTradeText:
 TradeTexts:
 ; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants
 ; TRADE_DIALOG_INTRO
-	dw TradeIntroText1
-	dw TradeIntroText2
-	dw TradeIntroText3
-	dw TradeIntroText4
+	dw NPCTradeIntroText1
+	dw NPCTradeIntroText2
+	dw NPCTradeIntroText2
+	dw NPCTradeIntroText3
 ; TRADE_DIALOG_CANCEL
-	dw TradeCancelText1
-	dw TradeCancelText2
-	dw TradeCancelText3
-	dw TradeCancelText4
+	dw NPCTradeCancelText1
+	dw NPCTradeCancelText2
+	dw NPCTradeCancelText2
+	dw NPCTradeCancelText3
 ; TRADE_DIALOG_WRONG
-	dw TradeWrongText1
-	dw TradeWrongText2
-	dw TradeWrongText3
-	dw TradeWrongText4
+	dw NPCTradeWrongText1
+	dw NPCTradeWrongText2
+	dw NPCTradeWrongText2
+	dw NPCTradeWrongText3
 ; TRADE_DIALOG_COMPLETE
-	dw TradeCompleteText1
-	dw TradeCompleteText2
-	dw TradeCompleteText3
-	dw TradeCompleteText4
+	dw NPCTradeCompleteText1
+	dw NPCTradeCompleteText2
+	dw NPCTradeCompleteText4
+	dw NPCTradeCompleteText3
 ; TRADE_DIALOG_AFTER
-	dw TradeAfterText1
-	dw TradeAfterText2
-	dw TradeAfterText3
-	dw TradeAfterText4
+	dw NPCTradeAfterText1
+	dw NPCTradeAfterText2
+	dw NPCTradeAfterText4
+	dw NPCTradeAfterText3
 
-ConnectLinkCableText:
-	; OK, connect the Game Link Cable.
-	text_far UnknownText_0x1bd407
+NPCTradeCableText:
+	text_far _NPCTradeCableText
 	text_end
 
 TradedForText:
 	; traded givemon for getmon
-	text_far UnknownText_0x1bd429
+	text_far Text_NPCTraded
 	text_asm
 	ld de, MUSIC_NONE
 	call PlayMusic
@@ -446,95 +445,73 @@ TradedForText:
 	ret
 
 .done
-	; sound_dex_fanfare_80_109
-	; text_pause
-	text_far UnknownText_0x1bd445
+	text_far _NPCTradeFanfareText
 	text_end
 
-TradeIntroText1:
-	; I collect #MON. Do you have @ ? Want to trade it for my @ ?
+NPCTradeIntroText1:
 	text_far _NPCTradeIntroText1
 	text_end
 
-TradeCancelText1:
-	; You don't want to trade? Aww…
+NPCTradeCancelText1:
 	text_far _NPCTradeCancelText1
 	text_end
 
-TradeWrongText1:
-	; Huh? That's not @ .  What a letdown…
+NPCTradeWrongText1:
 	text_far _NPCTradeWrongText1
 	text_end
 
-TradeCompleteText1:
-	; Yay! I got myself @ ! Thanks!
+NPCTradeCompleteText1:
 	text_far _NPCTradeCompleteText1
 	text_end
 
-TradeAfterText1:
-	; Hi, how's my old @  doing?
-	text_far _NPCTradeAFterText1
+NPCTradeAfterText1:
+	text_far _NPCTradeAfterText1
 	text_end
 
-TradeIntroText2:
-TradeIntroText3:
-	; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ?
+NPCTradeIntroText2:
 	text_far _NPCTradeIntroText2
 	text_end
 
-TradeCancelText2:
-TradeCancelText3:
-	; You don't have one either? Gee, that's really disappointing…
+NPCTradeCancelText2:
 	text_far _NPCTradeCancelText2
 	text_end
 
-TradeWrongText2:
-TradeWrongText3:
-	; You don't have @ ? That's too bad, then.
+NPCTradeWrongText2:
 	text_far _NPCTradeWrongText2
 	text_end
 
-TradeCompleteText2:
-	; Great! Thank you! I finally got @ .
+NPCTradeCompleteText2:
 	text_far _NPCTradeCompleteText2
 	text_end
 
-TradeAfterText2:
-	; Hi! The @ you traded me is doing great!
+NPCTradeAfterText2:
 	text_far _NPCTradeAfterText2
 	text_end
 
-TradeIntroText4:
-	; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ?
+NPCTradeIntroText3:
 	text_far _NPCTradeIntroText3
 	text_end
 
-TradeCancelText4:
-	; You don't want to trade? Oh, darn…
+NPCTradeCancelText3:
 	text_far _NPCTradeCancelText3
 	text_end
 
-TradeWrongText4:
-	; That's not @ . Please trade with me if you get one.
+NPCTradeWrongText3:
 	text_far _NPCTradeWrongText3
 	text_end
 
-TradeCompleteText4:
-	; Wow! Thank you! I always wanted @ !
+NPCTradeCompleteText3:
 	text_far _NPCTradeCompleteText3
 	text_end
 
-TradeAfterText4:
-	; How is that @  I traded you doing? Your @ 's so cute!
+NPCTradeAfterText3:
 	text_far _NPCTradeAfterText3
 	text_end
 
-TradeCompleteText3:
-	; Uh? What happened?
+NPCTradeCompleteText4:
 	text_far _NPCTradeCompleteText4
 	text_end
 
-TradeAfterText3:
-	; Trading is so odd… I still have a lot to learn about it.
+NPCTradeAfterText4:
 	text_far _NPCTradeAfterText4
 	text_end