DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Created folder Graphics/UI, renamed some UI graphics

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

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

@@ -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)"))

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

@@ -17,7 +17,7 @@ class PokemonEggHatch_Scene
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.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)

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

@@ -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)

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

@@ -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)

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

@@ -48,9 +48,9 @@ class HallOfFame_Scene
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.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)

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

@@ -8,7 +8,7 @@ class Window_DexesList < Window_CommandPokemon
def initialize(commands, commands2, width)
@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("<c3=F8F8F8,C02028>SEEN<r>OBTAINED</c3>"), 286, 136, 208, 64, @viewport
)

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

@@ -5,9 +5,9 @@ class Window_Pokedex < Window_DrawableCommand
def initialize(x, y, width, height, viewport)
@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)

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

@@ -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)

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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)

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

@@ -104,9 +104,9 @@ class PokemonRegionMap_Scene
pbMessage(_INTL("The map data cannot be found."))
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)

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

@@ -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

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

@@ -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
)

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

@@ -10,18 +10,18 @@ class PokemonTrainerCard_Scene
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.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

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

@@ -20,7 +20,7 @@ class PokemonLoadPanel < Sprite
@totalsec = (stats) ? stats.play_time.to_i : ((framecount || 0) / Graphics.frame_rate)
@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

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

@@ -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

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

@@ -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)

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

@@ -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))

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

@@ -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(

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

@@ -25,13 +25,13 @@ class MoveRelearner_Scene
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.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,

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

@@ -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

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

@@ -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]"))

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

@@ -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