Fixed up text positioning and window sizes, fixed crash when choosing how many items to toss from the Bag

This commit is contained in:
Maruno17
2021-03-07 23:08:05 +00:00
parent 3ca08f27b8
commit 4c35a7ecfe
31 changed files with 342 additions and 438 deletions

View File

@@ -409,7 +409,7 @@ class PokemonBoxSprite < SpriteWrapper
pbSetSystemFont(@contents)
widthval = @contents.text_size(boxname).width
xval = 162-(widthval/2)
pbDrawShadowText(@contents,xval,8 + 6,widthval,32,
pbDrawShadowText(@contents,xval,8,widthval,32,
boxname,Color.new(248,248,248),Color.new(40,48,48))
@refreshBox = false
end
@@ -1316,8 +1316,8 @@ class PokemonStorageScene
@sprites["markingoverlay"].bitmap.blt(336+58*(i%3),106+50*(i/3),@markingbitmap.bitmap,markrect)
end
textpos = [
[_INTL("OK"),402,210,2,base,shadow,1],
[_INTL("Cancel"),402,274,2,base,shadow,1]
[_INTL("OK"),402,208,2,base,shadow,1],
[_INTL("Cancel"),402,272,2,base,shadow,1]
]
pbDrawTextPositions(@sprites["markingoverlay"].bitmap,textpos)
pbMarkingSetArrow(@sprites["arrow"],index)
@@ -1412,26 +1412,26 @@ class PokemonStorageScene
nonshadow = Color.new(224,224,224)
pokename = pokemon.name
textstrings = [
[pokename,10,8,false,base,shadow]
[pokename,10,2,false,base,shadow]
]
if !pokemon.egg?
imagepos = []
if pokemon.male?
textstrings.push([_INTL(""),148,8,false,Color.new(24,112,216),Color.new(136,168,208)])
textstrings.push([_INTL(""),148,2,false,Color.new(24,112,216),Color.new(136,168,208)])
elsif pokemon.female?
textstrings.push([_INTL(""),148,8,false,Color.new(248,56,32),Color.new(224,152,144)])
textstrings.push([_INTL(""),148,2,false,Color.new(248,56,32),Color.new(224,152,144)])
end
imagepos.push(["Graphics/Pictures/Storage/overlay_lv",6,246])
textstrings.push([pokemon.level.to_s,28,234,false,base,shadow])
textstrings.push([pokemon.level.to_s,28,228,false,base,shadow])
if pokemon.ability
textstrings.push([pokemon.ability.name,86,306,2,base,shadow])
textstrings.push([pokemon.ability.name,86,300,2,base,shadow])
else
textstrings.push([_INTL("No ability"),86,306,2,nonbase,nonshadow])
textstrings.push([_INTL("No ability"),86,300,2,nonbase,nonshadow])
end
if pokemon.item
textstrings.push([pokemon.item.name,86,342,2,base,shadow])
textstrings.push([pokemon.item.name,86,336,2,base,shadow])
else
textstrings.push([_INTL("No item"),86,342,2,nonbase,nonshadow])
textstrings.push([_INTL("No item"),86,336,2,nonbase,nonshadow])
end
if pokemon.shiny?
imagepos.push(["Graphics/Pictures/shiny",156,198])