Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-06-08 00:29:35 +00:00
Code Issues Projects Releases Wiki Activity

mist: arbor: add last two locations

Browse Source 
had to play with graphics a bit to make sure compressed small enough to
fit in 39.75k
This commit is contained in:
Vince Weaver 2020-08-27 00:22:51 -04:00
parent 8e696a16eb
commit 0ee2b3c7c9
8 changed files with 79 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mist/Makefile
View File

@ -24,7 +24,6 @@ mist.dsk: HELLO LOADER MIST_TITLE MIST OCTAGON VIEWER \
$(DOS33) -y mist.dsk BSAVE -a 0x2000 D\'NI
$(DOS33) -y mist.dsk BSAVE -a 0xe00 SAVE0
$(DOS33) -y mist.dsk BSAVE -a 0x2000 SHIP
# $(DOS33) -y mist.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC
mist_side2.dsk: HELLO_DISK2 CHANNEL ARBOR NIBEL CABIN GENERATOR
cp empty.dsk mist_side2.dsk
@ -108,7 +107,7 @@ mist_title.o: mist_title.s zp.inc hardware.inc common_defines.inc \
####
MIST: mist.o
ld65 -o MIST mist.o -C ../linker_scripts/apple2_2000.inc
ld65 -o MIST mist.o -C ./apple2_2000.inc
mist.o: mist.s zp.inc hardware.inc common_defines.inc common_routines.inc \
graphics_mist/mist_graphics.inc \
@ -126,7 +125,7 @@ mist.o: mist.s zp.inc hardware.inc common_defines.inc common_routines.inc \
####
GENERATOR: generator.o
ld65 -o GENERATOR generator.o -C ../linker_scripts/apple2_2000.inc
ld65 -o GENERATOR generator.o -C ./apple2_2000.inc
generator.o: generator.s zp.inc hardware.inc \
common_defines.inc common_routines.inc \
@ -139,7 +138,7 @@ generator.o: generator.s zp.inc hardware.inc \
####
OCTAGON: octagon.o
ld65 -o OCTAGON octagon.o -C ../linker_scripts/apple2_2000.inc
ld65 -o OCTAGON octagon.o -C ./apple2_2000.inc
octagon.o: octagon.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -157,7 +156,7 @@ octagon.o: octagon.s zp.inc hardware.inc common_defines.inc \
####
D\'NI: dni.o
ld65 -o D\'NI dni.o -C ../linker_scripts/apple2_2000.inc
ld65 -o D\'NI dni.o -C ./apple2_2000.inc
dni.o: dni.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -171,7 +170,7 @@ dni.o: dni.s zp.inc hardware.inc common_defines.inc \
####
MECHE: meche.o
ld65 -o MECHE meche.o -C ../linker_scripts/apple2_2000.inc
ld65 -o MECHE meche.o -C ./apple2_2000.inc
meche.o: meche.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -191,7 +190,7 @@ meche.o: meche.s zp.inc hardware.inc common_defines.inc \
####
SELENA: selena.o
ld65 -o SELENA selena.o -C ../linker_scripts/apple2_2000.inc
ld65 -o SELENA selena.o -C ./apple2_2000.inc
selena.o: selena.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -210,7 +209,7 @@ selena.o: selena.s zp.inc hardware.inc common_defines.inc \
####
SUB: sub.o
ld65 -o SUB sub.o -C ../linker_scripts/apple2_2000.inc
ld65 -o SUB sub.o -C ./apple2_2000.inc
sub.o: sub.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -228,7 +227,7 @@ sub.o: sub.s zp.inc hardware.inc common_defines.inc \
####
VIEWER: viewer.o
ld65 -o VIEWER viewer.o -C ../linker_scripts/apple2_2000.inc
ld65 -o VIEWER viewer.o -C ./apple2_2000.inc
viewer.o: viewer.s zp.inc hardware.inc common_defines.inc \
graphics_viewer/viewer_graphics.inc \
@ -246,7 +245,7 @@ viewer.o: viewer.s zp.inc hardware.inc common_defines.inc \
####
STONEY: stoney.o
ld65 -o STONEY stoney.o -C ../linker_scripts/apple2_2000.inc
ld65 -o STONEY stoney.o -C ./apple2_2000.inc
stoney.o: stoney.s zp.inc hardware.inc common_defines.inc \
graphics_stoney/stoney_graphics.inc \
@ -266,7 +265,7 @@ stoney.o: stoney.s zp.inc hardware.inc common_defines.inc \
####
SHIP: ship.o
ld65 -o SHIP ship.o -C ../linker_scripts/apple2_2000.inc
ld65 -o SHIP ship.o -C ./apple2_2000.inc
ship.o: ship.s zp.inc hardware.inc common_defines.inc \
graphics_ship/ship_graphics.inc \
@ -285,7 +284,7 @@ ship.o: ship.s zp.inc hardware.inc common_defines.inc \
####
CABIN: cabin.o
ld65 -o CABIN cabin.o -C ../linker_scripts/apple2_2000.inc
ld65 -o CABIN cabin.o -C ./apple2_2000.inc
cabin.o: cabin.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -305,7 +304,7 @@ cabin.o: cabin.s zp.inc hardware.inc common_defines.inc \
####
CHANNEL: channel.o
ld65 -o CHANNEL channel.o -C ../linker_scripts/apple2_2000.inc
ld65 -o CHANNEL channel.o -C ./apple2_2000.inc
channel.o: channel.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -324,7 +323,7 @@ channel.o: channel.s zp.inc hardware.inc common_defines.inc \
####
ARBOR: arbor.o
ld65 -o ARBOR arbor.o -C ../linker_scripts/apple2_2000.inc
ld65 -o ARBOR arbor.o -C ./apple2_2000.inc
arbor.o: arbor.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -336,7 +335,7 @@ arbor.o: arbor.s zp.inc hardware.inc common_defines.inc \
####
NIBEL: nibel.o
ld65 -o NIBEL nibel.o -C ../linker_scripts/apple2_2000.inc
ld65 -o NIBEL nibel.o -C ./apple2_2000.inc
nibel.o: nibel.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \
@ -348,7 +347,7 @@ nibel.o: nibel.s zp.inc hardware.inc common_defines.inc \
####
DENTIST: dentist.o
ld65 -o DENTIST dentist.o -C ../linker_scripts/apple2_2000.inc
ld65 -o DENTIST dentist.o -C ./apple2_2000.inc
dentist.o: dentist.s zp.inc hardware.inc common_defines.inc \
common_routines.inc \

