Prepare to merge

This commit is contained in:
PikalaxALT
2016-01-18 00:39:01 -05:00
parent 7cc2571529
commit 8bf255b9f8
14 changed files with 301 additions and 290 deletions

View File

@@ -399,7 +399,7 @@ PlaceEnemysName:: ; 121b
cp RIVAL2
jr z, .rival
ld de, OTName
ld de, OTClassName
call PlaceString
ld h, b
ld l, c
@@ -416,7 +416,7 @@ PlaceEnemysName:: ; 121b
jr PlaceCommandCharacter
.linkbattle
ld de, OTName
ld de, OTClassName
jr PlaceCommandCharacter