pokecrystal-board/engine/events/npc_trade.asm

NPCTrade::
	ld a, e
	ld [wJumptableIndex], a
	call Trade_GetDialog
	ld b, CHECK_FLAG
	call TradeFlagAction
	ld a, TRADE_DIALOG_AFTER
	jr nz, .done

	ld a, TRADE_DIALOG_INTRO
	call PrintTradeText

	call YesNoBox
	ld a, TRADE_DIALOG_CANCEL
	jr c, .done

; Select givemon from party
	ld b, PARTYMENUACTION_GIVE_MON
	farcall SelectTradeOrDayCareMon
	ld a, TRADE_DIALOG_CANCEL
	jr c, .done

	ld e, NPCTRADE_GIVEMON
	call GetTradeAttribute
	ld a, [wCurPartySpecies]
	cp [hl]
	ld a, TRADE_DIALOG_WRONG
	jr nz, .done

	call CheckTradeGender
	ld a, TRADE_DIALOG_WRONG
	jr c, .done

	ld b, SET_FLAG
	call TradeFlagAction

	ld hl, NPCTradeCableText
	call PrintText

	call DoNPCTrade
	call .TradeAnimation
	call GetTradeMonNames

	ld hl, TradedForText
	call PrintText

	call RestartMapMusic

	ld a, TRADE_DIALOG_COMPLETE

.done
	call PrintTradeText
	ret

.TradeAnimation:
	call DisableSpriteUpdates
	ld a, [wJumptableIndex]
	push af
	ld a, [wcf64]
	push af
	predef TradeAnimation
	pop af
	ld [wcf64], a
	pop af
	ld [wJumptableIndex], a
	call ReturnToMapWithSpeechTextbox
	ret

CheckTradeGender:
	xor a
	ld [wMonType], a

	ld e, NPCTRADE_GENDER
	call GetTradeAttribute
	ld a, [hl]
	and a ; TRADE_GENDER_EITHER
	jr z, .matching
	cp TRADE_GENDER_MALE
	jr z, .check_male
	; TRADE_GENDER_FEMALE
	farcall GetGender
	jr nz, .not_matching
	jr .matching

.check_male
	farcall GetGender
	jr z, .not_matching

.matching
	and a
	ret

.not_matching
	scf
	ret

TradeFlagAction:
	ld hl, wTradeFlags
	ld a, [wJumptableIndex]
	ld c, a
	predef SmallFarFlagAction
	ld a, c
	and a
	ret

Trade_GetDialog:
	ld e, NPCTRADE_DIALOG
	call GetTradeAttribute
	ld a, [hl]
	ld [wcf64], a
	ret

DoNPCTrade:
	ld e, NPCTRADE_GIVEMON
	call GetTradeAttribute
	ld a, [hl]
	ld [wPlayerTrademonSpecies], a

	ld e, NPCTRADE_GETMON
	call GetTradeAttribute
	ld a, [hl]
	ld [wOTTrademonSpecies], a

	ld a, [wPlayerTrademonSpecies]
	ld de, wPlayerTrademonSpeciesName
	call GetTradeMonName
	call CopyTradeName

	ld a, [wOTTrademonSpecies]
	ld de, wOTTrademonSpeciesName
	call GetTradeMonName
	call CopyTradeName

	ld hl, wPartyMonOT
	ld bc, NAME_LENGTH
	call Trade_GetAttributeOfCurrentPartymon
	ld de, wPlayerTrademonOTName
	call CopyTradeName

	ld hl, wPlayerName
	ld de, wPlayerTrademonSenderName
	call CopyTradeName

	ld hl, wPartyMon1ID
	ld bc, PARTYMON_STRUCT_LENGTH
	call Trade_GetAttributeOfCurrentPartymon
	ld de, wPlayerTrademonID
	call Trade_CopyTwoBytes

	ld hl, wPartyMon1DVs
	ld bc, PARTYMON_STRUCT_LENGTH
	call Trade_GetAttributeOfCurrentPartymon
	ld de, wPlayerTrademonDVs
	call Trade_CopyTwoBytes

	ld hl, wPartyMon1Species
	ld bc, PARTYMON_STRUCT_LENGTH
	call Trade_GetAttributeOfCurrentPartymon
	ld b, h
	ld c, l
	farcall GetCaughtGender
	ld a, c
	ld [wPlayerTrademonCaughtData], a

	ld e, NPCTRADE_DIALOG
	call GetTradeAttribute
	ld a, [hl]
	cp TRADE_DIALOGSET_GIRL
	ld a, CAUGHT_BY_GIRL
	jr c, .okay
	ld a, CAUGHT_BY_BOY
