thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved some trades

Browse source 
That's my last commit for tonight, I swear!
This commit is contained in:
Martha Schilling 2024-01-07 01:50:02 +00:00
parent a25f681875
commit 6434c918f0
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/events/trades.asm
View file

@ -8,8 +8,8 @@ TradeMons:
db RAICHU, KADABRA, TRADE_DIALOGSET_EVOLUTION, "HARRY@@@@@@" ; Citrine City, new trade to complete the 4 main trade evos db RAICHU, KADABRA, TRADE_DIALOGSET_EVOLUTION, "HARRY@@@@@@" ; Citrine City, new trade to complete the 4 main trade evos
db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" ; Vermilion City db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" ; Vermilion City
db PERSIAN, TAUROS, TRADE_DIALOGSET_CASUAL, "JIMBO@@@@@@" ; Route 17-18 gate, from JP Blue db PERSIAN, TAUROS, TRADE_DIALOGSET_CASUAL, "JIMBO@@@@@@" ; Route 17-18 gate, from JP Blue
db MACHOKE, HAUNTER, TRADE_DIALOGSET_EVOLUTION, "MICHELLE@@@" ; Cinnabar Lab, from JP Blue db MACHOKE, HAUNTER, TRADE_DIALOGSET_EVOLUTION, "MICHELLE@@@" ; Route 11 Gate, from JP Blue
db KADABRA, GRAVELER, TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; Cinnabar Lab, from JP Blue (probably going to move these since you get the Trader here anyway...) db KADABRA, GRAVELER, TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; Route 10 Gate
db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; Route 5-6 Underground Path, from Yellow db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; Route 5-6 Underground Path, from Yellow
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; The Trader db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; The 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
@ -29,9 +29,9 @@ TradeMons:
db SLOWBRO, SLOWBRO_G, TRADE_DIALOGSET_REGION, "SLOWBRO@@@@" db SLOWBRO, SLOWBRO_G, TRADE_DIALOGSET_REGION, "SLOWBRO@@@@"
db SLOWKING, SLOWKING_G, TRADE_DIALOGSET_REGION, "SLOWKING@@@" db SLOWKING, SLOWKING_G, TRADE_DIALOGSET_REGION, "SLOWKING@@@"
db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING@@@@" db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING@@@@"
db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "CHURCHILL@@" ; Winston Churchill, notable "city gent" db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "MR.RIME@@@@"
db PERSIAN, PERRSERKER, TRADE_DIALOGSET_HAPPY, "ERIK@@@@@@@" ; One of the most famous vikings db PERSIAN, PERRSERKER, TRADE_DIALOGSET_HAPPY, "PERRSERKER@"
db LUXWAN, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "LANCELOT@@@" ; Influential knight of the round table db LUXWAN, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "SIRFETCH'D@"
db ARCANINE, ARCANINE_H, TRADE_DIALOGSET_BILL, "ARCANINE@@@" db ARCANINE, ARCANINE_H, TRADE_DIALOGSET_BILL, "ARCANINE@@@"
db ELECTRODE, ELECTRODE_H, TRADE_DIALOGSET_GRAMPS, "ELECTRODE@@" db ELECTRODE, ELECTRODE_H, TRADE_DIALOGSET_GRAMPS, "ELECTRODE@@"
assert_table_length NUM_NPC_TRADES assert_table_length NUM_NPC_TRADES

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

@ -9,6 +9,5 @@ CinnabarLabFossilRoom_Object:
def_object_events def_object_events
object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person
def_warps_to CINNABAR_LAB_FOSSIL_ROOM def_warps_to CINNABAR_LAB_FOSSIL_ROOM

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

@ -12,5 +12,6 @@ ViridianForestNorthGate_Object:
def_object_events def_object_events
object_event 3, 2, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person object_event 3, 2, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, 2 ; person object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, 2 ; person
object_event 7, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person
def_warps_to VIRIDIAN_FOREST_NORTH_GATE def_warps_to VIRIDIAN_FOREST_NORTH_GATE

BIN
gfx/blocksets/fossillab.bst
View file

Binary file not shown.

8
scripts/CinnabarLabFossilRoom.asm
View file

@ -3,7 +3,6 @@ CinnabarLabFossilRoom_Script:
CinnabarLabFossilRoom_TextPointers: CinnabarLabFossilRoom_TextPointers:
dw Lab4Text1 dw Lab4Text1
dw Lab4Text2
Lab4Script_GetFossilsInBag: Lab4Script_GetFossilsInBag:
; construct a list of all fossils in the player's bag ; construct a list of all fossils in the player's bag
@ -99,12 +98,5 @@ Lab4Text_75dd5:
text_far _Lab4Text_75dd5 text_far _Lab4Text_75dd5
text_end text_end
Lab4Text2:
text_asm
ld a, TRADE_FOR_MICHELLE
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
LoadFossilItemAndMonNameBank1D: LoadFossilItemAndMonNameBank1D:
farjp LoadFossilItemAndMonName farjp LoadFossilItemAndMonName

2
scripts/Route11Gate2F.asm
View file

@ -9,7 +9,7 @@ Route11Gate2F_TextPointers:
Route11GateUpstairsText1: Route11GateUpstairsText1:
text_asm text_asm
ld a, TRADE_FOR_CHIKUCHIKU ld a, TRADE_FOR_MICHELLE
ld [wWhichTrade], a ld [wWhichTrade], a
predef DoInGameTradeDialogue predef DoInGameTradeDialogue
Route11GateUpstairsScriptEnd: Route11GateUpstairsScriptEnd:

8
scripts/ViridianForestNorthGate.asm
View file

@ -4,6 +4,7 @@ ViridianForestNorthGate_Script:
ViridianForestNorthGate_TextPointers: ViridianForestNorthGate_TextPointers:
dw ViridianForestExitText1 dw ViridianForestExitText1
dw ViridianForestExitText2 dw ViridianForestExitText2
dw ViridianForestExitText3
ViridianForestExitText1: ViridianForestExitText1:
text_far _ViridianForestExitText1 text_far _ViridianForestExitText1
@ -12,3 +13,10 @@ ViridianForestExitText1:
ViridianForestExitText2: ViridianForestExitText2:
text_far _ViridianForestExitText2 text_far _ViridianForestExitText2
text_end text_end
ViridianForestExitText3:
text_asm
ld a, TRADE_FOR_CHIKUCHIKU
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd