From 17ed65c383d61cc3dab8ed25ffb36f09d3949b03 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 14 Apr 2024 19:31:16 -0400 Subject: [PATCH] mars: rename mars map and some other cleanups --- games/keen/Makefile | 2 +- games/keen/TODO | 6 +-- games/keen/maps/Makefile | 10 ++--- games/keen/maps/mars_map.png | Bin 873 -> 10027 bytes games/keen/maps/mars_new.png | Bin 10027 -> 0 bytes games/keen/maps/old/mars_map.png | Bin 0 -> 873 bytes games/keen/mars.s | 73 +++++-------------------------- 7 files changed, 19 insertions(+), 72 deletions(-) delete mode 100644 games/keen/maps/mars_new.png create mode 100644 games/keen/maps/old/mars_map.png diff --git a/games/keen/Makefile b/games/keen/Makefile index f844e670..298befa4 100644 --- a/games/keen/Makefile +++ b/games/keen/Makefile @@ -55,7 +55,7 @@ mars.o: mars.s zp.inc hardware.inc game_over.s \ mars_keyboard.s draw_tilemap.s \ mars_sfx.s longer_sound.s \ text_help.s \ - maps/mars_new.zx02 graphics/parts.gr.zx02 + maps/mars_map.zx02 graphics/parts.gr.zx02 ca65 -o mars.o mars.s -l mars.lst #### diff --git a/games/keen/TODO b/games/keen/TODO index 649d64bd..4bace426 100644 --- a/games/keen/TODO +++ b/games/keen/TODO @@ -6,13 +6,13 @@ title mars map ~~~~~~~~ + + animate stars + enforce collision detection + proper smooth movement - + transporters - + start at starting point + show keens left at start, also when press ?? + mark completed levels - + at start, over-write finished levels with blue tiles + check completed levels when action and not let you re-enter level1 ~~~~~~ + fix so works again diff --git a/games/keen/maps/Makefile b/games/keen/maps/Makefile index deaf5d4c..d08f0220 100644 --- a/games/keen/maps/Makefile +++ b/games/keen/maps/Makefile @@ -7,7 +7,7 @@ PNG2GR = ../../../utils/gr-utils/png2gr all: png2map \ level1_map.zx02 level2_map.zx02 \ - mars_map.gr.zx02 mars_new.zx02 + mars_map.zx02 ### @@ -29,11 +29,11 @@ level2_map.inc: level2_map.png png2map ### -mars_new.zx02: mars_new.inc - $(ZX02) mars_new.inc mars_new.zx02 +mars_map.zx02: mars_map.inc + $(ZX02) mars_map.inc mars_map.zx02 -mars_new.inc: mars_new.png png2map - ./png2map mars_new.png mars_new.inc +mars_map.inc: mars_map.png png2map + ./png2map mars_map.png mars_map.inc ### diff --git a/games/keen/maps/mars_map.png b/games/keen/maps/mars_map.png index cc20fba9e2e20512052d268ce7ac723a09a53c2d..515fc2a55390df847479587e0d8f30c97dc868bc 100644 GIT binary patch literal 10027 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 r7uQ_1@Bp>aay2~+GSglR)V zP)S2WAaHVTW@&6?001bFeUUv#!$2IxUsJ^oDh|yc;t-@d*+oShYZZ!6q0|bkI+$Gg z1x*@~6cJCrBX@wj<0(J_<9%RS^nq#90O|JVn9G5jxocu zi8qL6Hf@9RKC#G3vPyhTJYmuWi66PHc>Kn>=(4~wMKhD0Cl-mNVh1Z7%u1$4JWU)? zHJ$Q>tj8*U=Pk}!rN&zKMg=yawCbc-NYj4Y$3N`) zQ{+;}RR$x+0;eFy*m02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{009(9L_t(Y$K{sM4uc>JMT?0> ze31YD+pQ^t8EBzhx0tPo4{mzwJ*gl71h?9s1-?LlZv*#k@mI$<1Ol{2{r@;r4)KB* z+rt>S;53m3e?W{En^HS0UNk_uM|4>IX*v`lbN#her-A+c@K3^ogf&O= zK05&WJIeqlMegr@BCvie8Gw9fe)ls0r7{5Z^+}))@-Kkb?`#0)9)A*ebv6LL-{bv( Y50{lTN4R9UI{*Lx07*qoM6N<$f*#6TKL7v# diff --git a/games/keen/maps/mars_new.png b/games/keen/maps/mars_new.png deleted file mode 100644 index 515fc2a55390df847479587e0d8f30c97dc868bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10027 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 -; sta ZX0_src+1 - -; lda #$c ; load to page $c00 - -; jsr full_decomp ; tail call - rts @@ -498,28 +489,6 @@ check_location_match: rts ; jump -; lda MARS_X -; cmp #15 -; bcc do_nothing ; blt -; cmp #20 -; bcc maybe_ship -; cmp #35 -; bcs maybe_exit -;do_nothing: -; ; TODO: make sound? -; rts -;maybe_ship: -; lda MARS_Y -; cmp #16 -; bcc do_nothing -; cmp #24 -; bcs do_nothing -; jmp do_parts ; tail call -;maybe_exit: -; inc LEVEL_OVER -; rts - - ;===================================== ;===================================== @@ -535,6 +504,9 @@ dummy_action: ;===================================== ;===================================== ; level number is in X + + ; FIXME: make sure level is not completed + enter_level: stx CURRENT_LEVEL @@ -550,17 +522,17 @@ enter_level: ;===================================== transport_right: - ; TODO: play noise - lda #34 sta MARS_TILEX lda #3 + +transport_common: sta MARS_TILEY ldy #SFX_TELEPORTSND jsr play_sfx - jsr recenter_map ; fallthrough? + jsr recenter_map jsr copy_tilemap_subset @@ -573,21 +545,11 @@ transport_right: ;===================================== transport_left: - ; TODO: play noise - lda #26 sta MARS_TILEX lda #4 - sta MARS_TILEY - ldy #SFX_TELEPORTSND - jsr play_sfx - - jsr recenter_map ; fallthrough? - - jsr copy_tilemap_subset - - rts + bne transport_common ; bra ;===================================== ;===================================== @@ -597,23 +559,11 @@ transport_left: transport_secret: ; TODO: verify we are transporting back to the right place - ; TODO: play noise - lda #44 sta MARS_TILEX lda #24 - sta MARS_TILEY - - ldy #SFX_TELEPORTSND - jsr play_sfx - - jsr recenter_map ; fallthrough? - - jsr copy_tilemap_subset - - rts - + bne transport_common ; bra @@ -702,8 +652,6 @@ location_actions_high: ; level graphics -mars_zx02: - .incbin "maps/mars_map.gr.zx02" parts_zx02: .incbin "graphics/parts.gr.zx02" @@ -712,7 +660,7 @@ parts_zx02: .include "gr_fast_clear.s" .include "gr_copy.s" .include "gr_pageflip.s" -; .include "gr_putsprite_crop.s" + .include "gr_putsprite_crop.s" .include "zx02_optim.s" .include "gr_fade.s" @@ -727,10 +675,9 @@ parts_zx02: .include "mars_sfx.s" .include "longer_sound.s" - .include "gr_putsprite_crop.s" mars_data_zx02: - .incbin "maps/mars_new.zx02" + .incbin "maps/mars_map.zx02" ; dummy enemy_data_out: