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

Removed redundant "\r" from various messages, removed usages of BitmapWrapper, fixed Lure Ball error in battles started in the Debug menu, improved Terrain Tag editor, fixed some Compiler errors, enabled vsync, fixed event graphics frozen to the screen when using $game_player.moveto directly.

Browse Source
This commit is contained in:
Maruno17
2023-05-04 21:28:00 +01:00
parent 5f20121e59
commit 48fb8dae73
44 changed files with 362 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ class ButtonEventScene < EventScene
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/UI/Controls help/help_arrows")
addLabelForScreen(2, 134, 100, 352, _INTL("Use the Arrow keys to move the main character.\r\n\r\nYou can also use the Arrow keys to select entries and navigate menus."))
addLabelForScreen(2, 134, 100, 352, _INTL("Use the Arrow keys to move the main character.\n\nYou can also use the Arrow keys to select entries and navigate menus."))
addImageForScreen(3, 16, 90, "Graphics/UI/Controls help/help_usekey")
addImageForScreen(3, 16, 236, "Graphics/UI/Controls help/help_backkey")

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

@@ -175,18 +175,18 @@ class PokemonTrade_Scene
speciesname1 = GameData::Species.get(@pokemon.species).name
speciesname2 = GameData::Species.get(@pokemon2.species).name
pbMessageDisplay(@sprites["msgwindow"],
_ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}",
_ISPRINTF("{1:s}\nID: {2:05d} OT: {3:s}",
@pokemon.name, @pokemon.owner.public_id, @pokemon.owner.name) + "\\wtnp[0]") { pbUpdate }
pbMessageWaitForInput(@sprites["msgwindow"], 50, true) { pbUpdate }
pbPlayDecisionSE
pbScene1
pbMessageDisplay(@sprites["msgwindow"],
_INTL("For {1}'s {2},\r\n{3} sends {4}.", @trader1, speciesname1, @trader2, speciesname2) + "\1") { pbUpdate }
_INTL("For {1}'s {2},\n{3} sends {4}.", @trader1, speciesname1, @trader2, speciesname2) + "\1") { pbUpdate }
pbMessageDisplay(@sprites["msgwindow"],
_INTL("{1} bids farewell to {2}.", @trader2, speciesname2)) { pbUpdate }
pbScene2
pbMessageDisplay(@sprites["msgwindow"],
_ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}",
_ISPRINTF("{1:s}\nID: {2:05d} OT: {3:s}",
@pokemon2.name, @pokemon2.owner.public_id, @pokemon2.owner.name) + "\1") { pbUpdate }
pbMessageDisplay(@sprites["msgwindow"],
_INTL("Take good care of {1}.", speciesname2)) { pbUpdate }

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

@@ -19,7 +19,7 @@ class PokegearButton < Sprite
else
@button = AnimatedBitmap.new("Graphics/UI/Pokegear/icon_button")
end
@contents = BitmapWrapper.new(@button.width, @button.height)
@contents = Bitmap.new(@button.width, @button.height)
self.bitmap = @contents
self.x = x - (@button.width / 2)
self.y = y

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

@@ -12,7 +12,7 @@ class MapBottomSprite < Sprite
@mapname = ""
@maplocation = ""
@mapdetails = ""
self.bitmap = BitmapWrapper.new(Graphics.width, Graphics.height)
self.bitmap = Bitmap.new(Graphics.width, Graphics.height)
pbSetSystemFont(self.bitmap)
refresh
end

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

@@ -49,7 +49,7 @@ class PokemonLoadPanel < Sprite
return if disposed?
@refreshing = true
if !self.bitmap || self.bitmap.disposed?
self.bitmap = BitmapWrapper.new(@bgbitmap.width, 222)
self.bitmap = Bitmap.new(@bgbitmap.width, 222)
pbSetSystemFont(self.bitmap)
end
if @refreshBitmap

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

@@ -17,7 +17,7 @@ class ReadyMenuButton < Sprite
else
@button = AnimatedBitmap.new("Graphics/UI/Ready Menu/icon_itembutton")
end
@contents = BitmapWrapper.new(@button.width, @button.height / 2)
@contents = Bitmap.new(@button.width, @button.height / 2)
self.bitmap = @contents
pbSetSystemFont(self.bitmap)
if @command[2]

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

@@ -304,7 +304,7 @@ class PokemonBoxSprite < Sprite
pokemon = @storage[boxnumber, i]
@pokemonsprites[i] = PokemonBoxIcon.new(pokemon, viewport)
end
@contents = BitmapWrapper.new(324, 296)
@contents = Bitmap.new(324, 296)
self.bitmap = @contents
self.x = 184
self.y = 18
@@ -454,7 +454,7 @@ class PokemonBoxPartySprite < Sprite
pokemon = @party[i]
@pokemonsprites[i] = PokemonBoxIcon.new(pokemon, viewport) if pokemon
end
@contents = BitmapWrapper.new(172, 352)
@contents = Bitmap.new(172, 352)
self.bitmap = @contents
self.x = 182
self.y = Graphics.height - 352

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

@@ -236,7 +236,7 @@ class PokemonMart_Scene
@sprites["qtywindow"].y = Graphics.height - 102 - @sprites["qtywindow"].height
itemwindow.refresh
end
@sprites["moneywindow"].text = _INTL("Money:\r\n<r>{1}", @adapter.getMoneyString)
@sprites["moneywindow"].text = _INTL("Money:\n<r>{1}", @adapter.getMoneyString)
end
def pbStartBuyOrSellScene(buying, stock, adapter)

2
Data/Scripts/016_UI/021_UI_BattlePointShop.rb
View File

@@ -151,7 +151,7 @@ class BattlePointShop_Scene
@sprites["qtywindow"].y = Graphics.height - 102 - @sprites["qtywindow"].height
itemwindow.refresh
end
@sprites["battlepointwindow"].text = _INTL("Battle Points:\r\n<r>{1}", @adapter.getBPString)
@sprites["battlepointwindow"].text = _INTL("Battle Points:\n<r>{1}", @adapter.getBPString)
end
def pbStartScene(stock, adapter)

2
Data/Scripts/016_UI/025_UI_TextEntry.rb
View File

@@ -390,7 +390,7 @@ class PokemonEntryScene2
pbDrawTextPositions(b, textPos)
@bitmaps[@@Characters.length + i] = b
end
underline_bitmap = BitmapWrapper.new(24, 6)
underline_bitmap = Bitmap.new(24, 6)
underline_bitmap.fill_rect(2, 2, 22, 4, Color.new(168, 184, 184))
underline_bitmap.fill_rect(0, 0, 22, 4, Color.new(16, 24, 32))
@bitmaps.push(underline_bitmap)