.okay
	ld [wOTTrademonCaughtData], a

	ld hl, wPartyMon1Level
	ld bc, PARTYMON_STRUCT_LENGTH
	call Trade_GetAttributeOfCurrentPartymon
	ld a, [hl]
	ld [wCurPartyLevel], a
	ld a, [wOTTrademonSpecies]
	ld [wCurPartySpecies], a
	xor a
	ld [wMonType], a ; PARTYMON
	ld [wPokemonWithdrawDepositParameter], a ; REMOVE_PARTY
	callfar RemoveMonFromPartyOrBox
	predef TryAddMonToParty

	ld e, NPCTRADE_DIALOG
	call GetTradeAttribute
	ld a, [hl]
	cp TRADE_DIALOGSET_GIRL
	ld b, CAUGHT_BY_UNKNOWN
	jr c, .incomplete
	ld b, CAUGHT_BY_GIRL
.incomplete
	farcall SetGiftPartyMonCaughtData

	ld e, NPCTRADE_NICK
	call GetTradeAttribute
	ld de, wOTTrademonNickname
	call CopyTradeName

	ld hl, wPartyMonNicknames
	ld bc, MON_NAME_LENGTH
	call Trade_GetAttributeOfLastPartymon
	ld hl, wOTTrademonNickname
	call CopyTradeName

	ld e, NPCTRADE_OT_NAME
	call GetTradeAttribute
	push hl
	ld de, wOTTrademonOTName
	call CopyTradeName
	pop hl
	ld de, wOTTrademonSenderName
	call CopyTradeName

	ld hl, wPartyMonOT
	ld bc, NAME_LENGTH
	call Trade_GetAttributeOfLastPartymon
	ld hl, wOTTrademonOTName
	call CopyTradeName

	ld e, NPCTRADE_DVS
	call GetTradeAttribute
	ld de, wOTTrademonDVs
	call Trade_CopyTwoBytes

	ld hl, wPartyMon1DVs
	ld bc, PARTYMON_STRUCT_LENGTH
	call Trade_GetAttributeOfLastPartymon
	ld hl, wOTTrademonDVs
	call Trade_CopyTwoBytes

	ld e, NPCTRADE_OT_ID
	call GetTradeAttribute
	ld de, wOTTrademonID + 1
	call Trade_CopyTwoBytesReverseEndian

	ld hl, wPartyMon1ID
	ld bc, PARTYMON_STRUCT_LENGTH
	call Trade_GetAttributeOfLastPartymon
	ld hl, wOTTrademonID
	call Trade_CopyTwoBytes

	ld e, NPCTRADE_ITEM
	call GetTradeAttribute
	push hl
	ld hl, wPartyMon1Item
	ld bc, PARTYMON_STRUCT_LENGTH
	call Trade_GetAttributeOfLastPartymon
	pop hl
	ld a, [hl]
	ld [de], a

	push af
	push bc
	push de
	push hl
	ld a, [wCurPartyMon]
	push af
	ld a, [wPartyCount]
	dec a
	ld [wCurPartyMon], a
	farcall ComputeNPCTrademonStats
	pop af
	ld [wCurPartyMon], a
	pop hl
	pop de
	pop bc
	pop af
	ret

GetTradeAttribute:
	ld d, 0
	push de
	ld a, [wJumptableIndex]
	and $f
	swap a
	ld e, a
	ld d, 0
	ld hl, NPCTrades
	add hl, de
	add hl, de
	pop de
	add hl, de
	ret

Trade_GetAttributeOfCurrentPartymon:
	ld a, [wCurPartyMon]
	call AddNTimes
	ret

Trade_GetAttributeOfLastPartymon:
	ld a, [wPartyCount]
	dec a
	call AddNTimes
	ld e, l
	ld d, h
	ret

