diff options
Diffstat (limited to 'yellow')
| -rwxr-xr-x | yellow/main.asm | 5 | ||||
| -rwxr-xr-x | yellow/wram.asm | 1 |
2 files changed, 5 insertions, 1 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 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" |