thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-04-07 19:12:01 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

The Big One.

Browse source 
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 2023-09-19 23:34:25 +01:00
parent 57186bb2a0
commit 508a4e790e
246 changed files with 2446 additions and 2384 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/maps/objects/BillsHouse.asm
View file

@ -2,8 +2,8 @@ BillsHouse_Object:
db $d ; border block
def_warp_events
warp_event 2, 7, LAST_MAP, 1
warp_event 3, 7, LAST_MAP, 1
warp_event 2, 7, ROUTE_25, 1
warp_event 3, 7, ROUTE_25, 1
warp_event 11, 0, BILLS_GARDEN, 1
def_bg_events

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

@ -8,7 +8,7 @@ BrunswickTrail_Object:
def_bg_events
def_object_events
object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person
object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTORMUS, 60 | OW_POKEMON ; person
object_event 40, 21, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_BIRD_KEEPER, 12 ; person
object_event 29, 14, SPRITE_BEAUTY, STAY, DOWN, 3, OPP_BEAUTY, 16 ; person
object_event 25, 21, SPRITE_FISHER, STAY, DOWN, 4, OPP_FISHER, 13 ; person

10
data/maps/objects/CitrineCity.asm
View file

@ -8,8 +8,8 @@ CitrineCity_Object:
warp_event 15, 27, CITRINE_MART, 1
warp_event 23, 5, CELESTE_HILL_OUTSIDE, 1
warp_event 11, 7, BATTLE_TENT, 1
warp_event 27, 33, VERMILION_CITY, 9
warp_event 26, 33, VERMILION_CITY, 10
warp_event 26, 31, CITRINE_FERRY_DOCK, 1
warp_event 27, 31, CITRINE_FERRY_DOCK, 1
def_bg_events
bg_event 16, 27, 5 ; Citrine Shop
@ -17,14 +17,14 @@ CitrineCity_Object:
bg_event 20, 22, 7 ; Billboard 1
bg_event 5, 18, 8 ; Billboard 2
bg_event 9, 7, 9 ; Battle Tower
bg_event 25, 23, 10 ; City Sign
bg_event 21, 28, 11 ; Directions
bg_event 33, 23, 10 ; City Sign
bg_event 25, 24, 11 ; Directions
bg_event 25, 7, 12 ; Celeste Hill Sign
def_object_events
object_event 12, 18, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
object_event 6, 9, SPRITE_HIKER, WALK, LEFT_RIGHT, 2 ; person
object_event 20, 26, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
object_event 31, 28, SPRITE_ROCKER, WALK, ANY_DIR, 4 ; person
object_event 29, 23, SPRITE_ROCKER, WALK, ANY_DIR, 4 ; person
def_warps_to CITRINE_CITY

12
data/maps/objects/CitrineFerryDock.asm Normal file
View file

@ -0,0 +1,12 @@
CitrineFerryDock_Object:
db $f ; border block
def_warp_events
warp_event 14, 0, CITRINE_CITY, 7
warp_event 14, 2, SEAGALLOP_FERRY, 1
def_bg_events
def_object_events
def_warps_to CITRINE_FERRY_DOCK

4
data/maps/objects/CitrinePokecenter.asm
View file

@ -2,8 +2,8 @@ CitrinePokecenter_Object:
db $0 ; border block
def_warp_events
warp_event 3, 7, LAST_MAP, 3
warp_event 4, 7, LAST_MAP, 3
warp_event 3, 7, CITRINE_CITY, 3
warp_event 4, 7, CITRINE_CITY, 3
def_bg_events

4
data/maps/objects/CitrineTradebackHouse.asm
View file

@ -2,8 +2,8 @@ CitrineTradebackHouse_Object:
db $a ; border block
def_warp_events
warp_event 2, 7, LAST_MAP, 2
warp_event 3, 7, LAST_MAP, 2
warp_event 2, 7, CITRINE_CITY, 2
warp_event 3, 7, CITRINE_CITY, 2
def_bg_events

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

