From 4561cc66bf337b97fa07263012d7fa7c2741b9a6 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sun, 6 Feb 2022 18:40:43 +0000
Subject: [PATCH] Moved calls to PBS file-compiling methods into their own
 method, removed music file extensions from metadata.txt

---
 Data/Scripts/021_Compiler/001_Compiler.rb | 44 ++++++++++++-----------
 PBS/metadata.txt                          | 12 +++----
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb
index 55eb6ff55..e76ce8493 100644
--- a/Data/Scripts/021_Compiler/001_Compiler.rb
+++ b/Data/Scripts/021_Compiler/001_Compiler.rb
@@ -726,30 +726,34 @@ module Compiler
     Graphics.update
   end
 
+  def compile_pbs_files
+    compile_town_map
+    compile_connections
+    compile_phone
+    compile_types
+    compile_abilities
+    compile_moves             # Depends on Type
+    compile_items             # Depends on Move
+    compile_berry_plants      # Depends on Item
+    compile_pokemon           # Depends on Move, Item, Type, Ability
+    compile_pokemon_forms     # Depends on Species, Move, Item, Type, Ability
+    compile_pokemon_metrics   # Depends on Species
+    compile_shadow_pokemon    # Depends on Species
+    compile_regional_dexes    # Depends on Species
+    compile_ribbons
+    compile_encounters        # Depends on Species
+    compile_trainer_types
+    compile_trainers          # Depends on Species, Item, Move
+    compile_trainer_lists     # Depends on TrainerType
+    compile_metadata          # Depends on TrainerType
+    compile_map_metadata
+  end
+
   def compile_all(mustCompile)
     return if !mustCompile
     FileLineData.clear
     Console.echo_h1 _INTL("Starting full compile")
-    compile_town_map               # No dependencies
-    compile_connections            # No dependencies
-    compile_phone                  # No dependencies
-    compile_types                  # No dependencies
-    compile_abilities              # No dependencies
-    compile_moves                  # Depends on Type
-    compile_items                  # Depends on Move
-    compile_berry_plants           # Depends on Item
-    compile_pokemon                # Depends on Move, Item, Type, Ability
-    compile_pokemon_forms          # Depends on Species, Move, Item, Type, Ability
-    compile_pokemon_metrics        # Depends on Species
-    compile_shadow_pokemon         # Depends on Species
-    compile_regional_dexes         # Depends on Species
-    compile_ribbons                # No dependencies
-    compile_encounters             # Depends on Species
-    compile_trainer_types          # No dependencies
-    compile_trainers               # Depends on Species, Item, Move
-    compile_trainer_lists          # Depends on TrainerType
-    compile_metadata               # Depends on TrainerType
-    compile_map_metadata           # No dependencies
+    compile_pbs_files
     compile_animations
     compile_trainer_events(mustCompile)
     Console.echo_li _INTL("Saving messages...")
diff --git a/PBS/metadata.txt b/PBS/metadata.txt
index 4e0d9ffd5..ee0ce9f34 100644
--- a/PBS/metadata.txt
+++ b/PBS/metadata.txt
@@ -5,12 +5,12 @@ StartMoney = 3000
 StartItemStorage = POTION
 Home = 3,7,5,8
 StorageCreator = Bill
-WildBattleBGM = Battle wild.mid
-TrainerBattleBGM = Battle trainer.mid
-WildVictoryME = Battle victory wild.ogg
-TrainerVictoryME = Battle victory trainer.ogg
-SurfBGM = Surfing.mid
-BicycleBGM = Bicycle.mid
+WildBattleBGM = Battle wild
+TrainerBattleBGM = Battle trainer
+WildVictoryME = Battle victory wild
+TrainerVictoryME = Battle victory trainer
+SurfBGM = Surfing
+BicycleBGM = Bicycle
 #-------------------------------
 [1]
 TrainerType = POKEMONTRAINER_Red