Moving subr ranger to hud space

intoinside · Feb 27, 2022 · 3a096fc · 3a096fc
1 parent 3f12d67
commit 3a096fc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/_hud.asm b/_hud.asm
@@ -274,7 +274,26 @@ DrawDismissal: {
   .label DismissalPtr = $beef
 }
 
-CurrentScore: .byte $00, $00, $00, $00
+* = * "Hud ConvertDismissalToPoint"
+ConvertDismissalToPoint: {
+    lda ReduceDismissalCounter.DismissalCompleted
+    bne Done
+
+    ldx #15
+  !:
+    jsr WaitRoutine
+    dex
+    bne !-
+
+    jsr ReduceDismissalCounter
+    jsr Sfx.PointConversion
+    AddPoints(0, 0, 4, 0)
+
+  Done:
+    rts
+}
+
+CurrentScore: .byte 0, 0, 0, 0
 
 // "SCORE: 0000"
 ScoreLabel: .byte $14, $04, $10, $13, $06, $34, $00
@@ -290,3 +309,6 @@ DismissalLabel: .byte $05, $0a, $14, $0e, $0a, $14, $14, $02, $0d, $34, $00
 .label DismissalAliveChar = $a4
 
 ScreenMemoryAddress: .word $be00
+
+#import "_sounds.asm"
+#import "_utils.asm"
diff --git a/_level1.asm b/_level1.asm
@@ -47,7 +47,7 @@ Manager: {
 
   CloseLevelAndGotoNext:
     jsr SetSpriteToBackground
-    jsr Ranger.ConvertDismissalToPoint
+    jsr Hud.ConvertDismissalToPoint
     IsReturnPressed()
     bne LevelDone
     jmp JoystickMovement

diff --git a/_level2.asm b/_level2.asm
@@ -51,7 +51,7 @@ Manager: {
 
   CloseLevelAndGotoNext:
     jsr SetSpriteToBackground
-    jsr Ranger.ConvertDismissalToPoint
+    jsr Hud.ConvertDismissalToPoint
     IsReturnPressed()
     bne LevelDone
     jmp JoystickMovement

diff --git a/_ranger.asm b/_ranger.asm
@@ -206,24 +206,6 @@ FiningInAction: {
     rts
 }
 
-ConvertDismissalToPoint: {
-    lda Hud.ReduceDismissalCounter.DismissalCompleted
-    bne Done
-
-    ldx #15
-  !:
-    jsr WaitRoutine
-    dex
-    bne !-
-
-    jsr Hud.ReduceDismissalCounter
-    jsr Sfx.PointConversion
-    AddPoints(0, 0, 4, 0)
-
-  Done:
-    rts
-}
-
 * = * "Ranger UpdateRangerFrame"
 UpdateRangerFrame: {
     inc RangerFrame