Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps

Browse Source

...

This commit is contained in:

Diegoisawesome

2017-11-15 00:47:34 -06:00

parent 6e6e11205d 3fb2a488f9

commit ce0e5cbfe4

121 changed files with 6022 additions and 11283 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

data/tilesets/primary/inside_building/metatile_attributes.bin → data/tilesets/primary/building/metatile_attributes.bin

0

data/tilesets/primary/inside_building/metatiles.bin → data/tilesets/primary/building/metatiles.bin

0

data/tilesets/primary/inside_building/palettes/00.pal → data/tilesets/primary/building/palettes/00.pal

0

data/tilesets/primary/inside_building/palettes/01.pal → data/tilesets/primary/building/palettes/01.pal

0

data/tilesets/primary/inside_building/palettes/02.pal → data/tilesets/primary/building/palettes/02.pal

0

data/tilesets/primary/inside_building/palettes/03.pal → data/tilesets/primary/building/palettes/03.pal

0

data/tilesets/primary/inside_building/palettes/04.pal → data/tilesets/primary/building/palettes/04.pal

0

data/tilesets/primary/inside_building/palettes/05.pal → data/tilesets/primary/building/palettes/05.pal

0

data/tilesets/primary/inside_building/palettes/06.pal → data/tilesets/primary/building/palettes/06.pal

0

data/tilesets/primary/inside_building/palettes/07.pal → data/tilesets/primary/building/palettes/07.pal

0

data/tilesets/primary/inside_building/palettes/08.pal → data/tilesets/primary/building/palettes/08.pal

0

data/tilesets/primary/inside_building/palettes/09.pal → data/tilesets/primary/building/palettes/09.pal

0

data/tilesets/primary/inside_building/palettes/10.pal → data/tilesets/primary/building/palettes/10.pal

0

data/tilesets/primary/inside_building/palettes/11.pal → data/tilesets/primary/building/palettes/11.pal

0

data/tilesets/primary/inside_building/palettes/12.pal → data/tilesets/primary/building/palettes/12.pal

0

data/tilesets/primary/inside_building/palettes/13.pal → data/tilesets/primary/building/palettes/13.pal

0

data/tilesets/primary/inside_building/palettes/14.pal → data/tilesets/primary/building/palettes/14.pal

0

data/tilesets/primary/inside_building/palettes/15.pal → data/tilesets/primary/building/palettes/15.pal

0

data/tilesets/primary/inside_building/tiles.png → data/tilesets/primary/building/tiles.png

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