Updated Power Green fonts, repositioned all text accordingly

Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb

@@ -311,16 +311,16 @@ class HallOfFame_Scene
       dexnumber = _ISPRINTF("No. {1:03d}", number)
     end
     textPositions = [
-      [dexnumber, 32, Graphics.height - 86, 0, BASECOLOR, SHADOWCOLOR],
-      [pokename, Graphics.width - 192, Graphics.height - 86, 2, BASECOLOR, SHADOWCOLOR],
+      [dexnumber, 32, Graphics.height - 74, 0, BASECOLOR, SHADOWCOLOR],
+      [pokename, Graphics.width - 192, Graphics.height - 74, 2, BASECOLOR, SHADOWCOLOR],
       [_INTL("Lv. {1}", pokemon.egg? ? "?" : pokemon.level),
-       64, Graphics.height - 54, 0, BASECOLOR, SHADOWCOLOR],
+       64, Graphics.height - 42, 0, BASECOLOR, SHADOWCOLOR],
       [_INTL("IDNo.{1}", pokemon.egg? ? "?????" : idno),
-       Graphics.width - 192, Graphics.height - 54, 2, BASECOLOR, SHADOWCOLOR]
+       Graphics.width - 192, Graphics.height - 42, 2, BASECOLOR, SHADOWCOLOR]
     ]
     if hallNumber > -1
-      textPositions.push([_INTL("Hall of Fame No."), (Graphics.width / 2) - 104, -6, 0, BASECOLOR, SHADOWCOLOR])
-      textPositions.push([hallNumber.to_s, (Graphics.width / 2) + 104, -6, 1, BASECOLOR, SHADOWCOLOR])
+      textPositions.push([_INTL("Hall of Fame No."), (Graphics.width / 2) - 104, 6, 0, BASECOLOR, SHADOWCOLOR])
+      textPositions.push([hallNumber.to_s, (Graphics.width / 2) + 104, 6, 1, BASECOLOR, SHADOWCOLOR])
     end
     pbDrawTextPositions(overlay, textPositions)
   end
@@ -329,7 +329,7 @@ class HallOfFame_Scene
     overlay = @sprites["overlay"].bitmap
     overlay.clear
     pbDrawTextPositions(overlay, [[_INTL("Welcome to the Hall of Fame!"),
-                                   Graphics.width / 2, Graphics.height - 80, 2, BASECOLOR, SHADOWCOLOR]])
+                                   Graphics.width / 2, Graphics.height - 68, 2, BASECOLOR, SHADOWCOLOR]])
   end
 
   def pbAnimationLoop

Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb

@@ -25,8 +25,8 @@ class Window_DexesList < Window_CommandPokemon
       allown  = (@commands2[index][1] >= @commands2[index][2])
       pbDrawImagePositions(
         self.contents,
-        [["Graphics/Pictures/Pokedex/icon_menuseenown", rect.x + 236, rect.y + 2, (allseen) ? 24 : 0, 0, 24, 24],
-         ["Graphics/Pictures/Pokedex/icon_menuseenown", rect.x + 332, rect.y + 2, (allown) ? 24 : 0, 24, 24, 24]]
+        [["Graphics/Pictures/Pokedex/icon_menuseenown", rect.x + 236, rect.y + 6, (allseen) ? 24 : 0, 0, 24, 24],
+         ["Graphics/Pictures/Pokedex/icon_menuseenown", rect.x + 332, rect.y + 6, (allown) ? 24 : 0, 24, 24, 24]]
       )
     end
   end

Data/Scripts/016_UI/003_UI_Pokedex_Main.rb

@@ -40,9 +40,9 @@ class Window_Pokedex < Window_DrawableCommand
     indexNumber -= 1 if @commands[index][5]
     if $player.seen?(species)
       if $player.owned?(species)
-        pbCopyBitmap(self.contents, @pokeballOwn.bitmap, rect.x - 6, rect.y + 8)
+        pbCopyBitmap(self.contents, @pokeballOwn.bitmap, rect.x - 6, rect.y + 10)
       else
-        pbCopyBitmap(self.contents, @pokeballSeen.bitmap, rect.x - 6, rect.y + 8)
+        pbCopyBitmap(self.contents, @pokeballSeen.bitmap, rect.x - 6, rect.y + 10)
       end
       text = sprintf("%03d%s %s", indexNumber, " ", @commands[index][1])
     else
@@ -424,17 +424,17 @@ class PokemonPokedex_Scene
       end
     end
     textpos = [
-      [dexname, Graphics.width / 2, -2, 2, Color.new(248, 248, 248), Color.new(0, 0, 0)]
+      [dexname, Graphics.width / 2, 10, 2, Color.new(248, 248, 248), Color.new(0, 0, 0)]
     ]
-    textpos.push([GameData::Species.get(iconspecies).name, 112, 46, 2, base, shadow]) if iconspecies
+    textpos.push([GameData::Species.get(iconspecies).name, 112, 58, 2, base, shadow]) if iconspecies
     if @searchResults
-      textpos.push([_INTL("Search results"), 112, 302, 2, base, shadow])
-      textpos.push([@dexlist.length.to_s, 112, 334, 2, base, shadow])
+      textpos.push([_INTL("Search results"), 112, 314, 2, base, shadow])
+      textpos.push([@dexlist.length.to_s, 112, 346, 2, base, shadow])
     else
-      textpos.push([_INTL("Seen:"), 42, 302, 0, base, shadow])
-      textpos.push([$player.pokedex.seen_count(pbGetPokedexRegion).to_s, 182, 302, 1, base, shadow])
-      textpos.push([_INTL("Owned:"), 42, 334, 0, base, shadow])
-      textpos.push([$player.pokedex.owned_count(pbGetPokedexRegion).to_s, 182, 334, 1, base, shadow])
+      textpos.push([_INTL("Seen:"), 42, 314, 0, base, shadow])
+      textpos.push([$player.pokedex.seen_count(pbGetPokedexRegion).to_s, 182, 314, 1, base, shadow])
+      textpos.push([_INTL("Owned:"), 42, 346, 0, base, shadow])
+      textpos.push([$player.pokedex.owned_count(pbGetPokedexRegion).to_s, 182, 346, 1, base, shadow])
     end
     # Draw all text
     pbDrawTextPositions(overlay, textpos)
@@ -477,36 +477,36 @@ class PokemonPokedex_Scene
     shadow = Color.new(72, 72, 72)
     # Write various bits of text
     textpos = [
-      [_INTL("Search Mode"), Graphics.width / 2, -2, 2, base, shadow],
-      [_INTL("Order"), 136, 52, 2, base, shadow],
-      [_INTL("Name"), 58, 110, 2, base, shadow],
-      [_INTL("Type"), 58, 162, 2, base, shadow],
-      [_INTL("Height"), 58, 214, 2, base, shadow],
-      [_INTL("Weight"), 58, 266, 2, base, shadow],
-      [_INTL("Color"), 326, 110, 2, base, shadow],
-      [_INTL("Shape"), 454, 162, 2, base, shadow],
-      [_INTL("Reset"), 80, 338, 2, base, shadow, 1],
-      [_INTL("Start"), Graphics.width / 2, 338, 2, base, shadow, 1],
-      [_INTL("Cancel"), Graphics.width - 80, 338, 2, base, shadow, 1]
+      [_INTL("Search Mode"), Graphics.width / 2, 10, 2, base, shadow],
+      [_INTL("Order"), 136, 64, 2, base, shadow],
+      [_INTL("Name"), 58, 122, 2, base, shadow],
+      [_INTL("Type"), 58, 174, 2, base, shadow],
+      [_INTL("Height"), 58, 226, 2, base, shadow],
+      [_INTL("Weight"), 58, 278, 2, base, shadow],
+      [_INTL("Color"), 326, 122, 2, base, shadow],
+      [_INTL("Shape"), 454, 174, 2, base, shadow],
+      [_INTL("Reset"), 80, 346, 2, base, shadow, 1],
+      [_INTL("Start"), Graphics.width / 2, 346, 2, base, shadow, 1],
+      [_INTL("Cancel"), Graphics.width - 80, 346, 2, base, shadow, 1]
     ]
     # Write order, name and color parameters
-    textpos.push([@orderCommands[params[0]], 344, 58, 2, base, shadow, 1])
-    textpos.push([(params[1] < 0) ? "----" : @nameCommands[params[1]], 176, 116, 2, base, shadow, 1])
-    textpos.push([(params[8] < 0) ? "----" : @colorCommands[params[8]].name, 444, 116, 2, base, shadow, 1])
+    textpos.push([@orderCommands[params[0]], 344, 66, 2, base, shadow, 1])
+    textpos.push([(params[1] < 0) ? "----" : @nameCommands[params[1]], 176, 124, 2, base, shadow, 1])
+    textpos.push([(params[8] < 0) ? "----" : @colorCommands[params[8]].name, 444, 124, 2, base, shadow, 1])
     # Draw type icons
     if params[2] >= 0
       type_number = @typeCommands[params[2]].icon_position
       typerect = Rect.new(0, type_number * 32, 96, 32)
       overlay.blt(128, 168, @typebitmap.bitmap, typerect)
     else
-      textpos.push(["----", 176, 168, 2, base, shadow, 1])
+      textpos.push(["----", 176, 176, 2, base, shadow, 1])
     end
     if params[3] >= 0
       type_number = @typeCommands[params[3]].icon_position
       typerect = Rect.new(0, type_number * 32, 96, 32)
       overlay.blt(256, 168, @typebitmap.bitmap, typerect)
     else
-      textpos.push(["----", 304, 168, 2, base, shadow, 1])
+      textpos.push(["----", 304, 176, 2, base, shadow, 1])
     end
     # Write height and weight limits
     ht1 = (params[4] < 0) ? 0 : (params[4] >= @heightCommands.length) ? 999 : @heightCommands[params[4]]
@@ -519,16 +519,16 @@ class PokemonPokedex_Scene
       ht2 = (params[5] < 0) ? 99 * 12 : (ht2 / 0.254).round
       wt1 = (params[6] >= @weightCommands.length) ? 99_990 : (wt1 / 0.254).round
       wt2 = (params[7] < 0) ? 99_990 : (wt2 / 0.254).round
