From ae9181153782285fcbe9ce8864c17a795b248b59 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 14 Aug 2022 01:07:06 +0100 Subject: [PATCH] Created folder Graphics/UI, renamed some UI graphics --- Data/Scripts/001_Settings.rb | 6 +- .../006_Map renderer/004_TileDrawingHelper.rb | 4 +- .../007_Objects and windows/001_RPG_Cache.rb | 4 ++ .../002_MessageConfig.rb | 8 +-- .../005_SpriteWindow_text.rb | 18 +++--- .../001_Hardcoded data/004_BodyShape.rb | 2 +- .../010_Data/001_Hardcoded data/010_Status.rb | 8 +-- .../Scripts/010_Data/002_PBS data/006_Item.rb | 6 +- .../010_Data/002_PBS data/014_TrainerType.rb | 4 +- .../004_Scene/002_Scene_Initialize.rb | 4 +- .../004_Scene/005_Battle_Scene_Menus.rb | 28 +++++----- .../004_Scene/006_Battle_Scene_Objects.rb | 30 +++++----- .../004_Scene/008_Battle_Scene_Animations.rb | 8 +-- .../001_SafariBattle.rb | 2 +- .../004_BattleArenaBattle.rb | 4 +- .../012_Overworld/004_Overworld_FieldMoves.rb | 4 +- Data/Scripts/013_Items/006_Item_Mail.rb | 2 +- .../001_Non-interactive UI/002_UI_Controls.rb | 16 +++--- .../003_UI_EggHatching.rb | 2 +- .../004_UI_Evolution.rb | 2 +- .../001_Non-interactive UI/005_UI_Trading.rb | 2 +- .../006_UI_HallOfFame.rb | 4 +- Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb | 8 +-- Data/Scripts/016_UI/003_UI_Pokedex_Main.rb | 44 +++++++-------- Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb | 26 ++++----- Data/Scripts/016_UI/005_UI_Party.rb | 56 +++++++++---------- Data/Scripts/016_UI/006_UI_Summary.rb | 54 +++++++++--------- Data/Scripts/016_UI/007_UI_Bag.rb | 24 ++++---- Data/Scripts/016_UI/008_UI_Pokegear.rb | 14 ++--- Data/Scripts/016_UI/009_UI_RegionMap.rb | 10 ++-- Data/Scripts/016_UI/010_UI_Phone.rb | 8 +-- Data/Scripts/016_UI/011_UI_Jukebox.rb | 2 +- Data/Scripts/016_UI/012_UI_TrainerCard.rb | 10 ++-- Data/Scripts/016_UI/013_UI_Load.rb | 6 +- Data/Scripts/016_UI/016_UI_ReadyMenu.rb | 4 +- Data/Scripts/016_UI/017_UI_PokemonStorage.rb | 32 +++++------ Data/Scripts/016_UI/018_UI_ItemStorage.rb | 2 +- Data/Scripts/016_UI/020_UI_PokeMart.rb | 4 +- Data/Scripts/016_UI/021_UI_MoveRelearner.rb | 16 +++--- Data/Scripts/016_UI/022_UI_PurifyChamber.rb | 2 +- Data/Scripts/016_UI/023_UI_MysteryGift.rb | 2 +- Data/Scripts/016_UI/024_UI_TextEntry.rb | 30 +++++----- .../017_Minigames/002_Minigame_TripleTriad.rb | 14 ++--- .../017_Minigames/003_Minigame_SlotMachine.rb | 28 +++++----- .../017_Minigames/004_Minigame_VoltorbFlip.rb | 4 +- .../017_Minigames/006_Minigame_Mining.rb | 18 +++--- .../017_Minigames/007_Minigame_TilePuzzles.rb | 18 +++--- .../003_EditorScreens_MapConnections.rb | 2 +- .../004_EditorScreens_SpritePositioning.rb | 2 +- .../001_AnimEditor_SceneElements.rb | 10 ++-- 50 files changed, 311 insertions(+), 307 deletions(-) diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index f688a9fba..073cf51bd 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -246,11 +246,11 @@ module Settings # * Game Switch; the graphic is shown if this is ON (non-wall maps only). # * X 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. REGION_MAP_EXTRAS = [ - [0, 51, 16, 15, "mapHiddenBerth", false], - [0, 52, 20, 14, "mapHiddenFaraday", false] + [0, 51, 16, 15, "hidden_Berth", false], + [0, 52, 20, 14, "hidden_Faraday", false] ] # Whether the player can use Fly while looking at the Town Map. This is only diff --git a/Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb b/Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb index 57554fa36..95680e76f 100644 --- a/Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb +++ b/Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb @@ -196,7 +196,7 @@ end def getPassabilityMinimap(mapid) map = load_data(sprintf("Data/Map%03d.rxdata", mapid)) 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) passtable = Table.new(map.width, map.height) passages = tileset.passages @@ -221,6 +221,6 @@ def getPassabilityMinimap(mapid) bltMinimapAutotile(ret, i * 6, j * 6, minimap.bitmap, tile) end end - minimap.disposes + minimap.dispose return ret end diff --git a/Data/Scripts/007_Objects and windows/001_RPG_Cache.rb b/Data/Scripts/007_Objects and windows/001_RPG_Cache.rb index 59dacc639..d42452c43 100644 --- a/Data/Scripts/007_Objects and windows/001_RPG_Cache.rb +++ b/Data/Scripts/007_Objects and windows/001_RPG_Cache.rb @@ -86,6 +86,10 @@ module RPG self.load_bitmap("Graphics/Transitions/", filename) end + def self.ui(filename) + self.load_bitmap("Graphics/UI/", filename) + end + def self.retain(folder_name, filename = "", hue = 0) path = folder_name + filename ret = fromCache(path) diff --git a/Data/Scripts/007_Objects and windows/002_MessageConfig.rb b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb index 5edfade82..db1d6c8f5 100644 --- a/Data/Scripts/007_Objects and windows/002_MessageConfig.rb +++ b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb @@ -717,12 +717,12 @@ end #=============================================================================== # Adds a background to the sprite hash. # _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. # _viewport_ is a viewport to place the background in. def addBackgroundPlane(sprites, planename, background, viewport = nil) sprites[planename] = AnimatedPlane.new(viewport) - bitmapName = pbResolveBitmap("Graphics/Pictures/#{background}") + bitmapName = pbResolveBitmap("Graphics/UI/#{background}") if bitmapName.nil? # Plane should exist in any case sprites[planename].bitmap = nil @@ -739,12 +739,12 @@ end # Adds a background to the sprite hash. # _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. # _color_ is the color to use if the background can't be found. # _viewport_ is a viewport to place the background in. def addBackgroundOrColoredPlane(sprites, planename, background, color, viewport = nil) - bitmapName = pbResolveBitmap("Graphics/Pictures/#{background}") + bitmapName = pbResolveBitmap("Graphics/UI/#{background}") if bitmapName.nil? # Plane should exist in any case sprites[planename] = ColoredPlane.new(color, viewport) diff --git a/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb b/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb index 2e374df52..3420d5c93 100644 --- a/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb +++ b/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb @@ -417,7 +417,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base def allocPause return if @pausesprite - @pausesprite = AnimatedSprite.create("Graphics/Pictures/pause", 4, 3) + @pausesprite = AnimatedSprite.create("Graphics/UI/pause_arrow", 4, 3) @pausesprite.z = 100000 @pausesprite.visible = false end @@ -958,10 +958,10 @@ end #=============================================================================== module UpDownArrowMixin def initUpDownArrow - @uparrow = AnimatedSprite.create("Graphics/Pictures/uparrow", 8, 2, self.viewport) - @downarrow = AnimatedSprite.create("Graphics/Pictures/downarrow", 8, 2, self.viewport) - RPG::Cache.retain("Graphics/Pictures/uparrow") - RPG::Cache.retain("Graphics/Pictures/downarrow") + @uparrow = AnimatedSprite.create("Graphics/UI/up_arrow", 8, 2, self.viewport) + @downarrow = AnimatedSprite.create("Graphics/UI/down_arrow", 8, 2, self.viewport) + RPG::Cache.retain("Graphics/UI/up_arrow") + RPG::Cache.retain("Graphics/UI/down_arrow") @uparrow.z = 99998 @downarrow.z = 99998 @uparrow.visible = false @@ -1043,11 +1043,11 @@ class Window_DrawableCommand < SpriteWindow_SelectableEx super(x, y, width, height) self.viewport = viewport if viewport if isDarkWindowskin(self.windowskin) - @selarrow = AnimatedBitmap.new("Graphics/Pictures/selarrow_white") - RPG::Cache.retain("Graphics/Pictures/selarrow_white") + @selarrow = AnimatedBitmap.new("Graphics/UI/sel_arrow_white") + RPG::Cache.retain("Graphics/UI/sel_arrow_white") else - @selarrow = AnimatedBitmap.new("Graphics/Pictures/selarrow") - RPG::Cache.retain("Graphics/Pictures/selarrow") + @selarrow = AnimatedBitmap.new("Graphics/UI/sel_arrow") + RPG::Cache.retain("Graphics/UI/sel_arrow") end @index = 0 colors = getDefaultTextColors(self.windowskin) diff --git a/Data/Scripts/010_Data/001_Hardcoded data/004_BodyShape.rb b/Data/Scripts/010_Data/001_Hardcoded data/004_BodyShape.rb index 8d5a7b5b0..16d513dbf 100644 --- a/Data/Scripts/010_Data/001_Hardcoded data/004_BodyShape.rb +++ b/Data/Scripts/010_Data/001_Hardcoded data/004_BodyShape.rb @@ -1,6 +1,6 @@ # NOTE: The order these shapes are registered are the order they are listed in # 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. module GameData class BodyShape diff --git a/Data/Scripts/010_Data/001_Hardcoded data/010_Status.rb b/Data/Scripts/010_Data/001_Hardcoded data/010_Status.rb index 43ec0e1ff..3b4e53845 100644 --- a/Data/Scripts/010_Data/001_Hardcoded data/010_Status.rb +++ b/Data/Scripts/010_Data/001_Hardcoded data/010_Status.rb @@ -1,7 +1,7 @@ -# NOTE: "Graphics/Pictures/statuses.png" also contains icons for being fainted -# and for having Pokérus, in that order, at the bottom of the graphic. -# "Graphics/Pictures/Battle/icon_statuses.png" also contains an icon for -# bad poisoning (toxic), at the bottom of the graphic. +# NOTE: "Graphics/UI/statuses.png" also contains icons for being fainted and for +# having Pokérus, in that order, at the bottom of the graphic. +# "Graphics/UI/Battle/icon_statuses.png" also contains an icon for bad +# poisoning (toxic), at the bottom of the graphic. # Both graphics automatically handle varying numbers of defined statuses, # as long as their extra icons remain at the bottom of them. module GameData diff --git a/Data/Scripts/010_Data/002_PBS data/006_Item.rb b/Data/Scripts/010_Data/002_PBS data/006_Item.rb index bac5a775c..0c377b323 100644 --- a/Data/Scripts/010_Data/002_PBS data/006_Item.rb +++ b/Data/Scripts/010_Data/002_PBS data/006_Item.rb @@ -67,16 +67,16 @@ module GameData return nil if !item_data name_base = (item_data.is_mail?) ? "mail" : "item" # 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 sprintf("Graphics/Pictures/Party/icon_%s", name_base) + return sprintf("Graphics/UI/Party/icon_%s", name_base) end def self.mail_filename(item) item_data = self.try_get(item) return nil if !item_data # 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 end diff --git a/Data/Scripts/010_Data/002_PBS data/014_TrainerType.rb b/Data/Scripts/010_Data/002_PBS data/014_TrainerType.rb index cddc2b6eb..57991e127 100644 --- a/Data/Scripts/010_Data/002_PBS data/014_TrainerType.rb +++ b/Data/Scripts/010_Data/002_PBS data/014_TrainerType.rb @@ -71,12 +71,12 @@ module GameData end 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 def self.player_map_icon_filename(tr_type) 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 def initialize(hash) diff --git a/Data/Scripts/011_Battle/004_Scene/002_Scene_Initialize.rb b/Data/Scripts/011_Battle/004_Scene/002_Scene_Initialize.rb index 58bde1144..a27a34a9a 100644 --- a/Data/Scripts/011_Battle/004_Scene/002_Scene_Initialize.rb +++ b/Data/Scripts/011_Battle/004_Scene/002_Scene_Initialize.rb @@ -28,7 +28,7 @@ class Battle::Scene pbCreateBackdropSprites # Create message box graphic messageBox = pbAddSprite("messageBox", 0, Graphics.height - 96, - "Graphics/Pictures/Battle/overlay_message", @viewport) + "Graphics/UI/Battle/overlay_message", @viewport) messageBox.z = 195 # Create message window (displays the message) msgWindow = Window_AdvancedTextPokemon.newWithSize( @@ -50,7 +50,7 @@ class Battle::Scene # The party lineup graphics (bar and balls) for both sides 2.times do |side| partyBar = pbAddSprite("partyBar_#{side}", 0, 0, - "Graphics/Pictures/Battle/overlay_lineup", @viewport) + "Graphics/UI/Battle/overlay_lineup", @viewport) partyBar.z = 120 partyBar.mirror = true if side == 0 # Player's lineup bar only partyBar.visible = false diff --git a/Data/Scripts/011_Battle/004_Scene/005_Battle_Scene_Menus.rb b/Data/Scripts/011_Battle/004_Scene/005_Battle_Scene_Menus.rb index 66379bee6..bb60d9fc4 100644 --- a/Data/Scripts/011_Battle/004_Scene/005_Battle_Scene_Menus.rb +++ b/Data/Scripts/011_Battle/004_Scene/005_Battle_Scene_Menus.rb @@ -97,10 +97,10 @@ end # Command menu (Fight/Pokémon/Bag/Run) #=============================================================================== class Battle::Scene::CommandMenu < Battle::Scene::MenuBase - # If true, displays graphics from Graphics/Pictures/Battle/overlay_command.png - # and Graphics/Pictures/Battle/cursor_command.png. + # If true, displays graphics from Graphics/UI/Battle/overlay_command.png + # and Graphics/UI/Battle/cursor_command.png. # 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 # displayed. USE_GRAPHICS = true @@ -128,10 +128,10 @@ class Battle::Scene::CommandMenu < Battle::Scene::MenuBase if USE_GRAPHICS # Create background graphic 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) # Create bitmaps - @buttonBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/cursor_command")) + @buttonBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Battle/cursor_command")) # Create action buttons @buttons = Array.new(4) do |i| # 4 command options, therefore 4 buttons button = Sprite.new(viewport) @@ -205,10 +205,10 @@ class Battle::Scene::FightMenu < Battle::Scene::MenuBase GET_MOVE_TEXT_COLOR_FROM_MOVE_BUTTON = true - # If true, displays graphics from Graphics/Pictures/Battle/overlay_fight.png - # and Graphics/Pictures/Battle/cursor_fight.png. + # If true, displays graphics from Graphics/UI/Battle/overlay_fight.png + # and Graphics/UI/Battle/cursor_fight.png. # 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 # displayed. USE_GRAPHICS = true @@ -231,13 +231,13 @@ class Battle::Scene::FightMenu < Battle::Scene::MenuBase # 0=don't show, 1=show unpressed, 2=show pressed if USE_GRAPHICS # Create bitmaps - @buttonBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/cursor_fight")) - @typeBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) - @megaEvoBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/cursor_mega")) - @shiftBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/cursor_shift")) + @buttonBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Battle/cursor_fight")) + @typeBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types")) + @megaEvoBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Battle/cursor_mega")) + @shiftBitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Battle/cursor_shift")) # Create background graphic 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) # Create move buttons @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. # 0=select 1 button (@index), 1=select all buttons with text # Create bitmaps - @buttonBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/cursor_target") + @buttonBitmap = AnimatedBitmap.new("Graphics/UI/Battle/cursor_target") # Create target buttons @buttons = Array.new(maxIndex + 1) do |i| numButtons = @sideSizes[i % 2] diff --git a/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb b/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb index ef4cea163..5081eec34 100644 --- a/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb +++ b/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb @@ -42,15 +42,15 @@ class Battle::Scene::PokemonDataBox < Sprite onPlayerSide = @battler.index.even? # 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 - bgFilename = ["Graphics/Pictures/Battle/databox_normal", - "Graphics/Pictures/Battle/databox_normal_foe"][@battler.index % 2] + bgFilename = ["Graphics/UI/Battle/databox_normal", + "Graphics/UI/Battle/databox_normal_foe"][@battler.index % 2] if onPlayerSide @showHP = true @showExp = true end else # Multiple Pokémon on side, use the thin dara box BG - bgFilename = ["Graphics/Pictures/Battle/databox_thin", - "Graphics/Pictures/Battle/databox_thin_foe"][@battler.index % 2] + bgFilename = ["Graphics/UI/Battle/databox_thin", + "Graphics/UI/Battle/databox_thin_foe"][@battler.index % 2] end @databoxBitmap&.dispose @databoxBitmap = AnimatedBitmap.new(bgFilename) @@ -76,9 +76,9 @@ class Battle::Scene::PokemonDataBox < Sprite def initializeOtherGraphics(viewport) # Create other bitmaps - @numbersBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/icon_numbers") - @hpBarBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/overlay_hp") - @expBarBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/overlay_exp") + @numbersBitmap = AnimatedBitmap.new("Graphics/UI/Battle/icon_numbers") + @hpBarBitmap = AnimatedBitmap.new("Graphics/UI/Battle/overlay_hp") + @expBarBitmap = AnimatedBitmap.new("Graphics/UI/Battle/overlay_exp") # Create sprite to draw HP numbers on @hpNumbers = BitmapSprite.new(124, 16, viewport) # pbSetSmallFont(@hpNumbers.bitmap) @@ -221,7 +221,7 @@ class Battle::Scene::PokemonDataBox < Sprite def draw_level # "Lv" graphic pbDrawImagePositions(self.bitmap, - [["Graphics/Pictures/Battle/overlay_lv", @spriteBaseX + 140, 16]] + [["Graphics/UI/Battle/overlay_lv", @spriteBaseX + 140, 16]] ) # Level number 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 end 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]]) end def draw_shiny_icon return if !@battler.shiny? 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 def draw_special_form_icon # Mega Evolution/Primal Reversion icon 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? filename = nil if @battler.isSpecies?(:GROUDON) - filename = "Graphics/Pictures/Battle/icon_primal_Groudon" + filename = "Graphics/UI/Battle/icon_primal_Groudon" elsif @battler.isSpecies?(:KYOGRE) - filename = "Graphics/Pictures/Battle/icon_primal_Kyogre" + filename = "Graphics/UI/Battle/icon_primal_Kyogre" end primalX = (@battler.opposes?) ? 208 : -28 # Foe's/player's pbDrawImagePositions(self.bitmap, [[filename, @spriteBaseX + primalX, 4]]) if filename @@ -272,7 +272,7 @@ class Battle::Scene::PokemonDataBox < Sprite def draw_owned_icon 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 def refresh @@ -418,7 +418,7 @@ class Battle::Scene::AbilitySplashBar < Sprite @side = side @battler = nil # 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.bitmap = @bgBitmap.bitmap @bgSprite.src_rect.y = (side == 0) ? 0 : @bgBitmap.height / 2 diff --git a/Data/Scripts/011_Battle/004_Scene/008_Battle_Scene_Animations.rb b/Data/Scripts/011_Battle/004_Scene/008_Battle_Scene_Animations.rb index 03d1e4e61..a8a07cf0e 100644 --- a/Data/Scripts/011_Battle/004_Scene/008_Battle_Scene_Animations.rb +++ b/Data/Scripts/011_Battle/004_Scene/008_Battle_Scene_Animations.rb @@ -162,14 +162,14 @@ class Battle::Scene::Animation::LineupAppear < Battle::Scene::Animation def createBall(idxBall, delay, dir) # Choose ball's graphic 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 !@party[idxParty].able? - graphicFilename = "Graphics/Pictures/Battle/icon_ball_faint" + graphicFilename = "Graphics/UI/Battle/icon_ball_faint" elsif @party[idxParty].status != :NONE - graphicFilename = "Graphics/Pictures/Battle/icon_ball_status" + graphicFilename = "Graphics/UI/Battle/icon_ball_status" else - graphicFilename = "Graphics/Pictures/Battle/icon_ball" + graphicFilename = "Graphics/UI/Battle/icon_ball" end end # Set up ball sprite diff --git a/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb b/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb index 298688abe..f0e7e0af2 100644 --- a/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb +++ b/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb @@ -66,7 +66,7 @@ class Battle::Scene::SafariDataBox < Sprite super(viewport) @selected = 0 @battle = battle - @databox = AnimatedBitmap.new("Graphics/Pictures/Battle/databox_safari") + @databox = AnimatedBitmap.new("Graphics/UI/Battle/databox_safari") self.x = Graphics.width - 232 self.y = Graphics.height - 184 @contents = BitmapWrapper.new(@databox.width, @databox.height) diff --git a/Data/Scripts/011_Battle/007_Other battle types/004_BattleArenaBattle.rb b/Data/Scripts/011_Battle/007_Other battle types/004_BattleArenaBattle.rb index 215eaf0cc..6334b98e3 100644 --- a/Data/Scripts/011_Battle/007_Other battle types/004_BattleArenaBattle.rb +++ b/Data/Scripts/011_Battle/007_Other battle types/004_BattleArenaBattle.rb @@ -256,9 +256,9 @@ class Battle::Scene phase.times do |i| y = [48, 80, 112][i] 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) - 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 pbDrawImagePositions(window.contents, images) window.contents.fill_rect(16, 150, 256, 4, Color.new(80, 80, 80)) diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index a58a9feb5..7e86aeede 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -72,13 +72,13 @@ def pbHiddenMoveAnimation(pokemon) viewport = Viewport.new(0, 0, 0, 0) viewport.z = 99999 bg = Sprite.new(viewport) - bg.bitmap = RPG::Cache.picture("hiddenMovebg") + bg.bitmap = RPG::Cache.ui("Field move/bg") sprite = PokemonSprite.new(viewport) sprite.setOffset(PictureOrigin::CENTER) sprite.setPokemonBitmap(pokemon) sprite.z = 1 sprite.visible = false - strobebitmap = AnimatedBitmap.new("Graphics/Pictures/hiddenMoveStrobes") + strobebitmap = AnimatedBitmap.new("Graphics/UI/Field move/strobes") strobes = [] 15.times do |i| strobe = BitmapSprite.new(52, 16, viewport) diff --git a/Data/Scripts/013_Items/006_Item_Mail.rb b/Data/Scripts/013_Items/006_Item_Mail.rb index 4ba4b66d3..2daafa70b 100644 --- a/Data/Scripts/013_Items/006_Item_Mail.rb +++ b/Data/Scripts/013_Items/006_Item_Mail.rb @@ -32,7 +32,7 @@ def pbDisplayMail(mail, _bearer = nil) sprites = {} viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) viewport.z = 99999 - addBackgroundPlane(sprites, "background", "mailbg", viewport) + addBackgroundPlane(sprites, "background", "Mail/bg", viewport) sprites["card"] = IconSprite.new(0, 0, viewport) sprites["card"].setBitmap(GameData::Item.mail_filename(mail.item)) sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, viewport) diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/002_UI_Controls.rb b/Data/Scripts/016_UI/001_Non-interactive UI/002_UI_Controls.rb index 6410a6953..f98ff3477 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/002_UI_Controls.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/002_UI_Controls.rb @@ -10,27 +10,27 @@ class ButtonEventScene < EventScene super Graphics.freeze @current_screen = 1 - addImage(0, 0, "Graphics/Pictures/Controls help/help_bg") + addImage(0, 0, "Graphics/UI/Controls help/bg") @labels = [] @label_screens = [] @keys = [] @key_screens = [] - addImageForScreen(1, 44, 122, "Graphics/Pictures/Controls help/help_f1") - addImageForScreen(1, 44, 252, "Graphics/Pictures/Controls help/help_f8") + addImageForScreen(1, 44, 122, "Graphics/UI/Controls help/help_f1") + 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, 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.")) - addImageForScreen(3, 16, 90, "Graphics/Pictures/Controls help/help_usekey") - addImageForScreen(3, 16, 236, "Graphics/Pictures/Controls help/help_backkey") + addImageForScreen(3, 16, 90, "Graphics/UI/Controls help/help_usekey") + 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, 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, 236, "Graphics/Pictures/Controls help/help_specialkey") + addImageForScreen(4, 16, 90, "Graphics/UI/Controls help/help_actionkey") + 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, 196, 352, _INTL("Press to open the Ready Menu, where registered items and available field moves can be used. (Default: D)")) diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb b/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb index 61abe9fe0..9426c7524 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb @@ -17,7 +17,7 @@ class PokemonEggHatch_Scene @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport.z = 99999 # Create background image - addBackgroundOrColoredPlane(@sprites, "background", "hatchbg", + addBackgroundOrColoredPlane(@sprites, "background", "hatch_bg", Color.new(248, 248, 248), @viewport) # Create egg sprite/Pokémon sprite @sprites["pokemon"] = PokemonSprite.new(@viewport) diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb index 96fe239dc..1efc28f79 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb @@ -496,7 +496,7 @@ class PokemonEvolutionScene @viewport.z = 99999 @msgviewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @msgviewport.z = 99999 - addBackgroundOrColoredPlane(@sprites, "background", "evolutionbg", + addBackgroundOrColoredPlane(@sprites, "background", "evolution_bg", Color.new(248, 248, 248), @bgviewport) rsprite1 = PokemonSprite.new(@viewport) rsprite1.setOffset(PictureOrigin::CENTER) diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb b/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb index 40afe90b0..2782def27 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb @@ -32,7 +32,7 @@ class PokemonTrade_Scene @pokemon2 = pokemon2 @trader1 = trader1 @trader2 = trader2 - addBackgroundOrColoredPlane(@sprites, "background", "tradebg", + addBackgroundOrColoredPlane(@sprites, "background", "trade_bg", Color.new(248, 248, 248), @viewport) @sprites["rsprite1"] = PokemonSprite.new(@viewport) @sprites["rsprite1"].setPokemonBitmap(@pokemon, false) diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb index a31700e26..862c6e219 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb @@ -48,9 +48,9 @@ class HallOfFame_Scene @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport.z = 99999 # 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"].setBitmap("Graphics/Pictures/hallfamebars") + @sprites["hallbars"].setBitmap("Graphics/UI/Hall of Fame/bars") @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["overlay"].z = 10 pbSetSystemFont(@sprites["overlay"].bitmap) diff --git a/Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb b/Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb index 909c4135a..4b02e6be9 100644 --- a/Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb +++ b/Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb @@ -8,7 +8,7 @@ class Window_DexesList < Window_CommandPokemon def initialize(commands, commands2, width) @commands2 = commands2 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.shadowColor = Color.black self.windowskin = nil @@ -25,8 +25,8 @@ class Window_DexesList < Window_CommandPokemon allown = (@commands2[index][1] >= @commands2[index][2]) pbDrawImagePositions( self.contents, - [["Graphics/Pictures/Pokedex/icon_menuseenown", rect.x + 236, rect.y + 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 + 236, rect.y + 6, (allseen) ? 24 : 0, 0, 24, 24], + ["Graphics/UI/Pokedex/icon_menuseenown", rect.x + 332, rect.y + 6, (allown) ? 24 : 0, 24, 24, 24]] ) end end @@ -46,7 +46,7 @@ class PokemonPokedexMenu_Scene @viewport.z = 99999 @sprites = {} @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( _INTL("SEENOBTAINED"), 286, 136, 208, 64, @viewport ) diff --git a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb index 3f1a8fb53..043d4fdf2 100644 --- a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb +++ b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb @@ -5,9 +5,9 @@ class Window_Pokedex < Window_DrawableCommand def initialize(x, y, width, height, viewport) @commands = [] super(x, y, width, height, viewport) - @selarrow = AnimatedBitmap.new("Graphics/Pictures/Pokedex/cursor_list") - @pokeballOwn = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_own") - @pokeballSeen = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_seen") + @selarrow = AnimatedBitmap.new("Graphics/UI/Pokedex/cursor_list") + @pokeballOwn = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_own") + @pokeballSeen = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_seen") self.baseColor = Color.new(88, 88, 80) self.shadowColor = Color.new(168, 184, 184) self.windowskin = nil @@ -86,7 +86,7 @@ class PokedexSearchSelectionSprite < Sprite def initialize(viewport = nil) super(viewport) - @selbitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/cursor_search") + @selbitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/cursor_search") self.bitmap = @selbitmap.bitmap self.mode = -1 @index = 0 @@ -262,12 +262,12 @@ class PokemonPokedex_Scene end def pbStartScene - @sliderbitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_slider") - @typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Pokedex/icon_types")) - @shapebitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_shapes") - @hwbitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_hw") - @selbitmap = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_searchsel") - @searchsliderbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Pokedex/icon_searchslider")) + @sliderbitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_slider") + @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Pokedex/icon_types")) + @shapebitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_shapes") + @hwbitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_hw") + @selbitmap = AnimatedBitmap.new("Graphics/UI/Pokedex/icon_searchsel") + @searchsliderbitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Pokedex/icon_searchslider")) @sprites = {} @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport.z = 99999 @@ -405,9 +405,9 @@ class PokemonPokedex_Scene @sprites["pokedex"].index = index @sprites["pokedex"].refresh if @searchResults - @sprites["background"].setBitmap("Graphics/Pictures/Pokedex/bg_listsearch") + @sprites["background"].setBitmap("Graphics/UI/Pokedex/bg_listsearch") else - @sprites["background"].setBitmap("Graphics/Pictures/Pokedex/bg_list") + @sprites["background"].setBitmap("Graphics/UI/Pokedex/bg_list") end pbRefresh end @@ -902,19 +902,19 @@ class PokemonPokedex_Scene ret = nil # Set background case mode - when 0 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_order") - when 1 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_name") + when 0 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_order") + when 1 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_name") when 2 count = 0 GameData::Type.each { |t| count += 1 if !t.pseudo_type && t.id != :SHADOW } if count == 18 - @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_type_18") + @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_type_18") else - @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_type") + @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_type") end - when 3, 4 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_size") - when 5 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_color") - when 6 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_shape") + when 3, 4 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_size") + when 5 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_color") + when 6 then @sprites["searchbg"].setBitmap("Graphics/UI/Pokedex/bg_search_shape") end selindex = selitems.clone index = selindex[0] @@ -1087,7 +1087,7 @@ class PokemonPokedex_Scene end Input.update # 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"].index = mainindex return ret @@ -1246,9 +1246,9 @@ class PokemonPokedex_Scene end pbFadeOutAndHide(@sprites) if @searchResults - @sprites["background"].setBitmap("Graphics/Pictures/Pokedex/bg_listsearch") + @sprites["background"].setBitmap("Graphics/UI/Pokedex/bg_listsearch") else - @sprites["background"].setBitmap("Graphics/Pictures/Pokedex/bg_list") + @sprites["background"].setBitmap("Graphics/UI/Pokedex/bg_list") end pbRefresh pbFadeInAndShow(@sprites, oldsprites) diff --git a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb index ccf278a33..eabdf250c 100644 --- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb +++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb @@ -10,7 +10,7 @@ class PokemonPokedexInfo_Scene @region = region @page = 1 @show_battled_count = false - @typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Pokedex/icon_types")) + @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Pokedex/icon_types")) @sprites = {} @sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["infosprite"] = PokemonSprite.new(@viewport) @@ -23,21 +23,21 @@ class PokemonPokedexInfo_Scene @region = (mappos) ? mappos[0] : 0 # Region 0 default end @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"].y += (Graphics.height + 32 - @sprites["areamap"].bitmap.height) / 2 Settings::REGION_MAP_EXTRAS.each do |hidden| next if hidden[0] != @region || hidden[1] <= 0 || !$game_switches[hidden[1]] pbDrawImagePositions( @sprites["areamap"].bitmap, - [["Graphics/Pictures/#{hidden[4]}", + [["Graphics/UI/Town Map/#{hidden[4]}", hidden[2] * PokemonRegionMap_Scene::SQUARE_WIDTH, hidden[3] * PokemonRegionMap_Scene::SQUARE_HEIGHT]] ) end @sprites["areahighlight"] = BitmapSprite.new(Graphics.width, Graphics.height, @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"].setOffset(PictureOrigin::CENTER) @sprites["formfront"].x = 130 @@ -49,12 +49,12 @@ class PokemonPokedexInfo_Scene @sprites["formicon"].setOffset(PictureOrigin::CENTER) @sprites["formicon"].x = 82 @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"].y = 268 @sprites["uparrow"].play @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"].y = 348 @sprites["downarrow"].play @@ -94,7 +94,7 @@ class PokemonPokedexInfo_Scene @index = 0 @page = 1 @brief = true - @typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Pokedex/icon_types")) + @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/Pokedex/icon_types")) @sprites = {} @sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["infosprite"] = PokemonSprite.new(@viewport) @@ -198,13 +198,13 @@ class PokemonPokedexInfo_Scene end def drawPageInfo - @sprites["background"].setBitmap(_INTL("Graphics/Pictures/Pokedex/bg_info")) + @sprites["background"].setBitmap(_INTL("Graphics/UI/Pokedex/bg_info")) overlay = @sprites["overlay"].bitmap base = Color.new(88, 88, 80) shadow = Color.new(168, 184, 184) imagepos = [] if @brief - imagepos.push([_INTL("Graphics/Pictures/Pokedex/overlay_info"), 0, 0]) + imagepos.push([_INTL("Graphics/UI/Pokedex/overlay_info"), 0, 0]) end species_data = GameData::Species.get_species_form(@species, @form) # Write various bits of text @@ -253,7 +253,7 @@ class PokemonPokedexInfo_Scene footprint.dispose end # 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) species_data.types.each_with_index do |type, i| type_number = GameData::Type.get(type).icon_position @@ -333,7 +333,7 @@ class PokemonPokedexInfo_Scene end def drawPageArea - @sprites["background"].setBitmap(_INTL("Graphics/Pictures/Pokedex/bg_area")) + @sprites["background"].setBitmap(_INTL("Graphics/UI/Pokedex/bg_area")) overlay = @sprites["overlay"].bitmap base = Color.new(88, 88, 80) shadow = Color.new(168, 184, 184) @@ -371,7 +371,7 @@ class PokemonPokedexInfo_Scene if points.length == 0 pbDrawImagePositions( 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]) end @@ -382,7 +382,7 @@ class PokemonPokedexInfo_Scene end def drawPageForms - @sprites["background"].setBitmap(_INTL("Graphics/Pictures/Pokedex/bg_forms")) + @sprites["background"].setBitmap(_INTL("Graphics/UI/Pokedex/bg_forms")) overlay = @sprites["overlay"].bitmap base = Color.new(88, 88, 80) shadow = Color.new(168, 184, 184) diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb index fe20cbea0..9e432d984 100644 --- a/Data/Scripts/016_UI/005_UI_Party.rb +++ b/Data/Scripts/016_UI/005_UI_Party.rb @@ -9,11 +9,11 @@ class PokemonPartyConfirmCancelSprite < Sprite @refreshBitmap = true @bgsprite = ChangelingSprite.new(0, 0, viewport) if narrowbox - @bgsprite.addBitmap("desel", "Graphics/Pictures/Party/icon_cancel_narrow") - @bgsprite.addBitmap("sel", "Graphics/Pictures/Party/icon_cancel_narrow_sel") + @bgsprite.addBitmap("desel", "Graphics/UI/Party/icon_cancel_narrow") + @bgsprite.addBitmap("sel", "Graphics/UI/Party/icon_cancel_narrow_sel") else - @bgsprite.addBitmap("desel", "Graphics/Pictures/Party/icon_cancel") - @bgsprite.addBitmap("sel", "Graphics/Pictures/Party/icon_cancel_sel") + @bgsprite.addBitmap("desel", "Graphics/UI/Party/icon_cancel") + @bgsprite.addBitmap("sel", "Graphics/UI/Party/icon_cancel_sel") end @bgsprite.changeBitmap("desel") @overlaysprite = BitmapSprite.new(@bgsprite.bitmap.width, @bgsprite.bitmap.height, viewport) @@ -140,7 +140,7 @@ class PokemonPartyBlankPanel < Sprite super(viewport) self.x = (index % 2) * Graphics.width / 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 @text = nil end @@ -186,31 +186,31 @@ class PokemonPartyPanel < Sprite @panelbgsprite = ChangelingSprite.new(0, 0, viewport) @panelbgsprite.z = self.z if @active # Rounded panel - @panelbgsprite.addBitmap("able", "Graphics/Pictures/Party/panel_round") - @panelbgsprite.addBitmap("ablesel", "Graphics/Pictures/Party/panel_round_sel") - @panelbgsprite.addBitmap("fainted", "Graphics/Pictures/Party/panel_round_faint") - @panelbgsprite.addBitmap("faintedsel", "Graphics/Pictures/Party/panel_round_faint_sel") - @panelbgsprite.addBitmap("swap", "Graphics/Pictures/Party/panel_round_swap") - @panelbgsprite.addBitmap("swapsel", "Graphics/Pictures/Party/panel_round_swap_sel") - @panelbgsprite.addBitmap("swapsel2", "Graphics/Pictures/Party/panel_round_swap_sel2") + @panelbgsprite.addBitmap("able", "Graphics/UI/Party/panel_round") + @panelbgsprite.addBitmap("ablesel", "Graphics/UI/Party/panel_round_sel") + @panelbgsprite.addBitmap("fainted", "Graphics/UI/Party/panel_round_faint") + @panelbgsprite.addBitmap("faintedsel", "Graphics/UI/Party/panel_round_faint_sel") + @panelbgsprite.addBitmap("swap", "Graphics/UI/Party/panel_round_swap") + @panelbgsprite.addBitmap("swapsel", "Graphics/UI/Party/panel_round_swap_sel") + @panelbgsprite.addBitmap("swapsel2", "Graphics/UI/Party/panel_round_swap_sel2") else # Rectangular panel - @panelbgsprite.addBitmap("able", "Graphics/Pictures/Party/panel_rect") - @panelbgsprite.addBitmap("ablesel", "Graphics/Pictures/Party/panel_rect_sel") - @panelbgsprite.addBitmap("fainted", "Graphics/Pictures/Party/panel_rect_faint") - @panelbgsprite.addBitmap("faintedsel", "Graphics/Pictures/Party/panel_rect_faint_sel") - @panelbgsprite.addBitmap("swap", "Graphics/Pictures/Party/panel_rect_swap") - @panelbgsprite.addBitmap("swapsel", "Graphics/Pictures/Party/panel_rect_swap_sel") - @panelbgsprite.addBitmap("swapsel2", "Graphics/Pictures/Party/panel_rect_swap_sel2") + @panelbgsprite.addBitmap("able", "Graphics/UI/Party/panel_rect") + @panelbgsprite.addBitmap("ablesel", "Graphics/UI/Party/panel_rect_sel") + @panelbgsprite.addBitmap("fainted", "Graphics/UI/Party/panel_rect_faint") + @panelbgsprite.addBitmap("faintedsel", "Graphics/UI/Party/panel_rect_faint_sel") + @panelbgsprite.addBitmap("swap", "Graphics/UI/Party/panel_rect_swap") + @panelbgsprite.addBitmap("swapsel", "Graphics/UI/Party/panel_rect_swap_sel") + @panelbgsprite.addBitmap("swapsel2", "Graphics/UI/Party/panel_rect_swap_sel2") end @hpbgsprite = ChangelingSprite.new(0, 0, viewport) @hpbgsprite.z = self.z + 1 - @hpbgsprite.addBitmap("able", "Graphics/Pictures/Party/overlay_hp_back") - @hpbgsprite.addBitmap("fainted", "Graphics/Pictures/Party/overlay_hp_back_faint") - @hpbgsprite.addBitmap("swap", "Graphics/Pictures/Party/overlay_hp_back_swap") + @hpbgsprite.addBitmap("able", "Graphics/UI/Party/overlay_hp_back") + @hpbgsprite.addBitmap("fainted", "Graphics/UI/Party/overlay_hp_back_faint") + @hpbgsprite.addBitmap("swap", "Graphics/UI/Party/overlay_hp_back_swap") @ballsprite = ChangelingSprite.new(0, 0, viewport) @ballsprite.z = self.z + 1 - @ballsprite.addBitmap("desel", "Graphics/Pictures/Party/icon_ball") - @ballsprite.addBitmap("sel", "Graphics/Pictures/Party/icon_ball_sel") + @ballsprite.addBitmap("desel", "Graphics/UI/Party/icon_ball") + @ballsprite.addBitmap("sel", "Graphics/UI/Party/icon_ball_sel") @pkmnsprite = PokemonIconSprite.new(pokemon, viewport) @pkmnsprite.setOffset(PictureOrigin::CENTER) @pkmnsprite.active = @active @@ -220,8 +220,8 @@ class PokemonPartyPanel < Sprite @overlaysprite = BitmapSprite.new(Graphics.width, Graphics.height, viewport) @overlaysprite.z = self.z + 4 pbSetSystemFont(@overlaysprite.bitmap) - @hpbar = AnimatedBitmap.new("Graphics/Pictures/Party/overlay_hp") - @statuses = AnimatedBitmap.new(_INTL("Graphics/Pictures/statuses")) + @hpbar = AnimatedBitmap.new("Graphics/UI/Party/overlay_hp") + @statuses = AnimatedBitmap.new(_INTL("Graphics/UI/statuses")) @selected = false @preselected = false @switching = false @@ -380,7 +380,7 @@ class PokemonPartyPanel < Sprite return if @pokemon.egg? # "Lv" graphic 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 pbSetSmallFont(@overlaysprite.bitmap) pbDrawTextPositions(@overlaysprite.bitmap, @@ -434,7 +434,7 @@ class PokemonPartyPanel < Sprite def draw_shiny_icon return if @pokemon.egg? || !@pokemon.shiny? pbDrawImagePositions(@overlaysprite.bitmap, - [["Graphics/Pictures/shiny", 80, 48, 0, 0, 16, 16]]) + [["Graphics/UI/shiny", 80, 48, 0, 0, 16, 16]]) end def draw_annotation diff --git a/Data/Scripts/016_UI/006_UI_Summary.rb b/Data/Scripts/016_UI/006_UI_Summary.rb index 6041caf96..403c30498 100644 --- a/Data/Scripts/016_UI/006_UI_Summary.rb +++ b/Data/Scripts/016_UI/006_UI_Summary.rb @@ -7,7 +7,7 @@ class MoveSelectionSprite < Sprite def initialize(viewport = nil, fifthmove = false) super(viewport) - @movesel = AnimatedBitmap.new("Graphics/Pictures/Summary/cursor_move") + @movesel = AnimatedBitmap.new("Graphics/UI/Summary/cursor_move") @frame = 0 @index = 0 @fifthmove = fifthmove @@ -61,7 +61,7 @@ end class RibbonSelectionSprite < MoveSelectionSprite def initialize(viewport = nil) super(viewport) - @movesel = AnimatedBitmap.new("Graphics/Pictures/Summary/cursor_ribbon") + @movesel = AnimatedBitmap.new("Graphics/UI/Summary/cursor_ribbon") @frame = 0 @index = 0 @preselected = false @@ -117,8 +117,8 @@ class PokemonSummary_Scene @pokemon = @party[@partyindex] @inbattle = inbattle @page = 1 - @typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) - @markingbitmap = AnimatedBitmap.new("Graphics/Pictures/Summary/markings") + @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types")) + @markingbitmap = AnimatedBitmap.new("Graphics/UI/Summary/markings") @sprites = {} @sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["pokemon"] = PokemonSprite.new(@viewport) @@ -145,24 +145,24 @@ class PokemonSummary_Scene @sprites["ribbonpresel"].preselected = true @sprites["ribbonsel"] = RibbonSelectionSprite.new(@viewport) @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"].y = 56 @sprites["uparrow"].play @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"].y = 260 @sprites["downarrow"].play @sprites["downarrow"].visible = false @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["markingoverlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @sprites["markingoverlay"].visible = false pbSetSystemFont(@sprites["markingoverlay"].bitmap) @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"].visible = false @sprites["messagebox"] = Window_AdvancedTextPokemon.new("") @@ -183,7 +183,7 @@ class PokemonSummary_Scene @partyindex = partyindex @pokemon = @party[@partyindex] @page = 4 - @typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) + @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types")) @sprites = {} @sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @@ -306,10 +306,10 @@ class PokemonSummary_Scene base = Color.new(248, 248, 248) shadow = Color.new(104, 104, 104) # Set background image - @sprites["background"].setBitmap("Graphics/Pictures/Summary/bg_#{page}") + @sprites["background"].setBitmap("Graphics/UI/Summary/bg_#{page}") imagepos = [] # 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]) # Show status/fainted/Pokérus infected icon status = -1 @@ -321,15 +321,15 @@ class PokemonSummary_Scene status = GameData::Status.count end 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 # Show Pokérus cured icon 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 # Show shininess star if @pokemon.shiny? - imagepos.push([sprintf("Graphics/Pictures/shiny"), 2, 134]) + imagepos.push([sprintf("Graphics/UI/shiny"), 2, 134]) end # Draw all images pbDrawImagePositions(overlay, imagepos) @@ -381,8 +381,8 @@ class PokemonSummary_Scene if @pokemon.shadowPokemon? shadowfract = @pokemon.heart_gauge.to_f / @pokemon.max_gauge_size imagepos = [ - ["Graphics/Pictures/Summary/overlay_shadow", 224, 240], - ["Graphics/Pictures/Summary/overlay_shadowbar", 242, 280, 0, 0, (shadowfract * 248).floor, -1] + ["Graphics/UI/Summary/overlay_shadow", 224, 240], + ["Graphics/UI/Summary/overlay_shadowbar", 242, 280, 0, 0, (shadowfract * 248).floor, -1] ] pbDrawImagePositions(overlay, imagepos) end @@ -468,7 +468,7 @@ class PokemonSummary_Scene w = @pokemon.exp_fraction * 128 w = ((w / 2).round) * 2 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 @@ -479,10 +479,10 @@ class PokemonSummary_Scene base = Color.new(248, 248, 248) shadow = Color.new(104, 104, 104) # Set background image - @sprites["background"].setBitmap("Graphics/Pictures/Summary/bg_egg") + @sprites["background"].setBitmap("Graphics/UI/Summary/bg_egg") imagepos = [] # 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]) # Draw all images pbDrawImagePositions(overlay, imagepos) @@ -670,7 +670,7 @@ class PokemonSummary_Scene hpzone = 1 if @pokemon.hp <= (@pokemon.totalhp / 2).floor hpzone = 2 if @pokemon.hp <= (@pokemon.totalhp / 4).floor 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) end @@ -699,7 +699,7 @@ class PokemonSummary_Scene move = @pokemon.moves[i] if move 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]) if move.total_pp > 0 textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow]) @@ -741,9 +741,9 @@ class PokemonSummary_Scene Color.new(136, 48, 48)] # Zero PP # Set background image if move_to_learn - @sprites["background"].setBitmap("Graphics/Pictures/Summary/bg_learnmove") + @sprites["background"].setBitmap("Graphics/UI/Summary/bg_learnmove") else - @sprites["background"].setBitmap("Graphics/Pictures/Summary/bg_movedetail") + @sprites["background"].setBitmap("Graphics/UI/Summary/bg_movedetail") end # Write various bits of text textpos = [ @@ -765,7 +765,7 @@ class PokemonSummary_Scene end if move type_number = GameData::Type.get(move.display_type(@pokemon)).icon_position - imagepos.push(["Graphics/Pictures/types", 248, yPos - 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]) if move.total_pp > 0 textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow]) @@ -823,7 +823,7 @@ class PokemonSummary_Scene # Draw all text pbDrawTextPositions(overlay, textpos) # 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) # Draw selected move's description drawTextEx(overlay, 4, 224, 230, 5, selected_move.description, base, shadow) @@ -847,7 +847,7 @@ class PokemonSummary_Scene break if !@pokemon.ribbons[i] ribbon_data = GameData::Ribbon.get(@pokemon.ribbons[i]) 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), 64 * (ribn % 8), 64 * (ribn / 8).floor, 64, 64]) coord += 1 @@ -870,7 +870,7 @@ class PokemonSummary_Scene desc = ribbonid ? GameData::Ribbon.get(ribbonid).description : "" # Draw the description box imagepos = [ - ["Graphics/Pictures/Summary/overlay_ribbon", 8, 280] + ["Graphics/UI/Summary/overlay_ribbon", 8, 280] ] pbDrawImagePositions(overlay, imagepos) # Draw name of selected ribbon diff --git a/Data/Scripts/016_UI/007_UI_Bag.rb b/Data/Scripts/016_UI/007_UI_Bag.rb index 403e7a50d..4a0ac1cbe 100644 --- a/Data/Scripts/016_UI/007_UI_Bag.rb +++ b/Data/Scripts/016_UI/007_UI_Bag.rb @@ -12,8 +12,8 @@ class Window_PokemonBag < Window_DrawableCommand @sorting = false @adapter = PokemonMartAdapter.new super(x, y, width, height) - @selarrow = AnimatedBitmap.new("Graphics/Pictures/Bag/cursor") - @swaparrow = AnimatedBitmap.new("Graphics/Pictures/Bag/cursor_swap") + @selarrow = AnimatedBitmap.new("Graphics/UI/Bag/cursor") + @swaparrow = AnimatedBitmap.new("Graphics/UI/Bag/cursor_swap") self.windowskin = nil end @@ -82,12 +82,12 @@ class Window_PokemonBag < Window_DrawableCommand if @bag.registered?(item) pbDrawImagePositions( 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) pbDrawImagePositions( 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 else @@ -172,8 +172,8 @@ class PokemonBag_Scene end end @bag.last_viewed_pocket = lastpocket - @sliderbitmap = AnimatedBitmap.new("Graphics/Pictures/Bag/icon_slider") - @pocketbitmap = AnimatedBitmap.new("Graphics/Pictures/Bag/icon_pocket") + @sliderbitmap = AnimatedBitmap.new("Graphics/UI/Bag/icon_slider") + @pocketbitmap = AnimatedBitmap.new("Graphics/UI/Bag/icon_pocket") @sprites = {} @sprites["background"] = IconSprite.new(0, 0, @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"].x = 0 @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"].y = 76 @sprites["leftarrow"].visible = (!@choosing || numfilledpockets > 1) @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"].y = 76 @sprites["rightarrow"].visible = (!@choosing || numfilledpockets > 1) @@ -258,13 +258,13 @@ class PokemonBag_Scene def pbRefresh # 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 - 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 - @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 - @sprites["bagsprite"].setBitmap("Graphics/Pictures/Bag/bag_#{@bag.last_viewed_pocket}") + @sprites["bagsprite"].setBitmap("Graphics/UI/Bag/bag_#{@bag.last_viewed_pocket}") end # Draw the pocket icons @sprites["pocketicon"].bitmap.clear diff --git a/Data/Scripts/016_UI/008_UI_Pokegear.rb b/Data/Scripts/016_UI/008_UI_Pokegear.rb index 98c0adef7..4d822d16b 100644 --- a/Data/Scripts/016_UI/008_UI_Pokegear.rb +++ b/Data/Scripts/016_UI/008_UI_Pokegear.rb @@ -14,10 +14,10 @@ class PokegearButton < Sprite @image = command[0] @name = command[1] @selected = false - if $player.female? && pbResolveBitmap(sprintf("Graphics/Pictures/Pokegear/icon_button_f")) - @button = AnimatedBitmap.new("Graphics/Pictures/Pokegear/icon_button_f") + if $player.female? && pbResolveBitmap(sprintf("Graphics/UI/Pokegear/icon_button_f")) + @button = AnimatedBitmap.new("Graphics/UI/Pokegear/icon_button_f") else - @button = AnimatedBitmap.new("Graphics/Pictures/Pokegear/icon_button") + @button = AnimatedBitmap.new("Graphics/UI/Pokegear/icon_button") end @contents = BitmapWrapper.new(@button.width, @button.height) self.bitmap = @contents @@ -49,7 +49,7 @@ class PokegearButton < Sprite ] pbDrawTextPositions(self.bitmap, textpos) imagepos = [ - [sprintf("Graphics/Pictures/Pokegear/icon_" + @image), 18, 10] + [sprintf("Graphics/UI/Pokegear/icon_" + @image), 18, 10] ] pbDrawImagePositions(self.bitmap, imagepos) end @@ -73,10 +73,10 @@ class PokemonPokegear_Scene @viewport.z = 99999 @sprites = {} @sprites["background"] = IconSprite.new(0, 0, @viewport) - if $player.female? && pbResolveBitmap(sprintf("Graphics/Pictures/Pokegear/bg_f")) - @sprites["background"].setBitmap("Graphics/Pictures/Pokegear/bg_f") + if $player.female? && pbResolveBitmap(sprintf("Graphics/UI/Pokegear/bg_f")) + @sprites["background"].setBitmap("Graphics/UI/Pokegear/bg_f") else - @sprites["background"].setBitmap("Graphics/Pictures/Pokegear/bg") + @sprites["background"].setBitmap("Graphics/UI/Pokegear/bg") end @commands.length.times do |i| @sprites["button#{i}"] = PokegearButton.new(@commands[i], Graphics.width / 2, 0, @viewport) diff --git a/Data/Scripts/016_UI/009_UI_RegionMap.rb b/Data/Scripts/016_UI/009_UI_RegionMap.rb index 86e1bd6ba..5c5b4264b 100644 --- a/Data/Scripts/016_UI/009_UI_RegionMap.rb +++ b/Data/Scripts/016_UI/009_UI_RegionMap.rb @@ -104,9 +104,9 @@ class PokemonRegionMap_Scene pbMessage(_INTL("The map data cannot be found.")) return false 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"].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"].y += (Graphics.height - @sprites["map"].bitmap.height) / 2 Settings::REGION_MAP_EXTRAS.each do |graphic| @@ -118,7 +118,7 @@ class PokemonRegionMap_Scene end pbDrawImagePositions( @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 @sprites["mapbottom"] = MapBottomSprite.new(@viewport) @@ -136,7 +136,7 @@ class PokemonRegionMap_Scene (TOP..BOTTOM).each do |j| healspot = pbGetHealingSpot(i, j) 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}"].x = point_x_to_screen_x(i) @sprites["point#{k}"].y = point_y_to_screen_y(j) @@ -145,7 +145,7 @@ class PokemonRegionMap_Scene k += 1 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"].x = point_x_to_screen_x(@map_x) @sprites["cursor"].y = point_y_to_screen_y(@map_y) diff --git a/Data/Scripts/016_UI/010_UI_Phone.rb b/Data/Scripts/016_UI/010_UI_Phone.rb index 96fcda8c6..d6e07d2b9 100644 --- a/Data/Scripts/016_UI/010_UI_Phone.rb +++ b/Data/Scripts/016_UI/010_UI_Phone.rb @@ -3,7 +3,7 @@ #=============================================================================== class Window_PhoneList < Window_CommandPokemon def drawCursor(index, rect) - selarrow = AnimatedBitmap.new("Graphics/Pictures/phoneSel") + selarrow = AnimatedBitmap.new("Graphics/UI/Phone/cursor") if self.index == index pbCopyBitmap(self.contents, selarrow.bitmap, rect.x, rect.y + 2) end @@ -42,7 +42,7 @@ class PokemonPhoneScene @sprites = {} @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @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"].windowskin = nil @sprites["list"].commands = commands @@ -50,7 +50,7 @@ class PokemonPhoneScene @sprites["rematch[#{i}]"] = IconSprite.new(468, 62 + (i * 32), @viewport) j = i + @sprites["list"].top_item 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 @sprites["header"] = Window_UnformattedTextPokemon.newWithSize( @@ -111,7 +111,7 @@ class PokemonPhoneScene @sprites["rematch[#{i}]"].clearBitmaps j = i + @sprites["list"].top_item 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 diff --git a/Data/Scripts/016_UI/011_UI_Jukebox.rb b/Data/Scripts/016_UI/011_UI_Jukebox.rb index 2689021b3..a89d10d29 100644 --- a/Data/Scripts/016_UI/011_UI_Jukebox.rb +++ b/Data/Scripts/016_UI/011_UI_Jukebox.rb @@ -12,7 +12,7 @@ class PokemonJukebox_Scene @viewport.z = 99999 @sprites = {} @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( _INTL("Jukebox"), 2, -18, 128, 64, @viewport ) diff --git a/Data/Scripts/016_UI/012_UI_TrainerCard.rb b/Data/Scripts/016_UI/012_UI_TrainerCard.rb index eefbbfaa2..e06641060 100644 --- a/Data/Scripts/016_UI/012_UI_TrainerCard.rb +++ b/Data/Scripts/016_UI/012_UI_TrainerCard.rb @@ -10,18 +10,18 @@ class PokemonTrainerCard_Scene @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport.z = 99999 @sprites = {} - background = pbResolveBitmap(sprintf("Graphics/Pictures/Trainer Card/bg_f")) + background = pbResolveBitmap(sprintf("Graphics/UI/Trainer Card/bg_f")) if $player.female? && background addBackgroundPlane(@sprites, "bg", "Trainer Card/bg_f", @viewport) else addBackgroundPlane(@sprites, "bg", "Trainer Card/bg", @viewport) 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) if $player.female? && cardexists - @sprites["card"].setBitmap("Graphics/Pictures/Trainer Card/card_f") + @sprites["card"].setBitmap("Graphics/UI/Trainer Card/card_f") else - @sprites["card"].setBitmap("Graphics/Pictures/Trainer Card/card") + @sprites["card"].setBitmap("Graphics/UI/Trainer Card/card") end @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) pbSetSystemFont(@sprites["overlay"].bitmap) @@ -68,7 +68,7 @@ class PokemonTrainerCard_Scene imagePositions = [] 8.times do |i| 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 x += 48 end diff --git a/Data/Scripts/016_UI/013_UI_Load.rb b/Data/Scripts/016_UI/013_UI_Load.rb index 2dbd28f32..d58b84d38 100644 --- a/Data/Scripts/016_UI/013_UI_Load.rb +++ b/Data/Scripts/016_UI/013_UI_Load.rb @@ -20,7 +20,7 @@ class PokemonLoadPanel < Sprite @totalsec = (stats) ? stats.play_time.to_i : ((framecount || 0) / Graphics.frame_rate) @mapid = mapid @selected = (index == 0) - @bgbitmap = AnimatedBitmap.new("Graphics/Pictures/loadPanels") + @bgbitmap = AnimatedBitmap.new("Graphics/UI/Load/panels") @refreshBitmap = true @refreshing = false refresh @@ -103,7 +103,7 @@ class PokemonLoad_Scene @sprites = {} @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @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 commands.length.times do |i| @sprites["panel#{i}"] = PokemonLoadPanel.new( @@ -128,7 +128,7 @@ class PokemonLoad_Scene @sprites = {} @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @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 def pbUpdate diff --git a/Data/Scripts/016_UI/016_UI_ReadyMenu.rb b/Data/Scripts/016_UI/016_UI_ReadyMenu.rb index 7a38c9bc1..253f5f0f6 100644 --- a/Data/Scripts/016_UI/016_UI_ReadyMenu.rb +++ b/Data/Scripts/016_UI/016_UI_ReadyMenu.rb @@ -13,9 +13,9 @@ class ReadyMenuButton < Sprite @selected = selected @side = side if @command[2] - @button = AnimatedBitmap.new("Graphics/Pictures/Ready Menu/icon_movebutton") + @button = AnimatedBitmap.new("Graphics/UI/Ready Menu/icon_movebutton") else - @button = AnimatedBitmap.new("Graphics/Pictures/Ready Menu/icon_itembutton") + @button = AnimatedBitmap.new("Graphics/UI/Ready Menu/icon_itembutton") end @contents = BitmapWrapper.new(@button.width, @button.height / 2) self.bitmap = @contents diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb index ea79a3d8a..1e2de25a0 100644 --- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb +++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb @@ -130,14 +130,14 @@ class PokemonBoxArrow < Sprite @placingState = 0 @heldpkmn = nil @handsprite = ChangelingSprite.new(0, 0, viewport) - @handsprite.addBitmap("point1", "Graphics/Pictures/Storage/cursor_point_1") - @handsprite.addBitmap("point2", "Graphics/Pictures/Storage/cursor_point_2") - @handsprite.addBitmap("grab", "Graphics/Pictures/Storage/cursor_grab") - @handsprite.addBitmap("fist", "Graphics/Pictures/Storage/cursor_fist") - @handsprite.addBitmap("point1q", "Graphics/Pictures/Storage/cursor_point_1_q") - @handsprite.addBitmap("point2q", "Graphics/Pictures/Storage/cursor_point_2_q") - @handsprite.addBitmap("grabq", "Graphics/Pictures/Storage/cursor_grab_q") - @handsprite.addBitmap("fistq", "Graphics/Pictures/Storage/cursor_fist_q") + @handsprite.addBitmap("point1", "Graphics/UI/Storage/cursor_point_1") + @handsprite.addBitmap("point2", "Graphics/UI/Storage/cursor_point_2") + @handsprite.addBitmap("grab", "Graphics/UI/Storage/cursor_grab") + @handsprite.addBitmap("fist", "Graphics/UI/Storage/cursor_fist") + @handsprite.addBitmap("point1q", "Graphics/UI/Storage/cursor_point_1_q") + @handsprite.addBitmap("point2q", "Graphics/UI/Storage/cursor_point_2_q") + @handsprite.addBitmap("grabq", "Graphics/UI/Storage/cursor_grab_q") + @handsprite.addBitmap("fistq", "Graphics/UI/Storage/cursor_fist_q") @handsprite.changeBitmap("fist") @spriteX = self.x @spriteY = self.y @@ -372,7 +372,7 @@ class PokemonBoxSprite < Sprite @storage[@boxnumber].background = @bg end @boxbitmap&.dispose - @boxbitmap = AnimatedBitmap.new("Graphics/Pictures/Storage/box_#{@bg}") + @boxbitmap = AnimatedBitmap.new("Graphics/UI/Storage/box_#{@bg}") end end @@ -447,7 +447,7 @@ class PokemonBoxPartySprite < Sprite def initialize(party, viewport = nil) super(viewport) @party = party - @boxbitmap = AnimatedBitmap.new("Graphics/Pictures/Storage/overlay_party") + @boxbitmap = AnimatedBitmap.new("Graphics/UI/Storage/overlay_party") @pokemonsprites = [] Settings::MAX_PARTY_SIZE.times do |i| @pokemonsprites[i] = nil @@ -593,7 +593,7 @@ class PokemonStorageScene addBackgroundPlane(@sprites, "background", "Storage/bg", @bgviewport) @sprites["box"] = PokemonBoxSprite.new(@storage, @storage.currentBox, @boxviewport) @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) pbSetSystemFont(@sprites["overlay"].bitmap) @sprites["pokemon"] = AutoMosaicPokemonSprite.new(@boxsidesviewport) @@ -605,9 +605,9 @@ class PokemonStorageScene @sprites["boxparty"].x = 182 @sprites["boxparty"].y = Graphics.height end - @markingbitmap = AnimatedBitmap.new("Graphics/Pictures/Storage/markings") + @markingbitmap = AnimatedBitmap.new("Graphics/UI/Storage/markings") @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["markingoverlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @boxsidesviewport) @sprites["markingoverlay"].visible = false @@ -1429,7 +1429,7 @@ class PokemonStorageScene elsif pokemon.female? textstrings.push([_INTL("♀"), 148, 14, false, Color.new(248, 56, 32), Color.new(224, 152, 144)]) end - imagepos.push(["Graphics/Pictures/Storage/overlay_lv", 6, 246]) + imagepos.push(["Graphics/UI/Storage/overlay_lv", 6, 246]) textstrings.push([pokemon.level.to_s, 28, 240, false, base, shadow]) if pokemon.ability 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]) end if pokemon.shiny? - imagepos.push(["Graphics/Pictures/shiny", 156, 198]) + imagepos.push(["Graphics/UI/shiny", 156, 198]) end - typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) + typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types")) pokemon.types.each_with_index do |type, i| type_number = GameData::Type.get(type).icon_position type_rect = Rect.new(0, type_number * 28, 64, 28) diff --git a/Data/Scripts/016_UI/018_UI_ItemStorage.rb b/Data/Scripts/016_UI/018_UI_ItemStorage.rb index ffa1ba651..391c43036 100644 --- a/Data/Scripts/016_UI/018_UI_ItemStorage.rb +++ b/Data/Scripts/016_UI/018_UI_ItemStorage.rb @@ -75,7 +75,7 @@ class ItemStorage_Scene @bag = bag @sprites = {} @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) # Item list @sprites["itemwindow"] = Window_PokemonItemStorage.new(@bag, 98, 14, 334, 32 + (ITEMSVISIBLE * 32)) diff --git a/Data/Scripts/016_UI/020_UI_PokeMart.rb b/Data/Scripts/016_UI/020_UI_PokeMart.rb index 98a076833..901bdb160 100644 --- a/Data/Scripts/016_UI/020_UI_PokeMart.rb +++ b/Data/Scripts/016_UI/020_UI_PokeMart.rb @@ -157,7 +157,7 @@ class Window_PokemonMart < Window_DrawableCommand @stock = stock @adapter = adapter 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) @shadowColor = Color.new(168, 184, 184) self.windowskin = nil @@ -224,7 +224,7 @@ class PokemonMart_Scene @adapter = adapter @sprites = {} @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) winAdapter = buying ? BuyAdapter.new(adapter) : SellAdapter.new(adapter) @sprites["itemwindow"] = Window_PokemonMart.new( diff --git a/Data/Scripts/016_UI/021_UI_MoveRelearner.rb b/Data/Scripts/016_UI/021_UI_MoveRelearner.rb index b18a94d03..7a9817bd2 100644 --- a/Data/Scripts/016_UI/021_UI_MoveRelearner.rb +++ b/Data/Scripts/016_UI/021_UI_MoveRelearner.rb @@ -25,13 +25,13 @@ class MoveRelearner_Scene @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport.z = 99999 @sprites = {} - addBackgroundPlane(@sprites, "bg", "reminderbg", @viewport) + addBackgroundPlane(@sprites, "bg", "Move Reminder/bg", @viewport) @sprites["pokeicon"] = PokemonIconSprite.new(@pokemon, @viewport) @sprites["pokeicon"].setOffset(PictureOrigin::CENTER) @sprites["pokeicon"].x = 320 @sprites["pokeicon"].y = 84 @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"].src_rect = Rect.new(0, 72, 258, 72) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) @@ -42,7 +42,7 @@ class MoveRelearner_Scene @sprites["msgwindow"] = Window_AdvancedTextPokemon.new("") @sprites["msgwindow"].visible = false @sprites["msgwindow"].viewport = @viewport - @typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) + @typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types")) pbDrawMoveList pbDeactivateWindows(@sprites) # Fade in all sprites @@ -68,7 +68,7 @@ class MoveRelearner_Scene if moveobject moveData = GameData::Move.get(moveobject) type_number = GameData::Type.get(moveData.display_type(@pokemon)).icon_position - imagepos.push(["Graphics/Pictures/types", 12, yPos - 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([_INTL("PP"), 112, yPos + 32, 0, Color.new(64, 64, 64), Color.new(176, 176, 176)]) if moveData.total_pp > 0 @@ -80,7 +80,7 @@ class MoveRelearner_Scene end yPos += 64 end - imagepos.push(["Graphics/Pictures/reminderSel", + imagepos.push(["Graphics/UI/Move Reminder/cursor", 0, 78 + ((@sprites["commands"].index - @sprites["commands"].top_item) * 64), 0, 0, 258, 72]) selMoveData = GameData::Move.get(@moves[@sprites["commands"].index]) @@ -95,12 +95,12 @@ class MoveRelearner_Scene textpos.push([accuracy == 0 ? "---" : "#{accuracy}%", 468, 184, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)]) pbDrawTextPositions(overlay, textpos) - imagepos.push(["Graphics/Pictures/category", 436, 116, 0, category * 28, 64, 28]) + imagepos.push(["Graphics/UI/category", 436, 116, 0, category * 28, 64, 28]) 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 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 pbDrawImagePositions(overlay, imagepos) drawTextEx(overlay, 272, 216, 230, 5, selMoveData.description, diff --git a/Data/Scripts/016_UI/022_UI_PurifyChamber.rb b/Data/Scripts/016_UI/022_UI_PurifyChamber.rb index 2d7ba34bc..d3d0f6d23 100644 --- a/Data/Scripts/016_UI/022_UI_PurifyChamber.rb +++ b/Data/Scripts/016_UI/022_UI_PurifyChamber.rb @@ -1114,7 +1114,7 @@ class PurifyChamberScene @viewport.z = 99999 @viewportmsg = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewportmsg.z = 99999 - addBackgroundOrColoredPlane(@sprites, "bg", "purifychamberbg", + addBackgroundOrColoredPlane(@sprites, "bg", "purifychamber_bg", Color.new(64, 48, 96), @viewport) @sprites["setwindow"] = Window_PurifyChamberSets.new( @chamber, 0, 0, 112, Graphics.height, @viewport diff --git a/Data/Scripts/016_UI/023_UI_MysteryGift.rb b/Data/Scripts/016_UI/023_UI_MysteryGift.rb index f1daf6fc2..9453a952e 100644 --- a/Data/Scripts/016_UI/023_UI_MysteryGift.rb +++ b/Data/Scripts/016_UI/023_UI_MysteryGift.rb @@ -242,7 +242,7 @@ def pbDownloadMysteryGift(trainer) sprites = {} viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) viewport.z = 99999 - addBackgroundPlane(sprites, "background", "mysteryGiftbg", viewport) + addBackgroundPlane(sprites, "background", "mysterygift_bg", viewport) pbFadeInAndShow(sprites) sprites["msgwindow"] = pbCreateMessageWindow pbMessageDisplay(sprites["msgwindow"], _INTL("Searching for a gift.\nPlease wait...\\wtnp[0]")) diff --git a/Data/Scripts/016_UI/024_UI_TextEntry.rb b/Data/Scripts/016_UI/024_UI_TextEntry.rb index c43526328..16a404a79 100644 --- a/Data/Scripts/016_UI/024_UI_TextEntry.rb +++ b/Data/Scripts/016_UI/024_UI_TextEntry.rb @@ -124,7 +124,7 @@ class PokemonEntryScene meta = GameData::PlayerMetadata.get($player.character_ID) if meta @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"].y = 64 filename = pbGetPlayerCharset(meta.walk_charset, nil, true) @@ -137,7 +137,7 @@ class PokemonEntryScene when 2 # Pokémon if pokemon @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"].y = 64 @sprites["subject"] = PokemonIconSprite.new(pokemon, @viewport) @@ -159,7 +159,7 @@ class PokemonEntryScene end when 3 # NPC @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"].y = 64 @sprites["subject"] = TrainerWalkingCharSprite.new(pokemon.to_s, @viewport) @@ -169,7 +169,7 @@ class PokemonEntryScene @sprites["subject"].y = 76 - (charheight / 4) when 4 # Storage box @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 charwidth = @sprites["subject"].bitmap.width charheight = @sprites["subject"].bitmap.height @@ -281,9 +281,9 @@ class PokemonEntryScene2 def initialize(viewport) @sprite = Sprite.new(viewport) @cursortype = 0 - @cursor1 = AnimatedBitmap.new("Graphics/Pictures/Naming/cursor_1") - @cursor2 = AnimatedBitmap.new("Graphics/Pictures/Naming/cursor_2") - @cursor3 = AnimatedBitmap.new("Graphics/Pictures/Naming/cursor_3") + @cursor1 = AnimatedBitmap.new("Graphics/UI/Naming/cursor_1") + @cursor2 = AnimatedBitmap.new("Graphics/UI/Naming/cursor_2") + @cursor3 = AnimatedBitmap.new("Graphics/UI/Naming/cursor_3") @cursorPos = 0 updateInternal end @@ -382,7 +382,7 @@ class PokemonEntryScene2 # Create bitmaps @bitmaps = [] @@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 pbSetSystemFont(b) textPos = [] @@ -403,13 +403,13 @@ class PokemonEntryScene2 # Create sprites @sprites = {} @sprites["bg"] = IconSprite.new(0, 0, @viewport) - @sprites["bg"].setBitmap("Graphics/Pictures/Naming/bg") + @sprites["bg"].setBitmap("Graphics/UI/Naming/bg") case subject when 1 # Player meta = GameData::PlayerMetadata.get($player.character_ID) if meta @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"].y = 64 filename = pbGetPlayerCharset(meta.walk_charset, nil, true) @@ -422,7 +422,7 @@ class PokemonEntryScene2 when 2 # Pokémon if pokemon @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"].y = 64 @sprites["subject"] = PokemonIconSprite.new(pokemon, @viewport) @@ -444,7 +444,7 @@ class PokemonEntryScene2 end when 3 # NPC @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"].y = 64 @sprites["subject"] = TrainerWalkingCharSprite.new(pokemon.to_s, @viewport) @@ -454,7 +454,7 @@ class PokemonEntryScene2 @sprites["subject"].y = 76 - (charheight / 4) when 4 # Storage box @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 charwidth = @sprites["subject"].bitmap.width charheight = @sprites["subject"].bitmap.height @@ -484,7 +484,7 @@ class PokemonEntryScene2 @sprites["controls"] = IconSprite.new(0, 0, @viewport) @sprites["controls"].x = 16 @sprites["controls"].y = 96 - @sprites["controls"].setBitmap(_INTL("Graphics/Pictures/Naming/overlay_controls")) + @sprites["controls"].setBitmap(_INTL("Graphics/UI/Naming/overlay_controls")) @init = true @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) pbDoUpdateOverlay2 @@ -502,7 +502,7 @@ class PokemonEntryScene2 def pbDoUpdateOverlay2 overlay = @sprites["overlay"].bitmap 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) end diff --git a/Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb b/Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb index a40ace4a8..217558e35 100644 --- a/Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb +++ b/Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb @@ -84,12 +84,12 @@ class TriadCard def self.createBack(type = nil, noback = false) bitmap = BitmapWrapper.new(80, 96) 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)) cardbitmap.dispose end if type - typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) + typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types")) type_number = GameData::Type.get(type).icon_position typerect = Rect.new(0, type_number * 28, 64, 28) bitmap.blt(8, 50, typebitmap.bitmap, typerect, 192) @@ -102,13 +102,13 @@ class TriadCard return TriadCard.createBack if owner == 0 bitmap = BitmapWrapper.new(80, 96) if owner == 2 # Opponent - cardbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_card_opponent") + cardbitmap = AnimatedBitmap.new("Graphics/UI/Triple Triad/card_opponent") else # Player - cardbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_card_player") + cardbitmap = AnimatedBitmap.new("Graphics/UI/Triple Triad/card_player") end - typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) + typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types")) 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 bitmap.blt(0, 0, cardbitmap.bitmap, Rect.new(0, 0, cardbitmap.width, cardbitmap.height)) # Draw type icon @@ -168,7 +168,7 @@ class TriadScene # Allocate viewport @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport.z = 99999 - addBackgroundPlane(@sprites, "background", "triad_bg", @viewport) + addBackgroundPlane(@sprites, "background", "Triple Triad/bg", @viewport) @sprites["helpwindow"] = Window_AdvancedTextPokemon.newWithSize( "", 0, Graphics.height - 64, Graphics.width, 64, @viewport ) diff --git a/Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb b/Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb index b4543a103..27cb99894 100644 --- a/Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb +++ b/Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb @@ -32,8 +32,8 @@ class SlotMachineReel < BitmapSprite @stopping = false @slipping = 0 @index = rand(@reel.length) - @images = AnimatedBitmap.new(_INTL("Graphics/Pictures/Slot Machine/images")) - @shading = AnimatedBitmap.new("Graphics/Pictures/Slot Machine/ReelOverlay") + @images = AnimatedBitmap.new(_INTL("Graphics/UI/Slot Machine/images")) + @shading = AnimatedBitmap.new("Graphics/UI/Slot Machine/ReelOverlay") update end @@ -88,7 +88,7 @@ class SlotMachineScore < BitmapSprite @viewport = Viewport.new(x, y, 70, 22) @viewport.z = 99999 super(70, 22, @viewport) - @numbers = AnimatedBitmap.new("Graphics/Pictures/Slot Machine/numbers") + @numbers = AnimatedBitmap.new("Graphics/UI/Slot Machine/numbers") self.score = score end @@ -181,10 +181,10 @@ class SlotMachineScene Input.update update @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) 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) end @sprites["light1"].visible = true @@ -229,7 +229,7 @@ class SlotMachineScene Input.update update @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) frame += 1 end @@ -247,25 +247,25 @@ class SlotMachineScene @sprites["reel3"] = SlotMachineReel.new(224, 112, difficulty) (1..3).each do |i| @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 end (1..5).each do |i| y = [170, 122, 218, 82, 82][i - 1] @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") : "")) @sprites["row#{i}"].visible = false end @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["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"].visible = false @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["window2"] = IconSprite.new(358, 96, @viewport) @sprites["credit"] = SlotMachineScore.new(360, 66, $player.coins) @@ -292,7 +292,7 @@ class SlotMachineScene pbMessage(_INTL("You've run out of Coins.\nGame over!")) break 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) if Input.trigger?(Input::USE) pbSEPlay("Slots stop") @@ -322,10 +322,10 @@ class SlotMachineScene end @gameEnd = false 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) 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) end if Input.trigger?(Input::DOWN) && @wager < 3 && @sprites["credit"].score > 0 diff --git a/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb b/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb index 9e9a76719..bc97d61a5 100644 --- a/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb +++ b/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb @@ -37,7 +37,7 @@ class VoltorbFlip @index = [0, 0] # [x,y,points,selected] @squares = [0, 0, 0, false] - @directory = "Graphics/Pictures/Voltorb Flip/" + @directory = "Graphics/UI/Voltorb Flip/" squareValues = [] total = 1 voltorbs = 0 @@ -152,7 +152,7 @@ class VoltorbFlip @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport.z = 99999 @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) pbSetSystemFont(@sprites["text"].bitmap) @sprites["level"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) diff --git a/Data/Scripts/017_Minigames/006_Minigame_Mining.rb b/Data/Scripts/017_Minigames/006_Minigame_Mining.rb index cbc82b367..9f86c925b 100644 --- a/Data/Scripts/017_Minigames/006_Minigame_Mining.rb +++ b/Data/Scripts/017_Minigames/006_Minigame_Mining.rb @@ -12,7 +12,7 @@ class MiningGameCounter < BitmapSprite @viewport.z = 99999 super(416, 60, @viewport) @hits = 0 - @image = AnimatedBitmap.new("Graphics/Pictures/Mining/cracks") + @image = AnimatedBitmap.new("Graphics/UI/Mining/cracks") update end @@ -53,7 +53,7 @@ class MiningGameTile < BitmapSprite else @layer = 6 # 15% end - @image = AnimatedBitmap.new("Graphics/Pictures/Mining/tiles") + @image = AnimatedBitmap.new("Graphics/UI/Mining/tiles") update end @@ -89,9 +89,9 @@ class MiningGameCursor < BitmapSprite @mode = mode @hit = 0 # 0=regular, 1=hit item, 2=hit iron @counter = 0 - @cursorbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/cursor") - @toolbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/tools") - @hitsbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/hits") + @cursorbitmap = AnimatedBitmap.new("Graphics/UI/Mining/cursor") + @toolbitmap = AnimatedBitmap.new("Graphics/UI/Mining/tools") + @hitsbitmap = AnimatedBitmap.new("Graphics/UI/Mining/hits") update end @@ -230,10 +230,10 @@ class MiningGameScene @sprites = {} @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @viewport.z = 99999 - addBackgroundPlane(@sprites, "bg", "Mining/miningbg", @viewport) + addBackgroundPlane(@sprites, "bg", "Mining/bg", @viewport) @sprites["itemlayer"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) - @itembitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/items") - @ironbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/irons") + @itembitmap = AnimatedBitmap.new("Graphics/UI/Mining/items") + @ironbitmap = AnimatedBitmap.new("Graphics/UI/Mining/irons") @items = [] @itemswon = [] @iron = [] @@ -247,7 +247,7 @@ class MiningGameScene @sprites["crack"] = MiningGameCounter.new(0, 4) @sprites["cursor"] = MiningGameCursor.new(58, 0) # central position, pick @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) update pbFadeInAndShow(@sprites) diff --git a/Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb b/Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb index e53a3b605..01efc392e 100644 --- a/Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb +++ b/Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb @@ -35,7 +35,7 @@ class TilePuzzleCursor < BitmapSprite @arrows = [] @selected = false @holding = false - @cursorbitmap = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/cursor") + @cursorbitmap = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/cursor") update end @@ -148,23 +148,23 @@ class TilePuzzleScene @sprites = {} @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @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) else addBackgroundPlane(@sprites, "bg", "Tile Puzzle/bg", @viewport) end - @tilebitmap = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/tiles#{@board}") + @tilebitmap = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/tiles#{@board}") @tilebitmap1 = nil @tilebitmap2 = nil @tilebitmap3 = nil - if pbResolveBitmap("Graphics/Pictures/Tile Puzzle/tiles#{@board}_1") - @tilebitmap1 = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/tiles#{@board}_1") + if pbResolveBitmap("Graphics/UI/Tile Puzzle/tiles#{@board}_1") + @tilebitmap1 = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/tiles#{@board}_1") end - if pbResolveBitmap("Graphics/Pictures/Tile Puzzle/tiles#{@board}_2") - @tilebitmap2 = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/tiles#{@board}_2") + if pbResolveBitmap("Graphics/UI/Tile Puzzle/tiles#{@board}_2") + @tilebitmap2 = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/tiles#{@board}_2") end - if pbResolveBitmap("Graphics/Pictures/Tile Puzzle/tiles#{@board}_3") - @tilebitmap3 = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/tiles#{@board}_3") + if pbResolveBitmap("Graphics/UI/Tile Puzzle/tiles#{@board}_3") + @tilebitmap3 = AnimatedBitmap.new("Graphics/UI/Tile Puzzle/tiles#{@board}_3") end @tilewidth = @tilebitmap.width / @boardwidth @tileheight = @tilebitmap.height / @boardheight diff --git a/Data/Scripts/020_Debug/001_Editor screens/003_EditorScreens_MapConnections.rb b/Data/Scripts/020_Debug/001_Editor screens/003_EditorScreens_MapConnections.rb index 846a4d7a3..8b970efd2 100644 --- a/Data/Scripts/020_Debug/001_Editor screens/003_EditorScreens_MapConnections.rb +++ b/Data/Scripts/020_Debug/001_Editor screens/003_EditorScreens_MapConnections.rb @@ -107,7 +107,7 @@ class RegionMapSprite def createRegionMap(map) @mapdata = pbLoadTownMapData @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.stretch_blt( Rect.new(0, 0, bitmap.width / 2, bitmap.height / 2), diff --git a/Data/Scripts/020_Debug/001_Editor screens/004_EditorScreens_SpritePositioning.rb b/Data/Scripts/020_Debug/001_Editor screens/004_EditorScreens_SpritePositioning.rb index 012a8a1f7..110d64a5e 100644 --- a/Data/Scripts/020_Debug/001_Editor screens/004_EditorScreens_SpritePositioning.rb +++ b/Data/Scripts/020_Debug/001_Editor screens/004_EditorScreens_SpritePositioning.rb @@ -67,7 +67,7 @@ class SpritePositioner @sprites["base_1"].y -= @sprites["base_1"].bitmap.height / 2 if @sprites["base_1"].bitmap @sprites["base_1"].z = 1 @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["shadow_1"] = IconSprite.new(0, 0, @viewport) @sprites["shadow_1"].z = 3 diff --git a/Data/Scripts/020_Debug/002_Animation editor/001_AnimEditor_SceneElements.rb b/Data/Scripts/020_Debug/002_Animation editor/001_AnimEditor_SceneElements.rb index 1fb32517c..f0905e8ea 100644 --- a/Data/Scripts/020_Debug/002_Animation editor/001_AnimEditor_SceneElements.rb +++ b/Data/Scripts/020_Debug/002_Animation editor/001_AnimEditor_SceneElements.rb @@ -173,7 +173,7 @@ class AnimationWindow < Sprite def initialize(x, y, width, height, viewport = nil) super(viewport) @animbitmap = nil - @arrows = AnimatedBitmap.new("Graphics/Pictures/arrows") + @arrows = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_arrows") self.x = x self.y = y @start = 0 @@ -373,7 +373,7 @@ class SpriteFrame < InvalidatableSprite @prevcolor = Color.new(64, 128, 192) @contents = Bitmap.new(64, 64) 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.invalidate end @@ -453,9 +453,9 @@ class AnimationCanvas < Sprite @playingframe = 0 @player = nil @battle = MiniBattle.new - @user = AnimatedBitmap.new("Graphics/Pictures/testback").deanimate - @target = AnimatedBitmap.new("Graphics/Pictures/testfront").deanimate - @testscreen = AnimatedBitmap.new("Graphics/Pictures/testscreen") + @user = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_battler_back").deanimate + @target = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_battler_front").deanimate + @testscreen = AnimatedBitmap.new("Graphics/UI/Debug/anim_editor_battle_bg") self.bitmap = @testscreen.bitmap PBAnimation::MAX_SPRITES.times do |i| @lastframesprites[i] = SpriteFrame.new(i, @celsprites[i], viewport, true)