diff --git a/ootw/Makefile b/ootw/Makefile index 83fca358..2215f899 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -20,8 +20,9 @@ ootw.o: ootw.s \ keyboard.s \ ootw_rope.s \ ootw_pool.s ootw_cavern.s physicist.s random16.s slug_cutscene.s \ - ootw_pool.inc ootw_cavern.inc ootw_quake.inc ootw_rope.inc \ - ootw_sprites.inc + ootw_pool.inc \ + ootw_cavern.inc ootw_cavern2.inc ootw_cavern3.inc ootw_quake.inc \ + ootw_rope.inc ootw_sprites.inc ca65 -o ootw.o ootw.s -l ootw.lst #### @@ -37,6 +38,12 @@ ootw_pool.inc: $(PNG2RLE) another.png ootw_cavern.inc: $(PNG2RLE) another_cave.png $(PNG2RLE) asm another_cave.png cavern_rle > ootw_cavern.inc +ootw_cavern2.inc: $(PNG2RLE) another_cave2.png + $(PNG2RLE) asm another_cave2.png cavern2_rle > ootw_cavern2.inc + +ootw_cavern3.inc: $(PNG2RLE) another_cave3.png + $(PNG2RLE) asm another_cave3.png cavern3_rle > ootw_cavern3.inc + ootw_quake.inc: $(PNG2RLE) another_cave_shake.png $(PNG2RLE) asm another_cave_shake.png quake_rle > ootw_quake.inc diff --git a/ootw/another_cave2.png b/ootw/another_cave2.png new file mode 100644 index 00000000..8db061d1 Binary files /dev/null and b/ootw/another_cave2.png differ diff --git a/ootw/another_cave3.png b/ootw/another_cave3.png new file mode 100644 index 00000000..86b85ad2 Binary files /dev/null and b/ootw/another_cave3.png differ diff --git a/ootw/ootw.s b/ootw/ootw.s index 2dbf0c4c..c62b66dc 100644 --- a/ootw/ootw.s +++ b/ootw/ootw.s @@ -130,6 +130,8 @@ end_message: .include "keyboard.s" .include "ootw_pool.inc" .include "ootw_cavern.inc" +.include "ootw_cavern2.inc" +.include "ootw_cavern3.inc" .include "ootw_quake.inc" .include "ootw_rope.inc" .include "ootw_sprites.inc" diff --git a/ootw/ootw_cavern2.inc b/ootw/ootw_cavern2.inc new file mode 100644 index 00000000..1fa11071 --- /dev/null +++ b/ootw/ootw_cavern2.inc @@ -0,0 +1,38 @@ +cavern2_rle: .byte $28 ; ysize=48 + .byte $A8,$22, $A3,$82, $22,$22, $82, $A5,$88, $82,$82, $22,$22 + .byte $A3,$62, $68, $88,$88, $F8, $68,$68, $A8,$66, $88 + .byte $22, $66,$66, $A3,$22, $68,$68, $88, $F8, $62 + .byte $22, $A3,$88, $68,$68, $A3,$66, $22,$22, $A5,$66, $6F + .byte $FF,$FF, $A9,$66, $88, $22, $66,$66, $A3,$22, $66,$66 + .byte $88, $66, $6F, $22, $F8, $88, $AF,$66 + .byte $FF, $F6, $A8,$66, $88, $22, $66,$66, $22,$22 + .byte $A3,$66, $68, $66,$66, $22, $66, $68, $6F + .byte $F6, $AE,$66, $FF, $F6, $A8,$66, $22, $66,$66 + .byte $22,$22, $A6,$66, $22, $A4,$66, $6F,$6F, $F6, $AC,$66 + .byte $FF, $F6, $A6,$56, $66, $22, $66,$66, $22,$22 + .byte $AE,$66, $6F,$6F, $F6,$F6, $A9,$66, $6F, $A6,$55, $F6,$F6 + .byte $66,$66, $22,$22, $A0,$12,$66, $6F, $F6,$F6, $A7,$66, $A6,$55 + .byte $66, $A3,$6F, $22,$22, $A4,$F6, $A0,$11,$66, $6F,$6F, $F6,$F6 + .byte $A3,$66, $A6,$55, $A4,$66, $22,$22, $A3,$66, $A4,$6F, $FF + .byte $A4,$F6, $AD,$66, $6F,$6F, $F6, $A6,$55, $A4,$66, $22,$22 + .byte $AB,$66, $A4,$6F, $FF, $A4,$F6, $A8,$66, $A6,$55, $A4,$F6 + .byte $22,$22, $A4,$66, $86, $56, $AD,$66, $A4,$6F, $A5,$66 + .byte $A6,$55, $22, $A3,$66, $22,$22, $A4,$6F, $88, $55 + .byte $A3,$6F, $FF, $A9,$F6, $A6,$66, $76, $86, $56 + .byte $A6,$55, $22, $66,$66, $76, $22,$22, $76, $A3,$66 + .byte $88, $75, $66,$66, $88, $A5,$66, $76,$76, $66 + .byte $A3,$76, $86,$86, $87, $A4,$88, $A7,$55, $22, $87,$87 + .byte $77, $22,$22, $77, $A3,$87, $88, $85,$85, $57 + .byte $88, $87, $77,$77, $A6,$87, $A9,$88, $A7,$55, $22 + .byte $A3,$88, $22,$22, $AA,$88, $A3,$55, $78, $A3,$88, $58 + .byte $55,$55, $57,$57, $A4,$88, $58, $A7,$55, $22, $58 + .byte $55,$55, $22,$22, $57, $77, $78, $22, $A5,$58 + .byte $A4,$55, $57, $A3,$58, $A6,$55, $A3,$58, $A8,$55, $22 + .byte $25, $55,$55, $22,$22, $A3,$55, $22, $A0,$1E,$55, $22,$22 + .byte $55,$55, $22,$22, $25, $55,$55, $22, $AA,$55, $5A + .byte $A0,$13,$55, $22,$22, $55, $25, $A4,$22, $25, $22 + .byte $25, $85,$85, $A0,$12,$55, $A9,$85, $82, $88,$88, $82 + .byte $AF,$88, $A8,$28, $A4,$88, $28, $AA,$88, $22, $A3,$88 + .byte $28, $A3,$22, $28, $88, $22, $88,$88, $28 + .byte $A3,$52, $A8,$55, $52,$52, $28,$28, $A9,$88, $A0,$78,$00 + .byte $A1 diff --git a/ootw/ootw_cavern3.inc b/ootw/ootw_cavern3.inc new file mode 100644 index 00000000..7d03de4c --- /dev/null +++ b/ootw/ootw_cavern3.inc @@ -0,0 +1,31 @@ +cavern3_rle: .byte $28 ; ysize=48 + .byte $A5,$66, $6F, $F6,$F6, $66,$66, $A4,$22, $62, $AD,$66 + .byte $A6,$22, $AE,$66, $6F,$6F, $F6, $F2, $22, $62 + .byte $AE,$66, $A7,$22, $26, $A4,$66, $A3,$26, $56, $26 + .byte $56, $76, $A5,$66, $6F,$6F, $F6,$F6, $AD,$66, $A0,$11,$22 + .byte $77, $A9,$66, $6F, $F6,$F6, $AA,$66, $A0,$10,$22, $75 + .byte $77, $66, $A3,$86, $A8,$66, $6F,$6F, $F6,$F6, $A6,$66 + .byte $A0,$10,$22, $57, $66, $A4,$88, $56, $AB,$66, $6F,$6F + .byte $F6,$F6, $66,$66, $A0,$10,$22, $77, $66, $A4,$88, $55 + .byte $AF,$66, $6F, $A0,$11,$22, $77, $66, $A4,$88, $55 + .byte $A3,$6F, $A4,$F6, $A9,$66, $A0,$10,$22, $55, $22, $77 + .byte $A4,$88, $55, $56, $A6,$66, $A5,$6F, $A3,$F6, $A7,$22 + .byte $A6,$55, $A4,$22, $55, $22, $77, $A5,$88, $5A + .byte $AA,$66, $46, $66,$66, $A8,$22, $A6,$55, $A4,$22, $55 + .byte $22, $77, $78, $A3,$88, $85,$85, $55, $6F,$6F + .byte $A4,$F6, $66,$66, $A3,$44, $26, $A7,$22, $52, $55,$55 + .byte $05, $A3,$55, $A4,$22, $55, $22, $25, $77 + .byte $A7,$88, $8F, $5F,$5F, $A4,$6F, $88,$88, $28, $A8,$22 + .byte $55,$55, $00, $A4,$55, $A4,$22, $55, $22, $25 + .byte $57, $78, $A8,$88, $85, $8A, $EA,$EA, $E8,$E8 + .byte $28, $A9,$22, $55, $05, $50, $A4,$55, $A4,$22 + .byte $55, $22,$22, $52, $77, $A5,$88, $28, $22 + .byte $27, $77, $88,$88, $28, $AB,$22, $55,$55, $00 + .byte $A5,$55, $A5,$22, $25, $22,$22, $27,$27, $A4,$28, $A4,$22 + .byte $28, $AD,$22, $55, $00, $A6,$55, $A0,$1E,$22, $52 + .byte $55,$55, $00, $A5,$55, $00, $A7,$22, $02,$02, $A0,$12,$22 + .byte $52,$52, $A3,$55, $50, $A6,$55, $00, $52,$52, $02 + .byte $00, $52,$52, $A5,$50, $AE,$52, $A0,$1A,$55, $A3,$05, $A5,$55 + .byte $05, $A9,$55, $05,$05, $AF,$55, $05,$05, $A7,$00, $A3,$05 + .byte $AA,$55, $05, $A3,$00, $A3,$05, $A5,$55, $A0,$A0,$00 + .byte $A1