-      textpos.push([sprintf("%d'%02d''", ht1 / 12, ht1 % 12), 166, 220, 2, base, shadow, 1])
-      textpos.push([sprintf("%d'%02d''", ht2 / 12, ht2 % 12), 294, 220, 2, base, shadow, 1])
-      textpos.push([sprintf("%.1f", wt1 / 10.0), 166, 272, 2, base, shadow, 1])
-      textpos.push([sprintf("%.1f", wt2 / 10.0), 294, 272, 2, base, shadow, 1])
+      textpos.push([sprintf("%d'%02d''", ht1 / 12, ht1 % 12), 166, 228, 2, base, shadow, 1])
+      textpos.push([sprintf("%d'%02d''", ht2 / 12, ht2 % 12), 294, 228, 2, base, shadow, 1])
+      textpos.push([sprintf("%.1f", wt1 / 10.0), 166, 280, 2, base, shadow, 1])
+      textpos.push([sprintf("%.1f", wt2 / 10.0), 294, 280, 2, base, shadow, 1])
       hwoffset = true
     else
-      textpos.push([sprintf("%.1f", ht1 / 10.0), 166, 220, 2, base, shadow, 1])
-      textpos.push([sprintf("%.1f", ht2 / 10.0), 294, 220, 2, base, shadow, 1])
-      textpos.push([sprintf("%.1f", wt1 / 10.0), 166, 272, 2, base, shadow, 1])
-      textpos.push([sprintf("%.1f", wt2 / 10.0), 294, 272, 2, base, shadow, 1])
+      textpos.push([sprintf("%.1f", ht1 / 10.0), 166, 228, 2, base, shadow, 1])
+      textpos.push([sprintf("%.1f", ht2 / 10.0), 294, 228, 2, base, shadow, 1])
+      textpos.push([sprintf("%.1f", wt1 / 10.0), 166, 280, 2, base, shadow, 1])
+      textpos.push([sprintf("%.1f", wt2 / 10.0), 294, 280, 2, base, shadow, 1])
     end
     overlay.blt(344, 214, @hwbitmap.bitmap, Rect.new(0, (hwoffset) ? 44 : 0, 32, 44))
     overlay.blt(344, 266, @hwbitmap.bitmap, Rect.new(32, (hwoffset) ? 44 : 0, 32, 44))
@@ -549,13 +549,13 @@ class PokemonPokedex_Scene
     shadow = Color.new(72, 72, 72)
     # Write various bits of text
     textpos = [
-      [_INTL("Search Mode"), Graphics.width / 2, -2, 2, base, shadow],
-      [_INTL("OK"), 80, 338, 2, base, shadow, 1],
-      [_INTL("Cancel"), Graphics.width - 80, 338, 2, base, shadow, 1]
+      [_INTL("Search Mode"), Graphics.width / 2, 10, 2, base, shadow],
+      [_INTL("OK"), 80, 346, 2, base, shadow, 1],
+      [_INTL("Cancel"), Graphics.width - 80, 346, 2, base, shadow, 1]
     ]
     title = [_INTL("Order"), _INTL("Name"), _INTL("Type"), _INTL("Height"),
              _INTL("Weight"), _INTL("Color"), _INTL("Shape")][mode]
-    textpos.push([title, 102, (mode == 6) ? 58 : 52, 0, base, shadow])
+    textpos.push([title, 102, (mode == 6) ? 70 : 64, 0, base, shadow])
     case mode
     when 0   # Order
       xstart = 46
@@ -615,7 +615,7 @@ class PokemonPokedex_Scene
     when 2   # Type icons
       2.times do |i|
         if !sel[i] || sel[i] < 0
-          textpos.push(["----", 298 + (128 * i), 58, 2, base, shadow, 1])
+          textpos.push(["----", 298 + (128 * i), 66, 2, base, shadow, 1])
         else
           type_number = @typeCommands[sel[i]].icon_position
           typerect = Rect.new(0, type_number * 32, 96, 32)
@@ -636,8 +636,8 @@ class PokemonPokedex_Scene
         txt1 = sprintf("%.1f", ht1 / 10.0)
         txt2 = sprintf("%.1f", ht2 / 10.0)
       end
-      textpos.push([txt1, 286, 58, 2, base, shadow, 1])
-      textpos.push([txt2, 414, 58, 2, base, shadow, 1])
+      textpos.push([txt1, 286, 66, 2, base, shadow, 1])
+      textpos.push([txt2, 414, 66, 2, base, shadow, 1])
       overlay.blt(462, 52, @hwbitmap.bitmap, Rect.new(0, (hwoffset) ? 44 : 0, 32, 44))
     when 4   # Weight range
       wt1 = (sel[0] < 0) ? 0 : (sel[0] >= @weightCommands.length) ? 9999 : @weightCommands[sel[0]]
@@ -653,14 +653,14 @@ class PokemonPokedex_Scene
         txt1 = sprintf("%.1f", wt1 / 10.0)
         txt2 = sprintf("%.1f", wt2 / 10.0)
       end
-      textpos.push([txt1, 286, 58, 2, base, shadow, 1])
-      textpos.push([txt2, 414, 58, 2, base, shadow, 1])
+      textpos.push([txt1, 286, 66, 2, base, shadow, 1])
+      textpos.push([txt2, 414, 66, 2, base, shadow, 1])
       overlay.blt(462, 52, @hwbitmap.bitmap, Rect.new(32, (hwoffset) ? 44 : 0, 32, 44))
     when 5   # Color
       if sel[0] < 0
-        textpos.push(["----", 362, 58, 2, base, shadow, 1])
+        textpos.push(["----", 362, 66, 2, base, shadow, 1])
       else
-        textpos.push([cmds[sel[0]].name, 362, 58, 2, base, shadow, 1])
+        textpos.push([cmds[sel[0]].name, 362, 66, 2, base, shadow, 1])
       end
     when 6   # Shape icon
       if sel[0] >= 0
@@ -670,9 +670,9 @@ class PokemonPokedex_Scene
     else
       if sel[0] < 0
         text = ["----", "-", "----", "", "", "----", ""][mode]
-        textpos.push([text, 362, 58, 2, base, shadow, 1])
+        textpos.push([text, 362, 66, 2, base, shadow, 1])
       else
-        textpos.push([cmds[sel[0]], 362, 58, 2, base, shadow, 1])
+        textpos.push([cmds[sel[0]], 362, 66, 2, base, shadow, 1])
       end
     end
     # Draw selected option(s) button graphic
@@ -682,8 +682,8 @@ class PokemonPokedex_Scene
       xpos2 = xstart + ((sel[1] + 1) * xgap)
       xpos2 = xstart + (cols * xgap) if sel[1] < 0
       xpos2 = xstart if sel[1] >= cols - 1
-      ypos1 = ystart + 172
-      ypos2 = ystart + 28
+      ypos1 = ystart + 180
+      ypos2 = ystart + 36
       overlay.blt(16, 120, @searchsliderbitmap.bitmap, Rect.new(0, 192, 32, 44)) if sel[1] < cols - 1
       overlay.blt(464, 120, @searchsliderbitmap.bitmap, Rect.new(32, 192, 32, 44)) if sel[1] >= 0
       overlay.blt(16, 264, @searchsliderbitmap.bitmap, Rect.new(0, 192, 32, 44)) if sel[0] >= 0
@@ -698,9 +698,13 @@ class PokemonPokedex_Scene
       sel.length.times do |i|
         selrect = Rect.new(0, selbuttony, @selbitmap.bitmap.width, selbuttonheight)
         if sel[i] >= 0
-          overlay.blt(xstart + ((sel[i] % cols) * xgap), ystart + ((sel[i] / cols).floor * ygap), @selbitmap.bitmap, selrect)
+          overlay.blt(xstart + ((sel[i] % cols) * xgap),
+                      ystart + ((sel[i] / cols).floor * ygap),
+                      @selbitmap.bitmap, selrect)
         else
-          overlay.blt(xstart + ((cols - 1) * xgap), ystart + ((cmds.length / cols).floor * ygap), @selbitmap.bitmap, selrect)
+          overlay.blt(xstart + ((cols - 1) * xgap),
+                      ystart + ((cmds.length / cols).floor * ygap),
+                      @selbitmap.bitmap, selrect)
         end
       end
     end
@@ -709,34 +713,44 @@ class PokemonPokedex_Scene
     when 0, 1   # Order, name
       cmds.length.times do |i|
         x = xstart + halfwidth + ((i % cols) * xgap)
-        y = ystart + 6 + ((i / cols).floor * ygap)
+        y = ystart + 14 + ((i / cols).floor * ygap)
         textpos.push([cmds[i], x, y, 2, base, shadow, 1])
       end
       if mode != 0
         textpos.push([(mode == 1) ? "-" : "----",
-                      xstart + halfwidth + ((cols - 1) * xgap), ystart + 6 + ((cmds.length / cols).floor * ygap), 2, base, shadow, 1])
+                      xstart + halfwidth + ((cols - 1) * xgap),
+                      ystart + 14 + ((cmds.length / cols).floor * ygap),
+                      2, base, shadow, 1])
       end
     when 2   # Type
       typerect = Rect.new(0, 0, 96, 32)
       cmds.length.times do |i|
         typerect.y = @typeCommands[i].icon_position * 32
-        overlay.blt(xstart + 14 + ((i % cols) * xgap), ystart + 6 + ((i / cols).floor * ygap), @typebitmap.bitmap, typerect)
+        overlay.blt(xstart + 14 + ((i % cols) * xgap),
+                    ystart + 6 + ((i / cols).floor * ygap),
+                    @typebitmap.bitmap, typerect)
       end
       textpos.push(["----",
-                    xstart + halfwidth + ((cols - 1) * xgap), ystart + 6 + ((cmds.length / cols).floor * ygap), 2, base, shadow, 1])
+                    xstart + halfwidth + ((cols - 1) * xgap),
+                    ystart + 14 + ((cmds.length / cols).floor * ygap),
+                    2, base, shadow, 1])
     when 5   # Color
       cmds.length.times do |i|
         x = xstart + halfwidth + ((i % cols) * xgap)
-        y = ystart + 6 + ((i / cols).floor * ygap)
+        y = ystart + 14 + ((i / cols).floor * ygap)
         textpos.push([cmds[i].name, x, y, 2, base, shadow, 1])
       end
       textpos.push(["----",
-                    xstart + halfwidth + ((cols - 1) * xgap), ystart + 6 + ((cmds.length / cols).floor * ygap), 2, base, shadow, 1])
+                    xstart + halfwidth + ((cols - 1) * xgap),
+                    ystart + 14 + ((cmds.length / cols).floor * ygap),
+                    2, base, shadow, 1])
     when 6   # Shape
       shaperect = Rect.new(0, 0, 60, 60)
       cmds.length.times do |i|
         shaperect.y = @shapeCommands[i].icon_position * 60
-        overlay.blt(xstart + 4 + ((i % cols) * xgap), ystart + 4 + ((i / cols).floor * ygap), @shapebitmap.bitmap, shaperect)
+        overlay.blt(xstart + 4 + ((i % cols) * xgap),
+                    ystart + 4 + ((i / cols).floor * ygap),
+                    @shapebitmap.bitmap, shaperect)
       end
     end
     # Draw all text

Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb

