6 Commits

Author SHA1 Message Date
chardub
b3f7bf5e9f Improves evolution animation 2025-04-01 03:22:27 -04:00
chardub
681ab5ab3f cries 2025-04-01 02:51:10 -04:00
chardub
0e6d3bc669 corrupted data - fix 2025-03-31 23:47:50 -04:00
chardub
dafa19fa38 corrupted data 2025-03-26 18:25:57 -04:00
chardub
eba2c7c90c more clown nose 2025-03-26 09:54:16 -04:00
chardub
37938f864b clown nose 2025-03-25 16:37:22 -04:00
8362 changed files with 356663 additions and 135328 deletions

5
.gitignore vendored
View File

@@ -1,7 +1,6 @@
Graphics/CustomBattlers/local_sprites/* Graphics/CustomBattlers/local_sprites/*
Graphics/Battlers/Shiny/*
Graphics/Pokemon/FusionIcons/* Graphics/Pokemon/FusionIcons/*
Graphics/CustomBattlers/spritesheets/* Graphics/CustomBattlers/spritesheets
Graphics/CustomBattlers/* Graphics/CustomBattlers/*
Data/sprites/* Data/sprites/*
Data/VERSION Data/VERSION
@@ -14,5 +13,5 @@ Data/sprites/sprites_rate_limit.log
Game.rxproj Game.rxproj
.DS_Store .DS_Store
PBS/* PBS/*
Game.exe Game.rxproj
rpgmaker.sh rpgmaker.sh

3
.gitmodules vendored
View File

@@ -1,3 +0,0 @@
[submodule "Data/Scripts"]
path = Data/Scripts
url = https://github.com/infinitefusion/scripts.git

View File

@@ -1,15 +0,0 @@
<?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>

4
.idea/misc.xml generated
View File

@@ -1,4 +0,0 @@
<?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>

8
.idea/modules.xml generated
View File

@@ -1,8 +0,0 @@
<?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>

6
.idea/vcs.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

76
.idea/workspace.xml generated
View File

@@ -1,76 +0,0 @@
<?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>

BIN
Audio/BGM/BLAZIKEN.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/GENGAR.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/MISSINGNO.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/NIDORINO.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/Pallet Town.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/corrupted.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/pokecenter.wav Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/underwater.wav Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ABRA.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ABSOL.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/AGGRON.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/AIPOM.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ALAKAZAM.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ALTARIA.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/AMAURA.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/AMBIPOM.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/AMPHAROS.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ANORITH.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ARBOK.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ARCANINE.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ARCANINE.wav Normal file

Binary file not shown.

BIN
Audio/SE/Cries/ARCEUS.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ARCEUS.wav Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ARIADOS.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ARMALDO.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ARON.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/ARTICUNO.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/AURORUS.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Cries/AXEW.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More