DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-03-22 07:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Created folder Graphics/UI, renamed some UI graphics

Browse Source
This commit is contained in:
Maruno17
2022-08-14 01:07:06 +01:00
parent b1cde2db42
commit ae91811537
50 changed files with 311 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/001_Settings.rb
View File

@@ -246,11 +246,11 @@ module Settings
# * Game Switch; the graphic is shown if this is ON (non-wall maps only). # * Game Switch; the graphic is shown if this is ON (non-wall maps only).
# * X coordinate of the graphic on the map, in squares. # * X coordinate of the graphic on the map, in squares.
# * Y coordinate of the graphic on the map, in squares. # * Y coordinate of the graphic on the map, in squares.
# * Name of the graphic, found in the Graphics/Pictures folder. # * Name of the graphic, found in the Graphics/UI/Town Map folder.
# * The graphic will always (true) or never (false) be shown on a wall map. # * The graphic will always (true) or never (false) be shown on a wall map.
REGION_MAP_EXTRAS = [ REGION_MAP_EXTRAS = [
[0, 51, 16, 15, "mapHiddenBerth", false], [0, 51, 16, 15, "hidden_Berth", false],
[0, 52, 20, 14, "mapHiddenFaraday", false] [0, 52, 20, 14, "hidden_Faraday", false]
] ]
# Whether the player can use Fly while looking at the Town Map. This is only # Whether the player can use Fly while looking at the Town Map. This is only

4
Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb
View File

@@ -196,7 +196,7 @@ end
def getPassabilityMinimap(mapid) def getPassabilityMinimap(mapid)
map = load_data(sprintf("Data/Map%03d.rxdata", mapid)) map = load_data(sprintf("Data/Map%03d.rxdata", mapid))
tileset = $data_tilesets[map.tileset_id] tileset = $data_tilesets[map.tileset_id]
minimap = AnimatedBitmap.new("Graphics/Pictures/minimap_tiles") minimap = AnimatedBitmap.new("Graphics/UI/minimap_tiles")
ret = Bitmap.new(map.width * 6, map.height * 6) ret = Bitmap.new(map.width * 6, map.height * 6)
passtable = Table.new(map.width, map.height) passtable = Table.new(map.width, map.height)
passages = tileset.passages passages = tileset.passages
@@ -221,6 +221,6 @@ def getPassabilityMinimap(mapid)
bltMinimapAutotile(ret, i * 6, j * 6, minimap.bitmap, tile) bltMinimapAutotile(ret, i * 6, j * 6, minimap.bitmap, tile)
end end
end end
minimap.disposes minimap.dispose
return ret return ret
end end

4
Data/Scripts/007_Objects and windows/001_RPG_Cache.rb
View File

@@ -86,6 +86,10 @@ module RPG
self.load_bitmap("Graphics/Transitions/", filename) self.load_bitmap("Graphics/Transitions/", filename)
end end
def self.ui(filename)
self.load_bitmap("Graphics/UI/", filename)
end
def self.retain(folder_name, filename = "", hue = 0) def self.retain(folder_name, filename = "", hue = 0)
path = folder_name + filename path = folder_name + filename
ret = fromCache(path) ret = fromCache(path)

8
Data/Scripts/007_Objects and windows/002_MessageConfig.rb
View File

@@ -717,12 +717,12 @@ end
#=============================================================================== #===============================================================================
# Adds a background to the sprite hash. # Adds a background to the sprite hash.
# _planename_ is the hash key of the background. # _planename_ is the hash key of the background.
# _background_ is a filename within the Graphics/Pictures/ folder and can be # _background_ is a filename within the Graphics/UI/ folder and can be
# an animated image. # an animated image.
# _viewport_ is a viewport to place the background in. # _viewport_ is a viewport to place the background in.
def addBackgroundPlane(sprites, planename, background, viewport = nil) def addBackgroundPlane(sprites, planename, background, viewport = nil)
sprites[planename] = AnimatedPlane.new(viewport) sprites[planename] = AnimatedPlane.new(viewport)
bitmapName = pbResolveBitmap("Graphics/Pictures/#{background}") bitmapName = pbResolveBitmap("Graphics/UI/#{background}")
if bitmapName.nil? if bitmapName.nil?
# Plane should exist in any case # Plane should exist in any case
sprites[planename].bitmap = nil sprites[planename].bitmap = nil
@@ -739,12 +739,12 @@ end
# Adds a background to the sprite hash. # Adds a background to the sprite hash.
# _planename_ is the hash key of the background. # _planename_ is the hash key of the background.
# _background_ is a filename within the Graphics/Pictures/ folder and can be # _background_ is a filename within the Graphics/UI/ folder and can be
# an animated image. # an animated image.
# _color_ is the color to use if the background can't be found. # _color_ is the color to use if the background can't be found.
# _viewport_ is a viewport to place the background in. # _viewport_ is a viewport to place the background in.
def addBackgroundOrColoredPlane(sprites, planename, background, color, viewport = nil) def addBackgroundOrColoredPlane(sprites, planename, background, color, viewport = nil)
bitmapName = pbResolveBitmap("Graphics/Pictures/#{background}") bitmapName = pbResolveBitmap("Graphics/UI/#{background}")
if bitmapName.nil? if bitmapName.nil?
# Plane should exist in any case # Plane should exist in any case
sprites[planename] = ColoredPlane.new(color, viewport) sprites[planename] = ColoredPlane.new(color, viewport)

18
Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb
View File

@@ -417,7 +417,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
def allocPause def allocPause
return if @pausesprite return if @pausesprite
@pausesprite = AnimatedSprite.create("Graphics/Pictures/pause", 4, 3) @pausesprite = AnimatedSprite.create("Graphics/UI/pause_arrow", 4, 3)
@pausesprite.z = 100000 @pausesprite.z = 100000
@pausesprite.visible = false @pausesprite.visible = false
end end
@@ -958,10 +958,10 @@ end
#=============================================================================== #===============================================================================
module UpDownArrowMixin module UpDownArrowMixin
def initUpDownArrow def initUpDownArrow
@uparrow = AnimatedSprite.create("Graphics/Pictures/uparrow", 8, 2, self.viewport) @uparrow = AnimatedSprite.create("Graphics/UI/up_arrow", 8, 2, self.viewport)
@downarrow = AnimatedSprite.create("Graphics/Pictures/downarrow", 8, 2, self.viewport) @downarrow = AnimatedSprite.create("Graphics/UI/down_arrow", 8, 2, self.viewport)
RPG::Cache.retain("Graphics/Pictures/uparrow") RPG::Cache.retain("Graphics/UI/up_arrow")
RPG::Cache.retain("Graphics/Pictures/downarrow") RPG::Cache.retain("Graphics/UI/down_arrow")
@uparrow.z = 99998 @uparrow.z = 99998
@downarrow.z = 99998 @downarrow.z = 99998
@uparrow.visible = false @uparrow.visible = false
@@ -1043,11 +1043,11 @@ class Window_DrawableCommand < SpriteWindow_SelectableEx
super(x, y, width, height) super(x, y, width, height)
self.viewport = viewport if viewport self.viewport = viewport if viewport
if isDarkWindowskin(self.windowskin) if isDarkWindowskin(self.windowskin)
@selarrow = AnimatedBitmap.new("Graphics/Pictures/selarrow_white") @selarrow = AnimatedBitmap.new("Graphics/UI/sel_arrow_white")
RPG::Cache.retain("Graphics/Pictures/selarrow_white") RPG::Cache.retain("Graphics/UI/sel_arrow_white")
else else
@selarrow = AnimatedBitmap.new("Graphics/Pictures/selarrow") @selarrow = AnimatedBitmap.new("Graphics/UI/sel_arrow")
RPG::Cache.retain("Graphics/Pictures/selarrow") RPG::Cache.retain("Graphics/UI/sel_arrow")
end end
@index = 0 @index = 0
colors = getDefaultTextColors(self.windowskin) colors = getDefaultTextColors(self.windowskin)

2
Data/Scripts/010_Data/001_Hardcoded data/004_BodyShape.rb
View File

@@ -1,6 +1,6 @@
# NOTE: The order these shapes are registered are the order they are listed in # NOTE: The order these shapes are registered are the order they are listed in
# the Pokédex search screen. # the Pokédex search screen.
# "Graphics/Pictures/Pokedex/icon_shapes.png" contains icons for these # "Graphics/UI/Pokedex/icon_shapes.png" contains icons for these
# shapes. # shapes.
module GameData module GameData
class BodyShape class BodyShape

8
Data/Scripts/010_Data/001_Hardcoded data/010_Status.rb
View File

@@ -1,7 +1,7 @@
# NOTE: "Graphics/Pictures/statuses.png" also contains icons for being fainted # NOTE: "Graphics/UI/statuses.png" also contains icons for being fainted and for
# and for having Pokérus, in that order, at the bottom of the graphic. # having Pokérus, in that order, at the bottom of the graphic.
# "Graphics/Pictures/Battle/icon_statuses.png" also contains an icon for # "Graphics/UI/Battle/icon_statuses.png" also contains an icon for bad
# bad poisoning (toxic), at the bottom of the graphic. # poisoning (toxic), at the bottom of the graphic.
# Both graphics automatically handle varying numbers of defined statuses, # Both graphics automatically handle varying numbers of defined statuses,
# as long as their extra icons remain at the bottom of them. # as long as their extra icons remain at the bottom of them.
module GameData module GameData

6
Data/Scripts/010_Data/002_PBS data/006_Item.rb
View File

@@ -67,16 +67,16 @@ module GameData
return nil if !item_data return nil if !item_data
name_base = (item_data.is_mail?) ? "mail" : "item" name_base = (item_data.is_mail?) ? "mail" : "item"
# Check for files # Check for files
ret = sprintf("Graphics/Pictures/Party/icon_%s_%s", name_base, item_data.id) ret = sprintf("Graphics/UI/Party/icon_%s_%s", name_base, item_data.id)
return ret if pbResolveBitmap(ret) return ret if pbResolveBitmap(ret)
return sprintf("Graphics/Pictures/Party/icon_%s", name_base) return sprintf("Graphics/UI/Party/icon_%s", name_base)
end end
def self.mail_filename(item) def self.mail_filename(item)
item_data = self.try_get(item) item_data = self.try_get(item)
return nil if !item_data return nil if !item_data
# Check for files # Check for files
ret = sprintf("Graphics/Pictures/Mail/mail_%s", item_data.id) ret = sprintf("Graphics/UI/Mail/mail_%s", item_data.id)
return pbResolveBitmap(ret) ? ret : nil return pbResolveBitmap(ret) ? ret : nil
end end

4
Data/Scripts/010_Data/002_PBS data/014_TrainerType.rb
View File

@@ -71,12 +71,12 @@ module GameData
end end
def self.map_icon_filename(tr_type) def self.map_icon_filename(tr_type)
return self.check_file(tr_type, "Graphics/Pictures/mapPlayer") return self.check_file(tr_type, "Graphics/UI/Town Map/player_")
end end
def self.player_map_icon_filename(tr_type) def self.player_map_icon_filename(tr_type)
outfit = ($player) ? $player.outfit : 0 outfit = ($player) ? $player.outfit : 0
return self.check_file(tr_type, "Graphics/Pictures/mapPlayer", sprintf("_%d", outfit)) return self.check_file(tr_type, "Graphics/UI/Town Map/player_", sprintf("_%d", outfit))
end end
def initialize(hash) def initialize(hash)

4
Data/Scripts/011_Battle/004_Scene/002_Scene_Initialize.rb
View File

@@ -28,7 +28,7 @@ class Battle::Scene
pbCreateBackdropSprites pbCreateBackdropSprites
# Create message box graphic # Create message box graphic
messageBox = pbAddSprite("messageBox", 0, Graphics.height - 96, messageBox = pbAddSprite("messageBox", 0, Graphics.height - 96,
"Graphics/Pictures/Battle/overlay_message", @viewport) "Graphics/UI/Battle/overlay_message", @viewport)
messageBox.z = 195 messageBox.z = 195
# Create message window (displays the message) # Create message window (displays the message)
msgWindow = Window_AdvancedTextPokemon.newWithSize( msgWindow = Window_AdvancedTextPokemon.newWithSize(
@@ -50,7 +50,7 @@ class Battle::Scene
# The party lineup graphics (bar and balls) for both sides # The party lineup graphics (bar and balls) for both sides
2.times do |side| 2.times do |side|
partyBar = pbAddSprite("partyBar_#{side}", 0, 0, partyBar = pbAddSprite("partyBar_#{side}", 0, 0,
"Graphics/Pictures/Battle/overlay_lineup", @viewport) "Graphics/UI/Battle/overlay_lineup", @viewport)
partyBar.z = 120 partyBar.z = 120
partyBar.mirror = true if side == 0 # Player's lineup bar only partyBar.mirror = true if side == 0 # Player's lineup bar only
partyBar.visible = false partyBar.visible = false

28
Data/Scripts/011_Battle/004_Scene/005_Battle_Scene_Menus.rb
View File

@@ -97,10 +97,10 @@ end
# Command menu (Fight/Pokémon/Bag/Run) # Command menu (Fight/Pokémon/Bag/Run)
#=============================================================================== #===============================================================================
class Battle::Scene::CommandMenu < Battle::Scene::MenuBase class Battle::Scene::CommandMenu < Battle::Scene::MenuBase
# If true, displays graphics from Graphics/Pictures/Battle/overlay_command.png # If true, displays graphics from Graphics/UI/Battle/overlay_command.png
# and Graphics/Pictures/Battle/cursor_command.png. # and Graphics/UI/Battle/cursor_command.png.
# If false, just displays text and the command window over the graphic # If false, just displays text and the command window over the graphic
# Graphics/Pictures/Battle/overlay_message.png. You will need to edit def # Graphics/UI/Battle/overlay_message.png. You will need to edit def
# pbShowWindow to make the graphic appear while the command menu is being # pbShowWindow to make the graphic appear while the command menu is being
# displayed. # displayed.
USE_GRAPHICS = true USE_GRAPHICS = true
@@ -128,10 +128,10 @@ class Battle::Scene::CommandMenu < Battle::Scene::MenuBase
if USE_GRAPHICS if USE_GRAPHICS
# Create background graphic # Create background graphic
background = IconSprite.new(self.x, self.y, viewport) background = IconSprite.new(self.x, self.y, viewport)
background.setBitmap("Graphics/Pictures/Battle/overlay_command") background.setBitmap("Graphics/UI/Battle/overlay_command")
addSprite("background", background) addSprite("background", background)
# Create bitmaps # Create bitmaps
@buttonBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/cursor_command")) @buttonBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Battle/cursor_command"))
# Create action buttons # Create action buttons
@buttons = Array.new(4) do |i| # 4 command options, therefore 4 buttons @buttons = Array.new(4) do |i| # 4 command options, therefore 4 buttons
button = Sprite.new(viewport) button = Sprite.new(viewport)
@@ -205,10 +205,10 @@ class Battle::Scene::FightMenu < Battle::Scene::MenuBase
GET_MOVE_TEXT_COLOR_FROM_MOVE_BUTTON = true GET_MOVE_TEXT_COLOR_FROM_MOVE_BUTTON = true
# If true, displays graphics from Graphics/Pictures/Battle/overlay_fight.png # If true, displays graphics from Graphics/UI/Battle/overlay_fight.png
# and Graphics/Pictures/Battle/cursor_fight.png. # and Graphics/UI/Battle/cursor_fight.png.
# If false, just displays text and the command window over the graphic # If false, just displays text and the command window over the graphic
# Graphics/Pictures/Battle/overlay_message.png. You will need to edit def # Graphics/UI/Battle/overlay_message.png. You will need to edit def
# pbShowWindow to make the graphic appear while the command menu is being # pbShowWindow to make the graphic appear while the command menu is being
# displayed. # displayed.
USE_GRAPHICS = true USE_GRAPHICS = true
@@ -231,13 +231,13 @@ class Battle::Scene::FightMenu < Battle::Scene::MenuBase
# 0=don't show, 1=show unpressed, 2=show pressed # 0=don't show, 1=show unpressed, 2=show pressed
if USE_GRAPHICS if USE_GRAPHICS
# Create bitmaps # Create bitmaps
@buttonBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/cursor_fight")) @buttonBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Battle/cursor_fight"))
@typeBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) @typeBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types"))
@megaEvoBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/cursor_mega")) @megaEvoBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Battle/cursor_mega"))
@shiftBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/cursor_shift")) @shiftBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Battle/cursor_shift"))
# Create background graphic # Create background graphic
background = IconSprite.new(0, Graphics.height - 96, viewport) background = IconSprite.new(0, Graphics.height - 96, viewport)
background.setBitmap("Graphics/Pictures/Battle/overlay_fight") background.setBitmap("Graphics/UI/Battle/overlay_fight")
addSprite("background", background) addSprite("background", background)
# Create move buttons # Create move buttons
@buttons = Array.new(Pokemon::MAX_MOVES) do |i| @buttons = Array.new(Pokemon::MAX_MOVES) do |i|
@@ -472,7 +472,7 @@ class Battle::Scene::TargetMenu < Battle::Scene::MenuBase
# NOTE: @mode is for which buttons are shown as selected. # NOTE: @mode is for which buttons are shown as selected.
# 0=select 1 button (@index), 1=select all buttons with text # 0=select 1 button (@index), 1=select all buttons with text
# Create bitmaps # Create bitmaps
@buttonBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/cursor_target") @buttonBitmap = AnimatedBitmap.new("Graphics/UI/Battle/cursor_target")
# Create target buttons # Create target buttons
@buttons = Array.new(maxIndex + 1) do |i| @buttons = Array.new(maxIndex + 1) do |i|
numButtons = @sideSizes[i % 2] numButtons = @sideSizes[i % 2]

30
Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
View File

