37 Commits

Author SHA1 Message Date
Payapon
9a17e87904 added azumarill crobat OW, small edit to marill golbat OW, dialog changes with the woman who gives you azubat, and adjusted the main azubat event to reflect the filename change 2025-04-14 04:25:03 -04:00
Payapon
4c2f224a3d added OWs for azurill golbat. marill golbat, and azumarill golbat 2025-04-14 02:54:45 -04:00
Payapon
76af4e4e28 azurill zubat, marill zubat, and azumarill zubat OW sprites added 2025-04-13 23:22:25 -04:00
chardub
d668dae55a pokemon orphanage - rocket azubat & removes unused tileset files 2025-04-13 21:47:07 -04:00
chardub
046b1c0835 rpg maker files 2025-04-13 09:54:57 -04:00
chardub
c532cb2d09 Adds more custom pokedex entries 2025-04-12 18:04:08 -04:00
chardub
f2ccaf9eef Adds some new hats 2025-04-12 17:59:44 -04:00
chardub
d8b8fa8723 Removes several unused maps 2025-04-12 17:34:08 -04:00
chardub
90bc6770ff Fixes Goldenrod lottery exploit 2025-04-11 10:27:29 -04:00
chardub
e5e1ec5b0e Map fixes 2025-04-10 19:53:03 -04:00
chardub
9dffb6f99d Adds debug option to set a pokemon's level to current level cap 2025-04-10 19:52:56 -04:00
chardub
9853b8d6e4 Fixes quest icons showing up on invisible events 2025-04-10 19:52:35 -04:00
chardub
be2edbef70 Fixes move remembering issue when unfusing 2025-04-10 19:52:18 -04:00
chardub
e1b6d7e7a9 Fixes move remembering issue when unfusing 2025-04-10 19:52:11 -04:00
chardub
290b6f81d1 Adds menu option for Pokemon to remember any previously learned moves 2025-04-10 09:41:00 -04:00
chardub
80de6b019d Adds debug option to set a Pokémon's level to the current level cap 2025-04-09 12:01:40 -04:00
chardub
eb694dcdb5 Merge remote-tracking branch 'origin/develop-6.6' into develop-6.6 2025-04-08 22:35:54 -04:00
chardub
230b1b86b4 Updated readme 2025-04-08 22:35:30 -04:00
infinitefusion
692a78d041 Merge pull request #96 from KamilaBorowska/allow-changing-gender-of-single-gender-pokemon
Allow changing gender of single gender Pokemon
2025-04-08 21:38:06 -04:00
infinitefusion
fc87f353d7 Merge pull request #122 from Beinmann/make_black_and_white_flute_persist_between_routes
Make black and white flute effects persist when entering a new route
2025-04-08 21:35:47 -04:00
infinitefusion
a0fb092441 Merge pull request #136 from Leischii/options-description-fix
Options UI: Fix descriptions not updating correctly
2025-04-08 21:08:24 -04:00
chardub
a895180ac5 adds missing icon 2025-04-08 21:04:32 -04:00
chardub
f7ff2da270 Adds roadblock to Ilex Forest before obtaining goldenrod badge 2025-04-08 09:58:02 -04:00
Leischii
e6b17bf990 add: initial options update and up/down update trigger 2025-03-30 17:05:30 +02:00
chardub
3f2e23521c Adds non-quest dialog icons 2025-03-30 10:06:56 -04:00
chardub
2594149691 [fix] Adds natures to showdown export 2025-03-26 10:02:42 -04:00
chardub
e5c5cc5a17 quest symbol ressources 2025-03-25 09:52:59 -04:00
chardub
d2d79321b8 amber quest 2025-03-24 21:55:03 -04:00
chardub
2e7c922d95 Adds quest icons & refactors quest ids 2025-03-24 21:23:03 -04:00
chardub
4ea80c50da Fixes quest icon lingering on map transfers 2025-03-24 13:11:02 -04:00
chardub
91449316d5 Quest symbols (WIP) 2025-03-23 23:04:48 -04:00
chardub
0f90a62dba musicians graphics 2025-03-21 21:52:22 -04:00
chardub
5b6751083a Jigglypuff improvements 2025-03-21 10:41:10 -04:00
chardub
4d69d60fbc Different colors for regional & city exclusive outfits in outfits shops 2025-03-20 22:23:31 -04:00
Lukas Gründer
f7d05eca58 Keep black/white flute when entering new route 2024-07-27 23:24:48 +02:00
Lukas Gründer
bd7a15d1fc Make black/white flute toggleable 2024-07-27 23:24:31 +02:00
Konrad Borowski
6af6e448e6 Allow changing gender of single gender Pokemon
Before that change, Gender Stone and Gender Ball didn't actually
do anything with single-gender Pokemon such as Chansey.
2023-07-22 22:58:56 +02:00
401 changed files with 5463 additions and 712 deletions

15
.idea/infinitefusion-e18.iml generated Normal file
View File

@@ -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>

4
.idea/misc.xml generated Normal file
View File

@@ -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>

8
.idea/modules.xml generated Normal file
View File

@@ -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>

6
.idea/vcs.xml generated Normal file
View File

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

76
.idea/workspace.xml generated Normal file
View File

@@ -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>

BIN
Audio/ME/lullaby.mp3 Normal file

Binary file not shown.

BIN
Data/.DS_Store vendored

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.

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.

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.

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.

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
Data/Map101.rxdata 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.

Binary file not shown.

Binary file not shown.

BIN
Data/Map123.rxdata 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.

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.

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.

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.

Binary file not shown.

Binary file not shown.

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