From d53a662550eda27bb5422466c7f8b3e3e5bffe61 Mon Sep 17 00:00:00 2001 From: MineRobber9000 Date: Fri, 25 May 2018 02:54:01 -0400 Subject: [PATCH] Add Brock rematch text --- text.asm | 5 +++++ text/rematch/brock.asm | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 text/rematch/brock.asm diff --git a/text.asm b/text.asm index fc075e19..3ee31744 100644 --- a/text.asm +++ b/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" diff --git a/text/rematch/brock.asm b/text/rematch/brock.asm new file mode 100644 index 00000000..78d3e32d --- /dev/null +++ b/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