constants/event_constants.asm

@@ -1,7 +1,7 @@
 const_value = 0
 
 	const EVENT_FOLLOWED_OAK_INTO_LAB                ; 000, (D747, bit 0)
-	const EVENT_001                                  ; 001, (D747, bit 1)
+	const EVENT_BEAT_BROCK_REMATCH                   ; 001, (D747, bit 1)
 	const EVENT_002                                  ; 002, (D747, bit 2)
 	const EVENT_HALL_OF_FAME_DEX_RATING              ; 003, (D747, bit 3)
 	const EVENT_004                                  ; 004, (D747, bit 4)

data/trainer_parties.asm

@@ -599,18 +599,25 @@ BrunoData:
 	db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0
 BrockData:
 	db $FF,12,GEODUDE,14,ONIX,0
+	db $FF,34,GRAVELER,38,ONIX,0
 MistyData:
 	db $FF,18,STARYU,21,STARMIE,0
+	db $FF,46,STARYU,52,STARMIE,0
 LtSurgeData:
 	db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0
+	db $FF,52,VOLTORB,46,PIKACHU,58,RAICHU,0
 ErikaData:
 	db $FF,29,VICTREEBEL,24,TANGELA,29,VILEPLUME,0
+	db $FF,68,VICTREEBEL,58,TANGELA,68,VILEPLUME,0
 KogaData:
 	db $FF,37,KOFFING,39,MUK,37,KOFFING,43,WEEZING,0
+	db $FF,84,KOFFING,88,MUK,84,KOFFING,96,WEEZING,0
 BlaineData:
 	db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0
+	db $FF,94,GROWLITHE,90,PONYTA,94,RAPIDASH,100,ARCANINE,0
 SabrinaData:
 	db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0
+	db $FF,86,KADABRA,84,MR_MIME,86,VENOMOTH,96,ALAKAZAM,0
 GentlemanData:
 ; SS Anne 1F Rooms
 	db 18,GROWLITHE,GROWLITHE,0

text.asm

@@ -14,6 +14,7 @@ TEXT_11 EQU TEXT_10 + 1
 
 POKEDEX_TEXT EQU TEXT_11 + 1
 MOVE_NAMES   EQU POKEDEX_TEXT + 1
+REMATCH_TEXT EQU MOVE_NAMES + 1
 
 INCLUDE "macros.asm"
 INCLUDE "hram.asm"
@@ -3200,3 +3201,7 @@ INCLUDE "text/pokedex.asm"
 SECTION "Move Names", ROMX, BANK[MOVE_NAMES]
 
 INCLUDE "text/move_names.asm"
+
+SECTION "Rematch Text", ROMX, BANK[REMATCH_TEXT]
+
+INCLUDE "text/rematch/brock.asm"

text/rematch/brock.asm

@@ -0,0 +1,38 @@
+;ref	blah "Welcome to the"
+_BrockRematch_PreBattle::
+	text "You beat the"
+	line "Elite Four?"
+	cont "And you want"
+	cont "a rematch?"
+
+	para "Very well, but"
+	line "just know that"
+	cont "I'm stronger"
+	cont "now than ever"
+	cont "before!"
+
+	para "Let's go!"
+	done
+
+;ref    blah "Welcome to the"
+_BrockRematch_EndBattle::
+	text "I took you"
+	line "for granted!"
+	cont "Again!"
+
+	para "I may just"
+	line "retire after"
+	cont "this defeat!"
+	done
+
+_BrockRematch_AfterBattle::
+	text "Well, that"
+	line "was fun!"
+
+	para "I wish I had"
+	line "beat you,"
+	cont "though..."
+
+	para "Oh well!"
+	line "Goodbye!"
+	prompt