Citrine Pokecenter, trade refactoring

I am tired of doing the Legendary wing event, so I'm populating Citrine City.

Some notes;
- I refactored the In-Game Trades to match their nicknames and re-distributed them.
- I swapped Fuschia's bench guy for the third unused one meant for the safe house, but I may outright restore these.
- I refactored the Pokecenter Hidden Objects to all use the same set - they're clones of each other, so this works out. This saves a TON of bytes and works fine.
- I placed the Harry trade for Kadabra/Alakazam in Citrine Pokecenter as it feels right for such a powerful Pokemon to be post-game.
This commit is contained in:
Llinos Evans 2023-04-28 00:48:09 +01:00
parent ba78014ec6
commit d5708ef12e
25 changed files with 146 additions and 78 deletions

View file

@ -101,7 +101,7 @@ Lab4Text_75dd5:
Lab4Text2:
text_asm
ld a, TRADE_FOR_SAILOR
ld a, TRADE_FOR_JIMBO
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -13,7 +13,7 @@ Lab2Text1:
Lab2Text2:
text_asm
ld a, TRADE_FOR_DORIS
ld a, TRADE_FOR_JENNY
ld [wWhichTrade], a
jr Lab2DoTrade

View file

@ -0,0 +1,37 @@
CitrinePokecenter_Script:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
CitrinePokecenter_TextPointers:
dw CitrineHealNurseText
dw CitrinePokecenterText2
dw CitrinePokecenterText3
dw CitrineTradeNurseText
dw KadabraTrade
dw CitrinePokeCenterText4
CitrineTradeNurseText:
script_cable_club_receptionist
CitrineHealNurseText:
script_pokecenter_nurse
CitrinePokecenterText2:
text_far _CitrinePokecenterText2
text_end
CitrinePokecenterText3:
text_far _CitrinePokecenterText3
text_end
KadabraTrade:
text_asm
ld a, TRADE_FOR_HARRY
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
CitrinePokeCenterText4:
text_asm
callfar PokecenterChanseyText
jp TextScriptEnd

View file

@ -8,7 +8,7 @@ Route18Gate2F_TextPointers:
Route18GateUpstairsText1:
text_asm
ld a, TRADE_FOR_MARC
ld a, TRADE_FOR_JIMBO
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

View file

@ -11,7 +11,7 @@ UndergroundPathRoute5_TextPointers:
UndergroundPathEntranceRoute5Text1:
text_asm
ld a, TRADE_FOR_SPOT
ld a, TRADE_FOR_RICKY
ld [wWhichTrade], a
predef DoInGameTradeDialogue
ld hl, UndergroundPathEntranceRoute5_TextScriptEndingText