@ -8,6 +8,5 @@ DiglettsCave_Object:
def_bg_events
def_object_events
object_event 29, 12, SPRITE_BOULDER, STAY, DOWN, 1, WUGTRIO, 28 | OW_POKEMON
def_warps_to DIGLETTS_CAVE

10
data/maps/objects/FarawayIslandOutside.asm
View file

@ -2,13 +2,13 @@ FarawayIslandOutside_Object:
db $2d ; border block
def_warp_events
warp_event 2, 35, VERMILION_CITY, 6
warp_event 3, 35, VERMILION_CITY, 6
warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1
warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2
warp_event 6, 35, SEAGALLOP_FERRY, 1
warp_event 7, 35, SEAGALLOP_FERRY, 1
warp_event 18, 8, FARAWAY_ISLAND_INSIDE, 1
warp_event 19, 8, FARAWAY_ISLAND_INSIDE, 2
def_bg_events
bg_event 2, 28, 1 ; Sign
bg_event 4, 29, 1 ; Sign
def_object_events

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

@ -14,6 +14,5 @@ GiovannisRoom_Object:
object_event 8, 16, SPRITE_PAPER, STAY, RIGHT, 4
object_event 17, 22, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE
object_event 5, 22, SPRITE_POKE_BALL, STAY, NONE, 6, PROTECTOR
object_event 6, 17, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 8
def_warps_to GIOVANNIS_ROOM

12
data/maps/objects/SeagallopFerry.asm Normal file
View file

@ -0,0 +1,12 @@
SeagallopFerry_Object:
db $c ; border block
def_warp_events
warp_event 5, 1, VERMILION_FERRY_DOCK, 1
def_bg_events
def_object_events
object_event 3, 3, SPRITE_CAPTAIN, STAY, LEFT, 1 ; person
def_warps_to SEAGALLOP_FERRY

4
data/maps/objects/SilphCo11F.asm
View file

@ -16,7 +16,7 @@ SilphCo11F_Object:
object_event 2, 8, SPRITE_JAMES, STAY, UP, 4
object_event 3, 16, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 41
object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6
object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGA, 40 | OW_POKEMON
object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGA, 65 | OW_POKEMON
object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGADGE, 40 | OW_POKEMON
object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGADGE, 65 | OW_POKEMON
def_warps_to SILPH_CO_11F

8
data/maps/objects/SilphGauntlet2F.asm
View file

@ -9,10 +9,10 @@ SilphGauntlet2F_Object:
def_object_events
object_event 13, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_LASS, 19
object_event 21, 9, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_JUNIOR, 1
object_event 24, 13, SPRITE_HIKER, STAY, RIGHT, 3, OPP_HIKER, 15
object_event 23, 19, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 8
object_event 11, 16, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_POKEMANIAC, 8
object_event 21, 9, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 15
object_event 24, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 3, OPP_SUPER_NERD, 8
object_event 23, 19, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_POKEMANIAC, 8
object_event 11, 16, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 11
object_event 2, 16, SPRITE_HIKER, STAY, RIGHT, 6, OPP_BLACKBELT, 19
def_warps_to SILPH_GAUNTLET_2F

5
data/maps/objects/SilphGauntlet3F.asm
View file

@ -26,8 +26,7 @@ SilphGauntlet3F_Object:
object_event 12, 23, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_FIREFIGHTER, 2
object_event 2, 23, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN, 4
object_event 21, 12, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_ENGINEER, 4
object_event 6, 7, SPRITE_ROCKER, STAY, RIGHT, 5, OPP_ROCKER, 3
object_event 22, 23, SPRITE_FISHER, STAY, DOWN, 6, OPP_FISHER, 12
object_event 30, 23, SPRITE_BEAUTY, STAY, RIGHT, 7, OPP_BEAUTY, 11
object_event 22, 23, SPRITE_ROCKER, STAY, DOWN, 5, OPP_ROCKER, 3
object_event 30, 23, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 12
def_warps_to SILPH_GAUNTLET_3F

9
data/maps/objects/SilphGauntlet6F.asm
View file

