notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
attempt to fix PSP sleep wake
[picodrive.git]
/
Pico
/
Draw.s
diff --git
a/Pico/Draw.s
b/Pico/Draw.s
index
7e75a65
..
036d3a9
100644
(file)
--- a/
Pico/Draw.s
+++ b/
Pico/Draw.s
@@
-1132,11
+1132,11
@@
DrawAllSprites:
ldr r3, =rendstatus
\r
orr r1, r2, r1, lsl #1
\r
ldr r12,[r3]
\r
ldr r3, =rendstatus
\r
orr r1, r2, r1, lsl #1
\r
ldr r12,[r3]
\r
- tst r12,#(PDRAW_
ACC
_SPRITES|PDRAW_SPRITES_MOVED)
\r
+ tst r12,#(PDRAW_
DIRTY
_SPRITES|PDRAW_SPRITES_MOVED)
\r
beq das_no_prep
\r
stmfd sp!, {r0,r1,lr}
\r
and r0, r12,#PDRAW_DIRTY_SPRITES
\r
beq das_no_prep
\r
stmfd sp!, {r0,r1,lr}
\r
and r0, r12,#PDRAW_DIRTY_SPRITES
\r
- bic r12,r12,#(PDRAW_
ACC
_SPRITES|PDRAW_SPRITES_MOVED)
\r
+ bic r12,r12,#(PDRAW_
DIRTY
_SPRITES|PDRAW_SPRITES_MOVED)
\r
str r12,[r3]
\r
bl PrepareSprites
\r
ldmfd sp!, {r0,r1,lr}
\r
str r12,[r3]
\r
bl PrepareSprites
\r
ldmfd sp!, {r0,r1,lr}
\r
@@
-1330,7
+1330,7
@@
DrawWindow:
add r12, r12, r0, lsl #2 @ +starttile
\r
\r
ldr r6, =rendstatus
\r
add r12, r12, r0, lsl #2 @ +starttile
\r
\r
ldr r6, =rendstatus
\r
- ldr lr, =(Pico+0x10000) @ lr=Pico.vram
\r
+ ldr lr, =(Pico+0x10000)
@ lr=Pico.vram
\r
ldr r6, [r6]
\r
\r
@ fetch the first code now
\r
ldr r6, [r6]
\r
\r
@ fetch the first code now
\r
@@
-1442,7
+1442,7
@@
DrawWindow:
.dwloop_end:
\r
ldr r0, =rendstatus
\r
ldr r1, [r0]
\r
.dwloop_end:
\r
ldr r0, =rendstatus
\r
ldr r1, [r0]
\r
- and r6, r6, #
2
\r
+ and r6, r6, #
PDRAW_WND_DIFF_PRIO
\r
orr r1, r1, r6
\r
str r1, [r0]
\r
\r
orr r1, r1, r6
\r
str r1, [r0]
\r
\r