diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /text | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'text')
| -rw-r--r-- | text/RocketHideoutB2F.asm | 6 | ||||
| -rw-r--r-- | text/RocketHideoutB4F.asm | 6 | ||||
| -rw-r--r-- | text/Route8.asm | 2 | ||||
| -rw-r--r-- | text/SilphCo6F.asm | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/text/RocketHideoutB2F.asm b/text/RocketHideoutB2F.asm index 4dffbc3b..5e25c935 100644 --- a/text/RocketHideoutB2F.asm +++ b/text/RocketHideoutB2F.asm @@ -1,15 +1,15 @@ -_RocketHideoutB1FRocketBattleText:: +_RocketHideoutB2FRocketBattleText:: text "BOSS said you can" line "see GHOSTs with" cont "the SILPH SCOPE!" done -_RocketHideoutB1FRocketEndBattleText:: +_RocketHideoutB2FRocketEndBattleText:: text "I" line "surrender!" prompt -_RocketHideoutB1FRocketAfterBattleText:: +_RocketHideoutB2FRocketAfterBattleText:: text "The TEAM ROCKET" line "HQ has 4 basement" cont "floors. Can you" diff --git a/text/RocketHideoutB4F.asm b/text/RocketHideoutB4F.asm index 5a116b45..daef15b6 100644 --- a/text/RocketHideoutB4F.asm +++ b/text/RocketHideoutB4F.asm @@ -51,17 +51,17 @@ _RocketHideoutB4FGiovanniHopeWeMeetAgainText:: line "again..." done -_RocketHideoutB4FRocket2BattleText:: +_RocketHideoutB4FRocketBattleText:: text "The elevator" line "doesn't work? Who" cont "has the LIFT KEY?" done -_RocketHideoutB4FRocket2EndBattleText:: +_RocketHideoutB4FRocketEndBattleText:: text "No!" prompt -_RocketHideoutB4FRocket2AfterBattleText:: +_RocketHideoutB4FRocketAfterBattleText:: text "Oh no! I dropped" line "the LIFT KEY!" done diff --git a/text/Route8.asm b/text/Route8.asm index a6b24d79..741fa442 100644 --- a/text/Route8.asm +++ b/text/Route8.asm @@ -50,7 +50,7 @@ _Route8CooltrainerF1BattleText:: line "I collect them!" done -_Route8CooltrainerF21EndBattleText:: +_Route8CooltrainerF1EndBattleText:: text "Why? Why??" prompt diff --git a/text/SilphCo6F.asm b/text/SilphCo6F.asm index 86581c24..83408a50 100644 --- a/text/SilphCo6F.asm +++ b/text/SilphCo6F.asm @@ -60,12 +60,12 @@ _SilphCo6FRocket1BattleText:: line "ROCKET BROTHERS!" done -_SilphCo6Rocket1EndBattleText:: +_SilphCo6FRocket1EndBattleText:: text "Flame" line "out!" prompt -_SilphCo6Rocket1AfterBattleText:: +_SilphCo6FRocket1AfterBattleText:: text "No matter!" line "My brothers will" cont "avenge me!" |