Attempt to make yellow buildable, part 3

home.asm

@@ -21,7 +21,7 @@ SECTION "rst 38", ROM0 [$38]
 SECTION "vblank", ROM0 [$40]
 	jp VBlank
 SECTION "hblank", ROM0 [$48]
-	jp HBlank
+	jp LCDC
 SECTION "timer",  ROM0 [$50]
 	jp Timer
 SECTION "serial", ROM0 [$58]
@@ -718,7 +718,7 @@ PrintBCDNumber:: ; 13ad (0:13ad)
 	jr z,.loop
 	bit 7,b
 	jr nz,.loop
-	ld [hl],"¥"
+	ld [hl], "¥"
 	inc hl
 .loop
 	ld a,[de]
@@ -738,7 +738,7 @@ PrintBCDNumber:: ; 13ad (0:13ad)
 .skipRightAlignmentAdjustment
 	bit 5,b
 	jr z,.skipCurrencySymbol
-	ld [hl],"¥"
+	ld [hl], "¥"
 	inc hl
 .skipCurrencySymbol
 	ld [hl],"0"
@@ -757,7 +757,7 @@ PrintBCDDigit:: ; 13e4 (0:13e4)
 ; if bit 7 is set, then no numbers have been printed yet
 	bit 5,b ; print the currency symbol?
 	jr z,.skipCurrencySymbol
-	ld [hl],"¥"
+	ld [hl], "¥"
 	inc hl
 	res 5,b
 .skipCurrencySymbol

text.asm

@@ -2089,11 +2089,7 @@ _ColosseumVersionText::
 	prompt
 
 _Char00Text::
-<<<<<<< HEAD
 	TX_NUM hSpriteIndexOrTextID,1,2
-=======
-	TX_NUM $FF8C,1,2
->>>>>>> 6bdf0c5... Remove (incorrect) address comments
 	text " error."
 	done
 
@@ -2493,19 +2489,11 @@ _DreamWasEatenText::
 	line "dream was eaten!"
 	prompt
 
-<<<<<<< HEAD
 _TradeCenterText1::
 	text "!"
 	done
 
 _ColosseumText1::
-=======
-_BattleCenterMText1::
-	text "!"
-	done
-
-_TradeCenterMText1::
->>>>>>> 6bdf0c5... Remove (incorrect) address comments
 	text "!"
 	done
 

yellow/main.asm

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-INCLUDE "yellow.asm"
+INCLUDE "charmap.asm"
 INCLUDE "constants.asm"
 
 NPC_SPRITES_1 EQU $4
@@ -1069,8 +1068,3 @@ INCLUDE "engine/bank3f/main.asm"
 ;BeachHouse_Block:
 ;	INCBIN "gfx/blocksets/beachhouse.bst"
 ;ENDC
-
-=======
-INCLUDE "charmap.asm"
-INCLUDE "main.asm"
->>>>>>> e4bb6ce... Build only Yellow