166 Commits

Author SHA1 Message Date
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
9e80ff92ec fixes missing items 2024-07-07 10:59:13 -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
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
e6d133f7a6 Fixes roaming weather appearing even when legendaries have been caught 2024-06-30 17:37:28 -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
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
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
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
58c8192dca fix bike sprite 2024-06-28 17:18:14 -04:00
infinitefusion
3a488c9ba6 release 6.2 2024-06-28 12:01:39 -04:00
infinitefusion
0b9e83f554 adds new custom dex entries 2024-06-16 18:57:32 -04:00
infinitefusion
3b819f5c36 adds more custom dex entries 2024-06-01 11:31:43 -04:00
infinitefusion
0caae41865 updates custom sprites list 2024-06-01 11:30:06 -04:00
infinitefusion
cd7b9cc489 adds more custom dex entries 2024-05-06 10:59:49 -04:00
infinitefusion
d02289dc5c updates version number to 6.1.4 2024-04-20 11:42:32 -04:00
infinitefusion
503cd1c5bb ember spa hatches egg when idle 2024-04-20 09:50:36 -04:00
infinitefusion
7024717ec0 automatically sets player to walking for ilex forest musician 2024-04-20 09:23:33 -04:00
infinitefusion
de417567b6 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-04-19 18:08:08 -04:00
infinitefusion
9b14df38b6 minor fixes 2024-04-19 16:52:31 -04:00
infinitefusion
c3c2e9dcdb Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-04-16 15:58:03 -04:00
infinitefusion
6cc4f2e8ce renames modern mode to remix mode 2024-04-16 15:57:44 -04:00
infinitefusion
4dcbb0dfb8 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-04-15 08:43:01 -04:00
infinitefusion
52846fc919 missing trainer fix 2024-04-15 08:42:15 -04:00
infinitefusion
bc38781a34 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-04-13 13:58:55 -04:00
infinitefusion
256b5bf72b automatically update dex entries list when booting the game 2024-04-13 13:57:13 -04:00
infinitefusion
cca1e0bd62 Automatically downloads updated dex entries from repo 2024-04-13 13:49:49 -04:00
infinitefusion
3184a79bfd minor map changes 2024-04-13 13:47:35 -04:00
infinitefusion
b52a0f35a0 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-04-02 18:38:45 -04:00
infinitefusion
e8dde186c6 changes a cloud 2024-04-02 18:38:29 -04:00
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
5636c12408 updated minor version number 2024-01-13 16:49:15 -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
869ffbc1a3 basic game download source detection 2024-01-13 16:38:47 -05:00
infinitefusion
7d1714a2ba fixes rockruff and lycanroc sprites 2023-12-28 16:55:13 -05:00
infinitefusion
2294fddcdd moves power plant key and ice pick to after giovanni 2023-12-07 19:10:38 -05:00
infinitefusion
170b893d99 removed icons for removed items 2023-12-03 13:34:10 -05:00
infinitefusion
602b5d9752 small dialogue fix 2023-12-03 13:22:56 -05:00
infinitefusion
ba6f7f3ab2 froggywoggy 2023-11-30 18:59:21 -05:00
infinitefusion
a5311f5e2d Fixes bug allowing to unfuse traded pokemon 2023-11-25 12:21:26 -05:00
infinitefusion
e6e53bc94b don't crash when can't place pokemon in pc 2023-11-25 10:35:04 -05:00
infinitefusion
d9098afbec Fixes issue with certain npcs when selecting pokemon with triple fusions in your party 2023-11-25 10:24:09 -05:00
infinitefusion
9aee5206cd Fixes dolly quest message not being centered 2023-11-24 10:54:45 -05:00
infinitefusion
e1c52d9546 removes triple fusion types from pokedex search screen 2023-11-24 10:47:42 -05:00
infinitefusion
0433e49477 Removes debug line that caused crash on new games 2023-11-24 09:27:19 -05:00
infinitefusion
6f8f478303 Removes debug line that caused crash on new games 2023-11-24 08:09:34 -05:00
infinitefusion
5f09bec5ff adds discord staff to wondertrade nicknames list 2023-11-23 19:50:35 -05:00
infinitefusion
e7629a8afa Removes trash cans from pallet town 2023-11-23 19:38:05 -05:00
infinitefusion
1af9d853cb Adds cache for autogen sprites to reduce lag when loading sprites 2023-11-23 19:25:28 -05:00
infinitefusion
cbe71d8530 Makes necrozma light reset after battle 2023-11-23 18:50:11 -05:00
infinitefusion
9ade3e829a adds new pokemon to exotic pokenmon quests 2023-11-23 12:53:55 -05:00
infinitefusion
8f91ba0ff5 adds debug map 2023-11-22 21:28:30 -05:00
infinitefusion
0713ed0bb5 Wondertrade now uses the sprite's author as the original trainer when it can 2023-11-20 17:53:18 -05:00
infinitefusion
1d2ccb781b Fixes mankey paw not costing any money 2023-11-19 12:02:24 -05:00
infinitefusion
081fa99293 Fixes issue preventing fused roaming Pokémon to appear 2023-11-19 11:57:25 -05:00
infinitefusion
179c8d078b Fixes player becoming invisible after playing the pokefulute 2023-11-19 11:34:53 -05:00
infinitefusion
48327a61ff Fixes sprites not being downloaded before form change 2023-11-19 10:27:40 -05:00
infinitefusion
6e5f7bbce2 Fixes path issue after downloading autogen and unfused alt sprites 2023-11-19 09:33:46 -05:00
infinitefusion
7bfaec31f2 Adjusted position of battle boxes 2023-11-16 21:13:43 -05:00
infinitefusion
9a507fe4c1 renames cave tileset 2023-11-15 11:05:35 -05:00
infinitefusion
50cf18417e Fixes dialga/giratina/palkia battles starting the necrozma quest 2023-11-14 21:35:07 -05:00
infinitefusion
4d74cc7943 Updates patch version number to 6.0.2 2023-11-14 20:30:23 -05:00
infinitefusion
1acc5ef4f7 Fixes issue with gym randomizer when wiping out in a gym 2023-11-14 20:29:02 -05:00
infinitefusion
3943ce1684 fixes pokeflute animation causing the player to lose their running shoes 2023-11-14 20:19:02 -05:00
infinitefusion
433cb999ff fixes crash when trying to unfuse a triple fusion 2023-11-14 20:06:51 -05:00
infinitefusion
ea84f0fe2d fixes crash when accessing the pokedex sprites page from summary before the sprites substituion map was initialized 2023-11-14 20:04:03 -05:00
infinitefusion
44dc443a6c fixes regi rock/steel puzzle switches remaining pressed after leaving the room 2023-11-14 20:01:14 -05:00
infinitefusion
e4ae8802d5 Fixes new pokemon sprites not displaying in pokeradar 2023-11-14 19:52:09 -05:00
infinitefusion
e292078d17 Fixes super splicers not working correctly from PC 2023-11-14 19:37:29 -05:00
infinitefusion
2635217407 error handling in case the randomizer picks a pokemon that does not exist 2023-11-14 18:46:32 -05:00
infinitefusion
d729a630e5 removes update man from mt. ember lol 2023-11-13 23:37:19 -05:00
infinitefusion
b8f1162bd8 Fixes triple fusion fight crash in randomized mode & updated version number 2023-11-13 21:41:58 -05:00
infinitefusion
d941ae48e9 create missing directories when importing new custom sprites 2023-11-13 21:13:55 -05:00
infinitefusion
a86b844649 updated type icons for triple fusions 2023-11-13 20:59:24 -05:00
infinitefusion
cfc76d1f77 map fixes, regitablet and cool dino 2023-11-13 20:14:01 -05:00
infinitefusion
5ab7074507 Merge branch 'releases' of https://github.com/infinitefusion/infinitefusion-e18 2023-11-13 13:06:38 -05:00
infinitefusion
62b588314e updated gitignore 2023-11-13 13:06:28 -05:00
infinitefusion
0b334fe3ea removes capital letters in caves tileset 2023-11-13 13:04:42 -05:00
infinitefusion
b79f4b2f93 fuck you git 2023-11-13 13:04:10 -05:00
infinitefusion
2af97a0bbf Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-11-13 12:34:54 -05:00
infinitefusion
959edc3f6a Map fixes 2023-11-13 12:31:59 -05:00
infinitefusion
91153181c3 Map fixes 2023-11-13 11:50:57 -05:00
infinitefusion
d3662c3f10 update to latest 6.0 release 2023-11-12 21:45:07 -05:00
infinitefusion
ba7ee9bae2 Revert "6.0 release"
This reverts commit a0aea8f030.
2023-11-12 14:23:52 -05:00
infinitefusion
a0aea8f030 6.0 release 2023-11-12 14:10:05 -05:00
infinitefusion
6ba975ac51 removed broken character in randomzier sprites list 2023-11-06 19:08:22 -05:00
infinitefusion
2dd2a5d33b removed non-sprite lines in randomizer custom sprites list 2023-11-04 21:14:18 -04:00
infinitefusion
1ea6b531c2 updates randomizer custom sprites list 2023-11-03 18:14:22 -04:00
infinitefusion
b600e126bc reverts new version notification to 5.3.1.2 2023-10-26 15:09:08 -04:00
infinitefusion
2411a0c9fc updates new versin notification 2023-10-21 10:42:20 -04:00
3126 changed files with 739516 additions and 14755 deletions

