diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:39:01 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:39:01 -0500 |
| commit | 8bf255b9f84f7e4f93e85a75512a002ef240a10f (patch) | |
| tree | 786ae5588f8bfe4b067cb3e91fd66cc4d95bd2da /text | |
| parent | 7cc2571529d6b3f5ffcbb71c62fab31b27ba224a (diff) | |
Prepare to merge
Diffstat (limited to 'text')
| -rw-r--r-- | text/battle.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/text/battle.asm b/text/battle.asm index 42bf2b7c0..b9b121455 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -104,7 +104,7 @@ PerishCountText: ; 0x80864 prompt ; 0x80880 -BattleText_0x80880: ; 0x80880 +BattleText_TargetRecoveredWithItem: ; 0x80880 text "<TARGET>" line "recovered with" cont "@" @@ -122,7 +122,7 @@ BattleText_UserRecoveredPPUsing: ; 0x80899 prompt ; 0x808b6 -BattleText_0x808b6: ; 0x808b6 +BattleText_TargetWasHitByFutureSight: ; 0x808b6 text "<TARGET>" line "was hit by FUTURE" cont "SIGHT!" @@ -135,14 +135,14 @@ BattleText_SafeguardFaded: ; 0x808d2 prompt ; 0x808e7 -BattleText_PkmnnLightScreenFell: ; 0x808e7 +BattleText_PkmnLightScreenFell: ; 0x808e7 text_from_ram StringBuffer1 text " #MON's" line "LIGHT SCREEN fell!" prompt ; 0x80905 -BattleText_0x80905: ; 0x80905 +BattleText_PkmnReflectFaded: ; 0x80905 text_from_ram StringBuffer1 text " #MON's" line "REFLECT faded!" |