From 5073f86190e460a7d7502558c5cafed399ca9348 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 5 Sep 2020 22:34:32 +0100 Subject: [PATCH] Rearranged some script files --- .../001_Interpreter.rb | 0 .../002_Scene_Map.rb} | 0 .../003_Event_Handlers.rb} | 0 .../001_FileTests.rb | 0 .../002_File_Mixins.rb} | 0 .../003_Intl_Messages.rb} | 0 .../004_PBDebug.rb} | 0 .../{007_Audio => 008_Audio}/001_Audio.rb | 10 +- .../002_Audio_Play.rb} | 0 .../003_Audio_Utilities.rb} | 0 .../001_BitmapCache.rb} | 0 .../002_Window.rb} | 0 .../003_SpriteWindow.rb} | 0 .../004_SpriteWindow_text.rb} | 0 .../005_SpriteWindow_sprites.rb} | 0 .../006_DrawText.rb} | 0 .../007_Messages.rb} | 0 .../008_TextEntry.rb} | 0 .../009_PictureEx.rb} | 280 +++--------------- .../010_Interpolators.rb} | 0 .../001_Transitions.rb} | 0 Data/Scripts/010_Scenes/002_EventScene.rb | 199 +++++++++++++ .../003_Scene_Intro.rb} | 0 .../004_Scene_Controls.rb} | 0 .../005_Scene_Credits.rb | 0 .../006_Scene_Movie.rb} | 0 .../{010_Data => 011_Data}/001_MiscData.rb | 0 .../{010_Data => 011_Data}/002_PBMove.rb | 0 .../{010_Data => 011_Data}/003_PBStatuses.rb | 0 .../004_PBTypes_Extra.rb | 0 .../{010_Data => 011_Data}/005_PBNatures.rb | 0 .../006_PBGenderRates.rb | 0 .../007_PBExperience.rb | 0 .../{010_Data => 011_Data}/008_PBStats.rb | 0 .../{010_Data => 011_Data}/009_PBRibbons.rb | 0 .../{010_Data => 011_Data}/010_PBEggGroups.rb | 0 .../{010_Data => 011_Data}/011_PBColors.rb | 0 .../{010_Data => 011_Data}/012_PBHabitats.rb | 0 .../001_Battler/001_PokeBattle_Battler.rb | 0 .../001_Battler/002_Battler_Initialize.rb | 0 .../001_Battler/003_Battler_ChangeSelf.rb | 0 .../001_Battler/004_Battler_Statuses.rb | 0 .../001_Battler/005_Battler_StatStages.rb | 0 .../001_Battler/006_Battler_AbilityAndItem.rb | 0 .../001_Battler/007_Battler_UseMove.rb | 0 .../008_Battler_UseMove_Targeting.rb | 0 .../009_Battler_UseMove_SuccessChecks.rb | 0 .../010_Battler_UseMove_TriggerEffects.rb | 0 .../001_PBEnvironment.rb | 0 .../002_Move/001_PokeBattle_Move.rb | 0 .../002_Move/002_Move_Usage.rb | 0 .../002_Move/003_Move_Usage_Calculations.rb | 0 .../002_Move/004_Move_Effects_Generic.rb | 0 .../002_Move/005_Move_Effects_000-07F.rb | 0 .../002_Move/006_Move_Effects_080-0FF.rb | 0 .../002_Move/007_Move_Effects_100-17F.rb | 0 .../002_PBWeather.rb | 0 .../003_Battle/001_PokeBattle_BattleCommon.rb | 0 .../003_Battle/002_PokeBattle_Battle.rb | 0 .../003_Battle/003_Battle_StartAndEnd.rb | 0 .../004_Battle_ExpAndMoveLearning.rb | 0 .../005_Battle_Action_AttacksPriority.rb | 0 .../003_Battle/006_Battle_Action_Switching.rb | 0 .../003_Battle/007_Battle_Action_UseItem.rb | 0 .../003_Battle/008_Battle_Action_Running.rb | 0 .../003_Battle/009_Battle_Action_Other.rb | 0 .../003_Battle/010_Battle_Phase_Command.rb | 0 .../003_Battle/011_Battle_Phase_Attack.rb | 0 .../003_Battle/012_Battle_Phase_EndOfRound.rb | 0 .../003_PBBattleTerrains.rb | 0 .../004_AI/001_PokeBattle_AI.rb | 0 .../004_AI/002_AI_Item.rb | 0 .../004_AI/003_AI_Switch.rb | 0 .../004_AI/004_AI_Move.rb | 0 .../004_AI/005_AI_Move_EffectScores.rb | 0 .../004_AI/006_AI_Move_Utilities.rb | 0 .../004_PBTargets.rb | 0 .../001_PokeBattle_Animation.rb | 0 .../002_PokeBattle_SceneAnimations.rb | 0 .../003_PokeBattle_SceneConstants.rb | 0 .../004_PokeBattle_SceneElements.rb | 0 .../005_PokeBattle_SceneMenus.rb | 0 .../005_Battle scene/006_PokeBattle_Scene.rb | 0 .../005_Battle scene/007_Scene_Initialize.rb | 0 .../005_Battle scene/008_Scene_Commands.rb | 0 .../005_Battle scene/009_Scene_Animations.rb | 0 .../005_PBEffects.rb | 0 .../006_BattleHandlers.rb | 0 .../001_PokeBattle_AnimationPlayer.rb | 0 .../002_PokeBattle_SafariZone.rb | 0 .../003_PokeBattle_BugContest.rb | 0 .../004_PokeBattle_BattlePalace.rb | 0 .../005_PokeBattle_BattleArena.rb | 0 .../006_PokeBattle_BattleRecord.rb | 0 .../007_PokeBattle_DebugScene.rb | 0 .../008_PokeBattle_BattlePeer.rb | 0 .../009_PokeBattle_Clauses.rb | 0 .../007_BattleHandlers_Abilities.rb | 0 .../008_BattleHandlers_Items.rb | 0 .../009_PokeBall_CatchEffects.rb | 0 .../010_PokeBattle_ActiveField.rb | 0 .../011_PokeBattle_DamageState.rb | 0 .../001_PBTerrain.rb | 0 .../002_PField_Field.rb | 0 .../003_PField_Visuals.rb | 0 .../004_PField_Weather.rb | 0 .../005_PField_Metadata.rb | 0 .../006_PField_Battles.rb | 0 .../007_PField_Encounters.rb | 0 .../008_PField_EncounterModifiers.rb | 0 .../009_PField_RoamingPokemon.rb | 0 .../010_PField_RandomDungeons.rb | 0 .../011_PField_FieldMoves.rb | 0 .../012_PField_BerryPlants.rb | 0 .../013_PField_DayCare.rb | 0 .../014_PField_DependentEvents.rb | 0 .../015_PField_Time.rb | 0 .../001_PokeBattle_Trainer.rb | 0 .../002_PTrainer_NPCTrainers.rb | 0 .../001_PItem_Items.rb | 0 .../002_PItem_ItemEffects.rb | 0 .../003_PItem_BattleItemEffects.rb | 0 .../004_PItem_Phone.rb | 0 .../005_PItem_PokeRadar.rb | 0 .../006_PItem_Mail.rb | 0 .../007_PItem_Sprites.rb | 0 .../{014_Items => 015_Items}/008_PItem_Bag.rb | 0 .../001_PokeBattle_Pokemon.rb | 0 .../002_Pokemon_Forms.rb | 0 .../003_Pokemon_MegaEvolution.rb | 0 .../004_Pokemon_ShadowPokemon.rb | 0 .../005_Pokemon_Evolution.rb | 0 .../006_Pokemon_Chatter.rb | 0 .../007_Pokemon_Sprites.rb | 0 .../008_Pokemon_Storage.rb | 0 .../001_PScreen_PauseMenu.rb | 0 .../002_PScreen_PokedexMenu.rb | 0 .../003_PScreen_PokedexMain.rb | 0 .../004_PScreen_PokedexEntry.rb | 0 .../{016_UI => 017_UI}/005_PScreen_Party.rb | 0 .../{016_UI => 017_UI}/006_PScreen_Summary.rb | 0 .../{016_UI => 017_UI}/007_PScreen_Bag.rb | 0 .../008_PScreen_Pokegear.rb | 0 .../009_PScreen_RegionMap.rb | 0 .../{016_UI => 017_UI}/010_PScreen_Phone.rb | 0 .../{016_UI => 017_UI}/011_PScreen_Jukebox.rb | 0 .../012_PScreen_TrainerCard.rb | 0 .../{016_UI => 017_UI}/013_PScreen_Load.rb | 0 .../{016_UI => 017_UI}/014_PScreen_Save.rb | 0 .../{016_UI => 017_UI}/015_PScreen_Options.rb | 0 .../016_PScreen_ReadyMenu.rb | 0 .../017_PScreen_PokemonStorage.rb | 0 .../018_PScreen_ItemStorage.rb | 0 .../{016_UI => 017_UI}/019_PScreen_PC.rb | 0 .../020_PScreen_EggHatching.rb | 0 .../021_PScreen_Evolution.rb | 0 .../{016_UI => 017_UI}/022_PScreen_Trading.rb | 0 .../023_PScreen_MoveRelearner.rb | 0 .../024_PScreen_PurifyChamber.rb | 0 .../{016_UI => 017_UI}/025_PScreen_Mart.rb | 0 .../026_PScreen_MysteryGift.rb | 0 .../027_PScreen_HallOfFame.rb | 0 .../001_PBattle_Safari.rb | 0 .../002_PBattle_BugContest.rb | 0 .../003_PBattle_OrgBattle.rb | 0 .../004_PBattle_OrgBattleRules.rb | 0 .../005_PBattle_OrgBattleGenerator.rb | 0 .../006_PBattle_BattleSwap.rb | 0 .../001_PSystem_Controls.rb | 0 .../002_PSystem_System.rb | 0 .../003_PSystem_FileUtilities.rb | 0 .../004_PSystem_PokemonUtilities.rb | 0 .../005_PSystem_Utilities.rb | 0 .../001_Debug_Menu.rb | 0 .../002_Debug_Actions.rb | 0 .../003_Debug_Pokemon.rb | 0 .../004_Editor_Screens.rb | 0 .../005_Editor_SaveData.rb | 0 .../006_Editor_DataTypes.rb | 0 .../007_Editor_Listers.rb | 0 .../008_Editor_Utilities.rb | 0 .../009_Editor_TilesetEditor.rb | 0 .../010_Editor_MapConnectionEditor.rb | 0 .../011_Editor_SpritePosEditor.rb | 0 .../012_Editor_BattleAnimationEditor.rb | 0 .../001_Compiler.rb | 0 .../002_Compiler_PBS.rb | 0 .../003_Compiler_MapsAndEvents.rb | 0 188 files changed, 250 insertions(+), 239 deletions(-) rename Data/Scripts/{006_Events and files => 006_Game processing}/001_Interpreter.rb (100%) rename Data/Scripts/{009_Scenes/001_Scene_Map.rb => 006_Game processing/002_Scene_Map.rb} (100%) rename Data/Scripts/{006_Events and files/002_EventHandlers.rb => 006_Game processing/003_Event_Handlers.rb} (100%) rename Data/Scripts/{008_Objects and windows => 007_Events and files}/001_FileTests.rb (100%) rename Data/Scripts/{006_Events and files/003_File_Mixins.rb => 007_Events and files/002_File_Mixins.rb} (100%) rename Data/Scripts/{006_Events and files/004_Intl_Messages.rb => 007_Events and files/003_Intl_Messages.rb} (100%) rename Data/Scripts/{006_Events and files/005_PBDebug.rb => 007_Events and files/004_PBDebug.rb} (100%) rename Data/Scripts/{007_Audio => 008_Audio}/001_Audio.rb (98%) rename Data/Scripts/{007_Audio/002_AudioPlay.rb => 008_Audio/002_Audio_Play.rb} (100%) rename Data/Scripts/{007_Audio/003_AudioUtilities.rb => 008_Audio/003_Audio_Utilities.rb} (100%) rename Data/Scripts/{008_Objects and windows/002_BitmapCache.rb => 009_Objects and windows/001_BitmapCache.rb} (100%) rename Data/Scripts/{008_Objects and windows/003_Window.rb => 009_Objects and windows/002_Window.rb} (100%) rename Data/Scripts/{008_Objects and windows/004_SpriteWindow.rb => 009_Objects and windows/003_SpriteWindow.rb} (100%) rename Data/Scripts/{008_Objects and windows/005_SpriteWindow_text.rb => 009_Objects and windows/004_SpriteWindow_text.rb} (100%) rename Data/Scripts/{008_Objects and windows/006_SpriteWindow_sprites.rb => 009_Objects and windows/005_SpriteWindow_sprites.rb} (100%) rename Data/Scripts/{008_Objects and windows/007_DrawText.rb => 009_Objects and windows/006_DrawText.rb} (100%) rename Data/Scripts/{008_Objects and windows/008_Messages.rb => 009_Objects and windows/007_Messages.rb} (100%) rename Data/Scripts/{008_Objects and windows/009_TextEntry.rb => 009_Objects and windows/008_TextEntry.rb} (100%) rename Data/Scripts/{008_Objects and windows/010_EventScene.rb => 009_Objects and windows/009_PictureEx.rb} (78%) rename Data/Scripts/{008_Objects and windows/011_Interpolators.rb => 009_Objects and windows/010_Interpolators.rb} (100%) rename Data/Scripts/{009_Scenes/006_Transitions.rb => 010_Scenes/001_Transitions.rb} (100%) create mode 100644 Data/Scripts/010_Scenes/002_EventScene.rb rename Data/Scripts/{009_Scenes/002_Scene_Intro.rb => 010_Scenes/003_Scene_Intro.rb} (100%) rename Data/Scripts/{009_Scenes/003_Scene_Controls.rb => 010_Scenes/004_Scene_Controls.rb} (100%) rename Data/Scripts/{009_Scenes => 010_Scenes}/005_Scene_Credits.rb (100%) rename Data/Scripts/{009_Scenes/004_Scene_Movie.rb => 010_Scenes/006_Scene_Movie.rb} (100%) rename Data/Scripts/{010_Data => 011_Data}/001_MiscData.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/002_PBMove.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/003_PBStatuses.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/004_PBTypes_Extra.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/005_PBNatures.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/006_PBGenderRates.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/007_PBExperience.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/008_PBStats.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/009_PBRibbons.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/010_PBEggGroups.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/011_PBColors.rb (100%) rename Data/Scripts/{010_Data => 011_Data}/012_PBHabitats.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/001_PokeBattle_Battler.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/002_Battler_Initialize.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/003_Battler_ChangeSelf.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/004_Battler_Statuses.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/005_Battler_StatStages.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/006_Battler_AbilityAndItem.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/007_Battler_UseMove.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/008_Battler_UseMove_Targeting.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/009_Battler_UseMove_SuccessChecks.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_Battler/010_Battler_UseMove_TriggerEffects.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/001_PBEnvironment.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/002_Move/001_PokeBattle_Move.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/002_Move/002_Move_Usage.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/002_Move/003_Move_Usage_Calculations.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/002_Move/004_Move_Effects_Generic.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/002_Move/005_Move_Effects_000-07F.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/002_Move/006_Move_Effects_080-0FF.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/002_Move/007_Move_Effects_100-17F.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/002_PBWeather.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/001_PokeBattle_BattleCommon.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/002_PokeBattle_Battle.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/003_Battle_StartAndEnd.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/004_Battle_ExpAndMoveLearning.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/005_Battle_Action_AttacksPriority.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/006_Battle_Action_Switching.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/007_Battle_Action_UseItem.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/008_Battle_Action_Running.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/009_Battle_Action_Other.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/010_Battle_Phase_Command.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/011_Battle_Phase_Attack.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_Battle/012_Battle_Phase_EndOfRound.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/003_PBBattleTerrains.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/004_AI/001_PokeBattle_AI.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/004_AI/002_AI_Item.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/004_AI/003_AI_Switch.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/004_AI/004_AI_Move.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/004_AI/005_AI_Move_EffectScores.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/004_AI/006_AI_Move_Utilities.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/004_PBTargets.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/001_PokeBattle_Animation.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/002_PokeBattle_SceneAnimations.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/003_PokeBattle_SceneConstants.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/004_PokeBattle_SceneElements.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/005_PokeBattle_SceneMenus.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/006_PokeBattle_Scene.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/007_Scene_Initialize.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/008_Scene_Commands.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_Battle scene/009_Scene_Animations.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/005_PBEffects.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_BattleHandlers.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/001_PokeBattle_AnimationPlayer.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/002_PokeBattle_SafariZone.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/003_PokeBattle_BugContest.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/004_PokeBattle_BattlePalace.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/005_PokeBattle_BattleArena.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/006_PokeBattle_BattleRecord.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/007_PokeBattle_DebugScene.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/008_PokeBattle_BattlePeer.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/006_Other battle types/009_PokeBattle_Clauses.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/007_BattleHandlers_Abilities.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/008_BattleHandlers_Items.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/009_PokeBall_CatchEffects.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/010_PokeBattle_ActiveField.rb (100%) rename Data/Scripts/{011_Battle => 012_Battle}/011_PokeBattle_DamageState.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/001_PBTerrain.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/002_PField_Field.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/003_PField_Visuals.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/004_PField_Weather.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/005_PField_Metadata.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/006_PField_Battles.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/007_PField_Encounters.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/008_PField_EncounterModifiers.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/009_PField_RoamingPokemon.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/010_PField_RandomDungeons.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/011_PField_FieldMoves.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/012_PField_BerryPlants.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/013_PField_DayCare.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/014_PField_DependentEvents.rb (100%) rename Data/Scripts/{012_Overworld => 013_Overworld}/015_PField_Time.rb (100%) rename Data/Scripts/{013_Trainers => 014_Trainers}/001_PokeBattle_Trainer.rb (100%) rename Data/Scripts/{013_Trainers => 014_Trainers}/002_PTrainer_NPCTrainers.rb (100%) rename Data/Scripts/{014_Items => 015_Items}/001_PItem_Items.rb (100%) rename Data/Scripts/{014_Items => 015_Items}/002_PItem_ItemEffects.rb (100%) rename Data/Scripts/{014_Items => 015_Items}/003_PItem_BattleItemEffects.rb (100%) rename Data/Scripts/{014_Items => 015_Items}/004_PItem_Phone.rb (100%) rename Data/Scripts/{014_Items => 015_Items}/005_PItem_PokeRadar.rb (100%) rename Data/Scripts/{014_Items => 015_Items}/006_PItem_Mail.rb (100%) rename Data/Scripts/{014_Items => 015_Items}/007_PItem_Sprites.rb (100%) rename Data/Scripts/{014_Items => 015_Items}/008_PItem_Bag.rb (100%) rename Data/Scripts/{015_Pokemon => 016_Pokemon}/001_PokeBattle_Pokemon.rb (100%) rename Data/Scripts/{015_Pokemon => 016_Pokemon}/002_Pokemon_Forms.rb (100%) rename Data/Scripts/{015_Pokemon => 016_Pokemon}/003_Pokemon_MegaEvolution.rb (100%) rename Data/Scripts/{015_Pokemon => 016_Pokemon}/004_Pokemon_ShadowPokemon.rb (100%) rename Data/Scripts/{015_Pokemon => 016_Pokemon}/005_Pokemon_Evolution.rb (100%) rename Data/Scripts/{015_Pokemon => 016_Pokemon}/006_Pokemon_Chatter.rb (100%) rename Data/Scripts/{015_Pokemon => 016_Pokemon}/007_Pokemon_Sprites.rb (100%) rename Data/Scripts/{015_Pokemon => 016_Pokemon}/008_Pokemon_Storage.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/001_PScreen_PauseMenu.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/002_PScreen_PokedexMenu.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/003_PScreen_PokedexMain.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/004_PScreen_PokedexEntry.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/005_PScreen_Party.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/006_PScreen_Summary.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/007_PScreen_Bag.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/008_PScreen_Pokegear.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/009_PScreen_RegionMap.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/010_PScreen_Phone.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/011_PScreen_Jukebox.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/012_PScreen_TrainerCard.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/013_PScreen_Load.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/014_PScreen_Save.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/015_PScreen_Options.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/016_PScreen_ReadyMenu.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/017_PScreen_PokemonStorage.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/018_PScreen_ItemStorage.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/019_PScreen_PC.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/020_PScreen_EggHatching.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/021_PScreen_Evolution.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/022_PScreen_Trading.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/023_PScreen_MoveRelearner.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/024_PScreen_PurifyChamber.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/025_PScreen_Mart.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/026_PScreen_MysteryGift.rb (100%) rename Data/Scripts/{016_UI => 017_UI}/027_PScreen_HallOfFame.rb (100%) rename Data/Scripts/{017_Other battles => 019_Other battles}/001_PBattle_Safari.rb (100%) rename Data/Scripts/{017_Other battles => 019_Other battles}/002_PBattle_BugContest.rb (100%) rename Data/Scripts/{017_Other battles => 019_Other battles}/003_PBattle_OrgBattle.rb (100%) rename Data/Scripts/{017_Other battles => 019_Other battles}/004_PBattle_OrgBattleRules.rb (100%) rename Data/Scripts/{017_Other battles => 019_Other battles}/005_PBattle_OrgBattleGenerator.rb (100%) rename Data/Scripts/{017_Other battles => 019_Other battles}/006_PBattle_BattleSwap.rb (100%) rename Data/Scripts/{019_System and utilities => 020_System and utilities}/001_PSystem_Controls.rb (100%) rename Data/Scripts/{019_System and utilities => 020_System and utilities}/002_PSystem_System.rb (100%) rename Data/Scripts/{019_System and utilities => 020_System and utilities}/003_PSystem_FileUtilities.rb (100%) rename Data/Scripts/{019_System and utilities => 020_System and utilities}/004_PSystem_PokemonUtilities.rb (100%) rename Data/Scripts/{019_System and utilities => 020_System and utilities}/005_PSystem_Utilities.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/001_Debug_Menu.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/002_Debug_Actions.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/003_Debug_Pokemon.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/004_Editor_Screens.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/005_Editor_SaveData.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/006_Editor_DataTypes.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/007_Editor_Listers.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/008_Editor_Utilities.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/009_Editor_TilesetEditor.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/010_Editor_MapConnectionEditor.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/011_Editor_SpritePosEditor.rb (100%) rename Data/Scripts/{020_Debug => 021_Debug}/012_Editor_BattleAnimationEditor.rb (100%) rename Data/Scripts/{021_Compiler => 022_Compiler}/001_Compiler.rb (100%) rename Data/Scripts/{021_Compiler => 022_Compiler}/002_Compiler_PBS.rb (100%) rename Data/Scripts/{021_Compiler => 022_Compiler}/003_Compiler_MapsAndEvents.rb (100%) diff --git a/Data/Scripts/006_Events and files/001_Interpreter.rb b/Data/Scripts/006_Game processing/001_Interpreter.rb similarity index 100% rename from Data/Scripts/006_Events and files/001_Interpreter.rb rename to Data/Scripts/006_Game processing/001_Interpreter.rb diff --git a/Data/Scripts/009_Scenes/001_Scene_Map.rb b/Data/Scripts/006_Game processing/002_Scene_Map.rb similarity index 100% rename from Data/Scripts/009_Scenes/001_Scene_Map.rb rename to Data/Scripts/006_Game processing/002_Scene_Map.rb diff --git a/Data/Scripts/006_Events and files/002_EventHandlers.rb b/Data/Scripts/006_Game processing/003_Event_Handlers.rb similarity index 100% rename from Data/Scripts/006_Events and files/002_EventHandlers.rb rename to Data/Scripts/006_Game processing/003_Event_Handlers.rb diff --git a/Data/Scripts/008_Objects and windows/001_FileTests.rb b/Data/Scripts/007_Events and files/001_FileTests.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/001_FileTests.rb rename to Data/Scripts/007_Events and files/001_FileTests.rb diff --git a/Data/Scripts/006_Events and files/003_File_Mixins.rb b/Data/Scripts/007_Events and files/002_File_Mixins.rb similarity index 100% rename from Data/Scripts/006_Events and files/003_File_Mixins.rb rename to Data/Scripts/007_Events and files/002_File_Mixins.rb diff --git a/Data/Scripts/006_Events and files/004_Intl_Messages.rb b/Data/Scripts/007_Events and files/003_Intl_Messages.rb similarity index 100% rename from Data/Scripts/006_Events and files/004_Intl_Messages.rb rename to Data/Scripts/007_Events and files/003_Intl_Messages.rb diff --git a/Data/Scripts/006_Events and files/005_PBDebug.rb b/Data/Scripts/007_Events and files/004_PBDebug.rb similarity index 100% rename from Data/Scripts/006_Events and files/005_PBDebug.rb rename to Data/Scripts/007_Events and files/004_PBDebug.rb diff --git a/Data/Scripts/007_Audio/001_Audio.rb b/Data/Scripts/008_Audio/001_Audio.rb similarity index 98% rename from Data/Scripts/007_Audio/001_Audio.rb rename to Data/Scripts/008_Audio/001_Audio.rb index 21b844bfc..d84304b45 100644 --- a/Data/Scripts/007_Audio/001_Audio.rb +++ b/Data/Scripts/008_Audio/001_Audio.rb @@ -62,10 +62,12 @@ end ##################################### # Works around a problem with FileTest.exist # if directory contains accent marks -def safeExists?(f) - ret=false - File.open(f,"rb") { ret=true } rescue nil - return ret +if !defined?(safeExists?) + def safeExists?(f) + ret=false + File.open(f,"rb") { ret=true } rescue nil + return ret + end end diff --git a/Data/Scripts/007_Audio/002_AudioPlay.rb b/Data/Scripts/008_Audio/002_Audio_Play.rb similarity index 100% rename from Data/Scripts/007_Audio/002_AudioPlay.rb rename to Data/Scripts/008_Audio/002_Audio_Play.rb diff --git a/Data/Scripts/007_Audio/003_AudioUtilities.rb b/Data/Scripts/008_Audio/003_Audio_Utilities.rb similarity index 100% rename from Data/Scripts/007_Audio/003_AudioUtilities.rb rename to Data/Scripts/008_Audio/003_Audio_Utilities.rb diff --git a/Data/Scripts/008_Objects and windows/002_BitmapCache.rb b/Data/Scripts/009_Objects and windows/001_BitmapCache.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/002_BitmapCache.rb rename to Data/Scripts/009_Objects and windows/001_BitmapCache.rb diff --git a/Data/Scripts/008_Objects and windows/003_Window.rb b/Data/Scripts/009_Objects and windows/002_Window.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/003_Window.rb rename to Data/Scripts/009_Objects and windows/002_Window.rb diff --git a/Data/Scripts/008_Objects and windows/004_SpriteWindow.rb b/Data/Scripts/009_Objects and windows/003_SpriteWindow.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/004_SpriteWindow.rb rename to Data/Scripts/009_Objects and windows/003_SpriteWindow.rb diff --git a/Data/Scripts/008_Objects and windows/005_SpriteWindow_text.rb b/Data/Scripts/009_Objects and windows/004_SpriteWindow_text.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/005_SpriteWindow_text.rb rename to Data/Scripts/009_Objects and windows/004_SpriteWindow_text.rb diff --git a/Data/Scripts/008_Objects and windows/006_SpriteWindow_sprites.rb b/Data/Scripts/009_Objects and windows/005_SpriteWindow_sprites.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/006_SpriteWindow_sprites.rb rename to Data/Scripts/009_Objects and windows/005_SpriteWindow_sprites.rb diff --git a/Data/Scripts/008_Objects and windows/007_DrawText.rb b/Data/Scripts/009_Objects and windows/006_DrawText.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/007_DrawText.rb rename to Data/Scripts/009_Objects and windows/006_DrawText.rb diff --git a/Data/Scripts/008_Objects and windows/008_Messages.rb b/Data/Scripts/009_Objects and windows/007_Messages.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/008_Messages.rb rename to Data/Scripts/009_Objects and windows/007_Messages.rb diff --git a/Data/Scripts/008_Objects and windows/009_TextEntry.rb b/Data/Scripts/009_Objects and windows/008_TextEntry.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/009_TextEntry.rb rename to Data/Scripts/009_Objects and windows/008_TextEntry.rb diff --git a/Data/Scripts/008_Objects and windows/010_EventScene.rb b/Data/Scripts/009_Objects and windows/009_PictureEx.rb similarity index 78% rename from Data/Scripts/008_Objects and windows/010_EventScene.rb rename to Data/Scripts/009_Objects and windows/009_PictureEx.rb index 0c563b51c..b6f882dba 100644 --- a/Data/Scripts/008_Objects and windows/010_EventScene.rb +++ b/Data/Scripts/009_Objects and windows/009_PictureEx.rb @@ -1,3 +1,42 @@ +class PictureOrigin + TopLeft = 0 + Center = 1 + TopRight = 2 + BottomLeft = 3 + LowerLeft = 3 + BottomRight = 4 + LowerRight = 4 + Top = 5 + Bottom = 6 + Left = 7 + Right = 8 +end + + + +class Processes + XY = 0 + DeltaXY = 1 + Z = 2 + Curve = 3 + Zoom = 4 + Angle = 5 + Tone = 6 + Color = 7 + Hue = 8 + Opacity = 9 + Visible = 10 + BlendType = 11 + SE = 12 + Name = 13 + Origin = 14 + Src = 15 + SrcSize = 16 + CropBottom = 17 +end + + + def getCubicPoint2(src,t) x0 = src[0]; y0 = src[1] cx0 = src[2]; cy0 = src[3] @@ -31,29 +70,9 @@ end -class Processes - XY = 0 - DeltaXY = 1 - Z = 2 - Curve = 3 - Zoom = 4 - Angle = 5 - Tone = 6 - Color = 7 - Hue = 8 - Opacity = 9 - Visible = 10 - BlendType = 11 - SE = 12 - Name = 13 - Origin = 14 - Src = 15 - SrcSize = 16 - CropBottom = 17 -end - - - +#=============================================================================== +# PictureEx +#=============================================================================== class PictureEx attr_accessor :x # x-coordinate attr_accessor :y # y-coordinate @@ -429,6 +448,9 @@ end +#=============================================================================== +# +#=============================================================================== def setPictureSprite(sprite, picture, iconSprite=false) return if picture.frameUpdates.length==0 for i in 0...picture.frameUpdates.length @@ -495,215 +517,3 @@ end def setPictureIconSprite(sprite, picture) setPictureSprite(sprite,picture,true) end - - - -class PictureOrigin - TopLeft = 0 - Center = 1 - TopRight = 2 - BottomLeft = 3 - LowerLeft = 3 - BottomRight = 4 - LowerRight = 4 - Top = 5 - Bottom = 6 - Left = 7 - Right = 8 -end - - - -def pbTextBitmap(text, maxwidth=Graphics.width) - dims = [] - tmp = Bitmap.new(maxwidth,Graphics.height) - pbSetSystemFont(tmp) - drawFormattedTextEx(tmp,0,0,maxwidth,text,Color.new(248,248,248),Color.new(168,184,184)) - return tmp -end - - - -class PictureSprite < SpriteWrapper - def initialize(viewport, picture) - super(viewport) - @picture = picture - @pictureBitmap = nil - @customBitmap = nil - @customBitmapIsBitmap = true - @hue = 0 - update - end - - def dispose - @pictureBitmap.dispose if @pictureBitmap - super - end - - # Doesn't free the bitmap - def setCustomBitmap(bitmap) - @customBitmap = bitmap - @customBitmapIsBitmap = @customBitmap.is_a?(Bitmap) - end - - def update - super - @pictureBitmap.update if @pictureBitmap - # If picture file name is different from current one - if @customBitmap && @picture.name=="" - self.bitmap = (@customBitmapIsBitmap) ? @customBitmap : @customBitmap.bitmap - elsif @picture_name != @picture.name || @picture.hue.to_i != @hue.to_i - # Remember file name to instance variables - @picture_name = @picture.name - @hue = @picture.hue.to_i - # If file name is not empty - if @picture_name == "" - @pictureBitmap.dispose if @pictureBitmap - @pictureBitmap = nil - self.visible = false - return - end - # Get picture graphic - @pictureBitmap.dispose if @pictureBitmap - @pictureBitmap = AnimatedBitmap.new(@picture_name, @hue) - self.bitmap = (@pictureBitmap) ? @pictureBitmap.bitmap : nil - elsif @picture_name == "" - # Set sprite to invisible - self.visible = false - return - end - setPictureSprite(self,@picture) - end -end - - - -class EventScene - attr_accessor :onCTrigger,:onBTrigger,:onUpdate - - def initialize(viewport=nil) - @viewport = viewport - @onCTrigger = Event.new - @onBTrigger = Event.new - @onUpdate = Event.new - @pictures = [] - @picturesprites = [] - @usersprites = [] - @disposed = false - end - - def dispose - return if disposed? - for sprite in @picturesprites - sprite.dispose - end - for sprite in @usersprites - sprite.dispose - end - @onCTrigger.clear - @onBTrigger.clear - @onUpdate.clear - @pictures.clear - @picturesprites.clear - @usersprites.clear - @disposed = true - end - - def disposed? - return @disposed - end - - def addBitmap(x, y, bitmap) - # _bitmap_ can be a Bitmap or an AnimatedBitmap - # (update method isn't called if it's animated) - # EventScene doesn't take ownership of the passed-in bitmap - num = @pictures.length - picture = PictureEx.new(num) - picture.setXY(0,x,y) - picture.setVisible(0,true) - @pictures[num] = picture - @picturesprites[num] = PictureSprite.new(@viewport,picture) - @picturesprites[num].setCustomBitmap(bitmap) - return picture - end - - def addLabel(x, y, width, text) - addBitmap(x,y,pbTextBitmap(text,width)) - end - - def addImage(x, y, name) - num = @pictures.length - picture = PictureEx.new(num) - picture.name = name - picture.setXY(0,x,y) - picture.setVisible(0,true) - @pictures[num] = picture - @picturesprites[num] = PictureSprite.new(@viewport,picture) - return picture - end - - def addUserSprite(sprite) - @usersprites.push(sprite) - end - - def getPicture(num) - return @pictures[num] - end - - def wait(frames) - frames.times { update } - end - - def pictureWait(extraframes=0) - loop do - hasRunning = false - for pic in @pictures - hasRunning = true if pic.running? - end - break if !hasRunning - update - end - extraframes.times { update } - end - - def update - return if disposed? - Graphics.update - Input.update - for picture in @pictures - picture.update - end - for sprite in @picturesprites - sprite.update - end - for sprite in @usersprites - next if !sprite || sprite.disposed? || !sprite.is_a?(Sprite) - sprite.update - end - @onUpdate.trigger(self) - if Input.trigger?(Input::B) - @onBTrigger.trigger(self) - elsif Input.trigger?(Input::C) - @onCTrigger.trigger(self) - end - end - - def main - while !disposed? - update - end - end -end - - - -def pbEventScreen(cls) - pbFadeOutIn { - viewport = Viewport.new(0,0,Graphics.width,Graphics.height) - viewport.z = 99999 - PBDebug.logonerr { - cls.new(viewport).main - } - viewport.dispose - } -end diff --git a/Data/Scripts/008_Objects and windows/011_Interpolators.rb b/Data/Scripts/009_Objects and windows/010_Interpolators.rb similarity index 100% rename from Data/Scripts/008_Objects and windows/011_Interpolators.rb rename to Data/Scripts/009_Objects and windows/010_Interpolators.rb diff --git a/Data/Scripts/009_Scenes/006_Transitions.rb b/Data/Scripts/010_Scenes/001_Transitions.rb similarity index 100% rename from Data/Scripts/009_Scenes/006_Transitions.rb rename to Data/Scripts/010_Scenes/001_Transitions.rb diff --git a/Data/Scripts/010_Scenes/002_EventScene.rb b/Data/Scripts/010_Scenes/002_EventScene.rb new file mode 100644 index 000000000..1f2132176 --- /dev/null +++ b/Data/Scripts/010_Scenes/002_EventScene.rb @@ -0,0 +1,199 @@ +class PictureSprite < SpriteWrapper + def initialize(viewport, picture) + super(viewport) + @picture = picture + @pictureBitmap = nil + @customBitmap = nil + @customBitmapIsBitmap = true + @hue = 0 + update + end + + def dispose + @pictureBitmap.dispose if @pictureBitmap + super + end + + # Doesn't free the bitmap + def setCustomBitmap(bitmap) + @customBitmap = bitmap + @customBitmapIsBitmap = @customBitmap.is_a?(Bitmap) + end + + def update + super + @pictureBitmap.update if @pictureBitmap + # If picture file name is different from current one + if @customBitmap && @picture.name=="" + self.bitmap = (@customBitmapIsBitmap) ? @customBitmap : @customBitmap.bitmap + elsif @picture_name != @picture.name || @picture.hue.to_i != @hue.to_i + # Remember file name to instance variables + @picture_name = @picture.name + @hue = @picture.hue.to_i + # If file name is not empty + if @picture_name == "" + @pictureBitmap.dispose if @pictureBitmap + @pictureBitmap = nil + self.visible = false + return + end + # Get picture graphic + @pictureBitmap.dispose if @pictureBitmap + @pictureBitmap = AnimatedBitmap.new(@picture_name, @hue) + self.bitmap = (@pictureBitmap) ? @pictureBitmap.bitmap : nil + elsif @picture_name == "" + # Set sprite to invisible + self.visible = false + return + end + setPictureSprite(self,@picture) + end +end + + + +def pbTextBitmap(text, maxwidth=Graphics.width) + dims = [] + tmp = Bitmap.new(maxwidth,Graphics.height) + pbSetSystemFont(tmp) + drawFormattedTextEx(tmp,0,0,maxwidth,text,Color.new(248,248,248),Color.new(168,184,184)) + return tmp +end + + + +#=============================================================================== +# EventScene +#=============================================================================== +class EventScene + attr_accessor :onCTrigger,:onBTrigger,:onUpdate + + def initialize(viewport=nil) + @viewport = viewport + @onCTrigger = Event.new + @onBTrigger = Event.new + @onUpdate = Event.new + @pictures = [] + @picturesprites = [] + @usersprites = [] + @disposed = false + end + + def dispose + return if disposed? + for sprite in @picturesprites + sprite.dispose + end + for sprite in @usersprites + sprite.dispose + end + @onCTrigger.clear + @onBTrigger.clear + @onUpdate.clear + @pictures.clear + @picturesprites.clear + @usersprites.clear + @disposed = true + end + + def disposed? + return @disposed + end + + def addBitmap(x, y, bitmap) + # _bitmap_ can be a Bitmap or an AnimatedBitmap + # (update method isn't called if it's animated) + # EventScene doesn't take ownership of the passed-in bitmap + num = @pictures.length + picture = PictureEx.new(num) + picture.setXY(0,x,y) + picture.setVisible(0,true) + @pictures[num] = picture + @picturesprites[num] = PictureSprite.new(@viewport,picture) + @picturesprites[num].setCustomBitmap(bitmap) + return picture + end + + def addLabel(x, y, width, text) + addBitmap(x,y,pbTextBitmap(text,width)) + end + + def addImage(x, y, name) + num = @pictures.length + picture = PictureEx.new(num) + picture.name = name + picture.setXY(0,x,y) + picture.setVisible(0,true) + @pictures[num] = picture + @picturesprites[num] = PictureSprite.new(@viewport,picture) + return picture + end + + def addUserSprite(sprite) + @usersprites.push(sprite) + end + + def getPicture(num) + return @pictures[num] + end + + def wait(frames) + frames.times { update } + end + + def pictureWait(extraframes=0) + loop do + hasRunning = false + for pic in @pictures + hasRunning = true if pic.running? + end + break if !hasRunning + update + end + extraframes.times { update } + end + + def update + return if disposed? + Graphics.update + Input.update + for picture in @pictures + picture.update + end + for sprite in @picturesprites + sprite.update + end + for sprite in @usersprites + next if !sprite || sprite.disposed? || !sprite.is_a?(Sprite) + sprite.update + end + @onUpdate.trigger(self) + if Input.trigger?(Input::B) + @onBTrigger.trigger(self) + elsif Input.trigger?(Input::C) + @onCTrigger.trigger(self) + end + end + + def main + while !disposed? + update + end + end +end + + + +#=============================================================================== +# +#=============================================================================== +def pbEventScreen(cls) + pbFadeOutIn { + viewport = Viewport.new(0,0,Graphics.width,Graphics.height) + viewport.z = 99999 + PBDebug.logonerr { + cls.new(viewport).main + } + viewport.dispose + } +end diff --git a/Data/Scripts/009_Scenes/002_Scene_Intro.rb b/Data/Scripts/010_Scenes/003_Scene_Intro.rb similarity index 100% rename from Data/Scripts/009_Scenes/002_Scene_Intro.rb rename to Data/Scripts/010_Scenes/003_Scene_Intro.rb diff --git a/Data/Scripts/009_Scenes/003_Scene_Controls.rb b/Data/Scripts/010_Scenes/004_Scene_Controls.rb similarity index 100% rename from Data/Scripts/009_Scenes/003_Scene_Controls.rb rename to Data/Scripts/010_Scenes/004_Scene_Controls.rb diff --git a/Data/Scripts/009_Scenes/005_Scene_Credits.rb b/Data/Scripts/010_Scenes/005_Scene_Credits.rb similarity index 100% rename from Data/Scripts/009_Scenes/005_Scene_Credits.rb rename to Data/Scripts/010_Scenes/005_Scene_Credits.rb diff --git a/Data/Scripts/009_Scenes/004_Scene_Movie.rb b/Data/Scripts/010_Scenes/006_Scene_Movie.rb similarity index 100% rename from Data/Scripts/009_Scenes/004_Scene_Movie.rb rename to Data/Scripts/010_Scenes/006_Scene_Movie.rb diff --git a/Data/Scripts/010_Data/001_MiscData.rb b/Data/Scripts/011_Data/001_MiscData.rb similarity index 100% rename from Data/Scripts/010_Data/001_MiscData.rb rename to Data/Scripts/011_Data/001_MiscData.rb diff --git a/Data/Scripts/010_Data/002_PBMove.rb b/Data/Scripts/011_Data/002_PBMove.rb similarity index 100% rename from Data/Scripts/010_Data/002_PBMove.rb rename to Data/Scripts/011_Data/002_PBMove.rb diff --git a/Data/Scripts/010_Data/003_PBStatuses.rb b/Data/Scripts/011_Data/003_PBStatuses.rb similarity index 100% rename from Data/Scripts/010_Data/003_PBStatuses.rb rename to Data/Scripts/011_Data/003_PBStatuses.rb diff --git a/Data/Scripts/010_Data/004_PBTypes_Extra.rb b/Data/Scripts/011_Data/004_PBTypes_Extra.rb similarity index 100% rename from Data/Scripts/010_Data/004_PBTypes_Extra.rb rename to Data/Scripts/011_Data/004_PBTypes_Extra.rb diff --git a/Data/Scripts/010_Data/005_PBNatures.rb b/Data/Scripts/011_Data/005_PBNatures.rb similarity index 100% rename from Data/Scripts/010_Data/005_PBNatures.rb rename to Data/Scripts/011_Data/005_PBNatures.rb diff --git a/Data/Scripts/010_Data/006_PBGenderRates.rb b/Data/Scripts/011_Data/006_PBGenderRates.rb similarity index 100% rename from Data/Scripts/010_Data/006_PBGenderRates.rb rename to Data/Scripts/011_Data/006_PBGenderRates.rb diff --git a/Data/Scripts/010_Data/007_PBExperience.rb b/Data/Scripts/011_Data/007_PBExperience.rb similarity index 100% rename from Data/Scripts/010_Data/007_PBExperience.rb rename to Data/Scripts/011_Data/007_PBExperience.rb diff --git a/Data/Scripts/010_Data/008_PBStats.rb b/Data/Scripts/011_Data/008_PBStats.rb similarity index 100% rename from Data/Scripts/010_Data/008_PBStats.rb rename to Data/Scripts/011_Data/008_PBStats.rb diff --git a/Data/Scripts/010_Data/009_PBRibbons.rb b/Data/Scripts/011_Data/009_PBRibbons.rb similarity index 100% rename from Data/Scripts/010_Data/009_PBRibbons.rb rename to Data/Scripts/011_Data/009_PBRibbons.rb diff --git a/Data/Scripts/010_Data/010_PBEggGroups.rb b/Data/Scripts/011_Data/010_PBEggGroups.rb similarity index 100% rename from Data/Scripts/010_Data/010_PBEggGroups.rb rename to Data/Scripts/011_Data/010_PBEggGroups.rb diff --git a/Data/Scripts/010_Data/011_PBColors.rb b/Data/Scripts/011_Data/011_PBColors.rb similarity index 100% rename from Data/Scripts/010_Data/011_PBColors.rb rename to Data/Scripts/011_Data/011_PBColors.rb diff --git a/Data/Scripts/010_Data/012_PBHabitats.rb b/Data/Scripts/011_Data/012_PBHabitats.rb similarity index 100% rename from Data/Scripts/010_Data/012_PBHabitats.rb rename to Data/Scripts/011_Data/012_PBHabitats.rb diff --git a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb b/Data/Scripts/012_Battle/001_Battler/001_PokeBattle_Battler.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb rename to Data/Scripts/012_Battle/001_Battler/001_PokeBattle_Battler.rb diff --git a/Data/Scripts/011_Battle/001_Battler/002_Battler_Initialize.rb b/Data/Scripts/012_Battle/001_Battler/002_Battler_Initialize.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/002_Battler_Initialize.rb rename to Data/Scripts/012_Battle/001_Battler/002_Battler_Initialize.rb diff --git a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb b/Data/Scripts/012_Battle/001_Battler/003_Battler_ChangeSelf.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb rename to Data/Scripts/012_Battle/001_Battler/003_Battler_ChangeSelf.rb diff --git a/Data/Scripts/011_Battle/001_Battler/004_Battler_Statuses.rb b/Data/Scripts/012_Battle/001_Battler/004_Battler_Statuses.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/004_Battler_Statuses.rb rename to Data/Scripts/012_Battle/001_Battler/004_Battler_Statuses.rb diff --git a/Data/Scripts/011_Battle/001_Battler/005_Battler_StatStages.rb b/Data/Scripts/012_Battle/001_Battler/005_Battler_StatStages.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/005_Battler_StatStages.rb rename to Data/Scripts/012_Battle/001_Battler/005_Battler_StatStages.rb diff --git a/Data/Scripts/011_Battle/001_Battler/006_Battler_AbilityAndItem.rb b/Data/Scripts/012_Battle/001_Battler/006_Battler_AbilityAndItem.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/006_Battler_AbilityAndItem.rb rename to Data/Scripts/012_Battle/001_Battler/006_Battler_AbilityAndItem.rb diff --git a/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb b/Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb rename to Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb diff --git a/Data/Scripts/011_Battle/001_Battler/008_Battler_UseMove_Targeting.rb b/Data/Scripts/012_Battle/001_Battler/008_Battler_UseMove_Targeting.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/008_Battler_UseMove_Targeting.rb rename to Data/Scripts/012_Battle/001_Battler/008_Battler_UseMove_Targeting.rb diff --git a/Data/Scripts/011_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb b/Data/Scripts/012_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb rename to Data/Scripts/012_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb diff --git a/Data/Scripts/011_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb b/Data/Scripts/012_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb similarity index 100% rename from Data/Scripts/011_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb rename to Data/Scripts/012_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb diff --git a/Data/Scripts/011_Battle/001_PBEnvironment.rb b/Data/Scripts/012_Battle/001_PBEnvironment.rb similarity index 100% rename from Data/Scripts/011_Battle/001_PBEnvironment.rb rename to Data/Scripts/012_Battle/001_PBEnvironment.rb diff --git a/Data/Scripts/011_Battle/002_Move/001_PokeBattle_Move.rb b/Data/Scripts/012_Battle/002_Move/001_PokeBattle_Move.rb similarity index 100% rename from Data/Scripts/011_Battle/002_Move/001_PokeBattle_Move.rb rename to Data/Scripts/012_Battle/002_Move/001_PokeBattle_Move.rb diff --git a/Data/Scripts/011_Battle/002_Move/002_Move_Usage.rb b/Data/Scripts/012_Battle/002_Move/002_Move_Usage.rb similarity index 100% rename from Data/Scripts/011_Battle/002_Move/002_Move_Usage.rb rename to Data/Scripts/012_Battle/002_Move/002_Move_Usage.rb diff --git a/Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb b/Data/Scripts/012_Battle/002_Move/003_Move_Usage_Calculations.rb similarity index 100% rename from Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb rename to Data/Scripts/012_Battle/002_Move/003_Move_Usage_Calculations.rb diff --git a/Data/Scripts/011_Battle/002_Move/004_Move_Effects_Generic.rb b/Data/Scripts/012_Battle/002_Move/004_Move_Effects_Generic.rb similarity index 100% rename from Data/Scripts/011_Battle/002_Move/004_Move_Effects_Generic.rb rename to Data/Scripts/012_Battle/002_Move/004_Move_Effects_Generic.rb diff --git a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb b/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb similarity index 100% rename from Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb rename to Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb diff --git a/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb b/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb similarity index 100% rename from Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb rename to Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb diff --git a/Data/Scripts/011_Battle/002_Move/007_Move_Effects_100-17F.rb b/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb similarity index 100% rename from Data/Scripts/011_Battle/002_Move/007_Move_Effects_100-17F.rb rename to Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb diff --git a/Data/Scripts/011_Battle/002_PBWeather.rb b/Data/Scripts/012_Battle/002_PBWeather.rb similarity index 100% rename from Data/Scripts/011_Battle/002_PBWeather.rb rename to Data/Scripts/012_Battle/002_PBWeather.rb diff --git a/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb b/Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb rename to Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb diff --git a/Data/Scripts/011_Battle/003_Battle/002_PokeBattle_Battle.rb b/Data/Scripts/012_Battle/003_Battle/002_PokeBattle_Battle.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/002_PokeBattle_Battle.rb rename to Data/Scripts/012_Battle/003_Battle/002_PokeBattle_Battle.rb diff --git a/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb b/Data/Scripts/012_Battle/003_Battle/003_Battle_StartAndEnd.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb rename to Data/Scripts/012_Battle/003_Battle/003_Battle_StartAndEnd.rb diff --git a/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb b/Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb rename to Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb diff --git a/Data/Scripts/011_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb b/Data/Scripts/012_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb rename to Data/Scripts/012_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb diff --git a/Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb b/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb rename to Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb diff --git a/Data/Scripts/011_Battle/003_Battle/007_Battle_Action_UseItem.rb b/Data/Scripts/012_Battle/003_Battle/007_Battle_Action_UseItem.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/007_Battle_Action_UseItem.rb rename to Data/Scripts/012_Battle/003_Battle/007_Battle_Action_UseItem.rb diff --git a/Data/Scripts/011_Battle/003_Battle/008_Battle_Action_Running.rb b/Data/Scripts/012_Battle/003_Battle/008_Battle_Action_Running.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/008_Battle_Action_Running.rb rename to Data/Scripts/012_Battle/003_Battle/008_Battle_Action_Running.rb diff --git a/Data/Scripts/011_Battle/003_Battle/009_Battle_Action_Other.rb b/Data/Scripts/012_Battle/003_Battle/009_Battle_Action_Other.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/009_Battle_Action_Other.rb rename to Data/Scripts/012_Battle/003_Battle/009_Battle_Action_Other.rb diff --git a/Data/Scripts/011_Battle/003_Battle/010_Battle_Phase_Command.rb b/Data/Scripts/012_Battle/003_Battle/010_Battle_Phase_Command.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/010_Battle_Phase_Command.rb rename to Data/Scripts/012_Battle/003_Battle/010_Battle_Phase_Command.rb diff --git a/Data/Scripts/011_Battle/003_Battle/011_Battle_Phase_Attack.rb b/Data/Scripts/012_Battle/003_Battle/011_Battle_Phase_Attack.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/011_Battle_Phase_Attack.rb rename to Data/Scripts/012_Battle/003_Battle/011_Battle_Phase_Attack.rb diff --git a/Data/Scripts/011_Battle/003_Battle/012_Battle_Phase_EndOfRound.rb b/Data/Scripts/012_Battle/003_Battle/012_Battle_Phase_EndOfRound.rb similarity index 100% rename from Data/Scripts/011_Battle/003_Battle/012_Battle_Phase_EndOfRound.rb rename to Data/Scripts/012_Battle/003_Battle/012_Battle_Phase_EndOfRound.rb diff --git a/Data/Scripts/011_Battle/003_PBBattleTerrains.rb b/Data/Scripts/012_Battle/003_PBBattleTerrains.rb similarity index 100% rename from Data/Scripts/011_Battle/003_PBBattleTerrains.rb rename to Data/Scripts/012_Battle/003_PBBattleTerrains.rb diff --git a/Data/Scripts/011_Battle/004_AI/001_PokeBattle_AI.rb b/Data/Scripts/012_Battle/004_AI/001_PokeBattle_AI.rb similarity index 100% rename from Data/Scripts/011_Battle/004_AI/001_PokeBattle_AI.rb rename to Data/Scripts/012_Battle/004_AI/001_PokeBattle_AI.rb diff --git a/Data/Scripts/011_Battle/004_AI/002_AI_Item.rb b/Data/Scripts/012_Battle/004_AI/002_AI_Item.rb similarity index 100% rename from Data/Scripts/011_Battle/004_AI/002_AI_Item.rb rename to Data/Scripts/012_Battle/004_AI/002_AI_Item.rb diff --git a/Data/Scripts/011_Battle/004_AI/003_AI_Switch.rb b/Data/Scripts/012_Battle/004_AI/003_AI_Switch.rb similarity index 100% rename from Data/Scripts/011_Battle/004_AI/003_AI_Switch.rb rename to Data/Scripts/012_Battle/004_AI/003_AI_Switch.rb diff --git a/Data/Scripts/011_Battle/004_AI/004_AI_Move.rb b/Data/Scripts/012_Battle/004_AI/004_AI_Move.rb similarity index 100% rename from Data/Scripts/011_Battle/004_AI/004_AI_Move.rb rename to Data/Scripts/012_Battle/004_AI/004_AI_Move.rb diff --git a/Data/Scripts/011_Battle/004_AI/005_AI_Move_EffectScores.rb b/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb similarity index 100% rename from Data/Scripts/011_Battle/004_AI/005_AI_Move_EffectScores.rb rename to Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb diff --git a/Data/Scripts/011_Battle/004_AI/006_AI_Move_Utilities.rb b/Data/Scripts/012_Battle/004_AI/006_AI_Move_Utilities.rb similarity index 100% rename from Data/Scripts/011_Battle/004_AI/006_AI_Move_Utilities.rb rename to Data/Scripts/012_Battle/004_AI/006_AI_Move_Utilities.rb diff --git a/Data/Scripts/011_Battle/004_PBTargets.rb b/Data/Scripts/012_Battle/004_PBTargets.rb similarity index 100% rename from Data/Scripts/011_Battle/004_PBTargets.rb rename to Data/Scripts/012_Battle/004_PBTargets.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/001_PokeBattle_Animation.rb b/Data/Scripts/012_Battle/005_Battle scene/001_PokeBattle_Animation.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/001_PokeBattle_Animation.rb rename to Data/Scripts/012_Battle/005_Battle scene/001_PokeBattle_Animation.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb b/Data/Scripts/012_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb rename to Data/Scripts/012_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/003_PokeBattle_SceneConstants.rb b/Data/Scripts/012_Battle/005_Battle scene/003_PokeBattle_SceneConstants.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/003_PokeBattle_SceneConstants.rb rename to Data/Scripts/012_Battle/005_Battle scene/003_PokeBattle_SceneConstants.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb b/Data/Scripts/012_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb rename to Data/Scripts/012_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/005_PokeBattle_SceneMenus.rb b/Data/Scripts/012_Battle/005_Battle scene/005_PokeBattle_SceneMenus.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/005_PokeBattle_SceneMenus.rb rename to Data/Scripts/012_Battle/005_Battle scene/005_PokeBattle_SceneMenus.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/006_PokeBattle_Scene.rb b/Data/Scripts/012_Battle/005_Battle scene/006_PokeBattle_Scene.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/006_PokeBattle_Scene.rb rename to Data/Scripts/012_Battle/005_Battle scene/006_PokeBattle_Scene.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb b/Data/Scripts/012_Battle/005_Battle scene/007_Scene_Initialize.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb rename to Data/Scripts/012_Battle/005_Battle scene/007_Scene_Initialize.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/008_Scene_Commands.rb b/Data/Scripts/012_Battle/005_Battle scene/008_Scene_Commands.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/008_Scene_Commands.rb rename to Data/Scripts/012_Battle/005_Battle scene/008_Scene_Commands.rb diff --git a/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb b/Data/Scripts/012_Battle/005_Battle scene/009_Scene_Animations.rb similarity index 100% rename from Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb rename to Data/Scripts/012_Battle/005_Battle scene/009_Scene_Animations.rb diff --git a/Data/Scripts/011_Battle/005_PBEffects.rb b/Data/Scripts/012_Battle/005_PBEffects.rb similarity index 100% rename from Data/Scripts/011_Battle/005_PBEffects.rb rename to Data/Scripts/012_Battle/005_PBEffects.rb diff --git a/Data/Scripts/011_Battle/006_BattleHandlers.rb b/Data/Scripts/012_Battle/006_BattleHandlers.rb similarity index 100% rename from Data/Scripts/011_Battle/006_BattleHandlers.rb rename to Data/Scripts/012_Battle/006_BattleHandlers.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/001_PokeBattle_AnimationPlayer.rb b/Data/Scripts/012_Battle/006_Other battle types/001_PokeBattle_AnimationPlayer.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/001_PokeBattle_AnimationPlayer.rb rename to Data/Scripts/012_Battle/006_Other battle types/001_PokeBattle_AnimationPlayer.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb b/Data/Scripts/012_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb rename to Data/Scripts/012_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/003_PokeBattle_BugContest.rb b/Data/Scripts/012_Battle/006_Other battle types/003_PokeBattle_BugContest.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/003_PokeBattle_BugContest.rb rename to Data/Scripts/012_Battle/006_Other battle types/003_PokeBattle_BugContest.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb b/Data/Scripts/012_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb rename to Data/Scripts/012_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/005_PokeBattle_BattleArena.rb b/Data/Scripts/012_Battle/006_Other battle types/005_PokeBattle_BattleArena.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/005_PokeBattle_BattleArena.rb rename to Data/Scripts/012_Battle/006_Other battle types/005_PokeBattle_BattleArena.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/006_PokeBattle_BattleRecord.rb b/Data/Scripts/012_Battle/006_Other battle types/006_PokeBattle_BattleRecord.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/006_PokeBattle_BattleRecord.rb rename to Data/Scripts/012_Battle/006_Other battle types/006_PokeBattle_BattleRecord.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb b/Data/Scripts/012_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb rename to Data/Scripts/012_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/008_PokeBattle_BattlePeer.rb b/Data/Scripts/012_Battle/006_Other battle types/008_PokeBattle_BattlePeer.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/008_PokeBattle_BattlePeer.rb rename to Data/Scripts/012_Battle/006_Other battle types/008_PokeBattle_BattlePeer.rb diff --git a/Data/Scripts/011_Battle/006_Other battle types/009_PokeBattle_Clauses.rb b/Data/Scripts/012_Battle/006_Other battle types/009_PokeBattle_Clauses.rb similarity index 100% rename from Data/Scripts/011_Battle/006_Other battle types/009_PokeBattle_Clauses.rb rename to Data/Scripts/012_Battle/006_Other battle types/009_PokeBattle_Clauses.rb diff --git a/Data/Scripts/011_Battle/007_BattleHandlers_Abilities.rb b/Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb similarity index 100% rename from Data/Scripts/011_Battle/007_BattleHandlers_Abilities.rb rename to Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb diff --git a/Data/Scripts/011_Battle/008_BattleHandlers_Items.rb b/Data/Scripts/012_Battle/008_BattleHandlers_Items.rb similarity index 100% rename from Data/Scripts/011_Battle/008_BattleHandlers_Items.rb rename to Data/Scripts/012_Battle/008_BattleHandlers_Items.rb diff --git a/Data/Scripts/011_Battle/009_PokeBall_CatchEffects.rb b/Data/Scripts/012_Battle/009_PokeBall_CatchEffects.rb similarity index 100% rename from Data/Scripts/011_Battle/009_PokeBall_CatchEffects.rb rename to Data/Scripts/012_Battle/009_PokeBall_CatchEffects.rb diff --git a/Data/Scripts/011_Battle/010_PokeBattle_ActiveField.rb b/Data/Scripts/012_Battle/010_PokeBattle_ActiveField.rb similarity index 100% rename from Data/Scripts/011_Battle/010_PokeBattle_ActiveField.rb rename to Data/Scripts/012_Battle/010_PokeBattle_ActiveField.rb diff --git a/Data/Scripts/011_Battle/011_PokeBattle_DamageState.rb b/Data/Scripts/012_Battle/011_PokeBattle_DamageState.rb similarity index 100% rename from Data/Scripts/011_Battle/011_PokeBattle_DamageState.rb rename to Data/Scripts/012_Battle/011_PokeBattle_DamageState.rb diff --git a/Data/Scripts/012_Overworld/001_PBTerrain.rb b/Data/Scripts/013_Overworld/001_PBTerrain.rb similarity index 100% rename from Data/Scripts/012_Overworld/001_PBTerrain.rb rename to Data/Scripts/013_Overworld/001_PBTerrain.rb diff --git a/Data/Scripts/012_Overworld/002_PField_Field.rb b/Data/Scripts/013_Overworld/002_PField_Field.rb similarity index 100% rename from Data/Scripts/012_Overworld/002_PField_Field.rb rename to Data/Scripts/013_Overworld/002_PField_Field.rb diff --git a/Data/Scripts/012_Overworld/003_PField_Visuals.rb b/Data/Scripts/013_Overworld/003_PField_Visuals.rb similarity index 100% rename from Data/Scripts/012_Overworld/003_PField_Visuals.rb rename to Data/Scripts/013_Overworld/003_PField_Visuals.rb diff --git a/Data/Scripts/012_Overworld/004_PField_Weather.rb b/Data/Scripts/013_Overworld/004_PField_Weather.rb similarity index 100% rename from Data/Scripts/012_Overworld/004_PField_Weather.rb rename to Data/Scripts/013_Overworld/004_PField_Weather.rb diff --git a/Data/Scripts/012_Overworld/005_PField_Metadata.rb b/Data/Scripts/013_Overworld/005_PField_Metadata.rb similarity index 100% rename from Data/Scripts/012_Overworld/005_PField_Metadata.rb rename to Data/Scripts/013_Overworld/005_PField_Metadata.rb diff --git a/Data/Scripts/012_Overworld/006_PField_Battles.rb b/Data/Scripts/013_Overworld/006_PField_Battles.rb similarity index 100% rename from Data/Scripts/012_Overworld/006_PField_Battles.rb rename to Data/Scripts/013_Overworld/006_PField_Battles.rb diff --git a/Data/Scripts/012_Overworld/007_PField_Encounters.rb b/Data/Scripts/013_Overworld/007_PField_Encounters.rb similarity index 100% rename from Data/Scripts/012_Overworld/007_PField_Encounters.rb rename to Data/Scripts/013_Overworld/007_PField_Encounters.rb diff --git a/Data/Scripts/012_Overworld/008_PField_EncounterModifiers.rb b/Data/Scripts/013_Overworld/008_PField_EncounterModifiers.rb similarity index 100% rename from Data/Scripts/012_Overworld/008_PField_EncounterModifiers.rb rename to Data/Scripts/013_Overworld/008_PField_EncounterModifiers.rb diff --git a/Data/Scripts/012_Overworld/009_PField_RoamingPokemon.rb b/Data/Scripts/013_Overworld/009_PField_RoamingPokemon.rb similarity index 100% rename from Data/Scripts/012_Overworld/009_PField_RoamingPokemon.rb rename to Data/Scripts/013_Overworld/009_PField_RoamingPokemon.rb diff --git a/Data/Scripts/012_Overworld/010_PField_RandomDungeons.rb b/Data/Scripts/013_Overworld/010_PField_RandomDungeons.rb similarity index 100% rename from Data/Scripts/012_Overworld/010_PField_RandomDungeons.rb rename to Data/Scripts/013_Overworld/010_PField_RandomDungeons.rb diff --git a/Data/Scripts/012_Overworld/011_PField_FieldMoves.rb b/Data/Scripts/013_Overworld/011_PField_FieldMoves.rb similarity index 100% rename from Data/Scripts/012_Overworld/011_PField_FieldMoves.rb rename to Data/Scripts/013_Overworld/011_PField_FieldMoves.rb diff --git a/Data/Scripts/012_Overworld/012_PField_BerryPlants.rb b/Data/Scripts/013_Overworld/012_PField_BerryPlants.rb similarity index 100% rename from Data/Scripts/012_Overworld/012_PField_BerryPlants.rb rename to Data/Scripts/013_Overworld/012_PField_BerryPlants.rb diff --git a/Data/Scripts/012_Overworld/013_PField_DayCare.rb b/Data/Scripts/013_Overworld/013_PField_DayCare.rb similarity index 100% rename from Data/Scripts/012_Overworld/013_PField_DayCare.rb rename to Data/Scripts/013_Overworld/013_PField_DayCare.rb diff --git a/Data/Scripts/012_Overworld/014_PField_DependentEvents.rb b/Data/Scripts/013_Overworld/014_PField_DependentEvents.rb similarity index 100% rename from Data/Scripts/012_Overworld/014_PField_DependentEvents.rb rename to Data/Scripts/013_Overworld/014_PField_DependentEvents.rb diff --git a/Data/Scripts/012_Overworld/015_PField_Time.rb b/Data/Scripts/013_Overworld/015_PField_Time.rb similarity index 100% rename from Data/Scripts/012_Overworld/015_PField_Time.rb rename to Data/Scripts/013_Overworld/015_PField_Time.rb diff --git a/Data/Scripts/013_Trainers/001_PokeBattle_Trainer.rb b/Data/Scripts/014_Trainers/001_PokeBattle_Trainer.rb similarity index 100% rename from Data/Scripts/013_Trainers/001_PokeBattle_Trainer.rb rename to Data/Scripts/014_Trainers/001_PokeBattle_Trainer.rb diff --git a/Data/Scripts/013_Trainers/002_PTrainer_NPCTrainers.rb b/Data/Scripts/014_Trainers/002_PTrainer_NPCTrainers.rb similarity index 100% rename from Data/Scripts/013_Trainers/002_PTrainer_NPCTrainers.rb rename to Data/Scripts/014_Trainers/002_PTrainer_NPCTrainers.rb diff --git a/Data/Scripts/014_Items/001_PItem_Items.rb b/Data/Scripts/015_Items/001_PItem_Items.rb similarity index 100% rename from Data/Scripts/014_Items/001_PItem_Items.rb rename to Data/Scripts/015_Items/001_PItem_Items.rb diff --git a/Data/Scripts/014_Items/002_PItem_ItemEffects.rb b/Data/Scripts/015_Items/002_PItem_ItemEffects.rb similarity index 100% rename from Data/Scripts/014_Items/002_PItem_ItemEffects.rb rename to Data/Scripts/015_Items/002_PItem_ItemEffects.rb diff --git a/Data/Scripts/014_Items/003_PItem_BattleItemEffects.rb b/Data/Scripts/015_Items/003_PItem_BattleItemEffects.rb similarity index 100% rename from Data/Scripts/014_Items/003_PItem_BattleItemEffects.rb rename to Data/Scripts/015_Items/003_PItem_BattleItemEffects.rb diff --git a/Data/Scripts/014_Items/004_PItem_Phone.rb b/Data/Scripts/015_Items/004_PItem_Phone.rb similarity index 100% rename from Data/Scripts/014_Items/004_PItem_Phone.rb rename to Data/Scripts/015_Items/004_PItem_Phone.rb diff --git a/Data/Scripts/014_Items/005_PItem_PokeRadar.rb b/Data/Scripts/015_Items/005_PItem_PokeRadar.rb similarity index 100% rename from Data/Scripts/014_Items/005_PItem_PokeRadar.rb rename to Data/Scripts/015_Items/005_PItem_PokeRadar.rb diff --git a/Data/Scripts/014_Items/006_PItem_Mail.rb b/Data/Scripts/015_Items/006_PItem_Mail.rb similarity index 100% rename from Data/Scripts/014_Items/006_PItem_Mail.rb rename to Data/Scripts/015_Items/006_PItem_Mail.rb diff --git a/Data/Scripts/014_Items/007_PItem_Sprites.rb b/Data/Scripts/015_Items/007_PItem_Sprites.rb similarity index 100% rename from Data/Scripts/014_Items/007_PItem_Sprites.rb rename to Data/Scripts/015_Items/007_PItem_Sprites.rb diff --git a/Data/Scripts/014_Items/008_PItem_Bag.rb b/Data/Scripts/015_Items/008_PItem_Bag.rb similarity index 100% rename from Data/Scripts/014_Items/008_PItem_Bag.rb rename to Data/Scripts/015_Items/008_PItem_Bag.rb diff --git a/Data/Scripts/015_Pokemon/001_PokeBattle_Pokemon.rb b/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb similarity index 100% rename from Data/Scripts/015_Pokemon/001_PokeBattle_Pokemon.rb rename to Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb diff --git a/Data/Scripts/015_Pokemon/002_Pokemon_Forms.rb b/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb similarity index 100% rename from Data/Scripts/015_Pokemon/002_Pokemon_Forms.rb rename to Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb diff --git a/Data/Scripts/015_Pokemon/003_Pokemon_MegaEvolution.rb b/Data/Scripts/016_Pokemon/003_Pokemon_MegaEvolution.rb similarity index 100% rename from Data/Scripts/015_Pokemon/003_Pokemon_MegaEvolution.rb rename to Data/Scripts/016_Pokemon/003_Pokemon_MegaEvolution.rb diff --git a/Data/Scripts/015_Pokemon/004_Pokemon_ShadowPokemon.rb b/Data/Scripts/016_Pokemon/004_Pokemon_ShadowPokemon.rb similarity index 100% rename from Data/Scripts/015_Pokemon/004_Pokemon_ShadowPokemon.rb rename to Data/Scripts/016_Pokemon/004_Pokemon_ShadowPokemon.rb diff --git a/Data/Scripts/015_Pokemon/005_Pokemon_Evolution.rb b/Data/Scripts/016_Pokemon/005_Pokemon_Evolution.rb similarity index 100% rename from Data/Scripts/015_Pokemon/005_Pokemon_Evolution.rb rename to Data/Scripts/016_Pokemon/005_Pokemon_Evolution.rb diff --git a/Data/Scripts/015_Pokemon/006_Pokemon_Chatter.rb b/Data/Scripts/016_Pokemon/006_Pokemon_Chatter.rb similarity index 100% rename from Data/Scripts/015_Pokemon/006_Pokemon_Chatter.rb rename to Data/Scripts/016_Pokemon/006_Pokemon_Chatter.rb diff --git a/Data/Scripts/015_Pokemon/007_Pokemon_Sprites.rb b/Data/Scripts/016_Pokemon/007_Pokemon_Sprites.rb similarity index 100% rename from Data/Scripts/015_Pokemon/007_Pokemon_Sprites.rb rename to Data/Scripts/016_Pokemon/007_Pokemon_Sprites.rb diff --git a/Data/Scripts/015_Pokemon/008_Pokemon_Storage.rb b/Data/Scripts/016_Pokemon/008_Pokemon_Storage.rb similarity index 100% rename from Data/Scripts/015_Pokemon/008_Pokemon_Storage.rb rename to Data/Scripts/016_Pokemon/008_Pokemon_Storage.rb diff --git a/Data/Scripts/016_UI/001_PScreen_PauseMenu.rb b/Data/Scripts/017_UI/001_PScreen_PauseMenu.rb similarity index 100% rename from Data/Scripts/016_UI/001_PScreen_PauseMenu.rb rename to Data/Scripts/017_UI/001_PScreen_PauseMenu.rb diff --git a/Data/Scripts/016_UI/002_PScreen_PokedexMenu.rb b/Data/Scripts/017_UI/002_PScreen_PokedexMenu.rb similarity index 100% rename from Data/Scripts/016_UI/002_PScreen_PokedexMenu.rb rename to Data/Scripts/017_UI/002_PScreen_PokedexMenu.rb diff --git a/Data/Scripts/016_UI/003_PScreen_PokedexMain.rb b/Data/Scripts/017_UI/003_PScreen_PokedexMain.rb similarity index 100% rename from Data/Scripts/016_UI/003_PScreen_PokedexMain.rb rename to Data/Scripts/017_UI/003_PScreen_PokedexMain.rb diff --git a/Data/Scripts/016_UI/004_PScreen_PokedexEntry.rb b/Data/Scripts/017_UI/004_PScreen_PokedexEntry.rb similarity index 100% rename from Data/Scripts/016_UI/004_PScreen_PokedexEntry.rb rename to Data/Scripts/017_UI/004_PScreen_PokedexEntry.rb diff --git a/Data/Scripts/016_UI/005_PScreen_Party.rb b/Data/Scripts/017_UI/005_PScreen_Party.rb similarity index 100% rename from Data/Scripts/016_UI/005_PScreen_Party.rb rename to Data/Scripts/017_UI/005_PScreen_Party.rb diff --git a/Data/Scripts/016_UI/006_PScreen_Summary.rb b/Data/Scripts/017_UI/006_PScreen_Summary.rb similarity index 100% rename from Data/Scripts/016_UI/006_PScreen_Summary.rb rename to Data/Scripts/017_UI/006_PScreen_Summary.rb diff --git a/Data/Scripts/016_UI/007_PScreen_Bag.rb b/Data/Scripts/017_UI/007_PScreen_Bag.rb similarity index 100% rename from Data/Scripts/016_UI/007_PScreen_Bag.rb rename to Data/Scripts/017_UI/007_PScreen_Bag.rb diff --git a/Data/Scripts/016_UI/008_PScreen_Pokegear.rb b/Data/Scripts/017_UI/008_PScreen_Pokegear.rb similarity index 100% rename from Data/Scripts/016_UI/008_PScreen_Pokegear.rb rename to Data/Scripts/017_UI/008_PScreen_Pokegear.rb diff --git a/Data/Scripts/016_UI/009_PScreen_RegionMap.rb b/Data/Scripts/017_UI/009_PScreen_RegionMap.rb similarity index 100% rename from Data/Scripts/016_UI/009_PScreen_RegionMap.rb rename to Data/Scripts/017_UI/009_PScreen_RegionMap.rb diff --git a/Data/Scripts/016_UI/010_PScreen_Phone.rb b/Data/Scripts/017_UI/010_PScreen_Phone.rb similarity index 100% rename from Data/Scripts/016_UI/010_PScreen_Phone.rb rename to Data/Scripts/017_UI/010_PScreen_Phone.rb diff --git a/Data/Scripts/016_UI/011_PScreen_Jukebox.rb b/Data/Scripts/017_UI/011_PScreen_Jukebox.rb similarity index 100% rename from Data/Scripts/016_UI/011_PScreen_Jukebox.rb rename to Data/Scripts/017_UI/011_PScreen_Jukebox.rb diff --git a/Data/Scripts/016_UI/012_PScreen_TrainerCard.rb b/Data/Scripts/017_UI/012_PScreen_TrainerCard.rb similarity index 100% rename from Data/Scripts/016_UI/012_PScreen_TrainerCard.rb rename to Data/Scripts/017_UI/012_PScreen_TrainerCard.rb diff --git a/Data/Scripts/016_UI/013_PScreen_Load.rb b/Data/Scripts/017_UI/013_PScreen_Load.rb similarity index 100% rename from Data/Scripts/016_UI/013_PScreen_Load.rb rename to Data/Scripts/017_UI/013_PScreen_Load.rb diff --git a/Data/Scripts/016_UI/014_PScreen_Save.rb b/Data/Scripts/017_UI/014_PScreen_Save.rb similarity index 100% rename from Data/Scripts/016_UI/014_PScreen_Save.rb rename to Data/Scripts/017_UI/014_PScreen_Save.rb diff --git a/Data/Scripts/016_UI/015_PScreen_Options.rb b/Data/Scripts/017_UI/015_PScreen_Options.rb similarity index 100% rename from Data/Scripts/016_UI/015_PScreen_Options.rb rename to Data/Scripts/017_UI/015_PScreen_Options.rb diff --git a/Data/Scripts/016_UI/016_PScreen_ReadyMenu.rb b/Data/Scripts/017_UI/016_PScreen_ReadyMenu.rb similarity index 100% rename from Data/Scripts/016_UI/016_PScreen_ReadyMenu.rb rename to Data/Scripts/017_UI/016_PScreen_ReadyMenu.rb diff --git a/Data/Scripts/016_UI/017_PScreen_PokemonStorage.rb b/Data/Scripts/017_UI/017_PScreen_PokemonStorage.rb similarity index 100% rename from Data/Scripts/016_UI/017_PScreen_PokemonStorage.rb rename to Data/Scripts/017_UI/017_PScreen_PokemonStorage.rb diff --git a/Data/Scripts/016_UI/018_PScreen_ItemStorage.rb b/Data/Scripts/017_UI/018_PScreen_ItemStorage.rb similarity index 100% rename from Data/Scripts/016_UI/018_PScreen_ItemStorage.rb rename to Data/Scripts/017_UI/018_PScreen_ItemStorage.rb diff --git a/Data/Scripts/016_UI/019_PScreen_PC.rb b/Data/Scripts/017_UI/019_PScreen_PC.rb similarity index 100% rename from Data/Scripts/016_UI/019_PScreen_PC.rb rename to Data/Scripts/017_UI/019_PScreen_PC.rb diff --git a/Data/Scripts/016_UI/020_PScreen_EggHatching.rb b/Data/Scripts/017_UI/020_PScreen_EggHatching.rb similarity index 100% rename from Data/Scripts/016_UI/020_PScreen_EggHatching.rb rename to Data/Scripts/017_UI/020_PScreen_EggHatching.rb diff --git a/Data/Scripts/016_UI/021_PScreen_Evolution.rb b/Data/Scripts/017_UI/021_PScreen_Evolution.rb similarity index 100% rename from Data/Scripts/016_UI/021_PScreen_Evolution.rb rename to Data/Scripts/017_UI/021_PScreen_Evolution.rb diff --git a/Data/Scripts/016_UI/022_PScreen_Trading.rb b/Data/Scripts/017_UI/022_PScreen_Trading.rb similarity index 100% rename from Data/Scripts/016_UI/022_PScreen_Trading.rb rename to Data/Scripts/017_UI/022_PScreen_Trading.rb diff --git a/Data/Scripts/016_UI/023_PScreen_MoveRelearner.rb b/Data/Scripts/017_UI/023_PScreen_MoveRelearner.rb similarity index 100% rename from Data/Scripts/016_UI/023_PScreen_MoveRelearner.rb rename to Data/Scripts/017_UI/023_PScreen_MoveRelearner.rb diff --git a/Data/Scripts/016_UI/024_PScreen_PurifyChamber.rb b/Data/Scripts/017_UI/024_PScreen_PurifyChamber.rb similarity index 100% rename from Data/Scripts/016_UI/024_PScreen_PurifyChamber.rb rename to Data/Scripts/017_UI/024_PScreen_PurifyChamber.rb diff --git a/Data/Scripts/016_UI/025_PScreen_Mart.rb b/Data/Scripts/017_UI/025_PScreen_Mart.rb similarity index 100% rename from Data/Scripts/016_UI/025_PScreen_Mart.rb rename to Data/Scripts/017_UI/025_PScreen_Mart.rb diff --git a/Data/Scripts/016_UI/026_PScreen_MysteryGift.rb b/Data/Scripts/017_UI/026_PScreen_MysteryGift.rb similarity index 100% rename from Data/Scripts/016_UI/026_PScreen_MysteryGift.rb rename to Data/Scripts/017_UI/026_PScreen_MysteryGift.rb diff --git a/Data/Scripts/016_UI/027_PScreen_HallOfFame.rb b/Data/Scripts/017_UI/027_PScreen_HallOfFame.rb similarity index 100% rename from Data/Scripts/016_UI/027_PScreen_HallOfFame.rb rename to Data/Scripts/017_UI/027_PScreen_HallOfFame.rb diff --git a/Data/Scripts/017_Other battles/001_PBattle_Safari.rb b/Data/Scripts/019_Other battles/001_PBattle_Safari.rb similarity index 100% rename from Data/Scripts/017_Other battles/001_PBattle_Safari.rb rename to Data/Scripts/019_Other battles/001_PBattle_Safari.rb diff --git a/Data/Scripts/017_Other battles/002_PBattle_BugContest.rb b/Data/Scripts/019_Other battles/002_PBattle_BugContest.rb similarity index 100% rename from Data/Scripts/017_Other battles/002_PBattle_BugContest.rb rename to Data/Scripts/019_Other battles/002_PBattle_BugContest.rb diff --git a/Data/Scripts/017_Other battles/003_PBattle_OrgBattle.rb b/Data/Scripts/019_Other battles/003_PBattle_OrgBattle.rb similarity index 100% rename from Data/Scripts/017_Other battles/003_PBattle_OrgBattle.rb rename to Data/Scripts/019_Other battles/003_PBattle_OrgBattle.rb diff --git a/Data/Scripts/017_Other battles/004_PBattle_OrgBattleRules.rb b/Data/Scripts/019_Other battles/004_PBattle_OrgBattleRules.rb similarity index 100% rename from Data/Scripts/017_Other battles/004_PBattle_OrgBattleRules.rb rename to Data/Scripts/019_Other battles/004_PBattle_OrgBattleRules.rb diff --git a/Data/Scripts/017_Other battles/005_PBattle_OrgBattleGenerator.rb b/Data/Scripts/019_Other battles/005_PBattle_OrgBattleGenerator.rb similarity index 100% rename from Data/Scripts/017_Other battles/005_PBattle_OrgBattleGenerator.rb rename to Data/Scripts/019_Other battles/005_PBattle_OrgBattleGenerator.rb diff --git a/Data/Scripts/017_Other battles/006_PBattle_BattleSwap.rb b/Data/Scripts/019_Other battles/006_PBattle_BattleSwap.rb similarity index 100% rename from Data/Scripts/017_Other battles/006_PBattle_BattleSwap.rb rename to Data/Scripts/019_Other battles/006_PBattle_BattleSwap.rb diff --git a/Data/Scripts/019_System and utilities/001_PSystem_Controls.rb b/Data/Scripts/020_System and utilities/001_PSystem_Controls.rb similarity index 100% rename from Data/Scripts/019_System and utilities/001_PSystem_Controls.rb rename to Data/Scripts/020_System and utilities/001_PSystem_Controls.rb diff --git a/Data/Scripts/019_System and utilities/002_PSystem_System.rb b/Data/Scripts/020_System and utilities/002_PSystem_System.rb similarity index 100% rename from Data/Scripts/019_System and utilities/002_PSystem_System.rb rename to Data/Scripts/020_System and utilities/002_PSystem_System.rb diff --git a/Data/Scripts/019_System and utilities/003_PSystem_FileUtilities.rb b/Data/Scripts/020_System and utilities/003_PSystem_FileUtilities.rb similarity index 100% rename from Data/Scripts/019_System and utilities/003_PSystem_FileUtilities.rb rename to Data/Scripts/020_System and utilities/003_PSystem_FileUtilities.rb diff --git a/Data/Scripts/019_System and utilities/004_PSystem_PokemonUtilities.rb b/Data/Scripts/020_System and utilities/004_PSystem_PokemonUtilities.rb similarity index 100% rename from Data/Scripts/019_System and utilities/004_PSystem_PokemonUtilities.rb rename to Data/Scripts/020_System and utilities/004_PSystem_PokemonUtilities.rb diff --git a/Data/Scripts/019_System and utilities/005_PSystem_Utilities.rb b/Data/Scripts/020_System and utilities/005_PSystem_Utilities.rb similarity index 100% rename from Data/Scripts/019_System and utilities/005_PSystem_Utilities.rb rename to Data/Scripts/020_System and utilities/005_PSystem_Utilities.rb diff --git a/Data/Scripts/020_Debug/001_Debug_Menu.rb b/Data/Scripts/021_Debug/001_Debug_Menu.rb similarity index 100% rename from Data/Scripts/020_Debug/001_Debug_Menu.rb rename to Data/Scripts/021_Debug/001_Debug_Menu.rb diff --git a/Data/Scripts/020_Debug/002_Debug_Actions.rb b/Data/Scripts/021_Debug/002_Debug_Actions.rb similarity index 100% rename from Data/Scripts/020_Debug/002_Debug_Actions.rb rename to Data/Scripts/021_Debug/002_Debug_Actions.rb diff --git a/Data/Scripts/020_Debug/003_Debug_Pokemon.rb b/Data/Scripts/021_Debug/003_Debug_Pokemon.rb similarity index 100% rename from Data/Scripts/020_Debug/003_Debug_Pokemon.rb rename to Data/Scripts/021_Debug/003_Debug_Pokemon.rb diff --git a/Data/Scripts/020_Debug/004_Editor_Screens.rb b/Data/Scripts/021_Debug/004_Editor_Screens.rb similarity index 100% rename from Data/Scripts/020_Debug/004_Editor_Screens.rb rename to Data/Scripts/021_Debug/004_Editor_Screens.rb diff --git a/Data/Scripts/020_Debug/005_Editor_SaveData.rb b/Data/Scripts/021_Debug/005_Editor_SaveData.rb similarity index 100% rename from Data/Scripts/020_Debug/005_Editor_SaveData.rb rename to Data/Scripts/021_Debug/005_Editor_SaveData.rb diff --git a/Data/Scripts/020_Debug/006_Editor_DataTypes.rb b/Data/Scripts/021_Debug/006_Editor_DataTypes.rb similarity index 100% rename from Data/Scripts/020_Debug/006_Editor_DataTypes.rb rename to Data/Scripts/021_Debug/006_Editor_DataTypes.rb diff --git a/Data/Scripts/020_Debug/007_Editor_Listers.rb b/Data/Scripts/021_Debug/007_Editor_Listers.rb similarity index 100% rename from Data/Scripts/020_Debug/007_Editor_Listers.rb rename to Data/Scripts/021_Debug/007_Editor_Listers.rb diff --git a/Data/Scripts/020_Debug/008_Editor_Utilities.rb b/Data/Scripts/021_Debug/008_Editor_Utilities.rb similarity index 100% rename from Data/Scripts/020_Debug/008_Editor_Utilities.rb rename to Data/Scripts/021_Debug/008_Editor_Utilities.rb diff --git a/Data/Scripts/020_Debug/009_Editor_TilesetEditor.rb b/Data/Scripts/021_Debug/009_Editor_TilesetEditor.rb similarity index 100% rename from Data/Scripts/020_Debug/009_Editor_TilesetEditor.rb rename to Data/Scripts/021_Debug/009_Editor_TilesetEditor.rb diff --git a/Data/Scripts/020_Debug/010_Editor_MapConnectionEditor.rb b/Data/Scripts/021_Debug/010_Editor_MapConnectionEditor.rb similarity index 100% rename from Data/Scripts/020_Debug/010_Editor_MapConnectionEditor.rb rename to Data/Scripts/021_Debug/010_Editor_MapConnectionEditor.rb diff --git a/Data/Scripts/020_Debug/011_Editor_SpritePosEditor.rb b/Data/Scripts/021_Debug/011_Editor_SpritePosEditor.rb similarity index 100% rename from Data/Scripts/020_Debug/011_Editor_SpritePosEditor.rb rename to Data/Scripts/021_Debug/011_Editor_SpritePosEditor.rb diff --git a/Data/Scripts/020_Debug/012_Editor_BattleAnimationEditor.rb b/Data/Scripts/021_Debug/012_Editor_BattleAnimationEditor.rb similarity index 100% rename from Data/Scripts/020_Debug/012_Editor_BattleAnimationEditor.rb rename to Data/Scripts/021_Debug/012_Editor_BattleAnimationEditor.rb diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/022_Compiler/001_Compiler.rb similarity index 100% rename from Data/Scripts/021_Compiler/001_Compiler.rb rename to Data/Scripts/022_Compiler/001_Compiler.rb diff --git a/Data/Scripts/021_Compiler/002_Compiler_PBS.rb b/Data/Scripts/022_Compiler/002_Compiler_PBS.rb similarity index 100% rename from Data/Scripts/021_Compiler/002_Compiler_PBS.rb rename to Data/Scripts/022_Compiler/002_Compiler_PBS.rb diff --git a/Data/Scripts/021_Compiler/003_Compiler_MapsAndEvents.rb b/Data/Scripts/022_Compiler/003_Compiler_MapsAndEvents.rb similarity index 100% rename from Data/Scripts/021_Compiler/003_Compiler_MapsAndEvents.rb rename to Data/Scripts/022_Compiler/003_Compiler_MapsAndEvents.rb