more qa

hat name fix redux
hat name fix
2025-12-06 06:01:46 +00:00 · 2025-09-28 15:37:39 -04:00 · 2025-09-28 14:01:01 -04:00 · 2025-09-28 14:00:09 -04:00 · 2025-09-28 13:53:35 -04:00 · 2025-09-27 18:32:13 -04:00
15225 changed files with 586472 additions and 600992 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,18 @@
-/*
+Graphics/CustomBattlers/local_sprites/*
-!/Data/Scripts/
+Graphics/Battlers/Shiny/*
-!/Data/Scripts/**
+Graphics/Pokemon/FusionIcons/*
 Graphics/CustomBattlers/spritesheets/*
 Graphics/CustomBattlers/*
 Data/sprites/*
 Data/VERSION
 infinitefusion.sh
 Data/sprites/CUSTOM_SPRITES
 Data/sprites
 Data/sprites/updated_spritesheets_cache
 Data/sprites/sprites_rate_limit.log
 .gitignore
 Game.rxproj
 .DS_Store
 PBS/*
 Game.exe
 rpgmaker.sh
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
 [submodule "Data/Scripts"]
 	path = Data/Scripts
 	url = https://github.com/infinitefusion/scripts.git
--- a/.idea/infinitefusion-e18.iml
+++ b/.idea/infinitefusion-e18.iml
@@ -0,0 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RUBY_MODULE" version="4">
  <component name="ModuleRunConfigurationManager">
    <shared />
  </component>
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ProjectRootManager" version="2" project-jdk-name="ruby-2.6.10-p210" project-jdk-type="RUBY_SDK" />
 </project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/.idea/infinitefusion-e18.iml" filepath="$PROJECT_DIR$/.idea/infinitefusion-e18.iml" />
    </modules>
  </component>
 </project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
  </component>
 </project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -0,0 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="59b847cf-c39b-4afd-803a-38eea744d77a" name="Changes" comment="">
      <change beforePath="$PROJECT_DIR$/Data/Map237.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Map237.rxdata" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Data/Map276.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Map276.rxdata" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Data/Map277.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Map277.rxdata" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Data/MapInfos.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/MapInfos.rxdata" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Data/Scripts/004_Game classes/002_Game_System.rb" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Scripts/004_Game classes/002_Game_System.rb" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Data/Scripts/DownloadedSettings.rb" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Scripts/DownloadedSettings.rb" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Data/System.rxdata" beforeDir="false" afterPath="$PROJECT_DIR$/Data/System.rxdata" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Data/sprites/BASE_SPRITES" beforeDir="false" afterPath="$PROJECT_DIR$/Data/sprites/BASE_SPRITES" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Data/sprites/CUSTOM_SPRITES" beforeDir="false" afterPath="$PROJECT_DIR$/Data/sprites/CUSTOM_SPRITES" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
  <component name="GitHubPullRequestSearchHistory"><![CDATA[{
  "lastFilter": {
    "state": "OPEN",
    "assignee": "infinitefusion"
  }
 }]]></component>
  <component name="GithubPullRequestsUISettings"><![CDATA[{
  "selectedUrlAndAccountId": {
    "url": "https://github.com/infinitefusion/infinitefusion-e18.git",
    "accountId": "2b6eb7d6-790c-4e30-967d-bfb420050830"
  }
 }]]></component>
  <component name="ProjectColorInfo"><![CDATA[{
  "associatedIndex": 2
 }]]></component>
  <component name="ProjectId" id="2vRvDbTuifxaPtCcwMIlmzF9kqX" />
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "RunOnceActivity.git.unshallow": "true",
    "git-widget-placeholder": "develop-6.6",
    "last_opened_file_path": "/Users/chardub/Documents/infinitefusion/infinitefusion-release/infinitefusion-e18",
    "nodejs_package_manager_path": "npm",
    "vue.rearranger.settings.migration": "true"
  }
 }]]></component>
  <component name="SharedIndexes">
    <attachedChunks>
      <set>
        <option value="bundled-js-predefined-d6986cc7102b-822845ee3bb5-JavaScript-RM-243.23654.167" />
      </set>
    </attachedChunks>
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
  <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="true" RAILS_SPRING_PRE_LOADER_OPTION="true" />
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
      <changelist id="59b847cf-c39b-4afd-803a-38eea744d77a" name="Changes" comment="" />
      <created>1744120584178</created>
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1744120584178</updated>
      <workItem from="1744120585282" duration="16000" />
    </task>
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  </component>
 </project>
--- a/Audio/BGM/Hall
+++ b/Audio/BGM/Hall
--- a/Audio/BGM/Route
+++ b/Audio/BGM/Route
--- a/Audio/BGM/SSANNE.ogg
+++ b/Audio/BGM/SSANNE.ogg
--- 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/bicycle.mp3
+++ b/Audio/BGM/bicycle.mp3
--- a/Audio/BGM/eusine.mp3
+++ b/Audio/BGM/eusine.mp3
--- a/Audio/BGM/flap.mp3
+++ b/Audio/BGM/flap.mp3
--- a/Audio/BGM/fullmoonIsland.mp3
+++ b/Audio/BGM/fullmoonIsland.mp3
--- a/Audio/BGM/gym_kanto.mp3
+++ b/Audio/BGM/gym_kanto.mp3
--- a/Audio/BGM/lake_crater.mp3
+++ b/Audio/BGM/lake_crater.mp3
--- a/Audio/BGM/lake_crater_short.mp3
+++ b/Audio/BGM/lake_crater_short.mp3
--- a/Audio/BGM/meloetta_song.mp3
+++ b/Audio/BGM/meloetta_song.mp3
--- a/Audio/BGM/newmoonIsland.mp3
+++ b/Audio/BGM/newmoonIsland.mp3
--- a/Audio/BGM/police_interrogation.mp3
+++ b/Audio/BGM/police_interrogation.mp3
--- a/Audio/BGM/route1.mp3
+++ b/Audio/BGM/route1.mp3
--- a/Audio/BGM/route38_39.mp3
+++ b/Audio/BGM/route38_39.mp3
--- a/Audio/BGM/safari.ogg
+++ b/Audio/BGM/safari.ogg
--- a/Audio/BGM/scary_ambient.mp3
+++ b/Audio/BGM/scary_ambient.mp3
--- a/Audio/BGM/ultra_metropolis.mp3
+++ b/Audio/BGM/ultra_metropolis.mp3
--- a/Audio/BGM/uwater_short.ogg
+++ b/Audio/BGM/uwater_short.ogg
--- a/Audio/ME/Pkmn
+++ b/Audio/ME/Pkmn
--- a/Audio/ME/coloseum_theme..mp3
+++ b/Audio/ME/coloseum_theme..mp3
--- a/Audio/ME/lullaby.mp3
+++ b/Audio/ME/lullaby.mp3
--- a/Audio/ME/rocketQuest.ogg
+++ b/Audio/ME/rocketQuest.ogg
--- a/Audio/ME/spotted_police.mp3
+++ b/Audio/ME/spotted_police.mp3
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/Battle
+++ b/Audio/SE/Battle
--- a/Audio/SE/CARBINK.ogg
+++ b/Audio/SE/CARBINK.ogg
--- a/Audio/SE/Cries/ABOMASNOW.ogg
+++ b/Audio/SE/Cries/ABOMASNOW.ogg
--- a/Audio/SE/Cries/ABOMASNOW.wav
+++ b/Audio/SE/Cries/ABOMASNOW.wav
--- a/Audio/SE/Cries/ABOMASNOW_1.ogg
+++ b/Audio/SE/Cries/ABOMASNOW_1.ogg
--- a/Audio/SE/Cries/ABRA.ogg
+++ b/Audio/SE/Cries/ABRA.ogg
--- a/Audio/SE/Cries/ABRA.wav
+++ b/Audio/SE/Cries/ABRA.wav
--- a/Audio/SE/Cries/ABSOL.ogg
+++ b/Audio/SE/Cries/ABSOL.ogg
--- a/Audio/SE/Cries/ABSOL.wav
+++ b/Audio/SE/Cries/ABSOL.wav
--- a/Audio/SE/Cries/ABSOL_1.ogg
+++ b/Audio/SE/Cries/ABSOL_1.ogg
--- a/Audio/SE/Cries/ACCELGOR.ogg
+++ b/Audio/SE/Cries/ACCELGOR.ogg
--- a/Audio/SE/Cries/ACCELGOR.wav
+++ b/Audio/SE/Cries/ACCELGOR.wav
--- a/Audio/SE/Cries/AEGISLASH.ogg
+++ b/Audio/SE/Cries/AEGISLASH.ogg
--- a/Audio/SE/Cries/AEGISLASH.wav
+++ b/Audio/SE/Cries/AEGISLASH.wav
--- a/Audio/SE/Cries/AERODACTYL.ogg
+++ b/Audio/SE/Cries/AERODACTYL.ogg
--- a/Audio/SE/Cries/AERODACTYL.wav
+++ b/Audio/SE/Cries/AERODACTYL.wav
--- a/Audio/SE/Cries/AERODACTYL_1.ogg
+++ b/Audio/SE/Cries/AERODACTYL_1.ogg
--- a/Audio/SE/Cries/AGGRON.ogg
+++ b/Audio/SE/Cries/AGGRON.ogg
--- a/Audio/SE/Cries/AGGRON.wav
+++ b/Audio/SE/Cries/AGGRON.wav
--- a/Audio/SE/Cries/AGGRON_1.ogg
+++ b/Audio/SE/Cries/AGGRON_1.ogg
--- a/Audio/SE/Cries/AIPOM.ogg
+++ b/Audio/SE/Cries/AIPOM.ogg
--- a/Audio/SE/Cries/AIPOM.wav
+++ b/Audio/SE/Cries/AIPOM.wav
--- a/Audio/SE/Cries/ALAKAZAM.ogg
+++ b/Audio/SE/Cries/ALAKAZAM.ogg
--- a/Audio/SE/Cries/ALAKAZAM.wav
+++ b/Audio/SE/Cries/ALAKAZAM.wav
--- a/Audio/SE/Cries/ALAKAZAM_1.ogg
+++ b/Audio/SE/Cries/ALAKAZAM_1.ogg
--- a/Audio/SE/Cries/ALCREMIE.ogg
+++ b/Audio/SE/Cries/ALCREMIE.ogg
--- a/Audio/SE/Cries/ALOMOMOLA.ogg
+++ b/Audio/SE/Cries/ALOMOMOLA.ogg
--- a/Audio/SE/Cries/ALOMOMOLA.wav
+++ b/Audio/SE/Cries/ALOMOMOLA.wav
--- a/Audio/SE/Cries/ALTARIA.ogg
+++ b/Audio/SE/Cries/ALTARIA.ogg
--- a/Audio/SE/Cries/ALTARIA.wav
+++ b/Audio/SE/Cries/ALTARIA.wav
--- a/Audio/SE/Cries/ALTARIA_1.ogg
+++ b/Audio/SE/Cries/ALTARIA_1.ogg
--- a/Audio/SE/Cries/AMAURA.ogg
+++ b/Audio/SE/Cries/AMAURA.ogg
--- a/Audio/SE/Cries/AMBIPOM.ogg
+++ b/Audio/SE/Cries/AMBIPOM.ogg
--- a/Audio/SE/Cries/AMBIPOM.wav
+++ b/Audio/SE/Cries/AMBIPOM.wav
--- a/Audio/SE/Cries/AMOONGUSS.ogg
+++ b/Audio/SE/Cries/AMOONGUSS.ogg
--- a/Audio/SE/Cries/AMOONGUSS.wav
+++ b/Audio/SE/Cries/AMOONGUSS.wav
--- a/Audio/SE/Cries/AMPHAROS.ogg
+++ b/Audio/SE/Cries/AMPHAROS.ogg
--- a/Audio/SE/Cries/AMPHAROS.wav
+++ b/Audio/SE/Cries/AMPHAROS.wav
--- a/Audio/SE/Cries/AMPHAROS_1.ogg
+++ b/Audio/SE/Cries/AMPHAROS_1.ogg
--- a/Audio/SE/Cries/ANORITH.ogg
+++ b/Audio/SE/Cries/ANORITH.ogg
--- a/Audio/SE/Cries/ANORITH.wav
+++ b/Audio/SE/Cries/ANORITH.wav
--- a/Audio/SE/Cries/APPLETUN.ogg
+++ b/Audio/SE/Cries/APPLETUN.ogg
--- a/Audio/SE/Cries/APPLIN.ogg
+++ b/Audio/SE/Cries/APPLIN.ogg
--- a/Audio/SE/Cries/ARAQUANID.ogg
+++ b/Audio/SE/Cries/ARAQUANID.ogg
--- a/Audio/SE/Cries/ARBOK.ogg
+++ b/Audio/SE/Cries/ARBOK.ogg
--- a/Show More
+++ b/Show More