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

Giovanni uses his unused theme, and more!

Browse source 
This update does a good few things. Giovanni now uses his unused encounter theme in all pre-fights, which is followed by the regular evil trainer theme when you're about to fight him. This feels very correct. His team has also been minorly altered.

I backported LGPE's pre-fight monologue for Giovanni in Rocket Hideout B4F. Adapted for RB's story, of course, no Cubones here. The original text is very awkward and abrupt, and it also makes the encounter theme feel much more effective in delivery. I think a lot of people can appreciate this.

I also backported Jessie and James for Rocket Hideout B4F while I was at it. I had to change their event script quite a bit for it to fit, and their walking seems...awkward. Regardless, it's functional. The rest will be done with time.

To make future dev door testing easier, I'm keeping all warps I've previously used in comments.
This commit is contained in:
Llinos Evans 2023-05-05 04:48:58 +01:00
parent 48bf1bfe45
commit 16e3c69ee8
14 changed files with 407 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/hide_show_data.asm
View file

@ -455,6 +455,8 @@ RocketHideoutB3FHS:
db ROCKET_HIDEOUT_B3F, $04, SHOW ; HS_ROCKET_HIDEOUT_B3F_ITEM_2
RocketHideoutB4FHS:
db ROCKET_HIDEOUT_B4F, $01, SHOW ; HS_ROCKET_HIDEOUT_B4F_GIOVANNI
db ROCKET_HIDEOUT_B4F, $02, SHOW ; HS_ROCKET_HIDEOUT_B4F_JAMES
db ROCKET_HIDEOUT_B4F, $03, SHOW ; HS_ROCKET_HIDEOUT_B4F_JESSIE
db ROCKET_HIDEOUT_B4F, $05, SHOW ; HS_ROCKET_HIDEOUT_B4F_ITEM_1
db ROCKET_HIDEOUT_B4F, $06, SHOW ; HS_ROCKET_HIDEOUT_B4F_ITEM_2
db ROCKET_HIDEOUT_B4F, $07, SHOW ; HS_ROCKET_HIDEOUT_B4F_ITEM_3

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

@ -3,7 +3,9 @@ RedsHouse2F_Object:
def_warp_events
warp_event 7, 1, REDS_HOUSE_1F, 3
warp_event 5, 1, SILPH_GAUNTLET_7F, 1
;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief
;warp_event 5, 1, SILPH_CO_11F, 1 ; - Test Omega & Giovanni
warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
def_bg_events

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

@ -10,8 +10,8 @@ RocketHideoutB4F_Object:
def_object_events
object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1
object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 16
object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 17
object_event 25, 10, SPRITE_JAMES, STAY, DOWN, 2
object_event 24, 10, SPRITE_JESSIE, STAY, DOWN, 3
object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18
object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, 5, HP_UP
object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND

4
data/trainers/scaled_parties.asm
View file

@ -77,8 +77,8 @@ SabrinaData:
db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, RAPIDASH_G, 67, ALAKAZAM, 70, ARTICUNO_G, 0 ; 8 (postgame)
GiovanniData: ; is not scaled as he is always fought last
; Rocket Hideout B4F - should be changed to Lavender Tower
db $FF, 27, RHYHORN, 26, BEEDRILL, 31, KANGASKHAN, 31, PERSIAN, 0
; Rocket Hideout B4F
db $FF, 29, BEEDRILL, 32, RHYHORN, 31, KANGASKHAN, 37, PERSIAN, 0
; Silph Co. 11F
db $FF, 37, KANGASKHAN, 36, NIDOKING, 37, NIDOQUEEN, 40, PERSIAN, 42, RHYDON, 0
; Viridian Gym