@@ -42,15 +42,15 @@ class Battle::Scene::PokemonDataBox < Sprite
onPlayerSide = @battler.index.even? onPlayerSide = @battler.index.even?
# Get the data box graphic and set whether the HP numbers/Exp bar are shown # Get the data box graphic and set whether the HP numbers/Exp bar are shown
if sideSize == 1 # One Pokémon on side, use the regular dara box BG if sideSize == 1 # One Pokémon on side, use the regular dara box BG
bgFilename = ["Graphics/Pictures/Battle/databox_normal", bgFilename = ["Graphics/UI/Battle/databox_normal",
"Graphics/Pictures/Battle/databox_normal_foe"][@battler.index % 2] "Graphics/UI/Battle/databox_normal_foe"][@battler.index % 2]
if onPlayerSide if onPlayerSide
@showHP = true @showHP = true
@showExp = true @showExp = true
end end
else # Multiple Pokémon on side, use the thin dara box BG else # Multiple Pokémon on side, use the thin dara box BG
bgFilename = ["Graphics/Pictures/Battle/databox_thin", bgFilename = ["Graphics/UI/Battle/databox_thin",
"Graphics/Pictures/Battle/databox_thin_foe"][@battler.index % 2] "Graphics/UI/Battle/databox_thin_foe"][@battler.index % 2]
end end
@databoxBitmap&.dispose @databoxBitmap&.dispose
@databoxBitmap = AnimatedBitmap.new(bgFilename) @databoxBitmap = AnimatedBitmap.new(bgFilename)
@@ -76,9 +76,9 @@ class Battle::Scene::PokemonDataBox < Sprite
def initializeOtherGraphics(viewport) def initializeOtherGraphics(viewport)
# Create other bitmaps # Create other bitmaps
@numbersBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/icon_numbers") @numbersBitmap = AnimatedBitmap.new("Graphics/UI/Battle/icon_numbers")
@hpBarBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/overlay_hp") @hpBarBitmap = AnimatedBitmap.new("Graphics/UI/Battle/overlay_hp")
@expBarBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/overlay_exp") @expBarBitmap = AnimatedBitmap.new("Graphics/UI/Battle/overlay_exp")
# Create sprite to draw HP numbers on # Create sprite to draw HP numbers on
@hpNumbers = BitmapSprite.new(124, 16, viewport) @hpNumbers = BitmapSprite.new(124, 16, viewport)
# pbSetSmallFont(@hpNumbers.bitmap) # pbSetSmallFont(@hpNumbers.bitmap)
@@ -221,7 +221,7 @@ class Battle::Scene::PokemonDataBox < Sprite
def draw_level def draw_level
# "Lv" graphic # "Lv" graphic
pbDrawImagePositions(self.bitmap, pbDrawImagePositions(self.bitmap,
[["Graphics/Pictures/Battle/overlay_lv", @spriteBaseX + 140, 16]] [["Graphics/UI/Battle/overlay_lv", @spriteBaseX + 140, 16]]
) )
# Level number # Level number
pbDrawNumber(@battler.level, self.bitmap, @spriteBaseX + 162, 16) pbDrawNumber(@battler.level, self.bitmap, @spriteBaseX + 162, 16)
@@ -244,26 +244,26 @@ class Battle::Scene::PokemonDataBox < Sprite
s = GameData::Status.get(@battler.status).icon_position s = GameData::Status.get(@battler.status).icon_position
end end
return if s < 0 return if s < 0
pbDrawImagePositions(self.bitmap, [["Graphics/Pictures/Battle/icon_statuses", @spriteBaseX + 24, 36, pbDrawImagePositions(self.bitmap, [["Graphics/UI/Battle/icon_statuses", @spriteBaseX + 24, 36,
0, s * STATUS_ICON_HEIGHT, -1, STATUS_ICON_HEIGHT]]) 0, s * STATUS_ICON_HEIGHT, -1, STATUS_ICON_HEIGHT]])
end end
def draw_shiny_icon def draw_shiny_icon
return if !@battler.shiny? return if !@battler.shiny?
shiny_x = (@battler.opposes?(0)) ? 206 : -6 # Foe's/player's shiny_x = (@battler.opposes?(0)) ? 206 : -6 # Foe's/player's
pbDrawImagePositions(self.bitmap, [["Graphics/Pictures/shiny", @spriteBaseX + shiny_x, 36]]) pbDrawImagePositions(self.bitmap, [["Graphics/UI/shiny", @spriteBaseX + shiny_x, 36]])
end end
def draw_special_form_icon def draw_special_form_icon
# Mega Evolution/Primal Reversion icon # Mega Evolution/Primal Reversion icon
if @battler.mega? if @battler.mega?
pbDrawImagePositions(self.bitmap, [["Graphics/Pictures/Battle/icon_mega", @spriteBaseX + 8, 34]]) pbDrawImagePositions(self.bitmap, [["Graphics/UI/Battle/icon_mega", @spriteBaseX + 8, 34]])
elsif @battler.primal? elsif @battler.primal?
filename = nil filename = nil
if @battler.isSpecies?(:GROUDON) if @battler.isSpecies?(:GROUDON)
filename = "Graphics/Pictures/Battle/icon_primal_Groudon" filename = "Graphics/UI/Battle/icon_primal_Groudon"
elsif @battler.isSpecies?(:KYOGRE) elsif @battler.isSpecies?(:KYOGRE)
filename = "Graphics/Pictures/Battle/icon_primal_Kyogre" filename = "Graphics/UI/Battle/icon_primal_Kyogre"
end end
primalX = (@battler.opposes?) ? 208 : -28 # Foe's/player's primalX = (@battler.opposes?) ? 208 : -28 # Foe's/player's
pbDrawImagePositions(self.bitmap, [[filename, @spriteBaseX + primalX, 4]]) if filename pbDrawImagePositions(self.bitmap, [[filename, @spriteBaseX + primalX, 4]]) if filename
@@ -272,7 +272,7 @@ class Battle::Scene::PokemonDataBox < Sprite
def draw_owned_icon def draw_owned_icon
return if !@battler.owned? || !@battler.opposes?(0) # Draw for foe Pokémon only return if !@battler.owned? || !@battler.opposes?(0) # Draw for foe Pokémon only
pbDrawImagePositions(self.bitmap, [["Graphics/Pictures/Battle/icon_own", @spriteBaseX + 8, 36]]) pbDrawImagePositions(self.bitmap, [["Graphics/UI/Battle/icon_own", @spriteBaseX + 8, 36]])
end end
def refresh def refresh
@@ -418,7 +418,7 @@ class Battle::Scene::AbilitySplashBar < Sprite
@side = side @side = side
@battler = nil @battler = nil
# Create sprite wrapper that displays background graphic # Create sprite wrapper that displays background graphic
@bgBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/ability_bar") @bgBitmap = AnimatedBitmap.new("Graphics/UI/Battle/ability_bar")
@bgSprite = Sprite.new(viewport) @bgSprite = Sprite.new(viewport)
@bgSprite.bitmap = @bgBitmap.bitmap @bgSprite.bitmap = @bgBitmap.bitmap
@bgSprite.src_rect.y = (side == 0) ? 0 : @bgBitmap.height / 2 @bgSprite.src_rect.y = (side == 0) ? 0 : @bgBitmap.height / 2

8
Data/Scripts/011_Battle/004_Scene/008_Battle_Scene_Animations.rb
View File

@@ -162,14 +162,14 @@ class Battle::Scene::Animation::LineupAppear < Battle::Scene::Animation
def createBall(idxBall, delay, dir) def createBall(idxBall, delay, dir)
# Choose ball's graphic # Choose ball's graphic
idxParty = getPartyIndexFromBallIndex(idxBall) idxParty = getPartyIndexFromBallIndex(idxBall)
graphicFilename = "Graphics/Pictures/Battle/icon_ball_empty" graphicFilename = "Graphics/UI/Battle/icon_ball_empty"
if idxParty >= 0 && idxParty < @party.length && @party[idxParty] if idxParty >= 0 && idxParty < @party.length && @party[idxParty]
if !@party[idxParty].able? if !@party[idxParty].able?
graphicFilename = "Graphics/Pictures/Battle/icon_ball_faint" graphicFilename = "Graphics/UI/Battle/icon_ball_faint"
elsif @party[idxParty].status != :NONE elsif @party[idxParty].status != :NONE
graphicFilename = "Graphics/Pictures/Battle/icon_ball_status" graphicFilename = "Graphics/UI/Battle/icon_ball_status"
else else
graphicFilename = "Graphics/Pictures/Battle/icon_ball" graphicFilename = "Graphics/UI/Battle/icon_ball"
end end
end end
# Set up ball sprite # Set up ball sprite

2
Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb
View File

@@ -66,7 +66,7 @@ class Battle::Scene::SafariDataBox < Sprite
super(viewport) super(viewport)
@selected = 0 @selected = 0
@battle = battle @battle = battle
@databox = AnimatedBitmap.new("Graphics/Pictures/Battle/databox_safari") @databox = AnimatedBitmap.new("Graphics/UI/Battle/databox_safari")
self.x = Graphics.width - 232 self.x = Graphics.width - 232
self.y = Graphics.height - 184 self.y = Graphics.height - 184
@contents = BitmapWrapper.new(@databox.width, @databox.height) @contents = BitmapWrapper.new(@databox.width, @databox.height)

4
Data/Scripts/011_Battle/007_Other battle types/004_BattleArenaBattle.rb
View File

@@ -256,9 +256,9 @@ class Battle::Scene
phase.times do |i| phase.times do |i|
y = [48, 80, 112][i] y = [48, 80, 112][i]
x = (ratings1[i] == ratings2[i]) ? 64 : ((ratings1[i] > ratings2[i]) ? 0 : 32) x = (ratings1[i] == ratings2[i]) ? 64 : ((ratings1[i] > ratings2[i]) ? 0 : 32)
images.push(["Graphics/Pictures/judgment", 64 - 16, y, x, 0, 32, 32]) images.push(["Graphics/UI/Battle/judgment", 64 - 16, y, x, 0, 32, 32])
x = (ratings1[i] == ratings2[i]) ? 64 : ((ratings1[i] < ratings2[i]) ? 0 : 32) x = (ratings1[i] == ratings2[i]) ? 64 : ((ratings1[i] < ratings2[i]) ? 0 : 32)
images.push(["Graphics/Pictures/judgment", 224 - 16, y, x, 0, 32, 32]) images.push(["Graphics/UI/Battle/judgment", 224 - 16, y, x, 0, 32, 32])
end end
pbDrawImagePositions(window.contents, images) pbDrawImagePositions(window.contents, images)
window.contents.fill_rect(16, 150, 256, 4, Color.new(80, 80, 80)) window.contents.fill_rect(16, 150, 256, 4, Color.new(80, 80, 80))

4
Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
View File

@@ -72,13 +72,13 @@ def pbHiddenMoveAnimation(pokemon)
viewport = Viewport.new(0, 0, 0, 0) viewport = Viewport.new(0, 0, 0, 0)
viewport.z = 99999 viewport.z = 99999
bg = Sprite.new(viewport) bg = Sprite.new(viewport)
bg.bitmap = RPG::Cache.picture("hiddenMovebg") bg.bitmap = RPG::Cache.ui("Field move/bg")
sprite = PokemonSprite.new(viewport) sprite = PokemonSprite.new(viewport)
sprite.setOffset(PictureOrigin::CENTER) sprite.setOffset(PictureOrigin::CENTER)
sprite.setPokemonBitmap(pokemon) sprite.setPokemonBitmap(pokemon)
sprite.z = 1 sprite.z = 1
sprite.visible = false sprite.visible = false
strobebitmap = AnimatedBitmap.new("Graphics/Pictures/hiddenMoveStrobes") strobebitmap = AnimatedBitmap.new("Graphics/UI/Field move/strobes")
strobes = [] strobes = []
15.times do |i| 15.times do |i|
strobe = BitmapSprite.new(52, 16, viewport) strobe = BitmapSprite.new(52, 16, viewport)

2
Data/Scripts/013_Items/006_Item_Mail.rb
View File

@@ -32,7 +32,7 @@ def pbDisplayMail(mail, _bearer = nil)
sprites = {} sprites = {}
viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
viewport.z = 99999 viewport.z = 99999
addBackgroundPlane(sprites, "background", "mailbg", viewport) addBackgroundPlane(sprites, "background", "Mail/bg", viewport)
sprites["card"] = IconSprite.new(0, 0, viewport) sprites["card"] = IconSprite.new(0, 0, viewport)
sprites["card"].setBitmap(GameData::Item.mail_filename(mail.item)) sprites["card"].setBitmap(GameData::Item.mail_filename(mail.item))
sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, viewport) sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, viewport)

16
Data/Scripts/016_UI/001_Non-interactive UI/002_UI_Controls.rb
View File

@@ -10,27 +10,27 @@ class ButtonEventScene < EventScene
super super
Graphics.freeze Graphics.freeze
@current_screen = 1 @current_screen = 1
addImage(0, 0, "Graphics/Pictures/Controls help/help_bg") addImage(0, 0, "Graphics/UI/Controls help/bg")
@labels = [] @labels = []
@label_screens = [] @label_screens = []
@keys = [] @keys = []
@key_screens = [] @key_screens = []
addImageForScreen(1, 44, 122, "Graphics/Pictures/Controls help/help_f1") addImageForScreen(1, 44, 122, "Graphics/UI/Controls help/help_f1")
addImageForScreen(1, 44, 252, "Graphics/Pictures/Controls help/help_f8") addImageForScreen(1, 44, 252, "Graphics/UI/Controls help/help_f8")
addLabelForScreen(1, 134, 84, 352, _INTL("Opens the Key Bindings window, where you can choose which keyboard keys to use for each control.")) addLabelForScreen(1, 134, 84, 352, _INTL("Opens the Key Bindings window, where you can choose which keyboard keys to use for each control."))
addLabelForScreen(1, 134, 244, 352, _INTL("Take a screenshot. It is put in the same folder as the save file.")) addLabelForScreen(1, 134, 244, 352, _INTL("Take a screenshot. It is put in the same folder as the save file."))
addImageForScreen(2, 16, 158, "Graphics/Pictures/Controls help/help_arrows") addImageForScreen(2, 16, 158, "Graphics/UI/Controls help/help_arrows")
addLabelForScreen(2, 134, 100, 352, _INTL("Use the Arrow keys to move the main character.\r\n\r\nYou can also use the Arrow keys to select entries and navigate menus.")) addLabelForScreen(2, 134, 100, 352, _INTL("Use the Arrow keys to move the main character.\r\n\r\nYou can also use the Arrow keys to select entries and navigate menus."))
addImageForScreen(3, 16, 90, "Graphics/Pictures/Controls help/help_usekey") addImageForScreen(3, 16, 90, "Graphics/UI/Controls help/help_usekey")
addImageForScreen(3, 16, 236, "Graphics/Pictures/Controls help/help_backkey") addImageForScreen(3, 16, 236, "Graphics/UI/Controls help/help_backkey")
addLabelForScreen(3, 134, 68, 352, _INTL("Used to confirm a choice, interact with people and things, and move through text. (Default: C)")) addLabelForScreen(3, 134, 68, 352, _INTL("Used to confirm a choice, interact with people and things, and move through text. (Default: C)"))
addLabelForScreen(3, 134, 196, 352, _INTL("Used to exit, cancel a choice, and cancel a mode. While moving around, hold to move at a different speed. (Default: X)")) addLabelForScreen(3, 134, 196, 352, _INTL("Used to exit, cancel a choice, and cancel a mode. While moving around, hold to move at a different speed. (Default: X)"))
addImageForScreen(4, 16, 90, "Graphics/Pictures/Controls help/help_actionkey") addImageForScreen(4, 16, 90, "Graphics/UI/Controls help/help_actionkey")
addImageForScreen(4, 16, 236, "Graphics/Pictures/Controls help/help_specialkey") addImageForScreen(4, 16, 236, "Graphics/UI/Controls help/help_specialkey")
addLabelForScreen(4, 134, 68, 352, _INTL("Used to open the Pause Menu. Also has various functions depending on context. (Default: Z)")) addLabelForScreen(4, 134, 68, 352, _INTL("Used to open the Pause Menu. Also has various functions depending on context. (Default: Z)"))
addLabelForScreen(4, 134, 196, 352, _INTL("Press to open the Ready Menu, where registered items and available field moves can be used. (Default: D)")) addLabelForScreen(4, 134, 196, 352, _INTL("Press to open the Ready Menu, where registered items and available field moves can be used. (Default: D)"))

2
Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb
View File

@@ -17,7 +17,7 @@ class PokemonEggHatch_Scene
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
# Create background image # Create background image
addBackgroundOrColoredPlane(@sprites, "background", "hatchbg", addBackgroundOrColoredPlane(@sprites, "background", "hatch_bg",
Color.new(248, 248, 248), @viewport) Color.new(248, 248, 248), @viewport)
# Create egg sprite/Pokémon sprite # Create egg sprite/Pokémon sprite
@sprites["pokemon"] = PokemonSprite.new(@viewport) @sprites["pokemon"] = PokemonSprite.new(@viewport)

2
Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
View File

@@ -496,7 +496,7 @@ class PokemonEvolutionScene
@viewport.z = 99999 @viewport.z = 99999
@msgviewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @msgviewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@msgviewport.z = 99999 @msgviewport.z = 99999
addBackgroundOrColoredPlane(@sprites, "background", "evolutionbg", addBackgroundOrColoredPlane(@sprites, "background", "evolution_bg",
Color.new(248, 248, 248), @bgviewport) Color.new(248, 248, 248), @bgviewport)
rsprite1 = PokemonSprite.new(@viewport) rsprite1 = PokemonSprite.new(@viewport)
rsprite1.setOffset(PictureOrigin::CENTER) rsprite1.setOffset(PictureOrigin::CENTER)

2
Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb
View File

@@ -32,7 +32,7 @@ class PokemonTrade_Scene
@pokemon2 = pokemon2 @pokemon2 = pokemon2
@trader1 = trader1 @trader1 = trader1
@trader2 = trader2 @trader2 = trader2
addBackgroundOrColoredPlane(@sprites, "background", "tradebg", addBackgroundOrColoredPlane(@sprites, "background", "trade_bg",
Color.new(248, 248, 248), @viewport) Color.new(248, 248, 248), @viewport)
@sprites["rsprite1"] = PokemonSprite.new(@viewport) @sprites["rsprite1"] = PokemonSprite.new(@viewport)
@sprites["rsprite1"].setPokemonBitmap(@pokemon, false) @sprites["rsprite1"].setPokemonBitmap(@pokemon, false)

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

@@ -48,9 +48,9 @@ class HallOfFame_Scene
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
# Comment the below line to doesn't use a background # Comment the below line to doesn't use a background
addBackgroundPlane(@sprites, "bg", "hallfamebg", @viewport) addBackgroundPlane(@sprites, "bg", "Hall of Fame/bg", @viewport)
@sprites["hallbars"] = IconSprite.new(@viewport) @sprites["hallbars"] = IconSprite.new(@viewport)
@sprites["hallbars"].setBitmap("Graphics/Pictures/hallfamebars") @sprites["hallbars"].setBitmap("Graphics/UI/Hall of Fame/bars")
@sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@sprites["overlay"].z = 10 @sprites["overlay"].z = 10
pbSetSystemFont(@sprites["overlay"].bitmap) pbSetSystemFont(@sprites["overlay"].bitmap)

8
Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb
View File

@@ -8,7 +8,7 @@ class Window_DexesList < Window_CommandPokemon
def initialize(commands, commands2, width) def initialize(commands, commands2, width)
@commands2 = commands2 @commands2 = commands2
super(commands, width) super(commands, width)
@selarrow = AnimatedBitmap.new("Graphics/Pictures/selarrow_white") @selarrow = AnimatedBitmap.new("Graphics/UI/sel_arrow_white")
self.baseColor = Color.new(248, 248, 248) self.baseColor = Color.new(248, 248, 248)
self.shadowColor = Color.black self.shadowColor = Color.black
self.windowskin = nil self.windowskin = nil
@@ -25,8 +25,8 @@ class Window_DexesList < Window_CommandPokemon
allown = (@commands2[index][1] >= @commands2[index][2]) allown = (@commands2[index][1] >= @commands2[index][2])
pbDrawImagePositions( pbDrawImagePositions(
self.contents, self.contents,
[["Graphics/Pictures/Pokedex/icon_menuseenown", rect.x + 236, rect.y + 6, (allseen) ? 24 : 0, 0, 24, 24], [["Graphics/UI/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]] ["Graphics/UI/Pokedex/icon_menuseenown", rect.x + 332, rect.y + 6, (allown) ? 24 : 0, 24, 24, 24]]
) )
end end
end end
@@ -46,7 +46,7 @@ class PokemonPokedexMenu_Scene
@viewport.z = 99999 @viewport.z = 99999
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["background"].setBitmap(_INTL("Graphics/Pictures/Pokedex/bg_menu")) @sprites["background"].setBitmap(_INTL("Graphics/UI/Pokedex/bg_menu"))
@sprites["headings"] = Window_AdvancedTextPokemon.newWithSize( @sprites["headings"] = Window_AdvancedTextPokemon.newWithSize(
_INTL("<c3=F8F8F8,C02028>SEEN<r>OBTAINED</c3>"), 286, 136, 208, 64, @viewport _INTL("<c3=F8F8F8,C02028>SEEN<r>OBTAINED</c3>"), 286, 136, 208, 64, @viewport
) )

44
Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
View File

@@ -5,9 +5,9 @@ class Window_Pokedex < Window_DrawableCommand
def initialize(x, y, width, height, viewport) def initialize(x, y, width, height, viewport)
@commands = [] @commands = []
super(x, y, width, height, viewport) super(x, y, width, height, viewport)
@selarrow = AnimatedBitmap.new("Graphics/Pictures/Pokedex/cursor_list") @selarrow = AnimatedBitmap.new("Graphics/UI/Pokedex/cursor_list")
@pokeballOwn = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_own") @pokeballOwn = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_own")
@pokeballSeen = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_seen") @pokeballSeen = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_seen")
self.baseColor = Color.new(88, 88, 80) self.baseColor = Color.new(88, 88, 80)
self.shadowColor = Color.new(168, 184, 184) self.shadowColor = Color.new(168, 184, 184)
self.windowskin = nil self.windowskin = nil
@@ -86,7 +86,7 @@ class PokedexSearchSelectionSprite < Sprite
def initialize(viewport = nil) def initialize(viewport = nil)
super(viewport) super(viewport)
@selbitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/cursor_search") @selbitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/cursor_search")
self.bitmap = @selbitmap.bitmap self.bitmap = @selbitmap.bitmap
self.mode = -1 self.mode = -1
@index = 0 @index = 0
@@ -262,12 +262,12 @@ class PokemonPokedex_Scene
end end
def pbStartScene def pbStartScene
@sliderbitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_slider") @sliderbitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_slider")
@typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Pokedex/icon_types")) @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Pokedex/icon_types"))
@shapebitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_shapes") @shapebitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_shapes")
@hwbitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_hw") @hwbitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_hw")
@selbitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_searchsel") @selbitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_searchsel")
@searchsliderbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Pokedex/icon_searchslider")) @searchsliderbitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Pokedex/icon_searchslider"))
@sprites = {} @sprites = {}
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
@@ -405,9 +405,9 @@ class PokemonPokedex_Scene
@sprites["pokedex"].index = index @sprites["pokedex"].index = index
@sprites["pokedex"].refresh @sprites["pokedex"].refresh
if @searchResults if @searchResults
@sprites["background"].setBitmap("Graphics/Pictures/Pokedex/bg_listsearch") @sprites["background"].setBitmap("Graphics/UI/Pokedex/bg_listsearch")
else else
@sprites["background"].setBitmap("Graphics/Pictures/Pokedex/bg_list") @sprites["background"].setBitmap("Graphics/UI/Pokedex/bg_list")
end end
pbRefresh pbRefresh
end end
@@ -902,19 +902,19 @@ class PokemonPokedex_Scene
ret = nil ret = nil
# Set background # Set background
case mode case mode
when 0 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_order") when 0 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_order")
when 1 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_name") when 1 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_name")
when 2 when 2
count = 0 count = 0
GameData::Type.each { |t| count += 1 if !t.pseudo_type && t.id != :SHADOW } GameData::Type.each { |t| count += 1 if !t.pseudo_type && t.id != :SHADOW }
if count == 18 if count == 18
@sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_type_18") @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_type_18")
else else
@sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_type") @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_type")
end end
when 3, 4 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_size") when 3, 4 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_size")
when 5 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_color") when 5 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_color")
when 6 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_shape") when 6 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_shape")
end end
selindex = selitems.clone selindex = selitems.clone
index = selindex[0] index = selindex[0]
@@ -1087,7 +1087,7 @@ class PokemonPokedex_Scene
end end
Input.update Input.update
# Set background image # Set background image
@sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search") @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search")
@sprites["searchcursor"].mode = -1 @sprites["searchcursor"].mode = -1
@sprites["searchcursor"].index = mainindex @sprites["searchcursor"].index = mainindex
return ret return ret
@@ -1246,9 +1246,9 @@ class PokemonPokedex_Scene
end end
pbFadeOutAndHide(@sprites) pbFadeOutAndHide(@sprites)
if @searchResults if @searchResults
@sprites["background"].setBitmap("Graphics/Pictures/Pokedex/bg_listsearch") @sprites["background"].setBitmap("Graphics/UI/Pokedex/bg_listsearch")
else else
@sprites["background"].setBitmap("Graphics/Pictures/Pokedex/bg_list") @sprites["background"].setBitmap("Graphics/UI/Pokedex/bg_list")
end end
pbRefresh pbRefresh
pbFadeInAndShow(@sprites, oldsprites) pbFadeInAndShow(@sprites, oldsprites)

26
Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
View File

