ootw: add placeholders for c6 and c12

This commit is contained in:
Vince Weaver 2020-01-27 16:10:35 -05:00
parent aad825beb3
commit de5fd04033
9 changed files with 90 additions and 10 deletions

View File

@ -150,7 +150,7 @@ ootw_c6.o: ootw_c6.s \
keyboard.s gr_run_sequence.s physicist.s \
collision.s door.s gun.s blast.s shield.s \
ootw_graphics/sprites/physicist.inc \
ootw_graphics/l14arena/ootw_c14_arena.inc
ootw_graphics/l6cave/ootw_c6_cave.inc
ca65 -o ootw_c6.o ootw_c6.s -l ootw_c6.lst
###
@ -232,7 +232,7 @@ ootw_c12.o: ootw_c12.s \
keyboard.s gr_run_sequence.s physicist.s \
collision.s door.s gun.s blast.s shield.s \
ootw_graphics/sprites/physicist.inc \
ootw_graphics/l14arena/ootw_c14_arena.inc
ootw_graphics/l12room/ootw_c12_room.inc
ca65 -o ootw_c12.o ootw_c12.s -l ootw_c12.lst
###
@ -246,7 +246,7 @@ ootw_c13.o: ootw_c13.s \
keyboard.s gr_run_sequence.s physicist.s \
collision.s door.s gun.s blast.s shield.s \
ootw_graphics/sprites/physicist.inc \
ootw_graphics/l14arena/ootw_c14_arena.inc
ootw_graphics/l13room/ootw_c13_room.inc
ca65 -o ootw_c13.o ootw_c13.s -l ootw_c13.lst

View File

@ -169,9 +169,9 @@ room:
sta PHYSICIST_Y
; load background
lda #>(arena_rle)
lda #>(house_rle)
sta GBASH
lda #<(arena_rle)
lda #<(house_rle)
jmp room_setup_done
@ -518,7 +518,7 @@ end_message:
.include "collision.s"
; room backgrounds
.include "ootw_graphics/l14arena/ootw_c14_arena.inc"
.include "ootw_graphics/l12room/ootw_c12_room.inc"
; sprites
.include "ootw_graphics/sprites/physicist.inc"
.include "ootw_graphics/sprites/alien.inc"

View File

@ -165,13 +165,13 @@ room:
lda #0
sta cel_smc+1
lda #28
lda #16
sta PHYSICIST_Y
; load background
lda #>(arena_rle)
lda #>(cave_rle)
sta GBASH
lda #<(arena_rle)
lda #<(cave_rle)
jmp room_setup_done
@ -518,7 +518,7 @@ end_message:
.include "collision.s"
; room backgrounds
.include "ootw_graphics/l14arena/ootw_c14_arena.inc"
.include "ootw_graphics/l6cave/ootw_c6_cave.inc"
; sprites
.include "ootw_graphics/sprites/physicist.inc"
.include "ootw_graphics/sprites/alien.inc"

View File

@ -0,0 +1,18 @@
include ../../../Makefile.inc
PNG2RLE = ../../../gr-utils/png2rle
PNG2LZ4 = ../../../gr-utils/png2lz4
all: ootw_c12_room.inc
#####
ootw_c12_room.inc: $(PNG2RLE) \
house.png
$(PNG2RLE) asm house.png house_rle > ootw_c12_room.inc
#####
clean:
rm -f *~ *.o *.lst *.lzz *.inc

Binary file not shown.

After

Width:  |  Height:  |  Size: 404 B

View File

@ -0,0 +1,29 @@
house_rle: .byte $28 ; ysize=48
.byte $A3,$00, $02, $29, $02, $20, $A5,$22, $24
.byte $02, $A0,$1A,$22, $A4,$00, $42, $00, $A5,$02, $00
.byte $02, $00, $02,$02, $A0,$18,$22, $AF,$00, $A0,$19,$22, $AD,$00
.byte $20, $A0,$1A,$22, $AD,$00, $A0,$1B,$22, $AC,$00, $A0,$1C,$22, $AB,$00
.byte $A0,$1A,$22, $A3,$72, $AA,$00, $A0,$18,$22, $A6,$77, $A9,$00, $A0,$19,$22
.byte $A6,$77, $A9,$00, $A0,$12,$22, $55, $77, $A5,$22, $77,$77
.byte $22, $A3,$77, $A8,$00, $25, $A8,$62, $52, $72
.byte $A8,$62, $25, $27, $55, $A4,$62, $77, $27
.byte $22, $A3,$77, $A7,$00, $20, $22,$22, $26, $A5,$66
.byte $26, $55, $77, $26, $A5,$66, $26, $A5,$22
.byte $26, $66,$66, $77, $22, $00, $A3,$77, $A7,$00
.byte $A3,$88, $22, $26,$26, $55, $77, $26, $A4,$22
.byte $26,$26, $55, $77, $26, $22, $82, $A3,$88
.byte $82, $22, $26,$26, $77, $22, $00, $A3,$77
.byte $A6,$00, $80, $A6,$88, $85, $87, $A7,$88, $85
.byte $87, $AA,$88, $77, $22, $00, $A3,$77, $A6,$00
.byte $A0,$1C,$88, $77, $22, $00, $A3,$77, $A5,$00, $80
.byte $A0,$1C,$88, $77, $22, $00, $A3,$77, $A5,$00, $A0,$1D,$88
.byte $77, $22, $00, $A3,$77, $A5,$00, $02, $A0,$19,$88
.byte $02,$02, $88, $77, $22, $00, $A3,$77, $A6,$00
.byte $28, $A7,$88, $A0,$10,$58, $02,$02, $00, $58, $77
.byte $22, $00, $A3,$77, $A7,$00, $02, $88,$88, $28
.byte $A3,$82, $AF,$88, $02,$02, $00,$00, $88, $77, $22
.byte $00, $A3,$77, $A8,$00, $02, $A0,$13,$88, $02,$02, $A3,$00
.byte $88, $77, $22, $00, $A3,$77, $00,$00, $A0,$19,$05
.byte $02,$02, $A4,$00, $05,$05, $02, $50, $A3,$57, $A0,$1A,$00
.byte $02,$02, $A0,$25,$00, $02,$02, $AD,$00
.byte $A1

View File

@ -0,0 +1,18 @@
include ../../../Makefile.inc
PNG2RLE = ../../../gr-utils/png2rle
PNG2LZ4 = ../../../gr-utils/png2lz4
all: ootw_c6_cave.inc
#####
ootw_c6_cave.inc: $(PNG2RLE) \
cave.png
$(PNG2RLE) asm cave.png cave_rle > ootw_c6_cave.inc
#####
clean:
rm -f *~ *.o *.lst *.lzz *.inc

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

View File

@ -0,0 +1,15 @@
cave_rle: .byte $28 ; ysize=48
.byte $A8,$00, $25, $55, $A0,$15,$00, $22, $00, $22
.byte $AE,$00, $55,$55, $A0,$15,$00, $22, $02, $22, $AE,$00
.byte $55,$55, $A0,$17,$00, $22, $AE,$00, $55, $25, $A0,$17,$00
.byte $22, $AE,$00, $22, $55, $A0,$16,$00, $02, $22
.byte $AE,$00, $22, $25, $A0,$17,$00, $22, $AE,$00, $22
.byte $55, $A0,$17,$00, $22, $AE,$00, $52, $55, $A0,$17,$00
.byte $22, $AE,$00, $05, $A0,$16,$00, $20, $00, $22
.byte $A7,$00, $20, $A3,$00, $50, $20,$20, $A0,$17,$00, $22
.byte $02, $22, $A9,$00, $A3,$02, $A0,$19,$00, $22, $20
.byte $22, $A0,$25,$00, $22, $00, $22, $AF,$00, $20
.byte $A0,$15,$00, $22, $00, $22, $A0,$25,$00, $22, $02
.byte $22, $A0,$27,$00, $22, $AA,$00, $20,$20, $02, $00,$00
.byte $A0,$19,$02, $A6,$00, $A4,$02, $A0,$FF,$00, $A0,$3D,$00
.byte $A1