Giovanni uses his unused theme, and more!

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

View file

@ -685,7 +685,9 @@
const_skip 15
const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0
const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1
const_skip 15
const_skip 13
const EVENT_6A0
const_skip
const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2

View file

@ -150,6 +150,8 @@ DEF SHOW EQU $15
const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 8A X
const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 8B X
const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 8C
const HS_ROCKET_HIDEOUT_B4F_JAMES ; uhhh 86
const HS_ROCKET_HIDEOUT_B4F_JESSIE ; uhhh87
const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 8D X
const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 8E X
const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 8F X

View file

@ -59,6 +59,7 @@
const MUSIC_FIELD06
const MUSIC_MEET_JESSIE_JAMES
const MUSIC_MTMOONSQUARE
const MUSIC_SAKAKI
const NUM_SONGS