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

would you believe me if i told you this still isnt done

Browse source 
in the middle of a breakdown here but i'm committing this because I don't wanna have an overwhelming number of changed files like the Big One

- Fixed a bug where an item couldn't be picked up in Mt. Moon Crater

- Gave new cries to Leafeon, Glaceon, Perrserker, Gentlarva, Carapthor, Gorotora, Magnezone, Tangrowth, Tricules, Magmortar and Meltan. Pupal and Lickilicky also got new cries but they'll probably be changed later

- Changed Citrine's map slightly for hopefully the final time, removing the tall grass to allow the Old Man Glitch to work there

- Brought Pokemon Tower 5F back for some reason

- Moved the Rocket Grunt on Silph 11F closer to the Omegadge door

- 'Fixed' a warp issue on Faraway Island, can definitely be improved though

- Gave Gapdos 10 more base special because i forgot the first time

- Fixed a typo in Hitmontop's dex entry

- Fixed some inconsistencies in Gao and Gorotora's movesets

- Added the unused ice tiles to Seafoam Islands and Garnet Cavern (credit to Vortiene)

- Added a stats page to the Pokedex that displays base stats and the type of caught Pokemon (again, credit to Vortiene)

- Made Sandshrew more common in Mt. Moon

- Improved the 'already caught' icon

- uncapitalised all new instances of "trainer" in the text to make it more consistent

- HOPEFULLY fixed the issue where the SS Anne still couldn't be reboarded
This commit is contained in:
Martha Schilling 2023-11-20 11:00:20 +00:00
parent d0decc8e66
commit ef62d0a43f
48 changed files with 465 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

29
data/maps/hide_show_data.asm
View file

@ -151,7 +151,7 @@ MapHSPointers:
dw NoHS
dw PokemonTower2FHS
dw BrunswickGrottoHS
dw NoHS ; Pokemon Tower 4F, removed for constant space
dw NoHS
dw PokemonTower5FHS
dw PokemonTower6FHS
dw PokemonTower7FHS
@ -218,7 +218,6 @@ MapHSPointers:
dw SilphCo5FHS
dw NoHS
dw SilphCo7FHS
;dw SilphCo8FHS
dw PokemonMansion2FHS
dw PokemonMansion3FHS
dw PokemonMansionB1FHS
@ -253,11 +252,11 @@ MapHSPointers:
dw NoHS
dw RockTunnelB1FHS
dw GiovannisRoomHS
dw NoHS ; Battle Tent
dw MtMoonSquareHS ; Mt Moon Square
dw NoHS ; Mt Moon Square House
dw NoHS ; Celeste Hill Cave
dw NoHS ; Celeste Hill Outside
dw NoHS
dw MtMoonSquareHS
dw NoHS
dw NoHS
dw NoHS
dw BrunswickGladeHS
assert_table_length NUM_MAPS
dw -1 ; end
@ -330,7 +329,7 @@ Route25HS:
db ROUTE_25, $0A, SHOW ; HS_ROUTE_25_ITEM
BrunswickTrailHS:
db BRUNSWICK_TRAIL, $01, SHOW ; HS_CACTUS
db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1
db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1
BluesHouseHS:
db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING
db BLUES_HOUSE, $02, HIDE ; HS_DAISY_WALKING
@ -481,13 +480,6 @@ SilphCo3FHS:
db SILPH_CO_3F, $02, SHOW ; HS_SILPH_CO_3F_1
db SILPH_CO_3F, $03, SHOW ; HS_SILPH_CO_3F_2
db SILPH_CO_3F, $04, SHOW ; HS_SILPH_CO_3F_ITEM
;SilphCo4FHS:
; db SILPH_CO_4F, $02, SHOW ; HS_SILPH_CO_4F_1
; db SILPH_CO_4F, $03, SHOW ; HS_SILPH_CO_4F_2
; db SILPH_CO_4F, $04, SHOW ; HS_SILPH_CO_4F_3
; db SILPH_CO_4F, $05, SHOW ; HS_SILPH_CO_4F_ITEM_1
; db SILPH_CO_4F, $06, SHOW ; HS_SILPH_CO_4F_ITEM_2
; db SILPH_CO_4F, $07, SHOW ; HS_SILPH_CO_4F_ITEM_3
SilphCo5FHS:
db SILPH_CO_5F, $02, SHOW ; HS_SILPH_CO_5F_1
db SILPH_CO_5F, $03, SHOW ; HS_SILPH_CO_5F_2
@ -496,12 +488,6 @@ SilphCo5FHS:
db SILPH_CO_5F, $06, SHOW ; HS_SILPH_CO_5F_ITEM_1
db SILPH_CO_5F, $07, SHOW ; HS_SILPH_CO_5F_ITEM_2
db SILPH_CO_5F, $08, SHOW ; HS_SILPH_CO_5F_ITEM_3
;SilphCo6FHS:
; db SILPH_CO_6F, $06, SHOW ; HS_SILPH_CO_6F_1
; db SILPH_CO_6F, $07, SHOW ; HS_SILPH_CO_6F_2
; db SILPH_CO_6F, $08, SHOW ; HS_SILPH_CO_6F_3
; db SILPH_CO_6F, $09, SHOW ; HS_SILPH_CO_6F_ITEM_1
; db SILPH_CO_6F, $0A, SHOW ; HS_SILPH_CO_6F_ITEM_2
SilphCo7FHS:
db SILPH_CO_7F, $05, SHOW ; HS_SILPH_CO_7F_1
db SILPH_CO_7F, $06, SHOW ; HS_SILPH_CO_7F_2
@ -594,6 +580,7 @@ MtMoonCraterHS:
db MT_MOON_CRATER, $01, SHOW ; HS_MT_MOON_CRATER_ITEM_1
db MT_MOON_CRATER, $02, SHOW ; HS_MT_MOON_CRATER_ITEM_2
db MT_MOON_CRATER, $03, SHOW ; HS_MT_MOON_CRATER_ITEM_3
db MT_MOON_CRATER, $04, SHOW ; HS_MT_MOON_CRATER_ITEM_4
GiovannisRoomHS:
db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1
db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2

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

