110 Commits

Author SHA1 Message Date
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
81a6bfc21c adds remoteurl file 2023-11-12 21:34:33 -05:00
infinitefusion
59a086e9f7 updated version file 2023-11-12 21:32:41 -05:00
infinitefusion
c0a6958e0e removed rpg maker file 2023-11-12 21:31:36 -05:00
infinitefusion
1e13847b47 fixes braille text 2023-11-12 18:05:35 -05:00
infinitefusion
008cd91a7f fixes mapping issue 2023-11-12 17:41:03 -05:00
infinitefusion
ac2f38a115 renamed Caves to caves tileset 2023-11-12 17:31:21 -05:00
infinitefusion
d500e494d8 removes debug npc in viridian city 2023-11-12 16:34:56 -05:00
infinitefusion
4695d47827 fixed missing character sprites 2023-11-12 16:15:30 -05:00
infinitefusion
57165b6cbf 6.0 release 2023-11-12 15:37:12 -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
infinitefusion
63d56d7c32 fixed some map stuff 2023-10-20 23:44:41 -04:00
infinitefusion
ad276ab42e removed unfinished quest 2023-10-20 15:30:09 -04:00
infinitefusion
1124d9ce3b Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-10-19 22:45:08 -04:00
infinitefusion
2f4d26a68f Minor map fixes 2023-10-19 22:39:56 -04:00
infinitefusion
0e0969b3d8 updated sprites managers list in credits 2023-10-18 17:13:45 -04:00
infinitefusion
5d59804d51 Merge remote-tracking branch 'origin/main' 2023-09-30 09:19:19 -04:00
infinitefusion
e918744613 fixes head pokemon not being registered in pokedex after fusion 2023-09-30 09:16:41 -04:00
infinitefusion
e280bf2460 Merge pull request #104 from xfix/backup-save-on-save
Backup save when saving
2023-09-30 09:14:16 -04:00
infinitefusion
1f1780cee4 creates backup when saving (original commit: infinitefusion-e18/pull/104/commits/c4ef959e47facac7ac883865ec71f3c3b0907ec1) 2023-09-30 09:13:27 -04:00
infinitefusion
480271a562 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-09-27 22:01:21 -04:00
infinitefusion
d05e4569ea changed new version available text 2023-09-27 22:00:30 -04:00
infinitefusion
18758b007c updated custom sprites list for august pack 2023-09-27 21:18:48 -04:00
infinitefusion
1ea0934c19 changed url for fetching credits file 2023-09-27 21:02:54 -04:00
infinitefusion
24760804e1 Adds shiny chance to downloaded settings file 2023-09-18 21:33:56 -04:00
infinitefusion
581bdf3ca8 increases version number 2023-09-18 17:32:06 -04:00
infinitefusion
a492d15116 increases version number for everyone 2023-09-18 17:31:08 -04:00
infinitefusion
a3e2132600 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-09-17 20:31:30 -04:00
infinitefusion
eba115202d Fixes water effect bug 2023-09-17 20:28:51 -04:00
infinitefusion
09f9f20468 Fixes water effect bug 2023-09-17 20:28:25 -04:00
infinitefusion
71409b6698 updates version number 2023-09-17 19:51:11 -04:00
infinitefusion
50e24198e3 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-09-17 19:45:41 -04:00
infinitefusion
e448583222 fixes infinite splicers bug 2023-09-17 19:45:02 -04:00
infinitefusion
7b08544828 Fixes settings url 2023-09-17 19:44:52 -04:00
infinitefusion
b5bdac6775 fixed infinite splicers bug 2023-09-17 19:42:12 -04:00
infinitefusion
70e605ae79 re-enabled automatic url file download 2023-09-17 19:39:57 -04:00
infinitefusion
bd7b6bfa43 fixes crash when downloading base pokemon sprites 2023-09-17 19:39:26 -04:00
infinitefusion
84648ad7b5 increased version number 2023-09-17 19:01:13 -04:00
infinitefusion
0bb4ba944c automatically download remote urls settings 2023-09-17 19:00:39 -04:00
infinitefusion
bb7072d4cc changes sprites repo to gitlab 2 2023-09-17 18:06:55 -04:00
infinitefusion
9c560c7daf changes sprites repo to gitlab 2023-09-17 18:06:36 -04:00
infinitefusion
ecb0d4d2c3 minor game changes 2023-09-17 17:42:59 -04:00
infinitefusion
fa1bbc8728 updates july spritepack credits 2023-09-01 06:34:22 -04:00
infinitefusion
7f217583d0 updates randomizer file list with new spritepack 2023-09-01 06:30:31 -04:00
infinitefusion
9473fea8b9 updates sprite credits 2023-08-10 08:48:48 -04:00
infinitefusion
64923e1a0d updates custom sprites index with june spritepack 2023-08-10 07:53:06 -04:00
infinitefusion
ab24b9eb11 updates sprite credits file 2023-08-09 23:27:09 -04:00
infinitefusion
6378971055 fixes missing pixel line in outdoor tileset 2023-08-09 21:43:24 -04:00
infinitefusion
0f54173c05 updates some tilesets tiles 2023-08-09 21:26:47 -04:00
infinitefusion
05f9a7ec84 updates new version notification to 5.3.1 2023-08-07 18:57:30 -04:00
infinitefusion
85569a7bd7 Merge branch 'main' into releases 2023-08-07 18:44:51 -04:00
infinitefusion
8f15e963f1 updates version number 2023-08-07 18:43:56 -04:00
infinitefusion
c23bfaa824 Merge remote-tracking branch 'origin/main' into releases
# Conflicts:
#	PBS/items.txt
2023-08-07 18:38:32 -04:00
infinitefusion
9c5ca890f3 updates url for autogen sprites 2023-08-07 18:36:15 -04:00
Konrad Borowski
c4ef959e47 Backup save when saving 2023-07-26 17:53:55 +02:00
infinitefusion
9d6724fda0 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-07-16 20:17:06 -04:00
infinitefusion
e52a14e782 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-07-15 17:34:26 -04:00
infinitefusion
6fd262c526 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-07-11 20:19:15 -04:00
infinitefusion
c311d975cd adds zipped species.dat 2023-07-10 20:37:32 -04:00
infinitefusion
614caf8f4b adds gitignore 2023-07-09 22:18:28 -04:00
infinitefusion
b5489d9d1a Remove pbs files and adds alternate launcher 2023-07-09 22:15:51 -04:00
1701 changed files with 128148 additions and 394005 deletions

