diff --git a/games/tfv/Makefile b/games/tfv/Makefile index 25f12d98..462a115a 100644 --- a/games/tfv/Makefile +++ b/games/tfv/Makefile @@ -37,7 +37,7 @@ loader.o: loader.s init_vars.s common_defines.inc zp.inc ### -credits.o: credits.s credits_sprites.inc mockingboard.s \ +credits.o: credits.s zp.inc credits_sprites.inc mockingboard.s \ vapor_lock.s gr_putsprite.s move_letters.s \ ./graphics_credits/KATC.lzsa ca65 -o credits.o credits.s -l credits.lst @@ -53,6 +53,7 @@ TFV_TITLE: tfv_title.o tfv_title.o: tfv_title.s zp.inc \ gr_vlin.s tfv_opener.s \ draw_menu.s keyboard.s joystick.s \ + load_game.s tfv_textentry.s \ graphics_title/tfv_title.inc ca65 -o tfv_title.o tfv_title.s -l tfv_title.lst @@ -88,6 +89,9 @@ tfv_world.o: tfv_world.s zp.inc \ play_music.s music/fighting.pt3 music/victory.pt3 music/battle_music.inc ca65 -o tfv_world.o tfv_world.s -l tfv_world.lst +graphics_credits/KATC.lzsa: + cd graphics_credits && make + graphics_map/tfv_backgrounds.inc: cd graphics_map && make @@ -95,7 +99,7 @@ graphics_battle/battle_graphics.inc: cd graphics_battle && make music/battle_music.inc: - cd battle_music && make + cd music && make @@ -104,4 +108,5 @@ music/battle_music.inc: clean: rm -f *~ TITLE.GR *.o *.lst TFV_CREDITS TFV_TITLE TFV_FLYING TFV_WORLD HELLO LOADER cd graphics_battle && make clean + cd graphics_credits && ake clean cd music && make clean diff --git a/games/tfv/TODO b/games/tfv/TODO index 50e439bd..54ac71e7 100644 --- a/games/tfv/TODO +++ b/games/tfv/TODO @@ -10,8 +10,8 @@ short-term: - handle dying properly (game over at bottom of screen) + load game support + merge the credits and battle mockingboard code if possible - - ++ for the victory music, add pause before playing, adjust tempo ++ add "story" of some sort get metrocat by running across him on world map diff --git a/games/tfv/credits.s b/games/tfv/credits.s index 2a2b9dd4..c79e7406 100644 --- a/games/tfv/credits.s +++ b/games/tfv/credits.s @@ -21,8 +21,8 @@ MBOFFSET = $98 WAITING = $99 -MB_VALUE = $91 -DONE_PLAYING = $92 +;MB_VALUE = $91 +;DONE_PLAYING = $92 MB_ADDRL = $93 MB_ADDRH = $94 MB_CHUNK_OFFSET = $95 diff --git a/games/tfv/load_game.s b/games/tfv/load_game.s new file mode 100644 index 00000000..3fba9664 --- /dev/null +++ b/games/tfv/load_game.s @@ -0,0 +1,22 @@ + + ;================================= + ; load game! for now, debugging + ;================================= + ; eventually load values from file like MYST does + ; also provide multiple load games +load_game: + + + lda #$03 + sta HERO_LEVEL + + lda #$02 + sta HERO_HP_HI + lda #$90 + sta HERO_HP_LO + sta HERO_MP + sta HERO_MP_MAX + lda #LOAD_FLYING + sta WHICH_LOAD + + rts diff --git a/games/tfv/zp.inc b/games/tfv/zp.inc index d1e5a7ed..ceed458e 100644 --- a/games/tfv/zp.inc +++ b/games/tfv/zp.inc @@ -219,22 +219,19 @@ QUEUED_ATTACK = $DC QUEUED_DO_LIMIT = $03 QUEUED_DO_SUMMON = $04 + COLOR1 = $E0 COLOR2 = $E1 MATCH = $E2 XX = $E3 YY = $E4 -SHIPY = $E4 +SHIPY = $E4 ; same as before YADD = $E5 LOGO_LOOP = $E6 -;MEMPTRL = $E7 -;MEMPTRH = $E8 -NAMEL = $E9 -NAMEH = $EA -NAMEX = $EB -CHAR = $EC -DISP_PAGE = $ED -DRAW_PAGE = $EE +NAMEX = $E7 +CHAR = $E8 +DISP_PAGE = $E9 +DRAW_PAGE = $EA FIRST = $F0 LASTKEY = $F1