removes pokemon.txt

Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases
reverts shiny settings
2025-12-06 06:01:46 +00:00 · 2024-04-02 11:53:47 -04:00 · 2024-04-02 11:53:21 -04:00 · 2024-04-02 11:02:23 -04:00 · 2024-04-02 10:43:34 -04:00 · 2024-04-02 10:42:40 -04:00
1214 changed files with 199188 additions and 116705 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
-Graphics/Battlers/*
-PBS/*
+
 Graphics/Battlers_resized/*
 Graphics/CustomBattlers/*
+Graphics/Battlers/*
 Graphics/Pokemon/FusionIcons/*
 Data/SPRITE_CREDS
 Data/VERSION
-Exported Maps/*
-Game.rxproj
+ 
--- a/Audio/BGM/band/adjust_volume/band_harp.wav
+++ b/Audio/BGM/band/adjust_volume/band_harp.wav
--- a/Audio/BGM/band/band_1.wav
+++ b/Audio/BGM/band/band_1.wav
--- a/Audio/BGM/band/band_2.wav
+++ b/Audio/BGM/band/band_2.wav
--- a/Audio/BGM/band/band_3a.wav
+++ b/Audio/BGM/band/band_3a.wav
--- a/Audio/BGM/band/band_3b.wav
+++ b/Audio/BGM/band/band_3b.wav
--- a/Audio/BGM/band/band_4.wav
+++ b/Audio/BGM/band/band_4.wav
--- a/Audio/BGM/band/band_5a.wav
+++ b/Audio/BGM/band/band_5a.wav
--- a/Audio/BGM/band/band_5b.wav
+++ b/Audio/BGM/band/band_5b.wav
--- a/Audio/BGM/band/band_full.wav
+++ b/Audio/BGM/band/band_full.wav
--- a/Audio/BGM/band_aguitar.wav
+++ b/Audio/BGM/band_aguitar.wav
--- a/Audio/BGM/band_drums.wav
+++ b/Audio/BGM/band_drums.wav
--- a/Audio/BGM/band_eguitar.wav
+++ b/Audio/BGM/band_eguitar.wav
--- a/Audio/BGM/band_flute.wav
+++ b/Audio/BGM/band_flute.wav
--- a/Audio/BGM/band_harp.wav
+++ b/Audio/BGM/band_harp.wav
--- a/Audio/BGM/flap.mp3
+++ b/Audio/BGM/flap.mp3
--- a/Audio/BGM/fullmoonIsland.mp3
+++ b/Audio/BGM/fullmoonIsland.mp3
--- a/Audio/BGM/lake_crater.mp3
+++ b/Audio/BGM/lake_crater.mp3
--- a/Audio/BGM/lake_crater_short.mp3
+++ b/Audio/BGM/lake_crater_short.mp3
--- a/Audio/BGM/meloetta_song.mp3
+++ b/Audio/BGM/meloetta_song.mp3
--- a/Audio/BGM/newmoonIsland.mp3
+++ b/Audio/BGM/newmoonIsland.mp3
--- a/Audio/BGM/safari.ogg
+++ b/Audio/BGM/safari.ogg
--- a/Audio/BGM/scary_ambient.mp3
+++ b/Audio/BGM/scary_ambient.mp3
--- a/Audio/SE/Cries/LYCANROC_D.ogg
+++ b/Audio/SE/Cries/LYCANROC_D.ogg
--- a/Audio/SE/Cries/LYCANROC_N.ogg
+++ b/Audio/SE/Cries/LYCANROC_N.ogg
--- a/Audio/SE/Cries/MELOETTA_A.ogg
+++ b/Audio/SE/Cries/MELOETTA_A.ogg
--- a/Audio/SE/Cries/MELOETTA_P.ogg
+++ b/Audio/SE/Cries/MELOETTA_P.ogg
--- a/Audio/SE/Cries/PIKACHU.ogg
+++ b/Audio/SE/Cries/PIKACHU.ogg
--- a/Audio/SE/Cries/PIKACHU_faint.ogg
+++ b/Audio/SE/Cries/PIKACHU_faint.ogg
--- a/Audio/SE/Cries/U_NECROZMA.ogg
+++ b/Audio/SE/Cries/U_NECROZMA.ogg
--- a/Audio/SE/LYCANROC_D.ogg
+++ b/Audio/SE/LYCANROC_D.ogg
--- a/Audio/SE/MELOETTA_A.ogg
+++ b/Audio/SE/MELOETTA_A.ogg
--- a/Audio/SE/PRSFX-
+++ b/Audio/SE/PRSFX-
--- a/Audio/SE/cry_CRESSELIA.ogg
+++ b/Audio/SE/cry_CRESSELIA.ogg
--- a/Credits.txt
+++ b/Credits.txt
@@ -21,7 +21,8 @@ Zeak6464 (Kanto Map pack) http://www.pokecommunity.com/showthread.php?t=345591
 #################################
 #	Story / Dialogues	#
 #################################
-Chardub 
+Chardub
+Kiwikelly
 The story and dialogues were based off Pok<6F>mon Red and Blue, as well as
 Pok<EFBFBD>mon Gold and Silver. Both games are made by Game Freak.

@@ -40,7 +41,7 @@ http://pokefusion.japeal.com/
 Alexonsager (version 3.x and below) 
 http://pokemon.alexonsager.net/

-Special thanks to Aegide for helping to rip the sprites from the website
+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.

@@ -48,9 +49,23 @@ Intro cinamatic
 #####################
 Kiwikelly

+
+Custom sprites collecting and handling
+Kiwikelly, Payapon, Thornsoflight
+
+Discord custom sprites coordination
+avianAnnihilator<s>Blaquaza
+B<EFBFBD>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
+As of 06-09-2022, ordered by number of contributions. Check the Data/SPRITE_CREDS file for full, up to date credits

 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,
--- a/Data/.idea/codeStyles/Project.xml
+++ b/Data/.idea/codeStyles/Project.xml
@@ -0,0 +1,5 @@
+<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
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/Data/Actors.rxdata
+++ b/Data/Actors.rxdata
--- a/Data/Animations.rxdata
+++ b/Data/Animations.rxdata
--- a/Data/Armors.rxdata
+++ b/Data/Armors.rxdata
--- a/Data/CUSTOM_SPRITES
+++ b/Data/CUSTOM_SPRITES
--- a/Data/CommonEvents.rxdata
+++ b/Data/CommonEvents.rxdata
--- a/Data/Enemies.rxdata
+++ b/Data/Enemies.rxdata
--- a/Data/Items.rxdata
+++ b/Data/Items.rxdata
--- a/Data/Map012.rxdata
+++ b/Data/Map012.rxdata
--- a/Data/Map016.rxdata
+++ b/Data/Map016.rxdata
--- a/Data/Map019.rxdata
+++ b/Data/Map019.rxdata
--- a/Data/Map023.rxdata
+++ b/Data/Map023.rxdata
--- a/Data/Map024.rxdata
+++ b/Data/Map024.rxdata
--- a/Data/Map040.rxdata
+++ b/Data/Map040.rxdata
--- a/Data/Map050.rxdata
+++ b/Data/Map050.rxdata
--- a/Data/Map054.rxdata
+++ b/Data/Map054.rxdata
--- a/Data/Map090.rxdata
+++ b/Data/Map090.rxdata
--- a/Data/Map095.rxdata
+++ b/Data/Map095.rxdata
--- a/Data/Map102.rxdata
+++ b/Data/Map102.rxdata
--- a/Data/Map105.rxdata
+++ b/Data/Map105.rxdata
--- a/Data/Map108.rxdata
+++ b/Data/Map108.rxdata
--- a/Data/Map110.rxdata
+++ b/Data/Map110.rxdata
--- a/Data/Map112.rxdata
+++ b/Data/Map112.rxdata
--- a/Data/Map113.rxdata
+++ b/Data/Map113.rxdata
--- a/Data/Map114.rxdata
+++ b/Data/Map114.rxdata
--- a/Data/Map115.rxdata
+++ b/Data/Map115.rxdata
--- a/Data/Map129.rxdata
+++ b/Data/Map129.rxdata
--- a/Data/Map135.rxdata
+++ b/Data/Map135.rxdata
--- a/Data/Map141.rxdata
+++ b/Data/Map141.rxdata
--- a/Data/Map144.rxdata
+++ b/Data/Map144.rxdata
--- a/Data/Map154.rxdata
+++ b/Data/Map154.rxdata
--- a/Data/Map157.rxdata
+++ b/Data/Map157.rxdata
--- a/Data/Map167.rxdata
+++ b/Data/Map167.rxdata
--- a/Data/Map168.rxdata
+++ b/Data/Map168.rxdata
--- a/Data/Map175.rxdata
+++ b/Data/Map175.rxdata
--- a/Data/Map176.rxdata
+++ b/Data/Map176.rxdata
--- a/Data/Map181.rxdata
+++ b/Data/Map181.rxdata
--- a/Data/Map191.rxdata
+++ b/Data/Map191.rxdata
--- a/Data/Map195.rxdata
+++ b/Data/Map195.rxdata
--- a/Data/Map197.rxdata
+++ b/Data/Map197.rxdata
--- a/Data/Map214.rxdata
+++ b/Data/Map214.rxdata
--- a/Data/Map237.rxdata
+++ b/Data/Map237.rxdata
--- a/Data/Map240.rxdata
+++ b/Data/Map240.rxdata
--- a/Data/Map241.rxdata
+++ b/Data/Map241.rxdata
--- a/Data/Map242.rxdata
+++ b/Data/Map242.rxdata
--- a/Data/Map243.rxdata
+++ b/Data/Map243.rxdata
--- a/Data/Map246.rxdata
+++ b/Data/Map246.rxdata
--- a/Data/Map266.rxdata
+++ b/Data/Map266.rxdata
--- a/Data/Map273.rxdata
+++ b/Data/Map273.rxdata
--- a/Data/Map276.rxdata
+++ b/Data/Map276.rxdata
--- a/Data/Map277.rxdata
+++ b/Data/Map277.rxdata
--- a/Data/Map293.rxdata
+++ b/Data/Map293.rxdata
--- a/Data/Map295.rxdata
+++ b/Data/Map295.rxdata
--- a/Data/Map298.rxdata
+++ b/Data/Map298.rxdata
--- a/Data/Map299.rxdata
+++ b/Data/Map299.rxdata
--- a/Data/Map324.rxdata
+++ b/Data/Map324.rxdata
--- a/Data/Map331.rxdata
+++ b/Data/Map331.rxdata
--- a/Data/Map355.rxdata
+++ b/Data/Map355.rxdata
--- a/Data/Map356.rxdata
+++ b/Data/Map356.rxdata
--- a/Data/Map359.rxdata
+++ b/Data/Map359.rxdata
--- a/Data/Map363.rxdata
+++ b/Data/Map363.rxdata
--- a/Data/Map380.rxdata
+++ b/Data/Map380.rxdata
--- a/Data/Map407.rxdata
+++ b/Data/Map407.rxdata
--- a/Data/Map418.rxdata
+++ b/Data/Map418.rxdata
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
infinitefusion	a3c4e3f80d	removes pokemon.txt	2024-04-02 11:53:47 -04:00
infinitefusion	b95c954177	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-04-02 11:53:21 -04:00
infinitefusion	f2d25381f0	reverts shiny settings	2024-04-02 11:02:23 -04:00
infinitefusion	67988d56db	increments version number	2024-04-02 10:43:34 -04:00
infinitefusion	e0fa62a4b8	updates pokeball graphucs	2024-04-02 10:42:40 -04:00
infinitefusion	99e381f018	fixes some pokemon positionings	2024-04-01 20:25:23 -04:00
infinitefusion	4eee99829d	Revert "updates ball graphics" This reverts commit `96e7ab30e9`.	2024-04-01 19:39:14 -04:00
infinitefusion	f191713cd7	missing sprites	2024-04-01 19:14:09 -04:00
infinitefusion	f788a31579	fixes triple fusion not being unlocked after lake of rage	2024-04-01 17:11:01 -04:00
infinitefusion	96e7ab30e9	updates ball graphics	2024-04-01 17:01:12 -04:00
infinitefusion	309375673d	updates custom sprites list	2024-04-01 16:14:12 -04:00
infinitefusion	4cd19750ef	(temp) increased shiny odds for 2024-04-01	2024-04-01 10:39:00 -04:00
infinitefusion	d82020f64b	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-03-31 20:18:28 -04:00
infinitefusion	f21bd70b9a	fixed being able to recruit electric guitarist before starting the quest	2024-03-31 20:18:13 -04:00
infinitefusion	5fac90cd91	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-03-31 11:19:27 -04:00
infinitefusion	5ea17c8c6e	Adds small hints for meloetta quest guitarists	2024-03-31 10:33:35 -04:00
infinitefusion	4f87fb64c7	fixes missing trainer in expert mode	2024-03-30 21:27:14 -04:00
infinitefusion	0c0a20f222	Vermillion city invisible sign	2024-03-30 21:25:56 -04:00
infinitefusion	d78c950afc	no dev files in releases	2024-03-29 21:47:57 -04:00
infinitefusion	e3bb249849	system	2024-03-29 21:47:01 -04:00
infinitefusion	3dcaaedfc9	updates version number	2024-03-29 21:42:54 -04:00
infinitefusion	5e9153a097	Fixes crash because of indexes not resetting when scrolling in sprites page	2024-03-29 21:38:57 -04:00
infinitefusion	3a307cdabf	map fixes	2024-03-29 12:57:26 -04:00
infinitefusion	9a7ffd13fc	Fixes bug when player loses to mew	2024-03-28 23:42:49 -04:00
infinitefusion	fed0e2be83	removes dev files	2024-03-28 21:47:44 -04:00
infinitefusion	c9f043d7b3	adds hint for marowak in meloetta quest	2024-03-28 21:47:01 -04:00
infinitefusion	31063a7a2e	adds back pbs and project file lol	2024-03-28 20:12:40 -04:00
infinitefusion	58640ec8cb	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-03-28 20:08:27 -04:00
infinitefusion	695d00e351	fixes minor fuckups	2024-03-28 20:08:04 -04:00
infinitefusion	502ff9197c	6.1.1	2024-03-28 20:04:18 -04:00
infinitefusion	8ca8bf9b9f	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-03-28 19:59:29 -04:00
infinitefusion	085f73f7d1	fixes dex number not updating from previous version	2024-03-28 19:58:25 -04:00
infinitefusion	9608cca26f	updates new version notification	2024-03-28 18:25:47 -04:00
infinitefusion	fbddb27774	removes exported maps folder	2024-03-28 17:34:25 -04:00
infinitefusion	cdd8a8a4e4	removes dev files	2024-03-28 17:33:44 -04:00
infinitefusion	27209e46f0	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-03-28 17:32:42 -04:00
infinitefusion	d2f6d74a8a	fixes all game modes being unlocked from the start	2024-03-28 17:31:26 -04:00
infinitefusion	1635409e6d	updates to version 6.1	2024-03-28 17:14:35 -04:00
infinitefusion	9fa56202bb	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-02-05 23:35:31 -05:00
infinitefusion	e952a6f574	updated readme	2024-02-05 23:35:12 -05:00
infinitefusion	207cfcc4f8	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-01-13 16:49:40 -05:00
infinitefusion	25ab076835	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-01-13 16:40:32 -05:00
infinitefusion	7d1714a2ba	fixes rockruff and lycanroc sprites	2023-12-28 16:55:13 -05:00