Add regional trades, break trade limit

All over the place! S.S. Anne doesn't work properly though.

Thanks to Chatot4444 for bypassing the trade limit.
This commit is contained in:
Llinos Evans 2023-04-09 18:56:19 +01:00
parent 56793e1d11
commit 77fd55ea49
20 changed files with 265 additions and 42 deletions

View file

@ -22,11 +22,11 @@ SetIshiharaTeam:
IshiharaTeam:
db EXEGGUTOR_A, 90
db RAICHU, 90
db MEWTWO, 90
db PORYGON, 50
db TAUROS, 90
db SLOWKING, 90
db RAPIDASH, 50
IF DEF(_DEBUG)
db NINETALES, 50
db MUK, 50
ENDC
db -1 ; end

View file

@ -3,13 +3,9 @@ DoInGameTradeDialogue:
call SaveScreenTilesToBuffer2
ld hl, TradeMons
ld a, [wWhichTrade]
ld b, a
swap a
sub b
sub b
ld c, a
ld b, 0
add hl, bc
ld c, 3 + NAME_LENGTH ; new code from Chatot4444, this bypasses the 16-limit on in-game trades.
call AddNTimes ; Also from chatot4444
ld a, [hli]
ld [wInGameTradeGiveMonSpecies], a
ld a, [hli]
@ -277,6 +273,9 @@ InGameTradeTextPointers:
dw TradeTextPointers3
dw TradeTextPointers4
dw TradeTextPointers5
dw TradeTextPointers6 ; Combat Tauros
dw TradeTextPointers7 ; Aqua Tauros
dw TradeTextPointers8 ; Blaze Tauros
TradeTextPointers1:
dw WannaTrade1Text
@ -313,6 +312,27 @@ TradeTextPointers5:
dw Thanks1Text
dw AfterTrade1Text
TradeTextPointers6: ; Combat Tauros
dw WannaTrade6Text
dw NoTrade1Text
dw WrongMon6Text
dw Thanks6Text
dw AfterTrade6Text
TradeTextPointers7: ; Aqua Tauros
dw WannaTrade7Text
dw NoTrade1Text
dw WrongMon7Text
dw Thanks6Text
dw AfterTrade7Text
TradeTextPointers8: ; Aqua Tauros
dw WannaTrade8Text
dw NoTrade1Text
dw WrongMon8Text
dw Thanks6Text
dw AfterTrade8Text
ConnectCableText:
text_far _ConnectCableText
text_end
@ -401,4 +421,44 @@ WannaTrade5Text:
NoTrade5Text:
text_far _NoTrade5Text
text_end
text_end
WannaTrade6Text:
text_far _WannaTrade6Text
text_end
WrongMon6Text:
text_far _WrongMon6Text
text_end
Thanks6Text:
text_far _Thanks6Text
text_end
AfterTrade6Text:
text_far _AfterTrade6Text
text_end
WannaTrade7Text:
text_far _WannaTrade7Text
text_end
WrongMon7Text:
text_far _WrongMon7Text
text_end
AfterTrade7Text:
text_far _AfterTrade7Text
text_end
WannaTrade8Text:
text_far _WannaTrade8Text
text_end
WrongMon8Text:
text_far _WrongMon8Text
text_end
AfterTrade8Text:
text_far _AfterTrade8Text
text_end

View file

@ -106,7 +106,7 @@ ItemUsePtrTable:
dw ItemUseEvoStone ; BLK_AUGURITE
dw ItemUseEvoStone ; DUBIOUS_DISC
dw UnusableItem ; CITRINE_PASS
dw UnusableItem ; OLDSEACHART
dw UnusableItem ; OLD_SEA_MAP
dw ItemUseEvoStone ; UP_GRADE
dw UnusableItem ; FLOOR_B2F
dw UnusableItem ; FLOOR_B1F