From 10af88ddd712415f2a0a2b6124187d51075c95d5 Mon Sep 17 00:00:00 2001
From: "U-Daniel-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 8 Jun 2015 01:52:50 -0500
Subject: text.o

Conflicts:
	main.asm
	text.asm
	text/maps/cerulean_trade_house.asm
	text/maps/copycats_house_1f.asm
	text/maps/daycare_2.asm
	text/maps/museum_2f.asm
	text/maps/oaks_lab.asm
	text/maps/pewter_gym.asm
	text/maps/route_9_1.asm
	text/maps/school.asm
	text/maps/vermilion_gym_1.asm
	wram.asm
	yellow/text.asm
---
 yellow/text.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yellow')

diff --git a/yellow/text.asm b/yellow/text.asm
index a84a633d..6c118c73 100755
--- a/yellow/text.asm
+++ b/yellow/text.asm
@@ -1,2 +1,2 @@
-INCLUDE "yellow.asm"
+INCLUDE "charmap.asm"
 INCLUDE "text.asm"
-- 
cgit v1.3.1-sl0p