DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-25 15:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Scripts/012_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb
View File

@@ -213,13 +213,13 @@ class PokemonDataBox < SpriteWrapper
nameWidth = self.bitmap.text_size(@battler.name).width
nameOffset = 0
nameOffset = nameWidth-116 if nameWidth>116
textPos.push([@battler.name,@spriteBaseX+8-nameOffset,6,false,NAME_BASE_COLOR,NAME_SHADOW_COLOR])
textPos.push([@battler.name,@spriteBaseX+8-nameOffset,0,false,NAME_BASE_COLOR,NAME_SHADOW_COLOR])
# Draw Pokémon's gender symbol
case @battler.displayGender
when 0 # Male
textPos.push([_INTL("♂"),@spriteBaseX+126,6,false,MALE_BASE_COLOR,MALE_SHADOW_COLOR])
textPos.push([_INTL("♂"),@spriteBaseX+126,0,false,MALE_BASE_COLOR,MALE_SHADOW_COLOR])
when 1 # Female
textPos.push([_INTL("♀"),@spriteBaseX+126,6,false,FEMALE_BASE_COLOR,FEMALE_SHADOW_COLOR])
textPos.push([_INTL("♀"),@spriteBaseX+126,0,false,FEMALE_BASE_COLOR,FEMALE_SHADOW_COLOR])
end
pbDrawTextPositions(self.bitmap,textPos)
# Draw Pokémon's level
@@ -451,10 +451,10 @@ class AbilitySplashBar < SpriteWrapper
textPos = []
textX = (@side==0) ? 10 : self.bitmap.width-8
# Draw Pokémon's name
textPos.push([_INTL("{1}'s",@battler.name),textX,2,@side==1,
textPos.push([_INTL("{1}'s",@battler.name),textX,-4,@side==1,
TEXT_BASE_COLOR,TEXT_SHADOW_COLOR,true])
# Draw Pokémon's ability
textPos.push([@battler.abilityName,textX,32,@side==1,
textPos.push([@battler.abilityName,textX,26,@side==1,
TEXT_BASE_COLOR,TEXT_SHADOW_COLOR,true])
pbDrawTextPositions(self.bitmap,textPos)
end

6
Data/Scripts/012_Battle/005_Battle scene/005_PokeBattle_SceneMenus.rb
View File

@@ -348,7 +348,7 @@ class FightMenuDisplay < BattleMenuBase
@buttons.each_with_index do |button,i|
next if !@visibility["button_#{i}"]
x = button.x-self.x+button.src_rect.width/2
y = button.y-self.y+8
y = button.y-self.y+2
moveNameBase = TEXT_BASE_COLOR
if moves[i].type
# NOTE: This takes a colour from a particular pixel in the button
@@ -407,7 +407,7 @@ class FightMenuDisplay < BattleMenuBase
ppFraction = [(4.0*move.pp/move.total_pp).ceil,3].min
textPos = []
textPos.push([_INTL("PP: {1}/{2}",move.pp,move.total_pp),
448,50,2,PP_COLORS[ppFraction*2],PP_COLORS[ppFraction*2+1]])
448,44,2,PP_COLORS[ppFraction*2],PP_COLORS[ppFraction*2+1]])
pbDrawTextPositions(@infoOverlay.bitmap,textPos)
end
end
@@ -539,7 +539,7 @@ class TargetMenuDisplay < BattleMenuBase
@buttons.each_with_index do |button,i|
next if !button || @texts[i].nil? || @texts[i]==""
x = button.x-self.x+button.src_rect.width/2
y = button.y-self.y+8
y = button.y-self.y+2
textpos.push([@texts[i],x,y,2,TEXT_BASE_COLOR,TEXT_SHADOW_COLOR])
end
pbDrawTextPositions(@overlay.bitmap,textpos)

4
Data/Scripts/012_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb
View File

@@ -87,8 +87,8 @@ class SafariDataBox < SpriteWrapper
base = Color.new(72,72,72)
shadow = Color.new(184,184,184)
textpos = []
textpos.push([_INTL("Safari Balls"),30,8,false,base,shadow])
textpos.push([_INTL("Left: {1}",@battle.ballCount),30,38,false,base,shadow])
textpos.push([_INTL("Safari Balls"),30,2,false,base,shadow])
textpos.push([_INTL("Left: {1}",@battle.ballCount),30,32,false,base,shadow])
pbDrawTextPositions(self.bitmap,textpos)
end

18
Data/Scripts/012_Battle/006_Other battle types/005_PokeBattle_BattleArena.rb
View File

@@ -200,15 +200,15 @@ class PokeBattle_Scene
window.contents.clear
pbSetSystemFont(window.contents)
textpos = [
[battler1.name,64,0,2,Color.new(248,0,0),Color.new(208,208,200)],
[_INTL("VS"),144,0,2,Color.new(72,72,72),Color.new(208,208,200)],
[battler2.name,224,0,2,Color.new(72,72,72),Color.new(208,208,200)],
[_INTL("Mind"),144,48,2,Color.new(72,72,72),Color.new(208,208,200)],
[_INTL("Skill"),144,80,2,Color.new(72,72,72),Color.new(208,208,200)],
[_INTL("Body"),144,112,2,Color.new(72,72,72),Color.new(208,208,200)],
[sprintf("%d",total1),64,160,2,Color.new(72,72,72),Color.new(208,208,200)],
[_INTL("Judgment"),144,160,2,Color.new(72,72,72),Color.new(208,208,200)],
[sprintf("%d",total2),224,160,2,Color.new(72,72,72),Color.new(208,208,200)]
[battler1.name,64,-6,2,Color.new(248,0,0),Color.new(208,208,200)],
[_INTL("VS"),144,-6,2,Color.new(72,72,72),Color.new(208,208,200)],
[battler2.name,224,-6,2,Color.new(72,72,72),Color.new(208,208,200)],
[_INTL("Mind"),144,42,2,Color.new(72,72,72),Color.new(208,208,200)],
[_INTL("Skill"),144,74,2,Color.new(72,72,72),Color.new(208,208,200)],
[_INTL("Body"),144,106,2,Color.new(72,72,72),Color.new(208,208,200)],
[sprintf("%d",total1),64,154,2,Color.new(72,72,72),Color.new(208,208,200)],
[_INTL("Judgment"),144,154,2,Color.new(72,72,72),Color.new(208,208,200)],
[sprintf("%d",total2),224,154,2,Color.new(72,72,72),Color.new(208,208,200)]
]
pbDrawTextPositions(window.contents,textpos)
images = []