giz menu works

[picodrive.git] / Pico / Draw2.s

diff --git a/Pico/Draw2.s b/Pico/Draw2.s
index 7826b1e..9c3f027 100644 (file)
--- a/Pico/Draw2.s
+++ b/Pico/Draw2.s
@@ -8,7 +8,7 @@
 \r
 \r
 .extern Pico\r
-.extern framebuff\r
+.extern PicoDraw2FB\r
 \r
 @ define these constants in your include file:\r
 @ .equiv START_ROW,            1\r
@@ -22,7 +22,7 @@
 BackFillFull:\r
     stmfd   sp!, {r4-r9,lr}\r
 \r
-    ldr     lr, =framebuff      @ lr=framebuff\r
+    ldr     lr, =PicoDraw2FB      @ lr=PicoDraw2FB\r
     ldr     lr, [lr]\r
     add     lr, lr, #328*8\r
 \r
@@ -394,7 +394,7 @@ DrawLayerFull:
     and     r4, r4, #7\r
     orr     lr, lr, r4, lsl #13   @ lr|=nametab_bits{3}<<13\r
 \r
-    ldr     r11, =framebuff       @ r11=framebuff\r
+    ldr     r11, =PicoDraw2FB     @ r11=PicoDraw2FB\r
     ldr     r11, [r11]\r
     sub     r4, r9, #(START_ROW<<24)\r
     mov     r4, r4, asr #24\r
@@ -572,7 +572,7 @@ DrawTilesFromCacheF:
     mov     r9, #0xff000000 @ r9=prevcode=-1\r
     mvn     r6, #0          @ r6=prevy=-1\r
 \r
-    ldr     r4, =framebuff  @ r4=framebuff\r
+    ldr     r4, =PicoDraw2FB  @ r4=PicoDraw2FB\r
     ldr     r4, [r4]\r
     ldr     r1, [r0], #4    @ read y offset\r
     mov     r7, #328\r
@@ -696,7 +696,7 @@ DrawWindowFull:
 \r
     mov     r9, #0xff000000       @ r9=prevcode=-1\r
 \r
-    ldr     r11, =framebuff       @ r11=scrpos\r
+    ldr     r11, =PicoDraw2FB     @ r11=scrpos\r
     ldr     r11, [r11]\r
     add     r11, r11, #328*8\r
     add     r11, r11, #8\r
@@ -896,7 +896,7 @@ DrawSpriteFull:
 \r
     ldr     r10, =(Pico+0x10000)  @ r10=Pico.vram\r
 \r
-    ldr     r11, =framebuff       @ r11=scrpos\r
+    ldr     r11, =PicoDraw2FB     @ r11=scrpos\r
     ldr     r11, [r11]\r
     sub     r1, r12, #(START_ROW*8)\r
     mov     r0, #328\r