dannye 64b4cf624f Merge branch 'master' of https://github.com/YamaArashi/pokered ... Conflicts: engine/evos_moves.asm engine/overworld/healing_machine.asm		2015-07-19 03:52:20 -05:00
..
agatha.asm	misc	2015-07-18 21:58:55 -07:00
beach_house.asm
bikeshop.asm	Consolidate coord macros	2015-07-18 15:52:03 -05:00
billshouse.asm	fix variable naming	2015-07-18 08:17:46 -07:00
blueshouse.asm
bruno.asm	misc	2015-07-18 21:58:55 -07:00
celadoncity.asm
celadondiner.asm
celadongamecorner.asm	Name sound effects	2015-07-19 03:46:12 -05:00
celadongym.asm	fix variable naming	2015-07-18 08:17:46 -07:00
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	Consolidate coord macros	2015-07-18 15:52:03 -05:00
celadonpokecenter.asm
celadonprizeroom.asm
ceruleancity.asm	misc	2015-07-18 21:58:55 -07:00
ceruleancity2.asm
ceruleangym.asm	fix variable naming	2015-07-18 08:17:46 -07:00
ceruleanhouse1.asm
ceruleanhouse2.asm
ceruleanhousetrashed.asm
ceruleanmart.asm
ceruleanpokecenter.asm
cinnabargym.asm	Name sound effects	2015-07-19 03:46:12 -05:00
cinnabarisland.asm	fix variable naming	2015-07-18 08:17:46 -07:00
cinnabarmart.asm
cinnabarpokecenter.asm
colosseum.asm
copycatshouse1f.asm
copycatshouse2f.asm
daycarem.asm	Merge branch 'master' of https://github.com/YamaArashi/pokered	2015-07-19 03:52:20 -05:00
diglettscave.asm
diglettscaveroute2.asm
diglettscaveroute11.asm
fanclub.asm
fightingdojo.asm	fix variable naming	2015-07-18 08:17:46 -07:00
fuchsiacity.asm
fuchsiagym.asm	fix variable naming	2015-07-18 08:17:46 -07:00
fuchsiahouse1.asm
fuchsiahouse2.asm	fix variable naming	2015-07-18 08:17:46 -07:00
fuchsiahouse3.asm
fuchsiamart.asm
fuchsiameetingroom.asm
fuchsiapokecenter.asm
gary.asm	fix variable naming	2015-07-18 08:17:46 -07:00
halloffameroom.asm	fix variable naming	2015-07-18 08:17:46 -07:00
indigoplateau.asm
indigoplateaulobby.asm
lab1.asm
lab2.asm
lab3.asm
lab4.asm
lance.asm	Merge branch 'master' of https://github.com/YamaArashi/pokered	2015-07-19 03:52:20 -05:00
lavenderhouse1.asm
lavenderhouse2.asm
lavendermart.asm
lavenderpokecenter.asm
lavendertown.asm
lorelei.asm	misc	2015-07-18 21:58:55 -07:00
mansion1.asm	Name sound effects	2015-07-19 03:46:12 -05:00
mansion2.asm	Name sound effects	2015-07-19 03:46:12 -05:00
mansion3.asm	misc	2015-07-18 21:58:55 -07:00
mansion4.asm	fix variable naming	2015-07-18 08:17:46 -07:00
mtmoon1.asm	fix variable naming	2015-07-18 08:17:46 -07:00
mtmoon2.asm
mtmoon3.asm	fix variable naming	2015-07-18 08:17:46 -07:00
mtmoonpokecenter.asm	misc	2015-07-18 21:58:55 -07:00
museum1f.asm	Merge branch 'master' of https://github.com/YamaArashi/pokered	2015-07-19 03:52:20 -05:00
museum2f.asm
namerater.asm
oakslab.asm	misc	2015-07-18 21:58:55 -07:00
pallettown.asm	fix variable naming	2015-07-18 08:17:46 -07:00
pewtercity.asm	fix variable naming	2015-07-18 08:17:46 -07:00
pewtergym.asm	fix variable naming	2015-07-18 08:17:46 -07:00
pewterhouse1.asm
pewterhouse2.asm
pewtermart.asm
pewterpokecenter.asm	misc	2015-07-18 21:58:55 -07:00
pokemontower1.asm
pokemontower2.asm	fix variable naming	2015-07-18 08:17:46 -07:00
pokemontower3.asm	fix variable naming	2015-07-18 08:17:46 -07:00
pokemontower4.asm	fix variable naming	2015-07-18 08:17:46 -07:00
pokemontower5.asm	fix variable naming	2015-07-18 08:17:46 -07:00
pokemontower6.asm	fix variable naming	2015-07-18 08:17:46 -07:00
pokemontower7.asm	fix variable naming	2015-07-18 08:17:46 -07:00
powerplant.asm	fix variable naming	2015-07-18 08:17:46 -07:00
redshouse1f.asm
redshouse2f.asm
rockethideout1.asm	Name sound effects	2015-07-19 03:46:12 -05:00
rockethideout2.asm	Name sound effects	2015-07-19 03:46:12 -05:00
rockethideout3.asm	Name sound effects	2015-07-19 03:46:12 -05:00
rockethideout4.asm	Name sound effects	2015-07-19 03:46:12 -05:00
rockethideoutelevator.asm
rocktunnel1.asm
rocktunnel2.asm
rocktunnelpokecenter.asm
route1.asm
route2.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route2gate.asm
route2house.asm
route3.asm
route4.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route5.asm
route5gate.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route6.asm
route6gate.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route7.asm
route7gate.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route8.asm
route8gate.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route9.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route10.asm
route11.asm
route11gate.asm
route11gateupstairs.asm
route12.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route12gate.asm
route12gateupstairs.asm
route12house.asm
route13.asm
route14.asm
route15.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route15gate.asm
route15gateupstairs.asm
route16.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route16gate.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route16gateupstairs.asm
route16house.asm
route17.asm
route18.asm
route18gate.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route18gateupstairs.asm
route19.asm
route20.asm
route21.asm
route22.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route22gate.asm	Name sound effects	2015-07-19 03:46:12 -05:00
route23.asm	Name sound effects	2015-07-19 03:46:12 -05:00
route24.asm	fix variable naming	2015-07-18 08:17:46 -07:00
route25.asm	fix variable naming	2015-07-18 08:17:46 -07:00
safarizonecenter.asm	fix variable naming	2015-07-18 08:17:46 -07:00
safarizoneeast.asm	fix variable naming	2015-07-18 08:17:46 -07:00
safarizoneentrance-yellow.asm	small changes	2015-07-18 22:34:11 -07:00
safarizoneentrance.asm	misc	2015-07-18 21:58:55 -07:00
safarizonenorth.asm	fix variable naming	2015-07-18 08:17:46 -07:00
safarizoneresthouse1.asm
safarizoneresthouse2.asm
safarizoneresthouse3.asm
safarizoneresthouse4.asm
safarizonesecrethouse.asm
safarizonewest.asm	fix variable naming	2015-07-18 08:17:46 -07:00
saffroncity.asm
saffrongym.asm	fix variable naming	2015-07-18 08:17:46 -07:00
saffronhouse1.asm
saffronhouse2.asm
saffronmart.asm
saffronpokecenter.asm
school.asm
seafoamislands1.asm	misc	2015-07-18 21:58:55 -07:00
seafoamislands2.asm	misc	2015-07-18 21:58:55 -07:00
seafoamislands3.asm	misc	2015-07-18 21:58:55 -07:00
seafoamislands4.asm	misc	2015-07-18 21:58:55 -07:00
seafoamislands5.asm	misc	2015-07-18 21:58:55 -07:00
silphco1.asm
silphco2.asm
silphco3.asm	fix variable naming	2015-07-18 08:17:46 -07:00
silphco4.asm	fix variable naming	2015-07-18 08:17:46 -07:00
silphco5.asm	fix variable naming	2015-07-18 08:17:46 -07:00
silphco6.asm	fix variable naming	2015-07-18 08:17:46 -07:00
silphco7.asm	misc	2015-07-18 21:58:55 -07:00
silphco8.asm
silphco9.asm
silphco10.asm	fix variable naming	2015-07-18 08:17:46 -07:00
silphco11.asm	fix variable naming	2015-07-18 08:17:46 -07:00
silphcoelevator.asm
ssanne1.asm
ssanne2.asm	fix variable naming	2015-07-18 08:17:46 -07:00
ssanne3.asm
ssanne4.asm
ssanne5.asm
ssanne6.asm
ssanne7.asm
ssanne8.asm	fix variable naming	2015-07-18 08:17:46 -07:00
ssanne9.asm	fix variable naming	2015-07-18 08:17:46 -07:00
ssanne10.asm	fix variable naming	2015-07-18 08:17:46 -07:00
tradecenter.asm	fix variable naming	2015-07-18 08:17:46 -07:00
undergroundpathentranceroute5.asm
undergroundpathentranceroute6.asm
undergroundpathentranceroute7.asm
undergroundpathentranceroute7copy.asm
undergroundpathentranceroute8.asm	Merge branch 'master' of https://github.com/huderlem/pokered into pull-data	2014-05-19 16:05:19 -04:00
undergroundpathns.asm
undergroundpathwe.asm
unknowndungeon1.asm	fix variable naming	2015-07-18 08:17:46 -07:00
unknowndungeon2.asm	fix variable naming	2015-07-18 08:17:46 -07:00
unknowndungeon3.asm	fix variable naming	2015-07-18 08:17:46 -07:00
vermilioncity.asm	fix variable naming	2015-07-18 08:17:46 -07:00
vermiliondock.asm	Merge branch 'master' of https://github.com/YamaArashi/pokered	2015-07-19 03:52:20 -05:00
vermiliongym.asm	Name sound effects	2015-07-19 03:46:12 -05:00
vermilionhouse1.asm
vermilionhouse2.asm
vermilionhouse3.asm
vermilionmart.asm
vermilionpokecenter.asm
victoryroad1.asm	fix variable naming	2015-07-18 08:17:46 -07:00
victoryroad2.asm	misc	2015-07-18 21:58:55 -07:00
victoryroad3.asm	misc	2015-07-18 21:58:55 -07:00
viridiancity.asm	fix variable naming	2015-07-18 08:17:46 -07:00
viridianforest.asm	fix variable naming	2015-07-18 08:17:46 -07:00
viridianforestentrance.asm
viridianforestexit.asm
viridiangym.asm	Name sound effects	2015-07-19 03:46:12 -05:00
viridianhouse.asm
viridianmart.asm	fix variable naming	2015-07-18 08:17:46 -07:00
viridianpokecenter.asm