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 720b4065d..487e72e1c 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 @@ -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(_INTL("Graphics/Pictures/Battle/cursor_target")) + @buttonBitmap = AnimatedBitmap.new("Graphics/Pictures/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 02da2a175..23dbaab5c 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 @@ -76,9 +76,9 @@ class Battle::Scene::PokemonDataBox < SpriteWrapper def initializeOtherGraphics(viewport) # Create other bitmaps - @numbersBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/icon_numbers")) - @hpBarBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/overlay_hp")) - @expBarBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/overlay_exp")) + @numbersBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/icon_numbers") + @hpBarBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/overlay_hp") + @expBarBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/overlay_exp") # Create sprite to draw HP numbers on @hpNumbers = BitmapSprite.new(124, 16, viewport) # pbSetSmallFont(@hpNumbers.bitmap) @@ -418,7 +418,7 @@ class Battle::Scene::AbilitySplashBar < SpriteWrapper @side = side @battler = nil # Create sprite wrapper that displays background graphic - @bgBitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Battle/ability_bar")) + @bgBitmap = AnimatedBitmap.new("Graphics/Pictures/Battle/ability_bar") @bgSprite = SpriteWrapper.new(viewport) @bgSprite.bitmap = @bgBitmap.bitmap @bgSprite.src_rect.y = (side == 0) ? 0 : @bgBitmap.height / 2 diff --git a/Data/Scripts/016_UI/007_UI_Bag.rb b/Data/Scripts/016_UI/007_UI_Bag.rb index 971e90384..403e7a50d 100644 --- a/Data/Scripts/016_UI/007_UI_Bag.rb +++ b/Data/Scripts/016_UI/007_UI_Bag.rb @@ -172,8 +172,8 @@ class PokemonBag_Scene end end @bag.last_viewed_pocket = lastpocket - @sliderbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Bag/icon_slider")) - @pocketbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Bag/icon_pocket")) + @sliderbitmap = AnimatedBitmap.new("Graphics/Pictures/Bag/icon_slider") + @pocketbitmap = AnimatedBitmap.new("Graphics/Pictures/Bag/icon_pocket") @sprites = {} @sprites["background"] = IconSprite.new(0, 0, @viewport) @sprites["overlay"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) diff --git a/Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb b/Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb index b95a5d040..b9133603e 100644 --- a/Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb +++ b/Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb @@ -84,7 +84,7 @@ class TriadCard def self.createBack(type = nil, noback = false) bitmap = BitmapWrapper.new(80, 96) if !noback - cardbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/triad_card_opponent")) + cardbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_card_opponent") bitmap.blt(0, 0, cardbitmap.bitmap, Rect.new(0, 0, cardbitmap.width, cardbitmap.height)) cardbitmap.dispose end @@ -102,13 +102,13 @@ class TriadCard return TriadCard.createBack if owner == 0 bitmap = BitmapWrapper.new(80, 96) if owner == 2 # Opponent - cardbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/triad_card_opponent")) + cardbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_card_opponent") else # Player - cardbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/triad_card_player")) + cardbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_card_player") end typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types")) iconbitmap = AnimatedBitmap.new(GameData::Species.icon_filename(@species, @form)) - numbersbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/triad_numbers")) + numbersbitmap = AnimatedBitmap.new("Graphics/Pictures/triad_numbers") # Draw card background bitmap.blt(0, 0, cardbitmap.bitmap, Rect.new(0, 0, cardbitmap.width, cardbitmap.height)) # Draw type icon diff --git a/Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb b/Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb index b067787d9..b4543a103 100644 --- a/Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb +++ b/Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb @@ -33,7 +33,7 @@ class SlotMachineReel < BitmapSprite @slipping = 0 @index = rand(@reel.length) @images = AnimatedBitmap.new(_INTL("Graphics/Pictures/Slot Machine/images")) - @shading = AnimatedBitmap.new(_INTL("Graphics/Pictures/Slot Machine/ReelOverlay")) + @shading = AnimatedBitmap.new("Graphics/Pictures/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(_INTL("Graphics/Pictures/Slot Machine/numbers")) + @numbers = AnimatedBitmap.new("Graphics/Pictures/Slot Machine/numbers") self.score = score end diff --git a/Data/Scripts/017_Minigames/006_Minigame_Mining.rb b/Data/Scripts/017_Minigames/006_Minigame_Mining.rb index f897d012b..f9de33c82 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(_INTL("Graphics/Pictures/Mining/cracks")) + @image = AnimatedBitmap.new("Graphics/Pictures/Mining/cracks") update end @@ -53,7 +53,7 @@ class MiningGameTile < BitmapSprite else @layer = 6 # 15% end - @image = AnimatedBitmap.new(_INTL("Graphics/Pictures/Mining/tiles")) + @image = AnimatedBitmap.new("Graphics/Pictures/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(_INTL("Graphics/Pictures/Mining/cursor")) - @toolbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Mining/tools")) - @hitsbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Mining/hits")) + @cursorbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/cursor") + @toolbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/tools") + @hitsbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/hits") update end @@ -232,8 +232,8 @@ class MiningGameScene @viewport.z = 99999 addBackgroundPlane(@sprites, "bg", "Mining/miningbg", @viewport) @sprites["itemlayer"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport) - @itembitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Mining/items")) - @ironbitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/Mining/irons")) + @itembitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/items") + @ironbitmap = AnimatedBitmap.new("Graphics/Pictures/Mining/irons") @items = [] @itemswon = [] @iron = [] diff --git a/Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb b/Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb index 1e7a1cdd3..e53a3b605 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(_INTL("Graphics/Pictures/Tile Puzzle/cursor")) + @cursorbitmap = AnimatedBitmap.new("Graphics/Pictures/Tile Puzzle/cursor") update end