DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: DocRock3r:6.2
Branches Tags
DocRock3r:main DocRock3r:develop-6.6 DocRock3r:releases DocRock3r:6.6-prerelease DocRock3r:develop-e21 DocRock3r:rocket-azubat DocRock3r:releases-April DocRock3r:develop DocRock3r:develop-6.4 DocRock3r:develop-entries DocRock3r:whirlIslands DocRock3r:main-5.3 DocRock3r:main-dynamicFusions DocRock3r:main-doubleAbilities DocRock3r:e19-clean-install
DocRock3r:6.7 DocRock3r:6.5 DocRock3r:6.4.5 DocRock3r:6.4 DocRock3r:6.2.4 DocRock3r:6.2.3 DocRock3r:6.2.1 DocRock3r:6.2 DocRock3r:6.1.3 DocRock3r:6.1.2 DocRock3r:6.1.1 DocRock3r:6.1 DocRock3r:6.0.5 DocRock3r:6.0.4 DocRock3r:release-6.0 DocRock3r:release-5.3 DocRock3r:5.3
...
compare: DocRock3r:releases-April
Branches Tags
DocRock3r:develop-6.6 DocRock3r:releases DocRock3r:6.6-prerelease DocRock3r:develop-e21 DocRock3r:rocket-azubat DocRock3r:releases-April DocRock3r:develop DocRock3r:develop-6.4 DocRock3r:develop-entries DocRock3r:main DocRock3r:whirlIslands DocRock3r:main-5.3 DocRock3r:main-dynamicFusions DocRock3r:main-doubleAbilities DocRock3r:e19-clean-install
DocRock3r:6.7 DocRock3r:6.5 DocRock3r:6.4.5 DocRock3r:6.4 DocRock3r:6.2.4 DocRock3r:6.2.3 DocRock3r:6.2.1 DocRock3r:6.2 DocRock3r:6.1.3 DocRock3r:6.1.2 DocRock3r:6.1.1 DocRock3r:6.1 DocRock3r:6.0.5 DocRock3r:6.0.4 DocRock3r:release-6.0 DocRock3r:release-5.3 DocRock3r:5.3

284 Commits
6.2 ... releases-A

