Compare commits

base: DocRock3r/infinitefusion-e18:418ec58b800b8001ce1e0d1e7181649f76b51a09

Branches Tags

DocRock3r/infinitefusion-e18:main DocRock3r/infinitefusion-e18:develop-6.6 DocRock3r/infinitefusion-e18:releases DocRock3r/infinitefusion-e18:6.6-prerelease DocRock3r/infinitefusion-e18:develop-e21 DocRock3r/infinitefusion-e18:rocket-azubat DocRock3r/infinitefusion-e18:releases-April DocRock3r/infinitefusion-e18:develop DocRock3r/infinitefusion-e18:develop-6.4 DocRock3r/infinitefusion-e18:develop-entries DocRock3r/infinitefusion-e18:whirlIslands DocRock3r/infinitefusion-e18:main-5.3 DocRock3r/infinitefusion-e18:main-dynamicFusions DocRock3r/infinitefusion-e18:main-doubleAbilities DocRock3r/infinitefusion-e18:e19-clean-install

DocRock3r/infinitefusion-e18:6.7 DocRock3r/infinitefusion-e18:6.5 DocRock3r/infinitefusion-e18:6.4.5 DocRock3r/infinitefusion-e18:6.4 DocRock3r/infinitefusion-e18:6.2.4 DocRock3r/infinitefusion-e18:6.2.3 DocRock3r/infinitefusion-e18:6.2.1 DocRock3r/infinitefusion-e18:6.2 DocRock3r/infinitefusion-e18:6.1.3 DocRock3r/infinitefusion-e18:6.1.2 DocRock3r/infinitefusion-e18:6.1.1 DocRock3r/infinitefusion-e18:6.1 DocRock3r/infinitefusion-e18:6.0.5 DocRock3r/infinitefusion-e18:6.0.4 DocRock3r/infinitefusion-e18:release-6.0 DocRock3r/infinitefusion-e18:release-5.3 DocRock3r/infinitefusion-e18:5.3

..

compare: DocRock3r/infinitefusion-e18:5669e96b01e1fa936d88e982aa7be275ce081977

Branches Tags

DocRock3r/infinitefusion-e18:develop-6.6 DocRock3r/infinitefusion-e18:releases DocRock3r/infinitefusion-e18:6.6-prerelease DocRock3r/infinitefusion-e18:develop-e21 DocRock3r/infinitefusion-e18:rocket-azubat DocRock3r/infinitefusion-e18:releases-April DocRock3r/infinitefusion-e18:develop DocRock3r/infinitefusion-e18:develop-6.4 DocRock3r/infinitefusion-e18:develop-entries DocRock3r/infinitefusion-e18:main DocRock3r/infinitefusion-e18:whirlIslands DocRock3r/infinitefusion-e18:main-5.3 DocRock3r/infinitefusion-e18:main-dynamicFusions DocRock3r/infinitefusion-e18:main-doubleAbilities DocRock3r/infinitefusion-e18:e19-clean-install

DocRock3r/infinitefusion-e18:6.7 DocRock3r/infinitefusion-e18:6.5 DocRock3r/infinitefusion-e18:6.4.5 DocRock3r/infinitefusion-e18:6.4 DocRock3r/infinitefusion-e18:6.2.4 DocRock3r/infinitefusion-e18:6.2.3 DocRock3r/infinitefusion-e18:6.2.1 DocRock3r/infinitefusion-e18:6.2 DocRock3r/infinitefusion-e18:6.1.3 DocRock3r/infinitefusion-e18:6.1.2 DocRock3r/infinitefusion-e18:6.1.1 DocRock3r/infinitefusion-e18:6.1 DocRock3r/infinitefusion-e18:6.0.5 DocRock3r/infinitefusion-e18:6.0.4 DocRock3r/infinitefusion-e18:release-6.0 DocRock3r/infinitefusion-e18:release-5.3 DocRock3r/infinitefusion-e18:5.3

2 Commits

418ec58b80 .. 5669e96b01