8
.gitignore vendored
View File

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

Binary file not shown.

BIN
Audio/BGM/band/band_1.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_2.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_3a.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_3b.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_4.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_5a.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band/band_5b.wav Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/band_aguitar.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band_drums.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band_eguitar.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band_flute.wav Normal file

Binary file not shown.

BIN
Audio/BGM/band_harp.wav Normal file

Binary file not shown.

BIN
Audio/BGM/flap.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/lake_crater.mp3 Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/BGM/meloetta_song.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/newmoonIsland.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/route38_39.mp3 Normal file

Binary file not shown.

BIN
Audio/BGM/safari.ogg Normal file

Binary file not shown.

BIN
Audio/BGM/scary_ambient.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/LYCANROC_D.ogg Normal file

Binary file not shown.

BIN
Audio/SE/MELOETTA_A.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/cry_CRESSELIA.ogg Normal file

Binary file not shown.

View File

@@ -22,6 +22,7 @@ Zeak6464 (Kanto Map pack) http://www.pokecommunity.com/showthread.php?t=345591
# Story / Dialogues #
#################################
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,109 +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
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,
mammuth use ursaluna#3114, Kulgun#3323, Retrogamer#9934, Scrapi#6319, PinkYoshi#2350, Tomate#6670,
Stan#3932, Xiapher#4244, Howls#4468, xoto#0766, xigzagoon#9354, Beespoon#2222, NeoSoup#6526,
Dyno#3861, Sjoba_sheep#1111, Maelmc#9965, ThornsofLight#3245, Xillo#5236, pengu#6874, Mope7#1139,
Gorky#1761, All-Seeing#9253, IGot50lbsOfTanneriteInMyAnus#4093, Emisys#4024, JamoJauhis#4971,
Cheepoof#8815, Moon_Tah#2688, BButton#8097, Punko#1235, NakaMagic#0774, Tabarnak#2210, M4rcus#0928,
Bubba-Rottweiler#7322, Keksgesicht#7133, Teamama#4369, BTT#3408, calicorn#6994, PainT#3334,
Taylor Mai#0134, Underuser#5401, AkumaDelta#2364, Scotsman#6299, GenoRhye#3335, (????)Kanger#3997,
JoshuLips#5010, GREEN#2016, SpiDrone#6590, Bizmythe#4062, Silver#4784, gnose_#6945, D'Octobre#2420,
Tenedranox#5660, Bowsori#7981, Z-Man#1429, SolarFinch#9187, The Sinful Trubbish#6850, Seath#8173,
Pip#1053, PrinceMagz#8464, Yoshidactylus#5060, SissyPrincessBrianna#5790, LilacTypo#3280,
TimeAxis#3725, Zoroark73#0267, Matten#2329, BiscottiBuck#8750, kobold hijinks#9252, spagalapof#5624,
LeoPond#7180, Fourleaf#3792, Khrona#0339, yozara#3704, Mokko#1106, LeonDark#3188, WillTheWall#2204,
Skullex#3564, MrDeLuux#1087, OPStellar#8399, Kanguin#4977, FollyGee#6354, jace#6971, Caligulynn#8492,
UmbreonRogue#7717, Scoobz#4536, LinkLion1#2230, EddarHellsing#3724, UnclaimedPuppy#5082,
Tim Allen#0564, Galacta Pieta#5570, Admiral Pillowfight#0192, DigiDragoon#2625, Dusty#0376,
C J#3125, UnworthyPie#8963, Zazash#7034, Jordino#0453, Swonkfish#8759, GameLord 64#0690,
SilentSeekers14#2877, MonHuque#9884, Mo Zi#1172, Miramint#2314, axl17#9480, SilverTotodile#8015,
HydroDX#8982, Esprite#6535, Loafer#4133, Chulz#8591, Anonymous Joker#0001, 003Venusaur#9184,
MrGenie#1122, Livy#7053, error#6038, NotAThotScott#2497, Xyloldi#9276, Charlie#9139, BuzzBee#3824,
SmoothCactus#2568, Sploox#8782, Panos#1824, Neonriser#6841, mlettow#7447,
Because I can and it is fun.#5367, Rumi#1222, Murp#4269, dodo#2008, ??oasted ??oose#7124,
Kookodile#8975, Ignus#6182, BowgartKing#3840, Sourdeer#5268, Low#1512, FoLK#3915, Cult#8608,
xPeter#6603, toki woki#9743, Mewblue#8713, cold#8884, Tobbns#7421, Kaiivee#2186, Garrub#2366,
blinker#8709, Minion#6069, JeyP#8836, Dusk#1598, ChippyYYZ#7202, BramTheSlayer#2747, Aegide#8190,
???#2816, XtremeFireFox#6392, Skegg#5501, Potch#1120, Le Raz27#6898, GamR#2726, Fyre#9863,
CharIotte#8096, zitlezoan#9314, LordHDes#9807, Omasunner#1386, Hubercioch#2595, MarvusTheButt#4570,
Jaggedthorn#5446, coin coin#1267, DerD4nnY#6878, deetah#5572, Zypher31#5048, Yeticrossing#6549,
Teebreaker#2095, Romani Peace#5089, Bearmeme#1068, alexander1934#5599, Swagouille#3714, Rah_123#9893,
K3R0#8248, BungaloFury#7456, 1.Ghastly-Fox#6648, .panix#4390, Ulematome#0696, silvverserpent#9904,
Setteduetto#2592, Rhodric#8638, ClawsHDi#4608, W<>tr<74>#4935, TimelessShrine#3671, Jordanos#4570,
Garhall#0148, Bromancer#7220, Torch#9606, toad#0892, Phoenix99125#0873, Mei ??????#8634,
Dafaillord#2870, Carolus#7694, Alic(ub(e))#5067, ZeoMaddox#7022, Yep, it's Caio#2377, TM#7724,
Sjoba_sheep#3338, Rath#5557, Newfi Cheese#0429, Kveykva#4921, Kumo (Uh-hmmm)#5974, Just_A_Husk#8070,
Jigokuro#5094, Dynte#0539, Dree#6123, SpleensJuice#7677, Helium#0512, GimmeTheBelt#3052, FlyerBee#5026,
Chogolatine#0418, BrianTNT#0151, Persephone#6234, Okamical#7568, Kid Caliban#8938, DurchBurch#5530,
Vaporwave Capybara#2820, pursuji#8620, PinkPoffin#6403, Klutter#4451, H4R-P#0001, Blissful Moose#7601,
BigTimeAng#4614, wooloo#6925, Vietco#0665, TJTL33#9056, Sahxyel#2827, RubyRed1203#4517, Rice_Farmer#3642,
Mat<EFBFBD>o#1983, Elle#7960, DanniWins#2794, CrazeBanana#6943, Aurange#8320, A_nnoying#9360,
TheHackingRotom#7365, SpaceSR#5015, Serreor#6487, Scooch#5241, Risharcuterie#2982, Litanas#1153,
Kaegro#3029, Iustinus Tempus#9548, Holina#3742, Gor_Asgardian#8359, FatalFinish#0618, 1BadGTO#1642,
?????????????? ????#9211, Lu<4C><75>.#1932, WarMonger#6579, Spriter#1548, Scrafter#5868, Prince De Lu#8567,
Morphling#0001, Lie#2037, Jezza#0621, I'm Yoshi#9102, Fergul#0690, eblair#7032, BleuSnackBar#7428,
Ayko#3269, AndreOffline#6147, Romicron#9231, Pippington#5114, Muggins#0658, Mimikyuke#3868,
MikuGoya#5085, LoserUser359#1783, likouns#5496, LedianLover#4426, Jershal Ribbins#6163, HBleach#2567,
Haru Le Demi-Dieu#8222, derasez#6850, Banboox#6949, Azinith#4432, Absolute Madness#8296, Xicdul#6544,
Sin#1780, Resilicns#2615, Ravioliboi#9566, Kapados#1661, BellatheDork#4739, bacon#2689,
Was I'm Yoshi#3581, RampantMind#4474, maxolcorm#8623, Maskninja#9162, Lcs128#0603, Lahar#6856,
Klohinx#5120, Hilune#1076, Hid#5642, HatsuneZaku#0001, GODZILLA#9419, General#8915, DireDireDoc#9096,
Didus - Baggafix#0731, ChivesKirk#5773, Chilly#4972, BeardicKnowledge#0096, TheAlest#9187,
TheAlabastarBrothers#0696, SmoothEd1#9194, Pinely#0023, Libra#0105, KirbyRider1337#5876,
Jane has a gun#2231, hazel#7073, Formerly Beef#6239, Firetra#3665, DTHayward7#0135, demonslayer16#5650,
Demo_Exp - Bomb Elemental#6244, CozmoBoom#9335, Ceci n'est pas une Pine#1212, Axyl#2031, Admorei#1004,
2KoF#2209, Zortie#4505, xXSpiritWolfX#3996, Siyonn#6511, Jessisodwakus#0909, FlorianDX#0951,
Filip#9254, Elvenoob#6864, Celadeus#4914, CCStuck#7916, cavalo#2028, bobosmith01#6567, Biolum#7878,
ArcZero#5750, AfterKing#7628, ???Hysteria????#7235, WonderAll#6517, Whit-Kit#5553, Terminaut#2990,
ShaminSki#6500, Scharage#3575, Puffy Puffy Puff Puff#4305, Patrick Nevermore#2521, Ocxin#6186,
Meowholic#5433, LuMiraWolf#3615, JopDone#3412, Jaters#2779, Felgrand#3490, Fanta#4990,
Chrisnick64#8967, Bubbline#9700, bort#5617, BluePhoenixAlex#8696, amuseoffirebane#5527, Tenrec#8380,
Strix#6463, Snoot#0446, PenguinOfLife#1777, Marmotte5280#7658, KarottenKarl#8670, JunkShaman#7478,
Heaven Canceler#3755, FrozenReborns#2316, flabbergasted mega bee#0536, Dingo#0194, Crumbs#8513,
Amgis#6748, Zaloran#8106, YokoSpaghetti#5829, Xyrann#3916, Sp<53>rda#5449, Potato Q#8506, PlayerName#6665,
Monsieur Taser#6242, Misu#4074, leader of the nugget cult#0367, KewlKatKitten#9360, Kevinus98#4114,
inbox#1000, HampstaPig#8406, Gab#8558, Flattus Norvegicus#9850, FishyPriest#5286, EyeballSweat#0728,
Eisseele#3076, Cub#4366, Conansson#7524, cestlamo#3485, BossTyrant#7450, AzelGriff#8706,
1877KarsForKids#6916, ?Stalker?? ????#1267, ?NostalJay?#2533, WynnDawnstrider#0564, WelpY124#7582,
Toxx06#9251, Snrasha#5519, SmithPR#9652, Slayder#1617, ShadowOrSmth#8834, Ruchunteur#6203,
RatherPeculiar#3373, Prime#5723, philipl#0307, Parallerinpiped#9751, Mnemic#9960, Meztli#6172,
MarkGrant#6731, Kixur#7233, Judith?#7478, GrosslySolaire#7467, GingerBeef#3154, Evosion#9987,
Doctor Miawoo#8333, Cad48#0297, Bioh#5266, BigBepisBois#2341, Azuroh#5036, Archhaven#4929,
Amigo Monjo#7408, Altaria234#1181, ??Gigi#8967, ?Sparkling Elles?#5269, ?????#2741, Zarha#5972,
Yoshi#1606, Yassine#3435, WindSwirl#3153, WillFrost#0001, Verdrion#8762, Trubb#8466,
THEGRANDEMPEROR#2163, streetcarp#0275, Simlas#3079, Shiro#6632, ROKITCONR#5488, PharaohFan#3670,
Ortheoz#7942, Nymano#6967, Nukes#4014, Nightmeer13#1454, Midnight#9871, MarkTheDev#7056, Lunar#0258,
luigisalad#8550, lizzledpink#6611, Law (The Bear of Bad News)#1653, Hellfalas#6999, Hades Hand#7069,
Griever99#1623, gowther#2086, getthedripp#1890, flanne#6632, Doomknight#2447, Developer Pelipper#8851,
cub but mildly stupid#4564, CrimsonTy#7051, Cjpid#7996, Chani von Karpa#7869, BWU-Antonio#2379,
BUm79#8112, bees#0427, Anzu#5119, AmokomA#5947, .R<>serve.#3395, Zaldrick#1039, Yllan#4806, Vewz-#0205,
Veegee#6635, Vaatry#1009, Tiamaet#4806, thighs#2408, softsweets#5338, Slappicus#3616, Skargoth#7306,
SailorScum#9858, sabrina_the_witch#4746, Riiwarin#2470, Rhys's Pieces#1882, r2-d3po#9944,
PopcornKing#0819, Pooshi#6702, Pinxed [HeHim]#5214, Odion#7851, Nynnapaninie#8374, Nadie#4641,
mrvoid#8543, MonkeyMafia#1763, Martiii#8004, Magnus133#5875, Lore#1537, Lora-mun#5661,
KingGrimlock28#4763, Kiaory#3379, keurbi#8099, KeeganSkymin4444#7061, juni#6968, Jumby#0574,
JUICE#4388, Jolly (dapper) Prismeon#1104, HiraAkshay#8558, Gladiator_Kraken#4797, Frogdog#3947,
DQL#6149, croag#8681, crankypunk#6640, Consuelo#0664, Chibi Gaming#4876, chaggie#0001, Blaxaroz#0217,
blake7x#3726, Biscuit#9560, Bardiel#0243, AntoineXXI#8454, AnOn55#6663, AMELIE#1210, Aloeva#0375,
Aelias#5124, Abe#0249, ?? ??????? ?? ???????x??#2558, YungPizzaroll#0195, XBagon#2918, Wonder#2598,
Williams#3584, VoryoMHWorld#4492, ULTDude#6421, Th<54>o#4432, tert_14#4277, Solac#9353, sir ferali#4991,
Sequoia#2312, Red#4851, Razhiel_master#9310, Perytoon#6394, OppaiDragon#9155, magnacrabb#1234,
ljdz#9595, Literally Mongolia#7111, Le Titou puissant#5687, kpu#6858, Kahan#6555, Hm#0965, gux#7816,
Grip#1058, gloy#3170, GebackeneBanane#3898, ExplosiveDruid#0049, Dankey#8323,
Chocolatine R<>volutionnaire#4829, Blade Wolf#0033, Beniflex#9657, Baecundrop#7523, Amalgame#3432,
????Alex????#9704, Yorushima#8545, UnicornPrince#4068, Tofuz#0629, Tododas#8917, TJman461#7146,
Team Haxley#4549, StarlyCactus#3665, Sarcastic barbarian#3562, Sanic#0823, RoughPuff#7501, Romu#6969,
QuiteAMess#9717, Professor C-Dawg#5414, Nagareru#9593, luca3370#2920, KyleThePirahna#3191, KOMAIN#7770,
kakakiamekerasakia#3792, ItsThatSimple#6320, Gelos#9875, GalaxyDJx#0001, FullmetalHeichou#7070,
Evil Mailman#0604, elpano2#9588, Cenna#6226, Catdesu#0845, CaseyAether#2205, carni#0124, Buttlu#7240
Check the Data/SPRITE_CREDS file for full, up to date credits
Triple fusion sprites
@@ -212,6 +127,9 @@ with their respective authors' consent
### Custom tileset graphics ###
Kiwikelly
### Battle menu buttons: ###
TCGrunler#4583
elupsis
### Public tileset graphics ###
Jorginho (OutsideEmerald)
@@ -251,7 +169,7 @@ Kiwikelly
### Other graphics
Region map: Pokemon-Diamond (http://www.deviantart.com/art/Kanto-BW-styled-map-275298527)
Region map: Kiwikelly
Move animations:
Augmented Reborn Animations Project

5
Data/.idea/codeStyles/Project.xml generated Normal file
View File

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

View File

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

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More