summaryrefslogtreecommitdiff
path: root/arm
diff options
context:
space:
mode:
authortwinaphex2014-12-11 19:05:18 +0100
committertwinaphex2014-12-11 19:05:18 +0100
commit9ed950fd4e71e33d0b5fa5c3faeb0b5bf4005a65 (patch)
tree38a42a6128993d5be018efd815bf94df8bacdf62 /arm
parent8d7b204c2bdb742af4083df0fe0e110afe5c3def (diff)
downloadpicogpsp-9ed950fd4e71e33d0b5fa5c3faeb0b5bf4005a65.tar.gz
picogpsp-9ed950fd4e71e33d0b5fa5c3faeb0b5bf4005a65.tar.bz2
picogpsp-9ed950fd4e71e33d0b5fa5c3faeb0b5bf4005a65.zip
arm/video_blend.S - add another __MACH__ hack
Diffstat (limited to 'arm')
-rw-r--r--arm/video_blend.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arm/video_blend.S b/arm/video_blend.S
index 56d9953..9caaa33 100644
--- a/arm/video_blend.S
+++ b/arm/video_blend.S
@@ -157,7 +157,11 @@ _expand_blend:
@ r2 = end
1:
+#ifdef __MACH__
+ .word _palette_ram_converted
+#else
.word palette_ram_converted
+#endif
.word 0x3FE
.align 2