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

@@ -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