diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
| commit | 1ecfe6bd23bb9b4e1886342c082bd5c3a108abbb (patch) | |
| tree | 8190d5b11ebec4505c5494baf74b339ae9c82078 /text/battle.asm | |
| parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
| parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) | |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'text/battle.asm')
| -rw-r--r-- | text/battle.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/text/battle.asm b/text/battle.asm index b850c9661..5cd41bcca 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -30,7 +30,7 @@ PokemonFellFromTreeText: ; 0x80778 prompt ; 0x80793 -WildPokemonAppearedText2: ; 0x80793 +WildCelebiAppearedText: ; 0x80793 text "Wild @" text_from_ram $c616 db $0 @@ -60,43 +60,43 @@ BattleText_0x807cf: ; 0x807cf prompt ; 0x807e2 -BattleText_0x807e2: ; 0x807e2 +HurtByPoisonText: ; 0x807e2 text $5a line "is hurt by poison!" prompt ; 0x807f8 -BattleText_0x807f8: ; 0x807f8 +HurtByBurnText: ; 0x807f8 text $5a, "'s" line "hurt by its burn!" prompt ; 0x8080e -BattleText_0x8080e: ; 0x8080e +LeechSeedSapsText: ; 0x8080e text "LEECH SEED saps" line $5a, "!" prompt ; 0x80822 -BattleText_0x80822: ; 0x80822 +HasANightmareText: ; 0x80822 text $5a line "has a NIGHTMARE!" prompt ; 0x80836 -BattleText_0x80836: ; 0x80836 +HurtByCurseText: ; 0x80836 text $5a, "'s" line "hurt by the CURSE!" prompt ; 0x8084d -BattleText_0x8084d: ; 0x8084d +SandstormHitsText: ; 0x8084d text "The SANDSTORM hits" line $5a, "!" prompt ; 0x80864 -BattleText_0x80864: ; 0x80864 +PerishCountText: ; 0x80864 text $5a, "'s" line "PERISH count is @" deciram $d265, $11 |