WE ARE TEAM ROCKET, YOU CANNOT BEAT US

- Adds a slightly remade version of the Rocket battle theme that plays when fighting Rocket Grunts, Jessie & James, and Giovanni (1 and 2)

- Giovanni 3 and Chief now share a new battle theme composed by myself and LuciShrimp, which is a slower, more intimidating remix of the regular Rocket fight theme.

- Gave Giovanni 3 his own trainer class, allowing for better AI routines and smarter move choices.

- Removed Giovanni's name from the Viridian City Gym statues to keep his identity a further secret. It also made more sense than in vanilla.

- Gave the postgame Morimoto fight a better selection of moves.

data/maps/objects/ViridianGym.asm

@@ -11,7 +11,7 @@ ViridianGym_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  2,  2, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
+	object_event  2,  2, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_LEADER_GIOVANNI, 1
 	object_event 12,  7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
 	object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 5
 	object_event 10,  7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3

data/trainers/ai_pointers.asm

@@ -56,4 +56,5 @@ TrainerAIPointers:
 	dbw 2, BlackbeltAI ; Koichi
 	dbw 2, BlackbeltAI ; Jack
 	dbw 2, GenericAI ; Jessie & James
+	dbw 3, SabrinaAI
 	assert_table_length NUM_TRAINERS

data/trainers/encounter_types.asm

@@ -21,4 +21,5 @@ EvilTrainerList::
 	db OPP_CHANNELER
 	db OPP_AGATHA
 	db OPP_JESSIE_JAMES
+	db OPP_LEADER_GIOVANNI
 	db -1 ; end

data/trainers/move_choices.asm

@@ -61,4 +61,5 @@ TrainerClassMoveChoiceModifications:
 	move_choices 1, 2, 3 ; KOICHI
 	move_choices 1, 2, 3, 4 ; JACK
 	move_choices 1, 3,   ; JESSIE_JAMES
+	move_choices 1, 2, 3, 4 ; LEADER_GIOVANNI
 	assert_list_length NUM_TRAINERS

data/trainers/names.asm

@@ -52,4 +52,5 @@ TrainerNames::
 	li "KOICHI"
 	li "JACKY" ; Often called Jack, but the only source for that is the file names themselves, which are oft shortened or literal japanese translations; all other context is "Shinjuku Jacky".
 	li "JESSIE&JAMES"
+	li "GIOVANNI"
 	assert_list_length NUM_TRAINERS

data/trainers/parties.asm

@@ -52,6 +52,7 @@ TrainerDataPointers:
 	dw KoichiData
 	dw JackData
 	dw JessieJamesData
+	dw LeaderGiovanniData
 	assert_table_length NUM_TRAINERS
 
 ; if first byte != $FF, then

data/trainers/pic_pointers_money.asm

@@ -59,4 +59,5 @@ TrainerPicAndMoneyPointers::
 	pic_money KoichiPic,       9900
 	pic_money JackPic,         5000
 	pic_money JessieJamesPic,  5000
+	pic_money GiovanniPic2,    9900
 	assert_table_length NUM_TRAINERS

data/trainers/scaled_parties.asm

@@ -78,12 +78,13 @@ BlaineData:
 	db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0  ; 7 (unused)
 	db $FF, 62, RAPIDASH, 62, ARCANINE, 61, TAUROS_PB, 61, FLAREON, 62, CHARIZARD, 65, MAGMORTAR, 0  ; 8 (postgame)
 
-GiovanniData: ; is not scaled as he is always fought last
+GiovanniData:
 ; Rocket Hideout B4F
 	db $FF, 28, BEEDRILL, 30, RHYHORN, 30, KANGASKHAN, 32, PERSIAN, 0
 ; Silph Co. 11F - did you know this team was weaker than the rival in vanilla level-wise?
 	db $FF, 38, BEEDRILL, 39, RHYDON, 38, KANGASKHAN, 40, NIDOKING, 40, NIDOQUEEN, 42, PERSIAN, 0
-; Viridian Gym
+
+LeaderGiovanniData:
 	db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, GUARDIA, 48, NIDOQUEEN, 48, NIDOKING, 50, RHYPERIOR, 0
 
 LoreleiData:

data/trainers/special_moves.asm

@@ -795,7 +795,7 @@ SpecialTrainerMoves:
 	db 5, 2, SMOG
 	db 0
 
-	db GIOVANNI, 3		; Gym Leader Giovanni
+	db LEADER_GIOVANNI, 1
 	db 1, 1, BUBBLEBEAM
 	db 1, 2, EARTHQUAKE
 	db 2, 1, FISSURE
@@ -1157,6 +1157,27 @@ SpecialTrainerMoves:
 	db 6, 3, BODY_SLAM
 	db 6, 4, SOLARBEAM
 	db 0
+
+	db COOLTRAINER_M, 11	; GAME FREAK Morimoto
+	db 1, 1, BODY_SLAM
+	db 1, 2, HYPER_BEAM
+	db 1, 3, EARTHQUAKE
+	db 1, 4, ICE_PUNCH
+	db 2, 1, QUICK_ATTACK
+	db 2, 2, HYPER_BEAM
+	db 2, 3, GROWTH
+	db 2, 4, FIRE_BLAST
+	db 3, 1, QUICK_ATTACK
+	db 3, 2, BLIZZARD
+	db 3, 3, GROWTH
+	db 4, 1, QUICK_ATTACK
+	db 4, 3, GROWTH
+	db 5, 1, EARTHQUAKE
+	db 5, 2, ROCK_SLIDE
+	db 6, 1, BLIZZARD
+	db 6, 2, FIRE_BLAST
+	db 6, 3, THUNDER
+	db 0
 	
 	db YUJIROU, 10	; Yujirou postgame
 	db 1, 1, BUBBLEBEAM