GetTradeMonName:
	push de
	ld [wNamedObjectIndexBuffer], a
	call GetBasePokemonName
	ld hl, wStringBuffer1
	pop de
	ret

CopyTradeName:
	ld bc, NAME_LENGTH
	call CopyBytes
	ret

Functionfcdfb: ; unreferenced
	ld bc, 4
	call CopyBytes
	ld a, "@"
	ld [de], a
	ret

Functionfce05: ; unreferenced
	ld bc, 3
	call CopyBytes
	ld a, "@"
	ld [de], a
	ret

Trade_CopyTwoBytes:
	ld a, [hli]
	ld [de], a
	inc de
	ld a, [hl]
	ld [de], a
	ret

Trade_CopyTwoBytesReverseEndian:
	ld a, [hli]
	ld [de], a
	dec de
	ld a, [hl]
	ld [de], a
	ret

GetTradeMonNames:
	ld e, NPCTRADE_GETMON
	call GetTradeAttribute
	ld a, [hl]
	call GetTradeMonName

	ld de, wStringBuffer2
	call CopyTradeName

	ld e, NPCTRADE_GIVEMON
	call GetTradeAttribute
	ld a, [hl]
	call GetTradeMonName

	ld de, wMonOrItemNameBuffer
	call CopyTradeName

	ld hl, wStringBuffer1
.loop
	ld a, [hli]
	cp "@"
	jr nz, .loop

	dec hl
	push hl
	ld e, NPCTRADE_GENDER
	call GetTradeAttribute
	ld a, [hl]
	pop hl
	and a ; TRADE_GENDER_EITHER
	ret z
	cp TRADE_GENDER_MALE
	ld a, "♂"
	jr z, .done
	; TRADE_GENDER_FEMALE
	ld a, "♀"
.done
	ld [hli], a
	ld [hl], "@"
	ret

INCLUDE "data/events/npc_trades.asm"

PrintTradeText:
	push af
	call GetTradeMonNames
	pop af
	ld bc, 2 * 4
	ld hl, TradeTexts
	call AddNTimes
	ld a, [wcf64]
	ld c, a
	add hl, bc
	add hl, bc
	ld a, [hli]
	ld h, [hl]
	ld l, a
	call PrintText
	ret

TradeTexts:
; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants
; TRADE_DIALOG_INTRO
	dw NPCTradeIntroText1
	dw NPCTradeIntroText2
	dw NPCTradeIntroText2
	dw NPCTradeIntroText3
; TRADE_DIALOG_CANCEL
	dw NPCTradeCancelText1
	dw NPCTradeCancelText2
	dw NPCTradeCancelText2
	dw NPCTradeCancelText3
; TRADE_DIALOG_WRONG
	dw NPCTradeWrongText1
	dw NPCTradeWrongText2
	dw NPCTradeWrongText2
	dw NPCTradeWrongText3
; TRADE_DIALOG_COMPLETE
	dw NPCTradeCompleteText1
	dw NPCTradeCompleteText2
	dw NPCTradeCompleteText4
	dw NPCTradeCompleteText3
; TRADE_DIALOG_AFTER
	dw NPCTradeAfterText1
	dw NPCTradeAfterText2
	dw NPCTradeAfterText4
	dw NPCTradeAfterText3

NPCTradeCableText:
	text_far _NPCTradeCableText
	text_end

TradedForText:
	; traded givemon for getmon
	text_far Text_NPCTraded
	text_asm
	ld de, MUSIC_NONE
	call PlayMusic
	call DelayFrame
	ld hl, .done
	ret

.done
	text_far _NPCTradeFanfareText
	text_end

NPCTradeIntroText1:
	text_far _NPCTradeIntroText1
	text_end

NPCTradeCancelText1:
	text_far _NPCTradeCancelText1
	text_end

NPCTradeWrongText1:
	text_far _NPCTradeWrongText1
	text_end

NPCTradeCompleteText1:
	text_far _NPCTradeCompleteText1
	text_end

NPCTradeAfterText1:
	text_far _NPCTradeAfterText1
	text_end

NPCTradeIntroText2:
	text_far _NPCTradeIntroText2
	text_end

NPCTradeCancelText2:
	text_far _NPCTradeCancelText2
	text_end