Author SHA1 Message Date
chardub
b3f7bf5e9f Improves evolution animation 2025-04-01 03:22:27 -04:00
chardub
681ab5ab3f cries 2025-04-01 02:51:10 -04:00
chardub
0e6d3bc669 corrupted data - fix 2025-03-31 23:47:50 -04:00
chardub
dafa19fa38 corrupted data 2025-03-26 18:25:57 -04:00
chardub
eba2c7c90c more clown nose 2025-03-26 09:54:16 -04:00
chardub
37938f864b clown nose 2025-03-25 16:37:22 -04:00
chardub
4e26dbfeca scribbles 2025-03-20 17:16:52 -04:00
chardub
de1580c54c Secret Jigglypuff 2025-03-20 10:15:42 -04:00
chardub
7f1edad773 Fixes possible softlock with mahogany gym 2025-03-18 22:19:37 -04:00
chardub
46f0c898e0 increments version number 2025-03-17 10:41:09 -04:00
chardub
65d0bcc7c9 Handles exception when failing to create savefil backups 2025-03-17 10:37:22 -04:00
chardub
455bebbd1b Improves npc appearance generation algorithm 2025-03-17 10:36:36 -04:00
chardub
563390c166 Increases color range for generated spriters 2025-03-15 15:20:24 -04:00
chardub
2afa199b6b don't recreate pbs when compiling if missing 2025-03-15 14:52:46 -04:00
chardub
bab284c503 Fixes bad interaction between clothes menu and regi puzzle 2025-03-15 13:44:27 -04:00
chardub
147658bccb re-adds missing sprites to import folder 2025-03-15 12:45:56 -04:00
chardub
2f1c8e2a4d Removes leftover debug events 2025-03-15 12:29:39 -04:00
chardub
5910f28431 Fixes issue with learned moves 2025-03-15 11:58:06 -04:00
chardub
63c54e60c3 spritepack sprites 2025-03-15 10:42:53 -04:00
chardub
b016e42d3c update gitignore 2025-03-15 10:24:22 -04:00
chardub
697ea760b9 adds script for launching with wine 2025-03-15 10:23:01 -04:00
chardub
d966ee00cf custom battlers files 2025-03-15 10:16:32 -04:00
chardub
a3bbf1a9a8 6.5 release 2025-03-15 10:00:37 -04:00
chardub
7012af625d Updates dye kit menu 2025-03-15 09:37:54 -04:00
chardub
88ed3c000e adds icons for dye kit items 2025-03-14 19:42:23 -04:00
chardub
b53ffd0c73 Removes quitmenu prompt when exiting clothes menu 2025-03-14 15:18:23 -04:00
chardub
048e51b9ae Fixes some legendaries not respawning 2025-03-14 12:43:24 -04:00
chardub
47876255e9 Removes some debugging logs 2025-03-14 11:32:15 -04:00
chardub
d754fc45f5 Removes commented code 2025-03-14 11:21:43 -04:00
chardub
03b832a897 Fixes hats menu navigation issue 2025-03-14 11:19:44 -04:00
chardub
5343792f8c Fixes swapping hats visual glitch when only wearing one hat 2025-03-14 11:06:44 -04:00
chardub
324e8b5d18 Adds more custom pokedex entries 2025-03-13 10:50:24 -04:00
chardub
ce8d182b2f Adds some hats and clothes 2025-03-13 10:49:05 -04:00
chardub
4edd8e9719 Fixes graphical glitch when pressing shift on sprites pokedex page 2025-03-13 10:02:12 -04:00
chardub
aa396cf402 Battle menu: Automatically select the Fight option after switching out a Pokémon 2025-03-12 10:45:54 -04:00
chardub
3470c75b02 Removes debugging logs 2025-03-11 16:15:36 -04:00
chardub
7358d67e7e Fixes issue with possible uninitialized dyed items map when opening clothing menus 2025-03-11 14:04:42 -04:00
chardub
701ea9ab11 clothes menu crash fix 2025-03-10 13:35:04 -04:00
chardub
36851c7bb7 Hats menu navigation improvements 2025-03-10 12:59:14 -04:00
chardub
3d6e76a41e Fixes issue when putting on clothes 2025-03-09 22:34:42 -04:00
chardub
bc2d48488e changes engineer, traveller and gambler npc overworld sprites 2025-03-09 21:34:19 -04:00
chardub
f3ebd7e7f5 updates gambler sprite 2025-03-09 18:12:44 -04:00
chardub
6a072917b8 Fixes accidental file rename 2025-03-09 18:06:23 -04:00
chardub
0c06b7a6c9 Fixes new game crash 2025-03-09 18:04:48 -04:00
chardub
14f99f7efb Fixes issue with hats shops 2025-03-09 16:47:16 -04:00
chardub
b14d9d491c Adds moar character customization options 2025-03-09 16:20:27 -04:00
chardub
071621b8dd Fixes issue with hat swapping 2025-03-09 15:38:16 -04:00
chardub
dc4ec939cd Clothes and Hats selection menu now opens on current worn outfit 2025-03-09 13:45:59 -04:00
chardub
a974994d15 Adds Dye Kit item 2025-03-09 13:45:31 -04:00
chardub
6b978c0ebc double hats menu UI stuff 2025-03-09 12:49:07 -04:00
chardub
8b8b348ed1 Double hats menu 2025-03-09 12:48:32 -04:00
chardub
e9bdea5bad Double hats UI (except dyes) 2025-03-08 16:29:21 -05:00
chardub
6248ccd061 Fixes thief 2025-03-08 15:24:35 -05:00
chardub
60de077d01 double hats UI wip 2025-03-08 12:52:55 -05:00
chardub
20a5811ab8 Fixes Pokedex entries issues 2025-03-07 10:42:46 -05:00
chardub
32874d8a38 Adds second hat to continue screen 2025-03-07 09:49:42 -05:00
chardub
d9ef1cd12e Promps users for updating spritepack files 2025-03-06 18:57:43 -05:00
chardub
ccb05dc509 Fixes critical capture (based on 70bc2480f4) 2025-03-06 11:55:30 -05:00
chardub
4ed504d817 Fixes minimize glitch after soft reset 2025-03-06 11:44:05 -05:00
chardub
96f60d8cb9 fixes egg moves issue with pokemon that breed with incense in the official games, updates intro screen 2025-03-06 09:42:48 -05:00
chardub
45bf331031 Clothes given by fossil npc final encounter 2025-03-03 09:38:57 -05:00
chardub
4ef0e87577 nvm 2025-03-02 21:34:37 -05:00
chardub
4f1accc017 Fixes an issue causing checks for rate limiting to be counted 2025-03-02 21:30:44 -05:00
chardub
c41773d06f misty gym & learned moves stuff wip 2025-03-01 15:51:49 -05:00
chardub
5398a5aa78 Replace Dig TM with Return TM on Route 15 #101 (KamilaBorowska) 2025-03-01 15:41:41 -05:00
chardub
0d7ea25203 mahogany town gym trainers 2025-03-01 11:31:34 -05:00
chardub
98f753eb97 updates several gym leader graphics 2025-02-26 15:04:14 -05:00
chardub
f1f00202c2 fixes level graphics in party screen 2025-02-24 21:29:04 -05:00
chardub
c4242bb0b6 fixes level graphics 2025-02-24 21:17:07 -05:00
chardub
c3b501dc28 cc data 2025-02-24 20:08:22 -05:00
chardub
a6649ce82d Adds more character customization options 2025-02-24 20:06:41 -05:00
chardub
4fcc3e1516 optimized graphics 2025-02-24 16:58:14 -05:00
chardub
553d862168 Merge branch 'develop' of https://github.com/infinitefusion/infinitefusion-e18 into develop 2025-02-24 11:52:54 -05:00
infinitefusion
1dba2e41ae Merge pull request #124 from fellow-dev-simon/dna-reverser-fix 
DNAReverser Removal Bug
 2025-02-24 11:49:11 -05:00