12
mist/apple2_2000.inc Normal file
View File

@ -0,0 +1,12 @@
MEMORY {
ZP: start = $00, size = $1A, type = rw;
RAM: start = $2000, size = $9F00, file = %O;
}
SEGMENTS {
CODE: load = RAM, type = ro, align=$100;
RODATA: load = RAM, type = ro;
DATA: load = RAM, type = rw;
BSS: load = RAM, type = bss, define = yes;
ZEROPAGE: load = ZP, type = zp;
}

12
mist/graphics_arbor/Makefile
View File

@ -13,7 +13,7 @@ arbor_graphics.inc: \
arrival_down_e.lzsa arrival_noelev_e.lzsa \
inside_elevator1_closed_w.lzsa inside_elevator1_open_w.lzsa \
bridge1_e.lzsa bridge1_w.lzsa \
hut1_e.lzsa hut1_w.lzsa \
hut1_e.lzsa hut1_w.lzsa hut1_s.lzsa \
bridge2_n.lzsa bridge2_s.lzsa \
shack1_n.lzsa shack1_s.lzsa shack1_e.lzsa shack1_w.lzsa \
bridge3_e.lzsa bridge3_w.lzsa \
@ -25,7 +25,7 @@ arbor_graphics.inc: \
switch_hut_w.lzsa switch_hut_closed_s.lzsa switch_hut_open_s.lzsa \
bridge4_e.lzsa bridge4_w.lzsa \
hut2_e.lzsa hut2_w.lzsa \
hut2_inside_w.lzsa hut2_inside_s.lzsa \
hut2_inside_w.lzsa hut2_inside_s.lzsa hut2_inside_n.lzsa \
bridge5_n.lzsa bridge5_s.lzsa \
longshack3_n.lzsa longshack3_s.lzsa \
bridge6_n.lzsa bridge6_s.lzsa \
@ -41,7 +41,9 @@ arbor_graphics.inc: \
inlongshack3_n.lzsa inlongshack3_s.lzsa inlongshack3_e.lzsa inlongshack3_w.lzsa \
hut6_n.lzsa hut6_w.lzsa \
hut5_s.lzsa hut5_w.lzsa \
hut4_n.lzsa hut4_s.lzsa hut4_e.lzsa hut4_w.lzsa
hut4_n.lzsa hut4_s.lzsa hut4_e.lzsa hut4_w.lzsa \
hut3_s.lzsa \
hut7_n.lzsa
echo "arrival_e_lzsa: .incbin \"arrival_e.lzsa\"" > arbor_graphics.inc
echo "arrival_open_e_lzsa: .incbin \"arrival_open_e.lzsa\"" >> arbor_graphics.inc
echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> arbor_graphics.inc
@ -53,6 +55,7 @@ arbor_graphics.inc: \
echo "bridge1_w_lzsa: .incbin \"bridge1_w.lzsa\"" >> arbor_graphics.inc
echo "hut1_e_lzsa: .incbin \"hut1_e.lzsa\"" >> arbor_graphics.inc
echo "hut1_w_lzsa: .incbin \"hut1_w.lzsa\"" >> arbor_graphics.inc
echo "hut1_s_lzsa: .incbin \"hut1_s.lzsa\"" >> arbor_graphics.inc
echo "bridge2_n_lzsa: .incbin \"bridge2_n.lzsa\"" >> arbor_graphics.inc
echo "bridge2_s_lzsa: .incbin \"bridge2_s.lzsa\"" >> arbor_graphics.inc
echo "shack1_n_lzsa: .incbin \"shack1_n.lzsa\"" >> arbor_graphics.inc
@ -82,6 +85,7 @@ arbor_graphics.inc: \
echo "hut2_w_lzsa: .incbin \"hut2_w.lzsa\"" >> arbor_graphics.inc
echo "hut2_inside_w_lzsa: .incbin \"hut2_inside_w.lzsa\"" >> arbor_graphics.inc
echo "hut2_inside_s_lzsa: .incbin \"hut2_inside_s.lzsa\"" >> arbor_graphics.inc
echo "hut2_inside_n_lzsa: .incbin \"hut2_inside_n.lzsa\"" >> arbor_graphics.inc
echo "bridge5_n_lzsa: .incbin \"bridge5_n.lzsa\"" >> arbor_graphics.inc
echo "bridge5_s_lzsa: .incbin \"bridge5_s.lzsa\"" >> arbor_graphics.inc
echo "longshack3_n_lzsa: .incbin \"longshack3_n.lzsa\"" >> arbor_graphics.inc
@ -123,6 +127,8 @@ arbor_graphics.inc: \
echo "hut4_s_lzsa: .incbin \"hut4_s.lzsa\"" >> arbor_graphics.inc
echo "hut4_e_lzsa: .incbin \"hut4_e.lzsa\"" >> arbor_graphics.inc
echo "hut4_w_lzsa: .incbin \"hut4_w.lzsa\"" >> arbor_graphics.inc
echo "hut3_s_lzsa: .incbin \"hut3_s.lzsa\"" >> arbor_graphics.inc
echo "hut7_n_lzsa: .incbin \"hut7_n.lzsa\"" >> arbor_graphics.inc
%.gr: %.png
$(PNG2GR) $< $@

