Prevent oxygen drain during conversation. Increment year in title tex…

…ts. Optimize player X-scrolling code.
cadaver · Feb 10, 2018 · 975ddd4 · 975ddd4
1 parent 55cfa34
commit 975ddd4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/bg/world.lva b/bg/world.lva
diff --git a/bg/world00.lva b/bg/world00.lva
diff --git a/level.s b/level.s
@@ -882,7 +882,9 @@ ULO_RechargeLoop:
 ULO_RechargeNoMSB:
                 dey
                 bne ULO_RechargeLoop
-ULO_NoRecharge: lda #$07
+ULO_NoRecharge: lda menuMode                    ;Deactivate "no air zone" oxygen drain during conversation
+                bne ULO_CheckHeadUnderWater
+                lda #$07
 ULO_NoAirFlag:  ldy #$00
                 bne ULO_OxygenDelay
 ULO_CheckHeadUnderWater:

diff --git a/logo.s b/logo.s
@@ -13,7 +13,7 @@ titlePageTbl:   dc.w txtPressFire
                 dc.w txtMainMenu
                 dc.w txtOptions
 
-txtPressFire:   dc.b "A COVERT BITOPS PRODUCTION IN 2016",0
+txtPressFire:   dc.b "A COVERT BITOPS PRODUCTION IN 2018",0
                 dc.b 0
                 dc.b "CODE, GFX, SOUND: LASSE __RNI",0
                 dc.b 0

diff --git a/player.s b/player.s
@@ -72,7 +72,6 @@ MovePlayer:     ldy #ZONEH_BG3
                 lda (zoneLo),y
                 bmi MP_NoPlayerScroll           ;Scroll-disabled zone?
 MP_ScrollHorizontal:
-                ldy #$00
                 lda actXL+ACTI_PLAYER
                 rol
                 rol
@@ -87,19 +86,15 @@ MP_ScrollHorizontal:
                 asl
                 asl
                 ora zpSrcLo
+                ldy #-2
                 cmp #SCRCENTER_X-1
-                bcs MP_NotLeft1
-                dey
-MP_NotLeft1:    cmp #SCRCENTER_X
-                bcs MP_NotLeft2
-                dey
-MP_NotLeft2:    cmp #SCRCENTER_X+1
-                bcc MP_NotRight1
-                iny
-MP_NotRight1:   cmp #SCRCENTER_X+2
-                bcc MP_NotRight2
-                iny
-MP_NotRight2:   sty scrollSX
+                bcc MP_ScrollXOK
+                ldy #2
+                cmp #SCRCENTER_X+2
+                bcs MP_ScrollXOK
+                sbc #SCRCENTER_X-1
+                tay
+MP_ScrollXOK:   sty scrollSX
 MP_ScrollVertical:
                 ldy #$00
                 lda actYL+ACTI_PLAYER