Compare commits

base: DocRock3r:5669e96b01e1fa936d88e982aa7be275ce081977

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

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

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

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

Binary file not shown.

BIN

Data/Map019.rxdata

Binary file not shown.

BIN

Data/Map042.rxdata

Binary file not shown.

BIN

Data/Map086.rxdata

Binary file not shown.

BIN

Data/Map112.rxdata

Binary file not shown.

BIN

Data/Map141.rxdata

Binary file not shown.

BIN

Data/Map171.rxdata

Binary file not shown.

BIN

Data/Map359.rxdata

Binary file not shown.

BIN

Data/Map444.rxdata

Binary file not shown.

BIN

Data/Map660.rxdata

Binary file not shown.

BIN

Data/Map661.rxdata

Binary file not shown.

BIN

Data/Map662.rxdata

Binary file not shown.

BIN

Data/Map663.rxdata

Binary file not shown.

BIN

Data/Map665.rxdata

Binary file not shown.

BIN

Data/Map666.rxdata

Binary file not shown.

BIN

Data/Map667.rxdata

Binary file not shown.

BIN

Data/Map668.rxdata

Binary file not shown.

BIN

Data/Map758.rxdata

Binary file not shown.

BIN

Data/MapInfos.rxdata

Binary file not shown.

2

Data/Scripts

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

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

Binary file not shown.

BIN

Data/berry_dexes.dat Normal file

Binary file not shown.

BIN

Data/messages.dat

Binary file not shown.

BIN

Data/moves.dat

Binary file not shown.

2394

Data/pokedex/dex.json

File diff suppressed because it is too large Load Diff

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

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