Merged class PokemonTemp into class Game_Temp

This commit is contained in:
Maruno17
2021-10-21 22:01:59 +01:00
parent 5e51f702b3
commit ca680c9feb
37 changed files with 310 additions and 311 deletions

View File

@@ -49,7 +49,7 @@ class PokemonPauseMenu_Scene
ret = -1
cmdwindow = @sprites["cmdwindow"]
cmdwindow.commands = commands
cmdwindow.index = $PokemonTemp.menuLastChoice
cmdwindow.index = $game_temp.menu_last_choice
cmdwindow.resizeToFit(commands)
cmdwindow.x = Graphics.width-cmdwindow.width
cmdwindow.y = 0
@@ -64,7 +64,7 @@ class PokemonPauseMenu_Scene
break
elsif Input.trigger?(Input::USE)
ret = cmdwindow.index
$PokemonTemp.menuLastChoice = ret
$game_temp.menu_last_choice = ret
break
end
end
@@ -212,7 +212,7 @@ class PokemonPauseMenu
scene = PokemonPokegear_Scene.new
screen = PokemonPokegearScreen.new(scene)
screen.pbStartScreen
($PokemonTemp.flydata) ? @scene.pbEndScene : @scene.pbRefresh
($game_temp.fly_destination) ? @scene.pbEndScene : @scene.pbRefresh
}
return if pbFlyToNewLocation
elsif cmdTownMap>=0 && command==cmdTownMap
@@ -220,8 +220,8 @@ class PokemonPauseMenu
scene = PokemonRegionMap_Scene.new(-1, false)
screen = PokemonRegionMapScreen.new(scene)
ret = screen.pbStartScreen
$PokemonTemp.flydata = ret if ret
($PokemonTemp.flydata) ? @scene.pbEndScene : @scene.pbRefresh
$game_temp.fly_destination = ret if ret
($game_temp.fly_destination) ? @scene.pbEndScene : @scene.pbRefresh
}
return if pbFlyToNewLocation
elsif cmdTrainer>=0 && command==cmdTrainer

View File

@@ -1244,7 +1244,7 @@ class PokemonPartyScreen
screen = PokemonRegionMapScreen.new(scene)
ret = screen.pbStartFlyScreen
if ret
$PokemonTemp.flydata=ret
$game_temp.fly_destination = ret
return [pkmn,pkmn.moves[i].id]
end
@scene.pbStartScene(@party,

View File

@@ -567,7 +567,7 @@ class PokemonBagScreen
end
end
end
($PokemonTemp.flydata) ? @scene.dispose : @scene.pbEndScene
($game_temp.fly_destination) ? @scene.dispose : @scene.pbEndScene
return item
end

View File

@@ -148,11 +148,11 @@ class PokemonPokegearScreen
screen = PokemonRegionMapScreen.new(scene)
ret = screen.pbStartScreen
if ret
$PokemonTemp.flydata = ret
$game_temp.fly_destination = ret
next 99999 # Ugly hack to make Pokégear scene not reappear if flying
end
}
break if $PokemonTemp.flydata
break if $game_temp.fly_destination
elsif cmdPhone>=0 && cmd==cmdPhone
pbFadeOutIn {
PokemonPhoneScene.new.start
@@ -165,6 +165,6 @@ class PokemonPokegearScreen
}
end
end
($PokemonTemp.flydata) ? @scene.dispose : @scene.pbEndScene
($game_temp.fly_destination) ? @scene.dispose : @scene.pbEndScene
end
end

View File

@@ -358,6 +358,6 @@ def pbShowMap(region = -1, wallmap = true)
scene = PokemonRegionMap_Scene.new(region, wallmap)
screen = PokemonRegionMapScreen.new(scene)
ret = screen.pbStartScreen
$PokemonTemp.flydata = ret if ret && !wallmap
$game_temp.fly_destination = ret if ret && !wallmap
}
end

View File

@@ -83,7 +83,7 @@ class PokemonSaveScreen
ret = false
@scene.pbStartScreen
if pbConfirmMessage(_INTL('Would you like to save the game?'))
if SaveData.exists? && $PokemonTemp.begunNewGame
if SaveData.exists? && $game_temp.begun_new_game
pbMessage(_INTL('WARNING!'))
pbMessage(_INTL('There is a different game file that is already saved.'))
pbMessage(_INTL("If you save now, the other file's adventure, including items and Pokémon, will be entirely lost."))
@@ -94,7 +94,7 @@ class PokemonSaveScreen
return false
end
end
$PokemonTemp.begunNewGame = false
$game_temp.begun_new_game = false
pbSEPlay('GUI save choice')
if Game.save
pbMessage(_INTL("\\se[]{1} saved the game.\\me[GUI save game]\\wtnp[30]", $player.name))

View File

@@ -267,7 +267,7 @@ class PokemonReadyMenu
pbShowMenu if !ret
}
if ret
$PokemonTemp.flydata = ret
$game_temp.fly_destination = ret
$game_temp.in_menu = false
pbUseHiddenMove(user,move)
break