DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 06:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added 1.5x screen size option, fixed 2**32 being 0, tidied up some code

Browse Source
This commit is contained in:
Maruno17
2020-11-22 17:32:10 +00:00
parent f362b7f847
commit 4af57f6501
11 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/017_UI/013_PScreen_Load.rb
View File

@@ -355,7 +355,6 @@ class PokemonLoadScreen
$PokemonBag = Marshal.load(f)
$PokemonStorage = Marshal.load(f)
$SaveVersion = Marshal.load(f) unless f.eof?
pbRefreshResizeFactor # To fix Game_Screen pictures
magicNumberMatches = false
if $data_system.respond_to?("magic_number")
magicNumberMatches = ($game_system.magic_number==$data_system.magic_number)
@@ -427,7 +426,6 @@ class PokemonLoadScreen
$PokemonStorage = PokemonStorage.new
$PokemonEncounters = PokemonEncounters.new
$PokemonTemp.begunNewGame = true
pbRefreshResizeFactor # To fix Game_Screen pictures
$data_system = pbLoadRxData("Data/System")
$MapFactory = PokemonMapFactory.new($data_system.start_map_id) # calls setMapChanged
$game_player.moveto($data_system.start_x, $data_system.start_y)

6
Data/Scripts/017_UI/015_PScreen_Options.rb
View File

@@ -20,7 +20,7 @@ class PokemonSystem
@frame = 0 # Default window frame (see also $TextFrames)
@textskin = 0 # Speech frame
@font = 0 # Font (see also $VersionStyles)
@screensize = (SCREEN_ZOOM.floor).to_i # 0=half size, 1=full size, 2=double size
@screensize = (SCREEN_ZOOM * 2).floor - 1 # 0=half size, 1=full size, 2=full-and-a-half size, 3=double size
@border = 0 # Screen border (0=off, 1=on)
@language = 0 # Language (see also LANGUAGES in script PokemonSystem)
@runstyle = 0 # Run key functionality (0=hold to run, 1=toggle auto-run)
@@ -508,8 +508,8 @@ class PokemonOption_Scene
proc { $PokemonSystem.textinput },
proc { |value| $PokemonSystem.textinput = value }
),
EnumOption.new(_INTL("Screen Size"),[_INTL("S"),_INTL("M"),_INTL("L"),_INTL("Full")],
proc { [$PokemonSystem.screensize,3].min },
EnumOption.new(_INTL("Screen Size"),[_INTL("S"),_INTL("M"),_INTL("L"),_INTL("XL"),_INTL("Full")],
proc { [$PokemonSystem.screensize,4].min },
proc { |value|
oldvalue = $PokemonSystem.screensize
$PokemonSystem.screensize = value

6
Data/Scripts/017_UI/026_PScreen_MysteryGift.rb
View File

@@ -380,11 +380,7 @@ def pbReceiveMysteryGift(id)
end
gift=$Trainer.mysterygift[index]
if gift[1]==0 # Pokémon
pID=rand(256)
pID|=rand(256)<<8
pID|=rand(256)<<16
pID|=rand(256)<<24
gift[2].personalID=pID
gift[2].personalID = rand(2**16) | rand(2**16) << 16
gift[2].calcStats
time=pbGetTimeNow
gift[2].timeReceived=time.getgm.to_i