thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 06:38:40 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug Fixes & Enhancements

Browse source 
- Most, if not all, Silph Co. warps have been fixed. Inappropriate ones have been removed.
- The Metal Coat can now be found where one corrupted Silph Co. warp was to fill dead space, and another is in the Power Plant, replacing Carbos.
- Bill now trades you Hisuian Arcanine after being saved.
- Bill's Grandfather now trades you Hisuian Electrode. Had to remove Crinkles, but Tangela is literally right next to Cinnabar, c'mon lol
- Toedscool can now be found behind Pallet Town, replacing Gloom and Weepinbell, making it more focused.
- Now you can't run from Omega! May expand this to more Pokemon depending on feedback and whether it's ok on processing. Main concern is making the run button too laggy - it raised some eyebrows.
This commit is contained in:
Llinos Evans 2023-09-02 19:33:14 +01:00
parent 6da8a703ab
commit dadd7ee6a6
21 changed files with 192 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ CinnabarLabTradeRoom_Object:
def_object_events
object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; Trader
; object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; Trader
def_warps_to CINNABAR_LAB_TRADE_ROOM

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

@ -18,7 +18,7 @@ PowerPlant_Object:
object_event 21, 14, SPRITE_VOLTORB, STAY, UP, 7, ELECTRODE, 43 | OW_POKEMON
object_event 37, 32, SPRITE_VOLTORB, STAY, UP, 8, VOLTORB, 40 | OW_POKEMON
object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50 | OW_POKEMON
object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, METAL_COAT
object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER

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

@ -3,8 +3,8 @@ RedsHouse2F_Object:
def_warp_events
warp_event 7, 1, REDS_HOUSE_1F, 3
warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief
;warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief
warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt

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

@ -5,7 +5,7 @@ SilphCo11F_Object:
warp_event 9, 0, SILPH_CO_7F, 1
; warp_event 13, 0, SILPH_CO_ELEVATOR, 1
; warp_event 2, 2, LAST_MAP, 10
warp_event 3, 2, SILPH_CO_7F, 2
warp_event 3, 2, SILPH_CO_7F, 3
def_bg_events

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

@ -7,7 +7,7 @@ SilphCo3F_Object:
; warp_event 20, 0, SILPH_CO_ELEVATOR, 1
; warp_event 23, 11, SILPH_CO_3F, 10
warp_event 3, 3, SILPH_CO_5F, 6
warp_event 3, 15, SILPH_CO_5F, 7
; warp_event 3, 15, SILPH_CO_5F, 7
; warp_event 27, 3, SILPH_CO_2F, 4
; warp_event 3, 11, SILPH_CO_9F, 4
warp_event 11, 11, SILPH_CO_7F, 4
@ -19,6 +19,6 @@ SilphCo3F_Object:
object_event 24, 8, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
object_event 20, 7, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 25
object_event 7, 9, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 4
object_event 8, 5, SPRITE_POKE_BALL, STAY, NONE, 4, HYPER_POTION
object_event 3, 15, SPRITE_POKE_BALL, STAY, NONE, 4, METAL_COAT ; !!!
def_warps_to SILPH_CO_3F

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

@ -2,8 +2,8 @@ SilphCo5F_Object:
db $2e ; border block
def_warp_events
warp_event 24, 0, SILPH_CO_7F, 2
warp_event 26, 0, SILPH_CO_3F, 2
warp_event 24, 0, SILPH_CO_7F, 2
; warp_event 20, 0, SILPH_CO_ELEVATOR, 1
; warp_event 27, 3, SILPH_CO_7F, 6
; warp_event 9, 15, SILPH_CO_9F, 5

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

@ -3,10 +3,10 @@ SilphCo7F_Object:
def_warp_events
warp_event 16, 0, SILPH_CO_11F, 1
warp_event 22, 0, SILPH_CO_5F, 2
warp_event 22, 0, SILPH_CO_5F, 1
; warp_event 18, 0, SILPH_CO_ELEVATOR, 1
warp_event 5, 7, SILPH_CO_11F, 2
warp_event 5, 3, SILPH_CO_3F, 5
warp_event 5, 3, SILPH_CO_3F, 4
; warp_event 21, 15, SILPH_CO_5F, 4
def_bg_events