Finishing Silph Co. 11F

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

View file

@ -771,7 +771,10 @@
const_skip 5
const EVENT_BEAT_SILPH_CO_10F_TRAINER_0
const EVENT_BEAT_SILPH_CO_10F_TRAINER_1
const_skip 5
const_skip 2
const EVENT_780 ; jessie and james
const EVENT_781 ; jessie and james
const EVENT_782 ; jessie and james
const EVENT_SILPH_CO_10_UNLOCKED_DOOR
const_skip 11
const EVENT_BEAT_SILPH_CO_11F_TRAINER_0

View file

@ -199,9 +199,11 @@ DEF SHOW EQU $15
const HS_SILPH_CO_10F_ITEM_2 ; BA X best deck
const HS_SILPH_CO_10F_ITEM_3 ; BB X
const HS_SILPH_CO_11F_1 ; BC
const HS_SILPH_CO_11F_2 ; BD
const HS_SILPH_CO_11F_JAMES ; BD
const HS_SILPH_CO_11F_3 ; BE
const HS_SILPH_CO_11F_JESSIE ; BD
const HS_OMEGA ; BF
const HS_OMEGA_2
const HS_DRAGONITE ; C0
const HS_MOLTRES ; C1
const HS_POKEMON_MANSION_2F_ITEM ; C2 X
@ -260,5 +262,5 @@ DEF SHOW EQU $15
const HS_ROCK_TUNNEL_B1F_AMBER ; F8
const HS_ROCK_TUNNEL_B1F_WING ; F9
const HS_MT_MOON_CRATER_GUARD ; FA
const HS_DAYCARE_BULBASAUR ; FB
const HS_DAYCARE_BULBASAUR ; FB should be FD
DEF NUM_HS_OBJECTS EQU const_value