notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lowercasing filenames, part1; makefile adjustments
[libpicofe.git]
/
psp
/
emu.c
diff --git
a/psp/emu.c
b/psp/emu.c
index
d3e6317
..
91bd563
100644
(file)
--- a/
psp/emu.c
+++ b/
psp/emu.c
@@
-21,8
+21,8
@@
#include "../common/emu.h"
#include "../common/config.h"
#include "../common/lprintf.h"
#include "../common/emu.h"
#include "../common/config.h"
#include "../common/lprintf.h"
-#include
"../../Pico/PicoInt.h"
-#include
"../../Pico/cd/cue.h"
+#include
<pico/pico_int.h>
+#include
<pico/cd/cue.h>
#define OSD_FPS_X 432
#define OSD_FPS_X 432
@@
-263,7
+263,7
@@
static void do_pal_update(int allow_sh, int allow_as)
localPal[0xe0] = 0;
localPal[0xf0] = 0x001f;
}
localPal[0xe0] = 0;
localPal[0xf0] = 0x001f;
}
- else if (allow_as && (rendstatus & PDRAW_
ACC_SPRITES
))
+ else if (allow_as && (rendstatus & PDRAW_
SPR_LO_ON_HI
))
{
memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
}
{
memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
}
@@
-290,7
+290,7
@@
static void EmuScanPrepare(void)
if (Pico.m.dirtyPal)
do_pal_update(1, 1);
if (Pico.m.dirtyPal)
do_pal_update(1, 1);
- if ((rendstatus & PDRAW_
ACC_SPRITES
) && !(Pico.video.reg[0xC]&8))
+ if ((rendstatus & PDRAW_
SPR_LO_ON_HI
) && !(Pico.video.reg[0xC]&8))
amips_clut_f = amips_clut_6bit;
else amips_clut_f = amips_clut;
}
amips_clut_f = amips_clut_6bit;
else amips_clut_f = amips_clut;
}