@ -3,9 +3,16 @@ SilphGauntlet6F_Object:
def_warp_events
warp_event 2, 3, SILPH_GAUNTLET_5F, 2
warp_event 13, 13, SILPH_GAUNTLET_7F, 1
def_bg_events
def_object_events
object_event 12, 4, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 9
object_event 21, 6, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 2, OPP_MISTY, 9
object_event 18, 11, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_LT_SURGE, 9
object_event 18, 19, SPRITE_ERIKA, STAY, DOWN, 4, OPP_ERIKA, 9
object_event 13, 18, SPRITE_KOGA, STAY, DOWN, 5, OPP_KOGA, 9
object_event 8, 18, SPRITE_GIRL, STAY, LEFT, 6, OPP_SABRINA, 9
object_event 6, 10, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, 7, OPP_BLAINE, 9
def_warps_to SILPH_GAUNTLET_6F

20
data/maps/objects/VermilionCity.asm
View file

@ -10,17 +10,17 @@ VermilionCity_Object:
warp_event 18, 31, VERMILION_DOCK, 1
warp_event 19, 31, VERMILION_DOCK, 1
warp_event 15, 13, VERMILION_TRADE_HOUSE, 1
warp_event 10, 31, FARAWAY_ISLAND_OUTSIDE, 1
warp_event 26, 31, CITRINE_CITY, 7
warp_event 10, 31, VERMILION_FERRY_DOCK, 1
warp_event 11, 31, VERMILION_FERRY_DOCK, 1
def_bg_events
bg_event 27, 3, 11 ; VermilionCityText7
bg_event 37, 13, 12 ; VermilionCityText8
bg_event 24, 13, 13 ; MartSignText
bg_event 12, 3, 14 ; PokeCenterSignText
bg_event 7, 13, 15 ; VermilionCityText11
bg_event 7, 19, 16 ; VermilionCityText12
bg_event 29, 15, 17 ; VermilionCityText13
bg_event 27, 3, 9 ; VermilionCityText7
bg_event 37, 13, 10 ; VermilionCityText8
bg_event 24, 13, 11 ; MartSignText
bg_event 12, 3, 12 ; PokeCenterSignText
bg_event 7, 13, 13 ; VermilionCityText11
bg_event 7, 19, 14 ; VermilionCityText12
bg_event 29, 15, 15 ; VermilionCityText13
def_object_events
object_event 23, 5, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
@ -31,7 +31,5 @@ VermilionCity_Object:
object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
object_event 19, 8, SPRITE_OFFICER_JENNY, STAY, ANY_DIR, 7 ; squirtle event
object_event 12, 13, SPRITE_BEAUTY, STAY, DOWN, 8 ; arc/pers event
object_event 11, 30, SPRITE_SAILOR, STAY, UP, 9 ; person - Faraway Island
object_event 27, 30, SPRITE_SAILOR, STAY, UP, 10 ; person - Citrine City
def_warps_to VERMILION_CITY

12
data/maps/objects/VermilionFerryDock.asm Normal file
View file

@ -0,0 +1,12 @@
VermilionFerryDock_Object:
db $f ; border block
def_warp_events
warp_event 14, 0, LAST_MAP, 9
warp_event 14, 2, SEAGALLOP_FERRY, 1
def_bg_events
def_object_events
def_warps_to VERMILION_FERRY_DOCK

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

@ -18,7 +18,7 @@ VictoryRoad2F_Object:
object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5
object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6
object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5
object_event 11, 5, SPRITE_MONSTER, STAY, DOWN, 6, GYAOON, 50 | OW_POKEMON
object_event 11, 5, SPRITE_POKE_BALL, STAY, NONE, 6, RARE_CANDY
object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION
object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL
object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK

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

@ -7,7 +7,7 @@ ViridianCity_Object:
warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 1
warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 1
warp_event 32, 7, VIRIDIAN_GYM, 1
warp_event 32, 3, ROCKET_HIDEOUT_B1F, 2
warp_event 32, 3, GIOVANNIS_ROOM, 2
warp_event 12, 15, VIRIDIAN_PRE_GYM, 1
def_bg_events