From 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Sat, 6 Jun 2015 13:51:06 -0500 Subject: Build only Yellow Conflicts: gfx/intro_nido_1.6x6.png gfx/intro_nido_2.6x6.png gfx/intro_nido_3.6x6.png gfx/redgreenversion.png 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 yellow/main.asm --- yellow/main.asm | 5 +++++ yellow/wram.asm | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'yellow') diff --git a/yellow/main.asm b/yellow/main.asm index 6b544b06..bdca0983 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -1,3 +1,4 @@ +<<<<<<< HEAD INCLUDE "yellow.asm" INCLUDE "constants.asm" @@ -1069,3 +1070,7 @@ INCLUDE "engine/bank3f/main.asm" ; INCBIN "gfx/blocksets/beachhouse.bst" ;ENDC +======= +INCLUDE "charmap.asm" +INCLUDE "main.asm" +>>>>>>> e4bb6ce... Build only Yellow diff --git a/yellow/wram.asm b/yellow/wram.asm index c0b7f781..98057cd2 100755 --- a/yellow/wram.asm +++ b/yellow/wram.asm @@ -1,2 +1 @@ -INCLUDE "yellow.asm" INCLUDE "wram.asm" -- cgit v1.3.1-sl0p