NPCTradeWrongText2:
	text_far _NPCTradeWrongText2
	text_end

NPCTradeCompleteText2:
	text_far _NPCTradeCompleteText2
	text_end

NPCTradeAfterText2:
	text_far _NPCTradeAfterText2
	text_end

NPCTradeIntroText3:
	text_far _NPCTradeIntroText3
	text_end

NPCTradeCancelText3:
	text_far _NPCTradeCancelText3
	text_end

NPCTradeWrongText3:
	text_far _NPCTradeWrongText3
	text_end

NPCTradeCompleteText3:
	text_far _NPCTradeCompleteText3
	text_end

NPCTradeAfterText3:
	text_far _NPCTradeAfterText3
	text_end

NPCTradeCompleteText4:
	text_far _NPCTradeCompleteText4
	text_end

NPCTradeAfterText4:
	text_far _NPCTradeAfterText4
	text_end
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								NPCTrade::
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, e
 									ld [wJumptableIndex], a
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetDialog
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld b, CHECK_FLAG
 									call TradeFlagAction
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld a, TRADE_DIALOG_AFTER
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									jr nz, .done
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld a, TRADE_DIALOG_INTRO
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call PrintTradeText
 									call YesNoBox
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld a, TRADE_DIALOG_CANCEL
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									jr c, .done
 								; Select givemon from party
-												Label all of PARTYMENUACTION_*

It's pretty clear what it's used for.
PartyMenuActionText is used for two things:
1) Storing what kind of action we're going to do (<$10)
2) Storing the text for some kind of healing stuff I'm not entirely sure (>=$f0)

In the former case, if GetPartyMenuTilemapPointers is ran, it will be
used to pick a sequence of actions that should be done, specified in the
table, and it'll print the corresponding string using the
PartyMenuStrings table. The items in the sequence of actions that should
be done are in WritePartyMenuTilemap.

Strangely enough, one possible value is left completely unused:
PARTYMENUACTION_GIVE_MON_FEMALE. It works in the exact same way as it's
male counterpart, and as such I don't believe it was used in the
japanese version either, since it doesn't matter which gender your 'mon
is when you put 'em in the daycare.

											
										
										
											2017-11-30 11:27:25 -08:00
+									ld b, PARTYMENUACTION_GIVE_MON
-												callba/callab → farcall/callfar

											
										
										
											2017-12-24 09:47:30 -08:00
+									farcall SelectTradeOrDayCareMon
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld a, TRADE_DIALOG_CANCEL
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									jr c, .done
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_GIVEMON
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld a, [wCurPartySpecies]
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									cp [hl]
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld a, TRADE_DIALOG_WRONG
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									jr nz, .done
 									call CheckTradeGender
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld a, TRADE_DIALOG_WRONG
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									jr c, .done
 									ld b, SET_FLAG
 									call TradeFlagAction
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+									ld hl, NPCTradeCableText
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call PrintText
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call DoNPCTrade
 									call .TradeAnimation
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeMonNames
 									ld hl, TradedForText
 									call PrintText
 									call RestartMapMusic
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld a, TRADE_DIALOG_COMPLETE
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
 								.done
 									call PrintTradeText
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								.TradeAnimation:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call DisableSpriteUpdates
 									ld a, [wJumptableIndex]
 									push af
 									ld a, [wcf64]
 									push af
-												Remove Predef_ prefix from routines listed in PredefPointers

											
										
										
											2018-01-16 11:30:10 -08:00
+									predef TradeAnimation
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									pop af
 									ld [wcf64], a
 									pop af
 									ld [wJumptableIndex], a
-												Events and some WRAM cleanup

											
										
										
											2015-12-18 17:07:09 -08:00
+									call ReturnToMapWithSpeechTextbox
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								CheckTradeGender:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									xor a
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld [wMonType], a
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_GENDER
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									and a ; TRADE_GENDER_EITHER
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+									jr z, .matching
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									cp TRADE_GENDER_MALE
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+									jr z, .check_male
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									; TRADE_GENDER_FEMALE
-												Remove Predef_ prefix from routines listed in PredefPointers

											
										
										
											2018-01-16 11:30:10 -08:00
