Merge branch 'mistress' into renewables

scripts/CitrineRocketHouse.asm

@@ -16,10 +16,10 @@ MartGuy1Text:
 	script_mart TM_SWORDS_DANCE, TM_WHIRLWIND, TM_TOXIC, TM_BODY_SLAM, TM_DOUBLE_EDGE, TM_BUBBLEBEAM, TM_WATER_GUN, TM_ICE_BEAM, TM_BLIZZARD, TM_HYPER_BEAM, TM_PAY_DAY, TM_COUNTER, TM_SEISMIC_TOSS, TM_RAGE
 
 MartGuy2Text:
-	script_mart TM_MEGA_DRAIN, TM_SOLARBEAM, TM_DRAGON_RAGE, TM_THUNDERBOLT, TM_THUNDER, TM_EARTHQUAKE, TM_DIG, TM_PSYCHIC_M, TM_TELEPORT, TM_MIMIC, TM_BIDE, TM_METRONOME, TM_SELFDESTRUCT, TM_FIRE_BLAST
+	script_mart TM_MEGA_DRAIN, TM_SOLARBEAM, TM_DRAGON_RAGE, TM_THUNDERBOLT, TM_THUNDER, TM_EARTHQUAKE, TM_FISSURE, TM_DIG, TM_PSYCHIC_M, TM_TELEPORT, TM_MIMIC, TM_BIDE, TM_METRONOME, TM_SELFDESTRUCT
 
 MartGuy3Text:
-	script_mart TM_SWIFT, TM_SKULL_BASH, TM_SOFTBOILED, TM_DREAM_EATER, TM_SKY_ATTACK, TM_REST, TM_THUNDER_WAVE, TM_PSYWAVE, TM_EXPLOSION, TM_ROCK_SLIDE, TM_TRI_ATTACK, TM_SUBSTITUTE
+	script_mart TM_FIRE_BLAST, TM_SWIFT, TM_SKULL_BASH, TM_SOFTBOILED, TM_DREAM_EATER, TM_SKY_ATTACK, TM_REST, TM_THUNDER_WAVE, TM_PSYWAVE, TM_EXPLOSION, TM_ROCK_SLIDE, TM_TRI_ATTACK, TM_SUBSTITUTE
 
 MartGuy4Text:
 	script_mart PROTECTOR, UP_GRADE, DUBIOUS_DISC, METAL_COAT, BLK_AUGURITE, DOME_FOSSIL, HELIX_FOSSIL, WING_FOSSIL, OLD_AMBER

scripts/OaksLab.asm

@@ -365,9 +365,21 @@ OaksLabScript9: ; This is where Blue picks up the ball and removes the sprite.
 	cp $7
 	jr nz, .rivalDidNotChoseBall4
 	ld a, HS_STARTER_BALL_4
+	ld a, HS_DAMIEN			; This makes the starter gifts show up if you and your rival picked Pikachu and Eevee. It used to be coded differently but for some reason they still showed up if you picked Charmander or Squirtle, so I had to change it.
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	ld a, HS_VERMILION_JENNY
+	ld [wMissableObjectIndex], a
+	predef ShowObject
 	jr .hideBallAndContinue
 .rivalDidNotChoseBall4
 	ld a, HS_STARTER_BALL_5
+	ld a, HS_DAMIEN
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	ld a, HS_VERMILION_JENNY
+	ld [wMissableObjectIndex], a
+	predef ShowObject
 	jr .hideBallAndContinue
 .hideBallAndContinue
 	ld [wMissableObjectIndex], a
@@ -914,7 +926,6 @@ OaksLabText4:
 ; $6 = Eevee
 OaksLabTextPikachu:
 	text_asm
-	call PikachuEeveeMode
 	ld a, STARTER5
 	ld [wRivalStarterTemp], a
 	ld a, $8
@@ -925,7 +936,6 @@ OaksLabTextPikachu:
 
 OaksLabTextEevee:
 	text_asm
-	call PikachuEeveeMode
 	ld a, STARTER4
 	ld [wRivalStarterTemp], a
 	ld a, $7
@@ -1377,26 +1387,6 @@ OaksLabText_1d405:
 	text_far _OaksLabText_1d405
 	text_end
 
-; This is used to display Damien and Officer Jenny for Charmander and Squirtle, respectively.
-; It was set up in this way to easily add new things for the mode.
-; By default, all Pikachu/Eevee Mode things are hidden - more efficient.
-PikachuEeveeMode:
-	ld hl, PikachuEeveeShows
-.loop
-	ld a, [hli]
-	cp -1
-	ret z
-	push hl
-	ld [wMissableObjectIndex], a
-	predef ShowObject
-	pop hl
-	jr .loop
-
-PikachuEeveeShows:
-	db HS_DAMIEN ; Charmander guy
-	db HS_VERMILION_JENNY ; Squirtle
-	db -1 ; end
-
 ; Moved here to turn into a new bg event
 OakLabEmailText:
 	text_asm

scripts/VermilionCity.asm

@@ -287,6 +287,7 @@ OfficerJennySquirtle:
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	lb bc, SQUIRTLE, 16
 	call GivePokemon
+	jp nc, .fullParty
 	ld a, [wAddedToParty]
 	and a
 	call z, WaitForTextScrollButtonPress
@@ -303,6 +304,14 @@ OfficerJennySquirtle:
 .noBadge
 	ld hl, OfficerJennyNoBadge
 	jr .done
+.fullParty
+	ld hl, JennyFullParty
+	call PrintText
+	ld a, [wSimulatedJoypadStatesEnd] ; ensuring that the text doesn't autoskip.
+	and a ; yep, here too.
+	call z, WaitForTextScrollButtonPress ; and here.
+	call EnableAutoTextBoxDrawing ; and here.
+	; falls through to the next quote.
 .refuse
 	ld hl, OfficerJennyRefuse
 	; fallthrough
@@ -331,6 +340,10 @@ OfficerJennyHowDoing:
 	text_far _OfficerJennyText5
 	text_end
 
+JennyFullParty:
+	text_far _JennyFullParty
+	text_end
+
 EventVermillionCitySSTicket:
 	text_far _SSAnneFlashedTicketText
 	text_end