Compare commits

base: DocRock3r:e29ded6aa2084375bb03ec4690fe2eb618286322

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:develop-6.6

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

6 Commits

e29ded6aa2 ... develop-6.

Author	SHA1	Message	Date
chardub	97816abc98	map icons quests	2026-05-27 12:22:15 -04:00
chardub	fa6e0ad343	fix wall map crash	2026-05-19 17:44:57 -04:00
chardub	1b4fc5b688	fixes psychic house in saffron	2026-05-19 17:03:29 -04:00
chardub	0ee22861de	missing quest log button graphics	2026-05-19 14:44:09 -04:00
Payapon	7fb8282715	pif 1 graphic fizes. some towns/routes, and a handful of mt.moon	2026-05-19 14:43:20 -04:00
chardub	4dcad4a7d5	QA fixes	2026-05-17 11:31:53 -04:00

312 changed files with 5292 additions and 21 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/intro_silph.ogg Normal file

Binary file not shown.

BIN

Audio/ME/evolution_start.ogg Normal file

Binary file not shown.

BIN

Audio/ME/evolution_success.ogg Normal file

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

Binary file not shown.

BIN

Data/Map079.rxdata

Binary file not shown.

BIN

Data/Map081.rxdata

Binary file not shown.

BIN

Data/Map102.rxdata

Binary file not shown.

BIN

Data/Map103.rxdata

Binary file not shown.

BIN

Data/Map104.rxdata

Binary file not shown.

BIN

Data/Map105.rxdata

Binary file not shown.

BIN

Data/Map106.rxdata

Binary file not shown.

BIN

Data/Map108.rxdata

Binary file not shown.

BIN

Data/Map157.rxdata

Binary file not shown.

BIN

Data/Map182.rxdata

Binary file not shown.

BIN

Data/Map196.rxdata

Binary file not shown.

BIN

Data/Map248.rxdata

Binary file not shown.

BIN

Data/Map357.rxdata

Binary file not shown.

BIN

Data/Map380.rxdata

Binary file not shown.

BIN

Data/Map490.rxdata

Binary file not shown.

BIN

Data/Map494.rxdata

Binary file not shown.

BIN

Data/Map496.rxdata

Binary file not shown.

BIN

Data/Map767.rxdata

Binary file not shown.

BIN

Data/Map801.rxdata

Binary file not shown.

BIN

Data/MapInfos.rxdata

Binary file not shown.

2

Data/Scripts

Submodule Data/Scripts updated: 5ba98a48e1...0bc8925bc7

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

Binary file not shown.

BIN

Data/messages.dat

Binary file not shown.

5310

Data/pokedex/dex.json

File diff suppressed because it is too large Load Diff

0

Graphics/Battlebacks/enemybase/beach.png → Graphics/Battlebacks/base/beach.png

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

0

Graphics/Battlebacks/enemybase/blaine.png → Graphics/Battlebacks/base/blaine.png

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

0

Graphics/Battlebacks/enemybase/bridge.png → Graphics/Battlebacks/base/bridge.png

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

0

Graphics/Battlebacks/enemybase/brock.png → Graphics/Battlebacks/base/brock.png

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

0

Graphics/Battlebacks/enemybase/cave.png → Graphics/Battlebacks/base/cave.png

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

0

Graphics/Battlebacks/enemybase/cave1.png → Graphics/Battlebacks/base/cave1.png

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

0

Graphics/Battlebacks/enemybase/cave2.png → Graphics/Battlebacks/base/cave2.png

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

0

Graphics/Battlebacks/enemybase/cave2_water.png → Graphics/Battlebacks/base/cave2_water.png

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

0

Graphics/Battlebacks/enemybase/cave_water.png → Graphics/Battlebacks/base/cave_water.png

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

0

Graphics/Battlebacks/enemybase/cavedark.png → Graphics/Battlebacks/base/cavedark.png

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

0

Graphics/Battlebacks/enemybase/caveice.png → Graphics/Battlebacks/base/caveice.png

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

0

Graphics/Battlebacks/enemybase/caveice_water.png → Graphics/Battlebacks/base/caveice_water.png

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

0

Graphics/Battlebacks/enemybase/champion.png → Graphics/Battlebacks/base/champion.png

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

0

Graphics/Battlebacks/enemybase/chuck.png → Graphics/Battlebacks/base/chuck.png

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

0

Graphics/Battlebacks/enemybase/city.png → Graphics/Battlebacks/base/city.png

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

0

Graphics/Battlebacks/enemybase/city_concrete.png → Graphics/Battlebacks/base/city_concrete.png

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

0

Graphics/Battlebacks/enemybase/city_dirt.png → Graphics/Battlebacks/base/city_dirt.png

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

0

Graphics/Battlebacks/enemybase/city_grass.png → Graphics/Battlebacks/base/city_grass.png

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

0

Graphics/Battlebacks/enemybase/city_sand.png → Graphics/Battlebacks/base/city_sand.png

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

0

Graphics/Battlebacks/enemybase/city_water.png → Graphics/Battlebacks/base/city_water.png

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

