From d42e9f5b72de3d505622b0eb360f5fdfd388e26b Mon Sep 17 00:00:00 2001
From: luckytyphlosion <alan.rj.huang@gmail.com>
Date: Sat, 1 Aug 2015 17:42:36 -0400
Subject: Attempt to make yellow buildable, part 3

---
 yellow/main.asm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'yellow/main.asm')

diff --git a/yellow/main.asm b/yellow/main.asm
index bdca0983..025fe8be 100755
--- a/yellow/main.asm
+++ b/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
-- 
cgit v1.3.1-sl0p