Compare commits

base: DocRock3r:418ec58b800b8001ce1e0d1e7181649f76b51a09

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:5669e96b01e1fa936d88e982aa7be275ce081977

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

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

BIN

Audio/BGM/Evolution Start.ogg Normal file

Binary file not shown.

BIN

Audio/BGM/Evolution Success.ogg Normal file

Binary file not shown.

BIN

Audio/BGM/Evolution.ogg

Binary file not shown.

BIN

Audio/BGM/fusion_short 2.mp3 Normal file

Binary file not shown.

BIN

Audio/BGM/fusion_short.mp3 Normal file

Binary file not shown.

BIN

Audio/ME/Evolution start.ogg

Binary file not shown.

BIN

Audio/ME/Evolution success.ogg

Binary file not shown.

BIN

Audio/ME/Evolution.ogg Normal file

Binary file not shown.

BIN

Data/.DS_Store vendored

Binary file not shown.

BIN

Data/Actors.rxdata

Binary file not shown.

BIN

Data/Animations.rxdata

Binary file not shown.

BIN

Data/Armors.rxdata

Binary file not shown.

BIN

Data/CommonEvents.rxdata

Binary file not shown.

BIN

Data/Enemies.rxdata

Binary file not shown.

BIN

Data/Items.rxdata

Binary file not shown.

BIN

Data/Map146.rxdata

Binary file not shown.

BIN

Data/Map328.rxdata

Binary file not shown.

BIN

Data/Map357.rxdata

Binary file not shown.

BIN

Data/Map437.rxdata

Binary file not shown.

BIN

Data/Map438.rxdata

Binary file not shown.

BIN

Data/Map472.rxdata

Binary file not shown.

BIN

Data/Map751.rxdata

Binary file not shown.

BIN

Data/MapInfos.rxdata

Binary file not shown.

2

Data/Scripts

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

BIN

Data/Skills.rxdata

Binary file not shown.

BIN

Data/States.rxdata

Binary file not shown.

BIN

Data/System.rxdata

Binary file not shown.

BIN

Data/Tilesets.rxdata

Binary file not shown.

BIN

Data/Weapons.rxdata

Binary file not shown.

BIN

Data/abilities.dat

Binary file not shown.

BIN

Data/berry_plants.dat

Binary file not shown.

BIN

Data/encounters.dat

Binary file not shown.

BIN

Data/items.dat

Binary file not shown.

BIN

Data/map_metadata.dat

Binary file not shown.

BIN

Data/messages.dat

Binary file not shown.

BIN

Data/metadata.dat

Binary file not shown.

BIN

Data/moves.dat

Binary file not shown.

1049

Data/outfits/clothes_data.json

File diff suppressed because it is too large Load Diff

950

Data/outfits/hairstyles_data.json

File diff suppressed because it is too large Load Diff

1806

Data/outfits/hats_data.json

File diff suppressed because it is too large Load Diff

BIN

Data/ribbons.dat

Binary file not shown.

BIN

Data/species.dat

Binary file not shown.

BIN

Data/trainer_types.dat

Binary file not shown.

BIN

Data/trainers.dat

Binary file not shown.

BIN

Data/types.dat

Binary file not shown.

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

Graphics/Pictures/Fusion/evoCustom.png

Binary file not shown.

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

BIN

Graphics/Pictures/Fusion/evoCustom_blue.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Fusion/evoCustom_selected.png

Binary file not shown.

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

BIN

Graphics/Pictures/Fusion/evoNoCustom_selected.png

Binary file not shown.

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

BIN

Graphics/Pictures/Fusion/previewScreen_evolution.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/autogen_icon.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/autogen_icon_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_area_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_forms.png

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_forms_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_forms_old.png

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_forms_old_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_forms_selected_large.png

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_forms_selected_large_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_forms_selected_small.png

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_forms_selected_small_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_info.png

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_info_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_list_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_listsearch_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_search_color_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_search_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_search_name_dark.png Normal file

Binary file not shown.

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

BIN

Graphics/Pictures/Pokedex/bg_search_order_dark.png Normal file

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