mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-20 14:18:34 +13:00
The Big One.
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you. - Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them - Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy. - Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later. - Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8. - Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively - Restructured the Pokedex a little. Don't worry, Lickitung's still number 108! - All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones - Removed Blastyke as a Game Corner prize, replacing it with Squeamata. - Garnet Cavern is now properly listed as a dungeon map - Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden - Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent - Finished Gauntlet 6F except for the trainer text (PvK please help) - Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage. - Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit - Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke. - New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone! - Fixed a bug preventing the trade for Haunter from being accessed.
This commit is contained in:
Martha Schilling
parent
57186bb2a0
commit
508a4e790e
246 changed files with 2446 additions and 2384 deletions
|
|
@ -5,10 +5,6 @@
|
|||
; Format: map ID, Y, X, gate ID?
|
||||
|
||||
CardKeyTable1:
|
||||
db SILPH_CO_2F, $04, $04, 0
|
||||
db SILPH_CO_2F, $04, $05, 1
|
||||
db SILPH_CO_4F, $0C, $04, 2
|
||||
db SILPH_CO_4F, $0C, $05, 3
|
||||
db SILPH_CO_7F, $06, $0A, 4
|
||||
db SILPH_CO_7F, $06, $0B, 5
|
||||
db SILPH_CO_9F, $04, $12, 6
|
||||
|
|
@ -22,10 +18,6 @@ CardKeyTable2:
|
|||
db SILPH_CO_3F, $09, $09, 11
|
||||
db SILPH_CO_5F, $04, $07, 12
|
||||
db SILPH_CO_5F, $05, $07, 13
|
||||
db SILPH_CO_6F, $0C, $05, 14
|
||||
db SILPH_CO_6F, $0D, $05, 15
|
||||
;db SILPH_CO_8F, $08, $07, 16
|
||||
;db SILPH_CO_8F, $09, $07, 17
|
||||
db SILPH_CO_9F, $08, $03, 18
|
||||
db SILPH_CO_9F, $09, $03, 19
|
||||
db -1 ; end
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
SilphCoMapList:
|
||||
db SILPH_CO_2F
|
||||
db SILPH_CO_3F
|
||||
db SILPH_CO_4F
|
||||
db SILPH_CO_5F
|
||||
db SILPH_CO_6F
|
||||
db SILPH_CO_7F
|
||||
;db SILPH_CO_8F
|
||||
db SILPH_CO_9F
|
||||
db SILPH_CO_10F
|
||||
db SILPH_CO_11F
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
PrizeMonLevelDictionary:
|
||||
|
||||
db CUBONE, 12
|
||||
db BLASTYKE, 12
|
||||
db CACTUS, 20
|
||||
db CUBONE, 15
|
||||
db CACTORMUS, 20
|
||||
db SQUEAMATA, 20
|
||||
|
||||
db SCYTHER, 25
|
||||
db PINSIR, 25
|
||||
db PORYGON, 30
|
||||
db SCYTHER, 25
|
||||
db PINSIR, 25
|
||||
db PORYGON, 25
|
||||
|
|
@ -8,14 +8,14 @@ NoThanksText:
|
|||
|
||||
PrizeMenuMon1Entries:
|
||||
db CUBONE
|
||||
db BLASTYKE
|
||||
db CACTUS
|
||||
db CACTORMUS
|
||||
db SQUEAMATA
|
||||
db "@"
|
||||
|
||||
PrizeMenuMon1Cost:
|
||||
bcd2 200
|
||||
bcd2 700
|
||||
bcd2 1700
|
||||
bcd2 500
|
||||
bcd2 1000
|
||||
bcd2 2000
|
||||
db "@"
|
||||
|
||||
PrizeMenuMon2Entries:
|
||||
|
|
@ -27,7 +27,7 @@ PrizeMenuMon2Entries:
|
|||
PrizeMenuMon2Cost:
|
||||
bcd2 3500
|
||||
bcd2 3500
|
||||
bcd2 6500
|
||||
bcd2 7000
|
||||
db "@"
|
||||
|
||||
PrizeMenuTMsEntries:
|
||||
|
|
@ -37,7 +37,7 @@ PrizeMenuTMsEntries:
|
|||
db "@"
|
||||
|
||||
PrizeMenuTMsCost:
|
||||
bcd2 3300
|
||||
bcd2 5500
|
||||
bcd2 7700
|
||||
bcd2 3000
|
||||
bcd2 5000
|
||||
bcd2 7000
|
||||
db "@"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@ TradeMons:
|
|||
; entries correspond to TRADE_FOR_* constants
|
||||
table_width 3 + NAME_LENGTH, TradeMons
|
||||
; give mon, get mon, dialog id, nickname
|
||||
db POLIWHIRL, JYNX, TRADE_DIALOGSET_CASUAL, "LOLA@@@@@@@" ; Jynx trade replaces the useless Nidorino one
|
||||
db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@"
|
||||
db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@"
|
||||
db HAUNTER, KADABRA, TRADE_DIALOGSET_EVOLUTION, "HARRY@@@@@@" ; New trade to complete the 4 main trade evos
|
||||
db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@"
|
||||
db PERSIAN, TAUROS, TRADE_DIALOGSET_CASUAL, "JIMBO@@@@@@" ; From JP Blue
|
||||
db MACHOKE, HAUNTER, TRADE_DIALOGSET_EVOLUTION, "MICHELLE@@@" ; From JP Blue
|
||||
db KADABRA, GRAVELER, TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; From JP Blue
|
||||
db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; From Yellow
|
||||
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader
|
||||
db POLIWHIRL, JYNX, TRADE_DIALOGSET_CASUAL, "LOLA@@@@@@@" ; Cerulean City
|
||||
db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@" ; Route 2
|
||||
db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@" ; Route 11-12 gate, will be moved to Viridian Forest gate
|
||||
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 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 KADABRA, GRAVELER, TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; Cinnabar Lab, from JP Blue (probably going to move these since you get the Trader here anyway...)
|
||||
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 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
|
||||
|
|
@ -31,7 +31,7 @@ TradeMons:
|
|||
db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING@@@@"
|
||||
db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "CHURCHILL@@" ; Winston Churchill, notable "city gent"
|
||||
db PERSIAN, PERRSERKER, TRADE_DIALOGSET_HAPPY, "ERIK@@@@@@@" ; One of the most famous vikings
|
||||
db MADAAMU, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "LANCELOT@@@" ; Influential knight of the round table
|
||||
db LUXWAN, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "LANCELOT@@@" ; Influential knight of the round table
|
||||
db ARCANINE, ARCANINE_H, TRADE_DIALOGSET_BILL, "ARCANINE@@@"
|
||||
db ELECTRODE, ELECTRODE_H, TRADE_DIALOGSET_GRAMPS, "ELECTRODE@@"
|
||||
assert_table_length NUM_NPC_TRADES
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue