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

Regional Trades!

Browse source 
- 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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
constants/script_constants.asm
View file

@ -31,13 +31,13 @@ DEF SLOTS_SOMEONESKEYS EQU $ff
const TRADE_FOR_CRINKLES
const TRADE_FOR_SPOT ; probably also glass
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_NINETALES_A ; Cerulean
;const TRADE_FOR_PERSIAN_A ; Vermillion
const TRADE_FOR_PERSIAN_A ; Vermillion
;const TRADE_FOR_DUGTRIO_A ; Lavender
;const TRADE_FOR_SANDSLASH_A ; Celadon
;const TRADE_FOR_RAICHU_A ; Saffron
const TRADE_FOR_SANDSLASH_A ; Celadon
const TRADE_FOR_RAICHU_A ; Saffron
;const TRADE_FOR_MAROWAK_A ; Fuschia
;const TRADE_FOR_MUK_A ; Cinnabar
;const TRADE_FOR_EXEGGUTOR_A ; Indigo

38
data/events/trades.asm
View file

@ -13,24 +13,24 @@ TradeMons:
db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES@@@"
db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; From Yellow
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader
;db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE-A@" ; Viridian - LGPE trades begin here
;db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM-A@@@@" ; Pewter
;db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES-A" ; Cerulean
;db PERSIAN, PERSIAN_A, TRADE_DIALOGSET_REGION, "PERSIAN-A@@" ; Vermillion
;db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO-A@@" ; Lavender
;db SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH-A" ; Celadon
;db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU-A@@@" ; Saffron
;db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK-A@@" ; Fuschia
db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE@@@" ; Viridian - LGPE trades begin here
;db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM@@@@@@" ; Pewter
;db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES@@" ; Cerulean
db PERSIAN, PERSIAN_A, TRADE_DIALOGSET_REGION, "PERSIAN@@@@" ; Vermillion
;db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO@@@@" ; Lavender
db SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH@@" ; Celadon
db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron
;db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia
;db MUK, MUK_A, TRADE_DIALOGSET_REGION, "MUK-A@@@@@@" ; Cinnabar
;db EXEGGUTOR, EXEGGUTOR_A, TRADE_DIALOGSET_REGION, "EXEGGUTOR-A" ; Indigo
;db TAUROS, TAUROS_C, TRADE_DIALOGSET_REGION, "TAUROS_C@@@" ; S.S. Anne begins here
;db TAUROS, TAUROS_A, TRADE_DIALOGSET_REGION, "TAUROS_A@@@"
;db TAUROS, TAUROS_B, TRADE_DIALOGSET_REGION, "TAUROS_B@@@"
;db RAPIDASH, RAPIDASH_G, TRADE_DIALOGSET_REGION, "RAPIDASH-G@"
;db SLOWBRO, SLOWBRO_G, TRADE_DIALOGSET_REGION, "SLOWBRO-G@@"
;db SLOWKING, SLOWKING_G, TRADE_DIALOGSET_REGION, "SLOWKING-G@"
;db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING-G@@"
db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "MR. RIME@@@"
db PERSIAN, PERRSERKER, TRADE_DIALOGSET_CASUAL, "PERRSERKER@"
db MADAAMU, SIRFETCHD, TRADE_DIALOGSET_CASUAL, "SIRFETCH'D@"
;db EXEGGUTOR, EXEGGUTOR_A, TRADE_DIALOGSET_REGION, "EXEGGUTOR@@" ; Indigo
;db TAUROS, TAUROS_C, TRADE_DIALOGSET_REGION, "TAUROS@@@@@" ; S.S. Anne begins here
;db TAUROS, TAUROS_A, TRADE_DIALOGSET_REGION, "TAUROS@@@@@"
;db TAUROS, TAUROS_B, TRADE_DIALOGSET_REGION, "TAUROS@@@@@"
;db RAPIDASH, RAPIDASH_G, TRADE_DIALOGSET_REGION, "RAPIDASH@@@"
;db SLOWBRO, SLOWBRO_G, TRADE_DIALOGSET_REGION, "SLOWBRO@@@@"
;db SLOWKING, SLOWKING_G, TRADE_DIALOGSET_REGION, "SLOWKING@@@"
;db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING@@@@"
db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "MR.RIME@@@@"
db PERSIAN, PERRSERKER, TRADE_DIALOGSET_HAPPY, "PERRSERKER@"
db MADAAMU, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "SIRFETCH'D@"
assert_table_length NUM_NPC_TRADES

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

