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

Moved move data constants into module MoveData

Browse Source
This commit is contained in:
Maruno17
2020-10-17 00:29:58 +01:00
parent d3ec5c2c53
commit c30e302ccf
15 changed files with 131 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/017_UI/006_PScreen_Summary.rb
View File

@@ -714,9 +714,9 @@ class PokemonSummary_Scene
@sprites["itemicon"].visible = false if @sprites["itemicon"]
# Get data for selected move
moveData = pbGetMoveData(moveid)
basedamage = moveData[MOVE_BASE_DAMAGE]
category = moveData[MOVE_CATEGORY]
accuracy = moveData[MOVE_ACCURACY]
basedamage = moveData[MoveData::BASE_DAMAGE]
category = moveData[MoveData::CATEGORY]
accuracy = moveData[MoveData::ACCURACY]
textpos = []
# Write power and accuracy values for selected move
if basedamage==0 # Status move

12
Data/Scripts/017_UI/023_PScreen_MoveRelearner.rb
View File

@@ -103,14 +103,14 @@ class MoveRelearner_Scene
moveData=movesData[moveobject]
if moveData
imagepos.push(["Graphics/Pictures/types",12,yPos+2,0,
moveData[MOVE_TYPE]*28,64,28])
moveData[MoveData::TYPE]*28,64,28])
textpos.push([PBMoves.getName(moveobject),80,yPos,0,
Color.new(248,248,248),Color.new(0,0,0)])
if moveData[MOVE_TOTAL_PP]>0
if moveData[MoveData::TOTAL_PP]>0
textpos.push([_INTL("PP"),112,yPos+32,0,
Color.new(64,64,64),Color.new(176,176,176)])
textpos.push([_INTL("{1}/{2}",
moveData[MOVE_TOTAL_PP],moveData[MOVE_TOTAL_PP]),230,yPos+32,1,
moveData[MoveData::TOTAL_PP],moveData[MoveData::TOTAL_PP]),230,yPos+32,1,
Color.new(64,64,64),Color.new(176,176,176)])
end
else
@@ -124,9 +124,9 @@ class MoveRelearner_Scene
0,78+(@sprites["commands"].index-@sprites["commands"].top_item)*64,
0,0,258,72])
selMoveData=movesData[@moves[@sprites["commands"].index]]
basedamage=selMoveData[MOVE_BASE_DAMAGE]
category=selMoveData[MOVE_CATEGORY]
accuracy=selMoveData[MOVE_ACCURACY]
basedamage=selMoveData[MoveData::BASE_DAMAGE]
category=selMoveData[MoveData::CATEGORY]
accuracy=selMoveData[MoveData::ACCURACY]
textpos.push([_INTL("CATEGORY"),272,114,0,Color.new(248,248,248),Color.new(0,0,0)])
textpos.push([_INTL("POWER"),272,146,0,Color.new(248,248,248),Color.new(0,0,0)])
textpos.push([basedamage<=1 ? basedamage==1 ? "???" : "---" : sprintf("%d",basedamage),