From 8ae7ac73b34fd2b63eb9dcf021bbf2e0f44539cb Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sat, 11 Jan 2014 23:35:21 +0100 Subject: [PATCH 1/2] Minor comment harmonization. --- libsrc/c128/mou/c128-1351.s | 5 +++-- libsrc/c128/mou/c128-joy.s | 5 +++-- libsrc/c128/mou/c128-pot.s | 5 +++-- libsrc/c64/mou/c64-1351.s | 3 +-- libsrc/c64/mou/c64-joy.s | 5 +++-- libsrc/c64/mou/c64-pot.s | 5 +++-- libsrc/cbm510/mou/cbm510-joy.s | 5 +++-- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/libsrc/c128/mou/c128-1351.s b/libsrc/c128/mou/c128-1351.s index f2a71647c..1f8e6d5cd 100644 --- a/libsrc/c128/mou/c128-1351.s +++ b/libsrc/c128/mou/c128-1351.s @@ -81,10 +81,11 @@ YMax: .res 2 ; Y2 value of bounding box OldValue: .res 1 ; Temp for MoveCheck routine NewValue: .res 1 ; Temp for MoveCheck routine -; Default values for above variables - .rodata +; Default values for below variables +; (We use ".proc" because we want to define both a label and a scope.) + .proc DefVars .byte 0, 0 ; OldPotX/OldPotY .word SCREEN_HEIGHT/2 ; YPos diff --git a/libsrc/c128/mou/c128-joy.s b/libsrc/c128/mou/c128-joy.s index 8c3bd779d..53dd5ec4a 100644 --- a/libsrc/c128/mou/c128-joy.s +++ b/libsrc/c128/mou/c128-joy.s @@ -87,10 +87,11 @@ Buttons: .res 1 ; Button mask Temp: .res 1 -; Default values for above variables - .rodata +; Default values for below variables +; (We use ".proc" because we want to define both a label and a scope.) + .proc DefVars .word SCREEN_HEIGHT/2 ; YPos .word SCREEN_WIDTH/2 ; XPos diff --git a/libsrc/c128/mou/c128-pot.s b/libsrc/c128/mou/c128-pot.s index ab6922896..ccefeb01b 100644 --- a/libsrc/c128/mou/c128-pot.s +++ b/libsrc/c128/mou/c128-pot.s @@ -84,10 +84,11 @@ Buttons: .res 1 ; Button mask Temp: .res 1 -; Default values for above variables - .rodata +; Default values for below variables +; (We use ".proc" because we want to define both a label and a scope.) + .proc DefVars .word SCREEN_HEIGHT/2 ; YPos .word SCREEN_WIDTH/2 ; XPos diff --git a/libsrc/c64/mou/c64-1351.s b/libsrc/c64/mou/c64-1351.s index ec053b0b2..f561f1a8a 100644 --- a/libsrc/c64/mou/c64-1351.s +++ b/libsrc/c64/mou/c64-1351.s @@ -101,10 +101,9 @@ Buttons: .res 1 ; button status bits OldValue: .res 1 ; Temp for MoveCheck routine NewValue: .res 1 ; Temp for MoveCheck routine -; Default values for above variables - .rodata +; Default values for below variables ; (We use ".proc" because we want to define both a label and a scope.) .proc DefVars diff --git a/libsrc/c64/mou/c64-joy.s b/libsrc/c64/mou/c64-joy.s index 05f0ce50e..5f3bec8ed 100644 --- a/libsrc/c64/mou/c64-joy.s +++ b/libsrc/c64/mou/c64-joy.s @@ -106,10 +106,11 @@ Buttons: .res 1 ; Button mask Temp: .res 1 -; Default values for above variables - .rodata +; Default values for below variables +; (We use ".proc" because we want to define both a label and a scope.) + .proc DefVars .word SCREEN_HEIGHT/2 ; YPos .word SCREEN_WIDTH/2 ; XPos diff --git a/libsrc/c64/mou/c64-pot.s b/libsrc/c64/mou/c64-pot.s index 3eb977477..0ca446078 100644 --- a/libsrc/c64/mou/c64-pot.s +++ b/libsrc/c64/mou/c64-pot.s @@ -84,10 +84,11 @@ Buttons: .res 1 ; Button mask Temp: .res 1 -; Default values for above variables - .rodata +; Default values for below variables +; (We use ".proc" because we want to define both a label and a scope.) + .proc DefVars .word SCREEN_HEIGHT/2 ; YPos .word SCREEN_WIDTH/2 ; XPos diff --git a/libsrc/cbm510/mou/cbm510-joy.s b/libsrc/cbm510/mou/cbm510-joy.s index 9381cf761..effdb7cc0 100644 --- a/libsrc/cbm510/mou/cbm510-joy.s +++ b/libsrc/cbm510/mou/cbm510-joy.s @@ -89,10 +89,11 @@ YMax: .res 2 ; Y2 value of bounding box Temp: .res 1 -; Default values for above variables - .rodata +; Default values for below variables +; (We use ".proc" because we want to define both a label and a scope.) + .proc DefVars .word SCREEN_HEIGHT / 2 ; YPos .word SCREEN_WIDTH / 2 ; XPos From b1c8f8e714a747b1884c22423b2dc54a80acbc5d Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 12 Jan 2014 21:52:18 +0100 Subject: [PATCH 2/2] Fixed recent "Minor comment harmonization". --- libsrc/c128/mou/c128-1351.s | 2 +- libsrc/c128/mou/c128-joy.s | 2 +- libsrc/c128/mou/c128-pot.s | 2 +- libsrc/c64/mou/c64-1351.s | 2 +- libsrc/c64/mou/c64-joy.s | 2 +- libsrc/c64/mou/c64-pot.s | 2 +- libsrc/cbm510/mou/cbm510-joy.s | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libsrc/c128/mou/c128-1351.s b/libsrc/c128/mou/c128-1351.s index 1f8e6d5cd..ca165f5c3 100644 --- a/libsrc/c128/mou/c128-1351.s +++ b/libsrc/c128/mou/c128-1351.s @@ -83,7 +83,7 @@ NewValue: .res 1 ; Temp for MoveCheck routine .rodata -; Default values for below variables +; Default values for above variables ; (We use ".proc" because we want to define both a label and a scope.) .proc DefVars diff --git a/libsrc/c128/mou/c128-joy.s b/libsrc/c128/mou/c128-joy.s index 53dd5ec4a..8845dd357 100644 --- a/libsrc/c128/mou/c128-joy.s +++ b/libsrc/c128/mou/c128-joy.s @@ -89,7 +89,7 @@ Temp: .res 1 .rodata -; Default values for below variables +; Default values for above variables ; (We use ".proc" because we want to define both a label and a scope.) .proc DefVars diff --git a/libsrc/c128/mou/c128-pot.s b/libsrc/c128/mou/c128-pot.s index ccefeb01b..595e33ac9 100644 --- a/libsrc/c128/mou/c128-pot.s +++ b/libsrc/c128/mou/c128-pot.s @@ -86,7 +86,7 @@ Temp: .res 1 .rodata -; Default values for below variables +; Default values for above variables ; (We use ".proc" because we want to define both a label and a scope.) .proc DefVars diff --git a/libsrc/c64/mou/c64-1351.s b/libsrc/c64/mou/c64-1351.s index f561f1a8a..0211ee20f 100644 --- a/libsrc/c64/mou/c64-1351.s +++ b/libsrc/c64/mou/c64-1351.s @@ -103,7 +103,7 @@ NewValue: .res 1 ; Temp for MoveCheck routine .rodata -; Default values for below variables +; Default values for above variables ; (We use ".proc" because we want to define both a label and a scope.) .proc DefVars diff --git a/libsrc/c64/mou/c64-joy.s b/libsrc/c64/mou/c64-joy.s index 5f3bec8ed..08dad7b3c 100644 --- a/libsrc/c64/mou/c64-joy.s +++ b/libsrc/c64/mou/c64-joy.s @@ -108,7 +108,7 @@ Temp: .res 1 .rodata -; Default values for below variables +; Default values for above variables ; (We use ".proc" because we want to define both a label and a scope.) .proc DefVars diff --git a/libsrc/c64/mou/c64-pot.s b/libsrc/c64/mou/c64-pot.s index 0ca446078..3be0f4f3d 100644 --- a/libsrc/c64/mou/c64-pot.s +++ b/libsrc/c64/mou/c64-pot.s @@ -86,7 +86,7 @@ Temp: .res 1 .rodata -; Default values for below variables +; Default values for above variables ; (We use ".proc" because we want to define both a label and a scope.) .proc DefVars diff --git a/libsrc/cbm510/mou/cbm510-joy.s b/libsrc/cbm510/mou/cbm510-joy.s index effdb7cc0..43bd722f3 100644 --- a/libsrc/cbm510/mou/cbm510-joy.s +++ b/libsrc/cbm510/mou/cbm510-joy.s @@ -91,7 +91,7 @@ Temp: .res 1 .rodata -; Default values for below variables +; Default values for above variables ; (We use ".proc" because we want to define both a label and a scope.) .proc DefVars