summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2018-08-16 07:48:39 -0600
committerIIMarckus <iimarckus@gmail.com>2018-08-16 07:51:39 -0600
commit46f02aaee0fa392c1d2219818982a45dfffb348b (patch)
treecfbd402ecb6d399a467bf029b4a142eb145aad07 /main.asm
parent439f493aa9335759ed9d82b689ba0cd8f38882b2 (diff)
Sync many constant/macro files with pokecrystal.
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index 4d4f57da..9f8465b5 100644
--- a/main.asm
+++ b/main.asm
@@ -150,7 +150,7 @@ INCLUDE "engine/learn.asm"
CheckNickErrors:: ; 677e (1:677e)
push bc
push de
- ld b, PKMN_NAME_LENGTH
+ ld b, MON_NAME_LENGTH
.checkchar
ld a, [de]
cp "@"
@@ -317,7 +317,7 @@ ScrollBGMapPalettes:: ; 804f (2:404f)
INCLUDE "tilesets/palette_maps.asm"
Unknown85d7:
- rept NUM_MAP_GROUPS
+ rept 26 ; NUM_MAP_GROUPS
db PAL_BG_ROOF
endr