thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 00:56:40 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Regional trades for new forms

Browse source 
Sandslash and Raichu stopped working - hypothesis is correct.
This commit is contained in:
Llinos Evans 2023-04-08 23:37:36 +01:00
parent 4baf396498
commit b0d17719db
8 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/script_constants.asm
View file

@ -33,9 +33,9 @@ DEF SLOTS_SOMEONESKEYS EQU $ff
const TRADE_WITH_SELF ; Celadon University const TRADE_WITH_SELF ; Celadon University
const TRADE_FOR_RATICATE_A ; LGPE Trade references - Viridian const TRADE_FOR_RATICATE_A ; LGPE Trade references - Viridian
const TRADE_FOR_GOLEM_A ; Pewter const TRADE_FOR_GOLEM_A ; Pewter
;const TRADE_FOR_NINETALES_A ; Cerulean const TRADE_FOR_NINETALES_A ; Cerulean
const TRADE_FOR_PERSIAN_A ; Vermillion const TRADE_FOR_PERSIAN_A ; Vermillion
;const TRADE_FOR_DUGTRIO_A ; Lavender const TRADE_FOR_DUGTRIO_A ; Lavender
const TRADE_FOR_SANDSLASH_A ; Celadon const TRADE_FOR_SANDSLASH_A ; Celadon
const TRADE_FOR_RAICHU_A ; Saffron const TRADE_FOR_RAICHU_A ; Saffron
const TRADE_FOR_MAROWAK_A ; Fuschia const TRADE_FOR_MAROWAK_A ; Fuschia

4
data/events/trades.asm
View file

@ -15,9 +15,9 @@ TradeMons:
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader
db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE@@@" ; Viridian - LGPE trades begin here db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE@@@" ; Viridian - LGPE trades begin here
db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM@@@@@@" ; Pewter db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM@@@@@@" ; Pewter
;db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES@@" ; Cerulean db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES@@" ; Cerulean
db PERSIAN, PERSIAN_A, TRADE_DIALOGSET_REGION, "PERSIAN@@@@" ; Vermillion db PERSIAN, PERSIAN_A, TRADE_DIALOGSET_REGION, "PERSIAN@@@@" ; Vermillion
;db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO@@@@" ; Lavender db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO@@@@" ; Lavender
db SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH@@" ; Celadon db SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH@@" ; Celadon
db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron
db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia

1
data/maps/objects/CeruleanPokecenter.asm
View file

@ -12,5 +12,6 @@ CeruleanPokecenter_Object:
object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader
def_warps_to CERULEAN_POKECENTER def_warps_to CERULEAN_POKECENTER

1
data/maps/objects/LavenderPokecenter.asm
View file

@ -12,5 +12,6 @@ LavenderPokecenter_Object:
object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader
def_warps_to LAVENDER_POKECENTER def_warps_to LAVENDER_POKECENTER

4
engine/debug/debug_party.asm
View file

@ -26,8 +26,8 @@ IshiharaTeam:
db EXEGGUTOR, 90 db EXEGGUTOR, 90
db RAPIDASH, 50 db RAPIDASH, 50
IF DEF(_DEBUG) IF DEF(_DEBUG)
db GOLEM, 50 db NINETALES, 50
db MAROWAK, 50 db DUGTRIO, 50
ENDC ENDC
db -1 ; end db -1 ; end

1
engine/events/in_game_trades.asm
View file

@ -277,7 +277,6 @@ InGameTradeTextPointers:
dw TradeTextPointers3 dw TradeTextPointers3
dw TradeTextPointers4 dw TradeTextPointers4
dw TradeTextPointers5 dw TradeTextPointers5
dw TradeTextPointers6
TradeTextPointers1: TradeTextPointers1:
dw WannaTrade1Text dw WannaTrade1Text

9
scripts/CeruleanPokecenter.asm
View file

@ -7,6 +7,7 @@ CeruleanPokecenter_TextPointers:
dw CeruleanPokecenterText2 dw CeruleanPokecenterText2
dw CeruleanPokecenterText3 dw CeruleanPokecenterText3
dw CeruleanTradeNurseText dw CeruleanTradeNurseText
dw NinetalesTrade
CeruleanTradeNurseText: CeruleanTradeNurseText:
script_cable_club_receptionist script_cable_club_receptionist
@ -21,3 +22,11 @@ CeruleanPokecenterText2:
CeruleanPokecenterText3: CeruleanPokecenterText3:
text_far _CeruleanPokecenterText3 text_far _CeruleanPokecenterText3
text_end text_end
NinetalesTrade:
text_asm
ld a, TRADE_FOR_NINETALES_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

9
scripts/LavenderPokecenter.asm
View file

@ -7,6 +7,7 @@ LavenderPokecenter_TextPointers:
dw LavenderPokecenterText2 dw LavenderPokecenterText2
dw LavenderPokecenterText3 dw LavenderPokecenterText3
dw LavenderTradeNurseText dw LavenderTradeNurseText
dw DugtrioTrade
LavenderTradeNurseText: LavenderTradeNurseText:
script_cable_club_receptionist script_cable_club_receptionist
@ -21,3 +22,11 @@ LavenderPokecenterText2:
LavenderPokecenterText3: LavenderPokecenterText3:
text_far _LavenderPokecenterText3 text_far _LavenderPokecenterText3
text_end text_end
DugtrioTrade:
text_asm
ld a, TRADE_FOR_DUGTRIO_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd