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

This commit is contained in:
Diegoisawesome
2017-11-15 00:47:34 -06:00
121 changed files with 6022 additions and 11283 deletions
+2 -2
View File
@@ -128,11 +128,11 @@ gMetatileAttributes_BattleFrontierOutsideEast:: @ 83AF782
.align 1
gMetatiles_InsideBuilding:: @ 83AFB7E
.incbin "data/tilesets/primary/inside_building/metatiles.bin"
.incbin "data/tilesets/primary/building/metatiles.bin"
.align 1
gMetatileAttributes_InsideBuilding:: @ 83AFBFE
.incbin "data/tilesets/primary/inside_building/metatile_attributes.bin"
.incbin "data/tilesets/primary/building/metatile_attributes.bin"
.align 1
gMetatiles_Shop:: @ 83AFC0E