0

Graphics/Battlebacks/enemybase/cosmic.png → Graphics/Battlebacks/base/cosmic.png

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

0

Graphics/Battlebacks/enemybase/cyber.png → Graphics/Battlebacks/base/cyber.png

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

0

Graphics/Battlebacks/enemybase/darkgym.png → Graphics/Battlebacks/base/darkgym.png

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

0

Graphics/Battlebacks/enemybase/elitea.png → Graphics/Battlebacks/base/elitea.png

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

0

Graphics/Battlebacks/enemybase/eliteb.png → Graphics/Battlebacks/base/eliteb.png

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

0

Graphics/Battlebacks/enemybase/elitec.png → Graphics/Battlebacks/base/elitec.png

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

0

Graphics/Battlebacks/enemybase/elited.png → Graphics/Battlebacks/base/elited.png

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

0

Graphics/Battlebacks/enemybase/erika.png → Graphics/Battlebacks/base/erika.png

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

0

Graphics/Battlebacks/enemybase/field.png → Graphics/Battlebacks/base/field.png

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

0

Graphics/Battlebacks/enemybase/field_concrete.png → Graphics/Battlebacks/base/field_concrete.png

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

0

Graphics/Battlebacks/enemybase/field_dirt.png → Graphics/Battlebacks/base/field_dirt.png

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

0

Graphics/Battlebacks/enemybase/field_eve.png → Graphics/Battlebacks/base/field_eve.png

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

0

Graphics/Battlebacks/enemybase/field_grass.png → Graphics/Battlebacks/base/field_grass.png

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

0

Graphics/Battlebacks/enemybase/field_night.png → Graphics/Battlebacks/base/field_night.png

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

0

Graphics/Battlebacks/enemybase/field_puddle.png → Graphics/Battlebacks/base/field_puddle.png

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

0

Graphics/Battlebacks/enemybase/field_sand.png → Graphics/Battlebacks/base/field_sand.png

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

0

Graphics/Battlebacks/enemybase/field_water.png → Graphics/Battlebacks/base/field_water.png

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

0

Graphics/Battlebacks/enemybase/flyinggym.png → Graphics/Battlebacks/base/flyinggym.png

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

0

Graphics/Battlebacks/enemybase/forest.png → Graphics/Battlebacks/base/forest.png

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

0

Graphics/Battlebacks/enemybase/forest_eve.png → Graphics/Battlebacks/base/forest_eve.png

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

0

Graphics/Battlebacks/enemybase/forest_grass.png → Graphics/Battlebacks/base/forest_grass.png

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

0

Graphics/Battlebacks/enemybase/forest_mud.png → Graphics/Battlebacks/base/forest_mud.png

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

0

Graphics/Battlebacks/enemybase/forest_night.png → Graphics/Battlebacks/base/forest_night.png

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

0

Graphics/Battlebacks/enemybase/ghostgym.png → Graphics/Battlebacks/base/ghostgym.png

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

0

Graphics/Battlebacks/enemybase/giovanni.png → Graphics/Battlebacks/base/giovanni.png

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

0

Graphics/Battlebacks/enemybase/grass.png → Graphics/Battlebacks/base/grass.png

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

0

Graphics/Battlebacks/enemybase/grass_eve.png → Graphics/Battlebacks/base/grass_eve.png

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

0

Graphics/Battlebacks/enemybase/grass_night.png → Graphics/Battlebacks/base/grass_night.png

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

0

Graphics/Battlebacks/enemybase/grasspuddle.png → Graphics/Battlebacks/base/grasspuddle.png

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

0

Graphics/Battlebacks/enemybase/ice.png → Graphics/Battlebacks/base/ice.png

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

0

Graphics/Battlebacks/enemybase/ice_eve.png → Graphics/Battlebacks/base/ice_eve.png

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

0

Graphics/Battlebacks/enemybase/ice_night.png → Graphics/Battlebacks/base/ice_night.png

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

0

Graphics/Battlebacks/enemybase/icegym.png → Graphics/Battlebacks/base/icegym.png

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

0

Graphics/Battlebacks/enemybase/indoora.png → Graphics/Battlebacks/base/indoora.png

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

0

Graphics/Battlebacks/enemybase/indoorb.png → Graphics/Battlebacks/base/indoorb.png

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

0

Graphics/Battlebacks/enemybase/indoorc.png → Graphics/Battlebacks/base/indoorc.png

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

0

Graphics/Battlebacks/enemybase/jasmine.png → Graphics/Battlebacks/base/jasmine.png

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

0

Graphics/Battlebacks/enemybase/koga.png → Graphics/Battlebacks/base/koga.png

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

0

Graphics/Battlebacks/enemybase/lava.png → Graphics/Battlebacks/base/lava.png

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

0

Graphics/Battlebacks/enemybase/misty.png → Graphics/Battlebacks/base/misty.png

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

0

Graphics/Battlebacks/enemybase/mountain.png → Graphics/Battlebacks/base/mountain.png

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

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