Regional Trades!

- Regional trades now dummy out the "-A" thing etc so they look nice
- Added Celadon, Saffron, Viridian, and Vermillion regional trades
- Added Galarian Sidegrade trades to the S. S. Anne, but Perrserker and Sirfetch'd specifically don't work. I have zero clue why, as they work the same as the rest.
- Corrected grammar in the "Happy" text when you finish a trade
This commit is contained in:
Llinos Evans 2023-04-08 01:05:15 +01:00
parent 24602dc972
commit ed1ced807b
20 changed files with 98 additions and 33 deletions

View file

@ -7,6 +7,7 @@ CeladonPokecenter_TextPointers:
dw CeladonPokecenterText2
dw CeladonPokecenterText3
dw CeladonTradeNurseText
dw SandslashTrade
CeladonTradeNurseText:
script_cable_club_receptionist
@ -21,3 +22,10 @@ CeladonPokecenterText2:
CeladonPokecenterText3:
text_far _CeladonPokecenterText3
text_end
SandslashTrade:
text_asm
ld a, TRADE_FOR_SANDSLASH_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -24,6 +24,7 @@ SSAnne1FRooms_TextPointers:
dw SSAnne8Text9
dw PickUpItemText
dw SSAnne8Text11
dw PerrserkerTrade
SSAnne8TrainerHeaders:
def_trainers
@ -135,3 +136,10 @@ SSAnne8Text9:
SSAnne8Text11:
text_far _SSAnne8Text11
text_end
PerrserkerTrade:
text_asm
ld a, TRADE_FOR_PERRSERKER
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -29,6 +29,7 @@ SSAnne2FRooms_TextPointers:
dw SSAnne9Text11
dw SSAnne9Text12
dw SSAnne9Text13
dw SirfetchdTrade
SSAnne9TrainerHeaders:
def_trainers
@ -187,3 +188,10 @@ SSAnne9EndBattleText4:
SSAnne9AfterBattleText4:
text_far _SSAnne9AfterBattleText4
text_end
SirfetchdTrade:
text_asm
ld a, TRADE_FOR_SIRFETCHD
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -24,6 +24,7 @@ SSAnneB1FRooms_TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw MrRimeTrade
SSAnne10TrainerHeaders:
def_trainers
@ -159,3 +160,10 @@ SSAnne10AfterBattleText6:
SSAnne10Text7:
text_far _SSAnne10Text7
text_end
MrRimeTrade:
text_asm
ld a, TRADE_FOR_MR_RIME
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -7,6 +7,7 @@ SaffronPokecenter_TextPointers:
dw SaffronPokecenterText2
dw SaffronPokecenterText3
dw SaffronTradeNurseText
dw RaichuTrade
SaffronHealNurseText:
script_pokecenter_nurse
@ -21,3 +22,10 @@ SaffronPokecenterText3:
SaffronTradeNurseText:
script_cable_club_receptionist
RaichuTrade:
text_asm
ld a, TRADE_FOR_RAICHU_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -7,6 +7,7 @@ VermilionPokecenter_TextPointers:
dw VermilionPokecenterText2
dw VermilionPokecenterText3
dw VermilionTradeNurseText
dw PersianTrade
VermilionHealNurseText:
script_pokecenter_nurse
@ -21,3 +22,10 @@ VermilionPokecenterText3:
VermilionTradeNurseText:
script_cable_club_receptionist
PersianTrade:
text_asm
ld a, TRADE_FOR_PERSIAN_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -7,6 +7,7 @@ ViridianPokecenter_TextPointers:
dw ViridianPokeCenterText2
dw ViridianPokeCenterText3
dw ViridianTradeNurseText
dw RaticateTrade
ViridianHealNurseText:
script_pokecenter_nurse
@ -21,3 +22,10 @@ ViridianPokeCenterText3:
ViridianTradeNurseText:
script_cable_club_receptionist
RaticateTrade:
text_asm
ld a, TRADE_FOR_RATICATE_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd