diff --git a/ootw/Makefile b/ootw/Makefile index 6559353d..b3ac8cbb 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -176,7 +176,7 @@ ootw_c8.o: ootw_c8.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/l8crawl/ootw_c8_crawl.inc ca65 -o ootw_c8.o ootw_c8.s -l ootw_c8.lst ### diff --git a/ootw/ootw_c8.s b/ootw/ootw_c8.s index 3983e70f..821126b4 100644 --- a/ootw/ootw_c8.s +++ b/ootw/ootw_c8.s @@ -165,13 +165,13 @@ room: lda #0 sta cel_smc+1 - lda #28 + lda #14 sta PHYSICIST_Y ; load background - lda #>(arena_rle) + lda #>(entry_rle) sta GBASH - lda #<(arena_rle) + lda #<(entry_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/l8crawl/ootw_c8_crawl.inc" ; sprites .include "ootw_graphics/sprites/physicist.inc" .include "ootw_graphics/sprites/alien.inc" diff --git a/ootw/ootw_graphics/l8crawl/Makefile b/ootw/ootw_graphics/l8crawl/Makefile new file mode 100644 index 00000000..41982889 --- /dev/null +++ b/ootw/ootw_graphics/l8crawl/Makefile @@ -0,0 +1,18 @@ +include ../../../Makefile.inc + +PNG2RLE = ../../../gr-utils/png2rle +PNG2LZ4 = ../../../gr-utils/png2lz4 + +all: ootw_c8_crawl.inc + +##### + +ootw_c8_crawl.inc: $(PNG2RLE) \ + entry.png + $(PNG2RLE) asm entry.png entry_rle > ootw_c8_crawl.inc + +##### + +clean: + rm -f *~ *.o *.lst *.lzz *.inc + diff --git a/ootw/ootw_graphics/l8crawl/entry.png b/ootw/ootw_graphics/l8crawl/entry.png new file mode 100644 index 00000000..cfc18e51 Binary files /dev/null and b/ootw/ootw_graphics/l8crawl/entry.png differ diff --git a/ootw/ootw_graphics/l8crawl/ootw_c8_crawl.inc b/ootw/ootw_graphics/l8crawl/ootw_c8_crawl.inc new file mode 100644 index 00000000..72a49b2b --- /dev/null +++ b/ootw/ootw_graphics/l8crawl/ootw_c8_crawl.inc @@ -0,0 +1,68 @@ +entry_rle: .byte $28 ; ysize=48 + .byte $A5,$00, $80, $A5,$88, $22, $F6, $20, $A6,$00 + .byte $80, $88,$88, $58, $A4,$26, $58, $88, $80 + .byte $A7,$00, $88,$88, $A4,$00, $80, $A5,$88, $05, $22 + .byte $26, $22, $80, $A4,$00, $80, $A3,$88, $55 + .byte $A4,$22, $55, $88,$88, $A6,$00, $A3,$88, $A3,$00, $80 + .byte $AB,$88, $A4,$00, $A4,$88, $55, $A4,$22, $85, $A3,$88 + .byte $A4,$00, $80, $A3,$88, $A3,$00, $A4,$88, $58, $05 + .byte $85, $58, $88, $85, $88,$88, $50, $A3,$00 + .byte $A3,$88, $58, $55, $28, $82, $72, $22 + .byte $A3,$88, $58, $05, $A3,$00, $A3,$88, $58, $00,$00 + .byte $85, $58, $88,$88, $55, $00, $88,$88, $85 + .byte $58, $88,$88, $55, $A3,$00, $85, $58, $88,$88 + .byte $55, $22,$22, $28, $88, $77, $88,$88, $58 + .byte $55, $80, $00,$00, $55, $88,$88, $58, $05 + .byte $00,$00, $88, $55, $88,$88, $55, $00, $A3,$88 + .byte $55, $88,$88, $55, $80, $00,$00, $88, $55 + .byte $88,$88, $55, $A3,$22, $88, $77, $88,$88, $55 + .byte $00, $88, $00,$00, $85, $58, $88, $55 + .byte $00,$00, $88,$88, $25, $28, $05, $00, $A4,$88 + .byte $05, $08, $05, $00, $88, $00,$00, $88 + .byte $25, $A3,$08, $A3,$22, $28, $07, $08,$08, $05 + .byte $00, $88, $00,$00, $88, $05, $08, $05 + .byte $00,$00, $88,$88, $55, $A0,$01,$AA, $55, $00, $A4,$88 + .byte $55, $A0,$01,$AA, $55, $00, $88, $00,$00, $88 + .byte $55, $A0,$01,$AA, $55, $88, $A4,$22, $88, $55 + .byte $A0,$01,$AA, $00, $88,$88, $00,$00, $88, $55, $A0,$01,$AA + .byte $55, $00,$00, $88,$88, $55, $A0,$01,$AA, $55, $00 + .byte $88, $28,$28, $88, $55, $A0,$01,$AA, $55, $00 + .byte $88, $00,$00, $88, $55, $A0,$01,$AA, $55, $28 + .byte $A4,$22, $88, $55, $A0,$01,$AA, $00, $88,$88, $00,$00 + .byte $88, $55, $A0,$01,$AA, $55, $88, $00, $88,$88 + .byte $55, $A0,$01,$AA, $55, $00, $88, $82, $08 + .byte $88, $55, $A0,$01,$AA, $55, $88,$88, $00,$00, $88 + .byte $55, $A0,$01,$AA, $55, $A5,$22, $88, $55, $A0,$01,$AA + .byte $00, $88,$88, $00,$00, $88, $55, $A0,$01,$AA, $55 + .byte $88, $00, $88,$88, $55, $A0,$01,$AA, $55, $88,$88 + .byte $80,$80, $88, $55, $A0,$01,$AA, $55, $88,$88, $00,$00 + .byte $88, $55, $A0,$01,$AA, $55, $A6,$22, $55, $A0,$01,$AA + .byte $A3,$88, $00,$00, $88, $55, $A0,$01,$AA, $55, $88 + .byte $00, $88,$88, $55, $A0,$01,$AA, $55, $08, $A4,$88 + .byte $55, $A0,$01,$AA, $55, $08, $88, $00,$00, $88 + .byte $55, $A0,$01,$AA, $55, $A5,$22, $82, $55, $A0,$01,$AA + .byte $08, $88,$88, $00,$00, $88, $55, $A0,$01,$AA, $55 + .byte $88, $00, $88,$88, $55, $A0,$01,$AA, $55, $00 + .byte $A4,$88, $55, $A0,$01,$AA, $55, $00, $88, $00,$00 + .byte $88, $55, $A0,$01,$AA, $55, $A5,$22, $88, $55 + .byte $A0,$01,$AA, $00, $88,$88, $00,$00, $88, $55, $A0,$01,$AA + .byte $55, $88, $00, $88,$88, $55, $A0,$01,$AA, $55 + .byte $00, $A4,$88, $55, $A0,$01,$AA, $55, $00, $88 + .byte $00,$00, $88, $55, $A0,$01,$AA, $55, $A5,$22, $88 + .byte $55, $A0,$01,$AA, $00, $88,$88, $00,$00, $88, $55 + .byte $A0,$01,$AA, $55, $08, $00, $28,$28, $25, $2A + .byte $25, $20,$20, $A3,$28, $25, $2A, $25, $20,$20 + .byte $00,$00, $28, $25, $5A, $55, $A4,$72, $78,$78 + .byte $75, $2A, $20,$20, $28, $00,$00, $28, $25 + .byte $2A, $25, $20, $A0,$CC,$00, $20, $A7,$80, $00,$00 + .byte $F0,$F0, $00,$00, $AA,$80, $00, $70, $A3,$80, $00,$00 + .byte $A5,$80, $A4,$00, $25, $52, $28, $A4,$88, $FF + .byte $00,$00, $FF, $87, $00,$00, $AA,$88, $00, $55 + .byte $A3,$88, $00,$00, $A5,$88, $A4,$00, $82, $28, $85 + .byte $58, $88, $08, $88, $FF, $77, $58 + .byte $FF, $88, $00,$00, $AA,$88, $00, $25, $A3,$88 + .byte $00,$00, $A5,$88, $A4,$00, $A5,$28, $20,$20, $7F, $77 + .byte $28, $FF, $25, $00,$00, $58,$58, $A3,$28, $22 + .byte $A3,$28, $58, $50, $52, $58, $28,$28, $00,$00 + .byte $A5,$28 + .byte $A1