whirl islands map

.gitignore

@@ -1,18 +1,5 @@
-Graphics/CustomBattlers/local_sprites/*
+
-Graphics/Battlers/Shiny/*
 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

.gitmodules

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

.idea/infinitefusion-e18.iml

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

.idea/misc.xml

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

.idea/modules.xml

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

.idea/vcs.xml

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

.idea/workspace.xml

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

Credits.txt

@@ -1,5 +1,4 @@
 ##########		CREDITS	         ###############
-Pok?mon Infinite Fusion & Pok?mon Infinite Fusion: Hoenn
 Game made by Chardub
 
 *This is NOT an official Pokemon game. The author of this game is not 
@@ -13,29 +12,19 @@ Chardub
 ##############################
 ##	Maps		    		##
 ##############################	
-Chardub, Kiwikelly, Payapon
+Chardub, Kiwikelly
+
+Some of the maps were based on work by:
+BenGames,Films, and More! (Pokemon Adventures in Kanto) http://www.pokecommunity.com/showthread.php?t=303850
+Zeak6464 (Kanto Map pack) http://www.pokecommunity.com/showthread.php?t=345591
 
 #################################
 #	Story / Dialogues	#
 #################################
 Chardub
 Kiwikelly
-The story and dialogues were based off Pok?mon Ruby, Sapphire and Emerald, as well as Pok?mon
+The story and dialogues were based off Pok<EFBFBD>mon Red and Blue, as well as
-Omega Ruby and Alpha Sapphire, which are all made by Game Freak.
+Pok<EFBFBD>mon Gold and Silver. Both games are made by Game Freak.
-
-##############################
-##	Music		    							##
-##############################	
-Pory
-
-##############################
-## Animation									##
-#############################
--- Intro cinematic animation --
-Kiwikelly
-
-
-
 
 ###########################################################
 ###	Fusion Sprites										###
@@ -46,77 +35,47 @@ Generated Sprites
 Pokefusion 2 (version 4.5+)
 http://japeal.com/pkm
 
+Pokefusion (version 4.0-4.4)
+http://pokefusion.japeal.com/
+
+Alexonsager (version 3.x and below) 
+http://pokemon.alexonsager.net/
+
 Special thanks to Aegide and Reizod for helping to rip the sprites from the website
 and to the owners of the respective fusion websites for accepting to share
 their sprites.
 
-Custom sprites
+Intro cinamatic
 #####################
-Individual sprite credits can be found in Data/SPRITE_CREDS file for full, up to date credits
+Kiwikelly
+
 
 Custom sprites collecting and handling
 Kiwikelly, Payapon, Thornsoflight
 
 Discord custom sprites coordination
---- Sprite Managers ---
 avianAnnihilator<s>Blaquaza
-BBoutton<s>CaBiNE
+B<EFBFBD>Boutton<s>CaBiNE
 CoramSun<s>hero.drawing
-Howlingstarr<s>Ignus
+Howls<s>Ignus
 Kiwi<s>Maelmc
 Milchik the Miltank<s>Payapon
 Pix<s>Rosemagwin
-Thornsoflight<s>FauxBlue
+Thornsoflight
 
-### Spriter application reviews (Klefki)
+Custom fusion sprites
-007z3lda<s>barkey<s>the_cardinals
+#####################
-doodledoo<s>grafaiguy<s>gummy.frog
+Check the Data/SPRITE_CREDS file for full, up to date credits
-holgast<s>ignust<s>jcobe800
-markusknight<s>monolithyk<s>stickieanimates
-takopus<s>_woofa_<s>yumatei
-
-### Sprites quality assurance (Chansey)
-dodoowner_<s>fauxblue<s>fioretovi
-<greystorm101<s>.payapon<s>smasllcutekitty
-odditylad<s>midnightender6<s>toadettexmushina
-
-### Spriting process checking (Swablu)
-cataylor_01<s>pikahunter07<s>say_4732
-justvince.<s>
-
-### Abandoned sprites harvesting (Zigzagoon)
-_testrun_<s>greystorm101<s>.izik
-mystora<s>reddevil85<s>riberna
-chespining<s>togepimax
 
 
+Triple fusion sprites
+########################
+Legendary birds fusion sprite by Universez
+Legendary beasts fusion sprite by Milchik
+Weather trio fusion sprite by magnuzone
+Creation and Tao trio trio fusion sprite by mammuth89
 
 
-###################################
-###	Game quality assurance					###
-###################################
-### Tech support and bugs reporting management 
-sapphire_chuu<s>megaman.
-ymirbot<s>
-
-### Tech support and bugs reporting(Porygon)
-sapphire_chu<s>ernesto_gaming<s>xiaoanemo
-kitsuwren<s>lunarcharlotte<s>megaman.
-casinoluck<s>ymirbot
-
-
-
-###################################
-###	Custom Pok?dex entries					###
-###################################
-### Pok?dex entries quality control (Unown)
-luvischlo<s>char_latte3412<s>strawbearycandy
-bobosmith01<s>griddle<s>.izik
-knilk<s>lordjoostmeister<s>.realthree
-wigglypon<s>wildheartrazorfangs<s>ziggaway
-
-### Individual Pok?dex entries credits can be found in Data/pokedex/dex.json 
-
 ###########################################################
 ####		Pokemon Essentials			 ###
 ###########################################################
@@ -139,19 +98,14 @@ Gen 4 Legendary trio eggs by calicorn
 Nintendo
 GameFreak
 
-###########################################################
-###	French translation  #
-###########################################################
-anthonygourmand
-locpic_
-blood.wolf58 (Willi)
-ragzzh
 
 #######################################################################
 The following ressources were also used 
 with their respective authors' consent
 #######################################################################
 ### Sprites ###
+
+
 	Overworld Sprites:
 		Custom graphics:
 		Kiwikelly, Knuckles, UnworthyPie
@@ -162,10 +116,7 @@ with their respective authors' consent
 		SailorVicious (Prof. Elm OW sprite) 	https://www.deviantart.com/sailorvicious
 		OceansLugiaSpirit (Koga OW sprite)  	http://oceanslugiaspirit.deviantart.com/
 		Wolfang62: https://www.deviantart.com/wolfang62/art/Wimpod-Sprite-Overworld-836704744
-		zender1752 (Sabrina OW sprite)	https://www.deviantart.com/zender1752/art/Pokemon-Anime-Delia-Ketchum-Overworld-sprite-840038766
+
-		wesleyfg (Hoenn overworld NPCs) https://www.deviantart.com/wesleyfg/art/Hoenn-People-OW-in-BW-style-274475232
-		Wergan https://www.deviantart.com/wergan/art/Pokemon-Random-characters-002-959395621
-		TooManyLuigis, Mortedes, Billla,WolfPP: Golurk overworld sprite https://www.deviantart.com/wolfang62/art/Golurk-Sprite-Overworld-834611476
 	Battle sprites: 
 		Custom graphics:
 		Kiwikelly, UnworthyPie
@@ -173,9 +124,6 @@ with their respective authors' consent
 		Free use graphics:
 		luckygirl88  (Misty VS sprite) 		http://luckygirl88.deviantart.com/art/Pokemon-BW-Misty-Sprite-Sheet-268364830
 		Lorelei VS sprite by Nalty 		http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
-		x-5-4-5-2 (Sabrina sprite) 		https://www.deviantart.com/x-5-4-5-2/art/Game-Sabrina-204548703
-		
-		Zender1752 	(overworld mom sprite) 	https://www.deviantart.com/zender1752/art/Pokemon-Anime-Delia-Ketchum-Overworld-sprite-840038766
 		
 ### Custom tileset graphics ###
 Kiwikelly
@@ -225,7 +173,7 @@ audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FR
 
 
 ### Other graphics			
-Hoenn map: shivanking (Deviantart)
+Region map: Kiwikelly
 Move animations:
 
 	Augmented Reborn Animations Project

Data/.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/Scripts" vcs="Git" />
   </component>
 </project>