+									farcall GetGender
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+									jr nz, .not_matching
 									jr .matching
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+								.check_male
-												Remove Predef_ prefix from routines listed in PredefPointers

											
										
										
											2018-01-16 11:30:10 -08:00
+									farcall GetGender
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+									jr z, .not_matching
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+								.matching
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									and a
 									ret
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+								.not_matching
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									scf
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								TradeFlagAction:
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld hl, wTradeFlags
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, [wJumptableIndex]
 									ld c, a
-												Remove Predef_ prefix from routines listed in PredefPointers

											
										
										
											2018-01-16 11:30:10 -08:00
+									predef SmallFarFlagAction
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, c
 									and a
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								Trade_GetDialog:
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_DIALOG
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
 									ld [wcf64], a
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								DoNPCTrade:
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_GIVEMON
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld [wPlayerTrademonSpecies], a
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_GETMON
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld [wOTTrademonSpecies], a
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld a, [wPlayerTrademonSpecies]
 									ld de, wPlayerTrademonSpeciesName
 									call GetTradeMonName
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld a, [wOTTrademonSpecies]
 									ld de, wOTTrademonSpeciesName
 									call GetTradeMonName
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMonOT
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, NAME_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfCurrentPartymon
 									ld de, wPlayerTrademonOTName
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPlayerName
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld de, wPlayerTrademonSenderName
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMon1ID
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, PARTYMON_STRUCT_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfCurrentPartymon
 									ld de, wPlayerTrademonID
 									call Trade_CopyTwoBytes
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMon1DVs
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, PARTYMON_STRUCT_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfCurrentPartymon
 									ld de, wPlayerTrademonDVs
 									call Trade_CopyTwoBytes
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMon1Species
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, PARTYMON_STRUCT_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfCurrentPartymon
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld b, h
 									ld c, l
-												callba/callab → farcall/callfar

											
										
										
											2017-12-24 09:47:30 -08:00
+									farcall GetCaughtGender
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, c
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld [wPlayerTrademonCaughtData], a
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_DIALOG
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									cp TRADE_DIALOGSET_GIRL
-												Use maskbits some more

											
										
										
											2018-01-11 09:00:01 -08:00
+									ld a, CAUGHT_BY_GIRL
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									jr c, .okay
-												Use maskbits some more

											
										
										
											2018-01-11 09:00:01 -08:00
+									ld a, CAUGHT_BY_BOY
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+								.okay
 									ld [wOTTrademonCaughtData], a
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMon1Level
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, PARTYMON_STRUCT_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfCurrentPartymon
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, [hl]
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld [wCurPartyLevel], a
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld a, [wOTTrademonSpecies]
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld [wCurPartySpecies], a
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									xor a
-												Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBox

It takes a clearly different parameter, completely unrelated and
different in function to PC_DEPOSIT and PC_WITHDRAW.

											
										
										
											2018-02-22 12:35:11 -08:00
+									ld [wMonType], a ; PARTYMON
 									ld [wPokemonWithdrawDepositParameter], a ; REMOVE_PARTY
-												callba/callab → farcall/callfar

											
										
										
											2017-12-24 09:47:30 -08:00
+									callfar RemoveMonFromPartyOrBox
-												Remove Predef_ prefix from routines listed in PredefPointers

											
										
										
											2018-01-16 11:30:10 -08:00
+									predef TryAddMonToParty
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_DIALOG
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
-												Correct constants in DoNPCTrade

											
										
										
											2020-07-25 15:36:49 -07:00
+									cp TRADE_DIALOGSET_GIRL
 									ld b, CAUGHT_BY_UNKNOWN
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+									jr c, .incomplete
-												Correct constants in DoNPCTrade

											
										
										
											2020-07-25 15:36:49 -07:00
+									ld b, CAUGHT_BY_GIRL
-												Miscellaneous labels

											
										
										
											2015-12-13 17:33:56 -08:00
+								.incomplete
-												callba/callab → farcall/callfar

											
										
										
											2017-12-24 09:47:30 -08:00
+									farcall SetGiftPartyMonCaughtData
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_NICK
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld de, wOTTrademonNickname
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMonNicknames
-												PARTY_LENGTH; MON_NAME; sgb_border.bin

											
										
										
											2018-01-20 09:25:55 -08:00
