infinitefusion-e18

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

Audio/BGM/Evolution Start.ogg

BIN

View File

Binary file not shown.

Audio/BGM/Evolution Success.ogg

BIN

View File

Binary file not shown.

Audio/BGM/Evolution.ogg

BIN

View File

Binary file not shown.

Audio/BGM/fusion_short 2.mp3

BIN

View File

Binary file not shown.

Audio/BGM/fusion_short.mp3

BIN

View File

Binary file not shown.

Audio/ME/Evolution start.ogg

BIN

View File

Binary file not shown.

Audio/ME/Evolution success.ogg

BIN

View File

Binary file not shown.

Audio/ME/Evolution.ogg

BIN

View File

Binary file not shown.

Data/.DS_Store

Vendored

BIN

View File

Binary file not shown.

Data/Actors.rxdata

BIN

View File

Binary file not shown.

Data/Animations.rxdata

BIN

View File

Binary file not shown.

Data/Armors.rxdata

BIN

View File

Binary file not shown.

Data/CommonEvents.rxdata

BIN

View File

Binary file not shown.

Data/Enemies.rxdata

BIN

View File

Binary file not shown.

Data/Items.rxdata

BIN

View File

Binary file not shown.

Data/Map146.rxdata

BIN

View File

Binary file not shown.

Data/Map328.rxdata

BIN

View File

Binary file not shown.

Data/Map357.rxdata

BIN

View File

Binary file not shown.

Data/Map437.rxdata

BIN

View File

Binary file not shown.

Data/Map438.rxdata

BIN

View File

Binary file not shown.

Data/Map472.rxdata

BIN

View File

Binary file not shown.

Data/Map751.rxdata

BIN

View File

Binary file not shown.

Data/MapInfos.rxdata

BIN

View File

Binary file not shown.

Data/Scripts

+1 -1

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

Data/Skills.rxdata

BIN

View File

Binary file not shown.

Data/States.rxdata

BIN

View File

Binary file not shown.

Data/System.rxdata

BIN

View File

Binary file not shown.

Data/Tilesets.rxdata

BIN

View File

Binary file not shown.

Data/Weapons.rxdata

BIN

View File

Binary file not shown.

Data/abilities.dat

BIN

View File

Binary file not shown.

Data/berry_plants.dat

BIN

View File

Binary file not shown.

Data/encounters.dat

BIN

View File

Binary file not shown.

Data/items.dat

BIN

View File

Binary file not shown.

Data/map_metadata.dat

BIN

View File

Binary file not shown.

Data/messages.dat

BIN

View File

Binary file not shown.

Data/metadata.dat

BIN

View File

Binary file not shown.

Data/moves.dat

BIN

View File

Binary file not shown.

Data/outfits/clothes_data.json

+825 -224

View File

File diff suppressed because it is too large Load Diff

Data/outfits/hairstyles_data.json

+836 -114

View File

File diff suppressed because it is too large Load Diff

Data/outfits/hats_data.json

+1427 -379

View File

File diff suppressed because it is too large Load Diff

Data/ribbons.dat

BIN

View File

Binary file not shown.

Data/species.dat

BIN

View File

Binary file not shown.

Data/trainer_types.dat

BIN

View File

Binary file not shown.

Data/trainers.dat

BIN

View File

Binary file not shown.

Data/types.dat

BIN

View File

Binary file not shown.

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 6.6 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 6.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 6.9 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 7.9 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 4.6 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 2.4 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 8.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 6.6 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 6.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 6.9 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 7.9 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 4.6 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 5.6 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 8.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 3.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 3.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 3.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 3.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 4.9 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 3.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 3.1 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 3.0 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 2.9 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 769 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 765 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 779 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 764 B

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 833 B

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

BIN

View File

Binary file not shown.

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 3.3 KiB

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

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 1.6 KiB

Graphics/Pictures/Fusion/evoCustom.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 4.4 KiB

After

Width: | Height: | Size: 4.2 KiB

Graphics/Pictures/Fusion/evoCustom_blue.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 4.4 KiB

Graphics/Pictures/Fusion/evoCustom_selected.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 4.4 KiB

After

Width: | Height: | Size: 4.8 KiB

Graphics/Pictures/Fusion/evoNoCustom_selected.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 4.4 KiB

After

Width: | Height: | Size: 4.8 KiB

Graphics/Pictures/Fusion/previewScreen_evolution.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 4.7 KiB

Graphics/Pictures/Pokedex/autogen_icon.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 699 B

Graphics/Pictures/Pokedex/autogen_icon_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 858 B

Graphics/Pictures/Pokedex/bg_area_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.3 KiB

Graphics/Pictures/Pokedex/bg_forms.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 1.2 KiB

After

Width: | Height: | Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_forms_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_forms_old.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 1.0 KiB

After

Width: | Height: | Size: 4.7 KiB

Graphics/Pictures/Pokedex/bg_forms_old_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.6 KiB

Graphics/Pictures/Pokedex/bg_forms_selected_large.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 291 B

After

Width: | Height: | Size: 818 B

Graphics/Pictures/Pokedex/bg_forms_selected_large_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 818 B

Graphics/Pictures/Pokedex/bg_forms_selected_small.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 244 B

After

Width: | Height: | Size: 662 B

Graphics/Pictures/Pokedex/bg_forms_selected_small_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 662 B

Graphics/Pictures/Pokedex/bg_info.png

BIN

View File

Binary file not shown.

Before

Width: | Height: | Size: 1.0 KiB

After

Width: | Height: | Size: 5.4 KiB

Graphics/Pictures/Pokedex/bg_info_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_list_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.9 KiB

Graphics/Pictures/Pokedex/bg_listsearch_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.9 KiB

Graphics/Pictures/Pokedex/bg_search_color_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.7 KiB

Graphics/Pictures/Pokedex/bg_search_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_search_name_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.8 KiB

Graphics/Pictures/Pokedex/bg_search_order_dark.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.6 KiB

Compare commits

2 Commits

418ec58b80 ... 5669e96b01

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

Compare commits

2 Commits 418ec58b80 ... 5669e96b01

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

2 Commits

418ec58b80 ... 5669e96b01