diff options
| author | dannye <33dannye@gmail.com> | 2021-05-31 16:43:31 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-05-31 16:51:45 -0500 |
| commit | 7a23e2a635318754b56923824d5949bcff3815bf (patch) | |
| tree | 6e57c5b6762b76ce8e18e8b08dace841f640a01d /text/SaffronGym.asm | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Merge pull request #325 from CelestialAmber/master (diff) | |
| download | pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.tar.gz pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.tar.xz pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'text/SaffronGym.asm')
| -rw-r--r-- | text/SaffronGym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index a42a6932..eab08aea 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -1,4 +1,4 @@ -_SaffronGymText_5d162:: +_SabrinaPreBattleText:: text "I had a vision of" line "your arrival!" @@ -16,7 +16,7 @@ _SaffronGymText_5d162:: cont "you my powers!" done -_SaffronGymText_5d167:: +_ReceivedMarshBadgeText:: text "I'm" line "shocked!" cont "But, a loss is a" @@ -30,14 +30,14 @@ _SaffronGymText_5d167:: line "MARSHBADGE!@" text_end -_SaffronGymText_5d16e:: +_SabrinaPostBattleAdviceText:: text "Everyone has" line "psychic power!" cont "People just don't" cont "realize it!" done -_SaffronGymText_5d173:: +_KogaMarshBadgeInfoText:: text "The MARSHBADGE" line "makes #MON up" cont "to L70 obey you!" @@ -55,7 +55,7 @@ _SaffronGymText_5d173:: line "this TM with you!" done -ReceivedTM46Text:: +_ReceivedTM46Text:: text "<PLAYER> received" line "TM46!@" text_end @@ -74,7 +74,7 @@ _TM46NoRoomText:: line "of other items!" done -_SaffronGymText_5d1e6:: +_SaffronGymGuidePreBattleText:: text "Yo! Champ in" line "making!" @@ -91,7 +91,7 @@ _SaffronGymText_5d1e6:: cont "even aim a punch!" done -_SaffronGymText_5d1eb:: +_SaffronGymGuidePostBattleText:: text "Psychic power," line "huh?" |