@@ -10,7 +10,7 @@ class PokemonPokedexInfo_Scene
@region = region @region = region
@page = 1 @page = 1
@show_battled_count = false @show_battled_count = false
@typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Pokedex/icon_types")) @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Pokedex/icon_types"))
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["infosprite"] = PokemonSprite.new(@viewport) @sprites["infosprite"] = PokemonSprite.new(@viewport)
@@ -23,21 +23,21 @@ class PokemonPokedexInfo_Scene
@region = (mappos) ? mappos[0] : 0 # Region 0 default @region = (mappos) ? mappos[0] : 0 # Region 0 default
end end
@sprites["areamap"] = IconSprite.new(0, 0, @viewport) @sprites["areamap"] = IconSprite.new(0, 0, @viewport)
@sprites["areamap"].setBitmap("Graphics/Pictures/#{@mapdata[@region][1]}") @sprites["areamap"].setBitmap("Graphics/UI/Town Map/#{@mapdata[@region][1]}")
@sprites["areamap"].x += (Graphics.width - @sprites["areamap"].bitmap.width) / 2 @sprites["areamap"].x += (Graphics.width - @sprites["areamap"].bitmap.width) / 2
@sprites["areamap"].y += (Graphics.height + 32 - @sprites["areamap"].bitmap.height) / 2 @sprites["areamap"].y += (Graphics.height + 32 - @sprites["areamap"].bitmap.height) / 2
Settings::REGION_MAP_EXTRAS.each do |hidden| Settings::REGION_MAP_EXTRAS.each do |hidden|
next if hidden[0] != @region || hidden[1] <= 0 || !$game_switches[hidden[1]] next if hidden[0] != @region || hidden[1] <= 0 || !$game_switches[hidden[1]]
pbDrawImagePositions( pbDrawImagePositions(
@sprites["areamap"].bitmap, @sprites["areamap"].bitmap,
[["Graphics/Pictures/#{hidden[4]}", [["Graphics/UI/Town Map/#{hidden[4]}",
hidden[2] * PokemonRegionMap_Scene::SQUARE_WIDTH, hidden[2] * PokemonRegionMap_Scene::SQUARE_WIDTH,
hidden[3] * PokemonRegionMap_Scene::SQUARE_HEIGHT]] hidden[3] * PokemonRegionMap_Scene::SQUARE_HEIGHT]]
) )
end end
@sprites["areahighlight"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["areahighlight"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@sprites["areaoverlay"] = IconSprite.new(0, 0, @viewport) @sprites["areaoverlay"] = IconSprite.new(0, 0, @viewport)
@sprites["areaoverlay"].setBitmap("Graphics/Pictures/Pokedex/overlay_area") @sprites["areaoverlay"].setBitmap("Graphics/UI/Pokedex/overlay_area")
@sprites["formfront"] = PokemonSprite.new(@viewport) @sprites["formfront"] = PokemonSprite.new(@viewport)
@sprites["formfront"].setOffset(PictureOrigin::CENTER) @sprites["formfront"].setOffset(PictureOrigin::CENTER)
@sprites["formfront"].x = 130 @sprites["formfront"].x = 130
@@ -49,12 +49,12 @@ class PokemonPokedexInfo_Scene
@sprites["formicon"].setOffset(PictureOrigin::CENTER) @sprites["formicon"].setOffset(PictureOrigin::CENTER)
@sprites["formicon"].x = 82 @sprites["formicon"].x = 82
@sprites["formicon"].y = 328 @sprites["formicon"].y = 328
@sprites["uparrow"] = AnimatedSprite.new("Graphics/Pictures/uparrow", 8, 28, 40, 2, @viewport) @sprites["uparrow"] = AnimatedSprite.new("Graphics/UI/up_arrow", 8, 28, 40, 2, @viewport)
@sprites["uparrow"].x = 242 @sprites["uparrow"].x = 242
@sprites["uparrow"].y = 268 @sprites["uparrow"].y = 268
@sprites["uparrow"].play @sprites["uparrow"].play
@sprites["uparrow"].visible = false @sprites["uparrow"].visible = false
@sprites["downarrow"] = AnimatedSprite.new("Graphics/Pictures/downarrow", 8, 28, 40, 2, @viewport) @sprites["downarrow"] = AnimatedSprite.new("Graphics/UI/down_arrow", 8, 28, 40, 2, @viewport)
@sprites["downarrow"].x = 242 @sprites["downarrow"].x = 242
@sprites["downarrow"].y = 348 @sprites["downarrow"].y = 348
@sprites["downarrow"].play @sprites["downarrow"].play
@@ -94,7 +94,7 @@ class PokemonPokedexInfo_Scene
@index = 0 @index = 0
@page = 1 @page = 1
@brief = true @brief = true
@typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Pokedex/icon_types")) @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Pokedex/icon_types"))
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["infosprite"] = PokemonSprite.new(@viewport) @sprites["infosprite"] = PokemonSprite.new(@viewport)
@@ -198,13 +198,13 @@ class PokemonPokedexInfo_Scene
end end
def drawPageInfo def drawPageInfo
@sprites["background"].setBitmap(_INTL("Graphics/Pictures/Pokedex/bg_info")) @sprites["background"].setBitmap(_INTL("Graphics/UI/Pokedex/bg_info"))
overlay = @sprites["overlay"].bitmap overlay = @sprites["overlay"].bitmap
base = Color.new(88, 88, 80) base = Color.new(88, 88, 80)
shadow = Color.new(168, 184, 184) shadow = Color.new(168, 184, 184)
imagepos = [] imagepos = []
if @brief if @brief
imagepos.push([_INTL("Graphics/Pictures/Pokedex/overlay_info"), 0, 0]) imagepos.push([_INTL("Graphics/UI/Pokedex/overlay_info"), 0, 0])
end end
species_data = GameData::Species.get_species_form(@species, @form) species_data = GameData::Species.get_species_form(@species, @form)
# Write various bits of text # Write various bits of text
@@ -253,7 +253,7 @@ class PokemonPokedexInfo_Scene
footprint.dispose footprint.dispose
end end
# Show the owned icon # Show the owned icon
imagepos.push(["Graphics/Pictures/Pokedex/icon_own", 212, 44]) imagepos.push(["Graphics/UI/Pokedex/icon_own", 212, 44])
# Draw the type icon(s) # Draw the type icon(s)
species_data.types.each_with_index do |type, i| species_data.types.each_with_index do |type, i|
type_number = GameData::Type.get(type).icon_position type_number = GameData::Type.get(type).icon_position
@@ -333,7 +333,7 @@ class PokemonPokedexInfo_Scene
end end
def drawPageArea def drawPageArea
@sprites["background"].setBitmap(_INTL("Graphics/Pictures/Pokedex/bg_area")) @sprites["background"].setBitmap(_INTL("Graphics/UI/Pokedex/bg_area"))
overlay = @sprites["overlay"].bitmap overlay = @sprites["overlay"].bitmap
base = Color.new(88, 88, 80) base = Color.new(88, 88, 80)
shadow = Color.new(168, 184, 184) shadow = Color.new(168, 184, 184)
@@ -371,7 +371,7 @@ class PokemonPokedexInfo_Scene
if points.length == 0 if points.length == 0
pbDrawImagePositions( pbDrawImagePositions(
overlay, overlay,
[[sprintf("Graphics/Pictures/Pokedex/overlay_areanone"), 108, 188]] [[sprintf("Graphics/UI/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 end
@@ -382,7 +382,7 @@ class PokemonPokedexInfo_Scene
end end
def drawPageForms def drawPageForms
@sprites["background"].setBitmap(_INTL("Graphics/Pictures/Pokedex/bg_forms")) @sprites["background"].setBitmap(_INTL("Graphics/UI/Pokedex/bg_forms"))
overlay = @sprites["overlay"].bitmap overlay = @sprites["overlay"].bitmap
base = Color.new(88, 88, 80) base = Color.new(88, 88, 80)
shadow = Color.new(168, 184, 184) shadow = Color.new(168, 184, 184)

56
Data/Scripts/016_UI/005_UI_Party.rb
View File

@@ -9,11 +9,11 @@ class PokemonPartyConfirmCancelSprite < Sprite
@refreshBitmap = true @refreshBitmap = true
@bgsprite = ChangelingSprite.new(0, 0, viewport) @bgsprite = ChangelingSprite.new(0, 0, viewport)
if narrowbox if narrowbox
@bgsprite.addBitmap("desel", "Graphics/Pictures/Party/icon_cancel_narrow") @bgsprite.addBitmap("desel", "Graphics/UI/Party/icon_cancel_narrow")
@bgsprite.addBitmap("sel", "Graphics/Pictures/Party/icon_cancel_narrow_sel") @bgsprite.addBitmap("sel", "Graphics/UI/Party/icon_cancel_narrow_sel")
else else
@bgsprite.addBitmap("desel", "Graphics/Pictures/Party/icon_cancel") @bgsprite.addBitmap("desel", "Graphics/UI/Party/icon_cancel")
@bgsprite.addBitmap("sel", "Graphics/Pictures/Party/icon_cancel_sel") @bgsprite.addBitmap("sel", "Graphics/UI/Party/icon_cancel_sel")
end end
@bgsprite.changeBitmap("desel") @bgsprite.changeBitmap("desel")
@overlaysprite = BitmapSprite.new(@bgsprite.bitmap.width, @bgsprite.bitmap.height, viewport) @overlaysprite = BitmapSprite.new(@bgsprite.bitmap.width, @bgsprite.bitmap.height, viewport)
@@ -140,7 +140,7 @@ class PokemonPartyBlankPanel < Sprite
super(viewport) super(viewport)
self.x = (index % 2) * Graphics.width / 2 self.x = (index % 2) * Graphics.width / 2
self.y = (16 * (index % 2)) + (96 * (index / 2)) self.y = (16 * (index % 2)) + (96 * (index / 2))
@panelbgsprite = AnimatedBitmap.new("Graphics/Pictures/Party/panel_blank") @panelbgsprite = AnimatedBitmap.new("Graphics/UI/Party/panel_blank")
self.bitmap = @panelbgsprite.bitmap self.bitmap = @panelbgsprite.bitmap
@text = nil @text = nil
end end
@@ -186,31 +186,31 @@ class PokemonPartyPanel < Sprite
@panelbgsprite = ChangelingSprite.new(0, 0, viewport) @panelbgsprite = ChangelingSprite.new(0, 0, viewport)
@panelbgsprite.z = self.z @panelbgsprite.z = self.z
if @active # Rounded panel if @active # Rounded panel
@panelbgsprite.addBitmap("able", "Graphics/Pictures/Party/panel_round") @panelbgsprite.addBitmap("able", "Graphics/UI/Party/panel_round")
@panelbgsprite.addBitmap("ablesel", "Graphics/Pictures/Party/panel_round_sel") @panelbgsprite.addBitmap("ablesel", "Graphics/UI/Party/panel_round_sel")
@panelbgsprite.addBitmap("fainted", "Graphics/Pictures/Party/panel_round_faint") @panelbgsprite.addBitmap("fainted", "Graphics/UI/Party/panel_round_faint")
@panelbgsprite.addBitmap("faintedsel", "Graphics/Pictures/Party/panel_round_faint_sel") @panelbgsprite.addBitmap("faintedsel", "Graphics/UI/Party/panel_round_faint_sel")
@panelbgsprite.addBitmap("swap", "Graphics/Pictures/Party/panel_round_swap") @panelbgsprite.addBitmap("swap", "Graphics/UI/Party/panel_round_swap")
@panelbgsprite.addBitmap("swapsel", "Graphics/Pictures/Party/panel_round_swap_sel") @panelbgsprite.addBitmap("swapsel", "Graphics/UI/Party/panel_round_swap_sel")
@panelbgsprite.addBitmap("swapsel2", "Graphics/Pictures/Party/panel_round_swap_sel2") @panelbgsprite.addBitmap("swapsel2", "Graphics/UI/Party/panel_round_swap_sel2")
else # Rectangular panel else # Rectangular panel
@panelbgsprite.addBitmap("able", "Graphics/Pictures/Party/panel_rect") @panelbgsprite.addBitmap("able", "Graphics/UI/Party/panel_rect")
@panelbgsprite.addBitmap("ablesel", "Graphics/Pictures/Party/panel_rect_sel") @panelbgsprite.addBitmap("ablesel", "Graphics/UI/Party/panel_rect_sel")
@panelbgsprite.addBitmap("fainted", "Graphics/Pictures/Party/panel_rect_faint") @panelbgsprite.addBitmap("fainted", "Graphics/UI/Party/panel_rect_faint")
@panelbgsprite.addBitmap("faintedsel", "Graphics/Pictures/Party/panel_rect_faint_sel") @panelbgsprite.addBitmap("faintedsel", "Graphics/UI/Party/panel_rect_faint_sel")
@panelbgsprite.addBitmap("swap", "Graphics/Pictures/Party/panel_rect_swap") @panelbgsprite.addBitmap("swap", "Graphics/UI/Party/panel_rect_swap")
@panelbgsprite.addBitmap("swapsel", "Graphics/Pictures/Party/panel_rect_swap_sel") @panelbgsprite.addBitmap("swapsel", "Graphics/UI/Party/panel_rect_swap_sel")
@panelbgsprite.addBitmap("swapsel2", "Graphics/Pictures/Party/panel_rect_swap_sel2") @panelbgsprite.addBitmap("swapsel2", "Graphics/UI/Party/panel_rect_swap_sel2")
end end
@hpbgsprite = ChangelingSprite.new(0, 0, viewport) @hpbgsprite = ChangelingSprite.new(0, 0, viewport)
@hpbgsprite.z = self.z + 1 @hpbgsprite.z = self.z + 1
@hpbgsprite.addBitmap("able", "Graphics/Pictures/Party/overlay_hp_back") @hpbgsprite.addBitmap("able", "Graphics/UI/Party/overlay_hp_back")
@hpbgsprite.addBitmap("fainted", "Graphics/Pictures/Party/overlay_hp_back_faint") @hpbgsprite.addBitmap("fainted", "Graphics/UI/Party/overlay_hp_back_faint")
@hpbgsprite.addBitmap("swap", "Graphics/Pictures/Party/overlay_hp_back_swap") @hpbgsprite.addBitmap("swap", "Graphics/UI/Party/overlay_hp_back_swap")
@ballsprite = ChangelingSprite.new(0, 0, viewport) @ballsprite = ChangelingSprite.new(0, 0, viewport)
@ballsprite.z = self.z + 1 @ballsprite.z = self.z + 1
@ballsprite.addBitmap("desel", "Graphics/Pictures/Party/icon_ball") @ballsprite.addBitmap("desel", "Graphics/UI/Party/icon_ball")
@ballsprite.addBitmap("sel", "Graphics/Pictures/Party/icon_ball_sel") @ballsprite.addBitmap("sel", "Graphics/UI/Party/icon_ball_sel")
@pkmnsprite = PokemonIconSprite.new(pokemon, viewport) @pkmnsprite = PokemonIconSprite.new(pokemon, viewport)
@pkmnsprite.setOffset(PictureOrigin::CENTER) @pkmnsprite.setOffset(PictureOrigin::CENTER)
@pkmnsprite.active = @active @pkmnsprite.active = @active
@@ -220,8 +220,8 @@ class PokemonPartyPanel < Sprite
@overlaysprite = BitmapSprite.new(Graphics.width, Graphics.height, viewport) @overlaysprite = BitmapSprite.new(Graphics.width, Graphics.height, viewport)
@overlaysprite.z = self.z + 4 @overlaysprite.z = self.z + 4
pbSetSystemFont(@overlaysprite.bitmap) pbSetSystemFont(@overlaysprite.bitmap)
@hpbar = AnimatedBitmap.new("Graphics/Pictures/Party/overlay_hp") @hpbar = AnimatedBitmap.new("Graphics/UI/Party/overlay_hp")
@statuses = AnimatedBitmap.new(_INTL("Graphics/Pictures/statuses")) @statuses = AnimatedBitmap.new(_INTL("Graphics/UI/statuses"))
@selected = false @selected = false
@preselected = false @preselected = false
@switching = false @switching = false
@@ -380,7 +380,7 @@ class PokemonPartyPanel < Sprite
return if @pokemon.egg? return if @pokemon.egg?
# "Lv" graphic # "Lv" graphic
pbDrawImagePositions(@overlaysprite.bitmap, pbDrawImagePositions(@overlaysprite.bitmap,
[["Graphics/Pictures/Party/overlay_lv", 20, 70, 0, 0, 22, 14]]) [["Graphics/UI/Party/overlay_lv", 20, 70, 0, 0, 22, 14]])
# Level number # Level number
pbSetSmallFont(@overlaysprite.bitmap) pbSetSmallFont(@overlaysprite.bitmap)
pbDrawTextPositions(@overlaysprite.bitmap, pbDrawTextPositions(@overlaysprite.bitmap,
@@ -434,7 +434,7 @@ class PokemonPartyPanel < Sprite
def draw_shiny_icon def draw_shiny_icon
return if @pokemon.egg? || !@pokemon.shiny? return if @pokemon.egg? || !@pokemon.shiny?
pbDrawImagePositions(@overlaysprite.bitmap, pbDrawImagePositions(@overlaysprite.bitmap,
[["Graphics/Pictures/shiny", 80, 48, 0, 0, 16, 16]]) [["Graphics/UI/shiny", 80, 48, 0, 0, 16, 16]])
end end
def draw_annotation def draw_annotation

54
Data/Scripts/016_UI/006_UI_Summary.rb
View File

@@ -7,7 +7,7 @@ class MoveSelectionSprite < Sprite
def initialize(viewport = nil, fifthmove = false) def initialize(viewport = nil, fifthmove = false)
super(viewport) super(viewport)
@movesel = AnimatedBitmap.new("Graphics/Pictures/Summary/cursor_move") @movesel = AnimatedBitmap.new("Graphics/UI/Summary/cursor_move")
@frame = 0 @frame = 0
@index = 0 @index = 0
@fifthmove = fifthmove @fifthmove = fifthmove
@@ -61,7 +61,7 @@ end
class RibbonSelectionSprite < MoveSelectionSprite class RibbonSelectionSprite < MoveSelectionSprite
def initialize(viewport = nil) def initialize(viewport = nil)
super(viewport) super(viewport)
@movesel = AnimatedBitmap.new("Graphics/Pictures/Summary/cursor_ribbon") @movesel = AnimatedBitmap.new("Graphics/UI/Summary/cursor_ribbon")
@frame = 0 @frame = 0
@index = 0 @index = 0
@preselected = false @preselected = false
@@ -117,8 +117,8 @@ class PokemonSummary_Scene
@pokemon = @party[@partyindex] @pokemon = @party[@partyindex]
@inbattle = inbattle @inbattle = inbattle
@page = 1 @page = 1
@typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types"))
@markingbitmap = AnimatedBitmap.new("Graphics/Pictures/Summary/markings") @markingbitmap = AnimatedBitmap.new("Graphics/UI/Summary/markings")
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["pokemon"] = PokemonSprite.new(@viewport) @sprites["pokemon"] = PokemonSprite.new(@viewport)
@@ -145,24 +145,24 @@ class PokemonSummary_Scene
@sprites["ribbonpresel"].preselected = true @sprites["ribbonpresel"].preselected = true
@sprites["ribbonsel"] = RibbonSelectionSprite.new(@viewport) @sprites["ribbonsel"] = RibbonSelectionSprite.new(@viewport)
@sprites["ribbonsel"].visible = false @sprites["ribbonsel"].visible = false
@sprites["uparrow"] = AnimatedSprite.new("Graphics/Pictures/uparrow", 8, 28, 40, 2, @viewport) @sprites["uparrow"] = AnimatedSprite.new("Graphics/UI/up_arrow", 8, 28, 40, 2, @viewport)
@sprites["uparrow"].x = 350 @sprites["uparrow"].x = 350
@sprites["uparrow"].y = 56 @sprites["uparrow"].y = 56
@sprites["uparrow"].play @sprites["uparrow"].play
@sprites["uparrow"].visible = false @sprites["uparrow"].visible = false
@sprites["downarrow"] = AnimatedSprite.new("Graphics/Pictures/downarrow", 8, 28, 40, 2, @viewport) @sprites["downarrow"] = AnimatedSprite.new("Graphics/UI/down_arrow", 8, 28, 40, 2, @viewport)
@sprites["downarrow"].x = 350 @sprites["downarrow"].x = 350
@sprites["downarrow"].y = 260 @sprites["downarrow"].y = 260
@sprites["downarrow"].play @sprites["downarrow"].play
@sprites["downarrow"].visible = false @sprites["downarrow"].visible = false
@sprites["markingbg"] = IconSprite.new(260, 88, @viewport) @sprites["markingbg"] = IconSprite.new(260, 88, @viewport)
@sprites["markingbg"].setBitmap("Graphics/Pictures/Summary/overlay_marking") @sprites["markingbg"].setBitmap("Graphics/UI/Summary/overlay_marking")
@sprites["markingbg"].visible = false @sprites["markingbg"].visible = false
@sprites["markingoverlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["markingoverlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@sprites["markingoverlay"].visible = false @sprites["markingoverlay"].visible = false
pbSetSystemFont(@sprites["markingoverlay"].bitmap) pbSetSystemFont(@sprites["markingoverlay"].bitmap)
@sprites["markingsel"] = IconSprite.new(0, 0, @viewport) @sprites["markingsel"] = IconSprite.new(0, 0, @viewport)
@sprites["markingsel"].setBitmap("Graphics/Pictures/Summary/cursor_marking") @sprites["markingsel"].setBitmap("Graphics/UI/Summary/cursor_marking")
@sprites["markingsel"].src_rect.height = @sprites["markingsel"].bitmap.height / 2 @sprites["markingsel"].src_rect.height = @sprites["markingsel"].bitmap.height / 2
@sprites["markingsel"].visible = false @sprites["markingsel"].visible = false
@sprites["messagebox"] = Window_AdvancedTextPokemon.new("") @sprites["messagebox"] = Window_AdvancedTextPokemon.new("")
@@ -183,7 +183,7 @@ class PokemonSummary_Scene
@partyindex = partyindex @partyindex = partyindex
@pokemon = @party[@partyindex] @pokemon = @party[@partyindex]
@page = 4 @page = 4
@typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types"))
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@@ -306,10 +306,10 @@ class PokemonSummary_Scene
base = Color.new(248, 248, 248) base = Color.new(248, 248, 248)
shadow = Color.new(104, 104, 104) shadow = Color.new(104, 104, 104)
# Set background image # Set background image
@sprites["background"].setBitmap("Graphics/Pictures/Summary/bg_#{page}") @sprites["background"].setBitmap("Graphics/UI/Summary/bg_#{page}")
imagepos = [] imagepos = []
# Show the Poké Ball containing the Pokémon # Show the Poké Ball containing the Pokémon
ballimage = sprintf("Graphics/Pictures/Summary/icon_ball_%s", @pokemon.poke_ball) ballimage = sprintf("Graphics/UI/Summary/icon_ball_%s", @pokemon.poke_ball)
imagepos.push([ballimage, 14, 60]) imagepos.push([ballimage, 14, 60])
# Show status/fainted/Pokérus infected icon # Show status/fainted/Pokérus infected icon
status = -1 status = -1
@@ -321,15 +321,15 @@ class PokemonSummary_Scene
status = GameData::Status.count status = GameData::Status.count
end end
if status >= 0 if status >= 0
imagepos.push(["Graphics/Pictures/statuses", 124, 100, 0, 16 * status, 44, 16]) imagepos.push(["Graphics/UI/statuses", 124, 100, 0, 16 * status, 44, 16])
end end
# Show Pokérus cured icon # Show Pokérus cured icon
if @pokemon.pokerusStage == 2 if @pokemon.pokerusStage == 2
imagepos.push([sprintf("Graphics/Pictures/Summary/icon_pokerus"), 176, 100]) imagepos.push([sprintf("Graphics/UI/Summary/icon_pokerus"), 176, 100])
end end
# Show shininess star # Show shininess star
if @pokemon.shiny? if @pokemon.shiny?
imagepos.push([sprintf("Graphics/Pictures/shiny"), 2, 134]) imagepos.push([sprintf("Graphics/UI/shiny"), 2, 134])
end end
# Draw all images # Draw all images
pbDrawImagePositions(overlay, imagepos) pbDrawImagePositions(overlay, imagepos)
@@ -381,8 +381,8 @@ class PokemonSummary_Scene
if @pokemon.shadowPokemon? if @pokemon.shadowPokemon?
shadowfract = @pokemon.heart_gauge.to_f / @pokemon.max_gauge_size shadowfract = @pokemon.heart_gauge.to_f / @pokemon.max_gauge_size
imagepos = [ imagepos = [
["Graphics/Pictures/Summary/overlay_shadow", 224, 240], ["Graphics/UI/Summary/overlay_shadow", 224, 240],
["Graphics/Pictures/Summary/overlay_shadowbar", 242, 280, 0, 0, (shadowfract * 248).floor, -1] ["Graphics/UI/Summary/overlay_shadowbar", 242, 280, 0, 0, (shadowfract * 248).floor, -1]
] ]
pbDrawImagePositions(overlay, imagepos) pbDrawImagePositions(overlay, imagepos)
end end
@@ -468,7 +468,7 @@ class PokemonSummary_Scene
w = @pokemon.exp_fraction * 128 w = @pokemon.exp_fraction * 128
w = ((w / 2).round) * 2 w = ((w / 2).round) * 2
pbDrawImagePositions(overlay, pbDrawImagePositions(overlay,
[["Graphics/Pictures/Summary/overlay_exp", 362, 372, 0, 0, w, 6]]) [["Graphics/UI/Summary/overlay_exp", 362, 372, 0, 0, w, 6]])
end end
end end
@@ -479,10 +479,10 @@ class PokemonSummary_Scene
base = Color.new(248, 248, 248) base = Color.new(248, 248, 248)
shadow = Color.new(104, 104, 104) shadow = Color.new(104, 104, 104)
# Set background image # Set background image
@sprites["background"].setBitmap("Graphics/Pictures/Summary/bg_egg") @sprites["background"].setBitmap("Graphics/UI/Summary/bg_egg")
imagepos = [] imagepos = []
# Show the Poké Ball containing the Pokémon # Show the Poké Ball containing the Pokémon
ballimage = sprintf("Graphics/Pictures/Summary/icon_ball_%s", @pokemon.poke_ball) ballimage = sprintf("Graphics/UI/Summary/icon_ball_%s", @pokemon.poke_ball)
imagepos.push([ballimage, 14, 60]) imagepos.push([ballimage, 14, 60])
# Draw all images # Draw all images
pbDrawImagePositions(overlay, imagepos) pbDrawImagePositions(overlay, imagepos)
@@ -670,7 +670,7 @@ class PokemonSummary_Scene
hpzone = 1 if @pokemon.hp <= (@pokemon.totalhp / 2).floor hpzone = 1 if @pokemon.hp <= (@pokemon.totalhp / 2).floor
hpzone = 2 if @pokemon.hp <= (@pokemon.totalhp / 4).floor hpzone = 2 if @pokemon.hp <= (@pokemon.totalhp / 4).floor
imagepos = [ imagepos = [
["Graphics/Pictures/Summary/overlay_hp", 360, 110, 0, hpzone * 6, w, 6] ["Graphics/UI/Summary/overlay_hp", 360, 110, 0, hpzone * 6, w, 6]
] ]
pbDrawImagePositions(overlay, imagepos) pbDrawImagePositions(overlay, imagepos)
end end
@@ -699,7 +699,7 @@ class PokemonSummary_Scene
move = @pokemon.moves[i] move = @pokemon.moves[i]
if move if move
type_number = GameData::Type.get(move.display_type(@pokemon)).icon_position type_number = GameData::Type.get(move.display_type(@pokemon)).icon_position
imagepos.push(["Graphics/Pictures/types", 248, yPos - 4, 0, type_number * 28, 64, 28]) imagepos.push(["Graphics/UI/types", 248, yPos - 4, 0, type_number * 28, 64, 28])
textpos.push([move.name, 316, yPos, 0, moveBase, moveShadow]) textpos.push([move.name, 316, yPos, 0, moveBase, moveShadow])
if move.total_pp > 0 if move.total_pp > 0
textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow]) textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow])
@@ -741,9 +741,9 @@ class PokemonSummary_Scene
Color.new(136, 48, 48)] # Zero PP Color.new(136, 48, 48)] # Zero PP
# Set background image # Set background image
if move_to_learn if move_to_learn
@sprites["background"].setBitmap("Graphics/Pictures/Summary/bg_learnmove") @sprites["background"].setBitmap("Graphics/UI/Summary/bg_learnmove")
else else
@sprites["background"].setBitmap("Graphics/Pictures/Summary/bg_movedetail") @sprites["background"].setBitmap("Graphics/UI/Summary/bg_movedetail")
end end
# Write various bits of text # Write various bits of text
textpos = [ textpos = [
@@ -765,7 +765,7 @@ class PokemonSummary_Scene
end end
if move if move
type_number = GameData::Type.get(move.display_type(@pokemon)).icon_position type_number = GameData::Type.get(move.display_type(@pokemon)).icon_position
imagepos.push(["Graphics/Pictures/types", 248, yPos - 4, 0, type_number * 28, 64, 28]) imagepos.push(["Graphics/UI/types", 248, yPos - 4, 0, type_number * 28, 64, 28])
textpos.push([move.name, 316, yPos, 0, moveBase, moveShadow]) textpos.push([move.name, 316, yPos, 0, moveBase, moveShadow])
if move.total_pp > 0 if move.total_pp > 0
textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow]) textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow])
@@ -823,7 +823,7 @@ class PokemonSummary_Scene
# Draw all text # Draw all text
pbDrawTextPositions(overlay, textpos) pbDrawTextPositions(overlay, textpos)
# Draw selected move's damage category icon # Draw selected move's damage category icon
imagepos = [["Graphics/Pictures/category", 166, 124, 0, selected_move.display_category(@pokemon) * 28, 64, 28]] imagepos = [["Graphics/UI/category", 166, 124, 0, selected_move.display_category(@pokemon) * 28, 64, 28]]
pbDrawImagePositions(overlay, imagepos) pbDrawImagePositions(overlay, imagepos)
# Draw selected move's description # Draw selected move's description
drawTextEx(overlay, 4, 224, 230, 5, selected_move.description, base, shadow) drawTextEx(overlay, 4, 224, 230, 5, selected_move.description, base, shadow)
@@ -847,7 +847,7 @@ class PokemonSummary_Scene
break if !@pokemon.ribbons[i] break if !@pokemon.ribbons[i]
ribbon_data = GameData::Ribbon.get(@pokemon.ribbons[i]) ribbon_data = GameData::Ribbon.get(@pokemon.ribbons[i])
ribn = ribbon_data.icon_position ribn = ribbon_data.icon_position
imagepos.push(["Graphics/Pictures/ribbons", imagepos.push(["Graphics/UI/Summary/ribbons",
230 + (68 * (coord % 4)), 78 + (68 * (coord / 4).floor), 230 + (68 * (coord % 4)), 78 + (68 * (coord / 4).floor),
64 * (ribn % 8), 64 * (ribn / 8).floor, 64, 64]) 64 * (ribn % 8), 64 * (ribn / 8).floor, 64, 64])
coord += 1 coord += 1
@@ -870,7 +870,7 @@ class PokemonSummary_Scene
desc = ribbonid ? GameData::Ribbon.get(ribbonid).description : "" desc = ribbonid ? GameData::Ribbon.get(ribbonid).description : ""
# Draw the description box # Draw the description box
imagepos = [ imagepos = [
["Graphics/Pictures/Summary/overlay_ribbon", 8, 280] ["Graphics/UI/Summary/overlay_ribbon", 8, 280]
] ]
pbDrawImagePositions(overlay, imagepos) pbDrawImagePositions(overlay, imagepos)
# Draw name of selected ribbon # Draw name of selected ribbon

24
Data/Scripts/016_UI/007_UI_Bag.rb
View File

@@ -12,8 +12,8 @@ class Window_PokemonBag < Window_DrawableCommand
@sorting = false @sorting = false
@adapter = PokemonMartAdapter.new @adapter = PokemonMartAdapter.new
super(x, y, width, height) super(x, y, width, height)
@selarrow = AnimatedBitmap.new("Graphics/Pictures/Bag/cursor") @selarrow = AnimatedBitmap.new("Graphics/UI/Bag/cursor")
@swaparrow = AnimatedBitmap.new("Graphics/Pictures/Bag/cursor_swap") @swaparrow = AnimatedBitmap.new("Graphics/UI/Bag/cursor_swap")
self.windowskin = nil self.windowskin = nil
end end
@@ -82,12 +82,12 @@ class Window_PokemonBag < Window_DrawableCommand
if @bag.registered?(item) if @bag.registered?(item)
pbDrawImagePositions( pbDrawImagePositions(
self.contents, self.contents,
[["Graphics/Pictures/Bag/icon_register", rect.x + rect.width - 72, rect.y + 8, 0, 0, -1, 24]] [["Graphics/UI/Bag/icon_register", rect.x + rect.width - 72, rect.y + 8, 0, 0, -1, 24]]
) )
elsif pbCanRegisterItem?(item) elsif pbCanRegisterItem?(item)
pbDrawImagePositions( pbDrawImagePositions(
self.contents, self.contents,
[["Graphics/Pictures/Bag/icon_register", rect.x + rect.width - 72, rect.y + 8, 0, 24, -1, 24]] [["Graphics/UI/Bag/icon_register", rect.x + rect.width - 72, rect.y + 8, 0, 24, -1, 24]]
) )
end end
else else
@@ -172,8 +172,8 @@ class PokemonBag_Scene
end end
end end
@bag.last_viewed_pocket = lastpocket @bag.last_viewed_pocket = lastpocket
@sliderbitmap = AnimatedBitmap.new("Graphics/Pictures/Bag/icon_slider") @sliderbitmap = AnimatedBitmap.new("Graphics/UI/Bag/icon_slider")
@pocketbitmap = AnimatedBitmap.new("Graphics/Pictures/Bag/icon_pocket") @pocketbitmap = AnimatedBitmap.new("Graphics/UI/Bag/icon_pocket")
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@@ -182,12 +182,12 @@ class PokemonBag_Scene
@sprites["pocketicon"] = BitmapSprite.new(186, 32, @viewport) @sprites["pocketicon"] = BitmapSprite.new(186, 32, @viewport)
@sprites["pocketicon"].x = 0 @sprites["pocketicon"].x = 0
@sprites["pocketicon"].y = 224 @sprites["pocketicon"].y = 224
@sprites["leftarrow"] = AnimatedSprite.new("Graphics/Pictures/leftarrow", 8, 40, 28, 2, @viewport) @sprites["leftarrow"] = AnimatedSprite.new("Graphics/UI/left_arrow", 8, 40, 28, 2, @viewport)
@sprites["leftarrow"].x = -4 @sprites["leftarrow"].x = -4
@sprites["leftarrow"].y = 76 @sprites["leftarrow"].y = 76
@sprites["leftarrow"].visible = (!@choosing || numfilledpockets > 1) @sprites["leftarrow"].visible = (!@choosing || numfilledpockets > 1)
@sprites["leftarrow"].play @sprites["leftarrow"].play
@sprites["rightarrow"] = AnimatedSprite.new("Graphics/Pictures/rightarrow", 8, 40, 28, 2, @viewport) @sprites["rightarrow"] = AnimatedSprite.new("Graphics/UI/right_arrow", 8, 40, 28, 2, @viewport)
@sprites["rightarrow"].x = 150 @sprites["rightarrow"].x = 150
@sprites["rightarrow"].y = 76 @sprites["rightarrow"].y = 76
@sprites["rightarrow"].visible = (!@choosing || numfilledpockets > 1) @sprites["rightarrow"].visible = (!@choosing || numfilledpockets > 1)
@@ -258,13 +258,13 @@ class PokemonBag_Scene
def pbRefresh def pbRefresh
# Set the background image # Set the background image
@sprites["background"].setBitmap(sprintf("Graphics/Pictures/Bag/bg_#{@bag.last_viewed_pocket}")) @sprites["background"].setBitmap(sprintf("Graphics/UI/Bag/bg_#{@bag.last_viewed_pocket}"))
# Set the bag sprite # Set the bag sprite
fbagexists = pbResolveBitmap(sprintf("Graphics/Pictures/Bag/bag_#{@bag.last_viewed_pocket}_f")) fbagexists = pbResolveBitmap(sprintf("Graphics/UI/Bag/bag_#{@bag.last_viewed_pocket}_f"))
if $player.female? && fbagexists if $player.female? && fbagexists
@sprites["bagsprite"].setBitmap("Graphics/Pictures/Bag/bag_#{@bag.last_viewed_pocket}_f") @sprites["bagsprite"].setBitmap("Graphics/UI/Bag/bag_#{@bag.last_viewed_pocket}_f")
else else
@sprites["bagsprite"].setBitmap("Graphics/Pictures/Bag/bag_#{@bag.last_viewed_pocket}") @sprites["bagsprite"].setBitmap("Graphics/UI/Bag/bag_#{@bag.last_viewed_pocket}")
end end
# Draw the pocket icons # Draw the pocket icons
@sprites["pocketicon"].bitmap.clear @sprites["pocketicon"].bitmap.clear

14
Data/Scripts/016_UI/008_UI_Pokegear.rb
View File

@@ -14,10 +14,10 @@ class PokegearButton < Sprite
@image = command[0] @image = command[0]
@name = command[1] @name = command[1]
@selected = false @selected = false
if $player.female? && pbResolveBitmap(sprintf("Graphics/Pictures/Pokegear/icon_button_f")) if $player.female? && pbResolveBitmap(sprintf("Graphics/UI/Pokegear/icon_button_f"))
@button = AnimatedBitmap.new("Graphics/Pictures/Pokegear/icon_button_f") @button = AnimatedBitmap.new("Graphics/UI/Pokegear/icon_button_f")
else else
@button = AnimatedBitmap.new("Graphics/Pictures/Pokegear/icon_button") @button = AnimatedBitmap.new("Graphics/UI/Pokegear/icon_button")
end end
@contents = BitmapWrapper.new(@button.width, @button.height) @contents = BitmapWrapper.new(@button.width, @button.height)
self.bitmap = @contents self.bitmap = @contents
@@ -49,7 +49,7 @@ class PokegearButton < Sprite
] ]
pbDrawTextPositions(self.bitmap, textpos) pbDrawTextPositions(self.bitmap, textpos)
imagepos = [ imagepos = [
[sprintf("Graphics/Pictures/Pokegear/icon_" + @image), 18, 10] [sprintf("Graphics/UI/Pokegear/icon_" + @image), 18, 10]
] ]
pbDrawImagePositions(self.bitmap, imagepos) pbDrawImagePositions(self.bitmap, imagepos)
end end
@@ -73,10 +73,10 @@ class PokemonPokegear_Scene
@viewport.z = 99999 @viewport.z = 99999
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
if $player.female? && pbResolveBitmap(sprintf("Graphics/Pictures/Pokegear/bg_f")) if $player.female? && pbResolveBitmap(sprintf("Graphics/UI/Pokegear/bg_f"))
@sprites["background"].setBitmap("Graphics/Pictures/Pokegear/bg_f") @sprites["background"].setBitmap("Graphics/UI/Pokegear/bg_f")
else else
@sprites["background"].setBitmap("Graphics/Pictures/Pokegear/bg") @sprites["background"].setBitmap("Graphics/UI/Pokegear/bg")
end end
@commands.length.times do |i| @commands.length.times do |i|
@sprites["button#{i}"] = PokegearButton.new(@commands[i], Graphics.width / 2, 0, @viewport) @sprites["button#{i}"] = PokegearButton.new(@commands[i], Graphics.width / 2, 0, @viewport)

