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

Merge branch 'dev' into ai

Browse Source
This commit is contained in:
Maruno17
2023-01-08 21:56:33 +00:00
parent 3fa94bacc6 632b0f8b4b
commit a22f75f500
46 changed files with 1701 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/003_Game processing/001_StartGame.rb
View File

@@ -30,7 +30,7 @@ module Game
# Set language (and choose language if there is no save file)
if Settings::LANGUAGES.length >= 2
$PokemonSystem.language = pbChooseLanguage if save_data.empty?
pbLoadMessages("Data/" + Settings::LANGUAGES[$PokemonSystem.language][1])
MessageTypes.load_message_files(Settings::LANGUAGES[$PokemonSystem.language][1])
end
end

2
Data/Scripts/003_Game processing/002_Scene_Map.rb
View File

@@ -188,7 +188,7 @@ class Scene_Map
end
end
return if $game_temp.message_window_showing
if !pbMapInterpreterRunning?
if !pbMapInterpreterRunning? && !$PokemonGlobal.ice_sliding
if Input.trigger?(Input::USE)
$game_temp.interact_calling = true
elsif Input.trigger?(Input::ACTION)