9
.gitignore vendored Normal file
View File

@@ -0,0 +1,9 @@
Graphics/Battlers/*
PBS/*
Graphics/Battlers_resized/*
Graphics/CustomBattlers/*
Graphics/Pokemon/FusionIcons/*
Data/SPRITE_CREDS
Data/VERSION
Exported Maps/*
Game.rxproj

Binary file not shown.

BIN
Audio/BGM/uwater_short.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/NECROZMA.ogg Normal file

Binary file not shown.

BIN
Audio/SE/REGICE.ogg Normal file

Binary file not shown.

BIN
Audio/SE/REGIROCK.ogg Normal file

Binary file not shown.

BIN
Audio/SE/REGISTEEL.ogg Normal file

Binary file not shown.

BIN
Audio/SE/SHARPEDO.ogg Normal file

Binary file not shown.

BIN
Audio/SE/angry.wav Normal file

Binary file not shown.

BIN
Audio/SE/cry_DHELMISE.ogg Normal file

Binary file not shown.

BIN
Audio/SE/cry_FROSLASS.ogg Normal file

Binary file not shown.

BIN
Audio/SE/cry_SABLEYE.ogg Normal file

Binary file not shown.

BIN
Audio/SE/cry_SCOLIPEDE.ogg Normal file

Binary file not shown.

View File

@@ -1,5 +1,5 @@
########## CREDITS ###############
Game made by Frogman
Game made by Chardub
*This is NOT an official Pokemon game. The author of this game is not
affiliated with Nintendo in any way
@@ -7,21 +7,21 @@ affiliated with Nintendo in any way
##################################
## Programming / Events ##
#################################
Frogman
Chardub
##############################
## Maps ##
## Maps ##
##############################
Frogman
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 / Dialogies #
# Story / Dialogues #
#################################
Frogman
Chardub
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.
@@ -46,7 +46,7 @@ their sprites.
Intro cinamatic
#####################
Kiwi
Kiwikelly
Custom fusion sprites
#####################
@@ -189,41 +189,36 @@ 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)
Triple Fusion sprites
Tom spiste gr<67>nt
Scrapped Bones
Blackboot
Kiwi
Solo Queue
### Tileset graphics ###
### Custom tileset graphics ###
Kiwikelly
### Public 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,
@@ -234,7 +229,7 @@ with their respective authors' consent
tiles to be used in this pack.
Other tiles:
Frogman, chimcharsfireworkd, Rossay, Shiney570,
Chardub, chimcharsfireworkd, Rossay, Shiney570,
Phyromatical, Gallanty (deviantart)
### Music ###

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.

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