@@ -215,18 +215,18 @@ class PokemonPokedexInfo_Scene
     end
     textpos = [
       [_INTL("{1}{2} {3}", indexText, " ", species_data.name),
-       246, 36, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)]
+       246, 48, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)]
     ]
     if @show_battled_count
-      textpos.push([_INTL("Number Battled"), 314, 152, 0, base, shadow])
-      textpos.push([$player.pokedex.battled_count(@species).to_s, 452, 184, 1, base, shadow])
+      textpos.push([_INTL("Number Battled"), 314, 164, 0, base, shadow])
+      textpos.push([$player.pokedex.battled_count(@species).to_s, 452, 196, 1, base, shadow])
     else
-      textpos.push([_INTL("Height"), 314, 152, 0, base, shadow])
-      textpos.push([_INTL("Weight"), 314, 184, 0, base, shadow])
+      textpos.push([_INTL("Height"), 314, 164, 0, base, shadow])
+      textpos.push([_INTL("Weight"), 314, 196, 0, base, shadow])
     end
     if $player.owned?(@species)
       # Write the category
-      textpos.push([_INTL("{1} Pokémon", species_data.category), 246, 68, 0, base, shadow])
+      textpos.push([_INTL("{1} Pokémon", species_data.category), 246, 80, 0, base, shadow])
       # Write the height and weight
       if !@show_battled_count
         height = species_data.height
@@ -234,15 +234,15 @@ class PokemonPokedexInfo_Scene
         if System.user_language[3..4] == "US"   # If the user is in the United States
           inches = (height / 0.254).round
           pounds = (weight / 0.45359).round
-          textpos.push([_ISPRINTF("{1:d}'{2:02d}\"", inches / 12, inches % 12), 460, 152, 1, base, shadow])
-          textpos.push([_ISPRINTF("{1:4.1f} lbs.", pounds / 10.0), 494, 184, 1, base, shadow])
+          textpos.push([_ISPRINTF("{1:d}'{2:02d}\"", inches / 12, inches % 12), 460, 164, 1, base, shadow])
+          textpos.push([_ISPRINTF("{1:4.1f} lbs.", pounds / 10.0), 494, 196, 1, base, shadow])
         else
-          textpos.push([_ISPRINTF("{1:.1f} m", height / 10.0), 470, 152, 1, base, shadow])
-          textpos.push([_ISPRINTF("{1:.1f} kg", weight / 10.0), 482, 184, 1, base, shadow])
+          textpos.push([_ISPRINTF("{1:.1f} m", height / 10.0), 470, 164, 1, base, shadow])
+          textpos.push([_ISPRINTF("{1:.1f} kg", weight / 10.0), 482, 196, 1, base, shadow])
         end
       end
       # Draw the Pokédex entry text
-      drawTextEx(overlay, 40, 244, Graphics.width - (40 * 2), 4,   # overlay, x, y, width, num lines
+      drawTextEx(overlay, 40, 246, Graphics.width - (40 * 2), 4,   # overlay, x, y, width, num lines
                  species_data.pokedex_entry, base, shadow)
       # Draw the footprint
       footprintfile = GameData::Species.footprint_filename(@species, @form)
@@ -261,15 +261,15 @@ class PokemonPokedexInfo_Scene
       end
     else
       # Write the category
-      textpos.push([_INTL("????? Pokémon"), 246, 68, 0, base, shadow])
+      textpos.push([_INTL("????? Pokémon"), 246, 80, 0, base, shadow])
       # Write the height and weight
       if !@show_battled_count
         if System.user_language[3..4] == "US"   # If the user is in the United States
-          textpos.push([_INTL("???'??\""), 460, 152, 1, base, shadow])
-          textpos.push([_INTL("????.? lbs."), 494, 184, 1, base, shadow])
+          textpos.push([_INTL("???'??\""), 460, 164, 1, base, shadow])
+          textpos.push([_INTL("????.? lbs."), 494, 196, 1, base, shadow])
         else
-          textpos.push([_INTL("????.? m"), 470, 152, 1, base, shadow])
-          textpos.push([_INTL("????.? kg"), 482, 184, 1, base, shadow])
+          textpos.push([_INTL("????.? m"), 470, 164, 1, base, shadow])
+          textpos.push([_INTL("????.? kg"), 482, 196, 1, base, shadow])
         end
       end
     end
@@ -372,11 +372,11 @@ class PokemonPokedexInfo_Scene
         overlay,
         [[sprintf("Graphics/Pictures/Pokedex/overlay_areanone"), 108, 188]]
       )
-      textpos.push([_INTL("Area unknown"), Graphics.width / 2, (Graphics.height / 2) - 6, 2, base, shadow])
+      textpos.push([_INTL("Area unknown"), Graphics.width / 2, (Graphics.height / 2) + 6, 2, base, shadow])
     end
-    textpos.push([pbGetMessage(MessageTypes::RegionNames, @region), 414, 38, 2, base, shadow])
+    textpos.push([pbGetMessage(MessageTypes::RegionNames, @region), 414, 50, 2, base, shadow])
     textpos.push([_INTL("{1}'s area", GameData::Species.get(@species).name),
-                  Graphics.width / 2, 346, 2, base, shadow])
+                  Graphics.width / 2, 358, 2, base, shadow])
     pbDrawTextPositions(overlay, textpos)
   end
 
@@ -394,8 +394,8 @@ class PokemonPokedexInfo_Scene
       end
     end
     textpos = [
-      [GameData::Species.get(@species).name, Graphics.width / 2, Graphics.height - 94, 2, base, shadow],
-      [formname, Graphics.width / 2, Graphics.height - 62, 2, base, shadow]
+      [GameData::Species.get(@species).name, Graphics.width / 2, Graphics.height - 82, 2, base, shadow],
+      [formname, Graphics.width / 2, Graphics.height - 50, 2, base, shadow]
     ]
     # Draw all text
     pbDrawTextPositions(overlay, textpos)

Data/Scripts/016_UI/005_UI_Party.rb

@@ -19,8 +19,7 @@ class PokemonPartyConfirmCancelSprite < SpriteWrapper
     @overlaysprite = BitmapSprite.new(@bgsprite.bitmap.width, @bgsprite.bitmap.height, viewport)
     @overlaysprite.z = self.z + 1
     pbSetSystemFont(@overlaysprite.bitmap)
-    @yoffset = 8
-    textpos = [[text, 56, (narrowbox) ? -4 : 2, 2, Color.new(248, 248, 248), Color.new(40, 40, 40)]]
+    textpos = [[text, 56, (narrowbox) ? 8 : 14, 2, Color.new(248, 248, 248), Color.new(40, 40, 40)]]
     pbDrawTextPositions(@overlaysprite.bitmap, textpos)
     self.x = x
     self.y = y
@@ -126,8 +125,8 @@ class Window_CommandPokemonColor < Window_CommandPokemon
       base   = Color.new(0, 80, 160)
       shadow = Color.new(128, 192, 240)
     end
-    pbDrawShadowText(self.contents, rect.x, rect.y, rect.width, rect.height,
-                     @commands[index], base, shadow)
+    pbDrawShadowText(self.contents, rect.x, rect.y + (self.contents.text_offset_y || 0),
+                     rect.width, rect.height, @commands[index], base, shadow)
   end
 end
 
@@ -365,11 +364,11 @@ class PokemonPartyPanel < SpriteWrapper
       pbSetSystemFont(@overlaysprite.bitmap)
       textpos = []
       # Draw Pokémon name
-      textpos.push([@pokemon.name, 96, 10, 0, basecolor, shadowcolor])
+      textpos.push([@pokemon.name, 96, 22, 0, basecolor, shadowcolor])
       if !@pokemon.egg?
         if !@text || @text.length == 0
           # Draw HP numbers
-          textpos.push([sprintf("% 3d /% 3d", @pokemon.hp, @pokemon.totalhp), 224, 54, 1, basecolor, shadowcolor])
+          textpos.push([sprintf("% 3d /% 3d", @pokemon.hp, @pokemon.totalhp), 224, 66, 1, basecolor, shadowcolor])
           # Draw HP bar
           if @pokemon.hp > 0
             w = @pokemon.hp * 96 / @pokemon.totalhp.to_f
@@ -397,9 +396,9 @@ class PokemonPartyPanel < SpriteWrapper
         end
         # Draw gender symbol
         if @pokemon.male?
-          textpos.push([_INTL("♂"), 224, 10, 0, Color.new(0, 112, 248), Color.new(120, 184, 232)])
+          textpos.push([_INTL("♂"), 224, 22, 0, Color.new(0, 112, 248), Color.new(120, 184, 232)])
         elsif @pokemon.female?
-          textpos.push([_INTL("♀"), 224, 10, 0, Color.new(232, 32, 16), Color.new(248, 168, 184)])
+          textpos.push([_INTL("♀"), 224, 22, 0, Color.new(232, 32, 16), Color.new(248, 168, 184)])
         end
         # Draw shiny icon
         if @pokemon.shiny?
@@ -414,13 +413,13 @@ class PokemonPartyPanel < SpriteWrapper
                              [["Graphics/Pictures/Party/overlay_lv", 20, 70, 0, 0, 22, 14]])
         pbSetSmallFont(@overlaysprite.bitmap)
         pbDrawTextPositions(@overlaysprite.bitmap,
-                            [[@pokemon.level.to_s, 42, 57, 0, basecolor, shadowcolor]])
+                            [[@pokemon.level.to_s, 42, 68, 0, basecolor, shadowcolor]])
       end
       # Draw annotation text
       if @text && @text.length > 0
         pbSetSystemFont(@overlaysprite.bitmap)
         pbDrawTextPositions(@overlaysprite.bitmap,
-                            [[@text, 96, 52, 0, basecolor, shadowcolor]])
+                            [[@text, 96, 62, 0, basecolor, shadowcolor]])
       end
     end
     @refreshing = false

Data/Scripts/016_UI/006_UI_Summary.rb

