From 72fa5367c462a4c3b457cbe1e33f14e43c489e6b Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 17 Jan 2019 15:56:43 -0500 Subject: [PATCH] ootw: add some more art --- ootw/Makefile | 9 ++-- ootw/another_cave.png | Bin 0 -> 603 bytes ootw/ootw.s | 9 ++-- ootw/ootw_cavern.inc | 44 +++++++++++++++++++ ootw/{ootw_backgrounds.inc => ootw_pool.inc} | 2 +- 5 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 ootw/another_cave.png create mode 100644 ootw/ootw_cavern.inc rename ootw/{ootw_backgrounds.inc => ootw_pool.inc} (98%) diff --git a/ootw/Makefile b/ootw/Makefile index 59bac6f1..3f506b02 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -17,7 +17,7 @@ OOTW: ootw.o ootw.o: ootw.s \ gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \ - ootw_backgrounds.inc ootw_sprites.inc + ootw_pool.inc ootw_cavern.inc ootw_sprites.inc ca65 -o ootw.o ootw.s -l ootw.lst #### @@ -27,8 +27,11 @@ HELLO: hello.bas ##### -ootw_backgrounds.inc: $(PNG2RLE) another.png - $(PNG2RLE) asm another.png planet_rle > ootw_backgrounds.inc +ootw_pool.inc: $(PNG2RLE) another.png + $(PNG2RLE) asm another.png pool_rle > ootw_pool.inc + +ootw_cavern.inc: $(PNG2RLE) another_cave.png + $(PNG2RLE) asm another_cave.png cavern_rle > ootw_cavern.inc ##### diff --git a/ootw/another_cave.png b/ootw/another_cave.png new file mode 100644 index 0000000000000000000000000000000000000000..d858ee5abf35ee26d2ff6e560bf3ad33bb344f8b GIT binary patch literal 603 zcmV-h0;K(kP)oSYQT{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E% z000SaNLh0L028kO028kPW9E*-00007bV*G`2jc+|6g2@y*ds~+000?uMObu0Z*6U5 zZgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0004&NklYq)}9y91OFTYwLpz<%62gpPhGSSNr+_>LwJza01#k-!z! zbF%>U#OYK=SnI?A!mpmwt4av+fDr2gAebV^PQl9v{YAO~v;dwmY^%mp>n!fO@pT#@ z0KpF4wSsAxx)C8IO{x_hUkMV!zr;1LdYUds7l3{1XtTA%w()>+B1+jd4?{Vm)xE$6 zb|EBZ!eP&GbHK^;fqJPp6o9h*0LptxPl?wdNnf6;0i+0ViR_#PKsIco%3#SXz-u=|Eb_xU?uUKFBA~bPs7sDWd`NTxc<;)I0&+uo$8IhF-zr_1 puXB-Q(y2a&3gCOt1b+1o^aGsQNEqH(planet_rle) + lda #>(pool_rle) sta GBASH - lda #<(planet_rle) + lda #<(pool_rle) sta GBASL jsr load_rle_gr @@ -494,5 +494,6 @@ end_message: .include "gr_copy.s" .include "gr_putsprite.s" .include "gr_offsets.s" -.include "ootw_backgrounds.inc" +.include "ootw_pool.inc" +.include "ootw_cavern.inc" .include "ootw_sprites.inc" diff --git a/ootw/ootw_cavern.inc b/ootw/ootw_cavern.inc new file mode 100644 index 00000000..bbd073ec --- /dev/null +++ b/ootw/ootw_cavern.inc @@ -0,0 +1,44 @@ +cavern_rle: .byte $28 ; ysize=48 + .byte $A0,$39,$22, $A7,$62, $65, $A3,$55, $F5, $25, $A9,$22 + .byte $62, $22,$22, $62, $A6,$22, $62,$62, $A3,$22, $62 + .byte $AB,$66, $55, $6F, $FF, $F6, $66,$66, $62,$62 + .byte $A4,$22, $66,$66, $62, $66,$66, $62, $A3,$22, $62 + .byte $66, $6F,$6F, $F2, $22,$22, $AC,$66, $55, $66,$66 + .byte $6F, $FF, $F6, $A3,$66, $62, $66, $22 + .byte $A6,$66, $22,$22, $A6,$66, $22,$22, $6F, $F6,$F6, $AE,$66 + .byte $6F, $F6, $A4,$66, $22, $66,$66, $6F,$6F, $F6,$F6 + .byte $22,$22, $66, $26, $A4,$66, $22,$22, $A3,$66, $6F,$6F + .byte $F6,$F6, $AC,$66, $6F, $F6, $66,$66, $22, $A6,$66 + .byte $22,$22, $6F, $2F, $7A, $A3,$F6, $22,$22, $A7,$66 + .byte $6F,$6F, $F6,$F6, $AA,$66, $6F, $F6, $A3,$66, $26 + .byte $56, $76, $66, $22,$22, $26, $52, $57 + .byte $76,$76, $66, $22,$22, $A3,$6F, $A3,$F6, $A5,$66, $6F,$6F + .byte $F6,$F6, $A7,$66, $6F, $F6, $66,$66, $22, $A3,$55 + .byte $22,$22, $A4,$55, $27, $76, $22,$22, $66,$66, $26 + .byte $A3,$66, $A3,$6F, $A3,$F6, $A3,$66, $6F,$6F, $F6,$F6, $A5,$66 + .byte $6F, $F6, $22, $25, $55,$55, $22,$22, $A3,$55 + .byte $22, $55,$55, $22,$22, $56, $22, $77, $A0,$17,$66 + .byte $22,$22, $52, $55, $22,$22, $55,$55, $52, $A3,$55 + .byte $22,$22, $A4,$55, $76, $A0,$15,$66, $22, $25, $55,$55 + .byte $22,$22, $A6,$55, $22,$22, $55, $52, $22, $55 + .byte $77, $7F, $6F,$6F, $7F, $6F,$6F, $88, $A3,$6F + .byte $7F,$7F, $76, $77, $76, $A6,$66, $22, $55 + .byte $25, $55, $22,$22, $25, $A5,$55, $22,$22, $A5,$55 + .byte $77, $A5,$87, $88, $87, $88, $A3,$87, $A3,$77 + .byte $A6,$87, $22, $25, $22, $55, $A3,$22, $A5,$55 + .byte $22,$22, $55,$55, $25, $52, $A3,$57, $58,$58, $78 + .byte $58, $AA,$88, $58, $78, $A3,$88, $A4,$72, $A3,$22 + .byte $A5,$55, $22,$22, $55, $25, $22, $A8,$55, $58,$58 + .byte $88,$88, $22, $88,$88, $58,$58, $A4,$55, $58, $22 + .byte $55,$55, $75,$75, $A3,$22, $27, $55, $25, $55,$55 + .byte $A3,$22, $55, $57, $AC,$55, $22, $A4,$55, $25 + .byte $A4,$55, $22, $27, $57, $55, $A5,$22, $55 + .byte $22, $55, $25, $A4,$22, $25, $AC,$55, $22 + .byte $A3,$55, $25, $22, $A3,$55, $A3,$22, $25, $85 + .byte $A5,$22, $55, $A9,$22, $A7,$82, $A3,$85, $25, $22,$22 + .byte $25, $85, $22,$22, $85,$85, $A3,$82, $A5,$88, $82 + .byte $88,$88, $28, $88,$88, $28, $88,$88, $28, $88 + .byte $28, $A3,$88, $82, $A5,$88, $82,$82, $AC,$88, $A8,$28 + .byte $A0,$1B,$88, $28,$28, $A6,$88, $28, $22, $28, $88 + .byte $A3,$82, $A0,$1E,$88, $A0,$78,$00 + .byte $A1 diff --git a/ootw/ootw_backgrounds.inc b/ootw/ootw_pool.inc similarity index 98% rename from ootw/ootw_backgrounds.inc rename to ootw/ootw_pool.inc index ee82b1bf..025fbf1c 100644 --- a/ootw/ootw_backgrounds.inc +++ b/ootw/ootw_pool.inc @@ -1,4 +1,4 @@ -planet_rle: .byte $28 ; ysize=48 +pool_rle: .byte $28 ; ysize=48 .byte $22,$22, $99, $A9,$66, $76, $77, $76, $AD,$66 .byte $67, $AB,$66, $88, $22, $29, $86, $A6,$66 .byte $76, $A3,$66, $7F, $76, $AE,$66, $67, $66