10
Data/Scripts/016_UI/009_UI_RegionMap.rb
View File

@@ -104,9 +104,9 @@ class PokemonRegionMap_Scene
pbMessage(_INTL("The map data cannot be found.")) pbMessage(_INTL("The map data cannot be found."))
return false return false
end end
addBackgroundOrColoredPlane(@sprites, "background", "mapbg", Color.black, @viewport) addBackgroundOrColoredPlane(@sprites, "background", "Town Map/bg", Color.black, @viewport)
@sprites["map"] = IconSprite.new(0, 0, @viewport) @sprites["map"] = IconSprite.new(0, 0, @viewport)
@sprites["map"].setBitmap("Graphics/Pictures/#{@map[1]}") @sprites["map"].setBitmap("Graphics/UI/Town Map/#{@map[1]}")
@sprites["map"].x += (Graphics.width - @sprites["map"].bitmap.width) / 2 @sprites["map"].x += (Graphics.width - @sprites["map"].bitmap.width) / 2
@sprites["map"].y += (Graphics.height - @sprites["map"].bitmap.height) / 2 @sprites["map"].y += (Graphics.height - @sprites["map"].bitmap.height) / 2
Settings::REGION_MAP_EXTRAS.each do |graphic| Settings::REGION_MAP_EXTRAS.each do |graphic|
@@ -118,7 +118,7 @@ class PokemonRegionMap_Scene
end end
pbDrawImagePositions( pbDrawImagePositions(
@sprites["map2"].bitmap, @sprites["map2"].bitmap,
[["Graphics/Pictures/#{graphic[4]}", graphic[2] * SQUARE_WIDTH, graphic[3] * SQUARE_HEIGHT]] [["Graphics/UI/Town Map/#{graphic[4]}", graphic[2] * SQUARE_WIDTH, graphic[3] * SQUARE_HEIGHT]]
) )
end end
@sprites["mapbottom"] = MapBottomSprite.new(@viewport) @sprites["mapbottom"] = MapBottomSprite.new(@viewport)
@@ -136,7 +136,7 @@ class PokemonRegionMap_Scene
(TOP..BOTTOM).each do |j| (TOP..BOTTOM).each do |j|
healspot = pbGetHealingSpot(i, j) healspot = pbGetHealingSpot(i, j)
next if !healspot || !$PokemonGlobal.visitedMaps[healspot[0]] next if !healspot || !$PokemonGlobal.visitedMaps[healspot[0]]
@sprites["point#{k}"] = AnimatedSprite.create("Graphics/Pictures/mapFly", 2, 16) @sprites["point#{k}"] = AnimatedSprite.create("Graphics/UI/Town Map/icon_fly", 2, 16)
@sprites["point#{k}"].viewport = @viewport @sprites["point#{k}"].viewport = @viewport
@sprites["point#{k}"].x = point_x_to_screen_x(i) @sprites["point#{k}"].x = point_x_to_screen_x(i)
@sprites["point#{k}"].y = point_y_to_screen_y(j) @sprites["point#{k}"].y = point_y_to_screen_y(j)
@@ -145,7 +145,7 @@ class PokemonRegionMap_Scene
k += 1 k += 1
end end
end end
@sprites["cursor"] = AnimatedSprite.create("Graphics/Pictures/mapCursor", 2, 5) @sprites["cursor"] = AnimatedSprite.create("Graphics/UI/Town Map/cursor", 2, 5)
@sprites["cursor"].viewport = @viewport @sprites["cursor"].viewport = @viewport
@sprites["cursor"].x = point_x_to_screen_x(@map_x) @sprites["cursor"].x = point_x_to_screen_x(@map_x)
@sprites["cursor"].y = point_y_to_screen_y(@map_y) @sprites["cursor"].y = point_y_to_screen_y(@map_y)

8
Data/Scripts/016_UI/010_UI_Phone.rb
View File

