thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 22:28:41 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

this is a commit.

Browse source 
- Added another counter to the Game Corner prize room, adding Abra, Clefairy and Dratini back as prizes.

- Fixed Thorn Avery's and Zeta Null's names in the credits

- Small map changes to postgame areas

- Polished the new dex entries again

- Mewtwo no longer gets Waterfall and Roar from tradebacks

- Fixed a bug where you couldn't surf in the water on the Ferry tileset

- Gave Giovanni's room the same palette as Rocket HQ

- Minor text fixes

- Fixed an issue where LAST_MAP wouldn't update when sailing to Citrine
This commit is contained in:
Martha Schilling 2023-12-02 16:02:40 +00:00
parent 0fb953c155
commit 19c4bec9ee
28 changed files with 142 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/credits/credits_text.asm
View file

@ -244,7 +244,7 @@ CredHelix:
CredFO:
db -6, "FRENCH ORANGE@"
CredZetaNull:
db -4, "ZETA-NULL@"
db -4, "ZETA NULL@"
CredPSDevs:
db -5, "SHOWDOWN MOD@"
CredAus:
@ -268,7 +268,7 @@ CredFrrf:
CredMisty:
db -5, "LADYMISTICUS@"
CredThornAvery:
db -4, "THORNAVERY@"
db -4, "THORN AVERY@"
CredDannye:
db -4, "DANNYE33@"
CredEro:

6
data/events/prize_mon_levels.asm
View file

@ -1,8 +1,12 @@
PrizeMonLevelDictionary:
db CUBONE, 15
db ABRA, 14
db SEEL, 20
db CLEFAIRY, 20
db CACTORMUS, 20
db SQUEAMATA, 20
db DRATINI, 20
db SCYTHER, 25
db PINSIR, 25

27
data/events/prizes.asm
View file

@ -1,32 +1,45 @@
PrizeDifferentMenuPtrs:
dw PrizeMenuMon1Entries, PrizeMenuMon1Cost
dw PrizeMenuMon2Entries, PrizeMenuMon2Cost
dw PrizeMenuMon3Entries, PrizeMenuMon3Cost
dw PrizeMenuTMsEntries, PrizeMenuTMsCost
NoThanksText:
db "NO THANKS@"
PrizeMenuMon1Entries:
db CUBONE
db CACTORMUS
db SQUEAMATA
db ABRA
db SEEL
db CLEFAIRY
db "@"
PrizeMenuMon1Cost:
bcd2 300
bcd2 500
bcd2 1000
bcd2 2000
db "@"
PrizeMenuMon2Entries:
db CACTORMUS
db SQUEAMATA
db DRATINI
db "@"
PrizeMenuMon2Cost:
bcd2 1500
bcd2 3000
bcd2 3000
db "@"
PrizeMenuMon3Entries:
db SCYTHER
db PINSIR
db PORYGON
db "@"
PrizeMenuMon2Cost:
bcd2 3500
bcd2 3500
PrizeMenuMon3Cost:
bcd2 4500
bcd2 4500
bcd2 7000
db "@"

2
data/maps/objects/BrunswickGlade.asm
View file

@ -13,6 +13,6 @@ BrunswickGlade_Object:
def_object_events
object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2
object_event 14, 8, SPRITE_BIRD, STAY, RIGHT, 3
object_event 9, 3, SPRITE_BIRD, STAY, UP, 3
def_warps_to BRUNSWICK_GLADE

2
data/maps/objects/BrunswickGrotto.asm
View file

@ -9,6 +9,6 @@ BrunswickGrotto_Object:
bg_event 22, 10, 2 ; signage
def_object_events
object_event 6, 4, SPRITE_BIRD, STAY, LEFT, 1, ZAPDOS_G, 70 | OW_POKEMON ; person
object_event 5, 5, SPRITE_BIRD, STAY, LEFT, 1, ZAPDOS_G, 70 | OW_POKEMON ; person
def_warps_to BRUNSWICK_GROTTO

