diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-06 13:51:06 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:32:39 -0400 |
| commit | 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch) | |
| tree | 08106f9eec9cff1137269c20ccf848cfeffa71c6 /yellow/main.asm | |
| parent | text.o (diff) | |
| download | pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.gz pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.xz pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.zip | |
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
Diffstat (limited to 'yellow/main.asm')
| -rwxr-xr-x | yellow/main.asm | 5 |
1 files changed, 5 insertions, 0 deletions
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 |