adds new loading screens

fixes tileset fuckuo
revert temp fix
2026-06-11 14:37:42 +00:00 · 2025-05-05 09:25:26 -04:00 · 2025-04-30 23:20:49 -04:00 · 2025-04-19 22:40:28 -04:00 · 2025-04-19 22:34:21 -04:00 · 2025-04-19 22:31:18 -04:00
777 changed files with 4753 additions and 165534 deletions
@@ -13,5 +13,5 @@ Data/sprites/sprites_rate_limit.log
 Game.rxproj
 .DS_Store
 PBS/*
-Game.rxproj
+Game.exe
 rpgmaker.sh
@@ -0,0 +1,3 @@
+[submodule "Data/Scripts"]
+	path = Data/Scripts
+	url = https://github.com/infinitefusion/scripts.git
@@ -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>
@@ -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>
@@ -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>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
@@ -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/Show More
+++ b/Show More
Author	SHA1	Message	Date
chardub	0ad7b1a899	adds new loading screens	2025-05-05 09:25:26 -04:00
chardub	370814733b	fixes tileset fuckuo	2025-04-30 23:20:49 -04:00
chardub	4bc79de9dd	revert temp fix	2025-04-19 22:40:28 -04:00
chardub	26312dfd6c	temp fix	2025-04-19 22:34:21 -04:00
chardub	53adec3526	fixes police officer not setting azurill	2025-04-19 22:31:18 -04:00
chardub	9dcbf2b910	ignore .git folder when loading scripts	2025-04-19 17:27:42 -04:00
chardub	383ef3f51b	Adds animated flowers graphics	2025-04-19 15:48:01 -04:00
chardub	e4cb1ce6ef	Adds Scripts folder as submodule	2025-04-19 15:45:12 -04:00
chardub	58da1023c1	Remove Scripts folder to convert to submodule	2025-04-19 15:43:57 -04:00
chardub	0807a7ea79	flowers	2025-04-19 15:42:41 -04:00
chardub	86471fbedf	Animated flowers	2025-04-19 14:23:57 -04:00
chardub	5255ce0215	Reapply "Map fixes" This reverts commit `d559b813ed`.	2025-04-19 13:09:08 -04:00
chardub	05bb3f0d76	Updates tilemap renderer for extra autotiles	2025-04-19 13:05:42 -04:00
chardub	d559b813ed	Revert "Map fixes" This reverts commit `423bffaf62`.	2025-04-19 12:25:30 -04:00
chardub	423bffaf62	Map fixes	2025-04-19 12:02:56 -04:00
chardub	ed55f39aab	animated beach shores	2025-04-17 23:25:10 -04:00
chardub	866dbc3502	Merge remote-tracking branch 'origin/develop-6.6' into develop-6.6	2025-04-17 09:48:57 -04:00
chardub	65b3c34009	Fixes hairstyles with more than 4 versions causing players to go bald when swapping hairstyle	2025-04-17 09:48:45 -04:00
infinitefusion	c2d1384785	round icon	2025-04-17 09:40:15 -04:00
infinitefusion	0d5562ffde	updates game icon	2025-04-16 10:45:39 -04:00
chardub	d3a17668e2	change name of game exe	2025-04-16 10:21:54 -04:00
chardub	d917d01d9d	dev function to export tile ids	2025-04-16 10:08:50 -04:00
chardub	cec6847b4e	Fixes crash when trying to unfuse a rental fusion & doduo bellsprout graphics	2025-04-14 19:02:02 -04:00
Payapon	82868b55e8	added seperate cries for all the azubat OWs	2025-04-14 18:09:10 -04:00
chardub	c189472646	reimported azurill sprites	2025-04-14 17:55:11 -04:00
chardub	cf192456ae	Merge branch 'develop-6.6' of https://github.com/infinitefusion/infinitefusion-e18 into develop-6.6	2025-04-14 16:00:46 -04:00
chardub	37cc11d2d1	fixes map connections in cerulean city	2025-04-14 15:57:57 -04:00
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
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