diff --git a/games/peasant/TODO b/games/peasant/TODO index d1decc8b..53b125ca 100644 --- a/games/peasant/TODO +++ b/games/peasant/TODO @@ -4,6 +4,10 @@ General: - More frames in peasant sprites - Hook up text parser - Move music to language card? +- Remove mockingboard detect from qload, move other things in? + +Videlectrix Title: +- Can we make it faster? Intro: - Speaker music for title if no Mockingboard @@ -12,14 +16,15 @@ Peasantry: - Better animation of River - Priorities for all rooms - Hook up hidden glen, inside of cottage and inn +- Archery minigame Tower: - Tower level Trogdor: - All the rest -- Trogdor's speech -- Properly detect if SSI-263 is available and skip if not +- Rest of Trogdor's speech +- Properly disable speech if SSI-263 is available Ending: - Smoother baby animation? Use page-flipping? diff --git a/games/peasant/title.s b/games/peasant/title.s index b3be353e..2445f9b3 100644 --- a/games/peasant/title.s +++ b/games/peasant/title.s @@ -11,6 +11,13 @@ title: jsr HGR2 ; Hi-res graphics, no text at bottom ; Y=0, A=0 after this called + ;========================= + ; set up hgr lookup tables + ;========================= + + jsr hgr_make_tables + + ;======================== ; Music ;======================== @@ -22,33 +29,18 @@ title: PT3_ENABLE_APPLE_IIC = 1 + lda SOUND_STATUS + and #SOUND_MOCKINGBOARD + beq mockingboard_notfound + lda #0 sta DONE_PLAYING lda #1 sta LOOP - ; detect mockingboard - jsr mockingboard_detect - - bcc mockingboard_notfound - -mockingboard_found: - - ; print detected location - -; lda MB_ADDR_H ; $C4 = 4, want $B4 1100 -> 1011 -; and #$87 -; ora #$30 - -; sta $7d0+39 ; 23,39 - jsr mockingboard_patch ; patch to work in slots other than 4? -; lda SOUND_STATUS -; ora #SOUND_MOCKINGBOARD -; sta SOUND_STATUS - ;======================= ; Set up 50Hz interrupt ;======================== @@ -69,21 +61,14 @@ mockingboard_found: jsr pt3_init_song -mockingboard_notfound: - - ;========================= - ; set up hgr lookup tables - ;========================= - - jsr hgr_make_tables - - ;======================= ; start music ;======================= cli +mockingboard_notfound: + ;************************ ; Title diff --git a/games/peasant/vid_logo.s b/games/peasant/vid_logo.s index a2e56d45..8fdef12c 100644 --- a/games/peasant/vid_logo.s +++ b/games/peasant/vid_logo.s @@ -138,10 +138,6 @@ no_language_card: PT3_ENABLE_APPLE_IIC = 1 - lda #0 - sta DONE_PLAYING - sta LOOP - ; detect mockingboard jsr mockingboard_detect