2
data/maps/objects/CopycatsHouse2F.asm
View file

@ -12,7 +12,7 @@ CopycatsHouse2F_Object:
object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
object_event 0, 6, SPRITE_SEEL, STAY, RIGHT, 2 ; person
object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person
object_event 1, 2, SPRITE_BIRD, STAY, DOWN, 4 ; person
object_event 4, 6, SPRITE_FAIRY, STAY, LEFT, 5 ; person
def_warps_to COPYCATS_HOUSE_2F

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

@ -9,9 +9,10 @@ GameCornerPrizeRoom_Object:
bg_event 2, 2, 3 ; CeladonPrizeRoomText3
bg_event 4, 2, 4 ; CeladonPrizeRoomText4
bg_event 6, 2, 5 ; CeladonPrizeRoomText5
bg_event 8, 2, 6 ; CeladonPrizeRoomText6
def_object_events
object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
object_event 7, 4, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
def_warps_to GAME_CORNER_PRIZE_ROOM

126
data/pokemon/new_dex_text.asm
View file

@ -249,13 +249,13 @@ _TotartleDexEntry::
dex
_WeirduckDexEntry::
text "It exhibits odd"
next "mannerisms as"
text "WEIRDUCK exhibits"
next "odd mannerisms as"
next "it attempts to"
page "control its"
next "developing"
next "psychic powers"
page "keep its still-"
next "developing PSI"
next "under control"
dex
_CroakozunaDexEntry::
@ -269,22 +269,22 @@ _CroakozunaDexEntry::
dex
_GorotoraDexEntry::
text "Its growls sound"
next "like rolling"
next "thunder. It can"
page "only be tamed"
next "by the bravest"
text "It is said that"
next "only the bravest"
next "#MON trainers"
page "can tame it. Its"
next "growls sound like"
next "rolling thunder"
dex
_OmegadgeDexEntry::
text "A recent creation"
next "by SILPH CO."
next "Modeled after the"
text "Modeled after the"
next "extinct GAWARHED,"
next "this recent SILPH"
page "extinct GAWARHED,"
next "it's said to pack"
page "invention is said"
next "to pack truly"
next "devastating power"
dex
@ -299,8 +299,8 @@ _TriculesDexEntry:: ; Official entry from GS beta, reworded
dex
_TrampelDexEntry::
text "A rare species"
next "that's well-known"
text "This rare species"
next "is very well-known"
next "in India. It has"
page "a bulky physique,"
@ -321,9 +321,9 @@ _GavillainDexEntry::
_PendrakenDexEntry::
text "It often clashes"
next "with TENTACRUEL."
next "Sprays ink into"
next "It sprays ink in"
page "its foe's eyes,"
page "its foe's face,"
next "disorienting it"
next "before attacking"
dex
@ -339,11 +339,11 @@ _MagnetiteDexEntry::
dex
_NidoreignDexEntry:: ; The Nidos are based on the Moon Rabbit of East Asian mythology, so we're expanding on this with actual moon references.
text "It's said to come"
next "from the moon."
next "Its poisonous"
text "Said to have come"
next "from the moon. It"
next "has toxic spines"
page "spines are used"
page "which can be used"
next "to make powerful"
next "MAX ELIXERs"
dex
@ -391,15 +391,15 @@ _DisturbanDexEntry::
_GentlarvaDexEntry::
text "Closely related to"
next "WEEDLE. Due to the"
next "lack of a horn,"
next "lack of a horn, it"
page "it hides under"
next "trees, gnawing"
page "hides under tall"
next "trees, gnawing on"
next "their roots"
dex
_PupalDexEntry::
text "While awaiting"
text "While it awaits"
next "evolution, it"
next "barely moves. If"
@ -584,8 +584,8 @@ _LickilickyDexEntry::
next "prey, leaving it"
page "covered with a"
next "saliva that"
next "causes numbness"
next "saliva that can"
next "cause numbness"
dex
_MagnezoneDexEntry::
@ -721,11 +721,11 @@ _SandyShocksDexEntry::
_MeltanDexEntry::
text "Typically living"
next "in a group, this"
next "#MON eats iron"
next "#MON absorbs"
page "particles that"
next "it finds in the"
next "subsoil"
page "particles of iron"
next "that it finds"
next "in the subsoil"
dex
_MelmetalDexEntry::
@ -769,23 +769,23 @@ _PerrserkerDexEntry::
dex
_ArticunoGDexEntry::
text "From its eyes,"
next "it fires beams"
next "which can stun"
text "From its eyes, it"
next "fires PSI beams,"
next "which can stun and"
page "and immobilize"
next "foes as if they"
next "had been frozen"
page "immobilize foes as"
next "if they had been"
next "frozen solid"
dex
_ZapdosGDexEntry::
text "Its leg muscles"
next "are so powerful"
next "that one kick can"
text "As it runs, its"
next "feathers make a"
next "crackling sound."
page "pulverize a dump"
next "truck. It runs"
next "at over 180 mph"
page "One kick from its"
next "mighty legs can"
next "demolish a truck"
dex
_MoltresGDexEntry::
@ -793,8 +793,8 @@ _MoltresGDexEntry::
next "that surrounds it"
next "is said to burn"
page "the spirit of"
next "any creature that"
page "the spirit of any"
next "creature that"
next "wanders too close"
dex
@ -803,7 +803,7 @@ _ArcanineHDexEntry::
next "rock-like feel."
next "It dances around"
page "its foe before"
page "its foe, before"
next "biting it in a"
next "vicious rage" ; reference to Raging Fury
dex
@ -824,7 +824,7 @@ _RaticateADexEntry:: ; this entry hypercompresses most Gen 7 entries
next "greedily order"
page "its subjects to"
next "gather large"
next "gather incredible"
next "amounts of food"
dex
@ -840,11 +840,11 @@ _RaichuADexEntry::
_SandslashADexEntry::
text "It adapted to a"
next "frigid region."
next "Wounds caused"
next "frigid region. A"
next "wound caused by"
page "by SANDSLASH"
next "cause severe"
page "its sharp claws"
next "can cause severe"
next "frostbite"
dex
@ -869,9 +869,9 @@ _DugtrioADexEntry::
dex
_PersianADexEntry::
text "Its round face"
next "is a symbol of"
next "prosperity."
text "Its round face is"
next "seen as a symbol"
next "of prosperity."
page "Despite this, it"
next "prefers to fight"
@ -879,9 +879,9 @@ _PersianADexEntry::
dex
_GolemADexEntry::
text "It fires rocks"
next "charged with"
next "electricity."
text "It charges rocks"
next "with electricity,"
next "then fires them."
page "If it can't find"
next "ammo, it may fire"
@ -919,9 +919,9 @@ _SlowkingGDexEntry::
dex
_MukADexEntry::
text "Over 100 kinds"
next "of poison make"
next "up its body."
text "Its body contains"
next "over 100 different"
next "kinds of poison."
page "While friendly,"
next "it must be fed"

2
data/pokemon/tradeback_moves.asm
View file

@ -1326,8 +1326,6 @@ MewtwoTradebackMoves:
db 1, THUNDERPUNCH
db 1, HEADBUTT
db 1, FLAMETHROWER
db 1, WATERFALL
db 1, ROAR
db 0
SnorlaxTradebackMoves:

2
data/tilesets/collision_tile_ids.asm
View file

@ -75,7 +75,7 @@ Citrine_Coll::
coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59
Celeste_Coll::
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
RocketHouse_Coll::
coll_tiles $13, $31, $01, $53

2
data/tilesets/water_tilesets.asm
View file

@ -11,10 +11,12 @@ WaterTilesets:
db PLATEAU
db CITRINE
db CELESTE
db SEAGALLOPPORT
db -1 ; end
NonShoreTilesets:
db GYM
db SEAGALLOPPORT
db SHIP_PORT
db DOJO
db -1 ; end