Fix merge conflicts

2015-11-01 18:14:37 -05:00
parent 010b450834 25c126c69b
commit 6b2d0ae841
33 changed files with 717 additions and 641 deletions
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -6,9 +6,6 @@ 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