infinitefusion
f15fd29c39 Merge pull request #100 from KamilaBorowska/fix-aromatherapy-bug 
Make Aromatherapy work when user is not statused
 2025-02-24 11:44:27 -05:00
chardub
c38d513a67 Replace Dig TM with Return TM on Route 15 #101 (KamilaBorowska) 2025-02-24 11:34:43 -05:00
chardub
92feb7c714 Remove league check (unused) from list of Hidden Ability maps (KamilaBorowska) 2025-02-24 11:28:46 -05:00
infinitefusion
892c2b62f6 Merge pull request #116 from homie-estate/turtwig-fix 
Turtwig fix #114
 2025-02-24 11:23:01 -05:00
chardub
f1d21b10c6 updates readme 2025-02-24 11:01:40 -05:00
infinitefusion
687aa86e1c Merge pull request #128 from GLugia/bug-fixes 
Fix for Drain vs Liquid Ooze
 2025-02-24 10:57:00 -05:00
chardub
707bac5d65 adds some more character customization options 2025-02-22 23:48:37 -05:00
chardub
c8f2a37d5a updates pbsà 2025-02-22 12:28:55 -05:00
chardub
5eac2dd43a changes tm80 to rock slide 2025-02-22 12:28:02 -05:00
chardub
9b5f376ed9 updates misty sprite 2025-02-22 11:50:04 -05:00
chardub
5ed090229b updates sabrina sprite & Meloetta 2025-02-21 20:56:31 -05:00
chardub
f9095f2d06 hair can be one frame long 2025-02-21 20:38:56 -05:00
chardub
c6f69edf9c Fixes meloetta form change 2025-02-21 20:38:23 -05:00
chardub
a52af5a021 Changes Miss Melody (Meloetta) to Aria/Pirouette fusion 2025-02-21 19:49:16 -05:00
chardub
80eef3b1c4 Custom appearances for art gallery spriters 2025-02-21 12:30:56 -05:00
chardub
0f416eecaf Refactor: double hats 2025-02-20 17:10:24 -05:00
chardub
d099d788f4 Refactor: double hats 2025-02-20 17:09:56 -05:00
chardub
f835ff8209 Refactor: double hats 2025-02-20 17:09:48 -05:00
chardub
810154c516 fixes hair animation 2025-02-19 22:22:26 -05:00
chardub
76ecb4e2e0 Secondary Hat (WIP) 2025-02-18 23:01:49 -05:00
chardub
1c665bf636 Small map fixes 2025-02-18 19:39:42 -05:00
chardub
0f38d7933b Adds more dishes at once in SS Anne restaurant quest 2025-02-18 11:53:42 -05:00
chardub
4089c956d7 Adds way to favorite hats and clothes and item to quickly swap to them 2025-02-18 11:06:14 -05:00
chardub
133f01218b fixes reset cache option menu crash 2025-02-17 22:33:38 -05:00
chardub
c5cff0dfb9 fixes rare crashes from double team, minimize, dragon rage, sonic boom 
taken from:
720c2a4661
 2025-02-17 20:55:01 -05:00
