DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: DocRock3r:6.4.5
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:main
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

3 Commits
6.4.5 ... main

Author SHA1 Message Date
infinitefusion
064a09664a adds new batch of custom pokedex entries 2025-01-22 10:15:04 -05:00
infinitefusion
6c621d04e4 small fixes 2025-01-18 10:35:28 -05:00
infinitefusion
d523f30eb7 fIXES SCRAGGY POKERADAR 2025-01-17 13:24:31 -05:00
43 changed files with 32351 additions and 319 deletions
Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,5 +1,7 @@
Graphics/CustomBattlers/local_sprites/*
Graphics/Pokemon/FusionIcons/*
Graphics/CustomBattlers/spritesheets/*
Data/sprites/*
Data/VERSION

BIN
Data/Map051.rxdata
View File

Binary file not shown.

BIN
Data/Map095.rxdata
View File

Binary file not shown.

BIN
Data/Map250.rxdata
View File

Binary file not shown.

BIN
Data/Map406.rxdata
View File

Binary file not shown.

BIN
Data/Map457.rxdata
View File

Binary file not shown.

BIN
Data/Map500.rxdata
View File

Binary file not shown.

BIN
Data/Map828.rxdata
View File

Binary file not shown.

BIN
Data/Map830.rxdata
View File

Binary file not shown.

BIN
Data/MapInfos.rxdata
View File

Binary file not shown.

2
Data/Scripts/001_Settings.rb
View File

@@ -486,7 +486,7 @@ module Settings
[562, 50, :NINJASK,45,50], #Boon Island
[603, 50, :KECLEON,45,50], #Chrono Island
[654, 50, :WHIMSICOTT,32,45], #Brine Road
[654, 50, :SCRAGGY,32,45] #Kindle Road
[559, 50, :SCRAGGY,32,45] #Kindle Road
]
#=============================================================================

2
Data/Scripts/052_AddOns/GameplayUtils.rb
View File

@@ -1426,7 +1426,7 @@ def calculate_pokemon_weight(pokemon,nerf=0)
# Cap the weight between min and max values
weight = [[weight, min_weight].max, max_weight].min
weight -= nerf if nerf > nerf
weight -= nerf if weight- nerf > min_weight
return weight.round(2) # Round to 2 decimal places
end

BIN
Data/System.rxdata
View File

Binary file not shown.

BIN
Data/items.dat
View File

Binary file not shown.

BIN
Data/messages.dat
View File

Binary file not shown.

32604
Data/pokedex/dex.json
View File

File diff suppressed because it is too large Load Diff

1
Data/pokedex/generated_entries.json
View File

File diff suppressed because one or more lines are too long

BIN
Data/species.dat
View File

Binary file not shown.

8
Data/sprites/sprites_rate_limit.log
View File

@@ -1,3 +1,5 @@
1736379358
1736379359
1736379359
1737558625
1737558626
1737558626
1737558656
1737558656

49
Data/sprites/updated_spritesheets_cache
View File

@@ -4,3 +4,52 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/206/206.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/240.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/296.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/296/296.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/219.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/457.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/457/457.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/298.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/390.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/174.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/311.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/311/311.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/115.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/129.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/129/129.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/67.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/329.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/53.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/358.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/358/358b.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/9.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/287.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/155.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/155/155.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/461.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/84.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/84/84.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/98.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/180.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/139.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/245.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/245/245.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/331.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/3.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/3/3.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/286.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/410.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/410/410.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/181.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/469.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/469/469.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/380.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/260.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/358/358.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/498.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/429.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/124.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/124/124a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/267.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/263.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/100.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/448.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/448/448.png

BIN
Data/trainers.dat
View File

Binary file not shown.

BIN
Graphics/Battlers/special/138.140.142.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
Graphics/Battlers/special/139.141.142.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/129.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/139.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/181.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/286.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/298.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/331.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/390.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/429.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/457.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_base/53.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/124/124a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 266 KiB

After

Width:  |  Height:  |  Size: 262 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/129/129.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 844 KiB

After

Width:  |  Height:  |  Size: 845 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/245/245.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 792 KiB

After

Width:  |  Height:  |  Size: 788 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/3/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/358/358.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/410/410.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 377 KiB

After

Width:  |  Height:  |  Size: 372 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/448/448.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 711 KiB

After

Width:  |  Height:  |  Size: 704 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/457/457.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 479 KiB

After

Width:  |  Height:  |  Size: 476 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/469/469.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 878 KiB

After

Width:  |  Height:  |  Size: 874 KiB

BIN
Graphics/CustomBattlers/spritesheets/spritesheets_custom/84/84.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 KiB

After

Width:  |  Height:  |  Size: 519 KiB