Compare commits

base: DocRock3r/infinitefusion-e18:5669e96b01e1fa936d88e982aa7be275ce081977

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:45c7799cbd7b361aa0e99e8236660649cce6e4ca

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

3 Commits

5669e96b01 ... 45c7799cbd

Author	SHA1	Message	Date
chardub	45c7799cbd	saffron dialogs	2026-05-11 14:42:57 -04:00
chardub	5686163859	silph co dialogs	2026-05-11 14:38:07 -04:00
chardub	324128458f	Map fixes	2026-05-11 11:32:36 -04:00

780 changed files with 9014 additions and 20 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

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/Map012.rxdata

BIN

Binary file not shown.

Data/Map019.rxdata

BIN

Binary file not shown.

Data/Map042.rxdata

BIN

Binary file not shown.

Data/Map086.rxdata

BIN

Binary file not shown.

Data/Map112.rxdata

BIN

Binary file not shown.

Data/Map141.rxdata

BIN

Binary file not shown.

Data/Map171.rxdata

BIN

Binary file not shown.

Data/Map359.rxdata

BIN

Binary file not shown.

Data/Map444.rxdata

BIN

Binary file not shown.

Data/Map660.rxdata

BIN

Binary file not shown.

Data/Map661.rxdata

BIN

Binary file not shown.

Data/Map662.rxdata

BIN

Binary file not shown.

Data/Map663.rxdata

BIN

Binary file not shown.

Data/Map665.rxdata

BIN

Binary file not shown.

Data/Map666.rxdata

BIN

Binary file not shown.

Data/Map667.rxdata

BIN

Binary file not shown.

Data/Map668.rxdata

BIN

Binary file not shown.

Data/Map758.rxdata

BIN

Binary file not shown.

Data/MapInfos.rxdata

BIN

Binary file not shown.

Data/Scripts

+1 -1

Submodule Data/Scripts updated: 0724ae58ce...5ba98a48e1

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/berry_data.dat

BIN

Binary file not shown.

Data/berry_dexes.dat

BIN

Binary file not shown.

Data/messages.dat

BIN

Binary file not shown.

Data/moves.dat

BIN

Binary file not shown.

Data/pokedex/dex.json

+2392 -2

File diff suppressed because it is too large Load Diff

Exported Maps/001 - Cerulean City [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/002 - Route 101 [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/003 - Legend's House [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/004 - Cerulean City Gym [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/005 - Cerulean City [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/006 - Team Rocket HQ [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/007 - Bike Shop [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/008 - Route 24 [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/009 - Route 25 [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/010 - Cerulean Cape [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/011 - Bill's Lighthouse [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/013 - Day Care Center [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/014 - Underground [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/015 - Northern Gate [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/016 - Route 6 [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/017 - S.S. Anne [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/018 - Southern Gate [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/019 - Vermillion City [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/020 - Pokemon Center [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/022 - Vermillion City [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/023 - Vermillion City [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/024 - Vermillion City Gym [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/025 - Pokémon Fan Club [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/026 - Harbour [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/027 - S.S. Anne [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/028 - S.S. Anne [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/029 - S.S. Anne [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/030 - S.S. Anne [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/031 - S.S. Anne [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/033 - Kanto [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/034 - SS.Anne [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/035 - Captain's Room [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/036 - SS. Anne [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/037 - Vermillion City [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/039 - Trainer House [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/040 - Viridian River [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/041 - Goldenrod Waterway [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/042 - Pallet Town [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/043 - Legend's House [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/045 - Team Rocket Hideout [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/046 - Pinkan Hollow [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/047 - Mt. Mortar [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/048 - Legend's Room [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/049 - Mahogany Town [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/050 - Lavender Town [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/051 - Pinkan Island [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/052 - Seafoam Islands.old [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/053 - Seafoam Islands B2 [2026-05-10 12-24].png

BIN

Binary file not shown.

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

Exported Maps/054 - Seafoam Islands B3 [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/055 - Seafoam Islands B4 [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/056 - Surf Race [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/057 - Route 19 [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/058 - Route 20 [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/059 - Route 21 [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/061 - Vermillion City Gym [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/062 - Celadon City [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/063 - Celadon City [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/064 - Celadon City [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/065 - Pokemon Center [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/066 - Eastern Gate [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/067 - Legend's Room [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/068 - Legend's Room [2026-05-10 12-25].png

BIN

Binary file not shown.

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

Exported Maps/069 - Legend's Room [2026-05-10 12-25].png

BIN

Binary file not shown.

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

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