Author	SHA1	Message	Date
chardub	5669e96b01	Merge branch 'develop-6.6' of https://github.com/infinitefusion/infinitefusion-e18 into develop-6.6	2026-05-08 11:47:48 -04:00
chardub	bcb86778ff	QA changes	2026-05-08 11:47:41 -04:00

119 changed files with 3328 additions and 759 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

Audio/BGM/Evolution Start.ogg

BIN

Binary file not shown.

Audio/BGM/Evolution Success.ogg

BIN

Binary file not shown.

Audio/BGM/Evolution.ogg

BIN

Binary file not shown.

Audio/BGM/fusion_short 2.mp3

BIN

Binary file not shown.

Audio/BGM/fusion_short.mp3

BIN

Binary file not shown.

Audio/ME/Evolution start.ogg

BIN

Binary file not shown.

Audio/ME/Evolution success.ogg

BIN

Binary file not shown.

Audio/ME/Evolution.ogg

BIN

Binary file not shown.

Data/.DS_Store

Vendored

BIN

Binary file not shown.

Data/Actors.rxdata

BIN

Binary file not shown.

Data/Animations.rxdata

BIN

Binary file not shown.

Data/Armors.rxdata

BIN

Binary file not shown.

Data/CommonEvents.rxdata

BIN

Binary file not shown.

Data/Enemies.rxdata

BIN

Binary file not shown.

Data/Items.rxdata

BIN

Binary file not shown.

Data/Map146.rxdata

BIN

Binary file not shown.

Data/Map328.rxdata

BIN

Binary file not shown.

Data/Map357.rxdata

BIN

Binary file not shown.

Data/Map437.rxdata

BIN

Binary file not shown.

Data/Map438.rxdata

BIN

Binary file not shown.

Data/Map472.rxdata

BIN

Binary file not shown.

Data/Map751.rxdata

BIN

Binary file not shown.

Data/MapInfos.rxdata

BIN

Binary file not shown.

Data/Scripts

+1 -1

Submodule Data/Scripts updated: 3079b5a632...0724ae58ce

Data/Skills.rxdata

BIN

Binary file not shown.

Data/States.rxdata

BIN

Binary file not shown.

Data/System.rxdata

BIN

Binary file not shown.

Data/Tilesets.rxdata

BIN

Binary file not shown.

Data/Weapons.rxdata

BIN

Binary file not shown.

Data/abilities.dat

BIN

Binary file not shown.

Data/berry_plants.dat

BIN

Binary file not shown.

Data/encounters.dat

BIN

Binary file not shown.

Data/items.dat

BIN

Binary file not shown.

Data/map_metadata.dat

BIN

Binary file not shown.

Data/messages.dat

BIN

Binary file not shown.

Data/metadata.dat

BIN

Binary file not shown.

Data/moves.dat

BIN

Binary file not shown.

Data/outfits/clothes_data.json

+825 -224

File diff suppressed because it is too large Load Diff

Data/outfits/hairstyles_data.json

+836 -114

File diff suppressed because it is too large Load Diff

Data/outfits/hats_data.json

+1427 -379

File diff suppressed because it is too large Load Diff

Data/ribbons.dat

BIN

Binary file not shown.

Data/species.dat

BIN

Binary file not shown.

Data/trainer_types.dat

BIN

Binary file not shown.

Data/trainers.dat

BIN

Binary file not shown.

Data/types.dat

BIN

Binary file not shown.

