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

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

10
data/maps/hide_show_data.asm
View file

@ -522,10 +522,12 @@ SilphCo10FHS:
db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_1
db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_2
SilphCo11FHS:
db SILPH_CO_11F, $03, SHOW ; HS_SILPH_CO_11F_1
db SILPH_CO_11F, $04, SHOW ; HS_SILPH_CO_11F_2
db SILPH_CO_11F, $05, SHOW ; HS_SILPH_CO_11F_3
db SILPH_CO_11F, $06, SHOW ; HS_OMEGA
db SILPH_CO_11F, $03, SHOW ; Giovanni
db SILPH_CO_11F, $04, SHOW ; James
db SILPH_CO_11F, $05, SHOW ; Rocket
db SILPH_CO_11F, $06, SHOW ; James
db SILPH_CO_11F, $07, SHOW ; HS_OMEGA
db SILPH_CO_11F, $08, HIDE ; HS_OMEGA_2
UnderwaterTunnelHS:
db UNDERWATER_TUNNEL, $01, SHOW ; HS_DRAGONITE
CinnabarVolcanoHS:

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

2
data/pokemon/base_stats/bawligua.asm
View file

@ -3,7 +3,7 @@
db 72, 53, 46, 98, 81
; hp atk def spd spc
db WATER, WATER ; type
db DRAGON, DRAGON ; type
db 45 ; catch rate
db 144 ; base exp

4
data/pokemon/base_stats/cryithan.asm
View file

@ -1,9 +1,9 @@
db DEX_CRYITHAN ; pokedex id
db 92, 83, 76, 118, 101
db 92, 93, 76, 108, 121
; hp atk def spd spc
db WATER, DRAGON ; type
db DRAGON, DRAGON ; type
db 9 ; catch rate
db 210 ; base exp

2
data/pokemon/base_stats/gyaoon.asm
View file

@ -1,6 +1,6 @@
db DEX_GYAOON ; pokedex id
db 101, 110, 100, 30, 95
db 101, 124, 100, 30, 95
; hp atk def spd spc
db ROCK, ROCK ; type

2
data/pokemon/base_stats/omega.asm
View file

@ -1,6 +1,6 @@
db DEX_OMEGA ; pokedex id
db 101, 100, 120, 25, 95
db 101, 106, 120, 25, 95
; hp atk def spd spc
db STEEL, STEEL ; type

2
data/pokemon/base_stats/skimper.asm
View file

@ -3,7 +3,7 @@
db 62, 43, 36, 88, 71
; hp atk def spd spc
db WATER, WATER ; type
db DRAGON, DRAGON ; type
db 60 ; catch rate
db 67 ; base exp

2
data/pokemon/base_stats/trampel.asm
View file

@ -1,6 +1,6 @@
db DEX_TRAMPEL ; pokedex id
db 130, 100, 90, 56, 64
db 110, 100, 90, 56, 64
; hp atk def spd spc
db NORMAL, GROUND ; type

8
data/trainers/parties.asm
View file

@ -739,11 +739,11 @@ JackData:
db 70, ANIMON, PURAKKUSU, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...
JessieJamesData:
db 14, EKANS, MEOWTH, KOFFING, 0 ; Mt. Moon
db 25, KOFFING, LICKITUNG, MEOWTH, EKANS, 0 ; Rocket Hideout
db 14, MEOWTH, EKANS, KOFFING, 0 ; Mt. Moon
db 25, MEOWTH, EKANS, LICKITUNG, KOFFING, 0 ; Rocket Hideout
db 27, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, 0 ; Pokemon Tower
db 31, WEEZING, ARBOK, LICKITUNG, VICTREEBEL, GYARADOS, MEOWTH, 0 ; Silph Co.
db $FF, 80, MEOWTH, 72, ARBOK, 71, WEEZING, 74, LICKILICKY, 74, VICTREEBEL, 74, GYARADOS, 0 ; Citrine Rocket House
db 37, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, GYARADOS, 0 ; Silph Co.
db $FF, 80, MEOWTH, 72, LICKILICKY, 72, ARBOK, 71, VICTREEBEL, 74, WEEZING, 76, GYARADOS, 0 ; Citrine Rocket House
INCLUDE "data/trainers/scaled_parties.asm"
INCLUDE "data/trainers/rival_parties.asm"

4
data/trainers/scaled_parties.asm
View file

@ -79,8 +79,8 @@ SabrinaData:
GiovanniData: ; is not scaled as he is always fought last
; Rocket Hideout B4F
db $FF, 30, BEEDRILL, 32, RHYHORN, 32, KANGASKHAN, 34, PERSIAN, 0
; Silph Co. 11F
db $FF, 37, KANGASKHAN, 36, NIDOKING, 37, NIDOQUEEN, 40, PERSIAN, 42, RHYDON, 0
; Silph Co. 11F - did you know this team was weaker than the rival in vanilla level-wise?
db $FF, 40, BEEDRILL, 42, RHYDON, 42, KANGASKHAN, 43, NIDOKING, 43, NIDOQUEEN, 45, PERSIAN, 0 ; if persian slash is desirable, make it L47.
; Viridian Gym
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, GUARDIA, 48, NIDOKING, 50, RHYPERIOR, 0