chardub
1d2139df32 Get clown nose by donating to clowns 2025-02-17 20:24:35 -05:00
chardub
8352043c4c fixes crash on fusion screen 2025-02-17 19:41:49 -05:00
chardub
67d32e7c18 Fixes music in mt. moon square 2025-02-17 18:23:02 -05:00
chardub
1ddb9ba24a Mahogany gym trainers now notice player when standing next to them + adds referee that sends back the puck 2025-02-17 15:01:14 -05:00
chardub
4fa7292bdd Adds new hats & easter egg pokeballs 2025-02-17 11:06:32 -05:00
chardub
cb39bac568 Adds option for toggling custom eggs 2025-02-16 16:16:39 -05:00
chardub
541c98ba6b Adds option for toggling custom eggs 2025-02-16 16:16:32 -05:00
chardub
28a982ce15 Fixes F12 soft reset 2025-02-15 14:19:00 -05:00
chardub
fdcfbb5bb4 Fusion cries play both the head and body pokemon cries 2025-02-15 12:23:44 -05:00
chardub
05b1af28e0 Capitalizes suffix in Mr. Mime fusions name 2025-02-13 21:43:51 -05:00
chardub
0f58800fd1 adds new team flags 2025-02-13 20:43:46 -05:00
chardub
f251cf37ab Fixes goldenrod map transitions 
Fixes message in dresser in player room
Fixes tiles in kindle road underwater
Fixes black border on route 43
 2025-02-12 09:48:21 -05:00
