wip

This reverts commit d304d223bd.

.gitignore

@@ -1,8 +0,0 @@
-
-Graphics/Battlers_resized/*
-Graphics/CustomBattlers/*
-Graphics/Battlers/*
-Graphics/Pokemon/FusionIcons/*
-Data/SPRITE_CREDS
-Data/VERSION
- 

Credits.txt

@@ -1,5 +1,5 @@
 ##########		CREDITS	         ###############
-Game made by Chardub
+Game made by Frogman
 
 *This is NOT an official Pokemon game. The author of this game is not 
 affiliated with Nintendo in any way 
@@ -7,22 +7,21 @@ affiliated with Nintendo in any way
 ##################################
 ##	Programming  / Events  ##
 #################################
-Chardub
+Frogman
 
 ##############################
-##	Maps		    		##
+##	Maps		    ##
 ##############################	
-Chardub, Kiwikelly
+Frogman
 
 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	#
+#	Story / Dialogies	#
 #################################
-Chardub
+Frogman 
-Kiwikelly
 The story and dialogues were based off Pokémon Red and Blue, as well as
 Pokémon Gold and Silver. Both games are made by Game Freak.
 
@@ -41,31 +40,17 @@ 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
+Special thanks to Aegide for helping to rip the sprites from the website
 and to the owners of the respective fusion websites for accepting to share
 their sprites.
 
 Intro cinamatic
 #####################
-Kiwikelly
+Kiwi
-
-
-Custom sprites collecting and handling
-Kiwikelly, Payapon, Thornsoflight
-
-Discord custom sprites coordination
-avianAnnihilator<s>Blaquaza
-BéBoutton<s>CaBiNE
-CoramSun<s>hero.drawing
-Howls<s>Ignus
-Kiwi<s>Maelmc
-Milchik the Miltank<s>Payapon
-Pix<s>Rosemagwin
-Thornsoflight
 
 Custom fusion sprites
 #####################
-As of 06-09-2022, ordered by number of contributions. Check the Data/SPRITE_CREDS file for full, up to date credits
+As of 06-09-2022, ordered by number of contributions
 
 Toad 900#1617, Kiwi#4199, Aquatic#7954, Knuckles3&Knuckles#7559, Katten#7455, Blaquaza#1347, 
 Blackboots#7369, Milchik#6233, Deleted User#0000, Gdei#2810, Universez#0767, Scarecrow_924#8531,
@@ -204,36 +189,41 @@ The following ressources were also used
 with their respective authors' consent
 #######################################################################
 ### Sprites ###
+	Mega evolution sprites
+		The Smogon XY Sprite Project:
+		Nosciu, Layell, Branflakes325, , Sleet, TrainerSplash, Noscium, Wobblebuns,
+		Bynine, Arkeis, Legitimate Username, Mos_Quitoxe, Wyverii, ThatGuyYouKnow,
+		aXl, RedRooster, TeraVolt, Dleep, CoolStoryBoat,, TheCynicalPoet,
+		Brylark, Kyuzeth, Quanyails, princess-phoenix
 
-
+		Smogon Sun/Moon Sprite Project:
+		https://www.smogon.com/forums/threads/sun-moon-sprite-project.3577711/
+		leParagon, aXl, Layell, fishbowlsoul
+	
 	Overworld Sprites:
-		Custom graphics:
-		Kiwikelly, Knuckles, UnworthyPie
-
-		Free use graphics:
 		Rick1234 (BW overworld sprites)
 		Hankiro (Oak backsprite) 		http://s296.photobucket.com/user/Hankiro/media/ProfOakBackSprite.png.html
 		SailorVicious (Prof. Elm OW sprite) 	https://www.deviantart.com/sailorvicious
 		OceansLugiaSpirit (Koga OW sprite)  	http://oceanslugiaspirit.deviantart.com/
-
+		Knuckles (Kurt OW sprite)
+		UnworthyPie (Bruno and Agatha OW sprites)
 	Battle sprites: 
-		Custom graphics:
-		Kiwikelly, UnworthyPie
-
-		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
+		Kiwi (Kurt battle sprite)
+		UnworthyPie (Bruno battle sprite, Lance backsprite)
 		
-### Custom tileset graphics ###
+	Triple Fusion sprites
-Kiwikelly
+		Tom spiste grønt
-
+		Scrapped Bones
-
+		Blackboot
-### Public tileset graphics ### 
+		Kiwi
+		Solo Queue
+### Tileset graphics ### 
 	Jorginho (OutsideEmerald)
 	ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
 	DirtyWiggles (Gen 5 tileset) http://dirtywiggles.deviantart.com/art/RPG-Maker-Friendly-Tileset-5-0-generation-5-tiles-683576419
-	aveontrainer
+
-	princess-phoenix	https://www.deviantart.com/princess-phoenix/art/Fossil-Museum-Tileset-780178878
 	The Public Pokemon Tileset (Assembled by ThatsSoWitty) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
 	Includes tiles by the following DeviantArt users (in no specific order):
    		kyle-dove, rayd12smitty, Speedialga, Spacemotion, Alucus ,Pokemon-Diamond, kizemaru-kurunosuke, EpicDay,
@@ -244,7 +234,7 @@ Kiwikelly
 	tiles to be used in this pack.
 
 	Other tiles:
-		Chardub, chimcharsfireworkd, Rossay, Shiney570,
+		Frogman, chimcharsfireworkd, Rossay, Shiney570,
 		Phyromatical, Gallanty (deviantart)
 
 ### Music ###				

Data/.idea/codeStyles/Project.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="FORMATTER_TAGS_ENABLED" value="true" />
-  </code_scheme>
-</component>

Data/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>