diff --git a/res/drawable-hdpi/wallpaper_bluedotgrid.jpg b/res/drawable-hdpi/wallpaper_bluedotgrid.jpg new file mode 100644 index 0000000000..2fd28f9c09 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_bluedotgrid.jpg differ diff --git a/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg b/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg new file mode 100644 index 0000000000..f5244ce3c3 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_bluegray.jpg b/res/drawable-hdpi/wallpaper_bluegray.jpg deleted file mode 100644 index a07a25f987..0000000000 Binary files a/res/drawable-hdpi/wallpaper_bluegray.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_bluegray_small.jpg b/res/drawable-hdpi/wallpaper_bluegray_small.jpg deleted file mode 100644 index 8ae3771d1a..0000000000 Binary files a/res/drawable-hdpi/wallpaper_bluegray_small.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_brown.jpg b/res/drawable-hdpi/wallpaper_brown.jpg index d4c4f66267..a76ddd2009 100644 Binary files a/res/drawable-hdpi/wallpaper_brown.jpg and b/res/drawable-hdpi/wallpaper_brown.jpg differ diff --git a/res/drawable-hdpi/wallpaper_brown_small.jpg b/res/drawable-hdpi/wallpaper_brown_small.jpg index 153305b568..2734ead8e9 100644 Binary files a/res/drawable-hdpi/wallpaper_brown_small.jpg and b/res/drawable-hdpi/wallpaper_brown_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_despair.jpg b/res/drawable-hdpi/wallpaper_despair.jpg new file mode 100644 index 0000000000..49933c1129 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_despair.jpg differ diff --git a/res/drawable-hdpi/wallpaper_despair_small.jpg b/res/drawable-hdpi/wallpaper_despair_small.jpg new file mode 100644 index 0000000000..bae448d6df Binary files /dev/null and b/res/drawable-hdpi/wallpaper_despair_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_gray_small.jpg b/res/drawable-hdpi/wallpaper_gray_small.jpg index 3464142126..42efeb0a84 100644 Binary files a/res/drawable-hdpi/wallpaper_gray_small.jpg and b/res/drawable-hdpi/wallpaper_gray_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_greengray.jpg b/res/drawable-hdpi/wallpaper_greengray.jpg index dedaa6ff16..7bb2510c1f 100644 Binary files a/res/drawable-hdpi/wallpaper_greengray.jpg and b/res/drawable-hdpi/wallpaper_greengray.jpg differ diff --git a/res/drawable-hdpi/wallpaper_greengray_small.jpg b/res/drawable-hdpi/wallpaper_greengray_small.jpg index e80421111e..e43a053f88 100644 Binary files a/res/drawable-hdpi/wallpaper_greengray_small.jpg and b/res/drawable-hdpi/wallpaper_greengray_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_lavadark.jpg b/res/drawable-hdpi/wallpaper_lavadark.jpg deleted file mode 100644 index e587e7da6b..0000000000 Binary files a/res/drawable-hdpi/wallpaper_lavadark.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_lavadark_small.jpg b/res/drawable-hdpi/wallpaper_lavadark_small.jpg deleted file mode 100644 index e5c1d83cc0..0000000000 Binary files a/res/drawable-hdpi/wallpaper_lavadark_small.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_leaves.jpg b/res/drawable-hdpi/wallpaper_leaves.jpg deleted file mode 100644 index a287f18d8d..0000000000 Binary files a/res/drawable-hdpi/wallpaper_leaves.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_leaves_small.jpg b/res/drawable-hdpi/wallpaper_leaves_small.jpg deleted file mode 100644 index 56dcfbc7d8..0000000000 Binary files a/res/drawable-hdpi/wallpaper_leaves_small.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_lightgrad.jpg b/res/drawable-hdpi/wallpaper_lightgrad.jpg new file mode 100644 index 0000000000..b11f253915 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_lightgrad.jpg differ diff --git a/res/drawable-hdpi/wallpaper_redgray_small.jpg b/res/drawable-hdpi/wallpaper_lightgrad_small.jpg similarity index 65% rename from res/drawable-hdpi/wallpaper_redgray_small.jpg rename to res/drawable-hdpi/wallpaper_lightgrad_small.jpg index d50049714b..4e53bf79ee 100644 Binary files a/res/drawable-hdpi/wallpaper_redgray_small.jpg and b/res/drawable-hdpi/wallpaper_lightgrad_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_nexuspattern.jpg b/res/drawable-hdpi/wallpaper_nexuspattern.jpg new file mode 100644 index 0000000000..2a1580c4d7 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_nexuspattern.jpg differ diff --git a/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg b/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg new file mode 100644 index 0000000000..1aa99984bc Binary files /dev/null and b/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_nexusrain.jpg b/res/drawable-hdpi/wallpaper_nexusrain.jpg index 05b56ad52f..c465d4ee3c 100644 Binary files a/res/drawable-hdpi/wallpaper_nexusrain.jpg and b/res/drawable-hdpi/wallpaper_nexusrain.jpg differ diff --git a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg index 66e4ec84ae..9775a1143a 100644 Binary files a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg and b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_pcut.jpg b/res/drawable-hdpi/wallpaper_pcut.jpg index eb342d6a82..c2e8ba1861 100644 Binary files a/res/drawable-hdpi/wallpaper_pcut.jpg and b/res/drawable-hdpi/wallpaper_pcut.jpg differ diff --git a/res/drawable-hdpi/wallpaper_pcut_small.jpg b/res/drawable-hdpi/wallpaper_pcut_small.jpg index 81454e8625..e520ab055c 100644 Binary files a/res/drawable-hdpi/wallpaper_pcut_small.jpg and b/res/drawable-hdpi/wallpaper_pcut_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_redgray.jpg b/res/drawable-hdpi/wallpaper_redgray.jpg deleted file mode 100644 index 74c8432265..0000000000 Binary files a/res/drawable-hdpi/wallpaper_redgray.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_ropelights.jpg b/res/drawable-hdpi/wallpaper_ropelights.jpg index 5b8fde6313..258cb97975 100644 Binary files a/res/drawable-hdpi/wallpaper_ropelights.jpg and b/res/drawable-hdpi/wallpaper_ropelights.jpg differ diff --git a/res/drawable-hdpi/wallpaper_ropelights_small.jpg b/res/drawable-hdpi/wallpaper_ropelights_small.jpg index 6d1a56726d..9ea969c3c0 100644 Binary files a/res/drawable-hdpi/wallpaper_ropelights_small.jpg and b/res/drawable-hdpi/wallpaper_ropelights_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_x67.jpg b/res/drawable-hdpi/wallpaper_x67.jpg index d0fc791f45..7871b1d7d5 100644 Binary files a/res/drawable-hdpi/wallpaper_x67.jpg and b/res/drawable-hdpi/wallpaper_x67.jpg differ diff --git a/res/drawable-hdpi/wallpaper_x67_small.jpg b/res/drawable-hdpi/wallpaper_x67_small.jpg index 1037fcaa41..ffe3ac5580 100644 Binary files a/res/drawable-hdpi/wallpaper_x67_small.jpg and b/res/drawable-hdpi/wallpaper_x67_small.jpg differ diff --git a/res/raw/rollo3.c b/res/raw/rollo3.c index b2b6cf1974..6f0046e96e 100644 --- a/res/raw/rollo3.c +++ b/res/raw/rollo3.c @@ -378,10 +378,11 @@ void drawStrip(float row, float column, int isTop, int iconNum, float p) offset = positionStrip(row + 0.73f, column, isTop, p, 1); } if (offset < -20) return; + if (offset > 200) return; bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_LABEL_IDS, iconNum)); offset = clamp(offset, 0, 199 - 20); - //drawSimpleMeshRange(NAMED_SMMesh, offset * 6, 20 * 6); - drawSimpleMesh(NAMED_SMMesh); + drawSimpleMeshRange(NAMED_SMMesh, offset * 6, 20 * 6); + //drawSimpleMesh(NAMED_SMMesh); } void drawTop(float rowOffset, float p) diff --git a/res/values-hdpi/wallpapers.xml b/res/values-hdpi/wallpapers.xml index baffc700d3..26961b34fe 100644 --- a/res/values-hdpi/wallpapers.xml +++ b/res/values-hdpi/wallpapers.xml @@ -24,23 +24,23 @@ wallpaper_tree wallpaper_zanzibar wallpaper_field - wallpaper_leaves wallpaper_cloud wallpaper_desert wallpaper_goldengate + wallpaper_despair wallpaper_grass_night wallpaper_galaxy wallpaper_x67 wallpaper_nexusrain + wallpaper_nexuspattern wallpaper_nexuswallpaper1 wallpaper_brown - wallpaper_lavadark wallpaper_pcut + wallpaper_bluedotgrid wallpaper_hazybluedots wallpaper_ropelights - wallpaper_bluegray wallpaper_gray wallpaper_greengray - wallpaper_redgray + wallpaper_lightgrad