diff --git a/games/riven_hgr/disk10_files/disk10_defines.inc b/games/riven_hgr/disk10_files/disk10_defines.inc index 68fbf570..e5a45abf 100644 --- a/games/riven_hgr/disk10_files/disk10_defines.inc +++ b/games/riven_hgr/disk10_files/disk10_defines.inc @@ -6,3 +6,4 @@ LOAD_INSIDE = 1 ; INSIDE RIVEN_INSIDE = 0 +RIVEN_STAINED3 = 1 diff --git a/games/riven_hgr/disk10_files/graphics_stained/Makefile b/games/riven_hgr/disk10_files/graphics_stained/Makefile new file mode 100644 index 00000000..9787dea2 --- /dev/null +++ b/games/riven_hgr/disk10_files/graphics_stained/Makefile @@ -0,0 +1,24 @@ +include ../../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f +PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr + +all: stained_graphics.inc + +stained_graphics.inc: \ + stained03.hgr.zx02 + echo "stained03_zx02: .incbin \"stained03.hgr.zx02\"" > stained_graphics.inc + +#### + +%.hgr: %.png + $(PNG_TO_HGR) $< > $@ + +%.hgr.zx02: %.hgr + $(ZX02) -f $< $@ + +#### + +clean: + rm -f *~ *.o *.lst *.zx02 *.hgr stained_graphics.inc + diff --git a/games/riven_hgr/disk10_files/graphics_stained/stained03.png b/games/riven_hgr/disk10_files/graphics_stained/stained03.png new file mode 100644 index 00000000..2dd3b6c1 Binary files /dev/null and b/games/riven_hgr/disk10_files/graphics_stained/stained03.png differ diff --git a/games/riven_hgr/disk10_files/level_inside.s b/games/riven_hgr/disk10_files/level_inside.s index 7b322ba9..7f6bb31a 100644 --- a/games/riven_hgr/disk10_files/level_inside.s +++ b/games/riven_hgr/disk10_files/level_inside.s @@ -109,5 +109,6 @@ really_exit: .include "graphics_inside/inside_graphics.inc" +.include "graphics_stained/stained_graphics.inc" .include "leveldata_inside.inc" diff --git a/games/riven_hgr/disk10_files/leveldata_inside.inc b/games/riven_hgr/disk10_files/leveldata_inside.inc index 4c584355..0afcfb2b 100644 --- a/games/riven_hgr/disk10_files/leveldata_inside.inc +++ b/games/riven_hgr/disk10_files/leveldata_inside.inc @@ -3,7 +3,7 @@ ;=============================================== locations: - .word location0 + .word location0,location1 ; RIVEN_INSIDE -- part way across the bridge @@ -11,7 +11,7 @@ location0: .byte $ff ; north exit .byte $ff ; south exit .byte $E0 ; east exit - .byte $ff ; west exit + .byte RIVEN_STAINED3 ; west exit .byte $FF ; north exit_dir .byte $FF ; south exit_dir .byte DIRECTION_E ; east exit_dir @@ -23,3 +23,22 @@ location0: .byte BG_EAST|BG_WEST .byte $ff ; special exit +; RIVEN_STAINED3 -- stained glass image + +location1: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte RIVEN_INSIDE ; west exit + .byte $FF ; north exit_dir + .byte $FF ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word stained03_zx02 ; west bg + .byte BG_WEST + .byte $ff ; special exit + +