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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2020-11-25 22:07:17 +00:00
parent bba24abc1a e2dcba2169
commit 017cdb8d0f
14 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/Scripts/021_Debug/010_Editor_TilesetEditor.rb
View File

@@ -101,9 +101,9 @@ class PokemonTilesetScene
@x = 0
@y = -TILE_SIZE
@topy = -TILE_SIZE
height = @sprites["tileset"].bitmap.height
pbUpdateTileset
pbFadeInAndShow(@sprites)
height = @sprites["tileset"].bitmap.height
########
loop do
Graphics.update
@@ -161,6 +161,7 @@ class PokemonTilesetScene
pbUpdateTileset
when 2
pbChooseTileset
height = @sprites["tileset"].bitmap.height
end
elsif Input.trigger?(Input::B)
if pbConfirmMessage(_INTL("Save changes?"))