chardub
d23e2ff98a Fixes super Gourgeist attack stat 2025-02-10 10:42:58 -05:00
chardub
871045ca46 adds new hairstyles to Saffron boutique 2025-02-08 16:13:07 -05:00
chardub
0c918bbfcb updates gitignore 2025-02-08 14:48:36 -05:00
chardub
2488a2575e removes dev files 2025-02-08 11:31:14 -05:00
chardub
2c5b161029 lowers number of pokemon to catch for first celadon rocket mission from 4 to 3 2025-02-08 11:00:01 -05:00
chardub
32dc832b5c santa hat 2025-02-08 00:06:29 -05:00
chardub
9fa7dac43f oops spritesheets 2025-02-07 23:54:34 -05:00
chardub
d3e4fd3d33 updates gitignore 2025-02-07 23:40:57 -05:00
chardub
16b2deeefb adds missing folder 2025-02-07 23:21:28 -05:00
chardub
b8d479b801 Some minor map fixes 2025-02-07 22:47:02 -05:00
chardub
38377b703e updates version number 2025-02-07 22:29:12 -05:00
chardub
1fed55f7fa adds new character customization options 2025-02-07 22:28:44 -05:00
chardub
3ebd3fd68a Adds some character customization data 2025-02-07 21:04:35 -05:00
chardub
2fcc7fc9cd glitched mask obtain method 2025-02-07 20:22:23 -05:00
chardub
692a25bd8e Lowers default game volume 2025-02-07 11:15:41 -05:00
chardub
24943e092f fixes typo 2025-02-06 21:18:13 -05:00
chardub
935c548016 fixes normal type expert team 2025-02-06 21:14:19 -05:00
chardub
44f114b5e0 Adds debug function to change a pokemon's species from head and body pokedex numbers 2025-02-06 19:47:11 -05:00
chardub
1809d246b6 Clears celadon TR rocket HQ after getting recognized by Archer in Mt. Ember 2025-02-06 19:17:41 -05:00
infinitefusion
a9de6b6c97 updates sinnoh triple fusion sprite 2025-02-02 18:34:33 -05:00
infinitefusion
1499465ce0 santa claus sprite fix 2025-02-02 16:34:54 -05:00
infinitefusion
f72c7fff7b Adds CUSTOM_DEX_FILE_URL file url to settubgs 2025-02-02 15:23:55 -05:00
infinitefusion
a9267b7bad Adds credits file url to settubgs 2025-02-02 15:14:54 -05:00
infinitefusion
fed8490fc3 Removes debug code 2025-02-02 14:27:22 -05:00
infinitefusion
a62544e8d8 Entering TR HQ after Team Rocket has disbanded automatically completes any unfinished quests 2025-02-02 14:22:22 -05:00
infinitefusion
9d30b0e0fb Adds hint NPC in hotel for last cerulean rocket quest 2025-02-02 12:58:02 -05:00
infinitefusion
5640871dcd fixes missing minior cry 2025-02-02 12:07:34 -05:00
infinitefusion
e7d2330a2f Fix for TR quests not registered in quest log 2025-02-01 00:20:45 -05:00
infinitefusion
71894707b1 Lowers GS Ball quest requirement to 50 2025-01-31 16:29:49 -05:00
infinitefusion
727bccfe61 Adds Pinkan Berry to "do not randomize" items list 2025-01-31 16:10:20 -05:00
infinitefusion
e0201bf021 Adds option to swap base color in hair dye menu 2025-01-31 16:09:57 -05:00
infinitefusion
8f1f4a0f9b Makes it possible to finish construction materials quest after beating league 2025-01-31 15:22:26 -05:00
infinitefusion
8bcc4f226b fixes missing hall of fame music 2025-01-25 14:21:00 -05:00
infinitefusion
5fc4935a0c Removes Pinkan island troll rock 2025-01-22 16:59:00 -05:00
infinitefusion
064a09664a adds new batch of custom pokedex entries 2025-01-22 10:15:04 -05:00
infinitefusion
6c621d04e4 small fixes 2025-01-18 10:35:28 -05:00
infinitefusion
d523f30eb7 fIXES SCRAGGY POKERADAR 2025-01-17 13:24:31 -05:00
infinitefusion
b2b8a4ec12 Makes Magikarp contest easier the first time 2025-01-13 21:51:19 -05:00
infinitefusion
33ab16c3c6 Makes Magikarp contest easier the first time 2025-01-13 21:50:39 -05:00
infinitefusion
4730228557 updates outdoor tileset 2025-01-13 21:16:23 -05:00
infinitefusion
984d30d912 spritesheets shit 2025-01-10 22:38:43 -05:00
infinitefusion
5fde2bbc1a Fixes team not being recovered after replaying pinkan island from rocket side 2025-01-08 18:18:03 -05:00
infinitefusion
743367f514 skip credits on mobile 2025-01-06 00:43:40 -05:00
infinitefusion
f6fb6ff545 Fixes crash when backing out of menu on art gallery 2nd floor statistics npc 2025-01-06 00:32:15 -05:00
infinitefusion
fdd672c0de Makes it not possible to put hats on triple fusions (temp fix to prevent crash) 2025-01-06 00:31:43 -05:00
infinitefusion
7a2978a329 normal type expert compatibiolity with older savefiles 2025-01-05 11:18:52 -05:00
infinitefusion
0e42591bfd fixes base sprites importing 2025-01-04 20:02:50 -05:00
infinitefusion
028c6d1442 adds ash hat in viridian forest 2025-01-04 13:05:31 -05:00
infinitefusion
9f95e6a263 resized spritesheets 2025-01-02 16:27:04 -05:00
infinitefusion
bf06c26344 updates spritesheets to spritepack 2025-01-02 14:11:37 -05:00
infinitefusion
f9f6f35236 Fixes sprite importing 2025-01-02 14:09:09 -05:00
infinitefusion
804578f4e3 Fixes updated spritesheets list not resetting when new spritepack is released 2025-01-02 09:51:03 -05:00
infinitefusion
234f22e78e Use spritesheets of 96x96 sprites 2025-01-01 16:29:04 -05:00
infinitefusion
84d1fe3d86 Fixes quests npc statistics on new savefiles 2024-12-30 20:01:59 -05:00
infinitefusion
d1c0e4eaf9 Fixes fighting expert crash 2024-12-30 19:55:38 -05:00
infinitefusion
39d3c159b1 Updates version number 2024-12-30 15:59:49 -05:00
infinitefusion
6a3b607690 Fixes issue when wearing hat 2024-12-30 15:58:35 -05:00
infinitefusion
c2954b8e84 Fix game now gives back missed HMs if any 2024-12-30 15:58:23 -05:00
infinitefusion
0a7f0cbbef removes pbs files 2024-12-30 13:21:49 -05:00
infinitefusion
b547813995 Fixes issue with hotel quest rewards 2024-12-30 12:52:06 -05:00
infinitefusion
46e7636c65 Fixes bug preventing game from downloading newest sprites 2024-12-30 12:11:35 -05:00
infinitefusion
7cc97fb7b9 Typos and grammar mistakes 2024-12-30 11:10:57 -05:00
infinitefusion
49bf30987f Fixes always getting kicked out of celadon hideout after removing your uniform while inside 2024-12-30 10:51:34 -05:00
infinitefusion
83efcd1b35 graphics fixes 2024-12-30 10:44:31 -05:00
infinitefusion
de9029eb1b Fixes clothes/hats menu 2024-12-29 15:11:31 -05:00
infinitefusion
3415c85618 Fixes HMs getting randomized when random gym types are enabled 2024-12-29 12:43:26 -05:00
infinitefusion
de8f9603dc Track dyed clothes individually 2024-12-27 22:58:50 -05:00
infinitefusion
5e07802681 fixes type experts not removing randomized gym type 2024-12-25 14:38:14 -05:00
infinitefusion
099af82e47 split dex entry fixes 2024-12-25 14:33:52 -05:00
infinitefusion
c03fc60c05 updates version number 2024-12-25 14:20:35 -05:00
infinitefusion
c473e6ee72 Fixes diancie forcing player to release their pokemon to keep it 2024-12-25 14:20:12 -05:00
infinitefusion
d9be9d17f5 adds all_entries file 2024-12-25 14:13:40 -05:00
infinitefusion
479cfd07fd dynamic autogen entries 2024-12-25 14:13:03 -05:00
GLugia
256a045607 Fix for Drain vs Liquid Ooze 
When a draining move KOs a Pokemon with Liquid Ooze, the ability would not activate. This fixes that.
 2024-12-25 12:11:05 -05:00
