mirror of
https://github.com/deater/dos33fsprogs.git
synced 2024-06-12 11:29:37 +00:00
peasant: more work updating the intro
This commit is contained in:
parent
1ac631bbcf
commit
14270a87ed
|
@ -208,8 +208,11 @@ INTRO: intro.o
|
||||||
ld65 -o INTRO intro.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
|
ld65 -o INTRO intro.o -C $(LINKER_SCRIPTS)/apple2_6000.inc
|
||||||
|
|
||||||
intro.o: intro.s zp.inc qload.inc music.inc \
|
intro.o: intro.s zp.inc qload.inc music.inc \
|
||||||
graphics_peasantry/graphics_intro.inc sprites/peasant_sprites.inc \
|
graphics_peasantry/graphics_intro.inc \
|
||||||
graphics_peasantry/priority_intro.inc \
|
graphics_peasantry/priority_intro.inc \
|
||||||
|
sprites/peasant_sprites.inc \
|
||||||
|
sprites/bubble_sprites_e.inc \
|
||||||
|
sprites/bubble_sprites_w.inc \
|
||||||
text/intro.inc \
|
text/intro.inc \
|
||||||
draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \
|
draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \
|
||||||
hgr_1x28_sprite_mask.s hgr_1x5_sprite.s hgr_save_restore.s \
|
hgr_1x28_sprite_mask.s hgr_1x5_sprite.s hgr_save_restore.s \
|
||||||
|
|
|
@ -19,18 +19,7 @@ lake_east:
|
||||||
lda #PEASANT_DIR_RIGHT
|
lda #PEASANT_DIR_RIGHT
|
||||||
sta PEASANT_DIR
|
sta PEASANT_DIR
|
||||||
|
|
||||||
;=====================
|
;============================
|
||||||
; load bg
|
|
||||||
|
|
||||||
lda #<(lake_e_lzsa)
|
|
||||||
sta getsrc_smc+1
|
|
||||||
lda #>(lake_e_lzsa)
|
|
||||||
sta getsrc_smc+2
|
|
||||||
|
|
||||||
lda #$40
|
|
||||||
|
|
||||||
jsr decompress_lzsa2_fast
|
|
||||||
|
|
||||||
; load priority to $400
|
; load priority to $400
|
||||||
; indirectly as we can't trash screen holes
|
; indirectly as we can't trash screen holes
|
||||||
|
|
||||||
|
@ -47,6 +36,22 @@ lake_east:
|
||||||
|
|
||||||
jsr gr_copy_to_page1
|
jsr gr_copy_to_page1
|
||||||
|
|
||||||
|
|
||||||
|
;=====================
|
||||||
|
; load bg
|
||||||
|
|
||||||
|
lda #<(lake_e_lzsa)
|
||||||
|
sta getsrc_smc+1
|
||||||
|
lda #>(lake_e_lzsa)
|
||||||
|
sta getsrc_smc+2
|
||||||
|
|
||||||
|
lda #$20
|
||||||
|
|
||||||
|
jsr decompress_lzsa2_fast
|
||||||
|
|
||||||
|
jsr hgr_copy
|
||||||
|
|
||||||
|
|
||||||
;================
|
;================
|
||||||
; print title line
|
; print title line
|
||||||
|
|
||||||
|
@ -55,10 +60,10 @@ lake_east:
|
||||||
;====================
|
;====================
|
||||||
; save background
|
; save background
|
||||||
|
|
||||||
lda PEASANT_X
|
; lda PEASANT_X
|
||||||
sta CURSOR_X
|
; sta CURSOR_X
|
||||||
lda PEASANT_Y
|
; lda PEASANT_Y
|
||||||
sta CURSOR_Y
|
; sta CURSOR_Y
|
||||||
|
|
||||||
;=======================
|
;=======================
|
||||||
; walking
|
; walking
|
||||||
|
@ -219,7 +224,7 @@ update_bubbles_e:
|
||||||
lda #94
|
lda #94
|
||||||
sta CURSOR_Y
|
sta CURSOR_Y
|
||||||
|
|
||||||
jsr hgr_draw_sprite_1x5
|
jsr hgr_draw_sprite ;_1x5
|
||||||
|
|
||||||
|
|
||||||
; bubble 2
|
; bubble 2
|
||||||
|
@ -241,7 +246,7 @@ update_bubbles_e:
|
||||||
lda #103
|
lda #103
|
||||||
sta CURSOR_Y
|
sta CURSOR_Y
|
||||||
|
|
||||||
jsr hgr_draw_sprite_1x5
|
jsr hgr_draw_sprite ;_1x5
|
||||||
|
|
||||||
; bubble 3
|
; bubble 3
|
||||||
|
|
||||||
|
@ -262,7 +267,7 @@ update_bubbles_e:
|
||||||
lda #130
|
lda #130
|
||||||
sta CURSOR_Y
|
sta CURSOR_Y
|
||||||
|
|
||||||
jsr hgr_draw_sprite_1x5
|
jsr hgr_draw_sprite ;_1x5
|
||||||
|
|
||||||
rts
|
rts
|
||||||
|
|
||||||
|
@ -277,45 +282,54 @@ bubble_progress_e:
|
||||||
.word bubble_e_sprite4
|
.word bubble_e_sprite4
|
||||||
.word bubble_e_sprite5
|
.word bubble_e_sprite5
|
||||||
|
|
||||||
|
.include "sprites/bubble_sprites_e.inc"
|
||||||
|
|
||||||
|
.if 0
|
||||||
bubble_e_sprite0:
|
bubble_e_sprite0:
|
||||||
.byte $AA
|
.byte 1,5
|
||||||
.byte $AA
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $AA
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $80 ; 1 000 0000
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $AA
|
.byte $80 ; 1 000 0000 0 00 00 00 KKKKKKK
|
||||||
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
|
|
||||||
bubble_e_sprite1:
|
bubble_e_sprite1:
|
||||||
.byte $AA
|
.byte 1,5
|
||||||
.byte $AA
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $AA
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $88 ; 1 XXX 10XX
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $A2 ; 0 010 XX10
|
.byte $88 ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
|
.byte $A2 ; 1 010 0010 0 10 00 10 BBBKKBB
|
||||||
|
|
||||||
bubble_e_sprite2:
|
bubble_e_sprite2:
|
||||||
.byte $AA
|
.byte 1,5
|
||||||
.byte $AA
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $A2 ; 0 010 XX10
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $88 ; 1 XXX 10XX
|
.byte $A2 ; 1 010 0010 0 10 00 10 BBBKKBB
|
||||||
.byte $AA
|
.byte $88+++ ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
|
|
||||||
bubble_e_sprite3:
|
bubble_e_sprite3:
|
||||||
.byte $AA
|
.byte 1,5
|
||||||
.byte $A2 ; 101X XX10
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $88 ; 00XX 1XX0
|
.byte $A2 ; 1 010 0010 0 10 00 10 BBBKKBB
|
||||||
.byte $88 ; 1XX0 10XX
|
.byte $88 ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
.byte $AA
|
.byte $88 ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
|
|
||||||
bubble_e_sprite4:
|
bubble_e_sprite4:
|
||||||
.byte $88 ; 0xx0 10xx
|
.byte 1,5
|
||||||
.byte $A2 ; 101x xx10
|
.byte $88 ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
.byte $88 ; 00xx 1xx0
|
.byte $A2 ; 1 010 0010 0 10 00 10 BBBKKBB
|
||||||
.byte $88 ; 1xx0 10XX
|
.byte $88 ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
.byte $AA ; 0010 1010
|
.byte $88 ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
|
|
||||||
bubble_e_sprite5:
|
bubble_e_sprite5:
|
||||||
.byte $AA ; 0010 1010
|
.byte 1,5
|
||||||
.byte $88 ; 1XX0 10XX
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
.byte $A2 ; 001X XX10
|
.byte $88 ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
.byte $88 ; 1XX0 10XX
|
.byte $A2 ; 1 010 0010 0 10 00 10 BBBKKBB
|
||||||
.byte $AA ; 0010 1010
|
.byte $88 ; 1 000 1000 0 00 10 00 KKKBBKK
|
||||||
|
.byte $AA ; 1 010 1010 0 10 10 10 BBBBBBB
|
||||||
|
.endif
|
||||||
|
|
|
@ -340,7 +340,7 @@ bubble_progress:
|
||||||
.word bubble_sprite5
|
.word bubble_sprite5
|
||||||
|
|
||||||
|
|
||||||
.include "sprites/bubble_sprites.inc"
|
.include "sprites/bubble_sprites_w.inc"
|
||||||
|
|
||||||
.if 0
|
.if 0
|
||||||
bubble_sprite0:
|
bubble_sprite0:
|
||||||
|
|
|
@ -3,7 +3,7 @@ HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
|
||||||
all: inventory_sprites.inc ending_sprites.inc trogdor_sprites.inc \
|
all: inventory_sprites.inc ending_sprites.inc trogdor_sprites.inc \
|
||||||
boat_sprites.inc peasant_sprites.inc ned_sprites.inc \
|
boat_sprites.inc peasant_sprites.inc ned_sprites.inc \
|
||||||
peasant_robe_sprites.inc kerrek_sprites.inc \
|
peasant_robe_sprites.inc kerrek_sprites.inc \
|
||||||
waterfall_sprites.inc bubble_sprites.inc
|
waterfall_sprites.inc bubble_sprites_w.inc bubble_sprites_e.inc
|
||||||
|
|
||||||
peasant_sprites.inc: peasant_sprites.png
|
peasant_sprites.inc: peasant_sprites.png
|
||||||
$(HGR_SPRITE) -l peasant_right1_sprite peasant_sprites.png 35 1 35 29 > peasant_sprites.inc
|
$(HGR_SPRITE) -l peasant_right1_sprite peasant_sprites.png 35 1 35 29 > peasant_sprites.inc
|
||||||
|
@ -156,18 +156,25 @@ trogdor_sprites.inc: trogdor_sprites.png
|
||||||
waterfall_sprites.inc: waterfall_sprites.png
|
waterfall_sprites.inc: waterfall_sprites.png
|
||||||
$(HGR_SPRITE) -s -l waterfall_sprite waterfall_sprites.png 14 5 27 52 > waterfall_sprites.inc
|
$(HGR_SPRITE) -s -l waterfall_sprite waterfall_sprites.png 14 5 27 52 > waterfall_sprites.inc
|
||||||
|
|
||||||
bubble_sprites.inc: bubble_sprites.png
|
bubble_sprites_w.inc: bubble_sprites_w.png
|
||||||
$(HGR_SPRITE) -s -l bubble_sprite0 bubble_sprites.png 7 1 13 6 > bubble_sprites.inc
|
$(HGR_SPRITE) -s -l bubble_sprite0 bubble_sprites_w.png 7 1 13 6 > bubble_sprites_w.inc
|
||||||
$(HGR_SPRITE) -s -l bubble_sprite1 bubble_sprites.png 7 8 13 13 >> bubble_sprites.inc
|
$(HGR_SPRITE) -s -l bubble_sprite1 bubble_sprites_w.png 7 8 13 13 >> bubble_sprites_w.inc
|
||||||
$(HGR_SPRITE) -s -l bubble_sprite2 bubble_sprites.png 7 15 13 20 >> bubble_sprites.inc
|
$(HGR_SPRITE) -s -l bubble_sprite2 bubble_sprites_w.png 7 15 13 20 >> bubble_sprites_w.inc
|
||||||
$(HGR_SPRITE) -s -l bubble_sprite3 bubble_sprites.png 7 22 13 27 >> bubble_sprites.inc
|
$(HGR_SPRITE) -s -l bubble_sprite3 bubble_sprites_w.png 7 22 13 27 >> bubble_sprites_w.inc
|
||||||
$(HGR_SPRITE) -s -l bubble_sprite4 bubble_sprites.png 7 29 13 34 >> bubble_sprites.inc
|
$(HGR_SPRITE) -s -l bubble_sprite4 bubble_sprites_w.png 7 29 13 34 >> bubble_sprites_w.inc
|
||||||
$(HGR_SPRITE) -s -l bubble_sprite5 bubble_sprites.png 7 36 13 41 >> bubble_sprites.inc
|
$(HGR_SPRITE) -s -l bubble_sprite5 bubble_sprites_w.png 7 36 13 41 >> bubble_sprites_w.inc
|
||||||
|
|
||||||
|
|
||||||
|
bubble_sprites_e.inc: bubble_sprites_e.png
|
||||||
|
$(HGR_SPRITE) -s -l bubble_e_sprite0 bubble_sprites_e.png 7 1 13 6 > bubble_sprites_e.inc
|
||||||
|
$(HGR_SPRITE) -s -l bubble_e_sprite1 bubble_sprites_e.png 7 8 13 13 >> bubble_sprites_e.inc
|
||||||
|
$(HGR_SPRITE) -s -l bubble_e_sprite2 bubble_sprites_e.png 7 15 13 20 >> bubble_sprites_e.inc
|
||||||
|
$(HGR_SPRITE) -s -l bubble_e_sprite3 bubble_sprites_e.png 7 22 13 27 >> bubble_sprites_e.inc
|
||||||
|
$(HGR_SPRITE) -s -l bubble_e_sprite4 bubble_sprites_e.png 7 29 13 34 >> bubble_sprites_e.inc
|
||||||
|
$(HGR_SPRITE) -s -l bubble_e_sprite5 bubble_sprites_e.png 7 36 13 41 >> bubble_sprites_e.inc
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *~ peasant_sprites.inc inventory_sprites.inc \
|
rm -f *~ peasant_sprites.inc inventory_sprites.inc \
|
||||||
ending_sprites.inc trogdor_sprites.inc ned_sprites.inc \
|
ending_sprites.inc trogdor_sprites.inc ned_sprites.inc \
|
||||||
peasant_robe_sprites.inc kerrek_sprites.inc \
|
peasant_robe_sprites.inc kerrek_sprites.inc \
|
||||||
waterfall_sprites.inc bubble_sprites.inc
|
waterfall_sprites.inc bubble_sprites_w.inc \
|
||||||
|
bubble_sprites_e.inc
|
||||||
|
|
BIN
games/peasant/sprites/bubble_sprites_e.png
Normal file
BIN
games/peasant/sprites/bubble_sprites_e.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 7.4 KiB |
Loading…
Reference in New Issue
Block a user