Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

updates patch version number
fixes pokeradar going over UI
2025-12-06 06:01:46 +00:00 · 2024-06-29 14:16:17 -04:00 · 2024-06-29 14:15:43 -04:00 · 2024-06-29 14:15:02 -04:00 · 2024-06-29 13:48:04 -04:00 · 2024-06-29 13:38:41 -04:00
16130 changed files with 496036 additions and 169707 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,8 @@
-# Audio, Graphics and Plugins folders
-Audio/
-Graphics/
-Plugins/
-
-# Data folder, but not Data/Scripts folder
-Data/*
-!Data/Scripts.rxdata
-!Data/Scripts/
-
-# Files in the main project folder
-Game.ini
-Game.rxproj
-RGSS*.dll
-
-# Common code editor folders & files
-.vscode/
-*.code-workspace
-.idea/
-
-# Operating system generated files & folders
-.DS_Store
-.DS_Store?
-ehthumbs.db
-Thumbs.db
-[Dd]esktop.ini
-
-# Temp files
-
-~*
+Graphics/Battlers/*
+Graphics/Battlers_resized/*
+Graphics/CustomBattlers/*
+Graphics/Battlers/*
+Graphics/Pokemon/FusionIcons/*
+Data/SPRITE_CREDS
+Data/VERSION
+ 
--- a/Audio/BGM/Azalea
+++ b/Audio/BGM/Azalea
--- a/Audio/BGM/BW2_Ghetsis
+++ b/Audio/BGM/BW2_Ghetsis
--- a/Audio/BGM/BW2_K_leader.mp3
+++ b/Audio/BGM/BW2_K_leader.mp3
--- a/Audio/BGM/BattleTrainerK.mp3
+++ b/Audio/BGM/BattleTrainerK.mp3
--- a/Audio/BGM/BattleTrainerK.ogg
+++ b/Audio/BGM/BattleTrainerK.ogg
--- a/Audio/BGM/BattleWildK.ogg
+++ b/Audio/BGM/BattleWildK.ogg
--- a/Audio/BGM/Cave
+++ b/Audio/BGM/Cave
--- a/Audio/BGM/Celadon
+++ b/Audio/BGM/Celadon
--- a/HeartGold-SoulSilver.mp3
+++ b/HeartGold-SoulSilver.mp3
--- a/HeartGold_SoulSilver.mp3
+++ b/HeartGold_SoulSilver.mp3
--- a/Audio/BGM/Credits.mp3
+++ b/Audio/BGM/Credits.mp3
--- a/Audio/BGM/Ecruteak
+++ b/Audio/BGM/Ecruteak
--- a/Audio/BGM/Entrance
+++ b/Audio/BGM/Entrance
--- a/Audio/BGM/Evolution.ogg
+++ b/Audio/BGM/Evolution.ogg
--- a/Audio/BGM/Goldenrod
+++ b/Audio/BGM/Goldenrod
--- a/HeartGold-SoulSilver.mp3
+++ b/HeartGold-SoulSilver.mp3
--- a/Audio/BGM/GymLeaderK.ogg
+++ b/Audio/BGM/GymLeaderK.ogg
--- a/Audio/BGM/INTRO_music_cries.wav
+++ b/Audio/BGM/INTRO_music_cries.wav
--- a/Diamond%2FPearl%2FPlatinum.mp3
+++ b/Diamond%2FPearl%2FPlatinum.mp3
--- a/Audio/BGM/Lavender
+++ b/Audio/BGM/Lavender
--- a/Audio/BGM/Lavender_Town_Pokemon_Tower_Remix.mp3
+++ b/Audio/BGM/Lavender_Town_Pokemon_Tower_Remix.mp3
--- a/Audio/BGM/Legendary
+++ b/Audio/BGM/Legendary
--- a/Audio/BGM/Lostlorn
+++ b/Audio/BGM/Lostlorn
--- a/HeartGold-SoulSilver.mp3
+++ b/HeartGold-SoulSilver.mp3
--- a/Audio/BGM/Mt.
+++ b/Audio/BGM/Mt.
--- a/Audio/BGM/Music
+++ b/Audio/BGM/Music
--- a/Audio/BGM/National
+++ b/Audio/BGM/National
--- a/Audio/BGM/New
+++ b/Audio/BGM/New
--- a/Audio/BGM/Olivine
+++ b/Audio/BGM/Olivine
--- a/Audio/BGM/Opelucid
+++ b/Audio/BGM/Opelucid
--- a/Audio/BGM/Pallet
+++ b/Audio/BGM/Pallet
--- a/HeartGold-SoulSilver.mp3
+++ b/HeartGold-SoulSilver.mp3
--- a/Audio/BGM/Pewter_city.mp3
+++ b/Audio/BGM/Pewter_city.mp3
--- a/Audio/BGM/Plasma
+++ b/Audio/BGM/Plasma
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokemon
+++ b/Audio/BGM/Pokemon
--- a/Audio/BGM/Pokémon
+++ b/Audio/BGM/Pokémon
--- a/HeartGold-SoulSilver.mp3
+++ b/HeartGold-SoulSilver.mp3
--- a/Audio/BGM/Pokémon
+++ b/Audio/BGM/Pokémon
--- a/Audio/BGM/Pokémon
+++ b/Audio/BGM/Pokémon
--- a/Audio/BGM/Pokémon
+++ b/Audio/BGM/Pokémon
--- a/Audio/BGM/Pokémon_The_Origins_-_Rival_Encounter_Music_mp3.mp3
+++ b/Audio/BGM/Pokémon_The_Origins_-_Rival_Encounter_Music_mp3.mp3
--- a/Audio/BGM/Powerplant
+++ b/Audio/BGM/Powerplant
--- a/Audio/BGM/RBY
+++ b/Audio/BGM/RBY
--- a/Audio/BGM/Red
+++ b/Audio/BGM/Red
--- a/Audio/BGM/Reversal
+++ b/Audio/BGM/Reversal
--- a/Audio/BGM/Rock
+++ b/Audio/BGM/Rock
--- a/Audio/BGM/Rocket
+++ b/Audio/BGM/Rocket
--- a/HeartGold-SoulSilver.mp3
+++ b/HeartGold-SoulSilver.mp3
--- a/Audio/BGM/Route
+++ b/Audio/BGM/Route
--- a/Audio/BGM/Route
+++ b/Audio/BGM/Route
--- a/HeartGold-SoulSilver.mp3
+++ b/HeartGold-SoulSilver.mp3
--- a/Audio/BGM/Route
+++ b/Audio/BGM/Route
--- a/Audio/BGM/Route
+++ b/Audio/BGM/Route
--- a/Audio/BGM/Route
+++ b/Audio/BGM/Route
--- a/Audio/BGM/Safari
+++ b/Audio/BGM/Safari
--- a/Audio/BGM/Safari
+++ b/Audio/BGM/Safari
--- a/Audio/BGM/Seafoam
+++ b/Audio/BGM/Seafoam
--- a/Audio/BGM/SubwayTrainerBattle.mp3
+++ b/Audio/BGM/SubwayTrainerBattle.mp3
--- a/Audio/BGM/Surfing
+++ b/Audio/BGM/Surfing
--- a/Audio/BGM/Team
+++ b/Audio/BGM/Team
--- a/Audio/BGM/Trainer's
+++ b/Audio/BGM/Trainer's
--- a/Audio/BGM/Vermilion
+++ b/Audio/BGM/Vermilion
--- a/Audio/BGM/Victory
+++ b/Audio/BGM/Victory
--- a/Audio/BGM/Violet
+++ b/Audio/BGM/Violet
--- a/Audio/BGM/ancientbattle.mp3
+++ b/Audio/BGM/ancientbattle.mp3
--- a/Audio/BGM/band/adjust_volume/band_harp.wav
+++ b/Audio/BGM/band/adjust_volume/band_harp.wav
--- a/Audio/BGM/band/band_1.wav
+++ b/Audio/BGM/band/band_1.wav
--- a/Audio/BGM/band/band_2.wav
+++ b/Audio/BGM/band/band_2.wav
--- a/Audio/BGM/band/band_3a.wav
+++ b/Audio/BGM/band/band_3a.wav
--- a/Audio/BGM/band/band_3b.wav
+++ b/Audio/BGM/band/band_3b.wav
--- a/Audio/BGM/band/band_4.wav
+++ b/Audio/BGM/band/band_4.wav
--- a/Audio/BGM/band/band_5a.wav
+++ b/Audio/BGM/band/band_5a.wav
--- a/Audio/BGM/band/band_5b.wav
+++ b/Audio/BGM/band/band_5b.wav
--- a/Audio/BGM/band/band_full.wav
+++ b/Audio/BGM/band/band_full.wav
--- a/Audio/BGM/band_aguitar.wav
+++ b/Audio/BGM/band_aguitar.wav
--- a/Audio/BGM/band_drums.wav
+++ b/Audio/BGM/band_drums.wav
--- a/Audio/BGM/band_eguitar.wav
+++ b/Audio/BGM/band_eguitar.wav
--- a/Audio/BGM/band_flute.wav
+++ b/Audio/BGM/band_flute.wav
--- a/Audio/BGM/band_harp.wav
+++ b/Audio/BGM/band_harp.wav
--- a/Audio/BGM/champion_blue.mp3
+++ b/Audio/BGM/champion_blue.mp3
--- a/Audio/BGM/cianwood.mp3
+++ b/Audio/BGM/cianwood.mp3
--- a/Audio/BGM/cynthia_battle.mp3
+++ b/Audio/BGM/cynthia_battle.mp3
--- a/Audio/BGM/dpp_legend.mp3
+++ b/Audio/BGM/dpp_legend.mp3
--- a/Audio/BGM/flap.mp3
+++ b/Audio/BGM/flap.mp3
--- a/Audio/BGM/fullmoonIsland.mp3
+++ b/Audio/BGM/fullmoonIsland.mp3
--- a/Audio/BGM/fusion.mp3
+++ b/Audio/BGM/fusion.mp3
--- a/Show More
+++ b/Show More