infinitefusion
0a59474542 Removes autogen dex entries 2024-12-24 09:30:02 -05:00
infinitefusion
17ca4dcd69 fixes text 2024-12-23 23:58:48 -05:00
infinitefusion
950c942b20 Adds toggle for displaying generated entries or not + fixes issue when cleaning json strings 2024-12-23 23:52:04 -05:00
infinitefusion
d2e5dfb8cd Fixes crash when setting the device option twice 2024-12-22 16:56:31 -05:00
infinitefusion
a674134c62 Skip json string cleaning on mobile 2024-12-22 13:44:22 -05:00
infinitefusion
92818790b9 fixes unsynced pokedex issue 2024-12-22 12:17:17 -05:00
infinitefusion
f6f85fab1b fixes unsynced pokedex issue 2024-12-22 12:08:14 -05:00
infinitefusion
2ae331fd14 fixes crash 2024-12-22 12:05:04 -05:00
infinitefusion
b89420afd7 Fixes possible battle error when registering pokemon in pokedex 2024-12-22 11:33:14 -05:00
infinitefusion
5085a89614 fixes some misnamed outfits 2024-12-22 11:28:12 -05:00
infinitefusion
db8f0d6d3e Fixes in-battle form changes 2024-12-22 11:27:23 -05:00
infinitefusion
57d0118ee9 Fixes some outfit and trainer bugs 2024-12-22 11:11:14 -05:00
infinitefusion
fd053345b1 fixes crash when backing out of elevator menu 2024-12-21 21:19:25 -05:00
infinitefusion
5034855f98 fixes isOutdoor 2024-12-21 21:14:44 -05:00
infinitefusion
4cdd6878fb Adds missing hats 2024-12-21 19:47:10 -05:00
infinitefusion
a19b64ebea Fixes pinkan island bosses not resetting properly 2024-12-21 18:35:00 -05:00
infinitefusion
0e8e7da039 Fixes pinkan island bosses not resetting properly 2024-12-21 18:34:11 -05:00
infinitefusion
d22e6b0208 Fixes crash for entries 2024-12-21 18:20:50 -05:00
infinitefusion
a6dc5167d1 Fixes crash when swapping diancie for another pokemon after catching 2024-12-21 17:14:09 -05:00
infinitefusion
c846150afd Fixes crash in safari zone because of type icons 2024-12-21 17:11:30 -05:00
infinitefusion
81489ec8e6 fixes crash with ai entries on mobile 2024-12-21 17:00:22 -05:00
infinitefusion
28d3ffc074 fixes issue with letterless sprites not being picked automatically 2024-12-21 13:14:35 -05:00
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
Simon Fedick
7bb75aaf1d Fixed DNAReverser deletion bug 2024-08-20 19:20:34 +02: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
Edward Perpich
2bf0b6d104 fix turtwigs name in the split names 2024-03-01 17:24:27 -05:00
Konrad Borowski
bd11977c80 Make Aromatherapy work when user is not statused 2023-07-23 09:19:00 +02:00
11519 changed files with 497186 additions and 259991 deletions
Expand all files Collapse all files

21
.gitignore vendored
View File

@@ -1,8 +1,17 @@
Graphics/Battlers/*
Graphics/Battlers_resized/*
Graphics/CustomBattlers/*
Graphics/Battlers/*
Graphics/CustomBattlers/local_sprites/*
Graphics/Pokemon/FusionIcons/*
Data/SPRITE_CREDS
Graphics/CustomBattlers/spritesheets
Graphics/CustomBattlers/*
Data/sprites/*
Data/VERSION
infinitefusion.sh
Data/sprites/CUSTOM_SPRITES
Data/sprites
Data/sprites/updated_spritesheets_cache
Data/sprites/sprites_rate_limit.log
.gitignore
Game.rxproj
.DS_Store
PBS/*
Game.rxproj
rpgmaker.sh

BIN
Audio/BGM/BLAZIKEN.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/GENGAR.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/Hall of Fame.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/INTRO_music_cries.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/MISSINGNO.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/NIDORINO.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/Pallet Town.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/Pokemon Red-Blue Opening.mp3
View File

Binary file not shown.

BIN
Audio/BGM/Pokémon Center - Pokémon HeartGold-SoulSilver.mp3
View File

Binary file not shown.

BIN
Audio/BGM/Surfing (Kanto) - Remastered.mp3
View File

Binary file not shown.

BIN
Audio/BGM/corrupted.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/eusine.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/gym_kanto.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/pokecenter copy.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/pokecenter.mp3
View File

Binary file not shown.

BIN
Audio/BGM/pokecenter.wav Normal file
View File

Binary file not shown.

BIN
Audio/BGM/police_interrogation.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/shop.mp3
View File

Binary file not shown.

BIN
Audio/BGM/underwater.wav Normal file
View File

Binary file not shown.

BIN
Audio/BGM/uwater.mp3
View File

Binary file not shown.

BIN
Audio/ME/Pkmn get.ogg Normal file
View File

Binary file not shown.

BIN
Audio/ME/coloseum_theme..mp3 Normal file
View File

Binary file not shown.

BIN
Audio/ME/rocketQuest.ogg Normal file
View File

Binary file not shown.

BIN
Audio/ME/spotted_police.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/ME/wild-victory.mp3
View File

Binary file not shown.

0
Audio/SE/Cries/CARBINK.ogg → Audio/SE/CARBINK.ogg
View File

BIN
Audio/SE/Cries/ABOMASNOW.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABOMASNOW_1.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABRA.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABRA.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABSOL.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABSOL.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ABSOL_1.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ACCELGOR.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AEGISLASH.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AEGISLASH.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AERODACTYL.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AERODACTYL.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AERODACTYL_1.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AGGRON.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AGGRON.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AGGRON_1.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AIPOM.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AIPOM.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALAKAZAM.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALAKAZAM.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALAKAZAM_1.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALCREMIE.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALOMOMOLA.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALTARIA.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALTARIA.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ALTARIA_1.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMAURA.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMAURA.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMBIPOM.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMBIPOM.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMOONGUSS.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMPHAROS.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMPHAROS.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AMPHAROS_1.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ANORITH-2.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ANORITH.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ANORITH.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/APPLETUN.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/APPLIN.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARAQUANID.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARBOK.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARBOK.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCANINE.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCANINE.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCANINE.wav Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCEUS.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCEUS.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCEUS.wav Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCHEN.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCHEOPS.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCTOVISH.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARCTOZOLT.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARIADOS.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARIADOS.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARMALDO.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARMALDO.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AROMATISSE.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARON.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARON.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARROKUDA.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARTICUNO.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/ARTICUNO.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AUDINO.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AUDINO_1.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AURORUS.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AURORUS.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AVALUGG.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AXEW.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AXEW.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZELF.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZUMARILL.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZUMARILL.ogg
View File

Binary file not shown.

BIN
Audio/SE/Cries/AZURILL.mp3 Normal file
View File

Binary file not shown.

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