@ -18,13 +18,13 @@ CitrineCity_Object:
bg_event 5, 18, 8 ; Billboard 2
bg_event 9, 7, 9 ; Battle Tower
bg_event 33, 23, 10 ; City Sign
bg_event 25, 24, 11 ; Directions
bg_event 25, 22, 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 12, 19, 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 19, 15, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
object_event 29, 23, SPRITE_ROCKER, WALK, ANY_DIR, 4 ; person
def_warps_to CITRINE_CITY

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

@ -2,7 +2,7 @@ PokemonTower2F_Object:
db $1 ; border block
def_warp_events
warp_event 3, 9, POKEMON_TOWER_6F, 1
warp_event 3, 9, POKEMON_TOWER_5F, 1
warp_event 18, 9, POKEMON_TOWER_1F, 3
def_bg_events

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

@ -2,7 +2,7 @@ PokemonTower5F_Object:
db $1 ; border block
def_warp_events
; warp_event 3, 9, POKEMON_TOWER_4F, 1
warp_event 3, 9, POKEMON_TOWER_2F, 1
warp_event 18, 9, POKEMON_TOWER_6F, 1
def_bg_events

12
data/maps/objects/PokemonTower6F.asm
View file

@ -2,16 +2,16 @@ PokemonTower6F_Object:
db $1 ; border block
def_warp_events
warp_event 3, 9, POKEMON_TOWER_2F, 1
warp_event 18, 9, POKEMON_TOWER_5F, 2
warp_event 9, 16, POKEMON_TOWER_7F, 1
def_bg_events
def_object_events
object_event 9, 10, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 19
object_event 12, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
object_event 5, 5, SPRITE_CHANNELER, STAY, RIGHT, 3, OPP_CHANNELER, 21
object_event 15, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 7, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
object_event 7, 10, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
def_warps_to POKEMON_TOWER_6F

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

@ -14,7 +14,7 @@ SilphCo11F_Object:
object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person
object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2
object_event 2, 8, SPRITE_JAMES, STAY, UP, 4
object_event 3, 16, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 41
object_event 7, 14, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 41
object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6
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

6
data/maps/special_warps.asm
View file

@ -78,7 +78,6 @@ FlyWarpDataPtr:
fly_warp_spec ROUTE_4, .Route4
fly_warp_spec ROUTE_10, .Route10
fly_warp_spec REDS_HOUSE_2F, .RedsHouse2F ; This doesn't show on the Fly map, just used so the post-league warp doesn't have a stroke
fly_warp_spec FARAWAY_ISLAND_OUTSIDE, .FarawayIslandOutside
.PalletTown: fly_warp PALLET_TOWN, 5, 6
.ViridianCity: fly_warp VIRIDIAN_CITY, 23, 26
@ -94,6 +93,5 @@ FlyWarpDataPtr:
.CitrineCity: fly_warp CITRINE_CITY, 15, 18
.CeladonUniversityOutside: fly_warp CELADON_UNIVERSITY_OUTSIDE, 15, 26
.Route4: fly_warp ROUTE_4, 11, 6
.Route10: fly_warp ROUTE_10, 11, 20
.RedsHouse2F: fly_warp REDS_HOUSE_2F, 3, 6
.FarawayIslandOutside: fly_warp FARAWAY_ISLAND_OUTSIDE, 2, 23
.Route10: fly_warp ROUTE_10, 11, 28
.RedsHouse2F: fly_warp REDS_HOUSE_2F, 3, 6