diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
| commit | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch) | |
| tree | 459220542fcbfbd48b9725b48597b5740ee1ec0f /text | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'text')
| -rw-r--r-- | text/maps/champion.asm | 6 | ||||
| -rw-r--r-- | text/maps/seafoam_islands_b4f.asm | 2 | ||||
| -rw-r--r-- | text/maps/unknown_dungeon_b1f.asm | 2 | ||||
| -rw-r--r-- | text/maps/victory_road_2f.asm | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/text/maps/champion.asm b/text/maps/champion.asm index eb0287af..51258818 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -1,4 +1,4 @@ -_GaryText_760f4:: +_GaryChampionIntroText:: text $53, ": Hey!" para "I was looking" @@ -35,7 +35,7 @@ _GaryText_760f4:: cont "in the world!" done -_GaryText_760f9:: +_GaryDefeatedText:: text "NO!" line "That can't be!" cont "You beat my best!" @@ -49,7 +49,7 @@ _GaryText_760f9:: cont "It's not fair!" prompt -_GaryText_760fe:: +_GaryVictoryText:: text "Hahaha!" line "I won, I won!" diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm index c4649f4f..dccb43c0 100644 --- a/text/maps/seafoam_islands_b4f.asm +++ b/text/maps/seafoam_islands_b4f.asm @@ -1,4 +1,4 @@ -_SeafoamIslands5BattleText2:: +_ArticunoBattleText:: text "Gyaoo!@@" _SeafoamIslands5Text4:: diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm index bea7df28..4db8467f 100644 --- a/text/maps/unknown_dungeon_b1f.asm +++ b/text/maps/unknown_dungeon_b1f.asm @@ -1,3 +1,3 @@ -_UnknownDungeon3MewtwoText:: +_MewtwoBattleText:: text "Mew!@@" diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm index 390d8d54..bc1b6cd9 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/victory_road_2f.asm @@ -1,4 +1,4 @@ -_VictoryRoad2BattleText6:: +_MoltresBattleText:: text "Gyaoo!@@" _VictoryRoad2BattleText1:: |