Commit Graph

Select branches

Hide Pull Requests

6.6-prerelease

develop

develop-6.4

develop-6.6

develop-e21

develop-entries

e19-clean-install

main

main-5.3

main-doubleAbilities

main-dynamicFusions

releases

releases-April

rocket-azubat

whirlIslands

#1

#100

#101

#102

#103

#104

#105

#107

#109

#110

#116

#117

#118

#120

#122

#123

#123

#124

#127

#128

#131

#131

#132

#133

#134

#134

#135

#136

#137

#137

#139

#140

#141

#143

#144

#146

#147

#148

#148

#149

#152

#152

#153

#154

#154

#155

#70

#71

#74

#75

#76

#86

#87

#88

#89

#90

#90

#95

#96

#98

#99

5.3

6.0.4

6.0.5

6.1

6.1.1

6.1.2

6.1.3

6.2

6.2.1

6.2.3

6.2.4

6.4

6.4.5

6.5

6.7

release-5.3

release-6.0

Mono Color

• 8287f32a5e Fixed another crash when entering a map with no map metadata, fixed Sky Drop failing causing the target to remain in the air, decapitalised some Debug menu text Maruno17 2023-07-12 21:06:54 +01:00
• 6fd262c526 Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases infinitefusion 2023-07-11 20:19:15 -04:00
• 9106833a9d updates game version to 5.3.0.6 infinitefusion 2023-07-11 20:10:41 -04:00
• c615791bad Fixes bad egg resize in pc infinitefusion 2023-07-11 20:09:06 -04:00
• e7778b72b9 Fixes crash when can't copy file when generating fusion icon infinitefusion 2023-07-11 19:53:55 -04:00
• c311d975cd adds zipped species.dat infinitefusion 2023-07-10 20:37:32 -04:00
• 614caf8f4b adds gitignore infinitefusion 2023-07-09 22:18:28 -04:00
• b5489d9d1a Remove pbs files and adds alternate launcher infinitefusion 2023-07-09 22:15:51 -04:00
• e663541a88 fixes route 1 music infinitefusion 2023-07-09 16:51:15 -04:00
• 172797184e Fixes crash when sending bait in safari zone release-5.3 infinitefusion 2023-07-09 16:04:54 -04:00
• 172180790b Eusine give back stolen pokemon in goldenrod infinitefusion 2023-07-09 10:52:35 -04:00
• fc243c6ac7 Removes option to fuse from PC while holding a pokemon (the option did nothing) infinitefusion 2023-07-08 12:18:27 -04:00
• 95779bfccb adds missing several sound effects infinitefusion 2023-07-08 10:09:11 -04:00
• 78caa8fc21 Fixes crash when trying to revive fossil after updating from older version infinitefusion 2023-07-08 09:07:18 -04:00
• 0bbbbea686 Added more prizes to fusion quiz and adjusted prize exchange prices infinitefusion 2023-07-04 20:41:24 -04:00
• 45bb8d5946 Fix fusion icons infinitefusion 2023-07-03 18:41:46 -04:00
• 6e1dd22df8 FIxes mareanie doll not working infinitefusion 2023-07-03 12:42:40 -04:00
• 0fca95c637 Fixes boon island warps infinitefusion 2023-07-03 07:48:27 -04:00
• dbfaf352bc Fixes abilities activating twice infinitefusion 2023-07-02 22:26:07 -04:00
• 33a76f1a0c Fixes issue with learning tm 5.3 infinitefusion 2023-07-02 21:53:38 -04:00
• fd1e5695ff Updates available version number infinitefusion 2023-07-02 21:03:53 -04:00
• 9c433d88c7 Fixes alt base sprite github url infinitefusion 2023-07-02 20:33:17 -04:00
• 681c5e4dbf Adds option to sort bag infinitefusion 2023-07-02 18:47:17 -04:00
• 28c91aec12 Adds streak system to fusion quiz + tracks statistics infinitefusion 2023-07-02 14:22:09 -04:00
• 5c4e0daba3 fixes icon names infinitefusion 2023-07-02 12:02:12 -04:00
• 3aa94784e1 adds boxlink icon infinitefusion 2023-07-02 10:46:49 -04:00
• c96b308f48 Adds some radio flavor text infinitefusion 2023-07-02 10:39:05 -04:00
• 566472416a Replaces base sprites with custom ones infinitefusion 2023-07-02 10:01:20 -04:00
• 660ca160d2 Merge remote-tracking branch 'origin/main' infinitefusion 2023-07-02 00:34:03 -04:00
• 25f259b5bd fusion quiù adjustments infinitefusion 2023-07-02 00:33:38 -04:00
• a79469526f Merge pull request #89 from SylviBlossom/fix-static-magnet-pull infinitefusion 2023-07-01 17:54:22 -04:00
• 6c1edae863 Fixes crash when missing fusion icons folder (thanks kurayamiblackheart) infinitefusion 2023-07-01 17:49:35 -04:00
• 104bf2b598 Added some graphics filenames to the core messages Maruno17 2023-07-01 22:49:02 +01:00
• 45c323bdb0 Merge pull request #88 from Jodiark/main infinitefusion 2023-07-01 17:43:06 -04:00
• 9c8f9e9437 Pokemon no longer get healed in PC infinitefusion 2023-07-01 17:37:51 -04:00
• 368c5d4fc0 Fixes crash when a corrupted savefile is detected infinitefusion 2023-07-01 17:20:46 -04:00
• debdbfb1f1 Fixes glitch allowing players to reset choices in fusion quiz infinitefusion 2023-07-01 17:20:26 -04:00
• 2986ab3ebb Rewrote mkxp.json, fix crash when entering a map with no map metadata, fixed Battle Factory menu text misalignment Maruno17 2023-07-01 22:11:02 +01:00
• 73f0d18371 Guess that fusion quiz infinitefusion 2023-07-01 16:19:34 -04:00
• 6c81ceac8c Updated gitignore infinitefusion 2023-07-01 13:18:56 -04:00
• b847459468 Added all audio files infinitefusion 2023-07-01 13:15:25 -04:00
• 6673f392a9 added all graphics files infinitefusion 2023-07-01 13:11:59 -04:00
• 0862689883 Merge remote-tracking branch 'origin/main' infinitefusion 2023-07-01 11:41:31 -04:00
• 88c6bcc9d5 Guess that fusion quiz (not events) infinitefusion 2023-07-01 11:40:00 -04:00
• 2078f6b116 Ensured consistent PBS file layouts, fixed some script file numberings Maruno17 2023-06-27 20:38:15 +01:00
• 60f8a0cf7b Fixed potential slight irregularities in effect chances of elemental Fang moves, tweaked how credits are gathered, Maruno17 2023-06-27 19:16:14 +01:00
• aecd9e5bb6 Tidying up for v21's release Maruno17 2023-06-25 22:31:05 +01:00
• 22fa0f9c0b Added messages_core.dat and extracted text from it to GitHub, moved game credits to Settings, made credits translatable, tweaked some messages Maruno17 2023-06-25 16:53:13 +01:00
• eeb86464e6 adds gitignore to gitignore infinitefusion 2023-06-24 20:35:54 -04:00
• 2a51554a57 updated gitignore infinitefusion 2023-06-24 20:34:44 -04:00
• 7e87afa721 cleaned up main repo infinitefusion 2023-06-24 19:27:32 -04:00
• 7d77c5f3fc Tweaked some overworld weather animations, added NPCTrainer#version, added Debug function for editing more things in the phone and its contacts Maruno17 2023-06-24 23:52:09 +01:00
• 4fc0806c8a Ensured random dungeons place large events properly Maruno17 2023-06-20 19:26:40 +01:00
• 17e8be9dca Fixed error in Powder's backfire message, fixed move disruption affecting recharge moves when it shouldn't, fixed error when Shell Side Arm has no targets, fixed AI not unregistering Mega Evolution if it won't do so after all Maruno17 2023-06-19 23:55:49 +01:00
• 539bc0fb50 More AI bug fixes, more work on testing AI Maruno17 2023-06-18 23:36:06 +01:00
• b5e37248b9 Pokémon sent into battle now default to the Fight option, fixed bugs in Instruct, fixed some AI bugs, fixed parameter mixup for def pbMoveCanTarget?, renamed function to function_code everywhere, fixed black party Pokémon icons in storage, added some more AI testing code Maruno17 2023-06-18 20:12:36 +01:00
• 77789c8278 wip guess that fusion quiz infinitefusion 2023-06-18 14:01:09 -04:00
• 1f19e0d1a3 spriter trainer type infinitefusion 2023-06-17 13:00:54 -04:00
• a82a58df33 spriter fight in gallery infinitefusion 2023-06-17 12:58:57 -04:00
• 9c2a9130a5 Consolidated code for the player interacting in the overworld, fixed bad splash screen animations, added ShowQuantity property to items.txt, fixed Quick Draw and Aroma Veil, fixed text alignment in long list of regional Dexes in Pokédex, added better error message in load screen if player's charset is missing Maruno17 2023-06-12 22:32:41 +01:00
• 45fe666a35 more safeguards for wrong files credit format + added sprite managers to game credits infinitefusion 2023-06-11 17:35:58 -04:00
• 76daa33bf6 fixes crash when spriters credits list is malformatted infinitefusion 2023-06-11 16:36:26 -04:00
• 341273b206 wip generic triple fusions infinitefusion 2023-06-11 15:14:53 -04:00
• 9e77256c2a Merge branch 'main-doubleAbilities' of https://github.com/infinitefusion/infinitefusion-e18 infinitefusion 2023-06-11 13:54:17 -04:00
• fa5f33b22d update custom sprites list infinitefusion 2023-06-10 18:27:38 -04:00
• 20affb4345 Update 004_Game_Map.rb (#210) ENLS 2023-06-06 12:44:08 -07:00
• 9296f8d92a Fixes fossil reviving crash infinitefusion 2023-06-04 20:11:16 -04:00
• 534bf85aa9 haunter ecruteak fix main-doubleAbilities infinitefusion 2023-06-04 19:50:59 -04:00
• 679e9d42dc Moved Poké Radar encounters into encounters.txt, added Setting/map metadata for reflection rippling, fixed def minimum_level, fixed ice/waterfalls forcing movement even when holding Ctrl in Debug mode, Pokédex no longer shows genders for species without gender differences Maruno17 2023-06-04 20:40:42 +01:00
• f0321d465e Adds remaining ability triggers for double abilities infinitefusion 2023-06-04 11:39:04 -04:00
• 3470f9769c Synced FPS to monitor's refresh rate, fixed broken waterfall movement Maruno17 2023-06-03 22:33:49 +01:00
• 1901675e33 Finished FPS agnosticism, removed particle engine Maruno17 2023-06-03 21:55:02 +01:00
• b24fbf533d Ability splash screen for stats changing abilities in secondary abilities infinitefusion 2023-05-28 14:51:32 -04:00
• 68de25562a Removed last possible usages of Graphics.frame_rate and Graphics.frame_count, improved screen scrolling code, player now animates walking into a wall Maruno17 2023-05-28 17:25:30 +01:00
• 59fea87b0d Dboule abilities stuff infinitefusion 2023-05-27 14:15:19 -04:00
• 7bbb18ac43 Adds double ability triggers infinitefusion 2023-05-27 13:49:33 -04:00
• 1182afbea3 double abilities splash infinitefusion 2023-05-27 12:37:08 -04:00
• f27841a7f8 Better version of the previous commit's fix Maruno17 2023-05-25 15:38:29 +01:00
• 01a6869061 Fixed freeze from previous commit relating to script-type move route commands Maruno17 2023-05-25 15:24:14 +01:00
• c756e2647a More FPS agnosticism, fixed pause after finishing an event's repeating move route Maruno17 2023-05-24 21:20:20 +01:00
• 39f9bc5472 palkia, dialga, giratina events infinitefusion 2023-05-22 20:47:09 -04:00
• 82149eddb9 Double abilities infinitefusion 2023-05-22 13:16:41 -04:00
• db774ec5c0 Adds extensions for fusion menu infinitefusion 2023-05-22 10:02:36 -04:00
• 4b4aae00db refactor wonderguard check in its own method infinitefusion 2023-05-22 09:57:53 -04:00
• e61a520738 small map fixes infinitefusion 2023-05-22 09:22:46 -04:00
• 655546a433 Adds stat to track rare candies use infinitefusion 2023-05-21 09:11:00 -04:00
• 8c90b0700a Move Jasmine to Bond Bridge infinitefusion 2023-05-20 19:39:51 -04:00
• 167155c67d Deprecated methods intended to work around filenames with accents, fixed crash when the Compiler wants to rewrite PBS files if they don't exist Maruno17 2023-05-20 22:10:11 +01:00
• 276c052822 Updated mkxp-z version, fixed BGM issues caused by v2.4.2 Maruno17 2023-05-20 21:03:08 +01:00
• d112e2361a A lot of FPS agnosticism, added def lerp Maruno17 2023-05-20 18:37:54 +01:00
• 0aa20136f4 Move Jasmine to Bond Bridge infinitefusion 2023-05-20 10:23:13 -04:00
• 62f96bf55c Cinnabar cutscene changes + resort gorgeous fix infinitefusion 2023-05-20 09:48:48 -04:00
• 62e372f4d7 Improved usage of Time.now and pbGetTimeNow Maruno17 2023-05-17 19:24:38 +01:00
• 28a2b7c9c1 Removed Graphics.delta_s and the usage thereof, tweaked credits screen code Maruno17 2023-05-17 18:50:38 +01:00
• a96867d537 Updated to mkxp-z v2.4.2 Maruno17 2023-05-15 20:00:56 +01:00
• e7e153bf11 Fixed Rollout being affected by Parental Bond, fixed multi-turn moves being stopped by Torment, fixed BGM not stopping when returning to the title screen, removed AI references Maruno17 2023-05-15 19:41:34 +01:00
• 6ca7da0a06 Merge branch 'ai' into dev Maruno17 2023-05-14 18:36:25 +01:00
• a4d74a9663 Resolved all remaining TODO comments for AI (except testing), fixed effects of moves that can end the battle Maruno17 2023-05-13 22:49:09 +01:00
• e7d52aea9b Fix Static/Magnet Pull wild encounter modifier SylviBlossom 2023-05-12 19:48:40 -07:00
• 89977a8d49 Updates custom sprites list for april 2023 pack infinitefusion 2023-05-11 11:52:32 -04:00