removes game-default

Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases
updates gitignore
2025-12-06 06:01:46 +00:00 · 2024-12-21 10:44:07 -05:00 · 2024-12-21 10:42:12 -05:00 · 2024-12-21 10:37:49 -05:00 · 2024-12-21 10:34:52 -05:00 · 2024-12-21 10:25:30 -05:00
5977 changed files with 441518 additions and 256691 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
-Graphics/Battlers/*
-Graphics/Battlers_resized/*
 Graphics/CustomBattlers/*
 Graphics/Battlers/*
 Graphics/Pokemon/FusionIcons/*
-Data/SPRITE_CREDS
+Data/pokedex/*
+Data/sprites/*
 Data/VERSION
 
--- a/Audio/BGM/eusine.mp3
+++ b/Audio/BGM/eusine.mp3
--- a/Audio/BGM/gym_kanto.mp3
+++ b/Audio/BGM/gym_kanto.mp3
--- a/Audio/BGM/police_interrogation.mp3
+++ b/Audio/BGM/police_interrogation.mp3
--- a/Audio/ME/Pkmn
+++ b/Audio/ME/Pkmn
--- a/Audio/ME/coloseum_theme..mp3
+++ b/Audio/ME/coloseum_theme..mp3
--- a/Audio/ME/rocketQuest.ogg
+++ b/Audio/ME/rocketQuest.ogg
--- a/Audio/ME/spotted_police.mp3
+++ b/Audio/ME/spotted_police.mp3
--- a/Audio/SE/CARBINK.ogg
+++ b/Audio/SE/CARBINK.ogg
--- a/Audio/SE/DIANCIE.ogg
+++ b/Audio/SE/DIANCIE.ogg
--- a/Audio/SE/Elevator
+++ b/Audio/SE/Elevator
--- a/Audio/SE/Elevator
+++ b/Audio/SE/Elevator
--- a/Audio/SE/Elevator
+++ b/Audio/SE/Elevator
--- a/Audio/SE/Flee.WAV
+++ b/Audio/SE/Flee.WAV
--- a/Audio/SE/Pika.wav
+++ b/Audio/SE/Pika.wav
--- a/Audio/SE/Pkmn
+++ b/Audio/SE/Pkmn
--- a/Audio/SE/whistle.ogg
+++ b/Audio/SE/whistle.ogg
--- a/Credits.txt
+++ b/Credits.txt
@@ -115,6 +115,7 @@ with their respective authors' consent
 		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/
+		Wolfang62: https://www.deviantart.com/wolfang62/art/Wimpod-Sprite-Overworld-836704744

 	Battle sprites: 
 		Custom graphics:
@@ -131,6 +132,9 @@ Kiwikelly
 TCGrunler#4583
 elupsis

+### Battle type icons ###
+audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FREE-TO-USE-909562921
+
 ### Public tileset graphics ### 
 	Jorginho (OutsideEmerald)
 	ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
@@ -202,6 +206,7 @@ Marin				Better maps script	https://www.pokecommunity.com/showthread.php?t=41129
 barafanatic			Safari Zone improvements
 M3rein				Easy Questing System 
 bo4p5687			Multisave
+Vizualise			In-battle type icons (adapted from) https://github.com/Vizualyse/PokemonInfiniteFusion-EnemyTypesMod


 #### Data sources ###			  
--- a/Data/.idea/.gitignore
+++ b/Data/.idea/.gitignore
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/../../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\dynamic-fusions\infinitefusion-e18\Data\.idea/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
--- a/Data/.idea/Data.iml
+++ b/Data/.idea/Data.iml
@@ -1,11 +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$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/Data/.idea/codeStyles/Project.xml
+++ b/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>
--- a/Data/.idea/codeStyles/codeStyleConfig.xml
+++ b/Data/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/Data/.idea/modules.xml
+++ b/Data/.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/Data.iml" filepath="$PROJECT_DIR$/.idea/Data.iml" />
-    </modules>
-  </component>
-</project>
--- a/Data/.idea/vcs.xml
+++ b/Data/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
--- a/Data/Animations.rxdata
+++ b/Data/Animations.rxdata
--- a/Data/CommonEvents.rxdata
+++ b/Data/CommonEvents.rxdata
--- a/Data/Map001.rxdata
+++ b/Data/Map001.rxdata
--- a/Data/Map002.rxdata
+++ b/Data/Map002.rxdata
--- a/Data/Map004.rxdata
+++ b/Data/Map004.rxdata
--- a/Data/Map006.rxdata
+++ b/Data/Map006.rxdata
--- a/Data/Map008.rxdata
+++ b/Data/Map008.rxdata
--- a/Data/Map009.rxdata
+++ b/Data/Map009.rxdata
--- a/Data/Map010.rxdata
+++ b/Data/Map010.rxdata
--- a/Data/Map011.rxdata
+++ b/Data/Map011.rxdata
--- a/Data/Map013.rxdata
+++ b/Data/Map013.rxdata
--- a/Data/Map014.rxdata
+++ b/Data/Map014.rxdata
--- a/Data/Map015.rxdata
+++ b/Data/Map015.rxdata
--- a/Data/Map016.rxdata
+++ b/Data/Map016.rxdata
--- a/Data/Map017.rxdata
+++ b/Data/Map017.rxdata
--- a/Data/Map018.rxdata
+++ b/Data/Map018.rxdata
--- a/Data/Map019.rxdata
+++ b/Data/Map019.rxdata
--- a/Data/Map021.rxdata
+++ b/Data/Map021.rxdata
--- a/Data/Map023.rxdata
+++ b/Data/Map023.rxdata
--- a/Data/Map024.rxdata
+++ b/Data/Map024.rxdata
--- a/Data/Map026.rxdata
+++ b/Data/Map026.rxdata
--- a/Data/Map027.rxdata
+++ b/Data/Map027.rxdata
--- a/Data/Map029.rxdata
+++ b/Data/Map029.rxdata
--- a/Data/Map030.rxdata
+++ b/Data/Map030.rxdata
--- a/Data/Map031.rxdata
+++ b/Data/Map031.rxdata
--- a/Data/Map034.rxdata
+++ b/Data/Map034.rxdata
--- a/Data/Map035.rxdata
+++ b/Data/Map035.rxdata
--- a/Data/Map036.rxdata
+++ b/Data/Map036.rxdata
--- a/Data/Map040.rxdata
+++ b/Data/Map040.rxdata
--- a/Data/Map041.rxdata
+++ b/Data/Map041.rxdata
--- a/Data/Map042.rxdata
+++ b/Data/Map042.rxdata
--- a/Data/Map043.rxdata
+++ b/Data/Map043.rxdata
--- a/Data/Map045.rxdata
+++ b/Data/Map045.rxdata
--- a/Data/Map046.rxdata
+++ b/Data/Map046.rxdata
--- a/Data/Map047.rxdata
+++ b/Data/Map047.rxdata
--- a/Data/Map049.rxdata
+++ b/Data/Map049.rxdata
--- a/Data/Map050.rxdata
+++ b/Data/Map050.rxdata
--- a/Data/Map051.rxdata
+++ b/Data/Map051.rxdata
--- a/Data/Map056.rxdata
+++ b/Data/Map056.rxdata
--- a/Data/Map057.rxdata
+++ b/Data/Map057.rxdata
--- a/Data/Map058.rxdata
+++ b/Data/Map058.rxdata
--- a/Data/Map059.rxdata
+++ b/Data/Map059.rxdata
--- a/Data/Map060.rxdata
+++ b/Data/Map060.rxdata
--- a/Data/Map063.rxdata
+++ b/Data/Map063.rxdata
--- a/Data/Map064.rxdata
+++ b/Data/Map064.rxdata
--- a/Data/Map065.rxdata
+++ b/Data/Map065.rxdata
--- a/Data/Map066.rxdata
+++ b/Data/Map066.rxdata
--- a/Data/Map072.rxdata
+++ b/Data/Map072.rxdata
--- a/Data/Map074.rxdata
+++ b/Data/Map074.rxdata
--- a/Data/Map075.rxdata
+++ b/Data/Map075.rxdata
--- a/Data/Map076.rxdata
+++ b/Data/Map076.rxdata
--- a/Data/Map077.rxdata
+++ b/Data/Map077.rxdata
--- a/Data/Map078.rxdata
+++ b/Data/Map078.rxdata
--- a/Data/Map079.rxdata
+++ b/Data/Map079.rxdata
--- a/Data/Map080.rxdata
+++ b/Data/Map080.rxdata
--- a/Data/Map081.rxdata
+++ b/Data/Map081.rxdata
--- a/Data/Map082.rxdata
+++ b/Data/Map082.rxdata
--- a/Data/Map085.rxdata
+++ b/Data/Map085.rxdata
--- a/Data/Map086.rxdata
+++ b/Data/Map086.rxdata
--- a/Data/Map088.rxdata
+++ b/Data/Map088.rxdata
--- a/Data/Map090.rxdata
+++ b/Data/Map090.rxdata
--- a/Data/Map095.rxdata
+++ b/Data/Map095.rxdata
--- a/Data/Map096.rxdata
+++ b/Data/Map096.rxdata
--- a/Data/Map098.rxdata
+++ b/Data/Map098.rxdata
--- a/Data/Map099.rxdata
+++ b/Data/Map099.rxdata
--- a/Data/Map101.rxdata
+++ b/Data/Map101.rxdata
--- a/Data/Map102.rxdata
+++ b/Data/Map102.rxdata
--- a/Data/Map105.rxdata
+++ b/Data/Map105.rxdata
--- a/Data/Map106.rxdata
+++ b/Data/Map106.rxdata
--- a/Data/Map107.rxdata
+++ b/Data/Map107.rxdata
--- a/Data/Map108.rxdata
+++ b/Data/Map108.rxdata
--- a/Data/Map109.rxdata
+++ b/Data/Map109.rxdata
--- a/Data/Map110.rxdata
+++ b/Data/Map110.rxdata
--- a/Data/Map111.rxdata
+++ b/Data/Map111.rxdata
--- a/Data/Map112.rxdata
+++ b/Data/Map112.rxdata
--- a/Data/Map114.rxdata
+++ b/Data/Map114.rxdata
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
infinitefusion	56b0e44d88	removes game-default	2024-12-21 10:44:07 -05:00
infinitefusion	e4b56e26d7	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-12-21 10:42:12 -05:00
infinitefusion	2929da60ed	updates gitignore	2024-12-21 10:37:49 -05:00
infinitefusion	a1f024acfc	removes rubymine project files	2024-12-21 10:34:52 -05:00
infinitefusion	27dbc23898	removes dev files	2024-12-21 10:25:30 -05:00
infinitefusion	7cb2daa9ae	6.4 custom sprite spritesheets	2024-12-21 10:05:07 -05:00
infinitefusion	3675a9e361	6.4 autogen spritesheets	2024-12-21 09:47:19 -05:00
infinitefusion	c7f1fafdc0	cleans fusion icons folder	2024-12-21 09:45:46 -05:00
infinitefusion	1e325366d2	6.4 update (minus sprites)	2024-12-21 09:43:11 -05:00
infinitefusion	f70c2cfde4	6.4 sprite credits	2024-12-18 10:05:32 -05:00
infinitefusion	47c68bad06	adds sprite credits csv	2024-12-06 10:13:57 -05:00
infinitefusion	6db39eed0f	updates custom sprites list and adds base sprites list	2024-12-05 19:20:06 -05:00
infinitefusion	73cb1ade0e	updates credits	2024-11-02 15:35:06 -04:00
infinitefusion	b96b8393f4	fixes crash while downloading sprites	2024-10-06 15:55:21 -04:00
infinitefusion	7952fbb76d	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-10-05 20:06:26 -04:00
infinitefusion	be46d62c87	adds client side rate limit for custom spritesà	2024-10-05 20:02:18 -04:00
infinitefusion	fe857f1fae	Adds client-side rate limiting for fetching custom sprites	2024-10-05 20:01:00 -04:00
infinitefusion	113a0f829d	updates version number	2024-10-05 09:53:18 -04:00
infinitefusion	c2ea737a19	settings stuff	2024-10-05 09:38:46 -04:00
infinitefusion	425b00c317	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-09-24 19:13:23 -04:00
infinitefusion	620a20e7f2	downloadable settings shit	2024-09-24 19:10:24 -04:00
infinitefusion	56e1cc5e5d	updates remote settings shit	2024-09-24 18:52:15 -04:00
infinitefusion	f76ea4db46	gitlab urls	2024-09-24 13:32:53 -04:00
infinitefusion	ffd3a95e08	Fixes typo in gitlab url	2024-09-24 12:00:13 -04:00
infinitefusion	30f42847de	Changes gitlab repo url for base sprites	2024-09-24 11:57:02 -04:00
infinitefusion	6f69768db6	Changes gitlab repo url for autogens sprites	2024-09-24 11:56:34 -04:00
infinitefusion	f27961a805	Changes gitlab repo url for custom sprites	2024-09-24 11:47:30 -04:00
infinitefusion	0d9741a460	adds more dex entries	2024-08-23 11:28:36 -04:00
infinitefusion	3326daaaab	updates custom sprites list - spritepack 2023-07-31	2024-07-31 21:11:07 -04:00
infinitefusion	cc26deeb33	ss anne tiles fix	2024-07-13 20:49:45 -04:00
infinitefusion	a8ab419036	don't display gym rematch stats if didn't do any	2024-07-09 10:28:01 -04:00
infinitefusion	ba04d37b87	fixes rare candies stats not displaying	2024-07-09 10:26:54 -04:00
infinitefusion	aac5fd911a	Fixes town map crash	2024-07-09 10:14:44 -04:00
infinitefusion	17aa9c7cb8	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-07-07 10:59:40 -04:00
infinitefusion	9e80ff92ec	fixes missing items	2024-07-07 10:59:13 -04:00
infinitefusion	b2efd78631	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-07-05 18:35:06 -04:00
infinitefusion	116323d8e8	Automatically load classic mode trainer if missing in another game mode	2024-07-05 18:24:27 -04:00
infinitefusion	8c80c9db35	fixes ability ball	2024-07-05 18:11:49 -04:00
infinitefusion	0d75109a20	adds missing eggs	2024-07-05 18:06:00 -04:00
infinitefusion	d78caf6792	fixes brock battle transition	2024-07-05 17:53:12 -04:00
infinitefusion	4a6a889b3e	Fixes wearable sprite offset and layering issues when autoscrolling the map	2024-07-05 17:52:17 -04:00
infinitefusion	6180590860	Fixes displaced hat/hair in pokemarts	2024-07-03 20:42:11 -04:00
infinitefusion	dee677224d	flipped snorlax	2024-07-03 17:02:09 -04:00
infinitefusion	2a33e49855	fixes player becoming invisible while playing pokeflute	2024-07-03 13:46:20 -04:00
infinitefusion	a21f3b289b	eusine fix	2024-07-03 10:57:19 -04:00
infinitefusion	1379b219f2	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-07-03 10:30:11 -04:00
infinitefusion	f6b55a838b	gave cooltrainer a surfboard	2024-07-03 10:29:53 -04:00
Maruno17	92194cab02	Added checks that prevent aliasing a method if the alias method already exists, fixed Symbiosis not working properly for opponents	2024-07-01 20:27:19 -04:00
infinitefusion	0904f27afa	random map changes + meloetta now a self-fusion	2024-07-01 19:28:04 -04:00
infinitefusion	c5f578039e	ecruteak chairs	2024-07-01 14:30:12 -04:00
infinitefusion	2b06205ee8	fixes default dive base sprite	2024-07-01 14:20:39 -04:00
infinitefusion	867a3bf0a5	fixes wrong starter trade in cerulean	2024-06-30 19:25:06 -04:00
infinitefusion	9bdaf9e817	updates custom sprites list	2024-06-30 19:18:38 -04:00
infinitefusion	ef919ee44b	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-06-30 17:41:05 -04:00
infinitefusion	e6d133f7a6	Fixes roaming weather appearing even when legendaries have been caught	2024-06-30 17:37:28 -04:00
infinitefusion	e186c4b668	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-06-30 15:47:04 -04:00
infinitefusion	ad1be384ce	updates patch version nb	2024-06-30 15:46:48 -04:00
infinitefusion	19864599e0	removes the ability to fish while surfing	2024-06-30 15:45:03 -04:00
infinitefusion	b053d1eb77	fixes wrong backpack color on red clothes sprites	2024-06-30 15:41:02 -04:00
infinitefusion	2c3fae1b27	fixes player sprite layer issue when starting battles	2024-06-30 15:32:33 -04:00
infinitefusion	5e30a12118	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-06-30 15:19:09 -04:00
infinitefusion	c6a52b7940	fixes ability capsule not changing the ability	2024-06-30 15:18:42 -04:00
infinitefusion	0ba5b1551e	Fixes fishing sprite offsets	2024-06-30 15:17:37 -04:00
infinitefusion	090b065a9c	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-06-29 14:16:17 -04:00
infinitefusion	1ef1ca15d9	updates patch version number	2024-06-29 14:15:43 -04:00
infinitefusion	14d1988f40	fixes pokeradar going over UI	2024-06-29 14:15:02 -04:00
infinitefusion	fbb23d5e5e	Fixes hidden ability maps	2024-06-29 13:48:04 -04:00
infinitefusion	a5b464095b	Fixes clothes resetting after loading savefile without a hat	2024-06-29 13:38:41 -04:00
infinitefusion	5c7a7548a6	Fixes broken regi ice/rock door	2024-06-29 13:31:39 -04:00
infinitefusion	4ec7496fee	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-06-28 19:50:49 -04:00
infinitefusion	cfc4afa5ae	Fixes broken rival fight	2024-06-28 19:50:21 -04:00
infinitefusion	aa5e5c72e5	showcase -> remix mode	2024-06-28 18:49:56 -04:00
infinitefusion	4bd905d554	updates latest version message	2024-06-28 18:26:21 -04:00
infinitefusion	63e3d6970c	roamer fix	2024-06-28 18:07:27 -04:00