BIN
mist/graphics_arbor/hut1_s.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
mist/graphics_arbor/hut2_inside_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
mist/graphics_arbor/hut3_s.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
mist/graphics_arbor/hut7_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 939 B

53
mist/leveldata_arbor.inc
View File

@ -12,6 +12,7 @@ locations:
.word location24,location25,location26,location27
.word location28,location29,location30,location31
.word location32,location33,location34,location35
.word location36,location37
; ARBOR_INSIDE_ELEV1 -- arrival in elevator1
location0:
@ -107,18 +108,18 @@ location4:
; ARBOR_HUT1 -- first hut
location5:
.byte $ff ; north exit
.byte $ff ; south exit
.byte ARBOR_HUT3 ; south exit
.byte ARBOR_BRIDGE1 ; east exit
.byte ARBOR_BRIDGE2 ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_S ; south exit_dir
.byte DIRECTION_E ; east exit_dir
.byte DIRECTION_N ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word hut1_s_lzsa ; south bg
.word hut1_e_lzsa ; east bg
.word hut1_w_lzsa ; west bg
.byte BG_WEST|BG_EAST
.byte BG_WEST|BG_EAST|BG_SOUTH
.byte $ff
; ARBOR_BRIDGE2 -- second bridge
@ -313,19 +314,19 @@ location16:
; ARBOR_HUT2_INSIDE -- inside next hut
location17:
.byte $ff ; north exit
.byte ARBOR_HUT4 ; north exit
.byte ARBOR_BRIDGE5 ; south exit
.byte $ff ; east exit
.byte ARBOR_HUT2 ; west exit
.byte $ff ; north exit_dir
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word $0000 ; north bg
.word hut2_inside_n_lzsa ; north bg
.word hut2_inside_s_lzsa ; south bg
.word $0000 ; east bg
.word hut2_inside_w_lzsa ; west bg
.byte BG_WEST|BG_SOUTH
.byte BG_WEST|BG_SOUTH|BG_NORTH
.byte $ff
; ARBOR_BRIDGE5 -- next bridge
@ -638,11 +639,11 @@ location34:
; ARBOR_HUT4 -- inside hut4
location35:
.byte $ff ; north exit
.byte ARBOR_HUT7 ; north exit
.byte ARBOR_HUT2_INSIDE ; south exit
.byte ARBOR_HUT5 ; east exit
.byte $ff ; west exit
.byte $ff ; north exit_dir
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte DIRECTION_S ; east exit_dir
.byte $ff ; west exit_dir
@ -653,5 +654,37 @@ location35:
.byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
.byte $ff
; ARBOR_HUT7 -- standalone hut off ring
location36:
.byte ARBOR_HUT4 ; north exit
.byte $ff ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word hut7_n_lzsa ; north bg
.word $ff ; south bg
.word $ff ; east bg
.word $ff ; west bg
.byte BG_NORTH
.byte $ff
; ARBOR_HUT3 -- standalone hut at arrival
location37:
.byte $ff ; north exit
.byte ARBOR_HUT1 ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $ff ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word $ff ; north bg
.word hut3_s_lzsa ; south bg
.word $ff ; east bg
.word $ff ; west bg
.byte BG_SOUTH
.byte $ff