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

@ -8,6 +8,7 @@ CinnabarPokecenter_TextPointers:
dw CinnabarPokecenterText3
dw CinnabarTradeNurseText
dw PoryZSalesmanText
dw MukTrade
CinnabarHealNurseText:
script_pokecenter_nurse
@ -90,4 +91,11 @@ PoryZSalesmanText:
PoryZBagFull:
text_far _PoryZBagFull
text_end
text_end
MukTrade:
text_asm
ld a, TRADE_FOR_MUK_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -25,6 +25,7 @@ SSAnne1FRooms_TextPointers:
dw PickUpItemText
dw SSAnne8Text11
dw PerrserkerTrade
dw WeezingTrade
SSAnne8TrainerHeaders:
def_trainers
@ -143,3 +144,10 @@ PerrserkerTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
WeezingTrade:
text_asm
ld a, TRADE_FOR_WEEZING_G
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -30,6 +30,8 @@ SSAnne2FRooms_TextPointers:
dw SSAnne9Text12
dw SSAnne9Text13
dw SirfetchdTrade
dw MrRimeTrade
dw RapidashTrade
SSAnne9TrainerHeaders:
def_trainers
@ -195,3 +197,17 @@ SirfetchdTrade:
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
MrRimeTrade:
text_asm
ld a, TRADE_FOR_MR_RIME
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
RapidashTrade:
text_asm
ld a, TRADE_FOR_RAPIDASH_G
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -24,7 +24,9 @@ SSAnneB1FRooms_TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw MrRimeTrade
dw TaurosCTrade
dw TaurosATrade
dw TaurosBTrade
SSAnne10TrainerHeaders:
def_trainers
@ -161,9 +163,23 @@ SSAnne10Text7:
text_far _SSAnne10Text7
text_end
MrRimeTrade:
TaurosCTrade:
text_asm
ld a, TRADE_FOR_MR_RIME
ld a, TRADE_FOR_TAUROS_C
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
TaurosATrade:
text_asm
ld a, TRADE_FOR_TAUROS_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
TaurosBTrade:
text_asm
ld a, TRADE_FOR_TAUROS_B
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -18,7 +18,8 @@ SSAnneBow_TextPointers:
dw SSAnne5Text3
dw SSAnne5Text4
dw SSAnne5Text5
dw RapidashTrade
dw SlowkingTrade
dw SlowbroTrade
SSAnne5TrainerHeaders:
def_trainers 4
@ -76,9 +77,16 @@ SSAnne5AfterBattleText2:
text_far _SSAnne5AfterBattleText2
text_end
RapidashTrade:
SlowbroTrade:
text_asm
ld a, TRADE_FOR_RAPIDASH_G
ld a, TRADE_FOR_SLOWBRO_G
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
SlowkingTrade:
text_asm
ld a, TRADE_FOR_SLOWKING_G
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -221,7 +221,6 @@ VermilionDock_EraseSSAnne:
VermilionDock_TextPointers:
dw VermilionDockText1
dw PickUpItemText
;dw VermilionDockText2
VermilionDockText1:
text_far _VermilionDockText1