merge conflicts resolved

This commit is contained in:
JimB16
2015-10-19 16:25:15 +02:00
49 changed files with 3435 additions and 3173 deletions

View File

@@ -70,12 +70,12 @@ Function1dd7ae: ; 1dd7ae
call PlaceString
hlcoord 12, 15
ld de, GameTimeHours
ld bc, $0204
lb bc, 2, 4
call PrintNum
ld [hl], $67
inc hl
ld de, GameTimeMinutes
ld bc, $8102
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ret
; 1dd7f0