@@ -3,7 +3,7 @@
#=============================================================================== #===============================================================================
class Window_PhoneList < Window_CommandPokemon class Window_PhoneList < Window_CommandPokemon
def drawCursor(index, rect) def drawCursor(index, rect)
selarrow = AnimatedBitmap.new("Graphics/Pictures/phoneSel") selarrow = AnimatedBitmap.new("Graphics/UI/Phone/cursor")
if self.index == index if self.index == index
pbCopyBitmap(self.contents, selarrow.bitmap, rect.x, rect.y + 2) pbCopyBitmap(self.contents, selarrow.bitmap, rect.x, rect.y + 2)
end end
@@ -42,7 +42,7 @@ class PokemonPhoneScene
@sprites = {} @sprites = {}
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
addBackgroundPlane(@sprites, "bg", "phonebg", @viewport) addBackgroundPlane(@sprites, "bg", "Phone/bg", @viewport)
@sprites["list"] = Window_PhoneList.newEmpty(152, 32, Graphics.width - 142, Graphics.height - 80, @viewport) @sprites["list"] = Window_PhoneList.newEmpty(152, 32, Graphics.width - 142, Graphics.height - 80, @viewport)
@sprites["list"].windowskin = nil @sprites["list"].windowskin = nil
@sprites["list"].commands = commands @sprites["list"].commands = commands
@@ -50,7 +50,7 @@ class PokemonPhoneScene
@sprites["rematch[#{i}]"] = IconSprite.new(468, 62 + (i * 32), @viewport) @sprites["rematch[#{i}]"] = IconSprite.new(468, 62 + (i * 32), @viewport)
j = i + @sprites["list"].top_item j = i + @sprites["list"].top_item
if j < @contacts.length && @contacts[j].can_rematch? if j < @contacts.length && @contacts[j].can_rematch?
@sprites["rematch[#{i}]"].setBitmap("Graphics/Pictures/phoneRematch") @sprites["rematch[#{i}]"].setBitmap("Graphics/UI/Phone/icon_rematch")
end end
end end
@sprites["header"] = Window_UnformattedTextPokemon.newWithSize( @sprites["header"] = Window_UnformattedTextPokemon.newWithSize(
@@ -111,7 +111,7 @@ class PokemonPhoneScene
@sprites["rematch[#{i}]"].clearBitmaps @sprites["rematch[#{i}]"].clearBitmaps
j = i + @sprites["list"].top_item j = i + @sprites["list"].top_item
if j < @contacts.length && @contacts[j].can_rematch? if j < @contacts.length && @contacts[j].can_rematch?
@sprites["rematch[#{i}]"].setBitmap("Graphics/Pictures/phoneRematch") @sprites["rematch[#{i}]"].setBitmap("Graphics/UI/Phone/icon_rematch")
end end
end end
end end

2
Data/Scripts/016_UI/011_UI_Jukebox.rb
View File

@@ -12,7 +12,7 @@ class PokemonJukebox_Scene
@viewport.z = 99999 @viewport.z = 99999
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["background"].setBitmap("Graphics/Pictures/jukeboxbg") @sprites["background"].setBitmap("Graphics/UI/jukebox_bg")
@sprites["header"] = Window_UnformattedTextPokemon.newWithSize( @sprites["header"] = Window_UnformattedTextPokemon.newWithSize(
_INTL("Jukebox"), 2, -18, 128, 64, @viewport _INTL("Jukebox"), 2, -18, 128, 64, @viewport
) )

10
Data/Scripts/016_UI/012_UI_TrainerCard.rb
View File

@@ -10,18 +10,18 @@ class PokemonTrainerCard_Scene
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
@sprites = {} @sprites = {}
background = pbResolveBitmap(sprintf("Graphics/Pictures/Trainer Card/bg_f")) background = pbResolveBitmap(sprintf("Graphics/UI/Trainer Card/bg_f"))
if $player.female? && background if $player.female? && background
addBackgroundPlane(@sprites, "bg", "Trainer Card/bg_f", @viewport) addBackgroundPlane(@sprites, "bg", "Trainer Card/bg_f", @viewport)
else else
addBackgroundPlane(@sprites, "bg", "Trainer Card/bg", @viewport) addBackgroundPlane(@sprites, "bg", "Trainer Card/bg", @viewport)
end end
cardexists = pbResolveBitmap(sprintf("Graphics/Pictures/Trainer Card/card_f")) cardexists = pbResolveBitmap(sprintf("Graphics/UI/Trainer Card/card_f"))
@sprites["card"] = IconSprite.new(0, 0, @viewport) @sprites["card"] = IconSprite.new(0, 0, @viewport)
if $player.female? && cardexists if $player.female? && cardexists
@sprites["card"].setBitmap("Graphics/Pictures/Trainer Card/card_f") @sprites["card"].setBitmap("Graphics/UI/Trainer Card/card_f")
else else
@sprites["card"].setBitmap("Graphics/Pictures/Trainer Card/card") @sprites["card"].setBitmap("Graphics/UI/Trainer Card/card")
end end
@sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
pbSetSystemFont(@sprites["overlay"].bitmap) pbSetSystemFont(@sprites["overlay"].bitmap)
@@ -68,7 +68,7 @@ class PokemonTrainerCard_Scene
imagePositions = [] imagePositions = []
8.times do |i| 8.times do |i|
if $player.badges[i + (region * 8)] if $player.badges[i + (region * 8)]
imagePositions.push(["Graphics/Pictures/Trainer Card/icon_badges", x, 310, i * 32, region * 32, 32, 32]) imagePositions.push(["Graphics/UI/Trainer Card/icon_badges", x, 310, i * 32, region * 32, 32, 32])
end end
x += 48 x += 48
end end

6
Data/Scripts/016_UI/013_UI_Load.rb
View File

@@ -20,7 +20,7 @@ class PokemonLoadPanel < Sprite
@totalsec = (stats) ? stats.play_time.to_i : ((framecount || 0) / Graphics.frame_rate) @totalsec = (stats) ? stats.play_time.to_i : ((framecount || 0) / Graphics.frame_rate)
@mapid = mapid @mapid = mapid
@selected = (index == 0) @selected = (index == 0)
@bgbitmap = AnimatedBitmap.new("Graphics/Pictures/loadPanels") @bgbitmap = AnimatedBitmap.new("Graphics/UI/Load/panels")
@refreshBitmap = true @refreshBitmap = true
@refreshing = false @refreshing = false
refresh refresh
@@ -103,7 +103,7 @@ class PokemonLoad_Scene
@sprites = {} @sprites = {}
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99998 @viewport.z = 99998
addBackgroundOrColoredPlane(@sprites, "background", "loadbg", Color.new(248, 248, 248), @viewport) addBackgroundOrColoredPlane(@sprites, "background", "Load/bg", Color.new(248, 248, 248), @viewport)
y = 32 y = 32
commands.length.times do |i| commands.length.times do |i|
@sprites["panel#{i}"] = PokemonLoadPanel.new( @sprites["panel#{i}"] = PokemonLoadPanel.new(
@@ -128,7 +128,7 @@ class PokemonLoad_Scene
@sprites = {} @sprites = {}
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99998 @viewport.z = 99998
addBackgroundOrColoredPlane(@sprites, "background", "loadbg", Color.new(248, 248, 248), @viewport) addBackgroundOrColoredPlane(@sprites, "background", "Load/bg", Color.new(248, 248, 248), @viewport)
end end
def pbUpdate def pbUpdate

4
Data/Scripts/016_UI/016_UI_ReadyMenu.rb
View File

@@ -13,9 +13,9 @@ class ReadyMenuButton < Sprite
@selected = selected @selected = selected
@side = side @side = side
if @command[2] if @command[2]
@button = AnimatedBitmap.new("Graphics/Pictures/Ready Menu/icon_movebutton") @button = AnimatedBitmap.new("Graphics/UI/Ready Menu/icon_movebutton")
else else
@button = AnimatedBitmap.new("Graphics/Pictures/Ready Menu/icon_itembutton") @button = AnimatedBitmap.new("Graphics/UI/Ready Menu/icon_itembutton")
end end
@contents = BitmapWrapper.new(@button.width, @button.height / 2) @contents = BitmapWrapper.new(@button.width, @button.height / 2)
self.bitmap = @contents self.bitmap = @contents

32
Data/Scripts/016_UI/017_UI_PokemonStorage.rb
View File

@@ -130,14 +130,14 @@ class PokemonBoxArrow < Sprite
@placingState = 0 @placingState = 0
@heldpkmn = nil @heldpkmn = nil
@handsprite = ChangelingSprite.new(0, 0, viewport) @handsprite = ChangelingSprite.new(0, 0, viewport)
@handsprite.addBitmap("point1", "Graphics/Pictures/Storage/cursor_point_1") @handsprite.addBitmap("point1", "Graphics/UI/Storage/cursor_point_1")
@handsprite.addBitmap("point2", "Graphics/Pictures/Storage/cursor_point_2") @handsprite.addBitmap("point2", "Graphics/UI/Storage/cursor_point_2")
@handsprite.addBitmap("grab", "Graphics/Pictures/Storage/cursor_grab") @handsprite.addBitmap("grab", "Graphics/UI/Storage/cursor_grab")
@handsprite.addBitmap("fist", "Graphics/Pictures/Storage/cursor_fist") @handsprite.addBitmap("fist", "Graphics/UI/Storage/cursor_fist")
@handsprite.addBitmap("point1q", "Graphics/Pictures/Storage/cursor_point_1_q") @handsprite.addBitmap("point1q", "Graphics/UI/Storage/cursor_point_1_q")
@handsprite.addBitmap("point2q", "Graphics/Pictures/Storage/cursor_point_2_q") @handsprite.addBitmap("point2q", "Graphics/UI/Storage/cursor_point_2_q")
@handsprite.addBitmap("grabq", "Graphics/Pictures/Storage/cursor_grab_q") @handsprite.addBitmap("grabq", "Graphics/UI/Storage/cursor_grab_q")
@handsprite.addBitmap("fistq", "Graphics/Pictures/Storage/cursor_fist_q") @handsprite.addBitmap("fistq", "Graphics/UI/Storage/cursor_fist_q")
@handsprite.changeBitmap("fist") @handsprite.changeBitmap("fist")
@spriteX = self.x @spriteX = self.x
@spriteY = self.y @spriteY = self.y
@@ -372,7 +372,7 @@ class PokemonBoxSprite < Sprite
@storage[@boxnumber].background = @bg @storage[@boxnumber].background = @bg
end end
@boxbitmap&.dispose @boxbitmap&.dispose
@boxbitmap = AnimatedBitmap.new("Graphics/Pictures/Storage/box_#{@bg}") @boxbitmap = AnimatedBitmap.new("Graphics/UI/Storage/box_#{@bg}")
end end
end end
@@ -447,7 +447,7 @@ class PokemonBoxPartySprite < Sprite
def initialize(party, viewport = nil) def initialize(party, viewport = nil)
super(viewport) super(viewport)
@party = party @party = party
@boxbitmap = AnimatedBitmap.new("Graphics/Pictures/Storage/overlay_party") @boxbitmap = AnimatedBitmap.new("Graphics/UI/Storage/overlay_party")
@pokemonsprites = [] @pokemonsprites = []
Settings::MAX_PARTY_SIZE.times do |i| Settings::MAX_PARTY_SIZE.times do |i|
@pokemonsprites[i] = nil @pokemonsprites[i] = nil
@@ -593,7 +593,7 @@ class PokemonStorageScene
addBackgroundPlane(@sprites, "background", "Storage/bg", @bgviewport) addBackgroundPlane(@sprites, "background", "Storage/bg", @bgviewport)
@sprites["box"] = PokemonBoxSprite.new(@storage, @storage.currentBox, @boxviewport) @sprites["box"] = PokemonBoxSprite.new(@storage, @storage.currentBox, @boxviewport)
@sprites["boxsides"] = IconSprite.new(0, 0, @boxsidesviewport) @sprites["boxsides"] = IconSprite.new(0, 0, @boxsidesviewport)
@sprites["boxsides"].setBitmap("Graphics/Pictures/Storage/overlay_main") @sprites["boxsides"].setBitmap("Graphics/UI/Storage/overlay_main")
@sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @boxsidesviewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @boxsidesviewport)
pbSetSystemFont(@sprites["overlay"].bitmap) pbSetSystemFont(@sprites["overlay"].bitmap)
@sprites["pokemon"] = AutoMosaicPokemonSprite.new(@boxsidesviewport) @sprites["pokemon"] = AutoMosaicPokemonSprite.new(@boxsidesviewport)
@@ -605,9 +605,9 @@ class PokemonStorageScene
@sprites["boxparty"].x = 182 @sprites["boxparty"].x = 182
@sprites["boxparty"].y = Graphics.height @sprites["boxparty"].y = Graphics.height
end end
@markingbitmap = AnimatedBitmap.new("Graphics/Pictures/Storage/markings") @markingbitmap = AnimatedBitmap.new("Graphics/UI/Storage/markings")
@sprites["markingbg"] = IconSprite.new(292, 68, @boxsidesviewport) @sprites["markingbg"] = IconSprite.new(292, 68, @boxsidesviewport)
@sprites["markingbg"].setBitmap("Graphics/Pictures/Storage/overlay_marking") @sprites["markingbg"].setBitmap("Graphics/UI/Storage/overlay_marking")
@sprites["markingbg"].visible = false @sprites["markingbg"].visible = false
@sprites["markingoverlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @boxsidesviewport) @sprites["markingoverlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @boxsidesviewport)
@sprites["markingoverlay"].visible = false @sprites["markingoverlay"].visible = false
@@ -1429,7 +1429,7 @@ class PokemonStorageScene
elsif pokemon.female? elsif pokemon.female?
textstrings.push([_INTL("♀"), 148, 14, 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 end
imagepos.push(["Graphics/Pictures/Storage/overlay_lv", 6, 246]) imagepos.push(["Graphics/UI/Storage/overlay_lv", 6, 246])
textstrings.push([pokemon.level.to_s, 28, 240, false, base, shadow]) textstrings.push([pokemon.level.to_s, 28, 240, false, base, shadow])
if pokemon.ability if pokemon.ability
textstrings.push([pokemon.ability.name, 86, 312, 2, base, shadow]) textstrings.push([pokemon.ability.name, 86, 312, 2, base, shadow])
@@ -1442,9 +1442,9 @@ class PokemonStorageScene
textstrings.push([_INTL("No item"), 86, 348, 2, nonbase, nonshadow]) textstrings.push([_INTL("No item"), 86, 348, 2, nonbase, nonshadow])
end end
if pokemon.shiny? if pokemon.shiny?
imagepos.push(["Graphics/Pictures/shiny", 156, 198]) imagepos.push(["Graphics/UI/shiny", 156, 198])
end end
typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types"))
pokemon.types.each_with_index do |type, i| pokemon.types.each_with_index do |type, i|
type_number = GameData::Type.get(type).icon_position type_number = GameData::Type.get(type).icon_position
type_rect = Rect.new(0, type_number * 28, 64, 28) type_rect = Rect.new(0, type_number * 28, 64, 28)

2
Data/Scripts/016_UI/018_UI_ItemStorage.rb
View File

@@ -75,7 +75,7 @@ class ItemStorage_Scene
@bag = bag @bag = bag
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["background"].setBitmap("Graphics/Pictures/pcItembg") @sprites["background"].setBitmap("Graphics/UI/itemstorage_bg")
@sprites["icon"] = ItemIconSprite.new(50, 334, nil, @viewport) @sprites["icon"] = ItemIconSprite.new(50, 334, nil, @viewport)
# Item list # Item list
@sprites["itemwindow"] = Window_PokemonItemStorage.new(@bag, 98, 14, 334, 32 + (ITEMSVISIBLE * 32)) @sprites["itemwindow"] = Window_PokemonItemStorage.new(@bag, 98, 14, 334, 32 + (ITEMSVISIBLE * 32))

4
Data/Scripts/016_UI/020_UI_PokeMart.rb
View File

@@ -157,7 +157,7 @@ class Window_PokemonMart < Window_DrawableCommand
@stock = stock @stock = stock
@adapter = adapter @adapter = adapter
super(x, y, width, height, viewport) super(x, y, width, height, viewport)
@selarrow = AnimatedBitmap.new("Graphics/Pictures/martSel") @selarrow = AnimatedBitmap.new("Graphics/UI/Mart/cursor")
@baseColor = Color.new(88, 88, 80) @baseColor = Color.new(88, 88, 80)
@shadowColor = Color.new(168, 184, 184) @shadowColor = Color.new(168, 184, 184)
self.windowskin = nil self.windowskin = nil
@@ -224,7 +224,7 @@ class PokemonMart_Scene
@adapter = adapter @adapter = adapter
@sprites = {} @sprites = {}
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["background"].setBitmap("Graphics/Pictures/martScreen") @sprites["background"].setBitmap("Graphics/UI/Mart/bg")
@sprites["icon"] = ItemIconSprite.new(36, Graphics.height - 50, nil, @viewport) @sprites["icon"] = ItemIconSprite.new(36, Graphics.height - 50, nil, @viewport)
winAdapter = buying ? BuyAdapter.new(adapter) : SellAdapter.new(adapter) winAdapter = buying ? BuyAdapter.new(adapter) : SellAdapter.new(adapter)
@sprites["itemwindow"] = Window_PokemonMart.new( @sprites["itemwindow"] = Window_PokemonMart.new(

16
Data/Scripts/016_UI/021_UI_MoveRelearner.rb
View File

@@ -25,13 +25,13 @@ class MoveRelearner_Scene
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
@sprites = {} @sprites = {}
addBackgroundPlane(@sprites, "bg", "reminderbg", @viewport) addBackgroundPlane(@sprites, "bg", "Move Reminder/bg", @viewport)
@sprites["pokeicon"] = PokemonIconSprite.new(@pokemon, @viewport) @sprites["pokeicon"] = PokemonIconSprite.new(@pokemon, @viewport)
@sprites["pokeicon"].setOffset(PictureOrigin::CENTER) @sprites["pokeicon"].setOffset(PictureOrigin::CENTER)
@sprites["pokeicon"].x = 320 @sprites["pokeicon"].x = 320
@sprites["pokeicon"].y = 84 @sprites["pokeicon"].y = 84
@sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["background"].setBitmap("Graphics/Pictures/reminderSel") @sprites["background"].setBitmap("Graphics/UI/Move Reminder/cursor")
@sprites["background"].y = 78 @sprites["background"].y = 78
@sprites["background"].src_rect = Rect.new(0, 72, 258, 72) @sprites["background"].src_rect = Rect.new(0, 72, 258, 72)
@sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@@ -42,7 +42,7 @@ class MoveRelearner_Scene
@sprites["msgwindow"] = Window_AdvancedTextPokemon.new("") @sprites["msgwindow"] = Window_AdvancedTextPokemon.new("")
@sprites["msgwindow"].visible = false @sprites["msgwindow"].visible = false
@sprites["msgwindow"].viewport = @viewport @sprites["msgwindow"].viewport = @viewport
@typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types"))
pbDrawMoveList pbDrawMoveList
pbDeactivateWindows(@sprites) pbDeactivateWindows(@sprites)
# Fade in all sprites # Fade in all sprites
@@ -68,7 +68,7 @@ class MoveRelearner_Scene
if moveobject if moveobject
moveData = GameData::Move.get(moveobject) moveData = GameData::Move.get(moveobject)
type_number = GameData::Type.get(moveData.display_type(@pokemon)).icon_position type_number = GameData::Type.get(moveData.display_type(@pokemon)).icon_position
imagepos.push(["Graphics/Pictures/types", 12, yPos - 4, 0, type_number * 28, 64, 28]) imagepos.push(["Graphics/UI/types", 12, yPos - 4, 0, type_number * 28, 64, 28])
textpos.push([moveData.name, 80, yPos, 0, Color.new(248, 248, 248), Color.black]) textpos.push([moveData.name, 80, yPos, 0, Color.new(248, 248, 248), Color.black])
textpos.push([_INTL("PP"), 112, yPos + 32, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)]) textpos.push([_INTL("PP"), 112, yPos + 32, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)])
if moveData.total_pp > 0 if moveData.total_pp > 0
@@ -80,7 +80,7 @@ class MoveRelearner_Scene
end end
yPos += 64 yPos += 64
end end
imagepos.push(["Graphics/Pictures/reminderSel", imagepos.push(["Graphics/UI/Move Reminder/cursor",
0, 78 + ((@sprites["commands"].index - @sprites["commands"].top_item) * 64), 0, 78 + ((@sprites["commands"].index - @sprites["commands"].top_item) * 64),
0, 0, 258, 72]) 0, 0, 258, 72])
selMoveData = GameData::Move.get(@moves[@sprites["commands"].index]) selMoveData = GameData::Move.get(@moves[@sprites["commands"].index])
@@ -95,12 +95,12 @@ class MoveRelearner_Scene
textpos.push([accuracy == 0 ? "---" : "#{accuracy}%", textpos.push([accuracy == 0 ? "---" : "#{accuracy}%",
468, 184, 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) pbDrawTextPositions(overlay, textpos)
imagepos.push(["Graphics/Pictures/category", 436, 116, 0, category * 28, 64, 28]) imagepos.push(["Graphics/UI/category", 436, 116, 0, category * 28, 64, 28])
if @sprites["commands"].index < @moves.length - 1 if @sprites["commands"].index < @moves.length - 1
imagepos.push(["Graphics/Pictures/reminderButtons", 48, 350, 0, 0, 76, 32]) imagepos.push(["Graphics/UI/Move Reminder/buttons", 48, 350, 0, 0, 76, 32])
end end
if @sprites["commands"].index > 0 if @sprites["commands"].index > 0
imagepos.push(["Graphics/Pictures/reminderButtons", 134, 350, 76, 0, 76, 32]) imagepos.push(["Graphics/UI/Move Reminder/buttons", 134, 350, 76, 0, 76, 32])
end end
pbDrawImagePositions(overlay, imagepos) pbDrawImagePositions(overlay, imagepos)
drawTextEx(overlay, 272, 216, 230, 5, selMoveData.description, drawTextEx(overlay, 272, 216, 230, 5, selMoveData.description,

2
Data/Scripts/016_UI/022_UI_PurifyChamber.rb
View File

@@ -1114,7 +1114,7 @@ class PurifyChamberScene
@viewport.z = 99999 @viewport.z = 99999
@viewportmsg = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewportmsg = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewportmsg.z = 99999 @viewportmsg.z = 99999
addBackgroundOrColoredPlane(@sprites, "bg", "purifychamberbg", addBackgroundOrColoredPlane(@sprites, "bg", "purifychamber_bg",
Color.new(64, 48, 96), @viewport) Color.new(64, 48, 96), @viewport)
@sprites["setwindow"] = Window_PurifyChamberSets.new( @sprites["setwindow"] = Window_PurifyChamberSets.new(
@chamber, 0, 0, 112, Graphics.height, @viewport @chamber, 0, 0, 112, Graphics.height, @viewport

2
Data/Scripts/016_UI/023_UI_MysteryGift.rb
View File

@@ -242,7 +242,7 @@ def pbDownloadMysteryGift(trainer)
sprites = {} sprites = {}
viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
viewport.z = 99999 viewport.z = 99999
addBackgroundPlane(sprites, "background", "mysteryGiftbg", viewport) addBackgroundPlane(sprites, "background", "mysterygift_bg", viewport)
pbFadeInAndShow(sprites) pbFadeInAndShow(sprites)
sprites["msgwindow"] = pbCreateMessageWindow sprites["msgwindow"] = pbCreateMessageWindow
pbMessageDisplay(sprites["msgwindow"], _INTL("Searching for a gift.\nPlease wait...\\wtnp[0]")) pbMessageDisplay(sprites["msgwindow"], _INTL("Searching for a gift.\nPlease wait...\\wtnp[0]"))

30
Data/Scripts/016_UI/024_UI_TextEntry.rb
View File

@@ -124,7 +124,7 @@ class PokemonEntryScene
meta = GameData::PlayerMetadata.get($player.character_ID) meta = GameData::PlayerMetadata.get($player.character_ID)
if meta if meta
@sprites["shadow"] = IconSprite.new(0, 0, @viewport) @sprites["shadow"] = IconSprite.new(0, 0, @viewport)
@sprites["shadow"].setBitmap("Graphics/Pictures/Naming/icon_shadow") @sprites["shadow"].setBitmap("Graphics/UI/Naming/icon_shadow")
@sprites["shadow"].x = 66 @sprites["shadow"].x = 66
@sprites["shadow"].y = 64 @sprites["shadow"].y = 64
filename = pbGetPlayerCharset(meta.walk_charset, nil, true) filename = pbGetPlayerCharset(meta.walk_charset, nil, true)
@@ -137,7 +137,7 @@ class PokemonEntryScene
when 2 # Pokémon when 2 # Pokémon
if pokemon if pokemon
@sprites["shadow"] = IconSprite.new(0, 0, @viewport) @sprites["shadow"] = IconSprite.new(0, 0, @viewport)
@sprites["shadow"].setBitmap("Graphics/Pictures/Naming/icon_shadow") @sprites["shadow"].setBitmap("Graphics/UI/Naming/icon_shadow")
@sprites["shadow"].x = 66 @sprites["shadow"].x = 66
@sprites["shadow"].y = 64 @sprites["shadow"].y = 64
@sprites["subject"] = PokemonIconSprite.new(pokemon, @viewport) @sprites["subject"] = PokemonIconSprite.new(pokemon, @viewport)
@@ -159,7 +159,7 @@ class PokemonEntryScene
end end
when 3 # NPC when 3 # NPC
@sprites["shadow"] = IconSprite.new(0, 0, @viewport) @sprites["shadow"] = IconSprite.new(0, 0, @viewport)
@sprites["shadow"].setBitmap("Graphics/Pictures/Naming/icon_shadow") @sprites["shadow"].setBitmap("Graphics/UI/Naming/icon_shadow")
@sprites["shadow"].x = 66 @sprites["shadow"].x = 66
@sprites["shadow"].y = 64 @sprites["shadow"].y = 64
@sprites["subject"] = TrainerWalkingCharSprite.new(pokemon.to_s, @viewport) @sprites["subject"] = TrainerWalkingCharSprite.new(pokemon.to_s, @viewport)
@@ -169,7 +169,7 @@ class PokemonEntryScene
@sprites["subject"].y = 76 - (charheight / 4) @sprites["subject"].y = 76 - (charheight / 4)
when 4 # Storage box when 4 # Storage box
@sprites["subject"] = TrainerWalkingCharSprite.new(nil, @viewport) @sprites["subject"] = TrainerWalkingCharSprite.new(nil, @viewport)
@sprites["subject"].altcharset = "Graphics/Pictures/Naming/icon_storage" @sprites["subject"].altcharset = "Graphics/UI/Naming/icon_storage"
@sprites["subject"].animspeed = 4 @sprites["subject"].animspeed = 4
charwidth = @sprites["subject"].bitmap.width charwidth = @sprites["subject"].bitmap.width
charheight = @sprites["subject"].bitmap.height charheight = @sprites["subject"].bitmap.height
@@ -281,9 +281,9 @@ class PokemonEntryScene2
def initialize(viewport) def initialize(viewport)
@sprite = Sprite.new(viewport) @sprite = Sprite.new(viewport)
@cursortype = 0 @cursortype = 0
@cursor1 = AnimatedBitmap.new("Graphics/Pictures/Naming/cursor_1") @cursor1 = AnimatedBitmap.new("Graphics/UI/Naming/cursor_1")
@cursor2 = AnimatedBitmap.new("Graphics/Pictures/Naming/cursor_2") @cursor2 = AnimatedBitmap.new("Graphics/UI/Naming/cursor_2")
@cursor3 = AnimatedBitmap.new("Graphics/Pictures/Naming/cursor_3") @cursor3 = AnimatedBitmap.new("Graphics/UI/Naming/cursor_3")
@cursorPos = 0 @cursorPos = 0
updateInternal updateInternal
end end
@@ -382,7 +382,7 @@ class PokemonEntryScene2
# Create bitmaps # Create bitmaps
@bitmaps = [] @bitmaps = []
@@Characters.length.times do |i| @@Characters.length.times do |i|
@bitmaps[i] = AnimatedBitmap.new(sprintf("Graphics/Pictures/Naming/overlay_tab_#{i + 1}")) @bitmaps[i] = AnimatedBitmap.new(sprintf("Graphics/UI/Naming/overlay_tab_#{i + 1}"))
b = @bitmaps[i].bitmap.clone b = @bitmaps[i].bitmap.clone
pbSetSystemFont(b) pbSetSystemFont(b)
textPos = [] textPos = []
@@ -403,13 +403,13 @@ class PokemonEntryScene2
# Create sprites # Create sprites
@sprites = {} @sprites = {}
@sprites["bg"] = IconSprite.new(0, 0, @viewport) @sprites["bg"] = IconSprite.new(0, 0, @viewport)
@sprites["bg"].setBitmap("Graphics/Pictures/Naming/bg") @sprites["bg"].setBitmap("Graphics/UI/Naming/bg")
case subject case subject
when 1 # Player when 1 # Player
meta = GameData::PlayerMetadata.get($player.character_ID) meta = GameData::PlayerMetadata.get($player.character_ID)
if meta if meta
@sprites["shadow"] = IconSprite.new(0, 0, @viewport) @sprites["shadow"] = IconSprite.new(0, 0, @viewport)
@sprites["shadow"].setBitmap("Graphics/Pictures/Naming/icon_shadow") @sprites["shadow"].setBitmap("Graphics/UI/Naming/icon_shadow")
@sprites["shadow"].x = 66 @sprites["shadow"].x = 66
@sprites["shadow"].y = 64 @sprites["shadow"].y = 64
filename = pbGetPlayerCharset(meta.walk_charset, nil, true) filename = pbGetPlayerCharset(meta.walk_charset, nil, true)
@@ -422,7 +422,7 @@ class PokemonEntryScene2
when 2 # Pokémon when 2 # Pokémon
if pokemon if pokemon
@sprites["shadow"] = IconSprite.new(0, 0, @viewport) @sprites["shadow"] = IconSprite.new(0, 0, @viewport)
@sprites["shadow"].setBitmap("Graphics/Pictures/Naming/icon_shadow") @sprites["shadow"].setBitmap("Graphics/UI/Naming/icon_shadow")
@sprites["shadow"].x = 66 @sprites["shadow"].x = 66
@sprites["shadow"].y = 64 @sprites["shadow"].y = 64
@sprites["subject"] = PokemonIconSprite.new(pokemon, @viewport) @sprites["subject"] = PokemonIconSprite.new(pokemon, @viewport)
@@ -444,7 +444,7 @@ class PokemonEntryScene2
end end
when 3 # NPC when 3 # NPC
@sprites["shadow"] = IconSprite.new(0, 0, @viewport) @sprites["shadow"] = IconSprite.new(0, 0, @viewport)
@sprites["shadow"].setBitmap("Graphics/Pictures/Naming/icon_shadow") @sprites["shadow"].setBitmap("Graphics/UI/Naming/icon_shadow")
@sprites["shadow"].x = 66 @sprites["shadow"].x = 66
@sprites["shadow"].y = 64 @sprites["shadow"].y = 64
@sprites["subject"] = TrainerWalkingCharSprite.new(pokemon.to_s, @viewport) @sprites["subject"] = TrainerWalkingCharSprite.new(pokemon.to_s, @viewport)
@@ -454,7 +454,7 @@ class PokemonEntryScene2
@sprites["subject"].y = 76 - (charheight / 4) @sprites["subject"].y = 76 - (charheight / 4)
when 4 # Storage box when 4 # Storage box
@sprites["subject"] = TrainerWalkingCharSprite.new(nil, @viewport) @sprites["subject"] = TrainerWalkingCharSprite.new(nil, @viewport)
@sprites["subject"].altcharset = "Graphics/Pictures/Naming/icon_storage" @sprites["subject"].altcharset = "Graphics/UI/Naming/icon_storage"
@sprites["subject"].animspeed = 4 @sprites["subject"].animspeed = 4
charwidth = @sprites["subject"].bitmap.width charwidth = @sprites["subject"].bitmap.width
charheight = @sprites["subject"].bitmap.height charheight = @sprites["subject"].bitmap.height
@@ -484,7 +484,7 @@ class PokemonEntryScene2
@sprites["controls"] = IconSprite.new(0, 0, @viewport) @sprites["controls"] = IconSprite.new(0, 0, @viewport)
@sprites["controls"].x = 16 @sprites["controls"].x = 16
@sprites["controls"].y = 96 @sprites["controls"].y = 96
@sprites["controls"].setBitmap(_INTL("Graphics/Pictures/Naming/overlay_controls")) @sprites["controls"].setBitmap(_INTL("Graphics/UI/Naming/overlay_controls"))
@init = true @init = true
@sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
pbDoUpdateOverlay2 pbDoUpdateOverlay2
@@ -502,7 +502,7 @@ class PokemonEntryScene2
def pbDoUpdateOverlay2 def pbDoUpdateOverlay2
overlay = @sprites["overlay"].bitmap overlay = @sprites["overlay"].bitmap
overlay.clear overlay.clear
modeIcon = [[_INTL("Graphics/Pictures/Naming/icon_mode"), 44 + (@mode * 62), 120, @mode * 60, 0, 60, 44]] modeIcon = [[_INTL("Graphics/UI/Naming/icon_mode"), 44 + (@mode * 62), 120, @mode * 60, 0, 60, 44]]
pbDrawImagePositions(overlay, modeIcon) pbDrawImagePositions(overlay, modeIcon)
end end

14
Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb
View File

@@ -84,12 +84,12 @@ class TriadCard
def self.createBack(type = nil, noback = false) def self.createBack(type = nil, noback = false)
bitmap = BitmapWrapper.new(80, 96) bitmap = BitmapWrapper.new(80, 96)
if !noback if !noback
cardbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_card_opponent") cardbitmap = AnimatedBitmap.new("Graphics/UI/Triple Triad/card_opponent")
bitmap.blt(0, 0, cardbitmap.bitmap, Rect.new(0, 0, cardbitmap.width, cardbitmap.height)) bitmap.blt(0, 0, cardbitmap.bitmap, Rect.new(0, 0, cardbitmap.width, cardbitmap.height))
cardbitmap.dispose cardbitmap.dispose
end end
if type if type
typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types"))
type_number = GameData::Type.get(type).icon_position type_number = GameData::Type.get(type).icon_position
typerect = Rect.new(0, type_number * 28, 64, 28) typerect = Rect.new(0, type_number * 28, 64, 28)
bitmap.blt(8, 50, typebitmap.bitmap, typerect, 192) bitmap.blt(8, 50, typebitmap.bitmap, typerect, 192)
@@ -102,13 +102,13 @@ class TriadCard
return TriadCard.createBack if owner == 0 return TriadCard.createBack if owner == 0
bitmap = BitmapWrapper.new(80, 96) bitmap = BitmapWrapper.new(80, 96)
if owner == 2 # Opponent if owner == 2 # Opponent
cardbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_card_opponent") cardbitmap = AnimatedBitmap.new("Graphics/UI/Triple Triad/card_opponent")
else # Player else # Player
cardbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_card_player") cardbitmap = AnimatedBitmap.new("Graphics/UI/Triple Triad/card_player")
end end
typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types"))
iconbitmap = AnimatedBitmap.new(GameData::Species.icon_filename(@species, @form)) iconbitmap = AnimatedBitmap.new(GameData::Species.icon_filename(@species, @form))
numbersbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_numbers") numbersbitmap = AnimatedBitmap.new("Graphics/UI/Triple Triad/numbers")
# Draw card background # Draw card background
bitmap.blt(0, 0, cardbitmap.bitmap, Rect.new(0, 0, cardbitmap.width, cardbitmap.height)) bitmap.blt(0, 0, cardbitmap.bitmap, Rect.new(0, 0, cardbitmap.width, cardbitmap.height))
# Draw type icon # Draw type icon
@@ -168,7 +168,7 @@ class TriadScene
# Allocate viewport # Allocate viewport
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
addBackgroundPlane(@sprites, "background", "triad_bg", @viewport) addBackgroundPlane(@sprites, "background", "Triple Triad/bg", @viewport)
@sprites["helpwindow"] = Window_AdvancedTextPokemon.newWithSize( @sprites["helpwindow"] = Window_AdvancedTextPokemon.newWithSize(
"", 0, Graphics.height - 64, Graphics.width, 64, @viewport "", 0, Graphics.height - 64, Graphics.width, 64, @viewport
) )

28
Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb
View File

@@ -32,8 +32,8 @@ class SlotMachineReel < BitmapSprite
@stopping = false @stopping = false
@slipping = 0 @slipping = 0
@index = rand(@reel.length) @index = rand(@reel.length)
@images = AnimatedBitmap.new(_INTL("Graphics/Pictures/Slot Machine/images")) @images = AnimatedBitmap.new(_INTL("Graphics/UI/Slot Machine/images"))
@shading = AnimatedBitmap.new("Graphics/Pictures/Slot Machine/ReelOverlay") @shading = AnimatedBitmap.new("Graphics/UI/Slot Machine/ReelOverlay")
update update
end end
@@ -88,7 +88,7 @@ class SlotMachineScore < BitmapSprite
@viewport = Viewport.new(x, y, 70, 22) @viewport = Viewport.new(x, y, 70, 22)
@viewport.z = 99999 @viewport.z = 99999
super(70, 22, @viewport) super(70, 22, @viewport)
@numbers = AnimatedBitmap.new("Graphics/Pictures/Slot Machine/numbers") @numbers = AnimatedBitmap.new("Graphics/UI/Slot Machine/numbers")
self.score = score self.score = score
end end
@@ -181,10 +181,10 @@ class SlotMachineScene
Input.update Input.update
update update
@sprites["window2"].bitmap&.clear @sprites["window2"].bitmap&.clear
@sprites["window1"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/win")) @sprites["window1"].setBitmap(sprintf("Graphics/UI/Slot Machine/win"))
@sprites["window1"].src_rect.set(152 * ((frame / timePerFrame) % 4), 0, 152, 208) @sprites["window1"].src_rect.set(152 * ((frame / timePerFrame) % 4), 0, 152, 208)
if bonus > 0 if bonus > 0
@sprites["window2"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/bonus")) @sprites["window2"].setBitmap(sprintf("Graphics/UI/Slot Machine/bonus"))
@sprites["window2"].src_rect.set(152 * (bonus - 1), 0, 152, 208) @sprites["window2"].src_rect.set(152 * (bonus - 1), 0, 152, 208)
end end
@sprites["light1"].visible = true @sprites["light1"].visible = true
@@ -229,7 +229,7 @@ class SlotMachineScene
Input.update Input.update
update update
@sprites["window2"].bitmap&.clear @sprites["window2"].bitmap&.clear
@sprites["window1"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/lose")) @sprites["window1"].setBitmap(sprintf("Graphics/UI/Slot Machine/lose"))
@sprites["window1"].src_rect.set(152 * ((frame / timePerFrame) % 2), 0, 152, 208) @sprites["window1"].src_rect.set(152 * ((frame / timePerFrame) % 2), 0, 152, 208)
frame += 1 frame += 1
end end
@@ -247,25 +247,25 @@ class SlotMachineScene
@sprites["reel3"] = SlotMachineReel.new(224, 112, difficulty) @sprites["reel3"] = SlotMachineReel.new(224, 112, difficulty)
(1..3).each do |i| (1..3).each do |i|
@sprites["button#{i}"] = IconSprite.new(68 + (80 * (i - 1)), 260, @viewport) @sprites["button#{i}"] = IconSprite.new(68 + (80 * (i - 1)), 260, @viewport)
@sprites["button#{i}"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/button")) @sprites["button#{i}"].setBitmap(sprintf("Graphics/UI/Slot Machine/button"))
@sprites["button#{i}"].visible = false @sprites["button#{i}"].visible = false
end end
(1..5).each do |i| (1..5).each do |i|
y = [170, 122, 218, 82, 82][i - 1] y = [170, 122, 218, 82, 82][i - 1]
@sprites["row#{i}"] = IconSprite.new(2, y, @viewport) @sprites["row#{i}"] = IconSprite.new(2, y, @viewport)
@sprites["row#{i}"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/line%1d%s", @sprites["row#{i}"].setBitmap(sprintf("Graphics/UI/Slot Machine/line%1d%s",
1 + (i / 2), (i >= 4) ? ((i == 4) ? "a" : "b") : "")) 1 + (i / 2), (i >= 4) ? ((i == 4) ? "a" : "b") : ""))
@sprites["row#{i}"].visible = false @sprites["row#{i}"].visible = false
end end
@sprites["light1"] = IconSprite.new(16, 32, @viewport) @sprites["light1"] = IconSprite.new(16, 32, @viewport)
@sprites["light1"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/lights")) @sprites["light1"].setBitmap(sprintf("Graphics/UI/Slot Machine/lights"))
@sprites["light1"].visible = false @sprites["light1"].visible = false
@sprites["light2"] = IconSprite.new(240, 32, @viewport) @sprites["light2"] = IconSprite.new(240, 32, @viewport)
@sprites["light2"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/lights")) @sprites["light2"].setBitmap(sprintf("Graphics/UI/Slot Machine/lights"))
@sprites["light2"].mirror = true @sprites["light2"].mirror = true
@sprites["light2"].visible = false @sprites["light2"].visible = false
@sprites["window1"] = IconSprite.new(358, 96, @viewport) @sprites["window1"] = IconSprite.new(358, 96, @viewport)
@sprites["window1"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/insert")) @sprites["window1"].setBitmap(sprintf("Graphics/UI/Slot Machine/insert"))
@sprites["window1"].src_rect.set(0, 0, 152, 208) @sprites["window1"].src_rect.set(0, 0, 152, 208)
@sprites["window2"] = IconSprite.new(358, 96, @viewport) @sprites["window2"] = IconSprite.new(358, 96, @viewport)
@sprites["credit"] = SlotMachineScore.new(360, 66, $player.coins) @sprites["credit"] = SlotMachineScore.new(360, 66, $player.coins)
@@ -292,7 +292,7 @@ class SlotMachineScene
pbMessage(_INTL("You've run out of Coins.\nGame over!")) pbMessage(_INTL("You've run out of Coins.\nGame over!"))
break break
elsif @gameRunning # Reels are spinning elsif @gameRunning # Reels are spinning
@sprites["window1"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/stop")) @sprites["window1"].setBitmap(sprintf("Graphics/UI/Slot Machine/stop"))
@sprites["window1"].src_rect.set(152 * ((frame / spinFrameTime) % 4), 0, 152, 208) @sprites["window1"].src_rect.set(152 * ((frame / spinFrameTime) % 4), 0, 152, 208)
if Input.trigger?(Input::USE) if Input.trigger?(Input::USE)
pbSEPlay("Slots stop") pbSEPlay("Slots stop")
@@ -322,10 +322,10 @@ class SlotMachineScene
end end
@gameEnd = false @gameEnd = false
else # Awaiting coins for the next spin else # Awaiting coins for the next spin
@sprites["window1"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/insert")) @sprites["window1"].setBitmap(sprintf("Graphics/UI/Slot Machine/insert"))
@sprites["window1"].src_rect.set(152 * ((frame / insertFrameTime) % 2), 0, 152, 208) @sprites["window1"].src_rect.set(152 * ((frame / insertFrameTime) % 2), 0, 152, 208)
if @wager > 0 if @wager > 0
@sprites["window2"].setBitmap(sprintf("Graphics/Pictures/Slot Machine/press")) @sprites["window2"].setBitmap(sprintf("Graphics/UI/Slot Machine/press"))
@sprites["window2"].src_rect.set(152 * ((frame / insertFrameTime) % 2), 0, 152, 208) @sprites["window2"].src_rect.set(152 * ((frame / insertFrameTime) % 2), 0, 152, 208)
end end
if Input.trigger?(Input::DOWN) && @wager < 3 && @sprites["credit"].score > 0 if Input.trigger?(Input::DOWN) && @wager < 3 && @sprites["credit"].score > 0

4
Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb
View File

@@ -37,7 +37,7 @@ class VoltorbFlip
@index = [0, 0] @index = [0, 0]
# [x,y,points,selected] # [x,y,points,selected]
@squares = [0, 0, 0, false] @squares = [0, 0, 0, false]
@directory = "Graphics/Pictures/Voltorb Flip/" @directory = "Graphics/UI/Voltorb Flip/"
squareValues = [] squareValues = []
total = 1 total = 1
voltorbs = 0 voltorbs = 0
@@ -152,7 +152,7 @@ class VoltorbFlip
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
@sprites["bg"] = Sprite.new(@viewport) @sprites["bg"] = Sprite.new(@viewport)
@sprites["bg"].bitmap = RPG::Cache.load_bitmap(@directory, "boardbg") @sprites["bg"].bitmap = RPG::Cache.load_bitmap(@directory, "bg")
@sprites["text"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["text"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
pbSetSystemFont(@sprites["text"].bitmap) pbSetSystemFont(@sprites["text"].bitmap)
@sprites["level"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["level"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)

18
Data/Scripts/017_Minigames/006_Minigame_Mining.rb
View File

@@ -12,7 +12,7 @@ class MiningGameCounter < BitmapSprite
@viewport.z = 99999 @viewport.z = 99999
super(416, 60, @viewport) super(416, 60, @viewport)
@hits = 0 @hits = 0
@image = AnimatedBitmap.new("Graphics/Pictures/Mining/cracks") @image = AnimatedBitmap.new("Graphics/UI/Mining/cracks")
update update
end end
@@ -53,7 +53,7 @@ class MiningGameTile < BitmapSprite
else else
@layer = 6 # 15% @layer = 6 # 15%
end end
@image = AnimatedBitmap.new("Graphics/Pictures/Mining/tiles") @image = AnimatedBitmap.new("Graphics/UI/Mining/tiles")
update update
end end
@@ -89,9 +89,9 @@ class MiningGameCursor < BitmapSprite
@mode = mode @mode = mode
@hit = 0 # 0=regular, 1=hit item, 2=hit iron @hit = 0 # 0=regular, 1=hit item, 2=hit iron
@counter = 0 @counter = 0
@cursorbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/cursor") @cursorbitmap = AnimatedBitmap.new("Graphics/UI/Mining/cursor")
@toolbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/tools") @toolbitmap = AnimatedBitmap.new("Graphics/UI/Mining/tools")
@hitsbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/hits") @hitsbitmap = AnimatedBitmap.new("Graphics/UI/Mining/hits")
update update
end end
@@ -230,10 +230,10 @@ class MiningGameScene
@sprites = {} @sprites = {}
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
addBackgroundPlane(@sprites, "bg", "Mining/miningbg", @viewport) addBackgroundPlane(@sprites, "bg", "Mining/bg", @viewport)
@sprites["itemlayer"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["itemlayer"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@itembitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/items") @itembitmap = AnimatedBitmap.new("Graphics/UI/Mining/items")
@ironbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/irons") @ironbitmap = AnimatedBitmap.new("Graphics/UI/Mining/irons")
@items = [] @items = []
@itemswon = [] @itemswon = []
@iron = [] @iron = []
@@ -247,7 +247,7 @@ class MiningGameScene
@sprites["crack"] = MiningGameCounter.new(0, 4) @sprites["crack"] = MiningGameCounter.new(0, 4)
@sprites["cursor"] = MiningGameCursor.new(58, 0) # central position, pick @sprites["cursor"] = MiningGameCursor.new(58, 0) # central position, pick
@sprites["tool"] = IconSprite.new(434, 254, @viewport) @sprites["tool"] = IconSprite.new(434, 254, @viewport)
@sprites["tool"].setBitmap(sprintf("Graphics/Pictures/Mining/toolicons")) @sprites["tool"].setBitmap(sprintf("Graphics/UI/Mining/toolicons"))
@sprites["tool"].src_rect.set(0, 0, 68, 100) @sprites["tool"].src_rect.set(0, 0, 68, 100)
update update
pbFadeInAndShow(@sprites) pbFadeInAndShow(@sprites)

18
Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb
View File

@@ -35,7 +35,7 @@ class TilePuzzleCursor < BitmapSprite
@arrows = [] @arrows = []
@selected = false @selected = false
@holding = false @holding = false
@cursorbitmap = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/cursor") @cursorbitmap = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/cursor")
update update
end end
@@ -148,23 +148,23 @@ class TilePuzzleScene
@sprites = {} @sprites = {}
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
if pbResolveBitmap("Graphics/Pictures/Tile Puzzle/bg#{@board}") if pbResolveBitmap("Graphics/UI/Tile Puzzle/bg#{@board}")
addBackgroundPlane(@sprites, "bg", "Tile Puzzle/bg#{@board}", @viewport) addBackgroundPlane(@sprites, "bg", "Tile Puzzle/bg#{@board}", @viewport)
else else
addBackgroundPlane(@sprites, "bg", "Tile Puzzle/bg", @viewport) addBackgroundPlane(@sprites, "bg", "Tile Puzzle/bg", @viewport)
end end
@tilebitmap = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/tiles#{@board}") @tilebitmap = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/tiles#{@board}")
@tilebitmap1 = nil @tilebitmap1 = nil
@tilebitmap2 = nil @tilebitmap2 = nil
@tilebitmap3 = nil @tilebitmap3 = nil
if pbResolveBitmap("Graphics/Pictures/Tile Puzzle/tiles#{@board}_1") if pbResolveBitmap("Graphics/UI/Tile Puzzle/tiles#{@board}_1")
@tilebitmap1 = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/tiles#{@board}_1") @tilebitmap1 = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/tiles#{@board}_1")
end end
if pbResolveBitmap("Graphics/Pictures/Tile Puzzle/tiles#{@board}_2") if pbResolveBitmap("Graphics/UI/Tile Puzzle/tiles#{@board}_2")
@tilebitmap2 = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/tiles#{@board}_2") @tilebitmap2 = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/tiles#{@board}_2")
end end
if pbResolveBitmap("Graphics/Pictures/Tile Puzzle/tiles#{@board}_3") if pbResolveBitmap("Graphics/UI/Tile Puzzle/tiles#{@board}_3")
@tilebitmap3 = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/tiles#{@board}_3") @tilebitmap3 = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/tiles#{@board}_3")
end end
@tilewidth = @tilebitmap.width / @boardwidth @tilewidth = @tilebitmap.width / @boardwidth
@tileheight = @tilebitmap.height / @boardheight @tileheight = @tilebitmap.height / @boardheight

2
Data/Scripts/020_Debug/001_Editor screens/003_EditorScreens_MapConnections.rb
View File

@@ -107,7 +107,7 @@ class RegionMapSprite
def createRegionMap(map) def createRegionMap(map)
@mapdata = pbLoadTownMapData @mapdata = pbLoadTownMapData
@map = @mapdata[map] @map = @mapdata[map]
bitmap = AnimatedBitmap.new("Graphics/Pictures/#{@map[1]}").deanimate bitmap = AnimatedBitmap.new("Graphics/UI/Town Map/#{@map[1]}").deanimate
retbitmap = BitmapWrapper.new(bitmap.width / 2, bitmap.height / 2) retbitmap = BitmapWrapper.new(bitmap.width / 2, bitmap.height / 2)
retbitmap.stretch_blt( retbitmap.stretch_blt(
Rect.new(0, 0, bitmap.width / 2, bitmap.height / 2), Rect.new(0, 0, bitmap.width / 2, bitmap.height / 2),

2
Data/Scripts/020_Debug/001_Editor screens/004_EditorScreens_SpritePositioning.rb
View File

@@ -67,7 +67,7 @@ class SpritePositioner
@sprites["base_1"].y -= @sprites["base_1"].bitmap.height / 2 if @sprites["base_1"].bitmap @sprites["base_1"].y -= @sprites["base_1"].bitmap.height / 2 if @sprites["base_1"].bitmap
@sprites["base_1"].z = 1 @sprites["base_1"].z = 1
@sprites["messageBox"] = IconSprite.new(0, Graphics.height - 96, @viewport) @sprites["messageBox"] = IconSprite.new(0, Graphics.height - 96, @viewport)
@sprites["messageBox"].setBitmap("Graphics/Pictures/Battle/debug_message") @sprites["messageBox"].setBitmap("Graphics/UI/Debug/battle_message")
@sprites["messageBox"].z = 2 @sprites["messageBox"].z = 2
@sprites["shadow_1"] = IconSprite.new(0, 0, @viewport) @sprites["shadow_1"] = IconSprite.new(0, 0, @viewport)
@sprites["shadow_1"].z = 3 @sprites["shadow_1"].z = 3

10
Data/Scripts/020_Debug/002_Animation editor/001_AnimEditor_SceneElements.rb
View File

@@ -173,7 +173,7 @@ class AnimationWindow < Sprite
def initialize(x, y, width, height, viewport = nil) def initialize(x, y, width, height, viewport = nil)
super(viewport) super(viewport)
@animbitmap = nil @animbitmap = nil
@arrows = AnimatedBitmap.new("Graphics/Pictures/arrows") @arrows = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_arrows")
self.x = x self.x = x
self.y = y self.y = y
@start = 0 @start = 0
@@ -373,7 +373,7 @@ class SpriteFrame < InvalidatableSprite
@prevcolor = Color.new(64, 128, 192) @prevcolor = Color.new(64, 128, 192)
@contents = Bitmap.new(64, 64) @contents = Bitmap.new(64, 64)
self.z = (@previous) ? 49 : 50 self.z = (@previous) ? 49 : 50
@iconbitmap = AnimatedBitmap.new("Graphics/Pictures/animFrameIcon") @iconbitmap = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_frame_icons")
self.bitmap = @contents self.bitmap = @contents
self.invalidate self.invalidate
end end
@@ -453,9 +453,9 @@ class AnimationCanvas < Sprite
@playingframe = 0 @playingframe = 0
@player = nil @player = nil
@battle = MiniBattle.new @battle = MiniBattle.new
@user = AnimatedBitmap.new("Graphics/Pictures/testback").deanimate @user = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_battler_back").deanimate
@target = AnimatedBitmap.new("Graphics/Pictures/testfront").deanimate @target = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_battler_front").deanimate
@testscreen = AnimatedBitmap.new("Graphics/Pictures/testscreen") @testscreen = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_battle_bg")
self.bitmap = @testscreen.bitmap self.bitmap = @testscreen.bitmap
PBAnimation::MAX_SPRITES.times do |i| PBAnimation::MAX_SPRITES.times do |i|
@lastframesprites[i] = SpriteFrame.new(i, @celsprites[i], viewport, true) @lastframesprites[i] = SpriteFrame.new(i, @celsprites[i], viewport, true)