ootw: c1: pool now lzsa

This commit is contained in:
Vince Weaver 2021-03-23 09:28:19 -04:00
parent f0d1e864b3
commit c017a4bb8b
3 changed files with 25 additions and 61 deletions

View File

@ -1,17 +1,25 @@
include ../../../Makefile.inc include ../../../../../Makefile.inc
PNG2RLE = ../../../gr-utils/png2rle PNG2GR = ../../../../../utils/gr-utils/png2gr
PNG2LZ4 = ../../../gr-utils/png2lz4 LZSA = ~/research/lzsa/lzsa/lzsa
all: ootw_pool.inc all: ootw_pool.inc
##### #####
ootw_pool.inc: $(PNG2RLE) another_pool.png ootw_pool.inc: another_pool.lzsa
$(PNG2RLE) asm another_pool.png pool_rle > ootw_pool.inc echo "pool_lzsa: .incbin \"another_pool.lzsa\"" > ootw_pool.inc
#####
%.gr: %.png
$(PNG2GR) $< $@
%.lzsa: %.gr
$(LZSA) -r -f2 $< $@
##### #####
clean: clean:
rm -f *~ *.o *.lst *.lzz *.inc rm -f *~ *.o *.lst *.inc *.gr *.lzsa

View File

@ -1,45 +0,0 @@
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
.byte $76, $A7,$66, $22, $89, $22, $28, $96
.byte $A4,$66, $77, $A4,$66, $67, $7F, $A0,$13,$66, $76
.byte $A4,$66, $22, $28, $22,$22, $99, $A5,$66, $67
.byte $A3,$66, $76, $77, $A0,$15,$66, $76, $66,$66, $A4,$22
.byte $89, $26, $A8,$66, $7F, $A0,$18,$66, $67, $22
.byte $89, $22,$22, $88, $22, $99, $A5,$66, $67,$67
.byte $66,$66, $89,$89, $56, $66, $76, $AE,$66, $58
.byte $A4,$66, $22,$22, $28, $88, $89, $22,$22, $A9,$66
.byte $88,$88, $55, $A3,$66, $67, $66, $67, $66
.byte $67, $66,$66, $76, $66, $76, $A3,$66, $58
.byte $A4,$66, $22,$22, $82, $22, $82, $28, $22
.byte $A9,$66, $88,$88, $55, $66, $89, $A6,$66, $55
.byte $95, $A4,$66, $67, $28, $A6,$88, $22, $A3,$28
.byte $82, $22, $76, $66, $76, $66,$66, $96
.byte $A3,$66, $88,$88, $55, $66, $88, $A5,$66, $A3,$55
.byte $A5,$66, $62, $A5,$28, $88, $A4,$22, $88, $22
.byte $82, $A3,$66, $67, $55, $66, $67, $26
.byte $88,$88, $85, $66, $88, $66, $76, $86
.byte $76, $66, $68, $55, $95, $76, $A5,$66
.byte $88,$88, $82, $22, $88,$88, $22, $82, $22,$22
.byte $88, $A3,$22, $A3,$66, $55, $26,$26, $22, $A3,$88
.byte $22, $88, $66,$66, $88, $26,$26, $A3,$55, $26,$26
.byte $27, $66,$66, $22, $A3,$88, $22, $88,$88, $22
.byte $28, $82, $22, $28, $22, $88, $82
.byte $28, $82, $A3,$55, $52,$52, $A3,$88, $52, $88
.byte $52,$52, $58, $52, $A3,$55, $88, $55,$55, $52
.byte $26, $A3,$82, $88, $22, $A3,$88, $22,$22, $88
.byte $A3,$22, $88, $22,$22, $88,$88, $55,$55, $82, $A4,$88
.byte $85, $88, $A6,$55, $85, $88, $55,$55, $A0,$01,$A5
.byte $22, $A4,$88, $82,$82, $88, $A3,$22, $28, $A6,$22
.byte $28,$28, $25, $A9,$88, $A5,$85, $88,$88, $85,$85, $8A
.byte $82, $A7,$88, $A4,$22, $52, $82, $55, $85
.byte $AA,$25, $28, $A5,$25, $28, $A8,$25, $85, $55,$55
.byte $A4,$85, $22, $55, $88, $55,$55, $85, $28
.byte $A0,$1B,$22, $28, $85, $55, $78, $88,$88, $A3,$55
.byte $25, $58, $A7,$52, $72, $A3,$52, $22, $52,$52
.byte $72, $A8,$52, $22, $A6,$52, $72, $58, $55,$55
.byte $58, $A3,$82, $88, $82,$82, $A3,$88, $A7,$82, $88
.byte $A3,$82, $88, $A7,$82, $88, $A4,$82, $88, $A6,$82
.byte $A0,$28,$88, $AA,$28, $A4,$22, $A0,$1A,$28, $A0,$A0,$00
.byte $A1

View File

@ -38,12 +38,12 @@ ootw_pool:
;============================= ;=============================
; Load background to $c00 ; Load background to $c00
lda #>(pool_rle) lda #<(pool_lzsa)
sta GBASH sta getsrc_smc+1 ; LZSA_SRC_LO
lda #<(pool_rle) lda #>(pool_lzsa)
sta GBASL sta getsrc_smc+2 ; LZSA_SRC_HI
lda #$c ; load image off-screen $c00 lda #$c ; load image off-screen $c00
jsr load_rle_gr jsr decompress_lzsa2_fast
;================================= ;=================================
@ -411,12 +411,13 @@ exit_pool:
;============================= ;=============================
; Load background to $c00 ; Load background to $c00
lda #>(pool_rle) lda #<(pool_lzsa)
sta GBASH sta getsrc_smc+1 ; LZSA_SRC_LO
lda #<(pool_rle) lda #>(pool_lzsa)
sta GBASL sta getsrc_smc+2 ; LZSA_SRC_H
lda #$c ; load image off-screen $c00 lda #$c ; load image off-screen $c00
jsr load_rle_gr jsr decompress_lzsa2_fast
exit_pool_loop: exit_pool_loop: