diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:42:36 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:42:36 -0400 |
| commit | d42e9f5b72de3d505622b0eb360f5fdfd388e26b (patch) | |
| tree | 1cda7f9f3fef65c6dfce63c5baf3d9dc705a6242 /yellow | |
| parent | 1d63499fa73f028a5409ff358caedc8972a57552 (diff) | |
Attempt to make yellow buildable, part 3
Diffstat (limited to 'yellow')
| -rwxr-xr-x | yellow/main.asm | 8 |
1 files changed, 1 insertions, 7 deletions
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 |