Merge remote-tracking branch 'upstream/master' into something_to_pull

This commit is contained in:
Christian Groessler 2014-01-14 14:01:49 +01:00
commit 9a642a529a
7 changed files with 19 additions and 14 deletions

View file

@ -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 above 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

View file

@ -87,10 +87,11 @@ Buttons: .res 1 ; Button mask
Temp: .res 1
; Default values for above variables
.rodata
; Default values for above 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

View file

@ -84,10 +84,11 @@ Buttons: .res 1 ; Button mask
Temp: .res 1
; Default values for above variables
.rodata
; Default values for above 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

View file

@ -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 above variables
; (We use ".proc" because we want to define both a label and a scope.)
.proc DefVars

View file

@ -106,10 +106,11 @@ Buttons: .res 1 ; Button mask
Temp: .res 1
; Default values for above variables
.rodata
; Default values for above 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

View file

@ -84,10 +84,11 @@ Buttons: .res 1 ; Button mask
Temp: .res 1
; Default values for above variables
.rodata
; Default values for above 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

View file

@ -89,10 +89,11 @@ YMax: .res 2 ; Y2 value of bounding box
Temp: .res 1
; Default values for above variables
.rodata
; Default values for above 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