U-Fish-PC\Daniel 1a0992a2f1 Merge branch 'master' of https://github.com/huderlem/pokered into pull-data ... Conflicts: main.asm text.asm text/maps/route_22.asm		2014-05-19 16:05:19 -04:00
..
agatha.asm
battlecenterm.asm	Pull map objects out of main.asm	2014-05-17 15:43:13 -04:00
bikeshop.asm
billshouse.asm
blueshouse.asm
bruno.asm
celadoncity.asm
celadondiner.asm
celadongamecorner.asm
celadongym.asm
celadonhotel.asm
celadonhouse.asm
celadonmansion1.asm
celadonmansion2.asm
celadonmansion3.asm
celadonmansion4.asm
celadonmansion5.asm
celadonmart1.asm
celadonmart2.asm
celadonmart3.asm
celadonmart4.asm
celadonmart5.asm
celadonmartelevator.asm
celadonmartroof.asm
celadonpokecenter.asm
celadonprizeroom.asm
ceruleancity.asm
ceruleangym.asm
ceruleanhouse1.asm
ceruleanhouse2.asm
ceruleanhousetrashed.asm
ceruleanmart.asm
ceruleanpokecenter.asm
cinnabargym.asm
cinnabarisland.asm
cinnabarmart.asm
cinnabarpokecenter.asm
copycatshouse1f.asm
copycatshouse2f.asm
daycarem.asm
diglettscave.asm
diglettscaveroute2.asm
diglettscaveroute11.asm
fanclub.asm
fightingdojo.asm
fuchsiacity.asm
fuchsiagym.asm
fuchsiahouse1.asm
fuchsiahouse2.asm
fuchsiahouse3.asm
fuchsiamart.asm
fuchsiameetingroom.asm
fuchsiapokecenter.asm
gary.asm
halloffameroom.asm
indigoplateau.asm
indigoplateaulobby.asm
lab1.asm
lab2.asm
lab3.asm
lab4.asm
lance.asm
lavenderhouse1.asm
lavenderhouse2.asm
lavendermart.asm
lavenderpokecenter.asm
lavendertown.asm
lorelei.asm
mansion1.asm
mansion2.asm
mansion3.asm
mansion4.asm
mtmoon1.asm
mtmoon2.asm
mtmoon3.asm
mtmoonpokecenter.asm
museum1f.asm
museum2f.asm
namerater.asm
oakslab.asm	Pull map objects out of main.asm	2014-05-17 15:43:13 -04:00
pallettown.asm
pewtercity.asm
pewtergym.asm
pewterhouse1.asm
pewterhouse2.asm
pewtermart.asm
pewterpokecenter.asm
pokemontower1.asm
pokemontower2.asm
pokemontower3.asm
pokemontower4.asm
pokemontower5.asm
pokemontower6.asm
pokemontower7.asm
powerplant.asm
redshouse1f.asm
redshouse2f.asm
rockethideout1.asm
rockethideout2.asm
rockethideout3.asm
rockethideout4.asm
rockethideoutelevator.asm
rocktunnel1.asm
rocktunnel2.asm
rocktunnelpokecenter.asm
route1.asm
route2.asm
route2gate.asm
route2house.asm
route3.asm
route4.asm
route5.asm
route5gate.asm
route6.asm	Pull map headers out of main.asm	2014-05-17 17:18:23 -04:00
route6gate.asm
route7.asm
route7gate.asm
route8.asm
route8gate.asm
route9.asm
route10.asm
route11.asm
route11gate.asm
route11gateupstairs.asm
route12.asm
route12gate.asm
route12gateupstairs.asm
route12house.asm
route13.asm
route14.asm	Pull map objects out of main.asm	2014-05-17 15:43:13 -04:00
route15.asm
route15gate.asm
route15gateupstairs.asm
route16.asm	Pull map objects out of main.asm	2014-05-17 15:43:13 -04:00
route16gate.asm
route16gateupstairs.asm
route16house.asm
route17.asm
route18.asm
route18gate.asm
route18gateupstairs.asm
route19.asm
route20.asm
route21.asm	Pull map objects out of main.asm	2014-05-17 15:43:13 -04:00
route22.asm	Merge branch 'master' of https://github.com/huderlem/pokered into pull-data	2014-05-19 16:05:19 -04:00
route22gate.asm
route23.asm
route24.asm
route25.asm
safarizonecenter.asm
safarizoneeast.asm
safarizoneentrance.asm
safarizonenorth.asm
safarizoneresthouse1.asm
safarizoneresthouse2.asm
safarizoneresthouse3.asm
safarizoneresthouse4.asm
safarizonesecrethouse.asm
safarizonewest.asm
saffroncity.asm
saffrongym.asm
saffronhouse1.asm
saffronhouse2.asm
saffronmart.asm
saffronpokecenter.asm
school.asm
seafoamislands1.asm
seafoamislands2.asm
seafoamislands3.asm
seafoamislands4.asm
seafoamislands5.asm
silphco1.asm
silphco2.asm
silphco3.asm
silphco4.asm
silphco5.asm
silphco6.asm
silphco7.asm
silphco8.asm
silphco9.asm
silphco10.asm
silphco11.asm
silphcoelevator.asm
ssanne1.asm
ssanne2.asm
ssanne3.asm
ssanne4.asm
ssanne5.asm
ssanne6.asm
ssanne7.asm
ssanne8.asm
ssanne9.asm
ssanne10.asm
tradecenterm.asm
undergroundpathentranceroute5.asm
undergroundpathentranceroute6.asm
undergroundpathentranceroute7.asm
undergroundpathentranceroute7copy.asm
undergroundpathentranceroute8.asm
undergroundpathns.asm
undergroundpathwe.asm
unknowndungeon1.asm
unknowndungeon2.asm
unknowndungeon3.asm
vermilioncity.asm
vermiliondock.asm
vermiliongym.asm
vermilionhouse1.asm
vermilionhouse2.asm
vermilionhouse3.asm
vermilionmart.asm
vermilionpokecenter.asm
victoryroad1.asm
victoryroad2.asm
victoryroad3.asm
viridiancity.asm
viridianforest.asm
viridianforestentrance.asm
viridianforestexit.asm
viridiangym.asm
viridianhouse.asm
viridianmart.asm
viridianpokecenter.asm