aboutsummaryrefslogtreecommitdiffstats
path: root/engine/evos_moves.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 00:54:49 -0700
committerGitHub <noreply@github.com>2016-06-12 00:54:49 -0700
commitbcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (patch)
tree2ffb3b9c8eca5fc4e2be2fc8aaf4965f64a13296 /engine/evos_moves.asm
parentMerge pull request #13 from YamaArashi/master (diff)
parentmore syncing with pokered (diff)
downloadpokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.gz
pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.xz
pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.zip
Merge pull request #16 from YamaArashi/master
sync engine code with pokered
Diffstat (limited to 'engine/evos_moves.asm')
-rwxr-xr-xengine/evos_moves.asm5
1 files changed, 2 insertions, 3 deletions
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm
index 78ead030..8ec2c4c7 100755
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -24,8 +24,7 @@ EvolutionAfterBattle:
ld hl, wPartyCount
push hl
-Evolution_PartyMonLoop:
-; loop over party mons
+Evolution_PartyMonLoop: ; loop over party mons
ld hl, wWhichPokemon
inc [hl]
pop hl
@@ -313,7 +312,7 @@ StoppedEvolvingText:
TX_FAR _StoppedEvolvingText
db "@"
-IsEvolvingText: ; 3affe (e:6ffes)
+IsEvolvingText:
TX_FAR _IsEvolvingText
db "@"