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

Finishing Silph Co. 11F

Browse source 
That's a fair chunk out of my day...

This commit finishes everything about Silph Co. 11F. DON'T. TOUCH IT. Unless there's a bug, but OTHERWISE, do NOT touch it. Holy shit.

Here's everything featured;
- Jessie and James fight, ported over.
- Rocket grunt changed to the appointment one from the strange room on the other side that really shouldn't be there tbh
- Omega fight now doesn't have the "watch out" text as I needed to do a micro-optimisation TRUST ME it was NECESSARY (it was not, in fact, necessary)
- Giovanni now reuses Beedrill and has a generally stronger team, scaling with the fifth Rival fight.
- Omega refight has been added after some toiling with the Team Rocket intro text that absolutely should not have happened but did for some reason AAA
- Rocket trio text somewhat tweaked

Oh and I ported over the balance patch on the stats, including some neo-Cryithan onboarding.
This commit is contained in:
Llinos Evans 2023-07-09 11:43:32 +01:00
parent e2901cd854
commit 0659fb1c65
17 changed files with 514 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,12 +4,12 @@ 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, 1 ; - Test J&J, Omega, & Giovanni
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
;warp_event 5, 1, INDIGO_PLATEAU_LOBBY, 1 ; easy league access
warp_event 5, 1, GARNET_CAVERN_B1F, 1 ; Test GCuno
;warp_event 5, 1, GARNET_CAVERN_B1F, 1 ; Test GCuno
;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew
def_bg_events

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

@ -13,8 +13,10 @@ SilphCo11F_Object:
object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person
object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person
object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2
object_event 3, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 41
object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40
object_event 6, 11, SPRITE_MONSTER, STAY, UP, 7, OMEGA, 45 | OW_POKEMON
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, 45 | OW_POKEMON
object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGA, 75 | OW_POKEMON
def_warps_to SILPH_CO_11F