849 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
infinitefusion	fd1e5695ff	Updates available version number	2023-07-02 21:03:53 -04:00
infinitefusion	9c433d88c7	Fixes alt base sprite github url	2023-07-02 20:33:17 -04:00
infinitefusion	681c5e4dbf	Adds option to sort bag	2023-07-02 18:47:17 -04:00
infinitefusion	28c91aec12	Adds streak system to fusion quiz + tracks statistics	2023-07-02 14:22:09 -04:00
infinitefusion	5c4e0daba3	fixes icon names	2023-07-02 12:02:12 -04:00
infinitefusion	3aa94784e1	adds boxlink icon	2023-07-02 10:46:49 -04:00
infinitefusion	c96b308f48	Adds some radio flavor text	2023-07-02 10:39:05 -04:00
infinitefusion	566472416a	Replaces base sprites with custom ones	2023-07-02 10:01:20 -04:00
infinitefusion	660ca160d2	Merge remote-tracking branch 'origin/main'	2023-07-02 00:34:03 -04:00
infinitefusion	25f259b5bd	fusion quiù adjustments	2023-07-02 00:33:38 -04:00
infinitefusion	a79469526f	Merge pull request #89 from SylviBlossom/fix-static-magnet-pull ... Fix Static/Magnet Pull wild encounter modifier	2023-07-01 17:54:22 -04:00
infinitefusion	6c1edae863	Fixes crash when missing fusion icons folder (thanks kurayamiblackheart)	2023-07-01 17:49:35 -04:00
infinitefusion	45c323bdb0	Merge pull request #88 from Jodiark/main ... fix to bug regarding same icon for multiple fusions	2023-07-01 17:43:06 -04:00
infinitefusion	9c8f9e9437	Pokemon no longer get healed in PC	2023-07-01 17:37:51 -04:00
infinitefusion	368c5d4fc0	Fixes crash when a corrupted savefile is detected	2023-07-01 17:20:46 -04:00
infinitefusion	debdbfb1f1	Fixes glitch allowing players to reset choices in fusion quiz	2023-07-01 17:20:26 -04:00
infinitefusion	73f0d18371	Guess that fusion quiz	2023-07-01 16:19:34 -04:00
infinitefusion	6c81ceac8c	Updated gitignore	2023-07-01 13:18:56 -04:00
infinitefusion	b847459468	Added all audio files	2023-07-01 13:15:25 -04:00
infinitefusion	6673f392a9	added all graphics files	2023-07-01 13:11:59 -04:00
infinitefusion	0862689883	Merge remote-tracking branch 'origin/main'	2023-07-01 11:41:31 -04:00
infinitefusion	88c6bcc9d5	Guess that fusion quiz (not events)	2023-07-01 11:40:00 -04:00
infinitefusion	eeb86464e6	adds gitignore to gitignore	2023-06-24 20:35:54 -04:00
infinitefusion	2a51554a57	updated gitignore	2023-06-24 20:34:44 -04:00
infinitefusion	7e87afa721	cleaned up main repo	2023-06-24 19:27:32 -04:00
infinitefusion	77789c8278	wip guess that fusion quiz	2023-06-18 14:01:09 -04:00
infinitefusion	1f19e0d1a3	spriter trainer type	2023-06-17 13:00:54 -04:00
infinitefusion	a82a58df33	spriter fight in gallery	2023-06-17 12:58:57 -04:00
infinitefusion	45fe666a35	more safeguards for wrong files credit format + added sprite managers to game credits	2023-06-11 17:35:58 -04:00
infinitefusion	76daa33bf6	fixes crash when spriters credits list is malformatted	2023-06-11 16:36:26 -04:00
infinitefusion	341273b206	wip generic triple fusions	2023-06-11 15:14:53 -04:00
infinitefusion	9e77256c2a	Merge branch 'main-doubleAbilities' of https://github.com/infinitefusion/infinitefusion-e18 ... Conflicts: Data/MapInfos.rxdata Data/System.rxdata	2023-06-11 13:54:17 -04:00
infinitefusion	fa5f33b22d	update custom sprites list	2023-06-10 18:27:38 -04:00
infinitefusion	9296f8d92a	Fixes fossil reviving crash	2023-06-04 20:11:16 -04:00
infinitefusion	534bf85aa9	haunter ecruteak fix	2023-06-04 19:50:59 -04:00
infinitefusion	f0321d465e	Adds remaining ability triggers for double abilities	2023-06-04 11:39:04 -04:00
infinitefusion	b24fbf533d	Ability splash screen for stats changing abilities in secondary abilities	2023-05-28 14:51:32 -04:00
infinitefusion	59fea87b0d	Dboule abilities stuff	2023-05-27 14:15:19 -04:00
infinitefusion	7bbb18ac43	Adds double ability triggers	2023-05-27 13:49:33 -04:00
infinitefusion	1182afbea3	double abilities splash	2023-05-27 12:37:08 -04:00
infinitefusion	39f9bc5472	palkia, dialga, giratina events	2023-05-22 20:47:09 -04:00
infinitefusion	82149eddb9	Double abilities	2023-05-22 13:16:41 -04:00
infinitefusion	db774ec5c0	Adds extensions for fusion menu	2023-05-22 10:02:36 -04:00
infinitefusion	4b4aae00db	refactor wonderguard check in its own method	2023-05-22 09:57:53 -04:00
infinitefusion	e61a520738	small map fixes	2023-05-22 09:22:46 -04:00
infinitefusion	655546a433	Adds stat to track rare candies use	2023-05-21 09:11:00 -04:00
infinitefusion	8c90b0700a	Move Jasmine to Bond Bridge	2023-05-20 19:39:51 -04:00
infinitefusion	0aa20136f4	Move Jasmine to Bond Bridge	2023-05-20 10:23:13 -04:00
infinitefusion	62f96bf55c	Cinnabar cutscene changes + resort gorgeous fix	2023-05-20 09:48:48 -04:00
SylviBlossom	e7d52aea9b	Fix Static/Magnet Pull wild encounter modifier	2023-05-12 19:48:40 -07:00