Merged commits, minor adjustments

Itema-as · Jul 19, 2023 · aa3d155 · aa3d155
1 parent a7bea95
commit aa3d155
Showing 1 changed file with 0 additions and 57 deletions.
diff --git a/screens.asm b/screens.asm
@@ -258,7 +258,6 @@
 
 *=$2800
 background:
-<<<<<<< HEAD
 .byte	$28, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $26, $21, $29, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20
 .byte	$24, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $25, $29, $20, $20, $20, $09, $14, $05, $0D, $01, $20, $20, $20, $20, $20
 .byte	$24, $2B, $80, $81, $80, $81, $80, $81, $80, $81, $80, $81, $80, $81, $80, $81, $80, $81, $80, $81, $80, $81, $80, $81, $2B, $25, $29, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20
@@ -284,37 +283,9 @@ background:
 .byte	$24, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $25, $29, $20, $20, $20, $20, $20, $50, $51, $52, $53, $54, $20, $20, $20
 .byte	$24, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $2B, $25, $29, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20
 .byte	$22, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $27, $23, $29, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20, $20
-=======
-.byte $28,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$26,$21,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$09,$14,$05,$0D,$01,$20,$20,$20,$20,$20
-.byte $24,$2B,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$2B,$25,$29,$20,$08,$01,$03,$0B,$01,$14,$08,$0F,$0E,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$F0,$F0,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$F0,$F0,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$F0,$F0,$2B,$2B,$25,$29,$20,$06,$12,$1B,$19,$01,$20,$32,$30,$32,$33,$20,$20
-.byte $24,$2B,$7F,$7F,$7F,$7F,$7F,$7F,$7F,$7F,$7F,$7F,$2B,$2B,$7F,$7F,$7F,$7F,$7F,$7F,$7F,$7F,$7F,$7F,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$2B,$2B,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$2B,$2B,$80,$81,$80,$81,$80,$81,$80,$81,$80,$81,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$7F,$7F,$7F,$7F,$E0,$E1,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$E0,$E1,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$7F,$7F,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$7F,$7F,$2B,$2B,$2B,$E0,$E1,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$7F,$7F,$7F,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$7F,$7F,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$7F,$7F,$7F,$7F,$7F,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$7F,$7F,$7F,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$7F,$80,$81,$7F,$7F,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$7F,$7F,$7F,$80,$81,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$80,$81,$2B,$7F,$80,$81,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$80,$81,$7F,$2B,$80,$81,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$80,$81,$7F,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$80,$81,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$7F,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$40,$41,$42,$43,$44,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$50,$51,$52,$53,$54,$20,$20,$20
-.byte $24,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$2B,$25,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
-.byte $22,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$27,$23,$29,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20,$20
->>>>>>> 54eb526 (Add logotype, set color, move logo)
 .byte $ff
 
 colormap:
-<<<<<<< HEAD
 .byte	$07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $00, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05
 .byte	$07, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $07, $00, $07, $05, $05, $03, $03, $03, $03, $03, $03, $03, $03, $03, $07
 .byte	$07, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $07, $00, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07
@@ -341,31 +312,3 @@ colormap:
 .byte	$07, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $03, $07, $00, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07
 .byte	$07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $00, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07, $07
 .byte $ff
-=======
-.byte $07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$00,$05,$05,$05,$05,$05,$05,$05,$05,$05,$05,$05,$05,$05
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$05,$05,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$05,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$08,$08,$03,$03,$03,$03,$03,$03,$03,$03,$08,$08,$03,$03,$03,$03,$03,$03,$03,$08,$08,$03,$03,$07,$00,$07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$07
-.byte $07,$03,$08,$08,$08,$08,$08,$08,$08,$08,$08,$08,$03,$03,$08,$08,$08,$08,$08,$08,$08,$08,$08,$08,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$07,$07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$07,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$08,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$08,$08,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$08,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$08,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$08,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$0D,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$0D,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$0f,$0f,$0f,$0f,$0f,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$0f,$0f,$0f,$0f,$0f,$07,$07,$07
-.byte $07,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-.byte $07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$00,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07
-    .byte $ff
->>>>>>> 54eb526 (Add logotype, set color, move logo)