From 7a3f07c838b5a2201dfdc4cc8b348c1212f46f28 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Sun, 25 Feb 2018 19:20:43 -0800
Subject: [PATCH] Correct makefile

---
 desktop/Makefile   |  3 +++
 desktop/ovl3.s     | 11 +++++------
 desktop/ovl34567.s |  4 ++++
 desktop/ovl4.s     |  4 +---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/desktop/Makefile b/desktop/Makefile
index e785b0b..abaeb21 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -25,6 +25,9 @@ clean:
 	rm -f $(OUTDIR)/*.\$$F1
 	rm -f $(OUTDIR)/*.sys
 
+$(OUTDIR)/ovl34567.o: ovl34567.s $(HEADERS) ovl3.s ovl4.s ovl5.s ovl6.s ovl7.s
+	$(CC65)/ca65 $(CAFLAGS) --listing $(basename $@).list -o $@ $<
+
 $(OUTDIR)/%.o: %.s $(HEADERS)
 	$(CC65)/ca65 $(CAFLAGS) --listing $(basename $@).list -o $@ $<
 
diff --git a/desktop/ovl3.s b/desktop/ovl3.s
index 7f4c81c..3f6e85a 100644
--- a/desktop/ovl3.s
+++ b/desktop/ovl3.s
@@ -48,10 +48,9 @@ L9017:  lda     $0C00
         rts
 
 L903C:  ldx     #$01
-        copy16  $DB1C, L904B
-        .byte   $AD
-L904B:  .byte   $34
-L904C:  .byte   $12
+        copy16  $DB1C, load
+        load := *+1
+        lda     dummy1234
         cmp     #$0D
         bcc     L9052
         inx
@@ -60,7 +59,7 @@ L9052:  lda     #$00
         sta     $D443
         ldy     #$03
         lda     #$02
-        jsr     common_overlay::L5000
+        jsr     common_overlay_L5000
         pha
         txa
         pha
@@ -221,7 +220,7 @@ L91BC:  clc
         adc     #$01
         tay
         lda     #$02
-        jsr     L5000
+        jsr     common_overlay_L5000
         pha
         txa
         pha
diff --git a/desktop/ovl34567.s b/desktop/ovl34567.s
index 69ed893..bb443a8 100644
--- a/desktop/ovl34567.s
+++ b/desktop/ovl34567.s
@@ -14,6 +14,8 @@
         .addr arg2
 .endmacro
 
+        dummy1234 := $1234
+
 ;;; ==================================================
 ;;; Resources from language card area
 
@@ -37,3 +39,5 @@
         .include "ovl5.s"       ; File Copy      @ $7000-$77FF
         .include "ovl6.s"       ; File Delete    @ $7000-$77FF
         .include "ovl7.s"       ; Selector (2/2) @ $7000-$77FF
+
+        common_overlay_L5000 := common_overlay::L5000
diff --git a/desktop/ovl4.s b/desktop/ovl4.s
index 7254c36..af2f80a 100644
--- a/desktop/ovl4.s
+++ b/desktop/ovl4.s
@@ -9,9 +9,7 @@
         .org $5000
 .proc common_overlay
 
-        dummy1234 := $1234
-
-        jmp     L50B1
+L5000:  jmp     L50B1
 
 L5003:  .byte   $02
 L5004:  .byte   $00,$17,$50