mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Added Battle Points message window (\pt), fixed occasional wrong form when viewing Pokédex of newly caught species, other tweaks
This commit is contained in:
@@ -235,7 +235,7 @@ class PokemonPokedexInfo_Scene
|
||||
textpos.push([_ISPRINTF("{1:.1f} kg", weight / 10.0), 482, 184, 1, base, shadow])
|
||||
end
|
||||
# Draw the Pokédex entry text
|
||||
drawTextEx(overlay, 40, 240, Graphics.width - (40 * 2), 4, # overlay, x, y, width, num lines
|
||||
drawTextEx(overlay, 40, 244, Graphics.width - (40 * 2), 4, # overlay, x, y, width, num lines
|
||||
species_data.pokedex_entry, base, shadow)
|
||||
# Draw the footprint
|
||||
footprintfile = GameData::Species.footprint_filename(@species, @form)
|
||||
|
||||
@@ -663,7 +663,7 @@ class PokemonSummary_Scene
|
||||
ability = @pokemon.ability
|
||||
if ability
|
||||
textpos.push([ability.name,362,278,0,Color.new(64,64,64),Color.new(176,176,176)])
|
||||
drawTextEx(overlay,224,316,282,2,ability.description,Color.new(64,64,64),Color.new(176,176,176))
|
||||
drawTextEx(overlay,224,320,282,2,ability.description,Color.new(64,64,64),Color.new(176,176,176))
|
||||
end
|
||||
# Draw all text
|
||||
pbDrawTextPositions(overlay,textpos)
|
||||
@@ -830,7 +830,7 @@ class PokemonSummary_Scene
|
||||
imagepos = [["Graphics/Pictures/category", 166, 124, 0, selected_move.category * 28, 64, 28]]
|
||||
pbDrawImagePositions(overlay, imagepos)
|
||||
# Draw selected move's description
|
||||
drawTextEx(overlay, 4, 218, 230, 5, selected_move.description, base, shadow)
|
||||
drawTextEx(overlay, 4, 222, 230, 5, selected_move.description, base, shadow)
|
||||
end
|
||||
|
||||
def drawPageFive
|
||||
@@ -883,7 +883,7 @@ class PokemonSummary_Scene
|
||||
]
|
||||
pbDrawTextPositions(overlay,textpos)
|
||||
# Draw selected ribbon's description
|
||||
drawTextEx(overlay,18,318,480,2,desc,base,shadow)
|
||||
drawTextEx(overlay,18,322,480,2,desc,base,shadow)
|
||||
end
|
||||
|
||||
def pbGoToPrevious
|
||||
|
||||
@@ -132,7 +132,7 @@ class ItemStorage_Scene
|
||||
def pbRefresh
|
||||
bm = @sprites["pocketwindow"].bitmap
|
||||
# Draw title at upper left corner ("Toss Item/Withdraw Item")
|
||||
drawTextEx(bm,0,0,bm.width,2,@title,TITLEBASECOLOR,TITLESHADOWCOLOR)
|
||||
drawTextEx(bm,0,4,bm.width,2,@title,TITLEBASECOLOR,TITLESHADOWCOLOR)
|
||||
itemwindow = @sprites["itemwindow"]
|
||||
# Draw item icon
|
||||
@sprites["icon"].item = itemwindow.item
|
||||
|
||||
@@ -108,7 +108,7 @@ class MoveRelearner_Scene
|
||||
imagepos.push(["Graphics/Pictures/reminderButtons",134,350,76,0,76,32])
|
||||
end
|
||||
pbDrawImagePositions(overlay,imagepos)
|
||||
drawTextEx(overlay,272,210,230,5,selMoveData.description,
|
||||
drawTextEx(overlay,272,214,230,5,selMoveData.description,
|
||||
Color.new(64,64,64),Color.new(176,176,176))
|
||||
end
|
||||
|
||||
|
||||
@@ -24,7 +24,8 @@ class PokemonGlobalMetadata
|
||||
# @deprecated Use {Player#seen_purify_chamber} instead. This alias is slated to be removed in v20.
|
||||
def seenPurifyChamber
|
||||
Deprecation.warn_method('PokemonGlobalMetadata#seenPurifyChamber', 'v20', '$Trainer.seen_purify_chamber')
|
||||
return @seenPurifyChamber || false
|
||||
return @seenPurifyChamber if !@seenPurifyChamber.nil?
|
||||
return ($Trainer) ? $Trainer.seen_purify_chamber : false
|
||||
end
|
||||
|
||||
# @deprecated Use {Player#seen_purify_chamber=} instead. This alias is slated to be removed in v20.
|
||||
@@ -40,7 +41,8 @@ class PokemonGlobalMetadata
|
||||
# @deprecated Use {Player#has_snag_machine} instead. This alias is slated to be removed in v20.
|
||||
def snagMachine
|
||||
Deprecation.warn_method('PokemonGlobalMetadata#snagMachine', 'v20', '$Trainer.has_snag_machine')
|
||||
return @snagMachine || false
|
||||
return @snagMachine if !@snagMachine.nil?
|
||||
return ($Trainer) ? $Trainer.has_snag_machine : false
|
||||
end
|
||||
|
||||
# @deprecated Use {Player#has_snag_machine=} instead. This alias is slated to be removed in v20.
|
||||
|
||||
Reference in New Issue
Block a user