Merge branch 'main' into fix/damp

2025-07-18 14:22:19 +02:00 · 2024-06-29 17:28:07 -04:00 · 2024-06-29 17:28:07 -04:00 · 3afd70998c
commit 3afd70998c
parent da896b9c09 a48429de09
440 changed files with 26223 additions and 21553 deletions
--- a/README.md
+++ b/README.md
@ -54,7 +54,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
  - Pokémon Ultra Sun/Ultra Moon
  - Pokémon Sword/Shield
  - Pokémon Scarlet/Violet
-  - Firel (Custom Metropolis and Laboratory biome music)
+  - Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
  - Lmz (Custom Jungle biome music)

 ### 🎵 Sound Effects
--- a/public/audio/bgm/abyss.mp3
+++ b/public/audio/bgm/abyss.mp3
--- a/public/audio/bgm/badlands.mp3
+++ b/public/audio/bgm/badlands.mp3
--- a/public/audio/bgm/battle_alola_champion.mp3
+++ b/public/audio/bgm/battle_alola_champion.mp3
--- a/public/audio/bgm/battle_alola_elite.mp3
+++ b/public/audio/bgm/battle_alola_elite.mp3
--- a/public/audio/bgm/battle_aqua_magma_boss.mp3
+++ b/public/audio/bgm/battle_aqua_magma_boss.mp3
--- a/public/audio/bgm/battle_aqua_magma_grunt.mp3
+++ b/public/audio/bgm/battle_aqua_magma_grunt.mp3
--- a/public/audio/bgm/battle_bb_elite.mp3
+++ b/public/audio/bgm/battle_bb_elite.mp3
--- a/public/audio/bgm/battle_champion_alder.mp3
+++ b/public/audio/bgm/battle_champion_alder.mp3
--- a/public/audio/bgm/battle_champion_geeta.mp3
+++ b/public/audio/bgm/battle_champion_geeta.mp3
--- a/public/audio/bgm/battle_champion_iris.mp3
+++ b/public/audio/bgm/battle_champion_iris.mp3
--- a/public/audio/bgm/battle_champion_kieran.mp3
+++ b/public/audio/bgm/battle_champion_kieran.mp3
--- a/public/audio/bgm/battle_champion_nemona.mp3
+++ b/public/audio/bgm/battle_champion_nemona.mp3
--- a/public/audio/bgm/battle_final.mp3
+++ b/public/audio/bgm/battle_final.mp3
--- a/public/audio/bgm/battle_final_encounter.mp3
+++ b/public/audio/bgm/battle_final_encounter.mp3
--- a/public/audio/bgm/battle_flare_boss.mp3
+++ b/public/audio/bgm/battle_flare_boss.mp3
--- a/public/audio/bgm/battle_flare_grunt.mp3
+++ b/public/audio/bgm/battle_flare_grunt.mp3
--- a/public/audio/bgm/battle_galactic_boss.mp3
+++ b/public/audio/bgm/battle_galactic_boss.mp3
--- a/public/audio/bgm/battle_galactic_grunt.mp3
+++ b/public/audio/bgm/battle_galactic_grunt.mp3
--- a/public/audio/bgm/battle_galar_champion.mp3
+++ b/public/audio/bgm/battle_galar_champion.mp3
--- a/public/audio/bgm/battle_galar_elite.mp3
+++ b/public/audio/bgm/battle_galar_elite.mp3
--- a/public/audio/bgm/battle_galar_gym.mp3
+++ b/public/audio/bgm/battle_galar_gym.mp3
--- a/public/audio/bgm/battle_hoenn_champion.mp3
+++ b/public/audio/bgm/battle_hoenn_champion.mp3
--- a/public/audio/bgm/battle_hoenn_elite.mp3
+++ b/public/audio/bgm/battle_hoenn_elite.mp3
--- a/public/audio/bgm/battle_hoenn_gym.mp3
+++ b/public/audio/bgm/battle_hoenn_gym.mp3
--- a/public/audio/bgm/battle_johto_champion.mp3
+++ b/public/audio/bgm/battle_johto_champion.mp3
--- a/public/audio/bgm/battle_johto_gym.mp3
+++ b/public/audio/bgm/battle_johto_gym.mp3
--- a/public/audio/bgm/battle_kalos_champion.mp3
+++ b/public/audio/bgm/battle_kalos_champion.mp3
--- a/public/audio/bgm/battle_kalos_elite.mp3
+++ b/public/audio/bgm/battle_kalos_elite.mp3
--- a/public/audio/bgm/battle_kalos_gym.mp3
+++ b/public/audio/bgm/battle_kalos_gym.mp3
--- a/public/audio/bgm/battle_kanto_champion.mp3
+++ b/public/audio/bgm/battle_kanto_champion.mp3
--- a/public/audio/bgm/battle_kanto_gym.mp3
+++ b/public/audio/bgm/battle_kanto_gym.mp3
--- a/public/audio/bgm/battle_legendary_arceus.mp3
+++ b/public/audio/bgm/battle_legendary_arceus.mp3
--- a/public/audio/bgm/battle_legendary_birds_galar.mp3
+++ b/public/audio/bgm/battle_legendary_birds_galar.mp3
--- a/public/audio/bgm/battle_legendary_calyrex.mp3
+++ b/public/audio/bgm/battle_legendary_calyrex.mp3
--- a/public/audio/bgm/battle_legendary_deoxys.mp3
+++ b/public/audio/bgm/battle_legendary_deoxys.mp3
--- a/public/audio/bgm/battle_legendary_dia_pal.mp3
+++ b/public/audio/bgm/battle_legendary_dia_pal.mp3
--- a/public/audio/bgm/battle_legendary_dusk_dawn.mp3
+++ b/public/audio/bgm/battle_legendary_dusk_dawn.mp3
--- a/public/audio/bgm/battle_legendary_entei.mp3
+++ b/public/audio/bgm/battle_legendary_entei.mp3
--- a/public/audio/bgm/battle_legendary_giratina.mp3
+++ b/public/audio/bgm/battle_legendary_giratina.mp3
--- a/public/audio/bgm/battle_legendary_glas_spec.mp3
+++ b/public/audio/bgm/battle_legendary_glas_spec.mp3
--- a/public/audio/bgm/battle_legendary_gro_kyo.mp3
+++ b/public/audio/bgm/battle_legendary_gro_kyo.mp3
--- a/public/audio/bgm/battle_legendary_ho_oh.mp3
+++ b/public/audio/bgm/battle_legendary_ho_oh.mp3
--- a/public/audio/bgm/battle_legendary_kanto.mp3
+++ b/public/audio/bgm/battle_legendary_kanto.mp3
--- a/public/audio/bgm/battle_legendary_kor_mir.mp3
+++ b/public/audio/bgm/battle_legendary_kor_mir.mp3
--- a/public/audio/bgm/battle_legendary_kyurem.mp3
+++ b/public/audio/bgm/battle_legendary_kyurem.mp3
--- a/public/audio/bgm/battle_legendary_lake_trio.mp3
+++ b/public/audio/bgm/battle_legendary_lake_trio.mp3
--- a/public/audio/bgm/battle_legendary_loyal_three.mp3
+++ b/public/audio/bgm/battle_legendary_loyal_three.mp3
--- a/public/audio/bgm/battle_legendary_lugia.mp3
+++ b/public/audio/bgm/battle_legendary_lugia.mp3
--- a/public/audio/bgm/battle_legendary_ogerpon.mp3
+++ b/public/audio/bgm/battle_legendary_ogerpon.mp3
--- a/public/audio/bgm/battle_legendary_pecharunt.mp3
+++ b/public/audio/bgm/battle_legendary_pecharunt.mp3
--- a/public/audio/bgm/battle_legendary_raikou.mp3
+++ b/public/audio/bgm/battle_legendary_raikou.mp3
--- a/public/audio/bgm/battle_legendary_rayquaza.mp3
+++ b/public/audio/bgm/battle_legendary_rayquaza.mp3
--- a/public/audio/bgm/battle_legendary_regis_g5.mp3
+++ b/public/audio/bgm/battle_legendary_regis_g5.mp3
--- a/public/audio/bgm/battle_legendary_regis_g6.mp3
+++ b/public/audio/bgm/battle_legendary_regis_g6.mp3
--- a/public/audio/bgm/battle_legendary_res_zek.mp3
+++ b/public/audio/bgm/battle_legendary_res_zek.mp3
--- a/public/audio/bgm/battle_legendary_ruinous.mp3
+++ b/public/audio/bgm/battle_legendary_ruinous.mp3
--- a/public/audio/bgm/battle_legendary_sinnoh.mp3
+++ b/public/audio/bgm/battle_legendary_sinnoh.mp3
--- a/public/audio/bgm/battle_legendary_sol_lun.mp3
+++ b/public/audio/bgm/battle_legendary_sol_lun.mp3
--- a/public/audio/bgm/battle_legendary_suicune.mp3
+++ b/public/audio/bgm/battle_legendary_suicune.mp3
--- a/public/audio/bgm/battle_legendary_tapu.mp3
+++ b/public/audio/bgm/battle_legendary_tapu.mp3
--- a/public/audio/bgm/battle_legendary_terapagos.mp3
+++ b/public/audio/bgm/battle_legendary_terapagos.mp3
--- a/public/audio/bgm/battle_legendary_ub.mp3
+++ b/public/audio/bgm/battle_legendary_ub.mp3
--- a/public/audio/bgm/battle_legendary_ultra_nec.mp3
+++ b/public/audio/bgm/battle_legendary_ultra_nec.mp3
--- a/public/audio/bgm/battle_legendary_unova.mp3
+++ b/public/audio/bgm/battle_legendary_unova.mp3
--- a/public/audio/bgm/battle_legendary_xern_yvel.mp3
+++ b/public/audio/bgm/battle_legendary_xern_yvel.mp3
--- a/public/audio/bgm/battle_legendary_zac_zam.mp3
+++ b/public/audio/bgm/battle_legendary_zac_zam.mp3
--- a/public/audio/bgm/battle_paldea_elite.mp3
+++ b/public/audio/bgm/battle_paldea_elite.mp3
--- a/public/audio/bgm/battle_paldea_gym.mp3
+++ b/public/audio/bgm/battle_paldea_gym.mp3
--- a/public/audio/bgm/battle_plasma_boss.mp3
+++ b/public/audio/bgm/battle_plasma_boss.mp3
--- a/public/audio/bgm/battle_plasma_grunt.mp3
+++ b/public/audio/bgm/battle_plasma_grunt.mp3
--- a/public/audio/bgm/battle_rival.mp3
+++ b/public/audio/bgm/battle_rival.mp3
--- a/public/audio/bgm/battle_rival_2.mp3
+++ b/public/audio/bgm/battle_rival_2.mp3
--- a/public/audio/bgm/battle_rival_3.mp3
+++ b/public/audio/bgm/battle_rival_3.mp3
--- a/public/audio/bgm/battle_rocket_boss.mp3
+++ b/public/audio/bgm/battle_rocket_boss.mp3
--- a/public/audio/bgm/battle_rocket_grunt.mp3
+++ b/public/audio/bgm/battle_rocket_grunt.mp3
--- a/public/audio/bgm/battle_sinnoh_champion.mp3
+++ b/public/audio/bgm/battle_sinnoh_champion.mp3
--- a/public/audio/bgm/battle_sinnoh_gym.mp3
+++ b/public/audio/bgm/battle_sinnoh_gym.mp3
--- a/public/audio/bgm/battle_trainer.mp3
+++ b/public/audio/bgm/battle_trainer.mp3
--- a/public/audio/bgm/battle_unova_elite.mp3
+++ b/public/audio/bgm/battle_unova_elite.mp3
--- a/public/audio/bgm/battle_unova_gym.mp3
+++ b/public/audio/bgm/battle_unova_gym.mp3
--- a/public/audio/bgm/battle_wild.mp3
+++ b/public/audio/bgm/battle_wild.mp3
--- a/public/audio/bgm/battle_wild_strong.mp3
+++ b/public/audio/bgm/battle_wild_strong.mp3
--- a/public/audio/bgm/beach.mp3
+++ b/public/audio/bgm/beach.mp3
--- a/public/audio/bgm/bw/evolution.mp3
+++ b/public/audio/bgm/bw/evolution.mp3
--- a/public/audio/bgm/bw/evolution_fanfare.mp3
+++ b/public/audio/bgm/bw/evolution_fanfare.mp3
--- a/public/audio/bgm/bw/heal.mp3
+++ b/public/audio/bgm/bw/heal.mp3
--- a/public/audio/bgm/bw/item_fanfare.mp3
+++ b/public/audio/bgm/bw/item_fanfare.mp3
--- a/public/audio/bgm/bw/level_up_fanfare.mp3
+++ b/public/audio/bgm/bw/level_up_fanfare.mp3
--- a/public/audio/bgm/bw/minor_fanfare.mp3
+++ b/public/audio/bgm/bw/minor_fanfare.mp3
--- a/public/audio/bgm/bw/victory_champion.mp3
+++ b/public/audio/bgm/bw/victory_champion.mp3
--- a/public/audio/bgm/bw/victory_gym.mp3
+++ b/public/audio/bgm/bw/victory_gym.mp3
--- a/public/audio/bgm/bw/victory_team_plasma.mp3
+++ b/public/audio/bgm/bw/victory_team_plasma.mp3
--- a/public/audio/bgm/bw/victory_trainer.mp3
+++ b/public/audio/bgm/bw/victory_trainer.mp3
--- a/public/audio/bgm/cave.mp3
+++ b/public/audio/bgm/cave.mp3
--- a/public/audio/bgm/construction_site.mp3
+++ b/public/audio/bgm/construction_site.mp3
--- a/public/audio/bgm/desert.mp3
+++ b/public/audio/bgm/desert.mp3
--- a/public/audio/bgm/dojo.mp3
+++ b/public/audio/bgm/dojo.mp3
--- a/public/audio/bgm/encounter_ace_trainer.mp3
+++ b/public/audio/bgm/encounter_ace_trainer.mp3
--- a/public/audio/bgm/encounter_backpacker.mp3
+++ b/public/audio/bgm/encounter_backpacker.mp3
--- a/Show More
+++ b/Show More