Still no dice on sprites...

andrewyang96 · Oct 18, 2015 · 602ab58 · 602ab58
1 parent 0102944
commit 602ab58
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/appinfo.json b/appinfo.json
@@ -29,13 +29,13 @@
                 "type": "font"
             },
             {
-                "file": "images/charizard-back.png",
-                "name": "IMAGES_CHARIZARD_BACK_PNG",
+                "file": "images/umbreon-front.png",
+                "name": "IMAGES_UMBREON_FRONT_PNG",
                 "type": "png"
             },
             {
-                "file": "images/umbreon-front.png",
-                "name": "IMAGES_UMBREON_FRONT_PNG",
+                "file": "images/charizard-back.png",
+                "name": "IMAGES_CHARIZARD_BACK_PNG",
                 "type": "png"
             },
             {

diff --git a/resources/images/charizard-back.png b/resources/images/charizard-back.png
diff --git a/resources/images/umbreon-front.png b/resources/images/umbreon-front.png
diff --git a/src/app.js b/src/app.js
@@ -34,15 +34,15 @@ var infoRect = new UI.Rect({
 });
 
 var yourPokemon = new UI.Image({
-  image: 'images/charizard-back.png',
-  position: new Vector2(52, 4),
-  size: new Vector2(144, 144)
+  position: new Vector2(4, 80),
+  compositing: 'and',
+  image: 'images/charizard-back.png'
 });
 battleWind.add(yourPokemon);
 var opponentPokemon = new UI.Image({
-  image: 'images/umbreon-front.png',
   position: new Vector2(80, 4),
-  size: new Vector2(144, 144)
+  compositing: 'and',
+  image: 'images/umbreon-front.png'
 });
 battleWind.add(opponentPokemon);