From b15aacde68048440f6a787578d9ad50ca8d3a18e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 18 Jan 2021 16:06:54 -0500 Subject: [PATCH] tfv: summons now cost MP --- games/tfv/tfv_battle_draw_hero.s | 2 +- games/tfv/tfv_battle_summons.s | 52 ++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/games/tfv/tfv_battle_draw_hero.s b/games/tfv/tfv_battle_draw_hero.s index 686e42c9..4c4f1b5f 100644 --- a/games/tfv/tfv_battle_draw_hero.s +++ b/games/tfv/tfv_battle_draw_hero.s @@ -197,7 +197,7 @@ damage_hero_done: ;======================== ; hero use magic ;======================== - ; value in A + ; value in MAGIC_COST hero_use_magic: lda HERO_MP diff --git a/games/tfv/tfv_battle_summons.s b/games/tfv/tfv_battle_summons.s index c2a4c063..e6956d3c 100644 --- a/games/tfv/tfv_battle_summons.s +++ b/games/tfv/tfv_battle_summons.s @@ -1,3 +1,20 @@ + ;========================= + ; summon + ;========================= +summon: + lda MENU_POSITION + beq do_summon_metrocat + bne do_summon_vortex_cannon + +do_summon_metrocat: + jmp summon_metrocat +do_summon_vortex_cannon: + jmp summon_vortex_cannon + + rts + + + ;======================== @@ -157,6 +174,14 @@ metrocat_damage_loop: dec ANIMATE_LOOP bne metrocat_damage_loop + + ; ending scene + + + lda #$07 + sta MAGIC_COST + jsr hero_use_magic + jsr gr_copy_to_current ; draw enemy @@ -186,8 +211,8 @@ metrocat_damage_loop: jsr page_flip - ; long wait (2s?) - ldx #200 + ; long wait (1.5s) + ldx #150 jsr long_wait rts @@ -350,6 +375,9 @@ vortex_no_print_damage: ; end of summon + lda #$10 + sta MAGIC_COST + jsr hero_use_magic jsr gr_copy_to_current @@ -367,27 +395,11 @@ vortex_no_print_damage: jsr page_flip - ; wait 2s - ldx #200 + ; wait 1.5s + ldx #150 jsr long_wait rts - ;========================= - ; summon - ;========================= -summon: - lda MENU_POSITION - beq do_summon_metrocat - bne do_summon_vortex_cannon - -do_summon_metrocat: - jmp summon_metrocat -do_summon_vortex_cannon: - jmp summon_vortex_cannon - - rts - -