+									ld bc, MON_NAME_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfLastPartymon
 									ld hl, wOTTrademonNickname
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_OT_NAME
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									push hl
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld de, wOTTrademonOTName
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									pop hl
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld de, wOTTrademonSenderName
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMonOT
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, NAME_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfLastPartymon
 									ld hl, wOTTrademonOTName
 									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_DVS
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld de, wOTTrademonDVs
 									call Trade_CopyTwoBytes
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMon1DVs
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, PARTYMON_STRUCT_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfLastPartymon
 									ld hl, wOTTrademonDVs
 									call Trade_CopyTwoBytes
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_OT_ID
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld de, wOTTrademonID + 1
 									call Trade_CopyTwoBytesReverseEndian
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMon1ID
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, PARTYMON_STRUCT_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfLastPartymon
 									ld hl, wOTTrademonID
 									call Trade_CopyTwoBytes
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_ITEM
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									push hl
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wPartyMon1Item
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, PARTYMON_STRUCT_LENGTH
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call Trade_GetAttributeOfLastPartymon
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									pop hl
 									ld a, [hl]
 									ld [de], a
 									push af
 									push bc
 									push de
 									push hl
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld a, [wCurPartyMon]
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									push af
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld a, [wPartyCount]
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									dec a
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld [wCurPartyMon], a
-												callba/callab → farcall/callfar

											
										
										
											2017-12-24 09:47:30 -08:00
+									farcall ComputeNPCTrademonStats
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									pop af
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld [wCurPartyMon], a
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									pop hl
 									pop de
 									pop bc
 									pop af
 									ret
-												Remove even more address comments

That should be all of them this time

											
										
										
											2018-06-24 17:10:37 -07:00
+								GetTradeAttribute:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld d, 0
 									push de
 									ld a, [wJumptableIndex]
 									and $f
 									swap a
 									ld e, a
 									ld d, 0
 									ld hl, NPCTrades
 									add hl, de
-												More splitting of main.asm; remove unneeded rept 2

											
										
										
											2016-05-04 08:46:23 -07:00
+									add hl, de
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									pop de
 									add hl, de
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								Trade_GetAttributeOfCurrentPartymon:
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld a, [wCurPartyMon]
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call AddNTimes
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								Trade_GetAttributeOfLastPartymon:
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld a, [wPartyCount]
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									dec a
 									call AddNTimes
 									ld e, l
 									ld d, h
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								GetTradeMonName:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									push de
-												Add meaningful aliases for wd265
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants

											
										
										
											2018-07-28 16:27:34 -07:00
+									ld [wNamedObjectIndexBuffer], a
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetBasePokemonName
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wStringBuffer1
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									pop de
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								CopyTradeName:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, NAME_LENGTH
 									call CopyBytes
 									ret
-												Replace "Unreferenced" labels with "; unreferenced" comments

											
										
										
											2020-06-21 13:27:43 -07:00
+								Functionfcdfb: ; unreferenced
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, 4
 									call CopyBytes
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld a, "@"
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld [de], a
 									ret
-												Replace "Unreferenced" labels with "; unreferenced" comments

											
										
										
											2020-06-21 13:27:43 -07:00
+								Functionfce05: ; unreferenced
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld bc, 3
 									call CopyBytes
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									ld a, "@"
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld [de], a
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								Trade_CopyTwoBytes:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, [hli]
 									ld [de], a
 									inc de
 									ld a, [hl]
 									ld [de], a
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								Trade_CopyTwoBytesReverseEndian:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, [hli]
 									ld [de], a
 									dec de
 									ld a, [hl]
 									ld [de], a
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								GetTradeMonNames:
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_GETMON
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call GetTradeMonName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld de, wStringBuffer2
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_GIVEMON
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call GetTradeMonName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Events and some WRAM cleanup

											
										
										
											2015-12-18 17:07:09 -08:00
+									ld de, wMonOrItemNameBuffer
-												trade animation

											
										
										
											2015-11-22 21:21:21 -08:00
+									call CopyTradeName
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Prefix wram labels with w, part 2.

											
										
										
											2018-01-23 14:39:09 -08:00
+									ld hl, wStringBuffer1
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+								.loop
 									ld a, [hli]
 									cp "@"
 									jr nz, .loop
 									dec hl
 									push hl
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									ld e, NPCTRADE_GENDER
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									call GetTradeAttribute
 									ld a, [hl]
 									pop hl
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									and a ; TRADE_GENDER_EITHER
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ret z
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									cp TRADE_GENDER_MALE
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, "♂"
 									jr z, .done
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+									; TRADE_GENDER_FEMALE
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, "♀"
 								.done
 									ld [hli], a
 									ld [hl], "@"
 									ret
-												Move event data to data/events/

											
										
										
											2018-01-25 19:19:24 -08:00
+								INCLUDE "data/events/npc_trades.asm"
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								PrintTradeText:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									push af
 									call GetTradeMonNames
 									pop af
 									ld bc, 2 * 4
 									ld hl, TradeTexts
 									call AddNTimes
 									ld a, [wcf64]
 									ld c, a
 									add hl, bc
-												More splitting of main.asm; remove unneeded rept 2

											
										
										
											2016-05-04 08:46:23 -07:00
+									add hl, bc
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld a, [hli]
 									ld h, [hl]
 									ld l, a
 									call PrintText
 									ret
-												Remove all address comments

											
										
										
											2018-06-24 07:09:41 -07:00
+								TradeTexts:
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+								; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants
 								; TRADE_DIALOG_INTRO
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+									dw NPCTradeIntroText1
 									dw NPCTradeIntroText2
 									dw NPCTradeIntroText2
 									dw NPCTradeIntroText3
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+								; TRADE_DIALOG_CANCEL
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+									dw NPCTradeCancelText1
 									dw NPCTradeCancelText2
 									dw NPCTradeCancelText2
 									dw NPCTradeCancelText3
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+								; TRADE_DIALOG_WRONG
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+									dw NPCTradeWrongText1
 									dw NPCTradeWrongText2
 									dw NPCTradeWrongText2
 									dw NPCTradeWrongText3
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+								; TRADE_DIALOG_COMPLETE
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+									dw NPCTradeCompleteText1
 									dw NPCTradeCompleteText2
 									dw NPCTradeCompleteText4
 									dw NPCTradeCompleteText3
-												NPC trade constants don't all just start with TRADE_

											
										
										
											2018-01-31 18:16:57 -08:00
+								; TRADE_DIALOG_AFTER
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+									dw NPCTradeAfterText1
 									dw NPCTradeAfterText2
 									dw NPCTradeAfterText4
 									dw NPCTradeAfterText3
 								NPCTradeCableText:
 									text_far _NPCTradeCableText
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												Remove even more address comments

That should be all of them this time

											
										
										
											2018-06-24 17:10:37 -07:00
+								TradedForText:
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									; traded givemon for getmon
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+									text_far Text_NPCTraded
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_asm
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
+									ld de, MUSIC_NONE
 									call PlayMusic
 									call DelayFrame
 									ld hl, .done
 									ret
 								.done
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+									text_far _NPCTradeFanfareText
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeIntroText1:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeIntroText1
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeCancelText1:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeCancelText1
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeWrongText1:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeWrongText1
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeCompleteText1:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeCompleteText1
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeAfterText1:
 									text_far _NPCTradeAfterText1
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeIntroText2:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeIntroText2
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeCancelText2:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeCancelText2
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeWrongText2:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeWrongText2
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeCompleteText2:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeCompleteText2
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeAfterText2:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeAfterText2
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeIntroText3:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeIntroText3
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeCancelText3:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeCancelText3
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeWrongText3:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeWrongText3
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeCompleteText3:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeCompleteText3
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeAfterText3:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeAfterText3
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeCompleteText4:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeCompleteText4
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end
-												main.asm is now under 30k lines

											
										
										
											2015-11-19 15:07:20 -08:00
-												#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
											
										
										
											2019-10-20 15:24:17 -07:00
+								NPCTradeAfterText4:
-												common_1 text documentation

Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops

											
										
										
											2019-03-10 17:43:34 -07:00
+									text_far _NPCTradeAfterText4
-												Resolve issue #575: Rename text commands

											
										
										
											2018-11-17 10:33:03 -08:00
+									text_end