@@ -340,22 +340,22 @@ class PokemonSummary_Scene
                 _INTL("MOVES"),
                 _INTL("RIBBONS")][page - 1]
     textpos = [
-      [pagename, 26, 10, 0, base, shadow],
-      [@pokemon.name, 46, 56, 0, base, shadow],
-      [@pokemon.level.to_s, 46, 86, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [_INTL("Item"), 66, 312, 0, base, shadow]
+      [pagename, 26, 22, 0, base, shadow],
+      [@pokemon.name, 46, 68, 0, base, shadow],
+      [@pokemon.level.to_s, 46, 98, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [_INTL("Item"), 66, 324, 0, base, shadow]
     ]
     # Write the held item's name
     if @pokemon.hasItem?
-      textpos.push([@pokemon.item.name, 16, 346, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+      textpos.push([@pokemon.item.name, 16, 358, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
     else
-      textpos.push([_INTL("None"), 16, 346, 0, Color.new(192, 200, 208), Color.new(208, 216, 224)])
+      textpos.push([_INTL("None"), 16, 358, 0, Color.new(192, 200, 208), Color.new(208, 216, 224)])
     end
     # Write the gender symbol
     if @pokemon.male?
-      textpos.push([_INTL("♂"), 178, 56, 0, Color.new(24, 112, 216), Color.new(136, 168, 208)])
+      textpos.push([_INTL("♂"), 178, 68, 0, Color.new(24, 112, 216), Color.new(136, 168, 208)])
     elsif @pokemon.female?
-      textpos.push([_INTL("♀"), 178, 56, 0, Color.new(248, 56, 32), Color.new(224, 152, 144)])
+      textpos.push([_INTL("♀"), 178, 68, 0, Color.new(248, 56, 32), Color.new(224, 152, 144)])
     end
     # Draw all text
     pbDrawTextPositions(overlay, textpos)
@@ -388,12 +388,12 @@ class PokemonSummary_Scene
     end
     # Write various bits of text
     textpos = [
-      [_INTL("Dex No."), 238, 74, 0, base, shadow],
-      [_INTL("Species"), 238, 106, 0, base, shadow],
-      [@pokemon.speciesName, 435, 106, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [_INTL("Type"), 238, 138, 0, base, shadow],
-      [_INTL("OT"), 238, 170, 0, base, shadow],
-      [_INTL("ID No."), 238, 202, 0, base, shadow]
+      [_INTL("Dex No."), 238, 86, 0, base, shadow],
+      [_INTL("Species"), 238, 118, 0, base, shadow],
+      [@pokemon.speciesName, 435, 118, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [_INTL("Type"), 238, 150, 0, base, shadow],
+      [_INTL("OT"), 238, 182, 0, base, shadow],
+      [_INTL("ID No."), 238, 214, 0, base, shadow]
     ]
     # Write the Regional/National Dex number
     dexnum = 0
@@ -412,15 +412,15 @@ class PokemonSummary_Scene
       end
     end
     if dexnum <= 0
-      textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow])
+      textpos.push(["???", 435, 86, 2, dexNumBase, dexNumShadow])
     else
       dexnum -= 1 if dexnumshift
-      textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow])
+      textpos.push([sprintf("%03d", dexnum), 435, 86, 2, dexNumBase, dexNumShadow])
     end
     # Write Original Trainer's name and ID number
     if @pokemon.owner.name.empty?
-      textpos.push([_INTL("RENTAL"), 435, 170, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
-      textpos.push(["?????", 435, 202, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+      textpos.push([_INTL("RENTAL"), 435, 182, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+      textpos.push(["?????", 435, 214, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
     else
       ownerbase   = Color.new(64, 64, 64)
       ownershadow = Color.new(176, 176, 176)
@@ -432,12 +432,13 @@ class PokemonSummary_Scene
         ownerbase = Color.new(248, 56, 32)
         ownershadow = Color.new(224, 152, 144)
       end
-      textpos.push([@pokemon.owner.name, 435, 170, 2, ownerbase, ownershadow])
-      textpos.push([sprintf("%05d", @pokemon.owner.public_id), 435, 202, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+      textpos.push([@pokemon.owner.name, 435, 182, 2, ownerbase, ownershadow])
+      textpos.push([sprintf("%05d", @pokemon.owner.public_id), 435, 214, 2,
+                    Color.new(64, 64, 64), Color.new(176, 176, 176)])
     end
     # Write Exp text OR heart gauge message (if a Shadow Pokémon)
     if @pokemon.shadowPokemon?
-      textpos.push([_INTL("Heart Gauge"), 238, 234, 0, base, shadow])
+      textpos.push([_INTL("Heart Gauge"), 238, 246, 0, base, shadow])
       heartmessage = [_INTL("The door to its heart is open! Undo the final lock!"),
                       _INTL("The door to its heart is almost fully open."),
                       _INTL("The door to its heart is nearly open."),
@@ -445,13 +446,13 @@ class PokemonSummary_Scene
                       _INTL("The door to its heart is opening up."),
                       _INTL("The door to its heart is tightly shut.")][@pokemon.heartStage]
       memo = sprintf("<c3=404040,B0B0B0>%s\n", heartmessage)
-      drawFormattedTextEx(overlay, 234, 304, 264, memo)
+      drawFormattedTextEx(overlay, 234, 308, 264, memo)
     else
       endexp = @pokemon.growth_rate.minimum_exp_for_level(@pokemon.level + 1)
-      textpos.push([_INTL("Exp. Points"), 238, 234, 0, base, shadow])
-      textpos.push([@pokemon.exp.to_s_formatted, 488, 266, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)])
-      textpos.push([_INTL("To Next Lv."), 238, 298, 0, base, shadow])
-      textpos.push([(endexp - @pokemon.exp).to_s_formatted, 488, 330, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+      textpos.push([_INTL("Exp. Points"), 238, 246, 0, base, shadow])
+      textpos.push([@pokemon.exp.to_s_formatted, 488, 278, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+      textpos.push([_INTL("To Next Lv."), 238, 310, 0, base, shadow])
+      textpos.push([(endexp - @pokemon.exp).to_s_formatted, 488, 342, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)])
     end
     # Draw all text
     pbDrawTextPositions(overlay, textpos)
@@ -487,15 +488,15 @@ class PokemonSummary_Scene
     pbDrawImagePositions(overlay, imagepos)
     # Write various bits of text
     textpos = [
-      [_INTL("TRAINER MEMO"), 26, 10, 0, base, shadow],
-      [@pokemon.name, 46, 56, 0, base, shadow],
-      [_INTL("Item"), 66, 312, 0, base, shadow]
+      [_INTL("TRAINER MEMO"), 26, 22, 0, base, shadow],
+      [@pokemon.name, 46, 68, 0, base, shadow],
+      [_INTL("Item"), 66, 324, 0, base, shadow]
     ]
     # Write the held item's name
     if @pokemon.hasItem?
-      textpos.push([@pokemon.item.name, 16, 346, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+      textpos.push([@pokemon.item.name, 16, 358, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
     else
-      textpos.push([_INTL("None"), 16, 346, 0, Color.new(192, 200, 208), Color.new(208, 216, 224)])
+      textpos.push([_INTL("None"), 16, 358, 0, Color.new(192, 200, 208), Color.new(208, 216, 224)])
     end
     # Draw all text
     pbDrawTextPositions(overlay, textpos)
@@ -524,7 +525,7 @@ class PokemonSummary_Scene
     eggstate = _INTL("Sounds can be heard coming from inside! It will hatch soon!") if @pokemon.steps_to_hatch < 1275
     memo += sprintf("<c3=404040,B0B0B0>%s\n", eggstate)
     # Draw all text
-    drawFormattedTextEx(overlay, 232, 82, 268, memo)
+    drawFormattedTextEx(overlay, 232, 86, 268, memo)
     # Draw the Pokémon's markings
     drawMarkings(overlay, 84, 292)
   end
@@ -620,7 +621,7 @@ class PokemonSummary_Scene
       memo += sprintf("<c3=404040,B0B0B0>%s\n", characteristics[best_stat][best_iv % 5])
     end
     # Write all text
-    drawFormattedTextEx(overlay, 232, 82, 268, memo)
+    drawFormattedTextEx(overlay, 232, 86, 268, memo)
   end
 
   def drawPageThree
@@ -638,25 +639,25 @@ class PokemonSummary_Scene
     end
     # Write various bits of text
     textpos = [
-      [_INTL("HP"), 292, 70, 2, base, statshadows[:HP]],
-      [sprintf("%d/%d", @pokemon.hp, @pokemon.totalhp), 462, 70, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [_INTL("Attack"), 248, 114, 0, base, statshadows[:ATTACK]],
-      [sprintf("%d", @pokemon.attack), 456, 114, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [_INTL("Defense"), 248, 146, 0, base, statshadows[:DEFENSE]],
-      [sprintf("%d", @pokemon.defense), 456, 146, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [_INTL("Sp. Atk"), 248, 178, 0, base, statshadows[:SPECIAL_ATTACK]],
-      [sprintf("%d", @pokemon.spatk), 456, 178, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [_INTL("Sp. Def"), 248, 210, 0, base, statshadows[:SPECIAL_DEFENSE]],
-      [sprintf("%d", @pokemon.spdef), 456, 210, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [_INTL("Speed"), 248, 242, 0, base, statshadows[:SPEED]],
-      [sprintf("%d", @pokemon.speed), 456, 242, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [_INTL("Ability"), 224, 278, 0, base, shadow]
+      [_INTL("HP"), 292, 82, 2, base, statshadows[:HP]],
+      [sprintf("%d/%d", @pokemon.hp, @pokemon.totalhp), 462, 82, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [_INTL("Attack"), 248, 126, 0, base, statshadows[:ATTACK]],
+      [sprintf("%d", @pokemon.attack), 456, 126, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [_INTL("Defense"), 248, 158, 0, base, statshadows[:DEFENSE]],
+      [sprintf("%d", @pokemon.defense), 456, 158, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [_INTL("Sp. Atk"), 248, 190, 0, base, statshadows[:SPECIAL_ATTACK]],
+      [sprintf("%d", @pokemon.spatk), 456, 190, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [_INTL("Sp. Def"), 248, 222, 0, base, statshadows[:SPECIAL_DEFENSE]],
+      [sprintf("%d", @pokemon.spdef), 456, 222, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [_INTL("Speed"), 248, 254, 0, base, statshadows[:SPEED]],
+      [sprintf("%d", @pokemon.speed), 456, 254, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [_INTL("Ability"), 224, 290, 0, base, shadow]
     ]
     # Draw ability name and description
     ability = @pokemon.ability
     if ability
-      textpos.push([ability.name, 362, 278, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
-      drawTextEx(overlay, 224, 320, 282, 2, ability.description, Color.new(64, 64, 64), Color.new(176, 176, 176))
+      textpos.push([ability.name, 362, 290, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+      drawTextEx(overlay, 224, 322, 282, 2, ability.description, Color.new(64, 64, 64), Color.new(176, 176, 176))
     end
     # Draw all text
     pbDrawTextPositions(overlay, textpos)
@@ -693,12 +694,12 @@ class PokemonSummary_Scene
     textpos  = []
     imagepos = []
     # Write move names, types and PP amounts for each known move
-    yPos = 92
+    yPos = 104
     Pokemon::MAX_MOVES.times do |i|
       move = @pokemon.moves[i]
       if move
         type_number = GameData::Type.get(move.display_type(@pokemon)).icon_position
-        imagepos.push(["Graphics/Pictures/types", 248, yPos + 8, 0, type_number * 28, 64, 28])
+        imagepos.push(["Graphics/Pictures/types", 248, yPos - 4, 0, type_number * 28, 64, 28])
         textpos.push([move.name, 316, yPos, 0, moveBase, moveShadow])
         if move.total_pp > 0
           textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow])
@@ -746,14 +747,14 @@ class PokemonSummary_Scene
     end
     # Write various bits of text
     textpos = [
-      [_INTL("MOVES"), 26, 10, 0, base, shadow],
-      [_INTL("CATEGORY"), 20, 116, 0, base, shadow],
-      [_INTL("POWER"), 20, 148, 0, base, shadow],
-      [_INTL("ACCURACY"), 20, 180, 0, base, shadow]
+      [_INTL("MOVES"), 26, 22, 0, base, shadow],
+      [_INTL("CATEGORY"), 20, 128, 0, base, shadow],
+      [_INTL("POWER"), 20, 160, 0, base, shadow],
+      [_INTL("ACCURACY"), 20, 192, 0, base, shadow]
     ]
     imagepos = []
     # Write move names, types and PP amounts for each known move
-    yPos = 92
+    yPos = 104
     yPos -= 76 if move_to_learn
     limit = (move_to_learn) ? Pokemon::MAX_MOVES + 1 : Pokemon::MAX_MOVES
     limit.times do |i|
@@ -764,7 +765,7 @@ class PokemonSummary_Scene
       end
       if move
         type_number = GameData::Type.get(move.display_type(@pokemon)).icon_position
-        imagepos.push(["Graphics/Pictures/types", 248, yPos + 8, 0, type_number * 28, 64, 28])
+        imagepos.push(["Graphics/Pictures/types", 248, yPos - 4, 0, type_number * 28, 64, 28])
         textpos.push([move.name, 316, yPos, 0, moveBase, moveShadow])
         if move.total_pp > 0
           textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow])
@@ -810,14 +811,14 @@ class PokemonSummary_Scene
     textpos = []
     # Write power and accuracy values for selected move
     case selected_move.display_damage(@pokemon)
-    when 0 then textpos.push(["---", 216, 148, 1, base, shadow])   # Status move
-    when 1 then textpos.push(["???", 216, 148, 1, base, shadow])   # Variable power move
-    else        textpos.push([selected_move.display_damage(@pokemon).to_s, 216, 148, 1, base, shadow])
+    when 0 then textpos.push(["---", 216, 160, 1, base, shadow])   # Status move
+    when 1 then textpos.push(["???", 216, 160, 1, base, shadow])   # Variable power move
+    else        textpos.push([selected_move.display_damage(@pokemon).to_s, 216, 160, 1, base, shadow])
     end
     if selected_move.display_accuracy(@pokemon) == 0
-      textpos.push(["---", 216, 180, 1, base, shadow])
+      textpos.push(["---", 216, 192, 1, base, shadow])
     else
-      textpos.push(["#{selected_move.display_accuracy(@pokemon)}%", 216 + overlay.text_size("%").width, 180, 1, base, shadow])
+      textpos.push(["#{selected_move.display_accuracy(@pokemon)}%", 216 + overlay.text_size("%").width, 192, 1, base, shadow])
     end
     # Draw all text
     pbDrawTextPositions(overlay, textpos)
@@ -825,7 +826,7 @@ class PokemonSummary_Scene
     imagepos = [["Graphics/Pictures/category", 166, 124, 0, selected_move.display_category(@pokemon) * 28, 64, 28]]
     pbDrawImagePositions(overlay, imagepos)
     # Draw selected move's description
-    drawTextEx(overlay, 4, 222, 230, 5, selected_move.description, base, shadow)
+    drawTextEx(overlay, 4, 224, 230, 5, selected_move.description, base, shadow)
   end
 
   def drawPageFive
@@ -834,8 +835,8 @@ class PokemonSummary_Scene
     @sprites["downarrow"].visible = false
     # Write various bits of text
     textpos = [
-      [_INTL("No. of Ribbons:"), 234, 326, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)],
-      [@pokemon.numRibbons.to_s, 450, 326, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)]
+      [_INTL("No. of Ribbons:"), 234, 338, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)],
+      [@pokemon.numRibbons.to_s, 450, 338, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)]
     ]
     # Draw all text
     pbDrawTextPositions(overlay, textpos)
@@ -874,11 +875,11 @@ class PokemonSummary_Scene
     pbDrawImagePositions(overlay, imagepos)
     # Draw name of selected ribbon
     textpos = [
-      [name, 18, 280, 0, nameBase, nameShadow]
+      [name, 18, 292, 0, nameBase, nameShadow]
     ]
     pbDrawTextPositions(overlay, textpos)
     # Draw selected ribbon's description
-    drawTextEx(overlay, 18, 322, 480, 2, desc, base, shadow)
+    drawTextEx(overlay, 18, 324, 480, 2, desc, base, shadow)
   end
 
   def pbGoToPrevious
@@ -1083,9 +1084,9 @@ class PokemonSummary_Scene
                                                 @markingbitmap.bitmap, markrect)
         end
         textpos = [
-          [_INTL("Mark {1}", pokemon.name), 366, 90, 2, base, shadow],
-          [_INTL("OK"), 366, 242, 2, base, shadow],
-          [_INTL("Cancel"), 366, 292, 2, base, shadow]
+          [_INTL("Mark {1}", pokemon.name), 366, 102, 2, base, shadow],
+          [_INTL("OK"), 366, 254, 2, base, shadow],
+          [_INTL("Cancel"), 366, 304, 2, base, shadow]
         ]
         pbDrawTextPositions(@sprites["markingoverlay"].bitmap, textpos)
         redraw = false

Data/Scripts/016_UI/007_UI_Bag.rb

@@ -66,7 +66,7 @@ class Window_PokemonBag < Window_DrawableCommand
     rect = Rect.new(rect.x + 16, rect.y + 16, rect.width - 16, rect.height)
     thispocket = @bag.pockets[@pocket]
     if index == self.itemCount - 1
-      textpos.push([_INTL("CLOSE BAG"), rect.x, rect.y - 2, false, self.baseColor, self.shadowColor])
+      textpos.push([_INTL("CLOSE BAG"), rect.x, rect.y + 2, false, self.baseColor, self.shadowColor])
     else
       item = (@filterlist) ? thispocket[@filterlist[@pocket][index]][0] : thispocket[index][0]
       baseColor   = self.baseColor
@@ -76,7 +76,7 @@ class Window_PokemonBag < Window_DrawableCommand
         shadowColor = Color.new(248, 144, 144)
       end
       textpos.push(
-        [@adapter.getDisplayName(item), rect.x, rect.y - 2, false, baseColor, shadowColor]
+        [@adapter.getDisplayName(item), rect.x, rect.y + 2, false, baseColor, shadowColor]
       )
       if GameData::Item.get(item).is_important?
         if @bag.registered?(item)
@@ -94,7 +94,7 @@ class Window_PokemonBag < Window_DrawableCommand
         qty = (@filterlist) ? thispocket[@filterlist[@pocket][index]][1] : thispocket[index][1]
         qtytext = _ISPRINTF("x{1: 3d}", qty)
         xQty    = rect.x + rect.width - self.contents.text_size(qtytext).width - 16
-        textpos.push([qtytext, xQty, rect.y - 2, false, baseColor, shadowColor])
+        textpos.push([qtytext, xQty, rect.y + 2, false, baseColor, shadowColor])
       end
     end
     pbDrawTextPositions(self.contents, textpos)
@@ -200,7 +200,7 @@ class PokemonBag_Scene
     @sprites["itemlist"].shadowColor = ITEMLISTSHADOWCOLOR
     @sprites["itemicon"] = ItemIconSprite.new(48, Graphics.height - 48, nil, @viewport)
     @sprites["itemtext"] = Window_UnformattedTextPokemon.newWithSize(
-      "", 72, 270, Graphics.width - 72 - 24, 128, @viewport
+      "", 72, 272, Graphics.width - 72 - 24, 128, @viewport
     )
     @sprites["itemtext"].baseColor   = ITEMTEXTBASECOLOR
     @sprites["itemtext"].shadowColor = ITEMTEXTSHADOWCOLOR
@@ -293,7 +293,7 @@ class PokemonBag_Scene
     # Draw the pocket name
     pbDrawTextPositions(
       overlay,
-      [[PokemonBag.pocket_names[@bag.last_viewed_pocket - 1], 94, 176, 2, POCKETNAMEBASECOLOR, POCKETNAMESHADOWCOLOR]]
+      [[PokemonBag.pocket_names[@bag.last_viewed_pocket - 1], 94, 186, 2, POCKETNAMEBASECOLOR, POCKETNAMESHADOWCOLOR]]
     )
     # Draw slider arrows
     showslider = false

Data/Scripts/016_UI/008_UI_Pokegear.rb

@@ -45,7 +45,7 @@ class PokegearButton < SpriteWrapper
     rect.y = @button.height / 2 if @selected
     self.bitmap.blt(0, 0, @button.bitmap, rect)
     textpos = [
-      [@name, rect.width / 2, (rect.height / 2) - 22, 2, TEXT_BASE_COLOR, TEXT_SHADOW_COLOR]
+      [@name, rect.width / 2, (rect.height / 2) - 10, 2, TEXT_BASE_COLOR, TEXT_SHADOW_COLOR]
     ]
     pbDrawTextPositions(self.bitmap, textpos)
     imagepos = [

Data/Scripts/016_UI/009_UI_RegionMap.rb

@@ -39,9 +39,9 @@ class MapBottomSprite < SpriteWrapper
   def refresh
     bitmap.clear
     textpos = [
-      [@mapname,                     18,  -8, 0, TEXT_MAIN_COLOR, TEXT_SHADOW_COLOR],
-      [@maplocation,                 18, 348, 0, TEXT_MAIN_COLOR, TEXT_SHADOW_COLOR],
-      [@mapdetails, Graphics.width - 16, 348, 1, TEXT_MAIN_COLOR, TEXT_SHADOW_COLOR]
+      [@mapname,                     18,   4, 0, TEXT_MAIN_COLOR, TEXT_SHADOW_COLOR],
+      [@maplocation,                 18, 360, 0, TEXT_MAIN_COLOR, TEXT_SHADOW_COLOR],
+      [@mapdetails, Graphics.width - 16, 360, 1, TEXT_MAIN_COLOR, TEXT_SHADOW_COLOR]
     ]
     pbDrawTextPositions(bitmap, textpos)
   end
@@ -251,7 +251,7 @@ class PokemonRegionMap_Scene
     text = (@mode == 0) ? _INTL("ACTION: Fly") : _INTL("ACTION: Cancel Fly")
     pbDrawTextPositions(
       @sprites["help"].bitmap,
-      [[text, Graphics.width - 16, -8, 1, Color.new(248, 248, 248), Color.new(0, 0, 0)]]
+      [[text, Graphics.width - 16, 4, 1, Color.new(248, 248, 248), Color.new(0, 0, 0)]]
     )
     @sprites.each do |key, sprite|
       next if !key.include?("point")

Data/Scripts/016_UI/012_UI_TrainerCard.rb

@@ -49,18 +49,18 @@ class PokemonTrainerCard_Scene
                       $PokemonGlobal.startTime.day,
                       $PokemonGlobal.startTime.year)
     textPositions = [
-      [_INTL("Name"), 34, 58, 0, baseColor, shadowColor],
-      [$player.name, 302, 58, 1, baseColor, shadowColor],
-      [_INTL("ID No."), 332, 58, 0, baseColor, shadowColor],
-      [sprintf("%05d", $player.public_ID), 468, 58, 1, baseColor, shadowColor],
-      [_INTL("Money"), 34, 106, 0, baseColor, shadowColor],
-      [_INTL("${1}", $player.money.to_s_formatted), 302, 106, 1, baseColor, shadowColor],
-      [_INTL("Pokédex"), 34, 154, 0, baseColor, shadowColor],
-      [sprintf("%d/%d", $player.pokedex.owned_count, $player.pokedex.seen_count), 302, 154, 1, baseColor, shadowColor],
-      [_INTL("Time"), 34, 202, 0, baseColor, shadowColor],
-      [time, 302, 202, 1, baseColor, shadowColor],
-      [_INTL("Started"), 34, 250, 0, baseColor, shadowColor],
-      [starttime, 302, 250, 1, baseColor, shadowColor]
+      [_INTL("Name"), 34, 70, 0, baseColor, shadowColor],
+      [$player.name, 302, 70, 1, baseColor, shadowColor],
+      [_INTL("ID No."), 332, 70, 0, baseColor, shadowColor],
+      [sprintf("%05d", $player.public_ID), 468, 70, 1, baseColor, shadowColor],
+      [_INTL("Money"), 34, 118, 0, baseColor, shadowColor],
+      [_INTL("${1}", $player.money.to_s_formatted), 302, 118, 1, baseColor, shadowColor],
+      [_INTL("Pokédex"), 34, 166, 0, baseColor, shadowColor],
+      [sprintf("%d/%d", $player.pokedex.owned_count, $player.pokedex.seen_count), 302, 166, 1, baseColor, shadowColor],
+      [_INTL("Time"), 34, 214, 0, baseColor, shadowColor],
+      [time, 302, 214, 1, baseColor, shadowColor],
+      [_INTL("Started"), 34, 262, 0, baseColor, shadowColor],
+      [starttime, 302, 262, 1, baseColor, shadowColor]
     ]
     pbDrawTextPositions(overlay, textPositions)
     x = 72

Data/Scripts/016_UI/013_UI_Load.rb

@@ -49,44 +49,44 @@ class PokemonLoadPanel < SpriteWrapper
     return if disposed?
     @refreshing = true
     if !self.bitmap || self.bitmap.disposed?
-      self.bitmap = BitmapWrapper.new(@bgbitmap.width, 111 * 2)
+      self.bitmap = BitmapWrapper.new(@bgbitmap.width, 222)
       pbSetSystemFont(self.bitmap)
     end
     if @refreshBitmap
       @refreshBitmap = false
       self.bitmap&.clear
       if @isContinue
-        self.bitmap.blt(0, 0, @bgbitmap.bitmap, Rect.new(0, (@selected) ? 111 * 2 : 0, @bgbitmap.width, 111 * 2))
+        self.bitmap.blt(0, 0, @bgbitmap.bitmap, Rect.new(0, (@selected) ? 222 : 0, @bgbitmap.width, 222))
       else
-        self.bitmap.blt(0, 0, @bgbitmap.bitmap, Rect.new(0, (111 * 2 * 2) + ((@selected) ? 23 * 2 : 0), @bgbitmap.width, 23 * 2))
+        self.bitmap.blt(0, 0, @bgbitmap.bitmap, Rect.new(0, 444 + ((@selected) ? 46 : 0), @bgbitmap.width, 46))
       end
       textpos = []
       if @isContinue
-        textpos.push([@title, 16 * 2, 2 * 2, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
-        textpos.push([_INTL("Badges:"), 16 * 2, 53 * 2, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
-        textpos.push([@trainer.badge_count.to_s, 103 * 2, 53 * 2, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
-        textpos.push([_INTL("Pokédex:"), 16 * 2, 69 * 2, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
-        textpos.push([@trainer.pokedex.seen_count.to_s, 103 * 2, 69 * 2, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
-        textpos.push([_INTL("Time:"), 16 * 2, 85 * 2, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
+        textpos.push([@title, 32, 16, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
+        textpos.push([_INTL("Badges:"), 32, 118, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
+        textpos.push([@trainer.badge_count.to_s, 206, 118, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
+        textpos.push([_INTL("Pokédex:"), 32, 150, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
+        textpos.push([@trainer.pokedex.seen_count.to_s, 206, 150, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
+        textpos.push([_INTL("Time:"), 32, 182, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
         hour = @totalsec / 60 / 60
         min  = @totalsec / 60 % 60
         if hour > 0
-          textpos.push([_INTL("{1}h {2}m", hour, min), 103 * 2, 85 * 2, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
+          textpos.push([_INTL("{1}h {2}m", hour, min), 206, 182, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
         else
-          textpos.push([_INTL("{1}m", min), 103 * 2, 85 * 2, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
+          textpos.push([_INTL("{1}m", min), 206, 182, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
         end
         if @trainer.male?
-          textpos.push([@trainer.name, 56 * 2, 29 * 2, 0, MALETEXTCOLOR, MALETEXTSHADOWCOLOR])
+          textpos.push([@trainer.name, 112, 70, 0, MALETEXTCOLOR, MALETEXTSHADOWCOLOR])
         elsif @trainer.female?
-          textpos.push([@trainer.name, 56 * 2, 29 * 2, 0, FEMALETEXTCOLOR, FEMALETEXTSHADOWCOLOR])
+          textpos.push([@trainer.name, 112, 70, 0, FEMALETEXTCOLOR, FEMALETEXTSHADOWCOLOR])
         else
-          textpos.push([@trainer.name, 56 * 2, 29 * 2, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
+          textpos.push([@trainer.name, 112, 70, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
         end
         mapname = pbGetMapNameFromId(@mapid)
         mapname.gsub!(/\\PN/, @trainer.name)
-        textpos.push([mapname, 193 * 2, 2 * 2, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
+        textpos.push([mapname, 386, 16, 1, TEXTCOLOR, TEXTSHADOWCOLOR])
       else
-        textpos.push([@title, 16 * 2, 1 * 2, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
+        textpos.push([@title, 32, 14, 0, TEXTCOLOR, TEXTSHADOWCOLOR])
       end
       pbDrawTextPositions(self.bitmap, textpos)
     end
@@ -104,16 +104,16 @@ class PokemonLoad_Scene
     @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
     @viewport.z = 99998
     addBackgroundOrColoredPlane(@sprites, "background", "loadbg", Color.new(248, 248, 248), @viewport)
-    y = 16 * 2
+    y = 32
     commands.length.times do |i|
       @sprites["panel#{i}"] = PokemonLoadPanel.new(
         i, commands[i], (show_continue) ? (i == 0) : false, trainer,
         frame_count, stats, map_id, @viewport
       )
-      @sprites["panel#{i}"].x = 24 * 2
+      @sprites["panel#{i}"].x = 48
       @sprites["panel#{i}"].y = y
       @sprites["panel#{i}"].pbRefresh
-      y += (show_continue && i == 0) ? 112 * 2 : 24 * 2
+      y += (show_continue && i == 0) ? 224 : 48
     end
     @sprites["cmdwindow"] = Window_CommandPokemon.new([])
     @sprites["cmdwindow"].viewport = @viewport
@@ -140,25 +140,25 @@ class PokemonLoad_Scene
       @sprites["panel#{oldi}"].pbRefresh
       @sprites["panel#{newi}"].selected = true
       @sprites["panel#{newi}"].pbRefresh
-      while @sprites["panel#{newi}"].y > Graphics.height - (40 * 2)
+      while @sprites["panel#{newi}"].y > Graphics.height - 80
         @commands.length.times do |i|
-          @sprites["panel#{i}"].y -= 24 * 2
+          @sprites["panel#{i}"].y -= 48
         end
         6.times do |i|
           break if !@sprites["party#{i}"]
-          @sprites["party#{i}"].y -= 24 * 2
+          @sprites["party#{i}"].y -= 48
         end
-        @sprites["player"].y -= 24 * 2 if @sprites["player"]
+        @sprites["player"].y -= 48 if @sprites["player"]
       end
-      while @sprites["panel#{newi}"].y < 16 * 2
+      while @sprites["panel#{newi}"].y < 32
         @commands.length.times do |i|
-          @sprites["panel#{i}"].y += 24 * 2
+          @sprites["panel#{i}"].y += 48
         end
         6.times do |i|
           break if !@sprites["party#{i}"]
-          @sprites["party#{i}"].y += 24 * 2
+          @sprites["party#{i}"].y += 48
         end
-        @sprites["player"].y += 24 * 2 if @sprites["player"]
+        @sprites["player"].y += 48 if @sprites["player"]
       end
     end
   end
@@ -171,15 +171,15 @@ class PokemonLoad_Scene
       @sprites["player"] = TrainerWalkingCharSprite.new(filename, @viewport)
       charwidth  = @sprites["player"].bitmap.width
       charheight = @sprites["player"].bitmap.height
-      @sprites["player"].x        = (56 * 2) - (charwidth / 8)
-      @sprites["player"].y        = (56 * 2) - (charheight / 8)
+      @sprites["player"].x        = 112 - (charwidth / 8)
+      @sprites["player"].y        = 112 - (charheight / 8)
       @sprites["player"].src_rect = Rect.new(0, 0, charwidth / 4, charheight / 4)
     end
     trainer.party.each_with_index do |pkmn, i|
       @sprites["party#{i}"] = PokemonIconSprite.new(pkmn, @viewport)
       @sprites["party#{i}"].setOffset(PictureOrigin::CENTER)
-      @sprites["party#{i}"].x = (167 + (33 * (i % 2))) * 2
-      @sprites["party#{i}"].y = (56 + (25 * (i / 2))) * 2
+      @sprites["party#{i}"].x = 334 + (66 * (i % 2))
+      @sprites["party#{i}"].y = 112 + (50 * (i / 2))
       @sprites["party#{i}"].z = 99999
     end
   end

Data/Scripts/016_UI/015_UI_Options.rb

@@ -193,14 +193,14 @@ class Window_PokemonOption < Window_DrawableCommand
     when EnumOption
       if @options[index].values.length > 1
         totalwidth = 0
-        @options[index].each_value do |value|
+        @options[index].values.each do |value|
           totalwidth += self.contents.text_size(value).width
         end
         spacing = (rect.width - rect.x - optionwidth - totalwidth) / (@options[index].values.length - 1)
         spacing = 0 if spacing < 0
         xpos = optionwidth + rect.x
         ivalue = 0
-        @options[index].each_value do |value|
+        @options[index].values.each do |value|
           pbDrawShadowText(self.contents, xpos, rect.y, optionwidth, rect.height, value,
                            (ivalue == self[index]) ? SEL_VALUE_BASE_COLOR : self.baseColor,
                            (ivalue == self[index]) ? SEL_VALUE_SHADOW_COLOR : self.shadowColor)

Data/Scripts/016_UI/016_UI_ReadyMenu.rb

@@ -71,15 +71,15 @@ class ReadyMenuButton < SpriteWrapper
     self.bitmap.blt(0, 0, @button.bitmap, rect)
     textx = (@command[2]) ? 164 : (GameData::Item.get(@command[0]).is_important?) ? 146 : 124
     textpos = [
-      [@command[1], textx, 16, 2, Color.new(248, 248, 248), Color.new(40, 40, 40), 1]
+      [@command[1], textx, 24, 2, Color.new(248, 248, 248), Color.new(40, 40, 40), 1]
     ]
     if !@command[2] && !GameData::Item.get(@command[0]).is_important?
       qty = $bag.quantity(@command[0])
       if qty > 99
-        textpos.push([_INTL(">99"), 230, 16, 1,
+        textpos.push([_INTL(">99"), 230, 24, 1,
                       Color.new(248, 248, 248), Color.new(40, 40, 40), 1])
       else
-        textpos.push([_INTL("x{1}", qty), 230, 16, 1,
+        textpos.push([_INTL("x{1}", qty), 230, 24, 1,
                       Color.new(248, 248, 248), Color.new(40, 40, 40), 1])
       end
     end

Data/Scripts/016_UI/017_UI_PokemonStorage.rb

@@ -409,7 +409,7 @@ class PokemonBoxSprite < SpriteWrapper
       pbSetSystemFont(@contents)
       widthval = @contents.text_size(boxname).width
       xval = 162 - (widthval / 2)
-      pbDrawShadowText(@contents, xval, 8, widthval, 32,
+      pbDrawShadowText(@contents, xval, 14, widthval, 32,
                        boxname, Color.new(248, 248, 248), Color.new(40, 48, 48))
       @refreshBox = false
     end
@@ -531,7 +531,7 @@ class PokemonBoxPartySprite < SpriteWrapper
     @contents.blt(0, 0, @boxbitmap.bitmap, Rect.new(0, 0, 172, 352))
     pbDrawTextPositions(
       self.bitmap,
-      [[_INTL("Back"), 86, 240, 2, Color.new(248, 248, 248), Color.new(80, 80, 80), 1]]
+      [[_INTL("Back"), 86, 248, 2, Color.new(248, 248, 248), Color.new(80, 80, 80), 1]]
     )
     xvalues = []   # [18, 90, 18, 90, 18, 90]
     yvalues = []   # [2, 18, 66, 82, 130, 146]
@@ -1326,8 +1326,8 @@ class PokemonStorageScene
                                                 @markingbitmap.bitmap, markrect)
         end
         textpos = [
-          [_INTL("OK"), 402, 208, 2, base, shadow, 1],
-          [_INTL("Cancel"), 402, 272, 2, base, shadow, 1]
+          [_INTL("OK"), 402, 216, 2, base, shadow, 1],
+          [_INTL("Cancel"), 402, 280, 2, base, shadow, 1]
         ]
         pbDrawTextPositions(@sprites["markingoverlay"].bitmap, textpos)
         pbMarkingSetArrow(@sprites["arrow"], index)
@@ -1400,8 +1400,8 @@ class PokemonStorageScene
     buttonshadow = Color.new(80, 80, 80)
     pbDrawTextPositions(
       overlay,
-      [[_INTL("Party: {1}", (@storage.party.length rescue 0)), 270, 326, 2, buttonbase, buttonshadow, 1],
-       [_INTL("Exit"), 446, 326, 2, buttonbase, buttonshadow, 1]]
+      [[_INTL("Party: {1}", (@storage.party.length rescue 0)), 270, 334, 2, buttonbase, buttonshadow, 1],
+       [_INTL("Exit"), 446, 334, 2, buttonbase, buttonshadow, 1]]
     )
     pokemon = nil
     if @screen.pbHeldPokemon
@@ -1420,26 +1420,26 @@ class PokemonStorageScene
     nonshadow = Color.new(224, 224, 224)
     pokename = pokemon.name
     textstrings = [
-      [pokename, 10, 2, false, base, shadow]
+      [pokename, 10, 14, false, base, shadow]
     ]
     if !pokemon.egg?
       imagepos = []
       if pokemon.male?
-        textstrings.push([_INTL("♂"), 148, 2, false, Color.new(24, 112, 216), Color.new(136, 168, 208)])
+        textstrings.push([_INTL("♂"), 148, 14, false, Color.new(24, 112, 216), Color.new(136, 168, 208)])
       elsif pokemon.female?
-        textstrings.push([_INTL("♀"), 148, 2, false, Color.new(248, 56, 32), Color.new(224, 152, 144)])
+        textstrings.push([_INTL("♀"), 148, 14, false, Color.new(248, 56, 32), Color.new(224, 152, 144)])
       end
       imagepos.push(["Graphics/Pictures/Storage/overlay_lv", 6, 246])
-      textstrings.push([pokemon.level.to_s, 28, 228, false, base, shadow])
+      textstrings.push([pokemon.level.to_s, 28, 240, false, base, shadow])
       if pokemon.ability
-        textstrings.push([pokemon.ability.name, 86, 300, 2, base, shadow])
+        textstrings.push([pokemon.ability.name, 86, 312, 2, base, shadow])
       else
-        textstrings.push([_INTL("No ability"), 86, 300, 2, nonbase, nonshadow])
+        textstrings.push([_INTL("No ability"), 86, 312, 2, nonbase, nonshadow])
       end
       if pokemon.item
-        textstrings.push([pokemon.item.name, 86, 336, 2, base, shadow])
+        textstrings.push([pokemon.item.name, 86, 348, 2, base, shadow])
       else
-        textstrings.push([_INTL("No item"), 86, 336, 2, nonbase, nonshadow])
+        textstrings.push([_INTL("No item"), 86, 348, 2, nonbase, nonshadow])
       end
       if pokemon.shiny?
         imagepos.push(["Graphics/Pictures/shiny", 156, 198])

Data/Scripts/016_UI/018_UI_ItemStorage.rb

@@ -32,17 +32,17 @@ class Window_PokemonItemStorage < Window_DrawableCommand
     rect = drawCursor(index, rect)
     textpos = []
     if index == @bag.length
-      textpos.push([_INTL("CANCEL"), rect.x, rect.y - 6, false, self.baseColor, self.shadowColor])
+      textpos.push([_INTL("CANCEL"), rect.x, rect.y, false, self.baseColor, self.shadowColor])
     else
       item     = @bag[index][0]
       itemname = @adapter.getDisplayName(item)
       baseColor = (index == @sortIndex) ? Color.new(248, 24, 24) : self.baseColor
-      textpos.push([itemname, rect.x, rect.y - 6, false, self.baseColor, self.shadowColor])
+      textpos.push([itemname, rect.x, rect.y, false, self.baseColor, self.shadowColor])
       if !GameData::Item.get(item).is_important?   # Not a Key item/HM/TM
         qty     = _ISPRINTF("x{1: 2d}", @bag[index][1])
         sizeQty = self.contents.text_size(qty).width
         xQty = rect.x + rect.width - sizeQty - 2
-        textpos.push([qty, xQty, rect.y - 6, false, baseColor, self.shadowColor])
+        textpos.push([qty, xQty, rect.y, false, baseColor, self.shadowColor])
       end
     end
     pbDrawTextPositions(self.contents, textpos)
@@ -90,7 +90,7 @@ class ItemStorage_Scene
     @sprites["pocketwindow"].y = 16
     pbSetNarrowFont(@sprites["pocketwindow"].bitmap)
     # Item description
-    @sprites["itemtextwindow"] = Window_UnformattedTextPokemon.newWithSize("", 84, 270, Graphics.width - 84, 128, @viewport)
+    @sprites["itemtextwindow"] = Window_UnformattedTextPokemon.newWithSize("", 84, 272, Graphics.width - 84, 128, @viewport)
     @sprites["itemtextwindow"].baseColor   = ITEMTEXTBASECOLOR
     @sprites["itemtextwindow"].shadowColor = ITEMTEXTSHADOWCOLOR
     @sprites["itemtextwindow"].windowskin  = nil
@@ -132,7 +132,7 @@ class ItemStorage_Scene
   def pbRefresh
     bm = @sprites["pocketwindow"].bitmap
     # Draw title at upper left corner ("Toss Item/Withdraw Item")
-    drawTextEx(bm, 0, 4, bm.width, 2, @title, TITLEBASECOLOR, TITLESHADOWCOLOR)
+    drawTextEx(bm, 0, 8, bm.width, 2, @title, TITLEBASECOLOR, TITLESHADOWCOLOR)
     itemwindow = @sprites["itemwindow"]
     # Draw item icon
     @sprites["icon"].item = itemwindow.item

Data/Scripts/016_UI/020_UI_PokeMart.rb

@@ -176,15 +176,15 @@ class Window_PokemonMart < Window_DrawableCommand
     rect = drawCursor(index, rect)
     ypos = rect.y
     if index == count - 1
-      textpos.push([_INTL("CANCEL"), rect.x, ypos - 4, false, self.baseColor, self.shadowColor])
+      textpos.push([_INTL("CANCEL"), rect.x, ypos + 2, false, self.baseColor, self.shadowColor])
     else
       item = @stock[index]
       itemname = @adapter.getDisplayName(item)
       qty = @adapter.getDisplayPrice(item)
       sizeQty = self.contents.text_size(qty).width
       xQty = rect.x + rect.width - sizeQty - 2 - 16
-      textpos.push([itemname, rect.x, ypos - 4, false, self.baseColor, self.shadowColor])
-      textpos.push([qty, xQty, ypos - 4, false, self.baseColor, self.shadowColor])
+      textpos.push([itemname, rect.x, ypos + 2, false, self.baseColor, self.shadowColor])
+      textpos.push([qty, xQty, ypos + 2, false, self.baseColor, self.shadowColor])
     end
     pbDrawTextPositions(self.contents, textpos)
   end
@@ -228,7 +228,7 @@ class PokemonMart_Scene
     @sprites["icon"] = ItemIconSprite.new(36, Graphics.height - 50, nil, @viewport)
     winAdapter = buying ? BuyAdapter.new(adapter) : SellAdapter.new(adapter)
     @sprites["itemwindow"] = Window_PokemonMart.new(
-      stock, winAdapter, Graphics.width - 316 - 16, 12, 330 + 16, Graphics.height - 126
+      stock, winAdapter, Graphics.width - 316 - 16, 10, 330 + 16, Graphics.height - 124
     )
     @sprites["itemwindow"].viewport = @viewport
     @sprites["itemwindow"].index = 0

Data/Scripts/016_UI/021_UI_MoveRelearner.rb

@@ -59,24 +59,23 @@ class MoveRelearner_Scene
       overlay.blt(type_x, 70, @typebitmap.bitmap, type_rect)
     end
     textpos = [
-      [_INTL("Teach which move?"), 16, 2, 0, Color.new(88, 88, 80), Color.new(168, 184, 184)]
+      [_INTL("Teach which move?"), 16, 14, 0, Color.new(88, 88, 80), Color.new(168, 184, 184)]
     ]
     imagepos = []
-    yPos = 76
+    yPos = 88
     VISIBLEMOVES.times do |i|
       moveobject = @moves[@sprites["commands"].top_item + i]
       if moveobject
         moveData = GameData::Move.get(moveobject)
         type_number = GameData::Type.get(moveData.display_type(@pokemon)).icon_position
-        imagepos.push(["Graphics/Pictures/types", 12, yPos + 8, 0, type_number * 28, 64, 28])
+        imagepos.push(["Graphics/Pictures/types", 12, yPos - 4, 0, type_number * 28, 64, 28])
         textpos.push([moveData.name, 80, yPos, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)])
+        textpos.push([_INTL("PP"), 112, yPos + 32, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
         if moveData.total_pp > 0
-          textpos.push([_INTL("PP"), 112, yPos + 32, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
           textpos.push([_INTL("{1}/{1}", moveData.total_pp), 230, yPos + 32, 1,
                         Color.new(64, 64, 64), Color.new(176, 176, 176)])
         else
-          textpos.push(["-", 80, yPos, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
-          textpos.push(["--", 228, yPos + 32, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+          textpos.push(["--", 230, yPos + 32, 1, Color.new(64, 64, 64), Color.new(176, 176, 176)])
         end
       end
       yPos += 64
@@ -88,13 +87,13 @@ class MoveRelearner_Scene
     basedamage = selMoveData.display_damage(@pokemon)
     category = selMoveData.display_category(@pokemon)
     accuracy = selMoveData.display_accuracy(@pokemon)
-    textpos.push([_INTL("CATEGORY"), 272, 108, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)])
-    textpos.push([_INTL("POWER"), 272, 140, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)])
+    textpos.push([_INTL("CATEGORY"), 272, 120, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)])
+    textpos.push([_INTL("POWER"), 272, 152, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)])
     textpos.push([basedamage <= 1 ? basedamage == 1 ? "???" : "---" : sprintf("%d", basedamage),
-                  468, 140, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
-    textpos.push([_INTL("ACCURACY"), 272, 172, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)])
+                  468, 152, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+    textpos.push([_INTL("ACCURACY"), 272, 184, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)])
     textpos.push([accuracy == 0 ? "---" : "#{accuracy}%",
-                  468, 172, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
+                  468, 184, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
     pbDrawTextPositions(overlay, textpos)
     imagepos.push(["Graphics/Pictures/category", 436, 116, 0, category * 28, 64, 28])
     if @sprites["commands"].index < @moves.length - 1
@@ -104,7 +103,7 @@ class MoveRelearner_Scene
       imagepos.push(["Graphics/Pictures/reminderButtons", 134, 350, 76, 0, 76, 32])
     end
     pbDrawImagePositions(overlay, imagepos)
-    drawTextEx(overlay, 272, 214, 230, 5, selMoveData.description,
+    drawTextEx(overlay, 272, 216, 230, 5, selMoveData.description,
                Color.new(64, 64, 64), Color.new(176, 176, 176))
   end
 

Data/Scripts/016_UI/022_UI_PurifyChamber.rb

@@ -655,11 +655,9 @@ class Window_PurifyChamberSets < Window_DrawableCommand
     textpos = []
     rect = drawCursor(index, rect)
     if index == @switching
-      textpos.push([(index + 1).to_s, rect.x,
-                    rect.y - 6, false, Color.new(248, 0, 0), self.shadowColor])
+      textpos.push([(index + 1).to_s, rect.x, rect.y, false, Color.new(248, 0, 0), self.shadowColor])
     else
-      textpos.push([(index + 1).to_s, rect.x,
-                    rect.y - 6, false, self.baseColor, self.shadowColor])
+      textpos.push([(index + 1).to_s, rect.x, rect.y, false, self.baseColor, self.shadowColor])
     end
     if @chamber.setCount(index) > 0
       pbDrawGauge(self.contents, Rect.new(rect.x + 16, rect.y + 6, 48, 8),
@@ -949,14 +947,14 @@ class PurifyChamberSetView < SpriteWrapper
       if pkmn.types.length == 1
         textpos.push([_INTL("{1}  Lv.{2}  {3}", pkmn.name, pkmn.level,
                             GameData::Type.get(pkmn.types[0]).name),
-                      2, -6, 0, Color.new(248, 248, 248), Color.new(128, 128, 128)])
+                      2, 6, 0, Color.new(248, 248, 248), Color.new(128, 128, 128)])
       else
         textpos.push([_INTL("{1}  Lv.{2}  {3}/{4}", pkmn.name, pkmn.level,
                             GameData::Type.get(pkmn.types[0]).name,
                             GameData::Type.get(pkmn.types[1]).name),
-                      2, -6, 0, Color.new(248, 248, 248), Color.new(128, 128, 128)])
+                      2, 6, 0, Color.new(248, 248, 248), Color.new(128, 128, 128)])
       end
-      textpos.push([_INTL("FLOW"), 2 + (@info.bitmap.width / 2), 18, 0,
+      textpos.push([_INTL("FLOW"), 2 + (@info.bitmap.width / 2), 30, 0,
                     Color.new(248, 248, 248), Color.new(128, 128, 128)])
       # draw heart gauge
       pbDrawGauge(@info.bitmap, Rect.new(@info.bitmap.width * 3 / 4, 8, @info.bitmap.width * 1 / 4, 8),
@@ -966,7 +964,7 @@ class PurifyChamberSetView < SpriteWrapper
                   Color.new(0, 0, 248), @chamber.chamberFlow(@set), 6)
     end
     if @chamber.setCount(@set) > 0
-      textpos.push([_INTL("TEMPO"), 2, 18, 0,
+      textpos.push([_INTL("TEMPO"), 2, 30, 0,
                     Color.new(248, 248, 248), Color.new(128, 128, 128)])
       # draw tempo gauge
       pbDrawGauge(@info.bitmap, Rect.new(@info.bitmap.width * 1 / 4, 24 + 8, @info.bitmap.width * 1 / 4, 8),

Data/Scripts/016_UI/024_UI_TextEntry.rb

@@ -151,9 +151,9 @@ class PokemonEntryScene
         pbSetSystemFont(@sprites["gender"].bitmap)
         textpos = []
         if pokemon.male?
-          textpos.push([_INTL("♂"), 0, -6, false, Color.new(0, 128, 248), Color.new(168, 184, 184)])
+          textpos.push([_INTL("♂"), 0, 6, false, Color.new(0, 128, 248), Color.new(168, 184, 184)])
         elsif pokemon.female?
-          textpos.push([_INTL("♀"), 0, -6, false, Color.new(248, 24, 24), Color.new(168, 184, 184)])
+          textpos.push([_INTL("♀"), 0, 6, false, Color.new(248, 24, 24), Color.new(168, 184, 184)])
         end
         pbDrawTextPositions(@sprites["gender"].bitmap, textpos)
       end
@@ -389,7 +389,7 @@ class PokemonEntryScene2
       COLUMNS.times do |y|
         ROWS.times do |x|
           pos = (y * ROWS) + x
-          textPos.push([@@Characters[i][0][pos], 44 + (x * 32), 12 + (y * 38), 2,
+          textPos.push([@@Characters[i][0][pos], 44 + (x * 32), 24 + (y * 38), 2,
                         Color.new(16, 24, 32), Color.new(160, 160, 160)])
         end
       end
@@ -436,9 +436,9 @@ class PokemonEntryScene2
         pbSetSystemFont(@sprites["gender"].bitmap)
         textpos = []
         if pokemon.male?
-          textpos.push([_INTL("♂"), 0, -6, false, Color.new(0, 128, 248), Color.new(168, 184, 184)])
+          textpos.push([_INTL("♂"), 0, 6, false, Color.new(0, 128, 248), Color.new(168, 184, 184)])
         elsif pokemon.female?
-          textpos.push([_INTL("♀"), 0, -6, false, Color.new(248, 24, 24), Color.new(168, 184, 184)])
+          textpos.push([_INTL("♀"), 0, 6, false, Color.new(248, 24, 24), Color.new(168, 184, 184)])
         end
         pbDrawTextPositions(@sprites["gender"].bitmap, textpos)
       end
@@ -513,12 +513,12 @@ class PokemonEntryScene2
     bgoverlay.clear
     pbSetSystemFont(bgoverlay)
     textPositions = [
-      [@helptext, 160, 6, false, Color.new(16, 24, 32), Color.new(168, 184, 184)]
+      [@helptext, 160, 18, false, Color.new(16, 24, 32), Color.new(168, 184, 184)]
     ]
     chars = @helper.textChars
     x = 166
     chars.each do |ch|
-      textPositions.push([ch, x, 42, false, Color.new(16, 24, 32), Color.new(168, 184, 184)])
+      textPositions.push([ch, x, 54, false, Color.new(16, 24, 32), Color.new(168, 184, 184)])
       x += 24
     end
     pbDrawTextPositions(bgoverlay, textPositions)