Merge branch 'beta' into block-ribbons-with-inverse

2025-08-19 13:59:27 +02:00 · 2025-08-18 18:36:07 -07:00 · 2025-08-18 18:36:07 -07:00 · ab270c5da9
commit ab270c5da9
parent c7708be249 3d9cb539c7
135 changed files with 45 additions and 49 deletions
--- a/CREDITS.md
+++ b/CREDITS.md
@ -24,9 +24,10 @@
 - Pokémon Sword/Shield
 - Pokémon Legends: Arceus
 - Pokémon Scarlet/Violet
- Firel (Custom Graveyard, Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, and Volcano biome music)
+- Firel (Custom Graveyard, Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, Volcano, and Desert biome music)
 - Lmz (Custom Ancient Ruins, Jungle, and Lake biome music)
- Andr06 (Custom Forest, Slum and Sea biome music)
+- Andr06 (Custom Forest, Slum, Sea, and Fairy Cave biome music)
+- Leavannite (Custom Wasteland biome music)
 - _tresnoir
 - unveiler

--- a/public/audio/bgm/wasteland.mp3
+++ b/public/audio/bgm/wasteland.mp3
--- a/public/images/items/ampharosite.png
+++ b/public/images/items/ampharosite.png
--- a/public/images/items/amulet_coin.png
+++ b/public/images/items/amulet_coin.png
--- a/public/images/items/blunder_policy.png
+++ b/public/images/items/blunder_policy.png
--- a/public/images/items/bug_memory.png
+++ b/public/images/items/bug_memory.png
--- a/public/images/items/catching_charm.png
+++ b/public/images/items/catching_charm.png
--- a/public/images/items/diancite.png
+++ b/public/images/items/diancite.png
--- a/public/images/items/galarica_cuff.png
+++ b/public/images/items/galarica_cuff.png
--- a/public/images/items/gardevoirite.png
+++ b/public/images/items/gardevoirite.png
--- a/public/images/items/gb.png
+++ b/public/images/items/gb.png
--- a/public/images/items/hp_up.png
+++ b/public/images/items/hp_up.png
--- a/public/images/items/leftovers.png
+++ b/public/images/items/leftovers.png
--- a/public/images/items/magnet.png
+++ b/public/images/items/magnet.png
--- a/public/images/items/max_mushrooms.png
+++ b/public/images/items/max_mushrooms.png
--- a/public/images/items/mega_bracelet.png
+++ b/public/images/items/mega_bracelet.png
--- a/public/images/items/mint_atk.png
+++ b/public/images/items/mint_atk.png
--- a/public/images/items/n_solarizer.png
+++ b/public/images/items/n_solarizer.png
--- a/public/images/items/poison_barb.png
+++ b/public/images/items/poison_barb.png
--- a/public/images/items/power_herb.png
+++ b/public/images/items/power_herb.png
--- a/public/images/items/rayquazite.png
+++ b/public/images/items/rayquazite.png
--- a/public/images/items/ribbon_gen4.png
+++ b/public/images/items/ribbon_gen4.png
--- a/public/images/items/ribbon_gen5.png
+++ b/public/images/items/ribbon_gen5.png
--- a/public/images/items/sceptilite.png
+++ b/public/images/items/sceptilite.png
--- a/public/images/items/scroll_of_waters.png
+++ b/public/images/items/scroll_of_waters.png
--- a/public/images/items/soothe_bell.png
+++ b/public/images/items/soothe_bell.png
--- a/public/images/items/sweet_apple.png
+++ b/public/images/items/sweet_apple.png
--- a/public/images/items/tm_ice.png
+++ b/public/images/items/tm_ice.png
--- a/public/images/items/tm_normal.png
+++ b/public/images/items/tm_normal.png
--- a/public/images/items/toxic_orb.png
+++ b/public/images/items/toxic_orb.png
--- a/public/images/items/unknown.png
+++ b/public/images/items/unknown.png
--- a/public/images/items/white_herb.png
+++ b/public/images/items/white_herb.png
--- a/public/images/items/wl_antidote.png
+++ b/public/images/items/wl_antidote.png
--- a/public/images/items/wl_awakening.png
+++ b/public/images/items/wl_awakening.png
--- a/public/images/items/wl_burn_heal.png
+++ b/public/images/items/wl_burn_heal.png
--- a/public/images/items/wl_custom_thief.png
+++ b/public/images/items/wl_custom_thief.png
--- a/public/images/items/wl_elixir.png
+++ b/public/images/items/wl_elixir.png
--- a/public/images/items/wl_ether.png
+++ b/public/images/items/wl_ether.png
--- a/public/images/items/wl_full_heal.png
+++ b/public/images/items/wl_full_heal.png
--- a/public/images/items/wl_hyper_potion.png
+++ b/public/images/items/wl_hyper_potion.png
--- a/public/images/items/wl_ice_heal.png
+++ b/public/images/items/wl_ice_heal.png
--- a/public/images/items/wl_max_elixir.png
+++ b/public/images/items/wl_max_elixir.png
--- a/public/images/items/wl_max_ether.png
+++ b/public/images/items/wl_max_ether.png
--- a/public/images/items/wl_max_potion.png
+++ b/public/images/items/wl_max_potion.png
--- a/public/images/items/wl_paralyze_heal.png
+++ b/public/images/items/wl_paralyze_heal.png
--- a/public/images/items/wl_potion.png
+++ b/public/images/items/wl_potion.png
--- a/public/images/items/wl_super_potion.png
+++ b/public/images/items/wl_super_potion.png
--- a/public/images/logo_fake.png
+++ b/public/images/logo_fake.png
--- a/public/images/pokeball/gb_opening.png
+++ b/public/images/pokeball/gb_opening.png
--- a/public/images/pokeball/pb_open.png
+++ b/public/images/pokeball/pb_open.png
--- a/public/images/pokeball/pb_opening.png
+++ b/public/images/pokeball/pb_opening.png
--- a/public/images/pokeball/rb_open.png
+++ b/public/images/pokeball/rb_open.png
--- a/public/images/pokeball/ub_open.png
+++ b/public/images/pokeball/ub_open.png
--- a/public/images/pokeball/ub_opening.png
+++ b/public/images/pokeball/ub_opening.png
--- a/public/images/statuses_tl.png
+++ b/public/images/statuses_tl.png
--- a/public/images/trainer/aether_grunt_m.png
+++ b/public/images/trainer/aether_grunt_m.png
--- a/public/images/trainer/allister.png
+++ b/public/images/trainer/allister.png
--- a/public/images/trainer/aqua_grunt_m.png
+++ b/public/images/trainer/aqua_grunt_m.png
--- a/public/images/trainer/archie.png
+++ b/public/images/trainer/archie.png
--- a/public/images/trainer/expert_pokemon_breeder.png
+++ b/public/images/trainer/expert_pokemon_breeder.png
--- a/public/images/trainer/katy.png
+++ b/public/images/trainer/katy.png
--- a/public/images/trainer/rocket_boss_giovanni_1.png
+++ b/public/images/trainer/rocket_boss_giovanni_1.png
--- a/public/images/ui/boolean_sel.png
+++ b/public/images/ui/boolean_sel.png
--- a/public/images/ui/champion_ribbon.png
+++ b/public/images/ui/champion_ribbon.png
--- a/public/images/ui/champion_ribbon_bronze.png
+++ b/public/images/ui/champion_ribbon_bronze.png
--- a/public/images/ui/champion_ribbon_diamond.png
+++ b/public/images/ui/champion_ribbon_diamond.png
--- a/public/images/ui/champion_ribbon_emerald.png
+++ b/public/images/ui/champion_ribbon_emerald.png
--- a/public/images/ui/champion_ribbon_silver.png
+++ b/public/images/ui/champion_ribbon_silver.png
--- a/public/images/ui/cursor.png
+++ b/public/images/ui/cursor.png
--- a/public/images/ui/dawn_icon_fg.png
+++ b/public/images/ui/dawn_icon_fg.png
--- a/public/images/ui/day_icon_fg.png
+++ b/public/images/ui/day_icon_fg.png
--- a/public/images/ui/friendship_overlay.png
+++ b/public/images/ui/friendship_overlay.png
--- a/public/images/ui/hall_of_fame_blue.png
+++ b/public/images/ui/hall_of_fame_blue.png
--- a/public/images/ui/hall_of_fame_red.png
+++ b/public/images/ui/hall_of_fame_red.png
--- a/public/images/ui/icon_egg_move.png
+++ b/public/images/ui/icon_egg_move.png
--- a/public/images/ui/legacy/champion_ribbon.png
+++ b/public/images/ui/legacy/champion_ribbon.png
--- a/public/images/ui/legacy/champion_ribbon_bronze.png
+++ b/public/images/ui/legacy/champion_ribbon_bronze.png
--- a/public/images/ui/legacy/champion_ribbon_diamond.png
+++ b/public/images/ui/legacy/champion_ribbon_diamond.png
--- a/public/images/ui/legacy/champion_ribbon_emerald.png
+++ b/public/images/ui/legacy/champion_ribbon_emerald.png
--- a/public/images/ui/legacy/champion_ribbon_silver.png
+++ b/public/images/ui/legacy/champion_ribbon_silver.png
--- a/public/images/ui/legacy/cursor.png
+++ b/public/images/ui/legacy/cursor.png
--- a/public/images/ui/legacy/day_icon_fg.png
+++ b/public/images/ui/legacy/day_icon_fg.png
--- a/public/images/ui/legacy/discord.png
+++ b/public/images/ui/legacy/discord.png
--- a/public/images/ui/legacy/friendship_overlay.png
+++ b/public/images/ui/legacy/friendship_overlay.png
--- a/public/images/ui/legacy/hall_of_fame_blue.png
+++ b/public/images/ui/legacy/hall_of_fame_blue.png
--- a/public/images/ui/legacy/hall_of_fame_red.png
+++ b/public/images/ui/legacy/hall_of_fame_red.png
--- a/public/images/ui/legacy/icon_egg_move.png
+++ b/public/images/ui/legacy/icon_egg_move.png
--- a/public/images/ui/legacy/link_icon.png
+++ b/public/images/ui/legacy/link_icon.png
--- a/public/images/ui/legacy/namebox.png
+++ b/public/images/ui/legacy/namebox.png
--- a/public/images/ui/legacy/overlay_hp.png
+++ b/public/images/ui/legacy/overlay_hp.png
--- a/public/images/ui/legacy/overlay_lv_alt.png
+++ b/public/images/ui/legacy/overlay_lv_alt.png
--- a/public/images/ui/legacy/party_bg.png
+++ b/public/images/ui/legacy/party_bg.png
--- a/public/images/ui/legacy/party_bg_double.png
+++ b/public/images/ui/legacy/party_bg_double.png
--- a/public/images/ui/legacy/party_bg_double_manage.png
+++ b/public/images/ui/legacy/party_bg_double_manage.png
--- a/public/images/ui/legacy/party_slot_hp_overlay.png
+++ b/public/images/ui/legacy/party_slot_hp_overlay.png
--- a/public/images/ui/legacy/party_slot_main_short.png
+++ b/public/images/ui/legacy/party_slot_main_short.png
--- a/public/images/ui/legacy/party_slot_overlay_lv_alt.png
+++ b/public/images/ui/legacy/party_slot_overlay_lv_alt.png
--- a/public/images/ui/legacy/passive_bg.png
+++ b/public/images/ui/legacy/passive_bg.png
--- a/public/images/ui/legacy/pb_tray_overlay_enemy.png
+++ b/public/images/ui/legacy/pb_tray_overlay_enemy.png
--- a/public/images/ui/legacy/pbinfo_enemy_type.png
+++ b/public/images/ui/legacy/pbinfo_enemy_type.png
--- a/Show More
+++ b/Show More