@ -12,5 +12,6 @@ CeladonPokecenter_Object:
object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader
def_warps_to CELADON_POKECENTER

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

@ -23,5 +23,6 @@ SSAnne1FRooms_Object:
object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person
object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM
object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person
object_event 0, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader
def_warps_to SS_ANNE_1F_ROOMS

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

@ -31,5 +31,6 @@ SSAnne2FRooms_Object:
object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, 11 ; person
object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 12 ; person
object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, 13 ; person
object_event 0, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 14 ; Sirfetch'd Trader
def_warps_to SS_ANNE_2F_ROOMS

3
data/maps/objects/SSAnneB1FRooms.asm
View file

@ -16,7 +16,7 @@ SSAnneB1FRooms_Object:
def_bg_events
def_object_events
object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
object_event 1, 12, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4
object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5
object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6
@ -27,5 +27,6 @@ SSAnneB1FRooms_Object:
object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
object_event 0, 13, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Mr. Rime Trader
def_warps_to SS_ANNE_B1F_ROOMS

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

@ -12,5 +12,6 @@ SaffronPokecenter_Object:
object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, 2 ; person
object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Raichu Trader
def_warps_to SAFFRON_POKECENTER

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

@ -12,5 +12,6 @@ VermilionPokecenter_Object:
object_event 10, 5, SPRITE_FISHING_GURU, STAY, NONE, 2 ; person
object_event 5, 4, SPRITE_SAILOR, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Persian Trader
def_warps_to VERMILION_POKECENTER

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

@ -12,5 +12,6 @@ ViridianPokecenter_Object:
object_event 10, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 2 ; person
object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Raticate Trader
def_warps_to VIRIDIAN_POKECENTER

6
data/text/text_7.asm
View file

@ -96,7 +96,7 @@ _WrongMon1Text::
done
_Thanks1Text::
text "Hey thanks!"
text "Hey, thanks!"
done
_AfterTrade1Text::
@ -220,8 +220,8 @@ _Thanks4Text::
_WannaTrade5Text::
text "In my region, we"
line "have our own"
para "@"
text_ram wInGameTradeReceiveMonName
cont "@"
text_ram wInGameTradeGiveMonName
text "!"
para "Want to trade me"

9
engine/debug/debug_party.asm
View file

@ -22,11 +22,12 @@ SetIshiharaTeam:
IshiharaTeam:
db EXEGGUTOR, 90
db SANDSLASH_A, 90
db RATICATE_A, 90
db PERSIAN_A, 50
db RAICHU, 90
db RATICATE, 90
db PERSIAN, 50
IF DEF(_DEBUG)
db RAICHU_A, 50
db MR_MIME, 50
db MADAAMU, 50
ENDC
db -1 ; end

5
engine/events/in_game_trades.asm
View file

@ -276,6 +276,7 @@ InGameTradeTextPointers:
dw TradeTextPointers2
dw TradeTextPointers3
dw TradeTextPointers4
dw TradeTextPointers5
TradeTextPointers1:
dw WannaTrade1Text
@ -306,8 +307,8 @@ TradeTextPointers4:
dw AfterTrade1Text
TradeTextPointers5:
dw WannaTrade4Text
dw NoTrade4Text
dw WannaTrade5Text
dw NoTrade5Text
dw WrongMon3Text ; seems fitting, also optimises
dw Thanks1Text
dw AfterTrade1Text

BIN
gfx/pokemon/front/raticatea.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 705 B

8
scripts/CeladonPokecenter.asm
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

8
scripts/SSAnne1FRooms.asm
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

8
scripts/SSAnne2FRooms.asm
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

8
scripts/SSAnneB1FRooms.asm
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

8
scripts/SaffronPokecenter.asm
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

8
scripts/VermilionPokecenter.asm
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

8
scripts/ViridianPokecenter.asm
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