Prepare to merge

2015-11-01 18:13:31 -05:00
parent 31c407bb3d
commit 010b450834
15 changed files with 153 additions and 130 deletions
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -6,6 +6,9 @@ MAX_BALLS     EQU 12
 MAX_KEY_ITEMS EQU 25
 MAX_PC_ITEMS  EQU 50

+LO_NYBBLE EQU $0f
+HI_NYBBLE EQU $f0
+
 ; strings
 PLAYER_NAME_LENGTH EQU 8
 PKMN_NAME_LENGTH EQU 11