diff options
Diffstat (limited to 'yellow/main.asm')
| -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 |