diff --git a/games/peasant/climb/Makefile b/games/peasant/climb/Makefile index b7276e3d..d514e8fd 100644 --- a/games/peasant/climb/Makefile +++ b/games/peasant/climb/Makefile @@ -16,6 +16,7 @@ climb.o: climb.s \ ../zp.inc ../hardware.inc ../qload.inc \ draw_peasant_climb.s move_peasant_climb.s \ ../hgr_sprite_save.s \ + ../text/DIALOG_CLIMB.ZX02 \ keyboard_climb.s \ sprites/enemy_sprites.inc \ ../cliff_base/graphics_cliff/cliff_base.hgr.zx02 \ diff --git a/games/peasant/climb/climb.s b/games/peasant/climb/climb.s index 95a56d7a..76f5fea8 100644 --- a/games/peasant/climb/climb.s +++ b/games/peasant/climb/climb.s @@ -8,8 +8,9 @@ .include "../zp.inc" .include "../hardware.inc" -;.include "../peasant_sprite.inc" .include "../qload.inc" +.include "../text/dialog_climb.inc" +.include "../parse_input.inc" collision_location = $bc00 @@ -51,9 +52,21 @@ cliff_climb: sta HGR_PAGE jsr hgr_make_tables - jsr load_graphics + ;================================ + ; decompress dialog to $D000 + + lda #climb_text_zx02 + sta zx_src_h+1 + + lda #$D0 + + jsr zx02_full_decomp + + ;======================== ; Load Peasant Sprites ;======================== @@ -443,11 +456,18 @@ cliff_game_over: lda #NEW_FROM_DISK sta LEVEL_OVER - ; FIXME: there actually is a message I think + ;=========================================== + ; print the message -; ldx #die_message -; jmp finish_parse_message + bit KEYRESET + + ldx #climb_fallen_message + stx OUTL + sty OUTH + jsr print_text_message + + jsr wait_until_keypress rts ; will this work? @@ -474,8 +494,6 @@ cliff_reload_bg: rts - - keep_on_climbing: jsr reset_enemy_state @@ -493,8 +511,6 @@ keep_on_climbing: load_graphics: - - ;======================== ; Load Priority graphics ;======================== @@ -563,9 +579,6 @@ col_copy_loop: jsr print_score - - - rts @@ -592,6 +605,8 @@ col_copy_loop: .include "../hgr_sprite_bg_mask.s" +climb_text_zx02: +.incbin "../text/DIALOG_CLIMB.ZX02" priority_data_l: diff --git a/games/peasant/text/Makefile b/games/peasant/text/Makefile index dd9b4fed..87661435 100644 --- a/games/peasant/text/Makefile +++ b/games/peasant/text/Makefile @@ -16,6 +16,7 @@ all: dump_text shrink_text \ DIALOG_CLIFF_BASE.ZX02 dialog_cliff_base.inc \ DIALOG_CLIFF_HEIGHTS.ZX02 dialog_cliff_heights.inc \ DIALOG_TROGDOR.ZX02 dialog_trogdor.inc \ + DIALOG_CLIMB.ZX02 dialog_climb.inc \ common.inc.lookup \ inventory.inc.lookup @@ -35,6 +36,25 @@ dialog_cliff_base.o: dialog_cliff_base.s \ dialog_cliff_base.inc: ../generate_all_symbols dialog_cliff_base ../generate_all_symbols -a 0xd000 dialog_cliff_base.lst > dialog_cliff_base.inc + +### + + +DIALOG_CLIMB.ZX02: dialog_climb + $(ZX02) -f dialog_climb DIALOG_CLIMB.ZX02 + +dialog_climb: dialog_climb.o + ld65 -o dialog_climb dialog_climb.o -C $(LINKER_SCRIPTS)/apple2_d000.inc + +dialog_climb.o: dialog_climb.s \ + climb.inc.lookup + ca65 -o dialog_climb.o dialog_climb.s -l dialog_climb.lst + +dialog_climb.inc: ../generate_all_symbols dialog_climb + ../generate_all_symbols -a 0xd000 dialog_climb.lst > dialog_climb.inc + + + ### DIALOG_CLIFF_HEIGHTS.ZX02: dialog_cliff_heights @@ -187,6 +207,9 @@ cliff_base.inc.lookup: cliff_base.inc shrink_text cliff_heights.inc.lookup: cliff_heights.inc shrink_text ./shrink_text < cliff_heights.inc > cliff_heights.inc.lookup +climb.inc.lookup: climb.inc shrink_text + ./shrink_text < climb.inc > climb.inc.lookup + cottage.inc.lookup: cottage.inc shrink_text ./shrink_text < cottage.inc > cottage.inc.lookup diff --git a/games/peasant/text/dialog_climb.s b/games/peasant/text/dialog_climb.s new file mode 100644 index 00000000..942fe9ce --- /dev/null +++ b/games/peasant/text/dialog_climb.s @@ -0,0 +1,2 @@ +.include "lookup.inc" +.include "climb.inc.lookup"