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:main-5.3
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:main
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

279 Commits
main-5.3 ... main

Author SHA1 Message Date
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
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
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
infinitefusion
36094cbaac removes pbs folder 2024-06-28 17:19:06 -04:00
infinitefusion
0a07063d6b Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-28 17:18:35 -04:00
infinitefusion
58c8192dca fix bike sprite 2024-06-28 17:18:14 -04:00
infinitefusion
e15582deef Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2024-06-28 13:24:27 -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
142de56b03 removes project file 2024-04-20 11:43:38 -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
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
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
480271a562 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-09-27 22:01:21 -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
50e24198e3 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases 2023-09-17 19:45:41 -04:00
infinitefusion
85569a7bd7 Merge branch 'main' into releases 2023-08-07 18:44:51 -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
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
12712 changed files with 669004 additions and 508872 deletions
Expand all files Collapse all files

7
.gitignore vendored Normal file
View File

@@ -0,0 +1,7 @@
Graphics/CustomBattlers/local_sprites/*
Graphics/Pokemon/FusionIcons/*
Graphics/CustomBattlers/spritesheets/*
Data/sprites/*
Data/VERSION

BIN
Audio/BGM/band/adjust_volume/band_harp.wav Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Audio/BGM/band/band_full.wav Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Audio/BGM/fullmoonIsland.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/lake_crater.mp3 Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Audio/BGM/newmoonIsland.mp3 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/route38_39.mp3 Normal file
View File

Binary file not shown.

BIN
Audio/BGM/safari.ogg Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Audio/BGM/uwater_short.ogg Normal file
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/SE/CARBINK.ogg Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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