Graphics/Characters/player/clothes/gothhoodie/clothes_bike_gothhoodie(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.6 KiB

Graphics/Characters/player/clothes/gothhoodie/clothes_dive_gothhoodie(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.0 KiB

Graphics/Characters/player/clothes/gothhoodie/clothes_fish_gothhoodie(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.9 KiB

Graphics/Characters/player/clothes/gothhoodie/clothes_run_gothhoodie(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

Graphics/Characters/player/clothes/gothhoodie/clothes_surf_gothhoodie(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.6 KiB

Graphics/Characters/player/clothes/gothhoodie/clothes_trainer_gothhoodie(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

Graphics/Characters/player/clothes/gothhoodie/clothes_walk_gothhoodie(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.0 KiB

Graphics/Characters/player/clothes/summerdress/gothhoodie/clothes_bike_gothhoodie.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.6 KiB

Graphics/Characters/player/clothes/summerdress/gothhoodie/clothes_dive_gothhoodie.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.0 KiB

Graphics/Characters/player/clothes/summerdress/gothhoodie/clothes_fish_gothhoodie.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.9 KiB

Graphics/Characters/player/clothes/summerdress/gothhoodie/clothes_run_gothhoodie.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

Graphics/Characters/player/clothes/summerdress/gothhoodie/clothes_surf_gothhoodie.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.6 KiB

Graphics/Characters/player/clothes/summerdress/gothhoodie/clothes_trainer_gothhoodie.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.6 KiB

Graphics/Characters/player/clothes/summerdress/gothhoodie/clothes_walk_gothhoodie.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.0 KiB

Graphics/Characters/player/hair/SpecialLatias/hair_1_SpecialLatias(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.0 KiB

Graphics/Characters/player/hair/SpecialLatias/hair_2_SpecialLatias(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.0 KiB

Graphics/Characters/player/hair/SpecialLatias/hair_3_SpecialLatias(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.0 KiB

Graphics/Characters/player/hair/SpecialLatias/hair_4_SpecialLatias(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.0 KiB

Graphics/Characters/player/hair/SpecialLatias/hair_5_SpecialLatias(1).png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.9 KiB

Graphics/Characters/player/hair/emo/elm/hair_1_elm.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.0 KiB

Graphics/Characters/player/hair/emo/elm/hair_2_elm.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.1 KiB

Graphics/Characters/player/hair/emo/elm/hair_3_elm.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.0 KiB

Graphics/Characters/player/hair/emo/elm/hair_4_elm.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.9 KiB

Graphics/Characters/player/hair/emo/elm/hair_trainer_1_elm.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 769 B

Graphics/Characters/player/hair/emo/elm/hair_trainer_2_elm.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 765 B

Graphics/Characters/player/hair/emo/elm/hair_trainer_3_elm.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 779 B

Graphics/Characters/player/hair/emo/elm/hair_trainer_4_elm.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 764 B

Graphics/Characters/player/hair/lance/hair_4_lance.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 833 B

Graphics/Characters/player/hair/marshawk/CHANGES NEEDED.docx

BIN

Binary file not shown.

Graphics/Characters/player/hat/FlareonHat/hat_FlareonHat.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.3 KiB

Graphics/Characters/player/hat/FlareonHat/hat_trainer_FlareonHat.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB

Graphics/Pictures/Fusion/evoCustom.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.2 KiB

Graphics/Pictures/Fusion/evoCustom_blue.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

Graphics/Pictures/Fusion/evoCustom_selected.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.8 KiB

Graphics/Pictures/Fusion/evoNoCustom_selected.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 4.8 KiB

Graphics/Pictures/Fusion/previewScreen_evolution.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.7 KiB

Graphics/Pictures/Pokedex/autogen_icon.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 699 B

Graphics/Pictures/Pokedex/autogen_icon_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 858 B

Graphics/Pictures/Pokedex/bg_area_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

Graphics/Pictures/Pokedex/bg_forms.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_forms_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_forms_old.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 4.7 KiB

Graphics/Pictures/Pokedex/bg_forms_old_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

Graphics/Pictures/Pokedex/bg_forms_selected_large.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 291 B After Width:  |  Height:  |  Size: 818 B

Graphics/Pictures/Pokedex/bg_forms_selected_large_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 818 B

Graphics/Pictures/Pokedex/bg_forms_selected_small.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 244 B After Width:  |  Height:  |  Size: 662 B

Graphics/Pictures/Pokedex/bg_forms_selected_small_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 662 B

Graphics/Pictures/Pokedex/bg_info.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 5.4 KiB

Graphics/Pictures/Pokedex/bg_info_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_list_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

Graphics/Pictures/Pokedex/bg_listsearch_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

Graphics/Pictures/Pokedex/bg_search_color_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

Graphics/Pictures/Pokedex/bg_search_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_search_name_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_search_order_dark.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

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