summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/animated_objects_3e_1.asm184
-rwxr-xr-xdata/animations.asm814
-rw-r--r--data/bg_map_attributes.asm28
-rwxr-xr-xdata/bike_riding_tilesets.asm2
-rwxr-xr-xdata/credit_mons.asm2
-rwxr-xr-xdata/credits_order.asm2
-rwxr-xr-xdata/cries.asm2
-rwxr-xr-xdata/dungeon_tilesets.asm2
-rwxr-xr-xdata/evos_moves.asm382
-rw-r--r--data/facing.asm24
-rwxr-xr-xdata/force_bike_surf.asm2
-rwxr-xr-xdata/good_rod.asm2
-rwxr-xr-xdata/hidden_coins.asm2
-rwxr-xr-xdata/hidden_item_coords.asm2
-rwxr-xr-xdata/hidden_objects.asm2
-rwxr-xr-xdata/hide_show_data.asm156
-rwxr-xr-xdata/item_prices.asm2
-rwxr-xr-xdata/key_items.asm2
-rwxr-xr-xdata/mapHeaders/agatha.asm2
-rw-r--r--data/mapHeaders/beach_house.asm2
-rwxr-xr-xdata/mapHeaders/bikeshop.asm2
-rwxr-xr-xdata/mapHeaders/billshouse.asm2
-rwxr-xr-xdata/mapHeaders/blueshouse.asm2
-rwxr-xr-xdata/mapHeaders/bruno.asm2
-rwxr-xr-xdata/mapHeaders/celadoncity.asm2
-rwxr-xr-xdata/mapHeaders/celadondiner.asm2
-rwxr-xr-xdata/mapHeaders/celadongamecorner.asm2
-rwxr-xr-xdata/mapHeaders/celadongym.asm2
-rwxr-xr-xdata/mapHeaders/celadonhotel.asm2
-rwxr-xr-xdata/mapHeaders/celadonhouse.asm2
-rwxr-xr-xdata/mapHeaders/celadonmansion1.asm2
-rwxr-xr-xdata/mapHeaders/celadonmansion2.asm2
-rwxr-xr-xdata/mapHeaders/celadonmansion3.asm2
-rwxr-xr-xdata/mapHeaders/celadonmansion4.asm2
-rwxr-xr-xdata/mapHeaders/celadonmansion5.asm2
-rwxr-xr-xdata/mapHeaders/celadonmart1.asm2
-rwxr-xr-xdata/mapHeaders/celadonmart2.asm2
-rwxr-xr-xdata/mapHeaders/celadonmart3.asm2
-rwxr-xr-xdata/mapHeaders/celadonmart4.asm2
-rwxr-xr-xdata/mapHeaders/celadonmart5.asm2
-rwxr-xr-xdata/mapHeaders/celadonmartelevator.asm2
-rwxr-xr-xdata/mapHeaders/celadonmartroof.asm2
-rwxr-xr-xdata/mapHeaders/celadonpokecenter.asm2
-rwxr-xr-xdata/mapHeaders/celadonprizeroom.asm2
-rwxr-xr-xdata/mapHeaders/ceruleancity.asm2
-rwxr-xr-xdata/mapHeaders/ceruleangym.asm2
-rwxr-xr-xdata/mapHeaders/ceruleanhouse1.asm2
-rwxr-xr-xdata/mapHeaders/ceruleanhouse2.asm2
-rwxr-xr-xdata/mapHeaders/ceruleanhousetrashed.asm2
-rwxr-xr-xdata/mapHeaders/ceruleanmart.asm2
-rwxr-xr-xdata/mapHeaders/ceruleanpokecenter.asm2
-rwxr-xr-xdata/mapHeaders/cinnabargym.asm2
-rwxr-xr-xdata/mapHeaders/cinnabarisland.asm2
-rwxr-xr-xdata/mapHeaders/cinnabarmart.asm2
-rwxr-xr-xdata/mapHeaders/cinnabarpokecenter.asm2
-rw-r--r--data/mapHeaders/colosseum.asm2
-rwxr-xr-xdata/mapHeaders/copycatshouse1f.asm2
-rwxr-xr-xdata/mapHeaders/copycatshouse2f.asm2
-rwxr-xr-xdata/mapHeaders/daycarem.asm2
-rwxr-xr-xdata/mapHeaders/diglettscave.asm2
-rwxr-xr-xdata/mapHeaders/diglettscaveroute11.asm2
-rwxr-xr-xdata/mapHeaders/diglettscaveroute2.asm2
-rwxr-xr-xdata/mapHeaders/fanclub.asm2
-rwxr-xr-xdata/mapHeaders/fightingdojo.asm2
-rwxr-xr-xdata/mapHeaders/fuchsiacity.asm2
-rwxr-xr-xdata/mapHeaders/fuchsiagym.asm2
-rwxr-xr-xdata/mapHeaders/fuchsiahouse1.asm2
-rwxr-xr-xdata/mapHeaders/fuchsiahouse2.asm2
-rwxr-xr-xdata/mapHeaders/fuchsiahouse3.asm2
-rwxr-xr-xdata/mapHeaders/fuchsiamart.asm2
-rwxr-xr-xdata/mapHeaders/fuchsiameetingroom.asm2
-rwxr-xr-xdata/mapHeaders/fuchsiapokecenter.asm2
-rwxr-xr-xdata/mapHeaders/gary.asm2
-rwxr-xr-xdata/mapHeaders/halloffameroom.asm2
-rwxr-xr-xdata/mapHeaders/indigoplateau.asm2
-rwxr-xr-xdata/mapHeaders/indigoplateaulobby.asm2
-rwxr-xr-xdata/mapHeaders/lab1.asm2
-rwxr-xr-xdata/mapHeaders/lab2.asm2
-rwxr-xr-xdata/mapHeaders/lab3.asm2
-rwxr-xr-xdata/mapHeaders/lab4.asm2
-rwxr-xr-xdata/mapHeaders/lance.asm2
-rwxr-xr-xdata/mapHeaders/lavenderhouse1.asm2
-rwxr-xr-xdata/mapHeaders/lavenderhouse2.asm2
-rwxr-xr-xdata/mapHeaders/lavendermart.asm2
-rwxr-xr-xdata/mapHeaders/lavenderpokecenter.asm2
-rwxr-xr-xdata/mapHeaders/lavendertown.asm2
-rwxr-xr-xdata/mapHeaders/lorelei.asm2
-rwxr-xr-xdata/mapHeaders/mansion1.asm2
-rwxr-xr-xdata/mapHeaders/mansion2.asm2
-rwxr-xr-xdata/mapHeaders/mansion3.asm2
-rwxr-xr-xdata/mapHeaders/mansion4.asm2
-rwxr-xr-xdata/mapHeaders/mtmoon1.asm2
-rwxr-xr-xdata/mapHeaders/mtmoon2.asm2
-rwxr-xr-xdata/mapHeaders/mtmoon3.asm2
-rwxr-xr-xdata/mapHeaders/mtmoonpokecenter.asm2
-rwxr-xr-xdata/mapHeaders/museum1f.asm2
-rwxr-xr-xdata/mapHeaders/museum2f.asm2
-rwxr-xr-xdata/mapHeaders/namerater.asm2
-rwxr-xr-xdata/mapHeaders/oakslab.asm2
-rwxr-xr-xdata/mapHeaders/pallettown.asm2
-rwxr-xr-xdata/mapHeaders/pewtercity.asm2
-rwxr-xr-xdata/mapHeaders/pewtergym.asm2
-rwxr-xr-xdata/mapHeaders/pewterhouse1.asm2
-rwxr-xr-xdata/mapHeaders/pewterhouse2.asm2
-rwxr-xr-xdata/mapHeaders/pewtermart.asm2
-rwxr-xr-xdata/mapHeaders/pewterpokecenter.asm2
-rwxr-xr-xdata/mapHeaders/pokemontower1.asm2
-rwxr-xr-xdata/mapHeaders/pokemontower2.asm2
-rwxr-xr-xdata/mapHeaders/pokemontower3.asm2
-rwxr-xr-xdata/mapHeaders/pokemontower4.asm2
-rwxr-xr-xdata/mapHeaders/pokemontower5.asm2
-rwxr-xr-xdata/mapHeaders/pokemontower6.asm2
-rwxr-xr-xdata/mapHeaders/pokemontower7.asm2
-rwxr-xr-xdata/mapHeaders/powerplant.asm2
-rwxr-xr-xdata/mapHeaders/redshouse1f.asm2
-rwxr-xr-xdata/mapHeaders/redshouse2f.asm2
-rwxr-xr-xdata/mapHeaders/rockethideout1.asm2
-rwxr-xr-xdata/mapHeaders/rockethideout2.asm2
-rwxr-xr-xdata/mapHeaders/rockethideout3.asm2
-rwxr-xr-xdata/mapHeaders/rockethideout4.asm2
-rwxr-xr-xdata/mapHeaders/rockethideoutelevator.asm2
-rwxr-xr-xdata/mapHeaders/rocktunnel1.asm2
-rwxr-xr-xdata/mapHeaders/rocktunnel2.asm2
-rwxr-xr-xdata/mapHeaders/rocktunnelpokecenter.asm2
-rwxr-xr-xdata/mapHeaders/route1.asm2
-rwxr-xr-xdata/mapHeaders/route10.asm2
-rwxr-xr-xdata/mapHeaders/route11.asm2
-rwxr-xr-xdata/mapHeaders/route11gate.asm2
-rwxr-xr-xdata/mapHeaders/route11gateupstairs.asm2
-rwxr-xr-xdata/mapHeaders/route12.asm2
-rwxr-xr-xdata/mapHeaders/route12gate.asm2
-rwxr-xr-xdata/mapHeaders/route12gateupstairs.asm2
-rwxr-xr-xdata/mapHeaders/route12house.asm2
-rwxr-xr-xdata/mapHeaders/route13.asm2
-rwxr-xr-xdata/mapHeaders/route14.asm2
-rwxr-xr-xdata/mapHeaders/route15.asm2
-rwxr-xr-xdata/mapHeaders/route15gate.asm2
-rwxr-xr-xdata/mapHeaders/route15gateupstairs.asm2
-rwxr-xr-xdata/mapHeaders/route16.asm2
-rwxr-xr-xdata/mapHeaders/route16gate.asm2
-rwxr-xr-xdata/mapHeaders/route16gateupstairs.asm2
-rwxr-xr-xdata/mapHeaders/route16house.asm2
-rwxr-xr-xdata/mapHeaders/route17.asm2
-rwxr-xr-xdata/mapHeaders/route18.asm2
-rwxr-xr-xdata/mapHeaders/route18gate.asm2
-rwxr-xr-xdata/mapHeaders/route18gateupstairs.asm2
-rwxr-xr-xdata/mapHeaders/route19.asm2
-rwxr-xr-xdata/mapHeaders/route2.asm2
-rwxr-xr-xdata/mapHeaders/route20.asm2
-rwxr-xr-xdata/mapHeaders/route21.asm2
-rwxr-xr-xdata/mapHeaders/route22.asm2
-rwxr-xr-xdata/mapHeaders/route22gate.asm2
-rwxr-xr-xdata/mapHeaders/route23.asm2
-rwxr-xr-xdata/mapHeaders/route24.asm2
-rwxr-xr-xdata/mapHeaders/route25.asm2
-rwxr-xr-xdata/mapHeaders/route2gate.asm2
-rwxr-xr-xdata/mapHeaders/route2house.asm2
-rwxr-xr-xdata/mapHeaders/route3.asm2
-rwxr-xr-xdata/mapHeaders/route4.asm2
-rwxr-xr-xdata/mapHeaders/route5.asm2
-rwxr-xr-xdata/mapHeaders/route5gate.asm2
-rwxr-xr-xdata/mapHeaders/route6.asm2
-rwxr-xr-xdata/mapHeaders/route6gate.asm2
-rwxr-xr-xdata/mapHeaders/route7.asm2
-rwxr-xr-xdata/mapHeaders/route7gate.asm2
-rwxr-xr-xdata/mapHeaders/route8.asm2
-rwxr-xr-xdata/mapHeaders/route8gate.asm2
-rwxr-xr-xdata/mapHeaders/route9.asm2
-rwxr-xr-xdata/mapHeaders/safarizonecenter.asm2
-rwxr-xr-xdata/mapHeaders/safarizoneeast.asm2
-rwxr-xr-xdata/mapHeaders/safarizoneentrance.asm2
-rwxr-xr-xdata/mapHeaders/safarizonenorth.asm2
-rwxr-xr-xdata/mapHeaders/safarizoneresthouse1.asm2
-rwxr-xr-xdata/mapHeaders/safarizoneresthouse2.asm2
-rwxr-xr-xdata/mapHeaders/safarizoneresthouse3.asm2
-rwxr-xr-xdata/mapHeaders/safarizoneresthouse4.asm2
-rwxr-xr-xdata/mapHeaders/safarizonesecrethouse.asm2
-rwxr-xr-xdata/mapHeaders/safarizonewest.asm2
-rwxr-xr-xdata/mapHeaders/saffroncity.asm2
-rwxr-xr-xdata/mapHeaders/saffrongym.asm2
-rwxr-xr-xdata/mapHeaders/saffronhouse1.asm2
-rwxr-xr-xdata/mapHeaders/saffronhouse2.asm2
-rwxr-xr-xdata/mapHeaders/saffronmart.asm2
-rwxr-xr-xdata/mapHeaders/saffronpokecenter.asm2
-rwxr-xr-xdata/mapHeaders/school.asm2
-rwxr-xr-xdata/mapHeaders/seafoamislands1.asm2
-rwxr-xr-xdata/mapHeaders/seafoamislands2.asm2
-rwxr-xr-xdata/mapHeaders/seafoamislands3.asm2
-rwxr-xr-xdata/mapHeaders/seafoamislands4.asm2
-rwxr-xr-xdata/mapHeaders/seafoamislands5.asm2
-rwxr-xr-xdata/mapHeaders/silphco1.asm2
-rwxr-xr-xdata/mapHeaders/silphco10.asm2
-rwxr-xr-xdata/mapHeaders/silphco11.asm2
-rwxr-xr-xdata/mapHeaders/silphco2.asm2
-rwxr-xr-xdata/mapHeaders/silphco3.asm2
-rwxr-xr-xdata/mapHeaders/silphco4.asm2
-rwxr-xr-xdata/mapHeaders/silphco5.asm2
-rwxr-xr-xdata/mapHeaders/silphco6.asm2
-rwxr-xr-xdata/mapHeaders/silphco7.asm2
-rwxr-xr-xdata/mapHeaders/silphco8.asm2
-rwxr-xr-xdata/mapHeaders/silphco9.asm2
-rwxr-xr-xdata/mapHeaders/silphcoelevator.asm2
-rwxr-xr-xdata/mapHeaders/ssanne1.asm2
-rwxr-xr-xdata/mapHeaders/ssanne10.asm2
-rwxr-xr-xdata/mapHeaders/ssanne2.asm2
-rwxr-xr-xdata/mapHeaders/ssanne3.asm2
-rwxr-xr-xdata/mapHeaders/ssanne4.asm2
-rwxr-xr-xdata/mapHeaders/ssanne5.asm2
-rwxr-xr-xdata/mapHeaders/ssanne6.asm2
-rwxr-xr-xdata/mapHeaders/ssanne7.asm2
-rwxr-xr-xdata/mapHeaders/ssanne8.asm2
-rwxr-xr-xdata/mapHeaders/ssanne9.asm2
-rw-r--r--data/mapHeaders/tradecenter.asm2
-rwxr-xr-xdata/mapHeaders/undergroundpathentranceroute5.asm2
-rwxr-xr-xdata/mapHeaders/undergroundpathentranceroute6.asm2
-rwxr-xr-xdata/mapHeaders/undergroundpathentranceroute7.asm2
-rwxr-xr-xdata/mapHeaders/undergroundpathentranceroute7copy.asm2
-rwxr-xr-xdata/mapHeaders/undergroundpathentranceroute8.asm2
-rwxr-xr-xdata/mapHeaders/undergroundpathns.asm2
-rwxr-xr-xdata/mapHeaders/undergroundpathwe.asm2
-rwxr-xr-xdata/mapHeaders/unknowndungeon1.asm2
-rwxr-xr-xdata/mapHeaders/unknowndungeon2.asm2
-rwxr-xr-xdata/mapHeaders/unknowndungeon3.asm2
-rwxr-xr-xdata/mapHeaders/vermilioncity.asm2
-rwxr-xr-xdata/mapHeaders/vermiliondock.asm2
-rwxr-xr-xdata/mapHeaders/vermiliongym.asm2
-rwxr-xr-xdata/mapHeaders/vermilionhouse1.asm2
-rwxr-xr-xdata/mapHeaders/vermilionhouse2.asm2
-rwxr-xr-xdata/mapHeaders/vermilionhouse3.asm2
-rwxr-xr-xdata/mapHeaders/vermilionmart.asm2
-rwxr-xr-xdata/mapHeaders/vermilionpokecenter.asm2
-rwxr-xr-xdata/mapHeaders/victoryroad1.asm2
-rwxr-xr-xdata/mapHeaders/victoryroad2.asm2
-rwxr-xr-xdata/mapHeaders/victoryroad3.asm2
-rwxr-xr-xdata/mapHeaders/viridiancity.asm2
-rwxr-xr-xdata/mapHeaders/viridianforest.asm2
-rwxr-xr-xdata/mapHeaders/viridianforestentrance.asm2
-rwxr-xr-xdata/mapHeaders/viridianforestexit.asm2
-rwxr-xr-xdata/mapHeaders/viridiangym.asm2
-rwxr-xr-xdata/mapHeaders/viridianhouse.asm2
-rwxr-xr-xdata/mapHeaders/viridianmart.asm2
-rwxr-xr-xdata/mapHeaders/viridianpokecenter.asm2
-rwxr-xr-xdata/mapObjects/agatha.asm2
-rwxr-xr-xdata/mapObjects/bikeshop.asm2
-rwxr-xr-xdata/mapObjects/billshouse.asm2
-rwxr-xr-xdata/mapObjects/blueshouse.asm2
-rwxr-xr-xdata/mapObjects/bruno.asm2
-rwxr-xr-xdata/mapObjects/celadoncity.asm2
-rwxr-xr-xdata/mapObjects/celadondiner.asm2
-rwxr-xr-xdata/mapObjects/celadongamecorner.asm2
-rwxr-xr-xdata/mapObjects/celadongym.asm2
-rwxr-xr-xdata/mapObjects/celadonhotel.asm2
-rwxr-xr-xdata/mapObjects/celadonhouse.asm2
-rwxr-xr-xdata/mapObjects/celadonmansion1.asm2
-rwxr-xr-xdata/mapObjects/celadonmansion2.asm2
-rwxr-xr-xdata/mapObjects/celadonmansion3.asm2
-rwxr-xr-xdata/mapObjects/celadonmansion4.asm2
-rwxr-xr-xdata/mapObjects/celadonmansion5.asm2
-rwxr-xr-xdata/mapObjects/celadonmart1.asm2
-rwxr-xr-xdata/mapObjects/celadonmart2.asm2
-rwxr-xr-xdata/mapObjects/celadonmart3.asm2
-rwxr-xr-xdata/mapObjects/celadonmart4.asm2
-rwxr-xr-xdata/mapObjects/celadonmart5.asm2
-rwxr-xr-xdata/mapObjects/celadonmartelevator.asm2
-rwxr-xr-xdata/mapObjects/celadonmartroof.asm2
-rwxr-xr-xdata/mapObjects/celadonpokecenter.asm2
-rwxr-xr-xdata/mapObjects/celadonprizeroom.asm2
-rwxr-xr-xdata/mapObjects/ceruleancity.asm2
-rwxr-xr-xdata/mapObjects/ceruleangym.asm2
-rwxr-xr-xdata/mapObjects/ceruleanhouse1.asm2
-rwxr-xr-xdata/mapObjects/ceruleanhouse2.asm2
-rwxr-xr-xdata/mapObjects/ceruleanhousetrashed.asm2
-rwxr-xr-xdata/mapObjects/ceruleanmart.asm2
-rwxr-xr-xdata/mapObjects/ceruleanpokecenter.asm2
-rwxr-xr-xdata/mapObjects/cinnabargym.asm2
-rwxr-xr-xdata/mapObjects/cinnabarisland.asm2
-rwxr-xr-xdata/mapObjects/cinnabarmart.asm2
-rwxr-xr-xdata/mapObjects/cinnabarpokecenter.asm2
-rw-r--r--data/mapObjects/colosseum.asm2
-rwxr-xr-xdata/mapObjects/copycatshouse1f.asm2
-rwxr-xr-xdata/mapObjects/copycatshouse2f.asm2
-rwxr-xr-xdata/mapObjects/daycarem.asm2
-rwxr-xr-xdata/mapObjects/diglettscave.asm2
-rwxr-xr-xdata/mapObjects/diglettscaveroute11.asm2
-rwxr-xr-xdata/mapObjects/diglettscaveroute2.asm2
-rwxr-xr-xdata/mapObjects/fanclub.asm2
-rwxr-xr-xdata/mapObjects/fightingdojo.asm2
-rwxr-xr-xdata/mapObjects/fuchsiacity.asm2
-rwxr-xr-xdata/mapObjects/fuchsiagym.asm2
-rwxr-xr-xdata/mapObjects/fuchsiahouse1.asm2
-rwxr-xr-xdata/mapObjects/fuchsiahouse2.asm2
-rwxr-xr-xdata/mapObjects/fuchsiahouse3.asm2
-rwxr-xr-xdata/mapObjects/fuchsiamart.asm2
-rwxr-xr-xdata/mapObjects/fuchsiameetingroom.asm2
-rwxr-xr-xdata/mapObjects/fuchsiapokecenter.asm2
-rwxr-xr-xdata/mapObjects/gary.asm2
-rwxr-xr-xdata/mapObjects/halloffameroom.asm2
-rwxr-xr-xdata/mapObjects/indigoplateau.asm2
-rwxr-xr-xdata/mapObjects/indigoplateaulobby.asm2
-rwxr-xr-xdata/mapObjects/lab1.asm2
-rwxr-xr-xdata/mapObjects/lab2.asm2
-rwxr-xr-xdata/mapObjects/lab3.asm2
-rwxr-xr-xdata/mapObjects/lab4.asm2
-rwxr-xr-xdata/mapObjects/lance.asm2
-rwxr-xr-xdata/mapObjects/lavenderhouse1.asm2
-rwxr-xr-xdata/mapObjects/lavenderhouse2.asm2
-rwxr-xr-xdata/mapObjects/lavendermart.asm2
-rwxr-xr-xdata/mapObjects/lavenderpokecenter.asm2
-rwxr-xr-xdata/mapObjects/lavendertown.asm2
-rwxr-xr-xdata/mapObjects/lorelei.asm2
-rwxr-xr-xdata/mapObjects/mansion1.asm2
-rwxr-xr-xdata/mapObjects/mansion2.asm2
-rwxr-xr-xdata/mapObjects/mansion3.asm2
-rwxr-xr-xdata/mapObjects/mansion4.asm2
-rwxr-xr-xdata/mapObjects/mtmoon1.asm2
-rwxr-xr-xdata/mapObjects/mtmoon2.asm2
-rwxr-xr-xdata/mapObjects/mtmoon3.asm2
-rwxr-xr-xdata/mapObjects/mtmoonpokecenter.asm2
-rwxr-xr-xdata/mapObjects/museum1f.asm2
-rwxr-xr-xdata/mapObjects/museum2f.asm2
-rwxr-xr-xdata/mapObjects/namerater.asm2
-rwxr-xr-xdata/mapObjects/oakslab.asm2
-rwxr-xr-xdata/mapObjects/pallettown.asm2
-rwxr-xr-xdata/mapObjects/pewtercity.asm2
-rwxr-xr-xdata/mapObjects/pewtergym.asm2
-rwxr-xr-xdata/mapObjects/pewterhouse1.asm2
-rwxr-xr-xdata/mapObjects/pewterhouse2.asm2
-rwxr-xr-xdata/mapObjects/pewtermart.asm2
-rwxr-xr-xdata/mapObjects/pewterpokecenter.asm2
-rwxr-xr-xdata/mapObjects/pokemontower1.asm2
-rwxr-xr-xdata/mapObjects/pokemontower2.asm2
-rwxr-xr-xdata/mapObjects/pokemontower3.asm2
-rwxr-xr-xdata/mapObjects/pokemontower4.asm2
-rwxr-xr-xdata/mapObjects/pokemontower5.asm2
-rwxr-xr-xdata/mapObjects/pokemontower6.asm2
-rwxr-xr-xdata/mapObjects/pokemontower7.asm2
-rwxr-xr-xdata/mapObjects/powerplant.asm2
-rwxr-xr-xdata/mapObjects/redshouse1f.asm2
-rwxr-xr-xdata/mapObjects/redshouse2f.asm2
-rwxr-xr-xdata/mapObjects/rockethideout1.asm2
-rwxr-xr-xdata/mapObjects/rockethideout2.asm2
-rwxr-xr-xdata/mapObjects/rockethideout3.asm2
-rwxr-xr-xdata/mapObjects/rockethideout4.asm2
-rwxr-xr-xdata/mapObjects/rockethideoutelevator.asm2
-rwxr-xr-xdata/mapObjects/rocktunnel1.asm2
-rwxr-xr-xdata/mapObjects/rocktunnel2.asm2
-rwxr-xr-xdata/mapObjects/rocktunnelpokecenter.asm2
-rwxr-xr-xdata/mapObjects/route1.asm2
-rwxr-xr-xdata/mapObjects/route10.asm2
-rwxr-xr-xdata/mapObjects/route11.asm2
-rwxr-xr-xdata/mapObjects/route11gate.asm2
-rwxr-xr-xdata/mapObjects/route11gateupstairs.asm2
-rwxr-xr-xdata/mapObjects/route12.asm2
-rwxr-xr-xdata/mapObjects/route12gate.asm2
-rwxr-xr-xdata/mapObjects/route12gateupstairs.asm2
-rwxr-xr-xdata/mapObjects/route12house.asm2
-rwxr-xr-xdata/mapObjects/route13.asm2
-rwxr-xr-xdata/mapObjects/route14.asm2
-rwxr-xr-xdata/mapObjects/route15.asm2
-rwxr-xr-xdata/mapObjects/route15gate.asm2
-rwxr-xr-xdata/mapObjects/route15gateupstairs.asm2
-rwxr-xr-xdata/mapObjects/route16.asm2
-rwxr-xr-xdata/mapObjects/route16gate.asm2
-rwxr-xr-xdata/mapObjects/route16gateupstairs.asm2
-rwxr-xr-xdata/mapObjects/route16house.asm2
-rwxr-xr-xdata/mapObjects/route17.asm2
-rwxr-xr-xdata/mapObjects/route18.asm2
-rwxr-xr-xdata/mapObjects/route18gate.asm2
-rwxr-xr-xdata/mapObjects/route18gateupstairs.asm2
-rwxr-xr-xdata/mapObjects/route19.asm2
-rwxr-xr-xdata/mapObjects/route2.asm2
-rwxr-xr-xdata/mapObjects/route20.asm2
-rwxr-xr-xdata/mapObjects/route21.asm2
-rwxr-xr-xdata/mapObjects/route22.asm2
-rwxr-xr-xdata/mapObjects/route22gate.asm2
-rwxr-xr-xdata/mapObjects/route23.asm2
-rwxr-xr-xdata/mapObjects/route24.asm2
-rwxr-xr-xdata/mapObjects/route25.asm2
-rwxr-xr-xdata/mapObjects/route2gate.asm2
-rwxr-xr-xdata/mapObjects/route2house.asm2
-rwxr-xr-xdata/mapObjects/route3.asm2
-rwxr-xr-xdata/mapObjects/route4.asm2
-rwxr-xr-xdata/mapObjects/route5.asm2
-rwxr-xr-xdata/mapObjects/route5gate.asm2
-rwxr-xr-xdata/mapObjects/route6.asm2
-rwxr-xr-xdata/mapObjects/route6gate.asm2
-rwxr-xr-xdata/mapObjects/route7.asm2
-rwxr-xr-xdata/mapObjects/route7gate.asm2
-rwxr-xr-xdata/mapObjects/route8.asm2
-rwxr-xr-xdata/mapObjects/route8gate.asm2
-rwxr-xr-xdata/mapObjects/route9.asm2
-rwxr-xr-xdata/mapObjects/safarizonecenter.asm2
-rwxr-xr-xdata/mapObjects/safarizoneeast.asm2
-rwxr-xr-xdata/mapObjects/safarizoneentrance.asm2
-rwxr-xr-xdata/mapObjects/safarizonenorth.asm2
-rwxr-xr-xdata/mapObjects/safarizoneresthouse1.asm2
-rwxr-xr-xdata/mapObjects/safarizoneresthouse2.asm2
-rwxr-xr-xdata/mapObjects/safarizoneresthouse3.asm2
-rwxr-xr-xdata/mapObjects/safarizoneresthouse4.asm2
-rwxr-xr-xdata/mapObjects/safarizonesecrethouse.asm2
-rwxr-xr-xdata/mapObjects/safarizonewest.asm2
-rwxr-xr-xdata/mapObjects/saffroncity.asm2
-rwxr-xr-xdata/mapObjects/saffrongym.asm2
-rwxr-xr-xdata/mapObjects/saffronhouse1.asm2
-rwxr-xr-xdata/mapObjects/saffronhouse2.asm2
-rwxr-xr-xdata/mapObjects/saffronmart.asm2
-rwxr-xr-xdata/mapObjects/saffronpokecenter.asm2
-rwxr-xr-xdata/mapObjects/school.asm2
-rwxr-xr-xdata/mapObjects/seafoamislands1.asm2
-rwxr-xr-xdata/mapObjects/seafoamislands2.asm2
-rwxr-xr-xdata/mapObjects/seafoamislands3.asm2
-rwxr-xr-xdata/mapObjects/seafoamislands4.asm2
-rwxr-xr-xdata/mapObjects/seafoamislands5.asm2
-rwxr-xr-xdata/mapObjects/silphco1.asm2
-rwxr-xr-xdata/mapObjects/silphco10.asm2
-rwxr-xr-xdata/mapObjects/silphco11.asm2
-rwxr-xr-xdata/mapObjects/silphco2.asm2
-rwxr-xr-xdata/mapObjects/silphco3.asm2
-rwxr-xr-xdata/mapObjects/silphco4.asm2
-rwxr-xr-xdata/mapObjects/silphco5.asm2
-rwxr-xr-xdata/mapObjects/silphco6.asm2
-rwxr-xr-xdata/mapObjects/silphco7.asm2
-rwxr-xr-xdata/mapObjects/silphco8.asm2
-rwxr-xr-xdata/mapObjects/silphco9.asm2
-rwxr-xr-xdata/mapObjects/silphcoelevator.asm2
-rwxr-xr-xdata/mapObjects/ssanne1.asm2
-rwxr-xr-xdata/mapObjects/ssanne10.asm2
-rwxr-xr-xdata/mapObjects/ssanne2.asm2
-rwxr-xr-xdata/mapObjects/ssanne3.asm2
-rwxr-xr-xdata/mapObjects/ssanne4.asm2
-rwxr-xr-xdata/mapObjects/ssanne5.asm2
-rwxr-xr-xdata/mapObjects/ssanne6.asm2
-rwxr-xr-xdata/mapObjects/ssanne7.asm2
-rwxr-xr-xdata/mapObjects/ssanne8.asm2
-rwxr-xr-xdata/mapObjects/ssanne9.asm2
-rw-r--r--data/mapObjects/tradecenter.asm2
-rwxr-xr-xdata/mapObjects/undergroundpathentranceroute5.asm2
-rwxr-xr-xdata/mapObjects/undergroundpathentranceroute6.asm2
-rwxr-xr-xdata/mapObjects/undergroundpathentranceroute7.asm2
-rwxr-xr-xdata/mapObjects/undergroundpathentranceroute7copy.asm2
-rwxr-xr-xdata/mapObjects/undergroundpathentranceroute8.asm2
-rwxr-xr-xdata/mapObjects/undergroundpathns.asm2
-rwxr-xr-xdata/mapObjects/undergroundpathwe.asm2
-rwxr-xr-xdata/mapObjects/unknowndungeon1.asm2
-rwxr-xr-xdata/mapObjects/unknowndungeon2.asm2
-rwxr-xr-xdata/mapObjects/unknowndungeon3.asm2
-rwxr-xr-xdata/mapObjects/vermilioncity.asm2
-rwxr-xr-xdata/mapObjects/vermiliondock.asm2
-rwxr-xr-xdata/mapObjects/vermiliongym.asm2
-rwxr-xr-xdata/mapObjects/vermilionhouse1.asm2
-rwxr-xr-xdata/mapObjects/vermilionhouse2.asm2
-rwxr-xr-xdata/mapObjects/vermilionhouse3.asm2
-rwxr-xr-xdata/mapObjects/vermilionmart.asm2
-rwxr-xr-xdata/mapObjects/vermilionpokecenter.asm2
-rwxr-xr-xdata/mapObjects/victoryroad1.asm2
-rwxr-xr-xdata/mapObjects/victoryroad2.asm2
-rwxr-xr-xdata/mapObjects/victoryroad3.asm2
-rwxr-xr-xdata/mapObjects/viridiancity.asm2
-rwxr-xr-xdata/mapObjects/viridianforest.asm2
-rwxr-xr-xdata/mapObjects/viridianforestentrance.asm2
-rwxr-xr-xdata/mapObjects/viridianforestexit.asm2
-rwxr-xr-xdata/mapObjects/viridiangym.asm2
-rwxr-xr-xdata/mapObjects/viridianhouse.asm2
-rwxr-xr-xdata/mapObjects/viridianmart.asm2
-rwxr-xr-xdata/mapObjects/viridianpokecenter.asm2
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
-rw-r--r--data/map_songs.asm4
-rwxr-xr-xdata/mon_palettes.asm4
-rwxr-xr-xdata/mon_party_sprites.asm4
-rwxr-xr-xdata/pikachu_emotions.asm196
-rwxr-xr-xdata/pikachu_pic_animation.asm186
-rwxr-xr-xdata/pikachu_pic_objects.asm300
-rwxr-xr-xdata/pikachu_pic_tilemaps.asm253
-rwxr-xr-xdata/pokedex_entries.asm308
-rwxr-xr-xdata/pokedex_order.asm2
-rwxr-xr-xdata/prize_mon_levels.asm2
-rwxr-xr-xdata/prizes.asm14
-rwxr-xr-xdata/sgb_border.asm4
-rwxr-xr-xdata/sgb_packets.asm62
-rwxr-xr-xdata/slot_machine_wheels.asm6
-rwxr-xr-xdata/special_warps.asm44
-rwxr-xr-xdata/sprite_sets.asm8
-rwxr-xr-xdata/super_rod.asm4
-rwxr-xr-xdata/tileset_headers.asm3
-rwxr-xr-xdata/tm_prices.asm2
-rwxr-xr-xdata/tms.asm2
-rwxr-xr-xdata/town_map_entries.asm4
-rwxr-xr-xdata/town_map_order.asm2
-rwxr-xr-xdata/trades.asm2
-rwxr-xr-xdata/trainer_moves.asm2
-rwxr-xr-xdata/trainer_parties.asm2
-rwxr-xr-xdata/trainer_types.asm7
-rwxr-xr-xdata/type_effects.asm2
-rwxr-xr-xdata/warp_tile_ids.asm54
-rwxr-xr-xdata/wild_mons.asm2
496 files changed, 2285 insertions, 1710 deletions
diff --git a/data/animated_objects_3e_1.asm b/data/animated_objects_3e_1.asm
index 2461c469..07b17ce5 100755
--- a/data/animated_objects_3e_1.asm
+++ b/data/animated_objects_3e_1.asm
@@ -1,32 +1,32 @@
-Unkn_f9405:
- dw Unkn_f943d
- dw Unkn_f9440
- dw Unkn_f9445
- dw Unkn_f944a
- dw Unkn_f944f
- dw Unkn_f9454
- dw Unkn_f9459
- dw Unkn_f945e
- dw Unkn_f9463
- dw Unkn_f9468
- dw Unkn_f946d
- dw Unkn_f9472
- dw Unkn_f9477
- dw Unkn_f947c
- dw Unkn_f9481
- dw Unkn_f9486
- dw Unkn_f948b
- dw Unkn_f9494
- dw Unkn_f9499
- dw Unkn_f949e
- dw Unkn_f94fb
- dw Unkn_f94a1
- dw Unkn_f94b0
- dw Unkn_f94bf
- dw Unkn_f94ce
- dw Unkn_f94dd
- dw Unkn_f94ec
- dw Unkn_f94fe
+SurfingPikachuFrames:
+ dw Unkn_f943d ; 00
+ dw Unkn_f9440 ; 01
+ dw Unkn_f9445 ; 02
+ dw Unkn_f944a ; 03
+ dw Unkn_f944f ; 04
+ dw Unkn_f9454 ; 05
+ dw Unkn_f9459 ; 06
+ dw Unkn_f945e ; 07
+ dw Unkn_f9463 ; 08
+ dw Unkn_f9468 ; 09
+ dw Unkn_f946d ; 0a
+ dw Unkn_f9472 ; 0b
+ dw Unkn_f9477 ; 0c
+ dw Unkn_f947c ; 0d
+ dw Unkn_f9481 ; 0e
+ dw Unkn_f9486 ; 0f
+ dw Unkn_f948b ; 10
+ dw Unkn_f9494 ; 11
+ dw Unkn_f9499 ; 12
+ dw Unkn_f949e ; 13
+ dw Unkn_f94fb ; 14
+ dw Unkn_f94a1 ; 15
+ dw Unkn_f94b0 ; 16
+ dw Unkn_f94bf ; 17
+ dw Unkn_f94ce ; 18
+ dw Unkn_f94dd ; 19
+ dw Unkn_f94ec ; 1a
+ dw Unkn_f94fe ; 1b
Unkn_f943d:
frame $00, 32
@@ -199,49 +199,66 @@ Unkn_f94fe:
frame $23, 7
dorestart
-Unkn_f9507:
- dbw $00, Unkn_f9573
- dbw $00, Unkn_f9578
- dbw $36, Unkn_f9578
- dbw $03, Unkn_f9578
- dbw $39, Unkn_f9578
- dbw $06, Unkn_f9578
- dbw $3c, Unkn_f9578
- dbw $09, Unkn_f9578
- dbw $60, Unkn_f9578
- dbw $0c, Unkn_f9578
- dbw $63, Unkn_f9578
- dbw $30, Unkn_f9578
- dbw $66, Unkn_f9578
- dbw $33, Unkn_f9578
- dbw $69, Unkn_f9578
- dbw $6c, Unkn_f9578
- dbw $9c, Unkn_f9578
- dbw $a0, Unkn_f9578
- dbw $a3, Unkn_f9578
- dbw $a7, Unkn_f95db
- dbw $a8, Unkn_f95f4
- dbw $98, Unkn_f9625
- dbw $e0, Unkn_f959d
- dbw $e6, Unkn_f959d
- dbw $ca, Unkn_f959d
- dbw $a7, Unkn_f95ce
- dbw $00, Unkn_f9632
- dbw $00, Unkn_f963f
- dbw $00, Unkn_f9650
- dbw $00, Unkn_f9661
- dbw $00, Unkn_f9672
- dbw $00, Unkn_f9683
- dbw $80, Unkn_f9694
- dbw $84, Unkn_f9694
- dbw $88, Unkn_f9694
- dbw $8c, Unkn_f9694
-
-Unkn_f9573:
+SurfingPikachuOAMData:
+ dbw $00, .Frame0
+ dbw $00, .Frame1
+ dbw $36, .Frame2
+ dbw $03, .Frame3
+ dbw $39, .Frame4
+ dbw $06, .Frame5
+ dbw $3c, .Frame6
+ dbw $09, .Frame7
+ dbw $60, .Frame8
+ dbw $0c, .Frame9
+ dbw $63, .Frame10
+ dbw $30, .Frame11
+ dbw $66, .Frame12
+ dbw $33, .Frame13
+ dbw $69, .Frame14
+ dbw $6c, .Frame15
+ dbw $9c, .Frame16
+ dbw $a0, .Frame17
+ dbw $a3, .Frame18
+ dbw $a7, .Frame19
+ dbw $a8, .Frame20
+ dbw $98, .Frame21
+ dbw $e0, .Frame22
+ dbw $e6, .Frame23
+ dbw $ca, .Frame24
+ dbw $a7, .Frame25
+ dbw $00, .Frame26
+ dbw $00, .Frame27
+ dbw $00, .Frame28
+ dbw $00, .Frame29
+ dbw $00, .Frame30
+ dbw $00, .Frame31
+ dbw $80, .Frame32
+ dbw $84, .Frame33
+ dbw $88, .Frame34
+ dbw $8c, .Frame35
+
+.Frame0:
db 1
db $fc, $fc, $00, $00
-Unkn_f9578:
+.Frame1:
+.Frame2:
+.Frame3:
+.Frame4:
+.Frame5:
+.Frame6:
+.Frame7:
+.Frame8:
+.Frame9:
+.Frame10:
+.Frame11:
+.Frame12:
+.Frame13:
+.Frame14:
+.Frame15:
+.Frame16:
+.Frame17:
+.Frame18:
db 9
db $f4, $f4, $00, $00
db $f4, $fc, $01, $00
@@ -253,7 +270,9 @@ Unkn_f9578:
db $04, $fc, $21, $00
db $04, $04, $22, $00
-Unkn_f959d:
+.Frame22:
+.Frame23:
+.Frame24:
db 12
db $f8, $e8, $00, $00
db $f8, $f0, $01, $00
@@ -268,13 +287,13 @@ Unkn_f959d:
db $00, $08, $14, $00
db $00, $10, $15, $00
-Unkn_f95ce:
+.Frame25:
db 3
db $fc, $0b, $00, $10
db $04, $03, $0f, $10
db $04, $0b, $10, $10
-Unkn_f95db:
+.Frame19:
db 6
db $fc, $f0, $00, $30
db $fc, $08, $00, $10
@@ -283,7 +302,7 @@ Unkn_f95db:
db $04, $00, $0f, $10
db $04, $08, $10, $10
-Unkn_f95f4:
+.Frame20:
db 12
db $f4, $f0, $00, $10
db $f4, $f8, $01, $10
@@ -298,54 +317,57 @@ Unkn_f95f4:
db $04, $00, $21, $30
db $04, $08, $20, $30
-Unkn_f9625:
+.Frame21:
db 3
db $04, $f4, $00, $00
db $04, $fc, $01, $00
db $04, $04, $02, $00
-Unkn_f9632:
+.Frame26:
db 3
db $fc, $f4, $bf, $00
db $fc, $fc, $d5, $00
db $fc, $04, $d0, $00
-Unkn_f963f:
+.Frame27:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d1, $00
db $fc, $00, $d5, $00
db $fc, $08, $d0, $00
-Unkn_f9650:
+.Frame28:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d3, $00
db $fc, $00, $d5, $00
db $fc, $08, $d0, $00
-Unkn_f9661:
+.Frame29:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d7, $00
db $fc, $00, $d5, $00
db $fc, $08, $d0, $00
-Unkn_f9672:
+.Frame30:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d1, $00
db $fc, $00, $d8, $00
db $fc, $08, $d0, $00
-Unkn_f9683:
+.Frame31:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d5, $00
db $fc, $00, $d0, $00
db $fc, $08, $d0, $00
-Unkn_f9694:
+.Frame32:
+.Frame33:
+.Frame34:
+.Frame35:
db 12
db $f4, $f0, $03, $20
db $f4, $f8, $02, $20
diff --git a/data/animations.asm b/data/animations.asm
index 786f7e72..de2487d7 100755
--- a/data/animations.asm
+++ b/data/animations.asm
@@ -1,4 +1,4 @@
-AttackAnimationPointers: ; 7a22a (1e:622a)
+AttackAnimationPointers:
dw PoundAnim
dw KarateChopAnim
dw DoubleSlapAnim
@@ -208,152 +208,152 @@ AttackAnimationPointers: ; 7a22a (1e:622a)
; if first byte >= $D8
; db special_effect_id, sound_id
; $FF terminated
-PoundAnim: ; 7a216 (1e:6216)
-StruggleAnim: ; 7a216 (1e:6216)
+PoundAnim:
+StruggleAnim:
db $08,$00,$01
db $FF
-KarateChopAnim: ; 7a21a (1e:621a)
+KarateChopAnim:
db $08,$01,$03
db $FF
-DoubleSlapAnim: ; 7a21e (1e:621e)
+DoubleSlapAnim:
db $05,$02,$01
db $05,$02,$01
db $FF
-CometPunchAnim: ; 7a225 (1e:6225)
+CometPunchAnim:
db $04,$03,$02
db $04,$03,$02
db $FF
-MegaPunchAnim: ; 7a22c (1e:622c)
+MegaPunchAnim:
db $46,$04,$04
db $FF
-PayDayAnim: ; 7a230 (1e:6230)
+PayDayAnim:
db $08,$00,$01
db $04,$05,$52
db $FF
-FirePunchAnim: ; 7a237 (1e:6237)
+FirePunchAnim:
db $06,$06,$02
db $46,$FF,$11
db $FF
-IcePunchAnim: ; 7a23e (1e:623e)
+IcePunchAnim:
db $06,$07,$02
db $10,$FF,$2F
db $FF
-ThunderPunchAnim: ; 7a245 (1e:6245)
+ThunderPunchAnim:
db $06,$08,$02
db SE_DARK_SCREEN_PALETTE, $FF
db $46,$FF,$2B
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-ScratchAnim: ; 7a250 (1e:6250)
+ScratchAnim:
db $06,$09,$0F
db $FF
-VicegripAnim: ; 7a254 (1e:6254)
+VicegripAnim:
db $08,$0A,$2A
db $FF
-GuillotineAnim: ; 7a258 (1e:6258)
+GuillotineAnim:
db $06,$0B,$2A
db $FF
-RazorWindAnim: ; 7a25c (1e:625c)
+RazorWindAnim:
db $04,$0C,$16
db $FF
-SwordsDanceAnim: ; 7a260 (1e:6260)
+SwordsDanceAnim:
db $46,$0D,$18
db $46,$0D,$18
db $46,$0D,$18
db $FF
-CutAnim: ; 7a26a (1e:626a)
+CutAnim:
db SE_DARK_SCREEN_FLASH, $0E
db $04,$FF,$16
db $FF
-GustAnim: ; 7a270 (1e:6270)
+GustAnim:
db $46,$0F,$10
db $06,$FF,$02
db $FF
-WingAttackAnim: ; 7a277 (1e:6277)
+WingAttackAnim:
db $46,$10,$04
db $FF
-WhirlwindAnim: ; 7a27b (1e:627b)
+WhirlwindAnim:
db $46,$11,$10
db SE_SLIDE_ENEMY_MON_OFF, $FF
db $FF
-FlyAnim: ; 7a281 (1e:6281)
+FlyAnim:
db $46,$12,$04
db SE_SHOW_MON_PIC, $FF
db $FF
-BindAnim: ; 7a287 (1e:6287)
+BindAnim:
db $04,$13,$23
db $04,$13,$23
db $FF
-SlamAnim: ; 7a28e (1e:628e)
+SlamAnim:
db $06,$14,$02
db $FF
-VineWhipAnim: ; 7a292 (1e:6292)
+VineWhipAnim:
db $01,$15,$16
db $08,$FF,$01
db $FF
-StompAnim: ; 7a299 (1e:6299)
+StompAnim:
db $48,$16,$05
db $FF
-DoubleKickAnim: ; 7a29d (1e:629d)
+DoubleKickAnim:
db $08,$17,$01
db $08,$17,$01
db $FF
-MegaKickAnim: ; 7a2a4 (1e:62a4)
+MegaKickAnim:
db $46,$18,$04
db $FF
-JumpKickAnim: ; 7a2a8 (1e:62a8)
+JumpKickAnim:
db $46,$19,$04
db $FF
-RollingKickAnim: ; 7a2ac (1e:62ac)
+RollingKickAnim:
db SE_DARK_SCREEN_FLASH, $1A
db $46,$FF,$04
db $FF
-SandAttackAnim: ; 7a2b2 (1e:62b2)
+SandAttackAnim:
db $46,$1B,$28
db $FF
-HeatButtAnim: ; 7a2b6 (1e:62b6)
+HeatButtAnim:
db $46,$1C,$05
db $FF
-HornAttackAnim: ; 7a2ba (1e:62ba)
+HornAttackAnim:
db $06,$1D,$45
db $46,$FF,$05
db $FF
-FuryAttackAnim: ; 7a2c1 (1e:62c1)
+FuryAttackAnim:
db $02,$1E,$46
db $02,$FF,$46
db $FF
-HornDrillAnim: ; 7a2c8 (1e:62c8)
+HornDrillAnim:
db $42,$1F,$05
db $42,$FF,$05
db $42,$FF,$05
@@ -361,35 +361,35 @@ HornDrillAnim: ; 7a2c8 (1e:62c8)
db $42,$FF,$05
db $FF
-TackleAnim: ; 7a2d8 (1e:62d8)
+TackleAnim:
db SE_MOVE_MON_HORIZONTALLY, $48
db SE_RESET_MON_POSITION, $FF
db $FF
-BodySlamAnim: ; 7a2dd (1e:62dd)
+BodySlamAnim:
db SE_MOVE_MON_HORIZONTALLY, $48
db SE_DARK_SCREEN_FLASH, $FF
db SE_DARK_SCREEN_FLASH, $FF
db SE_RESET_MON_POSITION, $FF
db $FF
-WrapAnim: ; 7a2e6 (1e:62e6)
+WrapAnim:
db $04,$22,$23
db $04,$22,$23
db $04,$22,$23
db $FF
-TakeDownAnim: ; 7a2f0 (1e:62f0)
+TakeDownAnim:
db SE_MOVE_MON_HORIZONTALLY, $48
db SE_DARK_SCREEN_FLASH, $23
db SE_RESET_MON_POSITION, $FF
db $FF
-ThrashAnim: ; 7a2f7 (1e:62f7)
+ThrashAnim:
db $46,$24,$04
db $FF
-DoubleEdgeAnim: ; 7a2fb (1e:62fb)
+DoubleEdgeAnim:
db SE_LIGHT_SCREEN_PALETTE, $48
db $06,$FF,$2D
db SE_RESET_SCREEN_PALETTE, $FF
@@ -398,7 +398,7 @@ DoubleEdgeAnim: ; 7a2fb (1e:62fb)
db SE_RESET_MON_POSITION, $FF
db $FF
-TailWhipAnim: ; 7a309 (1e:6309)
+TailWhipAnim:
db SE_MOVE_MON_HORIZONTALLY, $84
db SE_DELAY_ANIMATION_10, $FF
db SE_RESET_MON_POSITION, $84
@@ -408,125 +408,125 @@ TailWhipAnim: ; 7a309 (1e:6309)
db SE_RESET_MON_POSITION, $84
db $FF
-PoisonStingAnim: ; 7a318 (1e:6318)
+PoisonStingAnim:
db $06,$27,$00
db $FF
-TwineedleAnim: ; 7a31c (1e:631c)
+TwineedleAnim:
db $05,$28,$01
db $05,$28,$01
db $FF
-PinMissileAnim: ; 7a323 (1e:6323)
+PinMissileAnim:
db $03,$29,$01
db $FF
-LeerAnim: ; 7a327 (1e:6327)
+LeerAnim:
db SE_DARK_SCREEN_PALETTE, $48
db SE_DARK_SCREEN_FLASH, $2A
db SE_DARK_SCREEN_FLASH, $2A
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-BiteAnim: ; 7a330 (1e:6330)
+BiteAnim:
db $08,$2B,$02
db $FF
-GrowlAnim: ; 7a334 (1e:6334)
+GrowlAnim:
db $46,$2C,$12
db $FF
-RoarAnim: ; 7a338 (1e:6338)
+RoarAnim:
db $46,$2D,$15
db $46,$2D,$15
db $46,$2D,$15
db $FF
-SingAnim: ; 7a342 (1e:6342)
+SingAnim:
db $46,$2E,$12
db $50,$FF,$40
db $50,$FF,$40
db $FF
-SupersonicAnim: ; 7a34c (1e:634c)
+SupersonicAnim:
db $06,$2F,$31
db $FF
-SonicBoomAnim: ; 7a350 (1e:6350)
+SonicBoomAnim:
db $46,$2D,$15
db $46,$2D,$15
db $46,$0F,$10
db $46,$FF,$05
db $FF
-DisableAnim: ; 7a35d (1e:635d)
+DisableAnim:
db SE_DARK_SCREEN_PALETTE, $48
db SE_DARK_SCREEN_FLASH, $2A
db SE_DARK_SCREEN_FLASH, $2A
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-AcidAnim: ; 7a366 (1e:6366)
+AcidAnim:
db $46,$32,$13
db $46,$32,$14
db $FF
-EmberAnim: ; 7a36d (1e:636d)
+EmberAnim:
db $46,$33,$11
db $FF
-FlamethrowerAnim: ; 7a371 (1e:6371)
+FlamethrowerAnim:
db $46,$34,$1F
db $46,$34,$0C
db $46,$34,$0D
db $FF
-MistAnim: ; 7a37b (1e:637b)
+MistAnim:
db SE_LIGHT_SCREEN_PALETTE, $FF
db SE_WATER_DROPLETS_EVERYWHERE, $38
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-WaterGunAnim: ; 7a382 (1e:6382)
+WaterGunAnim:
db $06,$36,$2C
db $FF
-HydroPumpAnim: ; 7a386 (1e:6386)
+HydroPumpAnim:
db $06,$37,$1A
db $06,$37,$1A
db $FF
-SurfAnim: ; 7a38d (1e:638d)
+SurfAnim:
db SE_WATER_DROPLETS_EVERYWHERE, $38
db $06,$37,$1A
db $FF
-IceBeamAnim: ; 7a393 (1e:6393)
+IceBeamAnim:
db $03,$39,$2E
db $10,$FF,$2F
db $FF
-BlizzardAnim: ; 7a39a (1e:639a)
+BlizzardAnim:
db $04,$3A,$38
db $04,$37,$38
db $FF
-PsyBeamAnim: ; 7a3a1 (1e:63a1)
+PsyBeamAnim:
db $03,$3B,$2E
db SE_FLASH_SCREEN_LONG, $FF
db $FF
-BubbleBeamAnim: ; 7a3a7 (1e:63a7)
+BubbleBeamAnim:
db $12,$3C,$35
db $FF
-AuroraBeamAnim: ; 7a3ab (1e:63ab)
+AuroraBeamAnim:
db $03,$3D,$2E
db SE_DELAY_ANIMATION_10, $FF
db SE_DELAY_ANIMATION_10, $FF
db $FF
-HyperBeamAnim: ; 7a3b3 (1e:63b3)
+HyperBeamAnim:
db SE_DARK_SCREEN_PALETTE, $48
db SE_SPIRAL_BALLS_INWARD, $FF
db $02,$3E,$2E
@@ -536,33 +536,33 @@ HyperBeamAnim: ; 7a3b3 (1e:63b3)
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-PeckAnim: ; 7a3c4 (1e:63c4)
+PeckAnim:
db $08,$3F,$01
db $FF
-DrillPeckAnim: ; 7a3c8 (1e:63c8)
+DrillPeckAnim:
db $46,$40,$04
db $FF
-SubmissionAnim: ; 7a3cc (1e:63cc)
+SubmissionAnim:
db SE_SLIDE_MON_OFF, $41
db $06,$FF,$01
db SE_SHOW_MON_PIC, $FF
db $FF
-LowKickAnim: ; 7a3d4 (1e:63d4)
+LowKickAnim:
db SE_SLIDE_MON_OFF, $42
db $46,$FF,$04
db SE_SHOW_MON_PIC, $FF
db $FF
-CounterAnim: ; 7a3dc (1e:63dc)
+CounterAnim:
db SE_SLIDE_MON_OFF, $43
db $46,$FF,$04
db SE_SHOW_MON_PIC, $FF
db $FF
-SeismicTossAnim: ; 7a3e4 (1e:63e4)
+SeismicTossAnim:
db SE_BLINK_ENEMY_MON, $FF
db $41,$8B,$4E
db SE_HIDE_ENEMY_MON_PIC, $FF
@@ -576,20 +576,20 @@ SeismicTossAnim: ; 7a3e4 (1e:63e4)
db SE_SHAKE_SCREEN, $FF
db $FF
-StrengthAnim: ; 7a3fe (1e:63fe)
+StrengthAnim:
db SE_MOVE_MON_HORIZONTALLY, $48
db SE_RESET_MON_POSITION, $FF
db $46,$06,$04
db $FF
-AbsorbAnim: ; 7a406 (1e:6406)
+AbsorbAnim:
db SE_LIGHT_SCREEN_PALETTE, $46
db $06,$FF,$21
db $06,$FF,$22
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-MegaDrainAnim: ; 7a411 (1e:6411)
+MegaDrainAnim:
db SE_LIGHT_SCREEN_PALETTE, $47
db SE_DARK_SCREEN_FLASH, $FF
db $06,$FF,$21
@@ -598,79 +598,79 @@ MegaDrainAnim: ; 7a411 (1e:6411)
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-LeechSeedAnim: ; 7a420 (1e:6420)
+LeechSeedAnim:
db $46,$48,$1B
db $55,$4D,$1C
db $FF
-GrowthAnim: ; 7a427 (1e:6427)
+GrowthAnim:
db SE_LIGHT_SCREEN_PALETTE, $49
db SE_SPIRAL_BALLS_INWARD, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-RazorLeafAnim: ; 7a42e (1e:642e)
+RazorLeafAnim:
db SE_LEAVES_FALLING, $4A
db $41,$80,$44
db $01,$0C,$16
db $FF
-SolarBeamAnim: ; 7a437 (1e:6437)
+SolarBeamAnim:
db $06,$4B,$2E
db $06,$FF,$01
db $FF
-PoisonPowderAnim: ; 7a43e (1e:643e)
+PoisonPowderAnim:
db $06,$4C,$36
db $FF
-StunSporeAnim: ; 7a442 (1e:6442)
+StunSporeAnim:
db $06,$4D,$36
db $FF
-SleepPowderAnim: ; 7a446 (1e:6446)
+SleepPowderAnim:
db $06,$4E,$36
db $FF
-PedalDanceAnim: ; 7a44a (1e:644a)
+PedalDanceAnim:
db SE_LIGHT_SCREEN_PALETTE, $4F
db SE_PETALS_FALLING, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-StringShotAnim: ; 7a451 (1e:6451)
+StringShotAnim:
db $08,$50,$37
db $FF
-DragonRageAnim: ; 7a455 (1e:6455)
+DragonRageAnim:
db $46,$51,$1F
db $46,$FF,$0C
db $46,$FF,$0D
db $46,$FF,$0E
db $FF
-FireSpinAnim: ; 7a462 (1e:6462)
+FireSpinAnim:
db $46,$52,$0C
db $46,$FF,$0D
db $46,$FF,$0E
db $FF
-ThunderShockAnim: ; 7a46c (1e:646c)
+ThunderShockAnim:
db $42,$53,$29
db $FF
-ThunderBoltAnim: ; 7a470 (1e:6470)
+ThunderBoltAnim:
db $41,$54,$29
db $41,$54,$29
db $FF
-ThunderWaveAnim: ; 7a477 (1e:6477)
+ThunderWaveAnim:
db $42,$55,$29
db $02,$FF,$23
db $04,$FF,$23
db $FF
-ThunderAnim: ; 7a481 (1e:6481)
+ThunderAnim:
db SE_DARK_SCREEN_PALETTE, $56
db SE_DARK_SCREEN_FLASH, $FF
db $46,$FF,$2B
@@ -679,87 +679,87 @@ ThunderAnim: ; 7a481 (1e:6481)
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-RockThrowAnim: ; 7a490 (1e:6490)
+RockThrowAnim:
db $04,$57,$30
db $FF
-EarthquakeAnim: ; 7a494 (1e:6494)
+EarthquakeAnim:
db SE_SHAKE_SCREEN, $58
db SE_SHAKE_SCREEN, $58
db $FF
-FissureAnim: ; 7a499 (1e:6499)
+FissureAnim:
db SE_DARK_SCREEN_FLASH, $59
db SE_SHAKE_SCREEN, $FF
db SE_DARK_SCREEN_FLASH, $59
db SE_SHAKE_SCREEN, $FF
db $FF
-DigAnim: ; 7a4a2 (1e:64a2)
+DigAnim:
db $46,$5A,$04
db SE_SLIDE_MON_UP, $FF
db $FF
-ToxicAnim: ; 7a4a8 (1e:64a8)
+ToxicAnim:
db SE_WATER_DROPLETS_EVERYWHERE, $38
db $46,$5B,$14
db $FF
-ConfusionAnim: ; 7a4ae (1e:64ae)
+ConfusionAnim:
db SE_FLASH_SCREEN_LONG, $5C
db $FF
-PsychicAnim: ; 7a4b1 (1e:64b1)
+PsychicAnim:
db SE_FLASH_SCREEN_LONG, $5D
db SE_WAVY_SCREEN, $FF
db $FF
-HypnosisAnim: ; 7a4b6 (1e:64b6)
+HypnosisAnim:
db SE_FLASH_SCREEN_LONG, $5E
db $FF
-MeditateAnim: ; 7a4b9 (1e:64b9)
+MeditateAnim:
db SE_LIGHT_SCREEN_PALETTE, $5F
db $46,$FF,$43
db SE_DARK_SCREEN_FLASH, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-AgilityAnim: ; 7a4c3 (1e:64c3)
+AgilityAnim:
db SE_LIGHT_SCREEN_PALETTE, $60
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-QuickAttackAnim: ; 7a4c8 (1e:64c8)
+QuickAttackAnim:
db SE_SLIDE_MON_OFF, $61
db $46,$FF,$04
db SE_SHOW_MON_PIC, $FF
db $FF
-RageAnim: ; 7a4d0 (1e:64d0)
+RageAnim:
db $06,$62,$01
db $FF
-TeleportAnim: ; 7a4d4 (1e:64d4)
+TeleportAnim:
db SE_SQUISH_MON_PIC, $63
db SE_SHOOT_BALLS_UPWARD, $FF
db $FF
-NightShadeAnim: ; 7a4d9 (1e:64d9)
+NightShadeAnim:
db SE_FLASH_SCREEN_LONG, $5C
db SE_WAVY_SCREEN, $FF
db $FF
-MimicAnim: ; 7a4de (1e:64de)
+MimicAnim:
db $46,$65,$21
db $46,$65,$22
db $FF
-ScreechAnim: ; 7a4e5 (1e:64e5)
+ScreechAnim:
db $46,$66,$12
db $FF
-DoubleTeamAnim: ; 7a4e9 (1e:64e9)
+DoubleTeamAnim:
db SE_DARK_SCREEN_PALETTE, $FF
db SE_DELAY_ANIMATION_10, $FF
db SE_DELAY_ANIMATION_10, $FF
@@ -771,28 +771,28 @@ DoubleTeamAnim: ; 7a4e9 (1e:64e9)
db $46,$6F,$33
db $FF
-RecoverAnim: ; 7a4fd (1e:64fd)
+RecoverAnim:
db SE_BLINK_MON, $68
db SE_LIGHT_SCREEN_PALETTE, $FF
db SE_SPIRAL_BALLS_INWARD, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-HardenAnim: ; 7a506 (1e:6506)
+HardenAnim:
db SE_LIGHT_SCREEN_PALETTE, $69
db $46,$FF,$43
db SE_DARK_SCREEN_FLASH, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-MinimizeAnim: ; 7a510 (1e:6510)
+MinimizeAnim:
db SE_LIGHT_SCREEN_PALETTE, $6A
db SE_SPIRAL_BALLS_INWARD, $FF
db SE_MINIMIZE_MON, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-SmokeScreenAnim: ; 7a519 (1e:6519)
+SmokeScreenAnim:
db $46,$6B,$28
db $04,$FF,$0A
db SE_DARKEN_MON_PALETTE, $FF
@@ -810,13 +810,13 @@ SmokeScreenAnim: ; 7a519 (1e:6519)
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-ConfuseRayAnim: ; 7a53a (1e:653a)
+ConfuseRayAnim:
db SE_DARK_SCREEN_PALETTE, $6C
db $46,$FF,$3E
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-WithdrawAnim: ; 7a542 (1e:6542)
+WithdrawAnim:
db SE_LIGHT_SCREEN_PALETTE, $6E
db SE_SLIDE_MON_DOWN, $FF
db $06,$FF,$51
@@ -824,47 +824,47 @@ WithdrawAnim: ; 7a542 (1e:6542)
db SE_SHOW_MON_PIC, $FF
db $FF
-DefenseCurlAnim: ; 7a54e (1e:654e)
+DefenseCurlAnim:
db SE_LIGHT_SCREEN_PALETTE, $6E
db $06,$FF,$43
db SE_DARK_SCREEN_FLASH, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-BarrierAnim: ; 7a558 (1e:6558)
+BarrierAnim:
db $46,$6F,$33
db $46,$6F,$33
db $FF
-LightScreenAnim: ; 7a55f (1e:655f)
+LightScreenAnim:
db SE_LIGHT_SCREEN_PALETTE, $FF
db $46,$70,$33
db $46,$70,$33
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-HazeAnim: ; 7a56a (1e:656a)
+HazeAnim:
db SE_DARKEN_MON_PALETTE, $FF
db SE_WATER_DROPLETS_EVERYWHERE, $38
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-ReflectAnim: ; 7a571 (1e:6571)
+ReflectAnim:
db SE_DARK_SCREEN_PALETTE, $FF
db $46,$72,$33
db $46,$72,$33
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-FocusEnergyAnim: ; 7a57c (1e:657c)
+FocusEnergyAnim:
db SE_SPIRAL_BALLS_INWARD, $73
db $FF
-BideAnim: ; 7a57f (1e:657f)
+BideAnim:
db $46,$74,$04
db $FF
-MetronomeAnim: ; 7a583 (1e:6583)
+MetronomeAnim:
db SE_MOVE_MON_HORIZONTALLY, $84
db SE_DELAY_ANIMATION_10, $FF
db SE_RESET_MON_POSITION, $84
@@ -874,39 +874,39 @@ MetronomeAnim: ; 7a583 (1e:6583)
db SE_RESET_MON_POSITION, $84
db $FF
-MirrorMoveAnim: ; 7a592 (1e:6592)
+MirrorMoveAnim:
db $08,$76,$01
db $FF
-SelfdestructAnim: ; 7a596 (1e:6596)
+SelfdestructAnim:
db $43,$77,$34
db $FF
-EggBombAnim: ; 7a59a (1e:659a)
+EggBombAnim:
db $44,$78,$41
db $44,$78,$42
db $FF
-LickAnim: ; 7a5a1 (1e:65a1)
+LickAnim:
db $46,$7B,$14
db $FF
-SmogAnim: ; 7a5a5 (1e:65a5)
+SmogAnim:
db SE_DARKEN_MON_PALETTE, $48
db $46,$7A,$19
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-SludgeAnim: ; 7a5ad (1e:65ad)
+SludgeAnim:
db $46,$7B,$13
db $46,$7B,$14
db $FF
-BoneClubAnim: ; 7a5b4 (1e:65b4)
+BoneClubAnim:
db $08,$7C,$02
db $FF
-FireBlastAnim: ; 7a5b8 (1e:65b8)
+FireBlastAnim:
db $46,$7D,$1F
db $46,$FF,$20
db $46,$FF,$20
@@ -914,47 +914,47 @@ FireBlastAnim: ; 7a5b8 (1e:65b8)
db $46,$FF,$0D
db $FF
-WaterfallAnim: ; 7a5c8 (1e:65c8)
+WaterfallAnim:
db SE_SLIDE_MON_DOWN, $48
db $06,$37,$1A
db $08,$FF,$02
db SE_SLIDE_MON_UP, $FF
db $FF
-ClampAnim: ; 7a5d3 (1e:65d3)
+ClampAnim:
db $08,$7F,$2A
db $06,$83,$23
db $06,$83,$23
db $FF
-SwiftAnim: ; 7a5dd (1e:65dd)
+SwiftAnim:
db $43,$80,$3F
db $FF
-SkullBashAnim: ; 7a5e1 (1e:65e1)
+SkullBashAnim:
db $46,$81,$05
db $FF
-SpikeCannonAnim: ; 7a5e5 (1e:65e5)
+SpikeCannonAnim:
db $44,$82,$04
db $FF
-ConstrictAnim: ; 7a5e9 (1e:65e9)
+ConstrictAnim:
db $06,$83,$23
db $06,$83,$23
db $06,$83,$23
db $FF
-AmnesiaAnim: ; 7a5f3 (1e:65f3)
+AmnesiaAnim:
db $08,$84,$25
db $08,$84,$25
db $FF
-KinesisAnim: ; 7a5fa (1e:65fa)
+KinesisAnim:
db $08,$85,$01
db $FF
-SoftboiledAnim: ; 7a5fe (1e:65fe)
+SoftboiledAnim:
db SE_SLIDE_MON_HALF_OFF, $48
db $08,$86,$4C
db SE_LIGHT_SCREEN_PALETTE, $FF
@@ -963,34 +963,34 @@ SoftboiledAnim: ; 7a5fe (1e:65fe)
db SE_SHOW_MON_PIC, $FF
db $FF
-HiJumpKickAnim: ; 7a6 (1e:660c)
+HiJumpKickAnim:
db $46,$87,$04
db $FF
-GlareAnim: ; 7a610 (1e:6610)
+GlareAnim:
db SE_DARK_SCREEN_PALETTE, $48
db SE_DARK_SCREEN_FLASH, $88
db SE_DARK_SCREEN_FLASH, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-DreamEaterAnim: ; 7a619 (1e:6619)
+DreamEaterAnim:
db SE_FLASH_SCREEN_LONG, $89
db SE_DARK_SCREEN_PALETTE, $89
db $08,$89,$02
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-PoisonGasAnim: ; 7a623 (1e:6623)
+PoisonGasAnim:
db $46,$8A,$19
db $FF
-BarrageAnim: ; 7a627 (1e:6627)
+BarrageAnim:
db $43,$8B,$41
db $05,$FF,$55
db $FF
-LeechLifeAnim: ; 7a62e (1e:662e)
+LeechLifeAnim:
db $08,$8C,$02
db SE_DARK_SCREEN_FLASH, $FF
db $06,$FF,$21
@@ -998,264 +998,264 @@ LeechLifeAnim: ; 7a62e (1e:662e)
db SE_DARK_SCREEN_FLASH, $FF
db $FF
-LovelyKissAnim: ; 7a63c (1e:663c)
+LovelyKissAnim:
db $06,$8D,$12
db $FF
-SkyAttackAnim: ; 7a640 (1e:6640)
+SkyAttackAnim:
db SE_SQUISH_MON_PIC, $8E
db SE_SHOOT_BALLS_UPWARD, $FF
db $46,$87,$04
db SE_SHOW_MON_PIC, $FF
db $FF
-TransformAnim: ; 7a64a (1e:664a)
+TransformAnim:
db $46,$8F,$21
db $44,$8F,$22
db $08,$FF,$47
db SE_TRANSFORM_MON, $FF
db $FF
-BubbleAnim: ; 7a656 (1e:6656)
+BubbleAnim:
db $16,$90,$35
db $FF
-DizzyPunchAnim: ; 7a65a (1e:665a)
+DizzyPunchAnim:
db $06,$91,$17
db $06,$91,$17
db $06,$91,$17
db $06,$02,$02
db $FF
-SporeAnim: ; 7a667 (1e:6667)
+SporeAnim:
db $06,$92,$36
db $FF
-FlashAnim: ; 7a66b (1e:666b)
+FlashAnim:
db SE_LIGHT_SCREEN_PALETTE, $48
db SE_DARK_SCREEN_FLASH, $88
db SE_DARK_SCREEN_FLASH, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-PsywaveAnim: ; 7a674 (1e:6674)
+PsywaveAnim:
db $06,$2F,$31
db SE_WAVY_SCREEN, $5C
db $FF
-SplashAnim: ; 7a67a (1e:667a)
+SplashAnim:
db SE_BOUNCE_UP_AND_DOWN, $95
db $FF
-AcidArmorAnim: ; 7a67d (1e:667d)
+AcidArmorAnim:
db SE_SLIDE_MON_DOWN_AND_HIDE, $96
db $FF
-CrabHammerAnim: ; 7a680 (1e:6680)
+CrabHammerAnim:
db $46,$97,$05
db $06,$FF,$2A
db $FF
-ExplosionAnim: ; 7a687 (1e:6687)
+ExplosionAnim:
db $43,$98,$34
db $FF
-FurySwipesAnim: ; 7a68b (1e:668b)
+FurySwipesAnim:
db $04,$99,$0F
db $FF
-BonemerangAnim: ; 7a68f (1e:668f)
+BonemerangAnim:
db $06,$9A,$02
db $FF
-RestAnim: ; 7a693 (1e:6693)
+RestAnim:
db $10,$9B,$3A
db $10,$9B,$3A
db $FF
-RockSlideAnim: ; 7a69a (1e:669a)
+RockSlideAnim:
db $04,$9C,$1D
db $03,$9C,$1E
db $46,$9D,$04
db $FF
-HyperFangAnim: ; 7a6a4 (1e:66a4)
+HyperFangAnim:
db $06,$9D,$02
db $FF
-SharpenAnim: ; 7a6a8 (1e:66a8)
+SharpenAnim:
db SE_LIGHT_SCREEN_PALETTE, $9E
db $46,$FF,$43
db SE_DARK_SCREEN_FLASH, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-ConversionAnim: ; 7a6b2 (1e:66b2)
+ConversionAnim:
db SE_DARK_SCREEN_FLASH, $9F
db $46,$FF,$21
db $46,$FF,$22
db SE_DARK_SCREEN_FLASH, $FF
db $FF
-TriAttackAnim: ; 7a6bd (1e:66bd)
+TriAttackAnim:
db SE_DARK_SCREEN_FLASH, $A0
db $46,$FF,$4D
db SE_DARK_SCREEN_FLASH, $FF
db $FF
-SuperFangAnim: ; 7a6c5 (1e:66c5)
+SuperFangAnim:
db SE_DARK_SCREEN_PALETTE, $48
db $46,$A1,$04
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-SlashAnim: ; 7a6cd (1e:66cd)
+SlashAnim:
db $06,$A2,$0F
db $FF
-SubstituteAnim: ; 7a6d1 (1e:66d1)
+SubstituteAnim:
db SE_SLIDE_MON_OFF, $A3
db $08,$FF,$47
db SE_SUBSTITUTE_MON, $FF
db $FF
-BallTossAnim: ; 7a6d9 (1e:66d9)
+BallTossAnim:
db $03,$FF,$06
db $FF
-GreatTossAnim: ; 7a6dd (1e:66dd)
+GreatTossAnim:
db $03,$FF,$07
db $FF
-UltraTossAnim: ; 7a6e1 (1e:66e1)
+UltraTossAnim:
db $02,$FF,$08
db $FF
-BallShakeAnim: ; 7a6e5 (1e:66e5)
+BallShakeAnim:
db $04,$FF,$09
db $FF
-BallPoofAnim: ; 7a6e9 (1e:66e9)
+BallPoofAnim:
db $04,$FF,$0A
db $FF
-ShowPicAnim: ; 7a6ed (1e:66ed)
+ShowPicAnim:
db SE_SHOW_ENEMY_MON_PIC, $FF
db $FF
-HidePicAnim: ; 7a6f0 (1e:66f0)
+HidePicAnim:
db SE_HIDE_ENEMY_MON_PIC, $FF
db $FF
-EnemyFlashAnim: ; 7a6f3 (1e:66f3)
+EnemyFlashAnim:
db SE_SHOW_MON_PIC, $FF
db $FF
-PlayerFlashAnim: ; 7a6f6 (1e:66f6)
+PlayerFlashAnim:
db SE_FLASH_MON_PIC, $FF
db $FF
-EnemyHUDShakeAnim: ; 7a6f9 (1e:66f9)
+EnemyHUDShakeAnim:
db SE_SHAKE_ENEMY_HUD, $FF
db $FF
-TradeBallDropAnim: ; 7a6fc (1e:66fc)
+TradeBallDropAnim:
db $86,$FF,$48
db $FF
-TradeBallAppear1Anim: ; 7a700 (1e:6700)
+TradeBallAppear1Anim:
db $84,$FF,$49
db $FF
-TradeBallAppear2Anim: ; 7a704 (1e:6704)
+TradeBallAppear2Anim:
db $86,$FF,$4A
db $FF
-TradeBallPoofAnim: ; 7a708 (1e:6708)
+TradeBallPoofAnim:
db $86,$FF,$4B
db $FF
-XStatItemAnim: ; 7a7c0 (1e:670c)
+XStatItemAnim:
db SE_LIGHT_SCREEN_PALETTE, $FF
db SE_SPIRAL_BALLS_INWARD, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-ShrinkingSquareAnim: ; 7a713 (1e:6713)
+ShrinkingSquareAnim:
db SE_LIGHT_SCREEN_PALETTE, $FF
db $46,$FF,$43
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-XStatItemBlackAnim: ; 7a71b (1e:671b)
+XStatItemBlackAnim:
db SE_DARKEN_MON_PALETTE, $FF
db SE_SPIRAL_BALLS_INWARD, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-ShrinkingSquareBlackAnim: ; 7a722 (1e:6722)
+ShrinkingSquareBlackAnim:
db SE_DARKEN_MON_PALETTE, $FF
db $46,$FF,$43
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-UnusedAnim: ; 7a72a (1e:672a)
+UnusedAnim:
db SE_LIGHT_SCREEN_PALETTE, $FF
db SE_SHOOT_MANY_BALLS_UPWARD, $FF
db SE_RESET_SCREEN_PALETTE, $FF
db $FF
-ParalyzeAnim: ; 7a731 (1e:6731)
+ParalyzeAnim:
db $04,$13,$24
db $04,$13,$24
db $FF
-PoisonAnim: ; 7a738 (1e:6738)
+PoisonAnim:
db $08,$13,$27
db $08,$13,$27
db $FF
-SleepPlayerAnim: ; 7a73f (1e:673f)
+SleepPlayerAnim:
db $10,$9B,$3A
db $10,$9B,$3A
db $FF
-SleepEnemyAnim: ; 7a746 (1e:6746)
+SleepEnemyAnim:
db $10,$9B,$3B
db $10,$9B,$3B
db $FF
-ConfusedPlayerAnim: ; 7a74d (1e:674d)
+ConfusedPlayerAnim:
db $08,$84,$25
db $08,$84,$25
db $FF
-ConfusedEnemyAnim: ; 7a754 (1e:6754)
+ConfusedEnemyAnim:
db $08,$84,$26
db $08,$84,$26
db $FF
-BallBlockAnim: ; 7a75b (1e:675b)
+BallBlockAnim:
db $03,$FF,$0B
db $FF
-FaintAnim: ; 7a75f (1e:675f)
+FaintAnim:
db SE_SLIDE_MON_DOWN, $5A
db $FF
-ShakeScreenAnim: ; 7a762 (1e:6762)
+ShakeScreenAnim:
db SE_SHAKE_SCREEN, $FF
db $FF
-ThrowRockAnim: ; 7a765 (1e:6765)
+ThrowRockAnim:
db $03,$8B,$53
db $FF
-ThrowBaitAnim: ; 7a769 (1e:6769)
+ThrowBaitAnim:
db $03,$8B,$54
db $FF
-SubanimationPointers: ; 7a76d (1e:676d)
+SubanimationPointers:
dw Subanimation00
dw Subanimation01
dw Subanimation02
@@ -1343,17 +1343,17 @@ SubanimationPointers: ; 7a76d (1e:676d)
dw Subanimation54
dw Subanimation55
-Subanimation04: ; 7a819 (1e:6819)
+Subanimation04:
db $43
db $02,$1a,$00
db $02,$10,$00
db $02,$03,$00
-Subanimation05: ; 7a823 (1e:6823)
+Subanimation05:
db $41
db $02,$10,$00
-Subanimation08: ; 7a827 (1e:6827)
+Subanimation08:
db $0b
db $03,$30,$00
db $03,$44,$00
@@ -1367,7 +1367,7 @@ Subanimation08: ; 7a827 (1e:6827)
db $03,$a1,$00
db $03,$34,$00
-Subanimation07: ; 7a849 (1e:6849)
+Subanimation07:
db $0b
db $03,$30,$00
db $03,$a2,$00
@@ -1381,7 +1381,7 @@ Subanimation07: ; 7a849 (1e:6849)
db $03,$a6,$00
db $03,$34,$00
-Subanimation06: ; 7a86b (1e:686b)
+Subanimation06:
db $0b
db $03,$30,$00
db $03,$a2,$00
@@ -1395,14 +1395,14 @@ Subanimation06: ; 7a86b (1e:686b)
db $03,$a9,$00
db $03,$34,$00
-Subanimation09: ; 7a88d (1e:688d)
+Subanimation09:
db $04
db $03,$21,$04
db $04,$21,$04
db $03,$21,$04
db $05,$21,$04
-Subanimation0a: ; 7a89a (1e:689a)
+Subanimation0a:
db $46
db $06,$1b,$00
db $07,$1b,$00
@@ -1411,18 +1411,18 @@ Subanimation0a: ; 7a89a (1e:689a)
db $0a,$15,$00
db $0a,$15,$00
-Subanimation0b: ; 7a8ad (1e:68ad)
+Subanimation0b:
db $04
db $01,$2d,$00
db $03,$2f,$00
db $03,$35,$00
db $03,$4d,$00
-Subanimation55: ; 7a8ba (1e:68ba)
+Subanimation55:
db $41
db $01,$9d,$00
-Subanimation11: ; 7a8be (1e:68be)
+Subanimation11:
db $4c
db $0b,$26,$00
db $0c,$26,$00
@@ -1437,7 +1437,7 @@ Subanimation11: ; 7a8be (1e:68be)
db $0b,$27,$00
db $0c,$27,$00
-Subanimation2b: ; 7a8e3 (1e:68e3)
+Subanimation2b:
db $4b
db $0d,$03,$03
db $0e,$03,$03
@@ -1451,7 +1451,7 @@ Subanimation2b: ; 7a8e3 (1e:68e3)
db $11,$1b,$00
db $11,$1b,$00
-Subanimation2c: ; 7a905 (1e:6905)
+Subanimation2c:
db $4c
db $12,$01,$00
db $12,$0f,$00
@@ -1466,7 +1466,7 @@ Subanimation2c: ; 7a905 (1e:6905)
db $16,$38,$00
db $16,$38,$00
-Subanimation12: ; 7a92a (1e:692a)
+Subanimation12:
db $69
db $17,$30,$00
db $17,$39,$00
@@ -1478,35 +1478,35 @@ Subanimation12: ; 7a92a (1e:692a)
db $17,$3f,$00
db $17,$1f,$00
-Subanimation00: ; 7a946 (1e:6946)
+Subanimation00:
db $41
db $01,$17,$00
-Subanimation01: ; 7a94a (1e:694a)
+Subanimation01:
db $42
db $01,$0f,$00
db $01,$1d,$00
-Subanimation02: ; 7a951 (1e:6951)
+Subanimation02:
db $43
db $01,$12,$00
db $01,$15,$00
db $01,$1c,$00
-Subanimation03: ; 7a95b (1e:695b)
+Subanimation03:
db $44
db $01,$0b,$00
db $01,$11,$00
db $01,$18,$00
db $01,$1d,$00
-Subanimation0c: ; 7a968 (1e:6968)
+Subanimation0c:
db $43
db $0c,$20,$00
db $0c,$21,$00
db $0c,$23,$00
-Subanimation0d: ; 7a972 (1e:6972)
+Subanimation0d:
db $46
db $0c,$20,$02
db $0c,$15,$00
@@ -1515,7 +1515,7 @@ Subanimation0d: ; 7a972 (1e:6972)
db $0c,$23,$02
db $0c,$19,$00
-Subanimation0e: ; 7a985 (1e:6985)
+Subanimation0e:
db $49
db $0c,$20,$02
db $0c,$15,$02
@@ -1527,7 +1527,7 @@ Subanimation0e: ; 7a985 (1e:6985)
db $0c,$19,$02
db $0c,$0c,$00
-Subanimation1f: ; 7a9a1 (1e:69a1)
+Subanimation1f:
db $85
db $0c,$30,$03
db $0c,$40,$03
@@ -1535,7 +1535,7 @@ Subanimation1f: ; 7a9a1 (1e:69a1)
db $0c,$42,$03
db $0c,$21,$00
-Subanimation2e: ; 7a9b1 (1e:69b1)
+Subanimation2e:
db $2e
db $18,$43,$02
db $75,$52,$04
@@ -1552,14 +1552,14 @@ Subanimation2e: ; 7a9b1 (1e:69b1)
db $1e,$43,$02
db $75,$1b,$00
-Subanimation2f: ; 7a9dc (1e:69dc)
+Subanimation2f:
db $44
db $1f,$24,$00
db $20,$20,$00
db $21,$1a,$00
db $22,$15,$00
-Subanimation30: ; 7a9e9 (1e:69e9)
+Subanimation30:
db $52
db $23,$00,$02
db $23,$02,$02
@@ -1580,7 +1580,7 @@ Subanimation30: ; 7a9e9 (1e:69e9)
db $24,$28,$00
db $24,$28,$00
-Subanimation0f: ; 7aa20 (1e:6a20)
+Subanimation0f:
db $4c
db $26,$0e,$02
db $26,$16,$02
@@ -1595,7 +1595,7 @@ Subanimation0f: ; 7aa20 (1e:6a20)
db $29,$16,$02
db $29,$1c,$00
-Subanimation16: ; 7aa45 (1e:6a45)
+Subanimation16:
db $4c
db $2a,$05,$00
db $2b,$05,$02
@@ -1610,7 +1610,7 @@ Subanimation16: ; 7aa45 (1e:6a45)
db $2c,$00,$02
db $2c,$00,$00
-Subanimation10: ; 7aa6a (1e:6a6a)
+Subanimation10:
db $88
db $2d,$44,$00
db $2e,$45,$00
@@ -1621,7 +1621,7 @@ Subanimation10: ; 7aa6a (1e:6a6a)
db $2d,$2f,$00
db $2e,$1a,$00
-Subanimation31: ; 7aa83 (1e:6a83)
+Subanimation31:
db $2a
db $2f,$46,$00
db $2f,$4a,$00
@@ -1634,7 +1634,7 @@ Subanimation31: ; 7aa83 (1e:6a83)
db $2f,$2e,$00
db $2f,$51,$00
-Subanimation13: ; 7aaa2 (1e:6aa2)
+Subanimation13:
db $86
db $30,$31,$00
db $30,$32,$00
@@ -1643,7 +1643,7 @@ Subanimation13: ; 7aaa2 (1e:6aa2)
db $30,$0f,$00
db $30,$10,$00
-Subanimation14: ; 7aab5 (1e:6ab5)
+Subanimation14:
db $49
db $30,$10,$00
db $30,$10,$03
@@ -1655,7 +1655,7 @@ Subanimation14: ; 7aab5 (1e:6ab5)
db $31,$22,$04
db $31,$27,$00
-Subanimation41: ; 7aad1 (1e:6ad1)
+Subanimation41:
db $85
db $03,$31,$00
db $03,$32,$00
@@ -1663,32 +1663,32 @@ Subanimation41: ; 7aad1 (1e:6ad1)
db $03,$0e,$00
db $03,$10,$00
-Subanimation42: ; 7aae1 (1e:6ae1)
+Subanimation42:
db $43
db $48,$08,$00
db $49,$08,$00
db $5a,$08,$00
-Subanimation15: ; 7aaeb (1e:6aeb)
+Subanimation15:
db $22
db $35,$52,$00
db $35,$53,$00
-Subanimation17: ; 7aaf2 (1e:6af2)
+Subanimation17:
db $44
db $36,$54,$00
db $36,$55,$00
db $37,$56,$00
db $37,$57,$00
-Subanimation18: ; 7aaff (1e:6aff)
+Subanimation18:
db $a4
db $36,$54,$00
db $36,$55,$00
db $37,$56,$00
db $37,$57,$00
-Subanimation40: ; 7ab0c (1e:6b0c)
+Subanimation40:
db $46
db $17,$54,$00
db $17,$55,$00
@@ -1697,7 +1697,7 @@ Subanimation40: ; 7ab0c (1e:6b0c)
db $17,$57,$00
db $17,$13,$00
-Subanimation19: ; 7ab1f (1e:6b1f)
+Subanimation19:
db $8c
db $38,$31,$00
db $39,$31,$00
@@ -1712,7 +1712,7 @@ Subanimation19: ; 7ab1f (1e:6b1f)
db $38,$10,$00
db $39,$10,$00
-Subanimation1a: ; 7ab44 (1e:6b44)
+Subanimation1a:
db $50
db $3a,$08,$00
db $3b,$08,$00
@@ -1731,20 +1731,20 @@ Subanimation1a: ; 7ab44 (1e:6b44)
db $3e,$0b,$00
db $3f,$0b,$00
-Subanimation1b: ; 7ab75 (1e:6b75)
+Subanimation1b:
db $84
db $40,$31,$00
db $40,$32,$00
db $40,$92,$00
db $40,$15,$00
-Subanimation1c: ; 7ab82 (1e:6b82)
+Subanimation1c:
db $43
db $41,$58,$00
db $41,$59,$00
db $41,$21,$00
-Subanimation1d: ; 7ab8c (1e:6b8c)
+Subanimation1d:
db $af
db $24,$9a,$00
db $23,$1b,$02
@@ -1762,22 +1762,22 @@ Subanimation1d: ; 7ab8c (1e:6b8c)
db $25,$62,$04
db $25,$99,$03
-Subanimation1e: ; 7abba (1e:6bba)
+Subanimation1e:
db $01
db $25,$75,$00
-Subanimation20: ; 7abbe (1e:6bbe)
+Subanimation20:
db $42
db $42,$07,$00
db $43,$07,$00
-Subanimation21: ; 7abc5 (1e:6bc5)
+Subanimation21:
db $43
db $44,$00,$00
db $45,$08,$00
db $46,$10,$02
-Subanimation22: ; 7abcf (1e:6bcf)
+Subanimation22:
db $8b
db $47,$10,$00
db $47,$56,$00
@@ -1791,7 +1791,7 @@ Subanimation22: ; 7abcf (1e:6bcf)
db $47,$89,$00
db $47,$b0,$00
-Subanimation2d: ; 7abf1 (1e:6bf1)
+Subanimation2d:
db $66
db $44,$64,$00
db $45,$65,$00
@@ -1800,15 +1800,15 @@ Subanimation2d: ; 7abf1 (1e:6bf1)
db $47,$66,$00
db $47,$66,$00
-Subanimation39: ; 7ac04 (1e:6c04)
+Subanimation39:
db $61
db $47,$67,$00
-Subanimation4e: ; 7ac08 (1e:6c08)
+Subanimation4e:
db $41
db $71,$0f,$03
-Subanimation4f: ; 7ac0c (1e:6c0c)
+Subanimation4f:
db $47
db $71,$0f,$00
db $71,$08,$00
@@ -1818,7 +1818,7 @@ Subanimation4f: ; 7ac0c (1e:6c0c)
db $73,$95,$00
db $74,$95,$00
-Subanimation50: ; 7ac22 (1e:6c22)
+Subanimation50:
db $48
db $74,$95,$00
db $73,$95,$00
@@ -1829,7 +1829,7 @@ Subanimation50: ; 7ac22 (1e:6c22)
db $71,$0f,$00
db $71,$16,$00
-Subanimation29: ; 7ac3b (1e:6c3b)
+Subanimation29:
db $5d
db $48,$0f,$00
db $4a,$68,$03
@@ -1861,63 +1861,63 @@ Subanimation29: ; 7ac3b (1e:6c3b)
db $4d,$2a,$03
db $49,$6b,$00
-Subanimation2a: ; 7ac93 (1e:6c93)
+Subanimation2a:
db $44
db $4e,$2b,$00
db $4f,$2b,$00
db $50,$2b,$00
db $50,$2b,$00
-Subanimation23: ; 7aca0 (1e:6ca0)
+Subanimation23:
db $42
db $51,$2d,$00
db $51,$6e,$00
-Subanimation24: ; 7aca7 (1e:6ca7)
+Subanimation24:
db $a2
db $51,$2d,$00
db $51,$6e,$00
-Subanimation25: ; 7acae (1e:6cae)
+Subanimation25:
db $62
db $52,$71,$00
db $52,$72,$00
-Subanimation26: ; 7acb5 (1e:6cb5)
+Subanimation26:
db $02
db $52,$01,$00
db $52,$2c,$00
-Subanimation3a: ; 7acbc (1e:6cbc)
+Subanimation3a:
db $63
db $53,$71,$00
db $53,$7f,$00
db $53,$81,$00
-Subanimation3b: ; 7acc6 (1e:6cc6)
+Subanimation3b:
db $03
db $53,$01,$00
db $53,$15,$00
db $53,$2c,$00
-Subanimation27: ; 7acd0 (1e:6cd0)
+Subanimation27:
db $a2
db $54,$01,$00
db $54,$2c,$00
-Subanimation28: ; 7acd7 (1e:6cd7)
+Subanimation28:
db $23
db $55,$73,$03
db $56,$73,$03
db $57,$73,$00
-Subanimation32: ; 7ace1 (1e:6ce1)
+Subanimation32:
db $63
db $47,$74,$00
db $47,$43,$00
db $47,$75,$00
-Subanimation33: ; 7aceb (1e:6ceb)
+Subanimation33:
db $26
db $58,$76,$00
db $34,$76,$00
@@ -1926,7 +1926,7 @@ Subanimation33: ; 7aceb (1e:6ceb)
db $58,$76,$00
db $34,$76,$00
-Subanimation3c: ; 7acfe (1e:6cfe)
+Subanimation3c:
db $67
db $59,$79,$03
db $59,$7b,$03
@@ -1936,7 +1936,7 @@ Subanimation3c: ; 7acfe (1e:6cfe)
db $59,$7c,$03
db $59,$76,$00
-Subanimation3d: ; 7ad14 (1e:6d14)
+Subanimation3d:
db $08
db $3a,$4d,$00
db $3b,$4d,$00
@@ -1947,7 +1947,7 @@ Subanimation3d: ; 7ad14 (1e:6d14)
db $3e,$4d,$00
db $3f,$4d,$00
-Subanimation34: ; 7ad2d (1e:6d2d)
+Subanimation34:
db $35
db $48,$7d,$00
db $49,$7d,$00
@@ -1971,14 +1971,14 @@ Subanimation34: ; 7ad2d (1e:6d2d)
db $49,$82,$00
db $5a,$82,$00
-Subanimation35: ; 7ad6d (1e:6d6d)
+Subanimation35:
db $24
db $5b,$83,$03
db $5c,$84,$03
db $5d,$85,$03
db $5e,$09,$00
-Subanimation36: ; 7ad7a (1e:6d7a)
+Subanimation36:
db $48
db $5f,$2a,$00
db $5f,$00,$00
@@ -1989,7 +1989,7 @@ Subanimation36: ; 7ad7a (1e:6d7a)
db $62,$2a,$00
db $62,$00,$00
-Subanimation37: ; 7ad93 (1e:6d93)
+Subanimation37:
db $2a
db $63,$89,$00
db $64,$75,$00
@@ -2002,7 +2002,7 @@ Subanimation37: ; 7ad93 (1e:6d93)
db $65,$88,$00
db $65,$1a,$00
-Subanimation38: ; 7adb2 (1e:6db2)
+Subanimation38:
db $50
db $66,$8a,$00
db $66,$33,$00
@@ -2021,7 +2021,7 @@ Subanimation38: ; 7adb2 (1e:6db2)
db $66,$1e,$04
db $67,$29,$00
-Subanimation3e: ; 7ade3 (1e:6de3)
+Subanimation3e:
db $92
db $02,$31,$00
db $34,$31,$00
@@ -2042,7 +2042,7 @@ Subanimation3e: ; 7ade3 (1e:6de3)
db $34,$10,$00
db $02,$10,$00
-Subanimation3f: ; 7ae1a (1e:6e1a)
+Subanimation3f:
db $72
db $68,$4b,$00
db $68,$8c,$00
@@ -2063,7 +2063,7 @@ Subanimation3f: ; 7ae1a (1e:6e1a)
db $68,$23,$00
db $68,$1f,$00
-Subanimation44: ; 7ae51 (1e:6e51)
+Subanimation44:
db $2c
db $69,$4b,$00
db $69,$8c,$00
@@ -2078,20 +2078,20 @@ Subanimation44: ; 7ae51 (1e:6e51)
db $69,$0c,$00
db $69,$06,$00
-Subanimation43: ; 7ae76 (1e:6e76)
+Subanimation43:
db $a3
db $6a,$07,$00
db $6b,$0f,$00
db $6c,$17,$00
-Subanimation45: ; 7ae80 (1e:6e80)
+Subanimation45:
db $24
db $6d,$8b,$00
db $6d,$84,$00
db $6d,$63,$00
db $6d,$8c,$00
-Subanimation46: ; 7ae8d (1e:6e8d)
+Subanimation46:
db $26
db $6d,$8b,$00
db $6d,$84,$00
@@ -2100,13 +2100,13 @@ Subanimation46: ; 7ae8d (1e:6e8d)
db $6d,$0a,$00
db $6d,$89,$00
-Subanimation47: ; 7aea0 (1e:6ea0)
+Subanimation47:
db $23
db $06,$82,$00
db $07,$82,$00
db $08,$96,$00
-Subanimation48: ; 7aeaa (1e:6eaa)
+Subanimation48:
db $06
db $03,$41,$04
db $03,$48,$04
@@ -2115,24 +2115,24 @@ Subanimation48: ; 7aeaa (1e:6eaa)
db $05,$48,$04
db $03,$48,$03
-Subanimation49: ; 7aebd (1e:6ebd)
+Subanimation49:
db $04
db $04,$48,$04
db $03,$48,$04
db $05,$48,$04
db $03,$48,$03
-Subanimation4a: ; 7aeca (1e:6eca)
+Subanimation4a:
db $01
db $04,$84,$03
-Subanimation4b: ; 7aece (1e:6ece)
+Subanimation4b:
db $03
db $06,$72,$00
db $07,$72,$00
db $08,$72,$00
-Subanimation4c: ; 7aed8 (1e:6ed8)
+Subanimation4c:
db $68
db $6f,$30,$00
db $6e,$30,$00
@@ -2143,7 +2143,7 @@ Subanimation4c: ; 7aed8 (1e:6ed8)
db $70,$30,$00
db $6e,$30,$00
-Subanimation4d: ; 7aef1 (1e:6ef1)
+Subanimation4d:
db $26
db $32,$4b,$00
db $33,$4f,$00
@@ -2152,7 +2152,7 @@ Subanimation4d: ; 7aef1 (1e:6ef1)
db $32,$19,$00
db $33,$0d,$00
-Subanimation51: ; 7af04 (1e:6f04)
+Subanimation51:
db $a6
db $76,$1b,$00
db $34,$1b,$00
@@ -2161,7 +2161,7 @@ Subanimation51: ; 7af04 (1e:6f04)
db $76,$1b,$00
db $34,$1b,$00
-Subanimation52: ; 7af17 (1e:6f17)
+Subanimation52:
db $47
db $77,$25,$00
db $77,$9b,$00
@@ -2171,7 +2171,7 @@ Subanimation52: ; 7af17 (1e:6f17)
db $77,$50,$00
db $77,$8c,$00
-Subanimation53: ; 7af2d (1e:6f2d)
+Subanimation53:
db $0c
db $78,$30,$00
db $78,$a2,$00
@@ -2186,7 +2186,7 @@ Subanimation53: ; 7af2d (1e:6f2d)
db $78,$34,$00
db $01,$9e,$00
-Subanimation54: ; 7af52 (1e:6f52)
+Subanimation54:
db $0b
db $79,$30,$00
db $79,$a2,$00
@@ -2200,7 +2200,7 @@ Subanimation54: ; 7af52 (1e:6f52)
db $79,$a9,$00
db $79,$34,$00
-FrameBlockPointers: ; 7af74 (1e:6f74)
+FrameBlockPointers:
dw FrameBlock00
dw FrameBlock01
dw FrameBlock02
@@ -2332,7 +2332,7 @@ FrameBlockPointers: ; 7af74 (1e:6f74)
; second byte = x offset
; third byte = tile id (it's actually tile id - $31)
; fourth byte = tile properties (xflip/yflip/etc.)
-FrameBlock01: ; 7b068 (1e:7068)
+FrameBlock01:
db $09
db $00,$00,$2c,$00
db $00,$08,$2d,$00
@@ -2344,7 +2344,7 @@ FrameBlock01: ; 7b068 (1e:7068)
db $10,$08,$2d,$40
db $10,$10,$2c,$60
-FrameBlock02: ; 7b08d (1e:708d)
+FrameBlock02:
db $10
db $00,$00,$20,$00
db $00,$08,$21,$00
@@ -2363,28 +2363,28 @@ FrameBlock02: ; 7b08d (1e:708d)
db $18,$10,$21,$60
db $18,$18,$20,$60
-FrameBlock03: ; 7b0ce (1e:70ce)
+FrameBlock03:
db $04
db $00,$00,$02,$00
db $00,$08,$02,$20
db $08,$00,$12,$00
db $08,$08,$12,$20
-FrameBlock04: ; 7b0df (1e:70df)
+FrameBlock04:
db $04
db $00,$00,$06,$00
db $00,$08,$07,$00
db $08,$00,$16,$00
db $08,$08,$17,$00
-FrameBlock05: ; 7b0f0 (1e:70f0)
+FrameBlock05:
db $04
db $00,$00,$07,$20
db $00,$08,$06,$20
db $08,$00,$17,$20
db $08,$08,$16,$20
-FrameBlock06: ; 7b101 (1e:7101)
+FrameBlock06:
db $0c
db $00,$08,$23,$00
db $08,$00,$32,$00
@@ -2399,7 +2399,7 @@ FrameBlock06: ; 7b101 (1e:7101)
db $10,$18,$32,$60
db $18,$10,$23,$60
-FrameBlock07: ; 7b132 (1e:7132)
+FrameBlock07:
db $10
db $00,$00,$20,$00
db $00,$08,$21,$00
@@ -2418,7 +2418,7 @@ FrameBlock07: ; 7b132 (1e:7132)
db $18,$10,$21,$60
db $18,$18,$20,$60
-FrameBlock08: ; 7b173 (1e:7173)
+FrameBlock08:
db $10
db $00,$00,$20,$00
db $00,$08,$21,$00
@@ -2437,7 +2437,7 @@ FrameBlock08: ; 7b173 (1e:7173)
db $20,$18,$21,$60
db $20,$20,$20,$60
-FrameBlock09: ; 7b1b4 (1e:71b4)
+FrameBlock09:
db $0c
db $00,$00,$24,$00
db $00,$08,$25,$00
@@ -2452,7 +2452,7 @@ FrameBlock09: ; 7b1b4 (1e:71b4)
db $20,$18,$25,$60
db $20,$20,$24,$60
-FrameBlock0a: ; 7b1e5 (1e:71e5)
+FrameBlock0a:
db $0c
db $00,$00,$24,$00
db $00,$08,$25,$00
@@ -2467,21 +2467,21 @@ FrameBlock0a: ; 7b1e5 (1e:71e5)
db $28,$20,$25,$60
db $28,$28,$24,$60
-FrameBlock0b: ; 7b216 (1e:7216)
+FrameBlock0b:
db $04
db $00,$00,$05,$00
db $00,$08,$05,$20
db $08,$00,$15,$00
db $08,$08,$15,$20
-FrameBlock0c: ; 7b227 (1e:7227)
+FrameBlock0c:
db $04
db $00,$00,$04,$00
db $00,$08,$04,$20
db $08,$00,$14,$00
db $08,$08,$14,$20
-FrameBlock0d: ; 7b238 (1e:7238)
+FrameBlock0d:
db $08
db $00,$00,$0c,$00
db $00,$08,$0d,$00
@@ -2492,21 +2492,21 @@ FrameBlock0d: ; 7b238 (1e:7238)
db $18,$00,$0d,$60
db $18,$08,$0c,$60
-FrameBlock0e: ; 7b259 (1e:7259)
+FrameBlock0e:
db $04
db $20,$00,$0c,$00
db $20,$08,$0d,$00
db $28,$00,$1c,$00
db $28,$08,$1d,$00
-FrameBlock0f: ; 7b26a (1e:726a)
+FrameBlock0f:
db $04
db $30,$00,$1d,$60
db $30,$08,$1c,$60
db $38,$00,$0d,$60
db $38,$08,$0c,$60
-FrameBlock10: ; 7b27b (1e:727b)
+FrameBlock10:
db $08
db $00,$00,$0e,$00
db $00,$08,$0f,$00
@@ -2517,7 +2517,7 @@ FrameBlock10: ; 7b27b (1e:727b)
db $08,$10,$1f,$20
db $08,$18,$1e,$20
-FrameBlock11: ; 7b29c (1e:729c)
+FrameBlock11:
db $08
db $00,$00,$0e,$00
db $00,$08,$0f,$00
@@ -2528,20 +2528,20 @@ FrameBlock11: ; 7b29c (1e:729c)
db $08,$20,$1f,$20
db $08,$28,$1e,$20
-FrameBlock12: ; 7b2bd (1e:72bd)
+FrameBlock12:
db $03
db $00,$00,$37,$00
db $08,$10,$37,$00
db $00,$20,$37,$00
-FrameBlock13: ; 7b2ca (1e:72ca)
+FrameBlock13:
db $04
db $00,$00,$36,$00
db $00,$08,$36,$20
db $08,$00,$36,$40
db $08,$08,$36,$60
-FrameBlock14: ; 7b2db (1e:72db)
+FrameBlock14:
db $08
db $00,$10,$28,$00
db $00,$18,$28,$20
@@ -2552,7 +2552,7 @@ FrameBlock14: ; 7b2db (1e:72db)
db $08,$20,$36,$40
db $08,$28,$36,$60
-FrameBlock15: ; 7b2fc (1e:72fc)
+FrameBlock15:
db $0c
db $00,$00,$28,$00
db $00,$08,$28,$20
@@ -2567,7 +2567,7 @@ FrameBlock15: ; 7b2fc (1e:72fc)
db $08,$20,$38,$00
db $08,$28,$38,$20
-FrameBlock16: ; 7b32d (1e:732d)
+FrameBlock16:
db $08
db $00,$00,$29,$00
db $00,$08,$29,$20
@@ -2578,60 +2578,60 @@ FrameBlock16: ; 7b32d (1e:732d)
db $08,$20,$39,$00
db $08,$28,$39,$20
-FrameBlock17: ; 7b34e (1e:734e)
+FrameBlock17:
db $04
db $00,$00,$08,$00
db $00,$08,$09,$00
db $08,$00,$18,$00
db $08,$08,$19,$00
-FrameBlock18: ; 7b35f (1e:735f)
+FrameBlock18:
db $01
db $18,$00,$45,$60
-FrameBlock19: ; 7b364 (1e:7364)
+FrameBlock19:
db $02
db $18,$08,$45,$00
db $10,$08,$46,$60
-FrameBlock1a: ; 7b36d (1e:736d)
+FrameBlock1a:
db $02
db $10,$10,$45,$60
db $18,$10,$46,$00
-FrameBlock1b: ; 7b376 (1e:7376)
+FrameBlock1b:
db $02
db $10,$18,$45,$00
db $08,$18,$46,$60
-FrameBlock1c: ; 7b37f (1e:737f)
+FrameBlock1c:
db $02
db $08,$20,$45,$60
db $10,$20,$46,$00
-FrameBlock1d: ; 7b388 (1e:7388)
+FrameBlock1d:
db $02
db $08,$28,$45,$00
db $00,$28,$46,$60
-FrameBlock1e: ; 7b391 (1e:7391)
+FrameBlock1e:
db $02
db $00,$30,$45,$60
db $08,$30,$46,$00
-FrameBlock75: ; 7b39a (1e:739a)
+FrameBlock75:
db $04
db $00,$00,$43,$00
db $00,$08,$43,$20
db $08,$00,$22,$00
db $08,$08,$43,$60
-FrameBlock1f: ; 7b3ab (1e:73ab)
+FrameBlock1f:
db $02
db $00,$00,$03,$00
db $00,$30,$03,$20
-FrameBlock20: ; 7b3b4 (1e:73b4)
+FrameBlock20:
db $06
db $00,$00,$03,$00
db $00,$30,$03,$20
@@ -2640,7 +2640,7 @@ FrameBlock20: ; 7b3b4 (1e:73b4)
db $08,$00,$13,$00
db $08,$30,$13,$20
-FrameBlock21: ; 7b3cd (1e:73cd)
+FrameBlock21:
db $0c
db $00,$00,$03,$00
db $00,$30,$03,$20
@@ -2655,7 +2655,7 @@ FrameBlock21: ; 7b3cd (1e:73cd)
db $10,$00,$03,$00
db $10,$30,$03,$20
-FrameBlock22: ; 7b3fe (1e:73fe)
+FrameBlock22:
db $13
db $00,$00,$03,$00
db $08,$00,$13,$00
@@ -2677,19 +2677,19 @@ FrameBlock22: ; 7b3fe (1e:73fe)
db $10,$30,$03,$20
db $18,$30,$13,$20
-FrameBlock23: ; 7b44b (1e:744b)
+FrameBlock23:
db $04
db $00,$00,$0a,$00
db $00,$08,$0b,$00
db $08,$00,$1a,$00
db $08,$08,$1b,$00
-FrameBlock24: ; 7b45c (1e:745c)
+FrameBlock24:
db $02
db $08,$00,$0a,$00
db $08,$08,$0b,$00
-FrameBlock25: ; 7b465 (1e:7465)
+FrameBlock25:
db $0c
db $10,$00,$0a,$00
db $10,$08,$0b,$00
@@ -2704,14 +2704,14 @@ FrameBlock25: ; 7b465 (1e:7465)
db $10,$20,$1a,$00
db $10,$28,$1b,$00
-FrameBlock26: ; 7b496 (1e:7496)
+FrameBlock26:
db $04
db $00,$10,$44,$00
db $00,$18,$44,$20
db $08,$10,$44,$40
db $08,$18,$44,$60
-FrameBlock27: ; 7b4a7 (1e:74a7)
+FrameBlock27:
db $05
db $08,$08,$44,$00
db $08,$10,$44,$20
@@ -2719,7 +2719,7 @@ FrameBlock27: ; 7b4a7 (1e:74a7)
db $10,$10,$44,$60
db $00,$18,$47,$00
-FrameBlock28: ; 7b4bc (1e:74bc)
+FrameBlock28:
db $06
db $10,$00,$44,$00
db $10,$08,$44,$20
@@ -2728,30 +2728,30 @@ FrameBlock28: ; 7b4bc (1e:74bc)
db $08,$10,$47,$00
db $02,$16,$47,$00
-FrameBlock29: ; 7b4d5 (1e:74d5)
+FrameBlock29:
db $04
db $18,$00,$47,$00
db $12,$06,$47,$00
db $0c,$0c,$47,$00
db $06,$12,$47,$00
-FrameBlock2a: ; 7b4e6 (1e:74e6)
+FrameBlock2a:
db $04
db $00,$00,$44,$00
db $00,$08,$44,$20
db $08,$00,$44,$40
db $08,$08,$44,$60
-FrameBlock2b: ; 7b4f7 (1e:74f7)
+FrameBlock2b:
db $02
db $06,$02,$47,$00
db $00,$08,$47,$00
-FrameBlock2c: ; 7b500 (1e:7500)
+FrameBlock2c:
db $01
db $a0,$00,$4d,$00
-FrameBlock2d: ; 7b505 (1e:7505)
+FrameBlock2d:
db $08
db $00,$00,$26,$00
db $00,$08,$27,$00
@@ -2762,7 +2762,7 @@ FrameBlock2d: ; 7b505 (1e:7505)
db $18,$00,$38,$00
db $18,$08,$39,$00
-FrameBlock2e: ; 7b526 (1e:7526)
+FrameBlock2e:
db $08
db $00,$00,$27,$20
db $00,$08,$26,$20
@@ -2773,25 +2773,25 @@ FrameBlock2e: ; 7b526 (1e:7526)
db $18,$00,$39,$20
db $18,$08,$38,$20
-FrameBlock2f: ; 7b547 (1e:7547)
+FrameBlock2f:
db $04
db $00,$00,$0c,$00
db $00,$08,$0d,$00
db $08,$00,$0c,$40
db $08,$08,$0d,$40
-FrameBlock30: ; 7b558 (1e:7558)
+FrameBlock30:
db $04
db $00,$00,$44,$00
db $00,$08,$44,$20
db $08,$00,$44,$40
db $08,$08,$44,$60
-FrameBlock31: ; 7b569 (1e:7569)
+FrameBlock31:
db $01
db $00,$00,$45,$00
-FrameBlock32: ; 7b56e (1e:756e)
+FrameBlock32:
db $07
db $00,$00,$4d,$00
db $00,$08,$2f,$00
@@ -2801,7 +2801,7 @@ FrameBlock32: ; 7b56e (1e:756e)
db $08,$10,$4e,$20
db $10,$08,$3f,$00
-FrameBlock33: ; 7b58b (1e:758b)
+FrameBlock33:
db $07
db $00,$08,$3f,$40
db $08,$00,$4e,$40
@@ -2811,11 +2811,11 @@ FrameBlock33: ; 7b58b (1e:758b)
db $10,$08,$2f,$40
db $10,$10,$4d,$60
-FrameBlock34: ; 7b5a8 (1e:75a8)
+FrameBlock34:
db $01
db $a0,$00,$00,$10
-FrameBlock35: ; 7b5ad (1e:75ad)
+FrameBlock35:
db $06
db $00,$00,$2a,$00
db $00,$08,$2b,$00
@@ -2824,42 +2824,42 @@ FrameBlock35: ; 7b5ad (1e:75ad)
db $18,$00,$2a,$40
db $18,$08,$2b,$40
-FrameBlock36: ; 7b5c6 (1e:75c6)
+FrameBlock36:
db $04
db $00,$00,$00,$00
db $00,$08,$01,$00
db $08,$00,$10,$00
db $08,$08,$11,$00
-FrameBlock37: ; 7b5d7 (1e:75d7)
+FrameBlock37:
db $04
db $00,$00,$01,$a0
db $00,$08,$00,$a0
db $08,$00,$11,$a0
db $08,$08,$10,$a0
-FrameBlock38: ; 7b5e8 (1e:75e8)
+FrameBlock38:
db $04
db $00,$00,$0a,$00
db $00,$08,$0b,$00
db $08,$00,$1a,$00
db $08,$08,$1b,$00
-FrameBlock39: ; 7b5f9 (1e:75f9)
+FrameBlock39:
db $04
db $00,$00,$0b,$20
db $00,$08,$0a,$20
db $08,$00,$1b,$20
db $08,$08,$1a,$20
-FrameBlock3a: ; 7b60a (1e:760a)
+FrameBlock3a:
db $04
db $20,$00,$05,$00
db $20,$08,$05,$20
db $28,$00,$15,$00
db $28,$08,$15,$20
-FrameBlock3b: ; 7b61b (1e:761b)
+FrameBlock3b:
db $05
db $18,$00,$04,$00
db $18,$08,$04,$20
@@ -2867,7 +2867,7 @@ FrameBlock3b: ; 7b61b (1e:761b)
db $20,$08,$14,$20
db $28,$04,$41,$00
-FrameBlock3c: ; 7b630 (1e:7630)
+FrameBlock3c:
db $06
db $10,$00,$05,$00
db $10,$08,$05,$20
@@ -2876,7 +2876,7 @@ FrameBlock3c: ; 7b630 (1e:7630)
db $20,$04,$42,$00
db $28,$04,$42,$00
-FrameBlock3d: ; 7b649 (1e:7649)
+FrameBlock3d:
db $07
db $08,$00,$04,$00
db $08,$08,$04,$20
@@ -2886,7 +2886,7 @@ FrameBlock3d: ; 7b649 (1e:7649)
db $20,$04,$41,$00
db $28,$04,$41,$00
-FrameBlock3e: ; 7b666 (1e:7666)
+FrameBlock3e:
db $08
db $00,$00,$05,$00
db $00,$08,$05,$20
@@ -2897,7 +2897,7 @@ FrameBlock3e: ; 7b666 (1e:7666)
db $20,$04,$42,$00
db $28,$04,$42,$00
-FrameBlock3f: ; 7b687 (1e:7687)
+FrameBlock3f:
db $08
db $00,$00,$04,$00
db $00,$08,$04,$20
@@ -2908,20 +2908,20 @@ FrameBlock3f: ; 7b687 (1e:7687)
db $20,$04,$41,$00
db $28,$04,$41,$00
-FrameBlock40: ; 7b6a8 (1e:76a8)
+FrameBlock40:
db $03
db $00,$00,$3d,$00
db $00,$08,$3d,$00
db $08,$08,$3d,$00
-FrameBlock41: ; 7b6b5 (1e:76b5)
+FrameBlock41:
db $04
db $00,$00,$06,$00
db $00,$08,$06,$20
db $08,$00,$16,$00
db $08,$08,$17,$00
-FrameBlock42: ; 7b6c6 (1e:76c6)
+FrameBlock42:
db $0b
db $00,$10,$42,$00
db $08,$00,$42,$00
@@ -2935,7 +2935,7 @@ FrameBlock42: ; 7b6c6 (1e:76c6)
db $20,$00,$42,$00
db $20,$20,$42,$00
-FrameBlock43: ; 7b6f3 (1e:76f3)
+FrameBlock43:
db $0b
db $00,$10,$41,$00
db $08,$00,$41,$00
@@ -2949,42 +2949,42 @@ FrameBlock43: ; 7b6f3 (1e:76f3)
db $20,$00,$41,$00
db $20,$20,$41,$00
-FrameBlock44: ; 7b720 (1e:7720)
+FrameBlock44:
db $04
db $00,$00,$49,$00
db $00,$28,$49,$00
db $28,$00,$49,$00
db $28,$28,$49,$00
-FrameBlock45: ; 7b731 (1e:7731)
+FrameBlock45:
db $04
db $00,$00,$49,$00
db $00,$18,$49,$00
db $18,$00,$49,$00
db $18,$18,$49,$00
-FrameBlock46: ; 7b742 (1e:7742)
+FrameBlock46:
db $04
db $00,$00,$49,$00
db $00,$08,$49,$00
db $08,$00,$49,$00
db $08,$08,$49,$00
-FrameBlock47: ; 7b753 (1e:7753)
+FrameBlock47:
db $04
db $00,$00,$43,$00
db $00,$08,$43,$20
db $08,$00,$43,$40
db $08,$08,$43,$60
-SmallBlackCircleFrameBlock: ; 7b764 (1e:7764)
+SmallBlackCircleFrameBlock:
db $04
db $08,$08,$33,$00
db $08,$10,$33,$20
db $10,$08,$33,$40
db $10,$10,$33,$60
-LargeBlockCircleFrameBlock: ; 7b775 (1e:7775)
+LargeBlockCircleFrameBlock:
db $10
db $00,$00,$22,$00
db $00,$08,$23,$00
@@ -3003,7 +3003,7 @@ LargeBlockCircleFrameBlock: ; 7b775 (1e:7775)
db $18,$10,$23,$60
db $18,$18,$22,$60
-FrameBlock71: ; 7b7b6 (1e:77b6)
+FrameBlock71:
db $10
db $00,$00,$22,$00
db $00,$08,$3b,$00
@@ -3022,7 +3022,7 @@ FrameBlock71: ; 7b7b6 (1e:77b6)
db $18,$10,$23,$60
db $18,$18,$22,$60
-FrameBlock72: ; 7b7f7 (1e:77f7)
+FrameBlock72:
db $0c
db $00,$00,$32,$00
db $00,$08,$43,$00
@@ -3037,7 +3037,7 @@ FrameBlock72: ; 7b7f7 (1e:77f7)
db $10,$10,$23,$60
db $10,$18,$22,$60
-FrameBlock73: ; 7b828 (1e:7828)
+FrameBlock73:
db $08
db $00,$00,$32,$40
db $00,$08,$43,$40
@@ -3048,42 +3048,42 @@ FrameBlock73: ; 7b828 (1e:7828)
db $08,$10,$23,$60
db $08,$18,$22,$60
-FrameBlock74: ; 7b849 (1e:7849)
+FrameBlock74:
db $04
db $00,$00,$22,$40
db $00,$08,$23,$40
db $00,$10,$23,$60
db $00,$18,$22,$60
-FrameBlock4a: ; 7b85a (1e:785a)
+FrameBlock4a:
db $04
db $08,$18,$4c,$20
db $20,$08,$4b,$00
db $30,$20,$4c,$00
db $18,$30,$4b,$40
-FrameBlock4b: ; 7b86b (1e:786b)
+FrameBlock4b:
db $04
db $00,$18,$4c,$00
db $20,$00,$4b,$40
db $38,$20,$4c,$20
db $18,$38,$4b,$00
-FrameBlock4c: ; 7b87c (1e:787c)
+FrameBlock4c:
db $04
db $10,$08,$4a,$40
db $30,$10,$4a,$00
db $28,$30,$4a,$20
db $08,$28,$4a,$60
-FrameBlock4d: ; 7b88d (1e:788d)
+FrameBlock4d:
db $04
db $08,$00,$4a,$20
db $38,$08,$4a,$60
db $30,$38,$4a,$40
db $00,$30,$4a,$00
-FrameBlock4e: ; 7b89e (1e:789e)
+FrameBlock4e:
db $08
db $00,$30,$44,$00
db $00,$38,$44,$20
@@ -3094,7 +3094,7 @@ FrameBlock4e: ; 7b89e (1e:789e)
db $2e,$0a,$44,$40
db $2e,$12,$44,$60
-FrameBlock4f: ; 7b8bf (1e:78bf)
+FrameBlock4f:
db $0c
db $0e,$22,$44,$00
db $0e,$2a,$44,$20
@@ -3109,7 +3109,7 @@ FrameBlock4f: ; 7b8bf (1e:78bf)
db $30,$08,$47,$00
db $2a,$0e,$47,$00
-FrameBlock50: ; 7b8f0 (1e:78f0)
+FrameBlock50:
db $08
db $06,$32,$47,$00
db $00,$38,$47,$00
@@ -3120,7 +3120,7 @@ FrameBlock50: ; 7b8f0 (1e:78f0)
db $2a,$0e,$47,$00
db $24,$14,$47,$00
-FrameBlock51: ; 7b911 (1e:7911)
+FrameBlock51:
db $08
db $00,$00,$35,$20
db $08,$00,$35,$40
@@ -3131,33 +3131,33 @@ FrameBlock51: ; 7b911 (1e:7911)
db $10,$40,$35,$20
db $18,$40,$35,$40
-FrameBlock52: ; 7b932 (1e:7932)
+FrameBlock52:
db $04
db $00,$00,$2a,$00
db $00,$08,$2b,$00
db $08,$00,$3a,$00
db $08,$08,$3b,$00
-FrameBlock53: ; 7b943 (1e:7943)
+FrameBlock53:
db $03
db $00,$00,$3f,$00
db $00,$08,$3f,$00
db $08,$06,$3f,$00
-FrameBlock54: ; 7b950 (1e:7950)
+FrameBlock54:
db $04
db $00,$00,$0e,$00
db $00,$08,$0e,$20
db $08,$00,$0f,$00
db $08,$08,$0f,$20
-FrameBlock55: ; 7b961 (1e:7961)
+FrameBlock55:
db $03
db $10,$00,$2c,$00
db $10,$08,$3c,$00
db $10,$10,$2d,$00
-FrameBlock56: ; 7b96e (1e:796e)
+FrameBlock56:
db $06
db $10,$10,$31,$00
db $10,$18,$31,$00
@@ -3166,7 +3166,7 @@ FrameBlock56: ; 7b96e (1e:796e)
db $08,$20,$2d,$00
db $10,$20,$2d,$00
-FrameBlock57: ; 7b987 (1e:7987)
+FrameBlock57:
db $09
db $08,$20,$31,$00
db $10,$20,$31,$00
@@ -3178,7 +3178,7 @@ FrameBlock57: ; 7b987 (1e:7987)
db $08,$30,$2d,$00
db $10,$30,$2d,$00
-FrameBlock58: ; 7b9ac (1e:79ac)
+FrameBlock58:
db $07
db $00,$00,$46,$00
db $08,$02,$47,$00
@@ -3188,11 +3188,11 @@ FrameBlock58: ; 7b9ac (1e:79ac)
db $28,$05,$48,$00
db $30,$05,$48,$00
-FrameBlock59: ; 7b9c9 (1e:79c9)
+FrameBlock59:
db $01
db $00,$00,$42,$00
-FrameBlock5a: ; 7b9ce (1e:79ce)
+FrameBlock5a:
db $0c
db $00,$00,$24,$00
db $00,$08,$25,$00
@@ -3207,14 +3207,14 @@ FrameBlock5a: ; 7b9ce (1e:79ce)
db $18,$10,$25,$60
db $18,$18,$24,$60
-FrameBlock5b: ; 7b9ff (1e:79ff)
+FrameBlock5b:
db $04
db $00,$00,$43,$00
db $00,$08,$43,$20
db $08,$00,$43,$40
db $08,$08,$43,$60
-FrameBlock5c: ; 7ba10 (1e:7a10)
+FrameBlock5c:
db $08
db $00,$00,$49,$00
db $02,$08,$49,$00
@@ -3225,7 +3225,7 @@ FrameBlock5c: ; 7ba10 (1e:7a10)
db $10,$00,$43,$40
db $10,$08,$43,$60
-FrameBlock5d: ; 7ba31 (1e:7a31)
+FrameBlock5d:
db $0b
db $00,$00,$49,$00
db $18,$02,$49,$00
@@ -3239,7 +3239,7 @@ FrameBlock5d: ; 7ba31 (1e:7a31)
db $0c,$08,$43,$40
db $0c,$10,$43,$60
-FrameBlock5e: ; 7ba5e (1e:7a5e)
+FrameBlock5e:
db $0f
db $00,$08,$49,$00
db $08,$10,$49,$00
@@ -3257,14 +3257,14 @@ FrameBlock5e: ; 7ba5e (1e:7a5e)
db $28,$08,$43,$40
db $28,$10,$43,$60
-FrameBlock5f: ; 7ba9b (1e:7a9b)
+FrameBlock5f:
db $04
db $00,$00,$49,$00
db $00,$10,$49,$00
db $00,$20,$49,$00
db $00,$30,$49,$00
-FrameBlock60: ; 7baac (1e:7aac)
+FrameBlock60:
db $08
db $00,$00,$49,$00
db $00,$10,$49,$00
@@ -3275,7 +3275,7 @@ FrameBlock60: ; 7baac (1e:7aac)
db $08,$28,$49,$00
db $08,$38,$49,$00
-FrameBlock61: ; 7bacd (1e:7acd)
+FrameBlock61:
db $0c
db $00,$00,$49,$00
db $00,$10,$49,$00
@@ -3290,7 +3290,7 @@ FrameBlock61: ; 7bacd (1e:7acd)
db $10,$20,$49,$00
db $10,$30,$49,$00
-FrameBlock62: ; 7bafe (1e:7afe)
+FrameBlock62:
db $0f
db $00,$00,$49,$00
db $00,$10,$49,$00
@@ -3309,7 +3309,7 @@ FrameBlock62: ; 7bafe (1e:7afe)
db $18,$28,$49,$00
db $18,$38,$49,$00 ; unused
-FrameBlock63: ; 7bb3f (1e:7b3f)
+FrameBlock63:
db $06
db $10,$00,$26,$00
db $10,$08,$27,$00
@@ -3318,7 +3318,7 @@ FrameBlock63: ; 7bb3f (1e:7b3f)
db $00,$20,$26,$00
db $00,$28,$27,$00
-FrameBlock64: ; 7bb58 (1e:7b58)
+FrameBlock64:
db $06
db $18,$00,$27,$00
db $10,$08,$26,$00
@@ -3327,7 +3327,7 @@ FrameBlock64: ; 7bb58 (1e:7b58)
db $08,$20,$27,$00
db $00,$28,$26,$00
-FrameBlock65: ; 7bb71 (1e:7b71)
+FrameBlock65:
db $06
db $00,$00,$1c,$00
db $00,$08,$1d,$00
@@ -3336,27 +3336,27 @@ FrameBlock65: ; 7bb71 (1e:7b71)
db $20,$00,$1c,$00
db $20,$08,$1d,$00
-FrameBlock66: ; 7bb8a (1e:7b8a)
+FrameBlock66:
db $02
db $00,$00,$03,$00
db $08,$00,$13,$00
-FrameBlock67: ; 7bb93 (1e:7b93)
+FrameBlock67:
db $01
db $00,$00,$03,$00
-FrameBlock68: ; 7bb98 (1e:7b98)
+FrameBlock68:
db $04
db $00,$00,$03,$00
db $00,$08,$03,$20
db $08,$00,$13,$00
db $08,$08,$13,$20
-FrameBlock69: ; 7bba9 (1e:7ba9)
+FrameBlock69:
db $01
db $00,$00,$06,$00
-FrameBlock6a: ; 7bbae (1e:7bae)
+FrameBlock6a:
db $08
db $00,$00,$2e,$00
db $00,$30,$2e,$20
@@ -3367,7 +3367,7 @@ FrameBlock6a: ; 7bbae (1e:7bae)
db $18,$00,$3e,$00
db $18,$30,$3e,$20
-FrameBlock6b: ; 7bbcf (1e:7bcf)
+FrameBlock6b:
db $08
db $00,$00,$2e,$00
db $00,$20,$2e,$20
@@ -3378,7 +3378,7 @@ FrameBlock6b: ; 7bbcf (1e:7bcf)
db $10,$00,$3e,$00
db $10,$20,$3e,$20
-FrameBlock6c: ; 7bbf0 (1e:7bf0)
+FrameBlock6c:
db $08
db $00,$00,$2e,$00
db $00,$10,$2e,$20
@@ -3389,33 +3389,33 @@ FrameBlock6c: ; 7bbf0 (1e:7bf0)
db $08,$00,$3e,$00
db $08,$10,$3e,$20
-FrameBlock6d: ; 7bc11 (1e:7c11)
+FrameBlock6d:
db $02
db $00,$00,$1e,$00
db $00,$08,$1f,$00
-FrameBlock6e: ; 7bc1a (1e:7c1a)
+FrameBlock6e:
db $04
db $00,$00,$48,$00
db $00,$08,$48,$20
db $08,$00,$12,$00
db $08,$08,$12,$20
-FrameBlock6f: ; 7bc2b (1e:7c2b)
+FrameBlock6f:
db $04
db $00,$00,$4a,$00
db $00,$08,$07,$00
db $08,$00,$16,$00
db $08,$08,$17,$00
-FrameBlock70: ; 7bc3c (1e:7c3c)
+FrameBlock70:
db $04
db $00,$00,$07,$20
db $00,$08,$4a,$20
db $08,$00,$17,$20
db $08,$08,$16,$20
-FrameBlock76: ; 7bc4d (1e:7c4d)
+FrameBlock76:
db $07
db $00,$10,$2f,$00
db $01,$08,$2f,$00
@@ -3425,22 +3425,22 @@ FrameBlock76: ; 7bc4d (1e:7c4d)
db $0a,$00,$3e,$00
db $0a,$20,$3e,$20
-FrameBlock77: ; 7bc6a (1e:7c6a)
+FrameBlock77:
db $04
db $00,$02,$4b,$00
db $00,$0a,$4c,$00
db $08,$00,$4c,$60
db $08,$08,$4b,$60
-FrameBlock78: ; 7bc7b (1e:7c7b)
+FrameBlock78:
db $01
db $00,$00,$4d,$00
-FrameBlock79: ; 7bc80 (1e:7c80)
+FrameBlock79:
db $01
db $00,$00,$4e,$00
-FrameBlockBaseCoords: ; 7bc85 (1e:7c85)
+FrameBlockBaseCoords:
db $10,$68
db $10,$70
db $10,$78
@@ -3619,5 +3619,5 @@ FrameBlockBaseCoords: ; 7bc85 (1e:7c85)
db $1C,$48
db $48,$28
-FrameBlock00: ; 7bde7 (1e:7de7)
+FrameBlock00:
db $00,$00
diff --git a/data/bg_map_attributes.asm b/data/bg_map_attributes.asm
index d1bcfb14..81535e72 100644
--- a/data/bg_map_attributes.asm
+++ b/data/bg_map_attributes.asm
@@ -1,4 +1,4 @@
-BGMapAttributes_Unknown1: ; bd000 (2f:5000)
+BGMapAttributes_Unknown1:
db $23
dw $000d
db $00
@@ -33,7 +33,7 @@ BGMapAttributes_Unknown1: ; bd000 (2f:5000)
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_Unknown2: ; bd250 (2f:5250)
+BGMapAttributes_Unknown2:
db $23
dw $000d
db $00
@@ -68,7 +68,7 @@ BGMapAttributes_Unknown2: ; bd250 (2f:5250)
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_GameFreakIntro: ; bd4a0 (2f:54a0)
+BGMapAttributes_GameFreakIntro:
db $23
dw $000d
db $00
@@ -103,7 +103,7 @@ BGMapAttributes_GameFreakIntro: ; bd4a0 (2f:54a0)
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_TrainerCard: ; bd6f0 (2f:56f0)
+BGMapAttributes_TrainerCard:
db $23
dw $000d
db $00
@@ -138,7 +138,7 @@ BGMapAttributes_TrainerCard: ; bd6f0 (2f:56f0)
db $00,$00,$00,$02,$02,$00,$00,$03,$03,$00,$00,$02,$02,$00,$00,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_PartyMenu: ; bd940 (2f:5940)
+BGMapAttributes_PartyMenu:
db $23
dw $000d
db $00
@@ -173,7 +173,7 @@ BGMapAttributes_PartyMenu: ; bd940 (2f:5940)
db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_NidorinoIntro: ; bdb90 (2f:5b90)
+BGMapAttributes_NidorinoIntro:
db $23
dw $000d
db $00
@@ -208,7 +208,7 @@ BGMapAttributes_NidorinoIntro: ; bdb90 (2f:5b90)
db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_TitleScreen: ; bdde0 (2f:5de0)
+BGMapAttributes_TitleScreen:
db $23
dw $024d
db $00
@@ -262,7 +262,7 @@ BGMapAttributes_TitleScreen: ; bdde0 (2f:5de0)
db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_Slots: ; be270 (2f:6270)
+BGMapAttributes_Slots:
db $23
dw $000d
db $00
@@ -297,7 +297,7 @@ BGMapAttributes_Slots: ; be270 (2f:6270)
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_Pokedex: ; be4c0 (2f:64c0)
+BGMapAttributes_Pokedex:
db $23
dw $000d
db $00
@@ -332,7 +332,7 @@ BGMapAttributes_Pokedex: ; be4c0 (2f:64c0)
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_StatusScreen: ; be710 (2f:6710)
+BGMapAttributes_StatusScreen:
db $23
dw $000d
db $00
@@ -367,7 +367,7 @@ BGMapAttributes_StatusScreen: ; be710 (2f:6710)
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_Battle: ; be960 (2f:6960)
+BGMapAttributes_Battle:
db $23
dw $000d
db $00
@@ -402,7 +402,7 @@ BGMapAttributes_Battle: ; be960 (2f:6960)
db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_WholeScreen: ; bebb0 (2f:6bb0)
+BGMapAttributes_WholeScreen:
db $3f
dw $000d
db $00
@@ -451,7 +451,7 @@ BGMapAttributes_WholeScreen: ; bebb0 (2f:6bb0)
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-BGMapAttributes_Unknown13: ; befc0 (2f:6fc0)
+BGMapAttributes_Unknown13:
db $23
dw $024d
db $00
@@ -503,4 +503,4 @@ BGMapAttributes_Unknown13: ; befc0 (2f:6fc0)
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
- db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 \ No newline at end of file
+ db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
diff --git a/data/bike_riding_tilesets.asm b/data/bike_riding_tilesets.asm
index f0fc922d..48c2cee6 100755
--- a/data/bike_riding_tilesets.asm
+++ b/data/bike_riding_tilesets.asm
@@ -1,2 +1,2 @@
-BikeRidingTilesets:: ; 09e2 (0:09e2)
+BikeRidingTilesets::
db OVERWORLD, FOREST, UNDERGROUND, SHIP_PORT, CAVERN, $FF
diff --git a/data/credit_mons.asm b/data/credit_mons.asm
index c271db68..15212048 100755
--- a/data/credit_mons.asm
+++ b/data/credit_mons.asm
@@ -1,4 +1,4 @@
-CreditsMons: ; 74131 (1d:4131)
+CreditsMons:
db VENUSAUR
db ARBOK
db RHYHORN
diff --git a/data/credits_order.asm b/data/credits_order.asm
index e84a2a09..c818ac07 100755
--- a/data/credits_order.asm
+++ b/data/credits_order.asm
@@ -1,4 +1,4 @@
-CreditsOrder: ; 74243 (1d:4243)
+CreditsOrder:
; subsequent credits elements will be displayed on separate lines.
; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used
; to go to the next set of credits texts.
diff --git a/data/cries.asm b/data/cries.asm
index 7d03b831..7031536e 100755
--- a/data/cries.asm
+++ b/data/cries.asm
@@ -1,4 +1,4 @@
-CryData: ; 39446 (e:5446)
+CryData:
;$BaseCry, $Pitch, $Length
db $11, $00, $80; Rhydon
db $03, $00, $80; Kangaskhan
diff --git a/data/dungeon_tilesets.asm b/data/dungeon_tilesets.asm
index 702a37e0..01e86714 100755
--- a/data/dungeon_tilesets.asm
+++ b/data/dungeon_tilesets.asm
@@ -1,2 +1,2 @@
-DungeonTilesets: ; c54c (3:454c)
+DungeonTilesets:
db FOREST, MUSEUM, SHIP, CAVERN, LOBBY, MANSION, GATE, LAB, FACILITY, CEMETERY, GYM, $FF
diff --git a/data/evos_moves.asm b/data/evos_moves.asm
index 1892663e..d819b916 100755
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -1,4 +1,4 @@
-EvosMovesPointerTable: ; 3b1e5 (e:71e5)
+EvosMovesPointerTable:
dw Mon112_EvosMoves
dw Mon115_EvosMoves
dw Mon032_EvosMoves
@@ -190,7 +190,7 @@ EvosMovesPointerTable: ; 3b1e5 (e:71e5)
dw Mon070_EvosMoves
dw Mon071_EvosMoves
-Mon112_EvosMoves: ; 3b361 (e:7361)
+Mon112_EvosMoves:
;RHYDON
;Evolutions
db 0
@@ -203,7 +203,7 @@ Mon112_EvosMoves: ; 3b361 (e:7361)
db 64,TAKE_DOWN
db 0
-Mon115_EvosMoves: ; 3b36f (e:736f)
+Mon115_EvosMoves:
;KANGASKHAN
;Evolutions
db 0
@@ -215,7 +215,7 @@ Mon115_EvosMoves: ; 3b36f (e:736f)
db 46,DIZZY_PUNCH
db 0
-Mon032_EvosMoves: ; 3b37b (e:737b)
+Mon032_EvosMoves:
;NIDORAN_M
;Evolutions
db EV_LEVEL,16,NIDORINO
@@ -229,7 +229,7 @@ Mon032_EvosMoves: ; 3b37b (e:737b)
db 38,HORN_DRILL
db 0
-Mon035_EvosMoves: ; 3b38c (e:738c)
+Mon035_EvosMoves:
;CLEFAIRY
;Evolutions
db EV_ITEM,MOON_STONE,1,CLEFABLE
@@ -243,7 +243,7 @@ Mon035_EvosMoves: ; 3b38c (e:738c)
db 48,LIGHT_SCREEN
db 0
-Mon021_EvosMoves: ; 3b39e (e:739e)
+Mon021_EvosMoves:
;SPEAROW
;Evolutions
db EV_LEVEL,20,FEAROW
@@ -256,7 +256,7 @@ Mon021_EvosMoves: ; 3b39e (e:739e)
db 36,AGILITY
db 0
-Mon100_EvosMoves: ; 3b3ad (e:73ad)
+Mon100_EvosMoves:
;VOLTORB
;Evolutions
db EV_LEVEL,30,ELECTRODE
@@ -269,7 +269,7 @@ Mon100_EvosMoves: ; 3b3ad (e:73ad)
db 43,EXPLOSION
db 0
-Mon034_EvosMoves: ; 3b3bc (e:73bc)
+Mon034_EvosMoves:
;NIDOKING
;Evolutions
db 0
@@ -279,7 +279,7 @@ Mon034_EvosMoves: ; 3b3bc (e:73bc)
db 23,THRASH
db 0
-Mon080_EvosMoves: ; 3b3c4 (e:73c4)
+Mon080_EvosMoves:
;SLOWBRO
;Evolutions
db 0
@@ -293,7 +293,7 @@ Mon080_EvosMoves: ; 3b3c4 (e:73c4)
db 55,PSYCHIC_M
db 0
-Mon002_EvosMoves: ; 3b3d4 (e:73d4)
+Mon002_EvosMoves:
;IVYSAUR
;Evolutions
db EV_LEVEL,32,VENUSAUR
@@ -308,7 +308,7 @@ Mon002_EvosMoves: ; 3b3d4 (e:73d4)
db 54,SOLARBEAM
db 0
-Mon103_EvosMoves: ; 3b3e7 (e:73e7)
+Mon103_EvosMoves:
;EXEGGUTOR
;Evolutions
db 0
@@ -316,7 +316,7 @@ Mon103_EvosMoves: ; 3b3e7 (e:73e7)
db 28,STOMP
db 0
-Mon108_EvosMoves: ; 3b3eb (e:73eb)
+Mon108_EvosMoves:
;LICKITUNG
;Evolutions
db 0
@@ -328,7 +328,7 @@ Mon108_EvosMoves: ; 3b3eb (e:73eb)
db 39,SCREECH
db 0
-Mon102_EvosMoves: ; 3b3f7 (e:73f7)
+Mon102_EvosMoves:
;EXEGGCUTE
;Evolutions
db EV_ITEM,LEAF_STONE,1,EXEGGUTOR
@@ -342,7 +342,7 @@ Mon102_EvosMoves: ; 3b3f7 (e:73f7)
db 48,SLEEP_POWDER
db 0
-Mon088_EvosMoves: ; 3b409 (e:7409)
+Mon088_EvosMoves:
;GRIMER
;Evolutions
db EV_LEVEL,38,MUK
@@ -356,7 +356,7 @@ Mon088_EvosMoves: ; 3b409 (e:7409)
db 55,ACID_ARMOR
db 0
-Mon094_EvosMoves: ; 3b41a (e:741a)
+Mon094_EvosMoves:
;GENGAR
;Evolutions
db 0
@@ -365,7 +365,7 @@ Mon094_EvosMoves: ; 3b41a (e:741a)
db 38,DREAM_EATER
db 0
-Mon029_EvosMoves: ; 3b420 (e:7420)
+Mon029_EvosMoves:
;NIDORAN_F
;Evolutions
db EV_LEVEL,16,NIDORINA
@@ -379,7 +379,7 @@ Mon029_EvosMoves: ; 3b420 (e:7420)
db 38,FURY_SWIPES
db 0
-Mon031_EvosMoves: ; 3b431 (e:7431)
+Mon031_EvosMoves:
;NIDOQUEEN
;Evolutions
db 0
@@ -389,7 +389,7 @@ Mon031_EvosMoves: ; 3b431 (e:7431)
db 23,BODY_SLAM
db 0
-Mon104_EvosMoves: ; 3b439 (e:7439)
+Mon104_EvosMoves:
;CUBONE
;Evolutions
db EV_LEVEL,28,MAROWAK
@@ -405,7 +405,7 @@ Mon104_EvosMoves: ; 3b439 (e:7439)
db 46,RAGE
db 0
-Mon111_EvosMoves: ; 3b44e (e:744e)
+Mon111_EvosMoves:
;RHYHORN
;Evolutions
db EV_LEVEL,42,RHYDON
@@ -419,7 +419,7 @@ Mon111_EvosMoves: ; 3b44e (e:744e)
db 55,TAKE_DOWN
db 0
-Mon131_EvosMoves: ; 3b45f (e:745f)
+Mon131_EvosMoves:
;LAPRAS
;Evolutions
db 0
@@ -432,14 +432,14 @@ Mon131_EvosMoves: ; 3b45f (e:745f)
db 46,HYDRO_PUMP
db 0
-Mon059_EvosMoves: ; 3b46d (e:746d)
+Mon059_EvosMoves:
;ARCANINE
;Evolutions
db 0
;Learnset
db 0
-Mon151_EvosMoves: ; 3b46f (e:746f)
+Mon151_EvosMoves:
;MEW
;Evolutions
db 0
@@ -450,7 +450,7 @@ Mon151_EvosMoves: ; 3b46f (e:746f)
db 40,PSYCHIC_M
db 0
-Mon130_EvosMoves: ; 3b479 (e:7479)
+Mon130_EvosMoves:
;GYARADOS
;Evolutions
db 0
@@ -462,7 +462,7 @@ Mon130_EvosMoves: ; 3b479 (e:7479)
db 52,HYPER_BEAM
db 0
-Mon090_EvosMoves: ; 3b485 (e:7485)
+Mon090_EvosMoves:
;SHELLDER
;Evolutions
db EV_ITEM,WATER_STONE,1,CLOYSTER
@@ -475,7 +475,7 @@ Mon090_EvosMoves: ; 3b485 (e:7485)
db 50,ICE_BEAM
db 0
-Mon072_EvosMoves: ; 3b495 (e:7495)
+Mon072_EvosMoves:
;TENTACOOL
;Evolutions
db EV_LEVEL,30,TENTACRUEL
@@ -491,7 +491,7 @@ Mon072_EvosMoves: ; 3b495 (e:7495)
db 48,HYDRO_PUMP
db 0
-Mon092_EvosMoves: ; 3b4aa (e:74aa)
+Mon092_EvosMoves:
;GASTLY
;Evolutions
db EV_LEVEL,25,HAUNTER
@@ -501,7 +501,7 @@ Mon092_EvosMoves: ; 3b4aa (e:74aa)
db 35,DREAM_EATER
db 0
-Mon123_EvosMoves: ; 3b4b3 (e:74b3)
+Mon123_EvosMoves:
;SCYTHER
;Evolutions
db 0
@@ -515,7 +515,7 @@ Mon123_EvosMoves: ; 3b4b3 (e:74b3)
db 50,WING_ATTACK
db 0
-Mon120_EvosMoves: ; 3b4c3 (e:74c3)
+Mon120_EvosMoves:
;STARYU
;Evolutions
db EV_ITEM,WATER_STONE,1,STARMIE
@@ -530,7 +530,7 @@ Mon120_EvosMoves: ; 3b4c3 (e:74c3)
db 47,HYDRO_PUMP
db 0
-Mon009_EvosMoves: ; 3b4d7 (e:74d7)
+Mon009_EvosMoves:
;BLASTOISE
;Evolutions
db 0
@@ -543,7 +543,7 @@ Mon009_EvosMoves: ; 3b4d7 (e:74d7)
db 52,HYDRO_PUMP
db 0
-Mon127_EvosMoves: ; 3b4e5 (e:74e5)
+Mon127_EvosMoves:
;PINSIR
;Evolutions
db 0
@@ -557,7 +557,7 @@ Mon127_EvosMoves: ; 3b4e5 (e:74e5)
db 54,SWORDS_DANCE
db 0
-Mon114_EvosMoves: ; 3b4f5 (e:74f5)
+Mon114_EvosMoves:
;TANGELA
;Evolutions
db 0
@@ -572,21 +572,21 @@ Mon114_EvosMoves: ; 3b4f5 (e:74f5)
db 48,GROWTH
db 0
-Mon152_EvosMoves: ; 3b507 (e:7507)
+Mon152_EvosMoves:
;MISSINGNO_1F
;Evolutions
db 0
;Learnset
db 0
-Mon153_EvosMoves: ; 3b509 (e:7509)
+Mon153_EvosMoves:
;MISSINGNO_20
;Evolutions
db 0
;Learnset
db 0
-Mon058_EvosMoves: ; 3b50b (e:750b)
+Mon058_EvosMoves:
;GROWLITHE
;Evolutions
db EV_ITEM,FIRE_STONE,1,ARCANINE
@@ -599,7 +599,7 @@ Mon058_EvosMoves: ; 3b50b (e:750b)
db 50,FLAMETHROWER
db 0
-Mon095_EvosMoves: ; 3b51b (e:751b)
+Mon095_EvosMoves:
;ONIX
;Evolutions
db 0
@@ -611,7 +611,7 @@ Mon095_EvosMoves: ; 3b51b (e:751b)
db 43,HARDEN
db 0
-Mon022_EvosMoves: ; 3b527 (e:7527)
+Mon022_EvosMoves:
;FEAROW
;Evolutions
db 0
@@ -623,7 +623,7 @@ Mon022_EvosMoves: ; 3b527 (e:7527)
db 43,AGILITY
db 0
-Mon016_EvosMoves: ; 3b533 (e:7533)
+Mon016_EvosMoves:
;PIDGEY
;Evolutions
db EV_LEVEL,18,PIDGEOTTO
@@ -637,7 +637,7 @@ Mon016_EvosMoves: ; 3b533 (e:7533)
db 44,MIRROR_MOVE
db 0
-Mon079_EvosMoves: ; 3b544 (e:7544)
+Mon079_EvosMoves:
;SLOWPOKE
;Evolutions
db EV_LEVEL,37,SLOWBRO
@@ -651,7 +651,7 @@ Mon079_EvosMoves: ; 3b544 (e:7544)
db 48,PSYCHIC_M
db 0
-Mon064_EvosMoves: ; 3b555 (e:7555)
+Mon064_EvosMoves:
;KADABRA
;Evolutions
db EV_TRADE,1,ALAKAZAM
@@ -665,7 +665,7 @@ Mon064_EvosMoves: ; 3b555 (e:7555)
db 42,REFLECT
db 0
-Mon075_EvosMoves: ; 3b566 (e:7566)
+Mon075_EvosMoves:
;GRAVELER
;Evolutions
db EV_TRADE,1,GOLEM
@@ -679,7 +679,7 @@ Mon075_EvosMoves: ; 3b566 (e:7566)
db 43,EXPLOSION
db 0
-Mon113_EvosMoves: ; 3b577 (e:7577)
+Mon113_EvosMoves:
;CHANSEY
;Evolutions
db 0
@@ -693,7 +693,7 @@ Mon113_EvosMoves: ; 3b577 (e:7577)
db 54,DOUBLE_EDGE
db 0
-Mon067_EvosMoves: ; 3b587 (e:7587)
+Mon067_EvosMoves:
;MACHOKE
;Evolutions
db EV_TRADE,1,MACHAMP
@@ -706,7 +706,7 @@ Mon067_EvosMoves: ; 3b587 (e:7587)
db 52,SUBMISSION
db 0
-Mon122_EvosMoves: ; 3b596 (e:7596)
+Mon122_EvosMoves:
;MR_MIME
;Evolutions
db 0
@@ -718,7 +718,7 @@ Mon122_EvosMoves: ; 3b596 (e:7596)
db 47,SUBSTITUTE
db 0
-Mon106_EvosMoves: ; 3b5a2 (e:75a2)
+Mon106_EvosMoves:
;HITMONLEE
;Evolutions
db 0
@@ -730,7 +730,7 @@ Mon106_EvosMoves: ; 3b5a2 (e:75a2)
db 53,MEGA_KICK
db 0
-Mon107_EvosMoves: ; 3b5ae (e:75ae)
+Mon107_EvosMoves:
;HITMONCHAN
;Evolutions
db 0
@@ -742,7 +742,7 @@ Mon107_EvosMoves: ; 3b5ae (e:75ae)
db 53,COUNTER
db 0
-Mon024_EvosMoves: ; 3b5ba (e:75ba)
+Mon024_EvosMoves:
;ARBOK
;Evolutions
db 0
@@ -754,7 +754,7 @@ Mon024_EvosMoves: ; 3b5ba (e:75ba)
db 47,ACID
db 0
-Mon047_EvosMoves: ; 3b5c6 (e:75c6)
+Mon047_EvosMoves:
;PARASECT
;Evolutions
db 0
@@ -766,7 +766,7 @@ Mon047_EvosMoves: ; 3b5c6 (e:75c6)
db 48,GROWTH
db 0
-Mon054_EvosMoves: ; 3b5d2 (e:75d2)
+Mon054_EvosMoves:
;PSYDUCK
;Evolutions
db EV_LEVEL,33,GOLDUCK
@@ -779,7 +779,7 @@ Mon054_EvosMoves: ; 3b5d2 (e:75d2)
db 52,HYDRO_PUMP
db 0
-Mon096_EvosMoves: ; 3b5e1 (e:75e1)
+Mon096_EvosMoves:
;DROWZEE
;Evolutions
db EV_LEVEL,26,HYPNO
@@ -793,7 +793,7 @@ Mon096_EvosMoves: ; 3b5e1 (e:75e1)
db 37,MEDITATE
db 0
-Mon076_EvosMoves: ; 3b5f2 (e:75f2)
+Mon076_EvosMoves:
;GOLEM
;Evolutions
db 0
@@ -806,14 +806,14 @@ Mon076_EvosMoves: ; 3b5f2 (e:75f2)
db 43,EXPLOSION
db 0
-Mon154_EvosMoves: ; 3b600 (e:7600)
+Mon154_EvosMoves:
;MISSINGNO_32
;Evolutions
db 0
;Learnset
db 0
-Mon126_EvosMoves: ; 3b602 (e:7602)
+Mon126_EvosMoves:
;MAGMAR
;Evolutions
db 0
@@ -826,14 +826,14 @@ Mon126_EvosMoves: ; 3b602 (e:7602)
db 55,FLAMETHROWER
db 0
-Mon155_EvosMoves: ; 3b610 (e:7610)
+Mon155_EvosMoves:
;MISSINGNO_34
;Evolutions
db 0
;Learnset
db 0
-Mon125_EvosMoves: ; 3b612 (e:7612)
+Mon125_EvosMoves:
;ELECTABUZZ
;Evolutions
db 0
@@ -845,7 +845,7 @@ Mon125_EvosMoves: ; 3b612 (e:7612)
db 54,THUNDER
db 0
-Mon082_EvosMoves: ; 3b61e (e:761e)
+Mon082_EvosMoves:
;MAGNETON
;Evolutions
db 0
@@ -858,7 +858,7 @@ Mon082_EvosMoves: ; 3b61e (e:761e)
db 54,SCREECH
db 0
-Mon109_EvosMoves: ; 3b62c (e:762c)
+Mon109_EvosMoves:
;KOFFING
;Evolutions
db EV_LEVEL,35,WEEZING
@@ -871,14 +871,14 @@ Mon109_EvosMoves: ; 3b62c (e:762c)
db 48,EXPLOSION
db 0
-Mon156_EvosMoves: ; 3b63b (e:763b)
+Mon156_EvosMoves:
;MISSINGNO_38
;Evolutions
db 0
;Learnset
db 0
-Mon056_EvosMoves: ; 3b63d (e:763d)
+Mon056_EvosMoves:
;MANKEY
;Evolutions
db EV_LEVEL,28,PRIMEAPE
@@ -893,7 +893,7 @@ Mon056_EvosMoves: ; 3b63d (e:763d)
db 45,SCREECH
db 0
-Mon086_EvosMoves: ; 3b650 (e:7650)
+Mon086_EvosMoves:
;SEEL
;Evolutions
db EV_LEVEL,34,DEWGONG
@@ -906,7 +906,7 @@ Mon086_EvosMoves: ; 3b650 (e:7650)
db 50,ICE_BEAM
db 0
-Mon050_EvosMoves: ; 3b65f (e:765f)
+Mon050_EvosMoves:
;DIGLETT
;Evolutions
db EV_LEVEL,26,DUGTRIO
@@ -919,7 +919,7 @@ Mon050_EvosMoves: ; 3b65f (e:765f)
db 40,EARTHQUAKE
db 0
-Mon128_EvosMoves: ; 3b66e (e:766e)
+Mon128_EvosMoves:
;TAUROS
;Evolutions
db 0
@@ -931,28 +931,28 @@ Mon128_EvosMoves: ; 3b66e (e:766e)
db 51,TAKE_DOWN
db 0
-Mon157_EvosMoves: ; 3b67a (e:767a)
+Mon157_EvosMoves:
;MISSINGNO_3D
;Evolutions
db 0
;Learnset
db 0
-Mon158_EvosMoves: ; 3b67c (e:767c)
+Mon158_EvosMoves:
;MISSINGNO_3E
;Evolutions
db 0
;Learnset
db 0
-Mon159_EvosMoves: ; 3b67e (e:767e)
+Mon159_EvosMoves:
;MISSINGNO_3F
;Evolutions
db 0
;Learnset
db 0
-Mon083_EvosMoves: ; 3b680 (e:7680)
+Mon083_EvosMoves:
;FARFETCH_D
;Evolutions
db 0
@@ -964,7 +964,7 @@ Mon083_EvosMoves: ; 3b680 (e:7680)
db 39,SLASH
db 0
-Mon048_EvosMoves: ; 3b68c (e:768c)
+Mon048_EvosMoves:
;VENONAT
;Evolutions
db EV_LEVEL,31,VENOMOTH
@@ -980,7 +980,7 @@ Mon048_EvosMoves: ; 3b68c (e:768c)
db 43,PSYCHIC_M
db 0
-Mon149_EvosMoves: ; 3b6a1 (e:76a1)
+Mon149_EvosMoves:
;DRAGONITE
;Evolutions
db 0
@@ -992,28 +992,28 @@ Mon149_EvosMoves: ; 3b6a1 (e:76a1)
db 60,HYPER_BEAM
db 0
-Mon160_EvosMoves: ; 3b6ad (e:76ad)
+Mon160_EvosMoves:
;MISSINGNO_43
;Evolutions
db 0
;Learnset
db 0
-Mon161_EvosMoves: ; 3b6af (e:76af)
+Mon161_EvosMoves:
;MISSINGNO_44
;Evolutions
db 0
;Learnset
db 0
-Mon162_EvosMoves: ; 3b6b1 (e:76b1)
+Mon162_EvosMoves:
;MISSINGNO_45
;Evolutions
db 0
;Learnset
db 0
-Mon084_EvosMoves: ; 3b6b3 (e:76b3)
+Mon084_EvosMoves:
;DODUO
;Evolutions
db EV_LEVEL,31,DODRIO
@@ -1027,7 +1027,7 @@ Mon084_EvosMoves: ; 3b6b3 (e:76b3)
db 44,AGILITY
db 0
-Mon060_EvosMoves: ; 3b6c4 (e:76c4)
+Mon060_EvosMoves:
;POLIWAG
;Evolutions
db EV_LEVEL,25,POLIWHIRL
@@ -1041,7 +1041,7 @@ Mon060_EvosMoves: ; 3b6c4 (e:76c4)
db 45,HYDRO_PUMP
db 0
-Mon124_EvosMoves: ; 3b6d5 (e:76d5)
+Mon124_EvosMoves:
;JYNX
;Evolutions
db 0
@@ -1054,7 +1054,7 @@ Mon124_EvosMoves: ; 3b6d5 (e:76d5)
db 58,BLIZZARD
db 0
-Mon146_EvosMoves: ; 3b6e3 (e:76e3)
+Mon146_EvosMoves:
;MOLTRES
;Evolutions
db 0
@@ -1064,7 +1064,7 @@ Mon146_EvosMoves: ; 3b6e3 (e:76e3)
db 60,SKY_ATTACK
db 0
-Mon144_EvosMoves: ; 3b6eb (e:76eb)
+Mon144_EvosMoves:
;ARTICUNO
;Evolutions
db 0
@@ -1074,7 +1074,7 @@ Mon144_EvosMoves: ; 3b6eb (e:76eb)
db 60,MIST
db 0
-Mon145_EvosMoves: ; 3b6f3 (e:76f3)
+Mon145_EvosMoves:
;ZAPDOS
;Evolutions
db 0
@@ -1084,14 +1084,14 @@ Mon145_EvosMoves: ; 3b6f3 (e:76f3)
db 60,LIGHT_SCREEN
db 0
-Mon132_EvosMoves: ; 3b6fb (e:76fb)
+Mon132_EvosMoves:
;DITTO
;Evolutions
db 0
;Learnset
db 0
-Mon052_EvosMoves: ; 3b6fd (e:76fd)
+Mon052_EvosMoves:
;MEOWTH
;Evolutions
db EV_LEVEL,28,PERSIAN
@@ -1104,7 +1104,7 @@ Mon052_EvosMoves: ; 3b6fd (e:76fd)
db 44,SLASH
db 0
-Mon098_EvosMoves: ; 3b70c (e:770c)
+Mon098_EvosMoves:
;KRABBY
;Evolutions
db EV_LEVEL,28,KINGLER
@@ -1117,28 +1117,28 @@ Mon098_EvosMoves: ; 3b70c (e:770c)
db 40,HARDEN
db 0
-Mon163_EvosMoves: ; 3b71b (e:771b)
+Mon163_EvosMoves:
;MISSINGNO_4F
;Evolutions
db 0
;Learnset
db 0
-Mon164_EvosMoves: ; 3b71d (e:771d)
+Mon164_EvosMoves:
;MISSINGNO_50
;Evolutions
db 0
;Learnset
db 0
-Mon165_EvosMoves: ; 3b71f (e:771f)
+Mon165_EvosMoves:
;MISSINGNO_51
;Evolutions
db 0
;Learnset
db 0
-Mon037_EvosMoves: ; 3b721 (e:7721)
+Mon037_EvosMoves:
;VULPIX
;Evolutions
db EV_ITEM,FIRE_STONE,1,NINETALES
@@ -1151,14 +1151,14 @@ Mon037_EvosMoves: ; 3b721 (e:7721)
db 42,FIRE_SPIN
db 0
-Mon038_EvosMoves: ; 3b731 (e:7731)
+Mon038_EvosMoves:
;NINETALES
;Evolutions
db 0
;Learnset
db 0
-Mon025_EvosMoves: ; 3b733 (e:7733)
+Mon025_EvosMoves:
;PIKACHU
;Evolutions
db EV_ITEM,THUNDER_STONE,1,RAICHU
@@ -1175,28 +1175,28 @@ Mon025_EvosMoves: ; 3b733 (e:7733)
db 50,LIGHT_SCREEN
db 0
-Mon026_EvosMoves: ; 3b74b (e:774b)
+Mon026_EvosMoves:
;RAICHU
;Evolutions
db 0
;Learnset
db 0
-Mon166_EvosMoves: ; 3b74d (e:774d)
+Mon166_EvosMoves:
;MISSINGNO_56
;Evolutions
db 0
;Learnset
db 0
-Mon167_EvosMoves: ; 3b74f (e:774f)
+Mon167_EvosMoves:
;MISSINGNO_57
;Evolutions
db 0
;Learnset
db 0
-Mon147_EvosMoves: ; 3b751 (e:7751)
+Mon147_EvosMoves:
;DRATINI
;Evolutions
db EV_LEVEL,30,DRAGONAIR
@@ -1209,7 +1209,7 @@ Mon147_EvosMoves: ; 3b751 (e:7751)
db 50,HYPER_BEAM
db 0
-Mon148_EvosMoves: ; 3b760 (e:7760)
+Mon148_EvosMoves:
;DRAGONAIR
;Evolutions
db EV_LEVEL,55,DRAGONITE
@@ -1222,7 +1222,7 @@ Mon148_EvosMoves: ; 3b760 (e:7760)
db 55,HYPER_BEAM
db 0
-Mon140_EvosMoves: ; 3b76f (e:776f)
+Mon140_EvosMoves:
;KABUTO
;Evolutions
db EV_LEVEL,40,KABUTOPS
@@ -1234,7 +1234,7 @@ Mon140_EvosMoves: ; 3b76f (e:776f)
db 49,HYDRO_PUMP
db 0
-Mon141_EvosMoves: ; 3b77c (e:777c)
+Mon141_EvosMoves:
;KABUTOPS
;Evolutions
db 0
@@ -1245,7 +1245,7 @@ Mon141_EvosMoves: ; 3b77c (e:777c)
db 53,HYDRO_PUMP
db 0
-Mon116_EvosMoves: ; 3b786 (e:7786)
+Mon116_EvosMoves:
;HORSEA
;Evolutions
db EV_LEVEL,32,SEADRA
@@ -1258,7 +1258,7 @@ Mon116_EvosMoves: ; 3b786 (e:7786)
db 45,HYDRO_PUMP
db 0
-Mon117_EvosMoves: ; 3b795 (e:7795)
+Mon117_EvosMoves:
;SEADRA
;Evolutions
db 0
@@ -1270,21 +1270,21 @@ Mon117_EvosMoves: ; 3b795 (e:7795)
db 52,HYDRO_PUMP
db 0
-Mon168_EvosMoves: ; 3b7a1 (e:77a1)
+Mon168_EvosMoves:
;MISSINGNO_5E
;Evolutions
db 0
;Learnset
db 0
-Mon169_EvosMoves: ; 3b7a3 (e:77a3)
+Mon169_EvosMoves:
;MISSINGNO_5F
;Evolutions
db 0
;Learnset
db 0
-Mon027_EvosMoves: ; 3b7a5 (e:77a5)
+Mon027_EvosMoves:
;SANDSHREW
;Evolutions
db EV_LEVEL,22,SANDSLASH
@@ -1297,7 +1297,7 @@ Mon027_EvosMoves: ; 3b7a5 (e:77a5)
db 38,FURY_SWIPES
db 0
-Mon028_EvosMoves: ; 3b7b4 (e:77b4)
+Mon028_EvosMoves:
;SANDSLASH
;Evolutions
db 0
@@ -1309,7 +1309,7 @@ Mon028_EvosMoves: ; 3b7b4 (e:77b4)
db 47,FURY_SWIPES
db 0
-Mon138_EvosMoves: ; 3b7c0 (e:77c0)
+Mon138_EvosMoves:
;OMANYTE
;Evolutions
db EV_LEVEL,40,OMASTAR
@@ -1321,7 +1321,7 @@ Mon138_EvosMoves: ; 3b7c0 (e:77c0)
db 53,HYDRO_PUMP
db 0
-Mon139_EvosMoves: ; 3b7cd (e:77cd)
+Mon139_EvosMoves:
;OMASTAR
;Evolutions
db 0
@@ -1332,7 +1332,7 @@ Mon139_EvosMoves: ; 3b7cd (e:77cd)
db 49,HYDRO_PUMP
db 0
-Mon039_EvosMoves: ; 3b7d7 (e:77d7)
+Mon039_EvosMoves:
;JIGGLYPUFF
;Evolutions
db EV_ITEM,MOON_STONE,1,WIGGLYTUFF
@@ -1347,14 +1347,14 @@ Mon039_EvosMoves: ; 3b7d7 (e:77d7)
db 39,DOUBLE_EDGE
db 0
-Mon040_EvosMoves: ; 3b7eb (e:77eb)
+Mon040_EvosMoves:
;WIGGLYTUFF
;Evolutions
db 0
;Learnset
db 0
-Mon133_EvosMoves: ; 3b7ed (e:77ed)
+Mon133_EvosMoves:
;EEVEE
;Evolutions
db EV_ITEM,FIRE_STONE,1,FLAREON
@@ -1370,7 +1370,7 @@ Mon133_EvosMoves: ; 3b7ed (e:77ed)
db 42,TAKE_DOWN
db 0
-Mon136_EvosMoves: ; 3b807 (e:7807)
+Mon136_EvosMoves:
;FLAREON
;Evolutions
db 0
@@ -1385,7 +1385,7 @@ Mon136_EvosMoves: ; 3b807 (e:7807)
db 52,FLAMETHROWER
db 0
-Mon135_EvosMoves: ; 3b819 (e:7819)
+Mon135_EvosMoves:
;JOLTEON
;Evolutions
db 0
@@ -1400,7 +1400,7 @@ Mon135_EvosMoves: ; 3b819 (e:7819)
db 52,THUNDER
db 0
-Mon134_EvosMoves: ; 3b82b (e:782b)
+Mon134_EvosMoves:
;VAPOREON
;Evolutions
db 0
@@ -1416,7 +1416,7 @@ Mon134_EvosMoves: ; 3b82b (e:782b)
db 52,HYDRO_PUMP
db 0
-Mon066_EvosMoves: ; 3b83f (e:783f)
+Mon066_EvosMoves:
;MACHOP
;Evolutions
db EV_LEVEL,28,MACHOKE
@@ -1429,7 +1429,7 @@ Mon066_EvosMoves: ; 3b83f (e:783f)
db 46,SUBMISSION
db 0
-Mon041_EvosMoves: ; 3b84e (e:784e)
+Mon041_EvosMoves:
;ZUBAT
;Evolutions
db EV_LEVEL,22,GOLBAT
@@ -1442,7 +1442,7 @@ Mon041_EvosMoves: ; 3b84e (e:784e)
db 36,HAZE
db 0
-Mon023_EvosMoves: ; 3b85d (e:785d)
+Mon023_EvosMoves:
;EKANS
;Evolutions
db EV_LEVEL,22,ARBOK
@@ -1455,7 +1455,7 @@ Mon023_EvosMoves: ; 3b85d (e:785d)
db 38,ACID
db 0
-Mon046_EvosMoves: ; 3b86c (e:786c)
+Mon046_EvosMoves:
;PARAS
;Evolutions
db EV_LEVEL,24,PARASECT
@@ -1468,7 +1468,7 @@ Mon046_EvosMoves: ; 3b86c (e:786c)
db 41,GROWTH
db 0
-Mon061_EvosMoves: ; 3b87b (e:787b)
+Mon061_EvosMoves:
;POLIWHIRL
;Evolutions
db EV_ITEM,WATER_STONE,1,POLIWRATH
@@ -1482,7 +1482,7 @@ Mon061_EvosMoves: ; 3b87b (e:787b)
db 49,HYDRO_PUMP
db 0
-Mon062_EvosMoves: ; 3b88d (e:788d)
+Mon062_EvosMoves:
;POLIWRATH
;Evolutions
db 0
@@ -1491,7 +1491,7 @@ Mon062_EvosMoves: ; 3b88d (e:788d)
db 19,WATER_GUN
db 0
-Mon013_EvosMoves: ; 3b893 (e:7893)
+Mon013_EvosMoves:
;WEEDLE
;Evolutions
db EV_LEVEL,7,KAKUNA
@@ -1499,7 +1499,7 @@ Mon013_EvosMoves: ; 3b893 (e:7893)
;Learnset
db 0
-Mon014_EvosMoves: ; 3b898 (e:7898)
+Mon014_EvosMoves:
;KAKUNA
;Evolutions
db EV_LEVEL,10,BEEDRILL
@@ -1507,7 +1507,7 @@ Mon014_EvosMoves: ; 3b898 (e:7898)
;Learnset
db 0
-Mon015_EvosMoves: ; 3b89d (e:789d)
+Mon015_EvosMoves:
;BEEDRILL
;Evolutions
db 0
@@ -1520,14 +1520,14 @@ Mon015_EvosMoves: ; 3b89d (e:789d)
db 35,AGILITY
db 0
-Mon170_EvosMoves: ; 3b8ab (e:78ab)
+Mon170_EvosMoves:
;MISSINGNO_73
;Evolutions
db 0
;Learnset
db 0
-Mon085_EvosMoves: ; 3b8ad (e:78ad)
+Mon085_EvosMoves:
;DODRIO
;Evolutions
db 0
@@ -1540,7 +1540,7 @@ Mon085_EvosMoves: ; 3b8ad (e:78ad)
db 51,AGILITY
db 0
-Mon057_EvosMoves: ; 3b8bb (e:78bb)
+Mon057_EvosMoves:
;PRIMEAPE
;Evolutions
db 0
@@ -1555,7 +1555,7 @@ Mon057_EvosMoves: ; 3b8bb (e:78bb)
db 45,SCREECH
db 0
-Mon051_EvosMoves: ; 3b8cd (e:78cd)
+Mon051_EvosMoves:
;DUGTRIO
;Evolutions
db 0
@@ -1567,7 +1567,7 @@ Mon051_EvosMoves: ; 3b8cd (e:78cd)
db 47,EARTHQUAKE
db 0
-Mon049_EvosMoves: ; 3b8d9 (e:78d9)
+Mon049_EvosMoves:
;VENOMOTH
;Evolutions
db 0
@@ -1580,7 +1580,7 @@ Mon049_EvosMoves: ; 3b8d9 (e:78d9)
db 50,PSYCHIC_M
db 0
-Mon087_EvosMoves: ; 3b8e7 (e:78e7)
+Mon087_EvosMoves:
;DEWGONG
;Evolutions
db 0
@@ -1592,21 +1592,21 @@ Mon087_EvosMoves: ; 3b8e7 (e:78e7)
db 56,ICE_BEAM
db 0
-Mon171_EvosMoves: ; 3b8f3 (e:78f3)
+Mon171_EvosMoves:
;MISSINGNO_79
;Evolutions
db 0
;Learnset
db 0
-Mon172_EvosMoves: ; 3b8f5 (e:78f5)
+Mon172_EvosMoves:
;MISSINGNO_7A
;Evolutions
db 0
;Learnset
db 0
-Mon010_EvosMoves: ; 3b8f7 (e:78f7)
+Mon010_EvosMoves:
;CATERPIE
;Evolutions
db EV_LEVEL,7,METAPOD
@@ -1614,7 +1614,7 @@ Mon010_EvosMoves: ; 3b8f7 (e:78f7)
;Learnset
db 0
-Mon011_EvosMoves: ; 3b8fc (e:78fc)
+Mon011_EvosMoves:
;METAPOD
;Evolutions
db EV_LEVEL,10,BUTTERFREE
@@ -1623,7 +1623,7 @@ Mon011_EvosMoves: ; 3b8fc (e:78fc)
db 7,HARDEN
db 0
-Mon012_EvosMoves: ; 3b903 (e:7903)
+Mon012_EvosMoves:
;BUTTERFREE
;Evolutions
db 0
@@ -1638,7 +1638,7 @@ Mon012_EvosMoves: ; 3b903 (e:7903)
db 34,PSYBEAM
db 0
-Mon068_EvosMoves: ; 3b915 (e:7915)
+Mon068_EvosMoves:
;MACHAMP
;Evolutions
db 0
@@ -1650,14 +1650,14 @@ Mon068_EvosMoves: ; 3b915 (e:7915)
db 52,SUBMISSION
db 0
-Mon173_EvosMoves: ; 3b921 (e:7921)
+Mon173_EvosMoves:
;MISSINGNO_7F
;Evolutions
db 0
;Learnset
db 0
-Mon055_EvosMoves: ; 3b923 (e:7923)
+Mon055_EvosMoves:
;GOLDUCK
;Evolutions
db 0
@@ -1669,7 +1669,7 @@ Mon055_EvosMoves: ; 3b923 (e:7923)
db 59,HYDRO_PUMP
db 0
-Mon097_EvosMoves: ; 3b92f (e:792f)
+Mon097_EvosMoves:
;HYPNO
;Evolutions
db 0
@@ -1682,7 +1682,7 @@ Mon097_EvosMoves: ; 3b92f (e:792f)
db 43,MEDITATE
db 0
-Mon042_EvosMoves: ; 3b93d (e:793d)
+Mon042_EvosMoves:
;GOLBAT
;Evolutions
db 0
@@ -1694,7 +1694,7 @@ Mon042_EvosMoves: ; 3b93d (e:793d)
db 43,HAZE
db 0
-Mon150_EvosMoves: ; 3b949 (e:7949)
+Mon150_EvosMoves:
;MEWTWO
;Evolutions
db 0
@@ -1706,7 +1706,7 @@ Mon150_EvosMoves: ; 3b949 (e:7949)
db 81,AMNESIA
db 0
-Mon143_EvosMoves: ; 3b955 (e:7955)
+Mon143_EvosMoves:
;SNORLAX
;Evolutions
db 0
@@ -1717,7 +1717,7 @@ Mon143_EvosMoves: ; 3b955 (e:7955)
db 56,HYPER_BEAM
db 0
-Mon129_EvosMoves: ; 3b95f (e:795f)
+Mon129_EvosMoves:
;MAGIKARP
;Evolutions
db EV_LEVEL,20,GYARADOS
@@ -1726,21 +1726,21 @@ Mon129_EvosMoves: ; 3b95f (e:795f)
db 15,TACKLE
db 0
-Mon174_EvosMoves: ; 3b966 (e:7966)
+Mon174_EvosMoves:
;MISSINGNO_86
;Evolutions
db 0
;Learnset
db 0
-Mon175_EvosMoves: ; 3b968 (e:7968)
+Mon175_EvosMoves:
;MISSINGNO_87
;Evolutions
db 0
;Learnset
db 0
-Mon089_EvosMoves: ; 3b96a (e:796a)
+Mon089_EvosMoves:
;MUK
;Evolutions
db 0
@@ -1753,14 +1753,14 @@ Mon089_EvosMoves: ; 3b96a (e:796a)
db 60,ACID_ARMOR
db 0
-Mon176_EvosMoves: ; 3b978 (e:7978)
+Mon176_EvosMoves:
;MISSINGNO_8A
;Evolutions
db 0
;Learnset
db 0
-Mon099_EvosMoves: ; 3b97a (e:797a)
+Mon099_EvosMoves:
;KINGLER
;Evolutions
db 0
@@ -1772,7 +1772,7 @@ Mon099_EvosMoves: ; 3b97a (e:797a)
db 49,HARDEN
db 0
-Mon091_EvosMoves: ; 3b986 (e:7986)
+Mon091_EvosMoves:
;CLOYSTER
;Evolutions
db 0
@@ -1780,14 +1780,14 @@ Mon091_EvosMoves: ; 3b986 (e:7986)
db 50,SPIKE_CANNON
db 0
-Mon177_EvosMoves: ; 3b98a (e:798a)
+Mon177_EvosMoves:
;MISSINGNO_8C
;Evolutions
db 0
;Learnset
db 0
-Mon101_EvosMoves: ; 3b98c (e:798c)
+Mon101_EvosMoves:
;ELECTRODE
;Evolutions
db 0
@@ -1799,14 +1799,14 @@ Mon101_EvosMoves: ; 3b98c (e:798c)
db 50,EXPLOSION
db 0
-Mon036_EvosMoves: ; 3b998 (e:7998)
+Mon036_EvosMoves:
;CLEFABLE
;Evolutions
db 0
;Learnset
db 0
-Mon110_EvosMoves: ; 3b99a (e:799a)
+Mon110_EvosMoves:
;WEEZING
;Evolutions
db 0
@@ -1818,7 +1818,7 @@ Mon110_EvosMoves: ; 3b99a (e:799a)
db 53,EXPLOSION
db 0
-Mon053_EvosMoves: ; 3b9a6 (e:79a6)
+Mon053_EvosMoves:
;PERSIAN
;Evolutions
db 0
@@ -1830,7 +1830,7 @@ Mon053_EvosMoves: ; 3b9a6 (e:79a6)
db 51,SLASH
db 0
-Mon105_EvosMoves: ; 3b9b2 (e:79b2)
+Mon105_EvosMoves:
;MAROWAK
;Evolutions
db 0
@@ -1845,14 +1845,14 @@ Mon105_EvosMoves: ; 3b9b2 (e:79b2)
db 55,RAGE
db 0
-Mon178_EvosMoves: ; 3b9c4 (e:79c4)
+Mon178_EvosMoves:
;MISSINGNO_92
;Evolutions
db 0
;Learnset
db 0
-Mon093_EvosMoves: ; 3b9c6 (e:79c6)
+Mon093_EvosMoves:
;HAUNTER
;Evolutions
db EV_TRADE,1,GENGAR
@@ -1862,7 +1862,7 @@ Mon093_EvosMoves: ; 3b9c6 (e:79c6)
db 38,DREAM_EATER
db 0
-Mon063_EvosMoves: ; 3b9cf (e:79cf)
+Mon063_EvosMoves:
;ABRA
;Evolutions
db EV_LEVEL,16,KADABRA
@@ -1870,7 +1870,7 @@ Mon063_EvosMoves: ; 3b9cf (e:79cf)
;Learnset
db 0
-Mon065_EvosMoves: ; 3b9d4 (e:79d4)
+Mon065_EvosMoves:
;ALAKAZAM
;Evolutions
db 0
@@ -1883,7 +1883,7 @@ Mon065_EvosMoves: ; 3b9d4 (e:79d4)
db 42,REFLECT
db 0
-Mon017_EvosMoves: ; 3b9e2 (e:79e2)
+Mon017_EvosMoves:
;PIDGEOTTO
;Evolutions
db EV_LEVEL,36,PIDGEOT
@@ -1897,7 +1897,7 @@ Mon017_EvosMoves: ; 3b9e2 (e:79e2)
db 49,MIRROR_MOVE
db 0
-Mon018_EvosMoves: ; 3b9f3 (e:79f3)
+Mon018_EvosMoves:
;PIDGEOT
;Evolutions
db 0
@@ -1910,14 +1910,14 @@ Mon018_EvosMoves: ; 3b9f3 (e:79f3)
db 54,MIRROR_MOVE
db 0
-Mon121_EvosMoves: ; 3ba01 (e:7a01)
+Mon121_EvosMoves:
;STARMIE
;Evolutions
db 0
;Learnset
db 0
-Mon001_EvosMoves: ; 3ba03 (e:7a03)
+Mon001_EvosMoves:
;BULBASAUR
;Evolutions
db EV_LEVEL,16,IVYSAUR
@@ -1932,7 +1932,7 @@ Mon001_EvosMoves: ; 3ba03 (e:7a03)
db 48,SOLARBEAM
db 0
-Mon003_EvosMoves: ; 3ba16 (e:7a16)
+Mon003_EvosMoves:
;VENUSAUR
;Evolutions
db 0
@@ -1946,7 +1946,7 @@ Mon003_EvosMoves: ; 3ba16 (e:7a16)
db 65,SOLARBEAM
db 0
-Mon073_EvosMoves: ; 3ba26 (e:7a26)
+Mon073_EvosMoves:
;TENTACRUEL
;Evolutions
db 0
@@ -1961,14 +1961,14 @@ Mon073_EvosMoves: ; 3ba26 (e:7a26)
db 50,HYDRO_PUMP
db 0
-Mon179_EvosMoves: ; 3ba38 (e:7a38)
+Mon179_EvosMoves:
;MISSINGNO_9C
;Evolutions
db 0
;Learnset
db 0
-Mon118_EvosMoves: ; 3ba3a (e:7a3a)
+Mon118_EvosMoves:
;GOLDEEN
;Evolutions
db EV_LEVEL,33,SEAKING
@@ -1982,7 +1982,7 @@ Mon118_EvosMoves: ; 3ba3a (e:7a3a)
db 54,AGILITY
db 0
-Mon119_EvosMoves: ; 3ba4b (e:7a4b)
+Mon119_EvosMoves:
;SEAKING
;Evolutions
db 0
@@ -1995,35 +1995,35 @@ Mon119_EvosMoves: ; 3ba4b (e:7a4b)
db 54,AGILITY
db 0
-Mon180_EvosMoves: ; 3ba59 (e:7a59)
+Mon180_EvosMoves:
;MISSINGNO_9F
;Evolutions
db 0
;Learnset
db 0
-Mon181_EvosMoves: ; 3ba5b (e:7a5b)
+Mon181_EvosMoves:
;MISSINGNO_A0
;Evolutions
db 0
;Learnset
db 0
-Mon182_EvosMoves: ; 3ba5d (e:7a5d)
+Mon182_EvosMoves:
;MISSINGNO_A1
;Evolutions
db 0
;Learnset
db 0
-Mon183_EvosMoves: ; 3ba5f (e:7a5f)
+Mon183_EvosMoves:
;MISSINGNO_A2
;Evolutions
db 0
;Learnset
db 0
-Mon077_EvosMoves: ; 3ba61 (e:7a61)
+Mon077_EvosMoves:
;PONYTA
;Evolutions
db EV_LEVEL,40,RAPIDASH
@@ -2037,7 +2037,7 @@ Mon077_EvosMoves: ; 3ba61 (e:7a61)
db 48,AGILITY
db 0
-Mon078_EvosMoves: ; 3ba72 (e:7a72)
+Mon078_EvosMoves:
;RAPIDASH
;Evolutions
db 0
@@ -2050,7 +2050,7 @@ Mon078_EvosMoves: ; 3ba72 (e:7a72)
db 55,AGILITY
db 0
-Mon019_EvosMoves: ; 3ba80 (e:7a80)
+Mon019_EvosMoves:
;RATTATA
;Evolutions
db EV_LEVEL,20,RATICATE
@@ -2062,7 +2062,7 @@ Mon019_EvosMoves: ; 3ba80 (e:7a80)
db 34,SUPER_FANG
db 0
-Mon020_EvosMoves: ; 3ba8d (e:7a8d)
+Mon020_EvosMoves:
;RATICATE
;Evolutions
db 0
@@ -2073,7 +2073,7 @@ Mon020_EvosMoves: ; 3ba8d (e:7a8d)
db 41,SUPER_FANG
db 0
-Mon033_EvosMoves: ; 3ba97 (e:7a97)
+Mon033_EvosMoves:
;NIDORINO
;Evolutions
db EV_ITEM,MOON_STONE,1,NIDOKING
@@ -2087,7 +2087,7 @@ Mon033_EvosMoves: ; 3ba97 (e:7a97)
db 46,HORN_DRILL
db 0
-Mon030_EvosMoves: ; 3baa9 (e:7aa9)
+Mon030_EvosMoves:
;NIDORINA
;Evolutions
db EV_ITEM,MOON_STONE,1,NIDOQUEEN
@@ -2101,7 +2101,7 @@ Mon030_EvosMoves: ; 3baa9 (e:7aa9)
db 46,FURY_SWIPES
db 0
-Mon074_EvosMoves: ; 3babb (e:7abb)
+Mon074_EvosMoves:
;GEODUDE
;Evolutions
db EV_LEVEL,25,GRAVELER
@@ -2115,7 +2115,7 @@ Mon074_EvosMoves: ; 3babb (e:7abb)
db 36,EXPLOSION
db 0
-Mon137_EvosMoves: ; 3bacc (e:7acc)
+Mon137_EvosMoves:
;PORYGON
;Evolutions
db 0
@@ -2126,7 +2126,7 @@ Mon137_EvosMoves: ; 3bacc (e:7acc)
db 42,TRI_ATTACK
db 0
-Mon142_EvosMoves: ; 3bad6 (e:7ad6)
+Mon142_EvosMoves:
;AERODACTYL
;Evolutions
db 0
@@ -2137,14 +2137,14 @@ Mon142_EvosMoves: ; 3bad6 (e:7ad6)
db 54,HYPER_BEAM
db 0
-Mon184_EvosMoves: ; 3bae0 (e:7ae0)
+Mon184_EvosMoves:
;MISSINGNO_AC
;Evolutions
db 0
;Learnset
db 0
-Mon081_EvosMoves: ; 3bae2 (e:7ae2)
+Mon081_EvosMoves:
;MAGNEMITE
;Evolutions
db EV_LEVEL,30,MAGNETON
@@ -2158,21 +2158,21 @@ Mon081_EvosMoves: ; 3bae2 (e:7ae2)
db 47,SCREECH
db 0
-Mon185_EvosMoves: ; 3baf3 (e:7af3)
+Mon185_EvosMoves:
;MISSINGNO_AE
;Evolutions
db 0
;Learnset
db 0
-Mon186_EvosMoves: ; 3baf5 (e:7af5)
+Mon186_EvosMoves:
;MISSINGNO_AF
;Evolutions
db 0
;Learnset
db 0
-Mon004_EvosMoves: ; 3baf7 (e:7af7)
+Mon004_EvosMoves:
;CHARMANDER
;Evolutions
db EV_LEVEL,16,CHARMELEON
@@ -2186,7 +2186,7 @@ Mon004_EvosMoves: ; 3baf7 (e:7af7)
db 46,FIRE_SPIN
db 0
-Mon007_EvosMoves: ; 3bb08 (e:7b08)
+Mon007_EvosMoves:
;SQUIRTLE
;Evolutions
db EV_LEVEL,16,WARTORTLE
@@ -2200,7 +2200,7 @@ Mon007_EvosMoves: ; 3bb08 (e:7b08)
db 42,HYDRO_PUMP
db 0
-Mon005_EvosMoves: ; 3bb19 (e:7b19)
+Mon005_EvosMoves:
;CHARMELEON
;Evolutions
db EV_LEVEL,36,CHARIZARD
@@ -2214,7 +2214,7 @@ Mon005_EvosMoves: ; 3bb19 (e:7b19)
db 56,FIRE_SPIN
db 0
-Mon008_EvosMoves: ; 3bb2a (e:7b2a)
+Mon008_EvosMoves:
;WARTORTLE
;Evolutions
db EV_LEVEL,36,BLASTOISE
@@ -2228,7 +2228,7 @@ Mon008_EvosMoves: ; 3bb2a (e:7b2a)
db 47,HYDRO_PUMP
db 0
-Mon006_EvosMoves: ; 3bb3b (e:7b3b)
+Mon006_EvosMoves:
;CHARIZARD
;Evolutions
db 0
@@ -2241,35 +2241,35 @@ Mon006_EvosMoves: ; 3bb3b (e:7b3b)
db 55,FIRE_SPIN
db 0
-Mon187_EvosMoves: ; 3bb49 (e:7b49)
+Mon187_EvosMoves:
;MISSINGNO_B5
;Evolutions
db 0
;Learnset
db 0
-Mon188_EvosMoves: ; 3bb4b (e:7b4b)
+Mon188_EvosMoves:
;FOSSIL_KABUTOPS
;Evolutions
db 0
;Learnset
db 0
-Mon189_EvosMoves: ; 3bb4d (e:7b4d)
+Mon189_EvosMoves:
;FOSSIL_AERODACTYL
;Evolutions
db 0
;Learnset
db 0
-Mon190_EvosMoves: ; 3bb4f (e:7b4f)
+Mon190_EvosMoves:
;MON_GHOST
;Evolutions
db 0
;Learnset
db 0
-Mon043_EvosMoves: ; 3bb51 (e:7b51)
+Mon043_EvosMoves:
;ODDISH
;Evolutions
db EV_LEVEL,21,GLOOM
@@ -2283,7 +2283,7 @@ Mon043_EvosMoves: ; 3bb51 (e:7b51)
db 46,SOLARBEAM
db 0
-Mon044_EvosMoves: ; 3bb62 (e:7b62)
+Mon044_EvosMoves:
;GLOOM
;Evolutions
db EV_ITEM,LEAF_STONE,1,VILEPLUME
@@ -2297,7 +2297,7 @@ Mon044_EvosMoves: ; 3bb62 (e:7b62)
db 52,SOLARBEAM
db 0
-Mon045_EvosMoves: ; 3bb74 (e:7b74)
+Mon045_EvosMoves:
;VILEPLUME
;Evolutions
db 0
@@ -2307,7 +2307,7 @@ Mon045_EvosMoves: ; 3bb74 (e:7b74)
db 19,SLEEP_POWDER
db 0
-Mon069_EvosMoves: ; 3bb7c (e:7b7c)
+Mon069_EvosMoves:
;BELLSPROUT
;Evolutions
db EV_LEVEL,21,WEEPINBELL
@@ -2322,7 +2322,7 @@ Mon069_EvosMoves: ; 3bb7c (e:7b7c)
db 42,SLAM
db 0
-Mon070_EvosMoves: ; 3bb8f (e:7b8f)
+Mon070_EvosMoves:
;WEEPINBELL
;Evolutions
db EV_ITEM,LEAF_STONE,1,VICTREEBEL
@@ -2337,7 +2337,7 @@ Mon070_EvosMoves: ; 3bb8f (e:7b8f)
db 49,SLAM
db 0
-Mon071_EvosMoves: ; 3bba3 (e:7ba3)
+Mon071_EvosMoves:
;VICTREEBEL
;Evolutions
db 0
diff --git a/data/facing.asm b/data/facing.asm
index 7a3dfacd..3e965132 100644
--- a/data/facing.asm
+++ b/data/facing.asm
@@ -1,4 +1,4 @@
-SpriteFacingAndAnimationTable: ; 4000 (1:4000)
+SpriteFacingAndAnimationTable:
dw SpriteFacingDownAndStanding ; facing down, walk animation frame 0
dw SpriteFacingDownAndWalking ; facing down, walk animation frame 1
dw SpriteFacingDownAndStanding ; facing down, walk animation frame 2
@@ -38,7 +38,7 @@ SpriteFacingAndAnimationTable: ; 4000 (1:4000)
; special case
dw SpriteSpecialCase ; pikachu maybe?
-SpriteFacingDownAndStanding: ; 4042 (1:4042)
+SpriteFacingDownAndStanding:
db $04
; Sprite OAM Parameters
db $00,$00,$00,$00 ; top left
@@ -46,7 +46,7 @@ SpriteFacingDownAndStanding: ; 4042 (1:4042)
db $08,$00,$02,OAMFLAG_CANBEMASKED ; bottom left
db $08,$08,$03,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingDownAndWalking: ; 4053 (1:4053)
+SpriteFacingDownAndWalking:
db $04
; Sprite OAM Parameters
db $00,$00,$80,$00 ; top left
@@ -54,7 +54,7 @@ SpriteFacingDownAndWalking: ; 4053 (1:4053)
db $08,$00,$82,OAMFLAG_CANBEMASKED ; bottom left
db $08,$08,$83,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingDownAndWalking2: ; 4064 (1:4064)
+SpriteFacingDownAndWalking2:
db $04
; Sprite OAM Parameters
db $00,$08,$80,OAMFLAG_VFLIPPED ; top left
@@ -62,7 +62,7 @@ SpriteFacingDownAndWalking2: ; 4064 (1:4064)
db $08,$08,$82,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left
db $08,$00,$83,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingUpAndStanding: ; 4075 (1:4075)
+SpriteFacingUpAndStanding:
db $04
; Sprite OAM Parameters
db $00,$00,$04,$00 ; top left
@@ -70,7 +70,7 @@ SpriteFacingUpAndStanding: ; 4075 (1:4075)
db $08,$00,$06,OAMFLAG_CANBEMASKED ; bottom left
db $08,$08,$07,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingUpAndWalking: ; 4086 (1:4086)
+SpriteFacingUpAndWalking:
db $04
; Sprite OAM Parameters
db $00,$00,$84,$00 ; top left
@@ -78,7 +78,7 @@ SpriteFacingUpAndWalking: ; 4086 (1:4086)
db $08,$00,$86,OAMFLAG_CANBEMASKED ; bottom left
db $08,$08,$87,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingUpAndWalking2: ; 4097 (1:4097)
+SpriteFacingUpAndWalking2:
db $04
; Sprite OAM Parameters
db $00,$08,$84,OAMFLAG_VFLIPPED ; top left
@@ -86,7 +86,7 @@ SpriteFacingUpAndWalking2: ; 4097 (1:4097)
db $08,$08,$86,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left
db $08,$00,$87,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingLeftAndStanding: ; 40a8 (1:40a8)
+SpriteFacingLeftAndStanding:
db $04
; Sprite OAM Parameters
db $00,$00,$08,$00 ; top left
@@ -94,7 +94,7 @@ SpriteFacingLeftAndStanding: ; 40a8 (1:40a8)
db $08,$00,$0a,OAMFLAG_CANBEMASKED ; bottom left
db $08,$08,$0b,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingLeftAndWalking: ; 40b9 (1:40b9)
+SpriteFacingLeftAndWalking:
db $04
; Sprite OAM Parameters
db $00,$00,$88,$00 ; top left
@@ -102,7 +102,7 @@ SpriteFacingLeftAndWalking: ; 40b9 (1:40b9)
db $08,$00,$8a,OAMFLAG_CANBEMASKED ; bottom left
db $08,$08,$8b,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingRightAndStanding: ; 40ca (1:40ca)
+SpriteFacingRightAndStanding:
db $04
; Sprite OAM Parameters
db $00,$08,$08,OAMFLAG_VFLIPPED ; top left
@@ -110,7 +110,7 @@ SpriteFacingRightAndStanding: ; 40ca (1:40ca)
db $08,$08,$0a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left
db $08,$00,$0b,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
-SpriteFacingRightAndWalking: ; 40db (1:40db)
+SpriteFacingRightAndWalking:
db $04
; Sprite OAM Parameters
db $00,$08,$88,OAMFLAG_VFLIPPED ; top left
@@ -130,4 +130,4 @@ SpriteSpecialCase ; 40ec (1:40ec)
db $0c,-$4,$00,OAM_VFLIP | OAMFLAG_CANBEMASKED
db $0c,$04,$01,OAMFLAG_CANBEMASKED
db $0c,$0c,$00,OAM_VFLIP | OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
- \ No newline at end of file
+
diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm
index 71c2c0cc..926db476 100755
--- a/data/force_bike_surf.asm
+++ b/data/force_bike_surf.asm
@@ -1,4 +1,4 @@
-ForcedBikeOrSurfMaps: ; c12f (3:412f)
+ForcedBikeOrSurfMaps:
; map id, y, x
db ROUTE_16,$0A,$11
db ROUTE_16,$0B,$11
diff --git a/data/good_rod.asm b/data/good_rod.asm
index f1785737..6c23f402 100755
--- a/data/good_rod.asm
+++ b/data/good_rod.asm
@@ -1,3 +1,3 @@
-GoodRodMons: ; e27f (3:627f)
+GoodRodMons:
db 10,GOLDEEN
db 10,POLIWAG
diff --git a/data/hidden_coins.asm b/data/hidden_coins.asm
index c0dc63b1..b7358572 100755
--- a/data/hidden_coins.asm
+++ b/data/hidden_coins.asm
@@ -1,4 +1,4 @@
-HiddenCoinCoords: ; 7608e (1d:608e)
+HiddenCoinCoords:
db GAME_CORNER,$08,$00
db GAME_CORNER,$10,$01
db GAME_CORNER,$0b,$03
diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm
index 051fdfe5..e94ebf80 100755
--- a/data/hidden_item_coords.asm
+++ b/data/hidden_item_coords.asm
@@ -1,4 +1,4 @@
-HiddenItemCoords: ; 75faa (1d:5faa)
+HiddenItemCoords:
; map ID, then coords
db SILPH_CO_5F, $03, $0c
db SILPH_CO_9F, $0f, $02
diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm
index 6738d597..7ba90bd3 100755
--- a/data/hidden_objects.asm
+++ b/data/hidden_objects.asm
@@ -1,4 +1,4 @@
-HiddenObjectMaps: ; f268d (3c:668d)
+HiddenObjectMaps:
dbw SILPH_CO_11F, SilphCo11FHiddenObjects
dbw SILPH_CO_5F, SilphCo5FHiddenObjects
dbw SILPH_CO_9F, SilphCo9FHiddenObjects
diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm
index 5b522f8e..72822a40 100755
--- a/data/hide_show_data.asm
+++ b/data/hide_show_data.asm
@@ -4,7 +4,7 @@
; Table of 2-Byte pointers, one pointer per map,
; goes up to Map_F7, ends with $FFFF.
; points to table listing all missable object in the area
-MapHSPointers: ; c69b (3:469b)
+MapHSPointers:
dw MapHS00
dw MapHS01
dw MapHS02
@@ -270,24 +270,24 @@ MapHSPointers: ; c69b (3:469b)
Hide EQU $11 ; (HideObjectPredef - PredefPointers) / 3
Show EQU $15 ; (ShowObjectPredef - PredefPointers) / 3
-MapHSXX: ; c88f (3:488f)
+MapHSXX:
db $FF, $FF, $FF
-MapHS00: ; c892 (3:4892)
+MapHS00:
db PALLET_TOWN, $01, Hide
-MapHS01: ; c895 (3:4895)
+MapHS01:
db VIRIDIAN_CITY, $05, Show
db VIRIDIAN_CITY, $07, Hide
db VIRIDIAN_CITY, $08, Hide
-MapHS02: ; c89e (3:489e)
+MapHS02:
db PEWTER_CITY, $03, Show
db PEWTER_CITY, $05, Show
-MapHS03: ; c8a4 (3:48a4)
+MapHS03:
db CERULEAN_CITY, $01, Hide
db CERULEAN_CITY, $02, Show
db CERULEAN_CITY, $06, Hide
db CERULEAN_CITY, $0A, Show
db CERULEAN_CITY, $0B, Show
-MapHS0A: ; c8b3 (3:48b3)
+MapHS0A:
db SAFFRON_CITY, $01, Show
db SAFFRON_CITY, $02, Show
db SAFFRON_CITY, $03, Show
@@ -303,86 +303,86 @@ MapHS0A: ; c8b3 (3:48b3)
db SAFFRON_CITY, $0D, Hide
db SAFFRON_CITY, $0E, Show
db SAFFRON_CITY, $0F, Hide
-MapHS0D: ; c8e0 (3:48e0)
+MapHS0D:
db ROUTE_2, $01, Show
db ROUTE_2, $02, Show
-MapHS0F: ; c8e6 (3:48e6)
+MapHS0F:
db ROUTE_4, $03, Show
-MapHS14: ; c8e9 (3:48e9)
+MapHS14:
db ROUTE_9, $0A, Show
-MapHS17: ; c8ec (3:48ec)
+MapHS17:
db ROUTE_12, $01, Show
db ROUTE_12, $09, Show
db ROUTE_12, $0A, Show
-MapHS1A: ; c8f5 (3:48f5)
+MapHS1A:
db ROUTE_15, $0B, Show
-MapHS1B: ; c8f8 (3:48f8)
+MapHS1B:
db ROUTE_16, $07, Show
-MapHS21: ; c8fb (3:48fb)
+MapHS21:
db ROUTE_22, $01, Hide
db ROUTE_22, $02, Hide
-MapHS23: ; c901 (3:4901)
+MapHS23:
db ROUTE_24, $01, Show
db ROUTE_24, $08, Show
-MapHS24: ; c907 (3:4907)
+MapHS24:
db ROUTE_25, $0A, Show
-MapHS27: ; c90a (3:490a)
+MapHS27:
db BLUES_HOUSE, $01, Show
db BLUES_HOUSE, $02, Hide
db BLUES_HOUSE, $03, Show
-MapHS28: ; c913 (3:4913)
+MapHS28:
db OAKS_LAB, $01, Show
db OAKS_LAB, $02, Show
db OAKS_LAB, $03, Hide
db OAKS_LAB, $04, Show
db OAKS_LAB, $05, Show
db OAKS_LAB, $06, Hide
-MapHS2D: ; c925 (3:4925)
+MapHS2D:
db VIRIDIAN_GYM, $01, Show
db VIRIDIAN_GYM, $0B, Show
-MapHS34: ; c92b (3:492b)
+MapHS34:
db MUSEUM_1F, $05, Show
MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house
db CERULEAN_HOUSE_1, $02, Show
-MapHSE4: ; c931 (3:4931)
+MapHSE4:
db UNKNOWN_DUNGEON_1, $01, Show
db UNKNOWN_DUNGEON_1, $02, Show
db UNKNOWN_DUNGEON_1, $03, Show
db UNKNOWN_DUNGEON_1, $04, Show
-MapHS8F: ; c93d (3:493d)
+MapHS8F:
db POKEMONTOWER_2, $01, Show
-MapHS90: ; c940 (3:4940)
+MapHS90:
db POKEMONTOWER_3, $04, Show
-MapHS91: ; c943 (3:4943)
+MapHS91:
db POKEMONTOWER_4, $04, Show
db POKEMONTOWER_4, $05, Show
db POKEMONTOWER_4, $06, Show
-MapHS92: ; c94c (3:494c)
+MapHS92:
db POKEMONTOWER_5, $06, Show
-MapHS93: ; c94f (3:494f)
+MapHS93:
db POKEMONTOWER_6, $04, Show
db POKEMONTOWER_6, $05, Show
-MapHS94: ; c955 (3:4955)
+MapHS94:
db POKEMONTOWER_7, $01, Hide ; jessie & james?
db POKEMONTOWER_7, $02, Hide
db POKEMONTOWER_7, $03, Show
-MapHS95: ; c95e (3:495e)
+MapHS95:
db LAVENDER_HOUSE_1, $05, Hide
-MapHS84: ; c961 (3:4961)
+MapHS84:
db CELADON_MANSION_5, $02, Show
-MapHS87: ; c964 (3:4964)
+MapHS87:
db GAME_CORNER, $0B, Show
-MapHS9B: ; c967 (3:4967)
+MapHS9B:
db FUCHSIA_HOUSE_2, $02, Show
-MapHSA5: ; c96a (3:496a)
+MapHSA5:
db MANSION_1, $02, Show
db MANSION_1, $03, Show
-MapHSB1: ; c970 (3:4970)
+MapHSB1:
db FIGHTING_DOJO, $06, Show
db FIGHTING_DOJO, $07, Show
-MapHSB5: ; c976 (3:4976)
+MapHSB5:
db SILPH_CO_1F, $01, Hide
-MapHS53: ; c979 (3:4979)
+MapHS53:
db POWER_PLANT, $01, Show
db POWER_PLANT, $02, Show
db POWER_PLANT, $03, Show
@@ -397,62 +397,62 @@ MapHS53: ; c979 (3:4979)
db POWER_PLANT, $0C, Show
db POWER_PLANT, $0D, Show
db POWER_PLANT, $0E, Show
-MapHSC2: ; c9a3 (3:49a3)
+MapHSC2:
db VICTORY_ROAD_2, $06, Show
db VICTORY_ROAD_2, $07, Show
db VICTORY_ROAD_2, $08, Show
db VICTORY_ROAD_2, $09, Show
db VICTORY_ROAD_2, $0A, Show
db VICTORY_ROAD_2, $0D, Show
-MapHS58: ; c9b5 (3:49b5)
+MapHS58:
db BILLS_HOUSE, $01, Show
db BILLS_HOUSE, $02, Hide
db BILLS_HOUSE, $03, Hide
-MapHS33: ; c9be (3:49be)
+MapHS33:
db VIRIDIAN_FOREST, $07, Show
db VIRIDIAN_FOREST, $08, Show
db VIRIDIAN_FOREST, $09, Show
-MapHS3B: ; c9c7 (3:49c7)
+MapHS3B:
db MT_MOON_1, $08, Show
db MT_MOON_1, $09, Show
db MT_MOON_1, $0A, Show
db MT_MOON_1, $0B, Show
db MT_MOON_1, $0C, Show
db MT_MOON_1, $0D, Show
-MapHS3D: ; c9d9 (3:49d9)
+MapHS3D:
db MT_MOON_3, $02, Hide
db MT_MOON_3, $06, Hide
db MT_MOON_3, $07, Show
db MT_MOON_3, $08, Show
db MT_MOON_3, $09, Show
db MT_MOON_3, $0A, Show
-MapHS60: ; c9eb (3:49eb)
+MapHS60:
db SS_ANNE_2, $02, Hide
-MapHS66: ; c9ee (3:49ee)
+MapHS66:
db SS_ANNE_8, $0A, Show
-MapHS67: ; c9f1 (3:49f1)
+MapHS67:
db SS_ANNE_9, $06, Show
db SS_ANNE_9, $09, Show
-MapHS68: ; c9f7 (3:49f7)
+MapHS68:
db SS_ANNE_10, $09, Show
db SS_ANNE_10, $0A, Show
db SS_ANNE_10, $0B, Show
-MapHSC6: ; ca00 (3:4a00)
+MapHSC6:
db VICTORY_ROAD_3, $05, Show
db VICTORY_ROAD_3, $06, Show
db VICTORY_ROAD_3, $0A, Show
-MapHSC7: ; ca09 (3:4a09)
+MapHSC7:
db ROCKET_HIDEOUT_1, $06, Show
db ROCKET_HIDEOUT_1, $07, Show
-MapHSC8: ; ca0f (3:4a0f)
+MapHSC8:
db ROCKET_HIDEOUT_2, $02, Show
db ROCKET_HIDEOUT_2, $03, Show
db ROCKET_HIDEOUT_2, $04, Show
db ROCKET_HIDEOUT_2, $05, Show
-MapHSC9: ; ca1b (3:4a1b)
+MapHSC9:
db ROCKET_HIDEOUT_3, $03, Show
db ROCKET_HIDEOUT_3, $04, Show
-MapHSCA: ; ca21 (3:4a21)
+MapHSCA:
db ROCKET_HIDEOUT_4, $01, Show
db ROCKET_HIDEOUT_4, $02, Hide
db ROCKET_HIDEOUT_4, $03, Hide
@@ -461,24 +461,24 @@ MapHSCA: ; ca21 (3:4a21)
db ROCKET_HIDEOUT_4, $07, Show
db ROCKET_HIDEOUT_4, $08, Hide
db ROCKET_HIDEOUT_4, $09, Hide
-MapHSCF: ; ca39 (3:4a39)
+MapHSCF:
db SILPH_CO_2F, $01, Show
db SILPH_CO_2F, $02, Show
db SILPH_CO_2F, $03, Show
db SILPH_CO_2F, $04, Show
db SILPH_CO_2F, $05, Show
-MapHSD0: ; ca48 (3:4a48)
+MapHSD0:
db SILPH_CO_3F, $02, Show
db SILPH_CO_3F, $03, Show
db SILPH_CO_3F, $04, Show
-MapHSD1: ; ca51 (3:4a51)
+MapHSD1:
db SILPH_CO_4F, $02, Show
db SILPH_CO_4F, $03, Show
db SILPH_CO_4F, $04, Show
db SILPH_CO_4F, $05, Show
db SILPH_CO_4F, $06, Show
db SILPH_CO_4F, $07, Show
-MapHSD2: ; ca63 (3:4a63)
+MapHSD2:
db SILPH_CO_5F, $02, Show
db SILPH_CO_5F, $03, Show
db SILPH_CO_5F, $04, Show
@@ -486,13 +486,13 @@ MapHSD2: ; ca63 (3:4a63)
db SILPH_CO_5F, $06, Show
db SILPH_CO_5F, $07, Show
db SILPH_CO_5F, $08, Show
-MapHSD3: ; ca78 (3:4a78)
+MapHSD3:
db SILPH_CO_6F, $06, Show
db SILPH_CO_6F, $07, Show
db SILPH_CO_6F, $08, Show
db SILPH_CO_6F, $09, Show
db SILPH_CO_6F, $0A, Show
-MapHSD4: ; ca87 (3:4a87)
+MapHSD4:
db SILPH_CO_7F, $05, Show
db SILPH_CO_7F, $06, Show
db SILPH_CO_7F, $07, Show
@@ -501,93 +501,93 @@ MapHSD4: ; ca87 (3:4a87)
db SILPH_CO_7F, $0A, Show
db SILPH_CO_7F, $0B, Show
db SILPH_CO_7F, $0C, Show
-MapHSD5: ; ca9f (3:4a9f)
+MapHSD5:
db SILPH_CO_8F, $02, Show
db SILPH_CO_8F, $03, Show
db SILPH_CO_8F, $04, Show
-MapHSE9: ; caa8 (3:4aa8)
+MapHSE9:
db SILPH_CO_9F, $02, Show
db SILPH_CO_9F, $03, Show
db SILPH_CO_9F, $04, Show
-MapHSEA: ; cab1 (3:4ab1)
+MapHSEA:
db SILPH_CO_10F, $01, Show
db SILPH_CO_10F, $02, Show
db SILPH_CO_10F, $03, Show
db SILPH_CO_10F, $04, Show
db SILPH_CO_10F, $05, Show
db SILPH_CO_10F, $06, Show
-MapHSEB: ; cac3 (3:4ac3)
+MapHSEB:
db SILPH_CO_11F, $03, Show
db SILPH_CO_11F, $04, Show
db SILPH_CO_11F, $05, Show
db SILPH_CO_11F, $06, Show
-MapHSF4: ; cacf (3:4acf)
+MapHSF4:
db $F4, $02, Show
-MapHSD6: ; cad2 (3:4ad2)
+MapHSD6:
db MANSION_2, $02, Show
-MapHSD7: ; cad5 (3:4ad5)
+MapHSD7:
db MANSION_3, $03, Show
db MANSION_3, $04, Show
-MapHSD8: ; cadb (3:4adb)
+MapHSD8:
db MANSION_4, $03, Show
db MANSION_4, $04, Show
db MANSION_4, $05, Show
db MANSION_4, $06, Show
db MANSION_4, $08, Show
-MapHSD9: ; caea (3:4aea)
+MapHSD9:
db SAFARI_ZONE_EAST, $01, Show
db SAFARI_ZONE_EAST, $02, Show
db SAFARI_ZONE_EAST, $03, Show
db SAFARI_ZONE_EAST, $04, Show
-MapHSDA: ; caf6 (3:4af6)
+MapHSDA:
db SAFARI_ZONE_NORTH, $01, Show
db SAFARI_ZONE_NORTH, $02, Show
-MapHSDB: ; cafc (3:4afc)
+MapHSDB:
db SAFARI_ZONE_WEST, $01, Show
db SAFARI_ZONE_WEST, $02, Show
db SAFARI_ZONE_WEST, $03, Show
db SAFARI_ZONE_WEST, $04, Show
-MapHSDC: ; cb08 (3:4b08)
+MapHSDC:
db SAFARI_ZONE_CENTER, $01, Show
-MapHSE2: ; cb0b (3:4b0b)
+MapHSE2:
db UNKNOWN_DUNGEON_2, $01, Show
db UNKNOWN_DUNGEON_2, $02, Show
db UNKNOWN_DUNGEON_2, $03, Show
db UNKNOWN_DUNGEON_2, $04, Show
-MapHSE3: ; cb17 (3:4b17)
+MapHSE3:
db UNKNOWN_DUNGEON_3, $01, Show
db UNKNOWN_DUNGEON_3, $02, Show
db UNKNOWN_DUNGEON_3, $03, Show
db UNKNOWN_DUNGEON_3, $04, Show
db UNKNOWN_DUNGEON_3, $05, Show
-MapHS6C: ; cb26 (3:4b26)
+MapHS6C:
db VICTORY_ROAD_1, $03, Show
db VICTORY_ROAD_1, $04, Show
-MapHS78: ; cb2c (3:4b2c)
+MapHS78:
db CHAMPIONS_ROOM, $02, Hide
-MapHSC0: ; cb2f (3:4b2f)
+MapHSC0:
db SEAFOAM_ISLANDS_1, $01, Show
db SEAFOAM_ISLANDS_1, $02, Show
-MapHS9F: ; cb35 (3:4b35)
+MapHS9F:
db SEAFOAM_ISLANDS_2, $01, Hide
db SEAFOAM_ISLANDS_2, $02, Hide
-MapHSA0: ; cb3b (3:4b3b)
+MapHSA0:
db SEAFOAM_ISLANDS_3, $01, Hide
db SEAFOAM_ISLANDS_3, $02, Hide
-MapHSA1: ; cb41 (3:4b41)
+MapHSA1:
db SEAFOAM_ISLANDS_4, $02, Show
db SEAFOAM_ISLANDS_4, $03, Show
db SEAFOAM_ISLANDS_4, $05, Hide
db SEAFOAM_ISLANDS_4, $06, Hide
-MapHSA2: ; cb4d (3:4b4d)
+MapHSA2:
db SEAFOAM_ISLANDS_5, $01, Hide
db SEAFOAM_ISLANDS_5, $02, Hide
db SEAFOAM_ISLANDS_5, $03, Show
-MapHS27Copy: ; cb56 (3:4b56)
+MapHS27Copy:
; doesn't seem to be referenced
db BLUES_HOUSE, $01, Show
db BLUES_HOUSE, $02, Hide
db BLUES_HOUSE, $03, Show
- db $FF, $01, Show \ No newline at end of file
+ db $FF, $01, Show
diff --git a/data/item_prices.asm b/data/item_prices.asm
index cdcb5762..15a1bd34 100755
--- a/data/item_prices.asm
+++ b/data/item_prices.asm
@@ -1,4 +1,4 @@
-ItemPrices: ; 4494 (1:4494)
+ItemPrices:
money 0 ; MASTER_BALL
money 1200 ; ULTRA_BALL
money 600 ; GREAT_BALL
diff --git a/data/key_items.asm b/data/key_items.asm
index c7ee6413..afa586af 100755
--- a/data/key_items.asm
+++ b/data/key_items.asm
@@ -1,4 +1,4 @@
-KeyItemBitfield: ; e6dd (3:66dd)
+KeyItemBitfield:
db %11110000
db %00000001
db %11110000
diff --git a/data/mapHeaders/agatha.asm b/data/mapHeaders/agatha.asm
index dcfe0231..f3389579 100755
--- a/data/mapHeaders/agatha.asm
+++ b/data/mapHeaders/agatha.asm
@@ -1,4 +1,4 @@
-Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
+Agatha_h:
db CEMETERY ; tileset
db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm
index 04652643..99d237f6 100644
--- a/data/mapHeaders/beach_house.asm
+++ b/data/mapHeaders/beach_house.asm
@@ -1,4 +1,4 @@
-BeachHouse_h: ; f220e (3c:620e)
+BeachHouse_h:
db BEACH_HOUSE_TILESET
db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x)
diff --git a/data/mapHeaders/bikeshop.asm b/data/mapHeaders/bikeshop.asm
index 958e9fd4..b63b03df 100755
--- a/data/mapHeaders/bikeshop.asm
+++ b/data/mapHeaders/bikeshop.asm
@@ -1,4 +1,4 @@
-BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
+BikeShop_h:
db CLUB ; tileset
db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/billshouse.asm b/data/mapHeaders/billshouse.asm
index 5218c5f3..735f8d62 100755
--- a/data/mapHeaders/billshouse.asm
+++ b/data/mapHeaders/billshouse.asm
@@ -1,4 +1,4 @@
-BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
+BillsHouse_h:
db INTERIOR ; tileset
db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/blueshouse.asm b/data/mapHeaders/blueshouse.asm
index 24564da5..47e5c5b4 100755
--- a/data/mapHeaders/blueshouse.asm
+++ b/data/mapHeaders/blueshouse.asm
@@ -1,4 +1,4 @@
-BluesHouse_h: ; 0x19b2f id=39
+BluesHouse_h:
db HOUSE ; tileset
db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions
dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript
diff --git a/data/mapHeaders/bruno.asm b/data/mapHeaders/bruno.asm
index 19536501..1267ebe2 100755
--- a/data/mapHeaders/bruno.asm
+++ b/data/mapHeaders/bruno.asm
@@ -1,4 +1,4 @@
-Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
+Bruno_h:
db GYM ; tileset
db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm
index 7e3a6c06..7f94cad5 100755
--- a/data/mapHeaders/celadoncity.asm
+++ b/data/mapHeaders/celadoncity.asm
@@ -1,4 +1,4 @@
-CeladonCity_h: ; 18000 (6:4000)
+CeladonCity_h:
db OVERWORLD ; tileset
db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadondiner.asm b/data/mapHeaders/celadondiner.asm
index cc2b6075..9520d76e 100755
--- a/data/mapHeaders/celadondiner.asm
+++ b/data/mapHeaders/celadondiner.asm
@@ -1,4 +1,4 @@
-CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
+CeladonDiner_h:
db LOBBY ; tileset
db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadongamecorner.asm b/data/mapHeaders/celadongamecorner.asm
index f211b930..3c5674a7 100755
--- a/data/mapHeaders/celadongamecorner.asm
+++ b/data/mapHeaders/celadongamecorner.asm
@@ -1,4 +1,4 @@
-CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
+CeladonGameCorner_h:
db LOBBY ; tileset
db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadongym.asm b/data/mapHeaders/celadongym.asm
index b54aa76c..c0dcf162 100755
--- a/data/mapHeaders/celadongym.asm
+++ b/data/mapHeaders/celadongym.asm
@@ -1,4 +1,4 @@
-CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
+CeladonGym_h:
db GYM ; tileset
db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonhotel.asm b/data/mapHeaders/celadonhotel.asm
index 6bb908fb..019c3cc3 100755
--- a/data/mapHeaders/celadonhotel.asm
+++ b/data/mapHeaders/celadonhotel.asm
@@ -1,4 +1,4 @@
-CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
+CeladonHotel_h:
db POKECENTER ; tileset
db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonhouse.asm b/data/mapHeaders/celadonhouse.asm
index fee3fa15..ba510282 100755
--- a/data/mapHeaders/celadonhouse.asm
+++ b/data/mapHeaders/celadonhouse.asm
@@ -1,4 +1,4 @@
-CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
+CeladonHouse_h:
db MANSION ; tileset
db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x)
dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmansion1.asm b/data/mapHeaders/celadonmansion1.asm
index 8b2d9856..8c94cc63 100755
--- a/data/mapHeaders/celadonmansion1.asm
+++ b/data/mapHeaders/celadonmansion1.asm
@@ -1,4 +1,4 @@
-CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
+CeladonMansion1_h:
db MANSION ; tileset
db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x)
dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmansion2.asm b/data/mapHeaders/celadonmansion2.asm
index e5afd96e..462dfdf3 100755
--- a/data/mapHeaders/celadonmansion2.asm
+++ b/data/mapHeaders/celadonmansion2.asm
@@ -1,4 +1,4 @@
-CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
+CeladonMansion2_h:
db MANSION ; tileset
db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x)
dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmansion3.asm b/data/mapHeaders/celadonmansion3.asm
index 8b290e42..81b3f2e2 100755
--- a/data/mapHeaders/celadonmansion3.asm
+++ b/data/mapHeaders/celadonmansion3.asm
@@ -1,4 +1,4 @@
-CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
+CeladonMansion3_h:
db MANSION ; tileset
db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x)
dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmansion4.asm b/data/mapHeaders/celadonmansion4.asm
index e7277d66..c5cf2da9 100755
--- a/data/mapHeaders/celadonmansion4.asm
+++ b/data/mapHeaders/celadonmansion4.asm
@@ -1,4 +1,4 @@
-CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
+CeladonMansion4_h:
db MANSION ; tileset
db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x)
dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmansion5.asm b/data/mapHeaders/celadonmansion5.asm
index 06c5ce09..d26faccf 100755
--- a/data/mapHeaders/celadonmansion5.asm
+++ b/data/mapHeaders/celadonmansion5.asm
@@ -1,4 +1,4 @@
-CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
+CeladonMansion5_h:
db HOUSE ; tileset
db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x)
dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmart1.asm b/data/mapHeaders/celadonmart1.asm
index 2a5dc6ad..50d171bc 100755
--- a/data/mapHeaders/celadonmart1.asm
+++ b/data/mapHeaders/celadonmart1.asm
@@ -1,4 +1,4 @@
-CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
+CeladonMart1_h:
db LOBBY ; tileset
db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x)
dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmart2.asm b/data/mapHeaders/celadonmart2.asm
index 9bcd63bf..ecd609cb 100755
--- a/data/mapHeaders/celadonmart2.asm
+++ b/data/mapHeaders/celadonmart2.asm
@@ -1,4 +1,4 @@
-CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
+CeladonMart2_h:
db LOBBY ; tileset
db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x)
dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmart3.asm b/data/mapHeaders/celadonmart3.asm
index bb847159..af109528 100755
--- a/data/mapHeaders/celadonmart3.asm
+++ b/data/mapHeaders/celadonmart3.asm
@@ -1,4 +1,4 @@
-CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
+CeladonMart3_h:
db LOBBY ; tileset
db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x)
dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmart4.asm b/data/mapHeaders/celadonmart4.asm
index 12e7cc12..4ae820d9 100755
--- a/data/mapHeaders/celadonmart4.asm
+++ b/data/mapHeaders/celadonmart4.asm
@@ -1,4 +1,4 @@
-CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
+CeladonMart4_h:
db LOBBY ; tileset
db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x)
dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmart5.asm b/data/mapHeaders/celadonmart5.asm
index c16207ca..0d28464f 100755
--- a/data/mapHeaders/celadonmart5.asm
+++ b/data/mapHeaders/celadonmart5.asm
@@ -1,4 +1,4 @@
-CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
+CeladonMart5_h:
db LOBBY ; tileset
db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x)
dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmartelevator.asm b/data/mapHeaders/celadonmartelevator.asm
index 1e51a262..498587c6 100755
--- a/data/mapHeaders/celadonmartelevator.asm
+++ b/data/mapHeaders/celadonmartelevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
+CeladonMartElevator_h:
db LOBBY ; tileset
db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonmartroof.asm b/data/mapHeaders/celadonmartroof.asm
index 9654ef3d..8814092b 100755
--- a/data/mapHeaders/celadonmartroof.asm
+++ b/data/mapHeaders/celadonmartroof.asm
@@ -1,4 +1,4 @@
-CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
+CeladonMartRoof_h:
db LOBBY ; tileset
db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonpokecenter.asm b/data/mapHeaders/celadonpokecenter.asm
index e2164223..b9464c68 100755
--- a/data/mapHeaders/celadonpokecenter.asm
+++ b/data/mapHeaders/celadonpokecenter.asm
@@ -1,4 +1,4 @@
-CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
+CeladonPokecenter_h:
db POKECENTER ; tileset
db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/celadonprizeroom.asm b/data/mapHeaders/celadonprizeroom.asm
index 96951df0..f7a5dc12 100755
--- a/data/mapHeaders/celadonprizeroom.asm
+++ b/data/mapHeaders/celadonprizeroom.asm
@@ -1,4 +1,4 @@
-CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
+CeladonPrizeRoom_h:
db LOBBY ; tileset
db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x)
dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/ceruleancity.asm b/data/mapHeaders/ceruleancity.asm
index 56cab9f7..be6dc5b2 100755
--- a/data/mapHeaders/ceruleancity.asm
+++ b/data/mapHeaders/ceruleancity.asm
@@ -1,4 +1,4 @@
-CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3)
+CeruleanCity_h:
db OVERWORLD ; tileset
db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/ceruleangym.asm b/data/mapHeaders/ceruleangym.asm
index 7296a2a7..f95e1a79 100755
--- a/data/mapHeaders/ceruleangym.asm
+++ b/data/mapHeaders/ceruleangym.asm
@@ -1,4 +1,4 @@
-CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
+CeruleanGym_h:
db GYM ; tileset
db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/ceruleanhouse1.asm b/data/mapHeaders/ceruleanhouse1.asm
index 879ceb23..2a8c9197 100755
--- a/data/mapHeaders/ceruleanhouse1.asm
+++ b/data/mapHeaders/ceruleanhouse1.asm
@@ -1,4 +1,4 @@
-CeruleanHouse1_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
+CeruleanHouse1_h:
db HOUSE ; tileset
db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x)
dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ceruleanhouse2.asm b/data/mapHeaders/ceruleanhouse2.asm
index d2c44a47..1e040ffd 100755
--- a/data/mapHeaders/ceruleanhouse2.asm
+++ b/data/mapHeaders/ceruleanhouse2.asm
@@ -1,4 +1,4 @@
-CeruleanHouse2_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
+CeruleanHouse2_h:
db SHIP ; tileset
db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x)
dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ceruleanhousetrashed.asm b/data/mapHeaders/ceruleanhousetrashed.asm
index 60c6dc94..90119dc5 100755
--- a/data/mapHeaders/ceruleanhousetrashed.asm
+++ b/data/mapHeaders/ceruleanhousetrashed.asm
@@ -1,4 +1,4 @@
-CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
+CeruleanHouseTrashed_h:
db HOUSE ; tileset
db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x)
dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/ceruleanmart.asm b/data/mapHeaders/ceruleanmart.asm
index a2e112fd..3f3231e8 100755
--- a/data/mapHeaders/ceruleanmart.asm
+++ b/data/mapHeaders/ceruleanmart.asm
@@ -1,4 +1,4 @@
-CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
+CeruleanMart_h:
db MART ; tileset
db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/ceruleanpokecenter.asm b/data/mapHeaders/ceruleanpokecenter.asm
index 908229fe..636a89ae 100755
--- a/data/mapHeaders/ceruleanpokecenter.asm
+++ b/data/mapHeaders/ceruleanpokecenter.asm
@@ -1,4 +1,4 @@
-CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
+CeruleanPokecenter_h:
db POKECENTER ; tileset
db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/cinnabargym.asm b/data/mapHeaders/cinnabargym.asm
index 1902fe5d..3f05790c 100755
--- a/data/mapHeaders/cinnabargym.asm
+++ b/data/mapHeaders/cinnabargym.asm
@@ -1,4 +1,4 @@
-CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166)
+CinnabarGym_h:
db FACILITY ; tileset
db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/cinnabarisland.asm b/data/mapHeaders/cinnabarisland.asm
index 60ba7560..6ae6424d 100755
--- a/data/mapHeaders/cinnabarisland.asm
+++ b/data/mapHeaders/cinnabarisland.asm
@@ -1,4 +1,4 @@
-CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8)
+CinnabarIsland_h:
db OVERWORLD ; tileset
db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x)
dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/cinnabarmart.asm b/data/mapHeaders/cinnabarmart.asm
index dd9fc116..b686713f 100755
--- a/data/mapHeaders/cinnabarmart.asm
+++ b/data/mapHeaders/cinnabarmart.asm
@@ -1,4 +1,4 @@
-CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
+CinnabarMart_h:
db MART ; tileset
db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/cinnabarpokecenter.asm b/data/mapHeaders/cinnabarpokecenter.asm
index 2d00d498..b1f002bd 100755
--- a/data/mapHeaders/cinnabarpokecenter.asm
+++ b/data/mapHeaders/cinnabarpokecenter.asm
@@ -1,4 +1,4 @@
-CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171)
+CinnabarPokecenter_h:
db POKECENTER ; tileset
db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm
index 94728b8d..67e1188b 100644
--- a/data/mapHeaders/colosseum.asm
+++ b/data/mapHeaders/colosseum.asm
@@ -1,4 +1,4 @@
-Colosseum_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
+Colosseum_h:
db CLUB ; tileset
db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x)
dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/copycatshouse1f.asm b/data/mapHeaders/copycatshouse1f.asm
index a8d171d7..bdca2189 100755
--- a/data/mapHeaders/copycatshouse1f.asm
+++ b/data/mapHeaders/copycatshouse1f.asm
@@ -1,4 +1,4 @@
-CopycatsHouse1F_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
+CopycatsHouse1F_h:
db REDS_HOUSE_1 ; tileset
db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/copycatshouse2f.asm b/data/mapHeaders/copycatshouse2f.asm
index 46be1f54..3eecf718 100755
--- a/data/mapHeaders/copycatshouse2f.asm
+++ b/data/mapHeaders/copycatshouse2f.asm
@@ -1,4 +1,4 @@
-CopycatsHouse2F_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
+CopycatsHouse2F_h:
db REDS_HOUSE_2 ; tileset
db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/daycarem.asm b/data/mapHeaders/daycarem.asm
index 2677b51c..1b8d4c1c 100755
--- a/data/mapHeaders/daycarem.asm
+++ b/data/mapHeaders/daycarem.asm
@@ -1,4 +1,4 @@
-DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
+DayCareM_h:
db HOUSE ; tileset
db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x)
dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/diglettscave.asm b/data/mapHeaders/diglettscave.asm
index 3cd5a651..0e68a55c 100755
--- a/data/mapHeaders/diglettscave.asm
+++ b/data/mapHeaders/diglettscave.asm
@@ -1,4 +1,4 @@
-DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
+DiglettsCave_h:
db CAVERN ; tileset
db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/diglettscaveroute11.asm b/data/mapHeaders/diglettscaveroute11.asm
index 8d9acd49..7670c83f 100755
--- a/data/mapHeaders/diglettscaveroute11.asm
+++ b/data/mapHeaders/diglettscaveroute11.asm
@@ -1,4 +1,4 @@
-DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
+DiglettsCaveEntranceRoute11_h:
db CAVERN ; tileset
db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x)
dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/diglettscaveroute2.asm b/data/mapHeaders/diglettscaveroute2.asm
index b81d48a6..0499b4c3 100755
--- a/data/mapHeaders/diglettscaveroute2.asm
+++ b/data/mapHeaders/diglettscaveroute2.asm
@@ -1,4 +1,4 @@
-DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
+DiglettsCaveRoute2_h:
db CAVERN ; tileset
db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x)
dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/fanclub.asm b/data/mapHeaders/fanclub.asm
index 603ec53b..8e8205b4 100755
--- a/data/mapHeaders/fanclub.asm
+++ b/data/mapHeaders/fanclub.asm
@@ -1,4 +1,4 @@
-FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
+FanClub_h:
db INTERIOR ; tileset
db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/fightingdojo.asm b/data/mapHeaders/fightingdojo.asm
index d981d816..cb0a2fdb 100755
--- a/data/mapHeaders/fightingdojo.asm
+++ b/data/mapHeaders/fightingdojo.asm
@@ -1,4 +1,4 @@
-FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
+FightingDojo_h:
db DOJO ; tileset
db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm
index 998f7bb4..2bfd2793 100755
--- a/data/mapHeaders/fuchsiacity.asm
+++ b/data/mapHeaders/fuchsiacity.asm
@@ -1,4 +1,4 @@
-FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7)
+FuchsiaCity_h:
db OVERWORLD ; tileset
db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x)
dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/fuchsiagym.asm b/data/mapHeaders/fuchsiagym.asm
index 4c6f083f..9d16f178 100755
--- a/data/mapHeaders/fuchsiagym.asm
+++ b/data/mapHeaders/fuchsiagym.asm
@@ -1,4 +1,4 @@
-FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
+FuchsiaGym_h:
db GYM ; tileset
db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/fuchsiahouse1.asm b/data/mapHeaders/fuchsiahouse1.asm
index 98974fee..c4ab2c95 100755
--- a/data/mapHeaders/fuchsiahouse1.asm
+++ b/data/mapHeaders/fuchsiahouse1.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
+FuchsiaHouse1_h:
db HOUSE ; tileset
db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x)
dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/fuchsiahouse2.asm b/data/mapHeaders/fuchsiahouse2.asm
index f4d05eeb..530f44b6 100755
--- a/data/mapHeaders/fuchsiahouse2.asm
+++ b/data/mapHeaders/fuchsiahouse2.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
+FuchsiaHouse2_h:
db LAB ; tileset
db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x)
dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/fuchsiahouse3.asm b/data/mapHeaders/fuchsiahouse3.asm
index 92b4d96d..e52b6b8a 100755
--- a/data/mapHeaders/fuchsiahouse3.asm
+++ b/data/mapHeaders/fuchsiahouse3.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
+FuchsiaHouse3_h:
db SHIP ; tileset
db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x)
dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/fuchsiamart.asm b/data/mapHeaders/fuchsiamart.asm
index a9f00150..dcdfe8c7 100755
--- a/data/mapHeaders/fuchsiamart.asm
+++ b/data/mapHeaders/fuchsiamart.asm
@@ -1,4 +1,4 @@
-FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
+FuchsiaMart_h:
db MART ; tileset
db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/fuchsiameetingroom.asm b/data/mapHeaders/fuchsiameetingroom.asm
index 48d4c7fc..b44acf29 100755
--- a/data/mapHeaders/fuchsiameetingroom.asm
+++ b/data/mapHeaders/fuchsiameetingroom.asm
@@ -1,4 +1,4 @@
-FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
+FuchsiaMeetingRoom_h:
db LAB ; tileset
db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/fuchsiapokecenter.asm b/data/mapHeaders/fuchsiapokecenter.asm
index aec7f455..dc6f1e6b 100755
--- a/data/mapHeaders/fuchsiapokecenter.asm
+++ b/data/mapHeaders/fuchsiapokecenter.asm
@@ -1,4 +1,4 @@
-FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
+FuchsiaPokecenter_h:
db POKECENTER ; tileset
db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm
index 5b1a1f98..792c4b32 100755
--- a/data/mapHeaders/gary.asm
+++ b/data/mapHeaders/gary.asm
@@ -1,4 +1,4 @@
-Gary_h: ; 75f11 (1d:5f11)
+Gary_h:
db GYM ;tileset
db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width
dw GaryBlocks, GaryTextPointers, GaryScript
diff --git a/data/mapHeaders/halloffameroom.asm b/data/mapHeaders/halloffameroom.asm
index 63cd6419..a90464a8 100755
--- a/data/mapHeaders/halloffameroom.asm
+++ b/data/mapHeaders/halloffameroom.asm
@@ -1,4 +1,4 @@
-HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
+HallofFameRoom_h:
db GYM ; tileset
db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/indigoplateau.asm b/data/mapHeaders/indigoplateau.asm
index 87c37501..deaf5041 100755
--- a/data/mapHeaders/indigoplateau.asm
+++ b/data/mapHeaders/indigoplateau.asm
@@ -1,4 +1,4 @@
-IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
+IndigoPlateau_h:
db PLATEAU ; tileset
db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x)
dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/indigoplateaulobby.asm b/data/mapHeaders/indigoplateaulobby.asm
index d0e056ac..4cf92d82 100755
--- a/data/mapHeaders/indigoplateaulobby.asm
+++ b/data/mapHeaders/indigoplateaulobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174)
+IndigoPlateauLobby_h:
db MART ; tileset
db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/lab1.asm b/data/mapHeaders/lab1.asm
index 512373c4..d0e976e7 100755
--- a/data/mapHeaders/lab1.asm
+++ b/data/mapHeaders/lab1.asm
@@ -1,4 +1,4 @@
-Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167)
+Lab1_h:
db LAB ; tileset
db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x)
dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/lab2.asm b/data/mapHeaders/lab2.asm
index a3c2ccf6..75cbcf1f 100755
--- a/data/mapHeaders/lab2.asm
+++ b/data/mapHeaders/lab2.asm
@@ -1,4 +1,4 @@
-Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
+Lab2_h:
db LAB ; tileset
db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x)
dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/lab3.asm b/data/mapHeaders/lab3.asm
index c9709e83..9af39022 100755
--- a/data/mapHeaders/lab3.asm
+++ b/data/mapHeaders/lab3.asm
@@ -1,4 +1,4 @@
-Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
+Lab3_h:
db LAB ; tileset
db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x)
dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/lab4.asm b/data/mapHeaders/lab4.asm
index 82ced4a3..e0b23c7d 100755
--- a/data/mapHeaders/lab4.asm
+++ b/data/mapHeaders/lab4.asm
@@ -1,4 +1,4 @@
-Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
+Lab4_h:
db LAB ; tileset
db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x)
dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/lance.asm b/data/mapHeaders/lance.asm
index 464fd0d7..13b2a343 100755
--- a/data/mapHeaders/lance.asm
+++ b/data/mapHeaders/lance.asm
@@ -1,4 +1,4 @@
-Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
+Lance_h:
db DOJO ; tileset
db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/lavenderhouse1.asm b/data/mapHeaders/lavenderhouse1.asm
index e9531fff..f1750dc0 100755
--- a/data/mapHeaders/lavenderhouse1.asm
+++ b/data/mapHeaders/lavenderhouse1.asm
@@ -1,4 +1,4 @@
-LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
+LavenderHouse1_h:
db HOUSE ; tileset
db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x)
dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/lavenderhouse2.asm b/data/mapHeaders/lavenderhouse2.asm
index ea6c00c1..449ccf07 100755
--- a/data/mapHeaders/lavenderhouse2.asm
+++ b/data/mapHeaders/lavenderhouse2.asm
@@ -1,4 +1,4 @@
-LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
+LavenderHouse2_h:
db HOUSE ; tileset
db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x)
dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/lavendermart.asm b/data/mapHeaders/lavendermart.asm
index 95f448e5..e2bd0c9c 100755
--- a/data/mapHeaders/lavendermart.asm
+++ b/data/mapHeaders/lavendermart.asm
@@ -1,4 +1,4 @@
-LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
+LavenderMart_h:
db MART ; tileset
db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/lavenderpokecenter.asm b/data/mapHeaders/lavenderpokecenter.asm
index ce6630bf..c0d41294 100755
--- a/data/mapHeaders/lavenderpokecenter.asm
+++ b/data/mapHeaders/lavenderpokecenter.asm
@@ -1,4 +1,4 @@
-LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
+LavenderPokecenter_h:
db POKECENTER ; tileset
db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/lavendertown.asm b/data/mapHeaders/lavendertown.asm
index 72952d41..74bbd7a8 100755
--- a/data/mapHeaders/lavendertown.asm
+++ b/data/mapHeaders/lavendertown.asm
@@ -1,4 +1,4 @@
-LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4)
+LavenderTown_h:
db OVERWORLD ; tileset
db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x)
dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/lorelei.asm b/data/mapHeaders/lorelei.asm
index e1261c3e..634435d3 100755
--- a/data/mapHeaders/lorelei.asm
+++ b/data/mapHeaders/lorelei.asm
@@ -1,4 +1,4 @@
-Lorelei_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
+Lorelei_h:
db GYM ; tileset
db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/mansion1.asm b/data/mapHeaders/mansion1.asm
index e7110698..46b0a83e 100755
--- a/data/mapHeaders/mansion1.asm
+++ b/data/mapHeaders/mansion1.asm
@@ -1,4 +1,4 @@
-Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
+Mansion1_h:
db FACILITY ; tileset
db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x)
dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/mansion2.asm b/data/mapHeaders/mansion2.asm
index e888b243..ee4b570c 100755
--- a/data/mapHeaders/mansion2.asm
+++ b/data/mapHeaders/mansion2.asm
@@ -1,4 +1,4 @@
-Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214)
+Mansion2_h:
db FACILITY ; tileset
db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x)
dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/mansion3.asm b/data/mapHeaders/mansion3.asm
index a1b6c95f..97074347 100755
--- a/data/mapHeaders/mansion3.asm
+++ b/data/mapHeaders/mansion3.asm
@@ -1,4 +1,4 @@
-Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215)
+Mansion3_h:
db FACILITY ; tileset
db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x)
dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/mansion4.asm b/data/mapHeaders/mansion4.asm
index 63f138e7..45b1636a 100755
--- a/data/mapHeaders/mansion4.asm
+++ b/data/mapHeaders/mansion4.asm
@@ -1,4 +1,4 @@
-Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216)
+Mansion4_h:
db FACILITY ; tileset
db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x)
dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/mtmoon1.asm b/data/mapHeaders/mtmoon1.asm
index f5b52f37..da64b667 100755
--- a/data/mapHeaders/mtmoon1.asm
+++ b/data/mapHeaders/mtmoon1.asm
@@ -1,4 +1,4 @@
-MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
+MtMoon1_h:
db CAVERN ; tileset
db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x)
dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/mtmoon2.asm b/data/mapHeaders/mtmoon2.asm
index 5e53bc20..7121c33e 100755
--- a/data/mapHeaders/mtmoon2.asm
+++ b/data/mapHeaders/mtmoon2.asm
@@ -1,4 +1,4 @@
-MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
+MtMoon2_h:
db CAVERN ; tileset
db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x)
dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/mtmoon3.asm b/data/mapHeaders/mtmoon3.asm
index 95331007..643eb95d 100755
--- a/data/mapHeaders/mtmoon3.asm
+++ b/data/mapHeaders/mtmoon3.asm
@@ -1,4 +1,4 @@
-MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
+MtMoon3_h:
db CAVERN ; tileset
db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x)
dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/mtmoonpokecenter.asm b/data/mapHeaders/mtmoonpokecenter.asm
index 52f002cc..ba82c478 100755
--- a/data/mapHeaders/mtmoonpokecenter.asm
+++ b/data/mapHeaders/mtmoonpokecenter.asm
@@ -1,4 +1,4 @@
-MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68)
+MtMoonPokecenter_h:
db POKECENTER ; tileset
db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/museum1f.asm b/data/mapHeaders/museum1f.asm
index dacdb50e..10611513 100755
--- a/data/mapHeaders/museum1f.asm
+++ b/data/mapHeaders/museum1f.asm
@@ -1,4 +1,4 @@
-Museum1F_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
+Museum1F_h:
db MUSEUM ; tileset
db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/museum2f.asm b/data/mapHeaders/museum2f.asm
index 15997573..62f9f7ca 100755
--- a/data/mapHeaders/museum2f.asm
+++ b/data/mapHeaders/museum2f.asm
@@ -1,4 +1,4 @@
-Museum2F_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
+Museum2F_h:
db MUSEUM ; tileset
db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/namerater.asm b/data/mapHeaders/namerater.asm
index f43493d4..3fdef0d7 100755
--- a/data/mapHeaders/namerater.asm
+++ b/data/mapHeaders/namerater.asm
@@ -1,4 +1,4 @@
-NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
+NameRater_h:
db HOUSE ; tileset
db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/oakslab.asm b/data/mapHeaders/oakslab.asm
index ab41ef4d..ba2c9d22 100755
--- a/data/mapHeaders/oakslab.asm
+++ b/data/mapHeaders/oakslab.asm
@@ -1,4 +1,4 @@
-OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
+OaksLab_h:
db DOJO ; tileset
db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm
index 5ad13aea..a957314c 100755
--- a/data/mapHeaders/pallettown.asm
+++ b/data/mapHeaders/pallettown.asm
@@ -1,4 +1,4 @@
-PalletTown_h: ; 182a1 (6:42a1)
+PalletTown_h:
db OVERWORLD ; tileset
db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions
dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript
diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm
index 69c5d978..ff5bd7b9 100755
--- a/data/mapHeaders/pewtercity.asm
+++ b/data/mapHeaders/pewtercity.asm
@@ -1,4 +1,4 @@
-PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
+PewterCity_h:
db OVERWORLD ; tileset
db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/pewtergym.asm b/data/mapHeaders/pewtergym.asm
index ac159b16..8eee73b3 100755
--- a/data/mapHeaders/pewtergym.asm
+++ b/data/mapHeaders/pewtergym.asm
@@ -1,4 +1,4 @@
-PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
+PewterGym_h:
db GYM ; tileset
db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/pewterhouse1.asm b/data/mapHeaders/pewterhouse1.asm
index b9d11d98..40209926 100755
--- a/data/mapHeaders/pewterhouse1.asm
+++ b/data/mapHeaders/pewterhouse1.asm
@@ -1,4 +1,4 @@
-PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
+PewterHouse1_h:
db HOUSE ; tileset
db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x)
dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/pewterhouse2.asm b/data/mapHeaders/pewterhouse2.asm
index abcb409b..25fc3e9d 100755
--- a/data/mapHeaders/pewterhouse2.asm
+++ b/data/mapHeaders/pewterhouse2.asm
@@ -1,4 +1,4 @@
-PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
+PewterHouse2_h:
db HOUSE ; tileset
db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x)
dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/pewtermart.asm b/data/mapHeaders/pewtermart.asm
index 673dc1cf..02481bfc 100755
--- a/data/mapHeaders/pewtermart.asm
+++ b/data/mapHeaders/pewtermart.asm
@@ -1,4 +1,4 @@
-PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56)
+PewterMart_h:
db MART ; tileset
db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/pewterpokecenter.asm b/data/mapHeaders/pewterpokecenter.asm
index 4fd426c5..f3abc838 100755
--- a/data/mapHeaders/pewterpokecenter.asm
+++ b/data/mapHeaders/pewterpokecenter.asm
@@ -1,4 +1,4 @@
-PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58)
+PewterPokecenter_h:
db POKECENTER ; tileset
db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/pokemontower1.asm b/data/mapHeaders/pokemontower1.asm
index d7c2849e..9a799d73 100755
--- a/data/mapHeaders/pokemontower1.asm
+++ b/data/mapHeaders/pokemontower1.asm
@@ -1,4 +1,4 @@
-PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
+PokemonTower1_h:
db CEMETERY ; tileset
db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x)
dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/pokemontower2.asm b/data/mapHeaders/pokemontower2.asm
index 30493d08..a2c395c9 100755
--- a/data/mapHeaders/pokemontower2.asm
+++ b/data/mapHeaders/pokemontower2.asm
@@ -1,4 +1,4 @@
-PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143)
+PokemonTower2_h:
db CEMETERY ; tileset
db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x)
dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/pokemontower3.asm b/data/mapHeaders/pokemontower3.asm
index bb3f2318..af81c9e6 100755
--- a/data/mapHeaders/pokemontower3.asm
+++ b/data/mapHeaders/pokemontower3.asm
@@ -1,4 +1,4 @@
-PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144)
+PokemonTower3_h:
db CEMETERY ; tileset
db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x)
dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/pokemontower4.asm b/data/mapHeaders/pokemontower4.asm
index bf405a76..073c34c0 100755
--- a/data/mapHeaders/pokemontower4.asm
+++ b/data/mapHeaders/pokemontower4.asm
@@ -1,4 +1,4 @@
-PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145)
+PokemonTower4_h:
db CEMETERY ; tileset
db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x)
dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/pokemontower5.asm b/data/mapHeaders/pokemontower5.asm
index 662c32d2..a7636534 100755
--- a/data/mapHeaders/pokemontower5.asm
+++ b/data/mapHeaders/pokemontower5.asm
@@ -1,4 +1,4 @@
-PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
+PokemonTower5_h:
db CEMETERY ; tileset
db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x)
dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/pokemontower6.asm b/data/mapHeaders/pokemontower6.asm
index a6d0ff9d..a83ae0ba 100755
--- a/data/mapHeaders/pokemontower6.asm
+++ b/data/mapHeaders/pokemontower6.asm
@@ -1,4 +1,4 @@
-PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
+PokemonTower6_h:
db CEMETERY ; tileset
db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x)
dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/pokemontower7.asm b/data/mapHeaders/pokemontower7.asm
index c366006b..4e13bcee 100755
--- a/data/mapHeaders/pokemontower7.asm
+++ b/data/mapHeaders/pokemontower7.asm
@@ -1,4 +1,4 @@
-PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148)
+PokemonTower7_h:
db CEMETERY ; tileset
db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x)
dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/powerplant.asm b/data/mapHeaders/powerplant.asm
index 36c07d3f..9c78311d 100755
--- a/data/mapHeaders/powerplant.asm
+++ b/data/mapHeaders/powerplant.asm
@@ -1,4 +1,4 @@
-PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
+PowerPlant_h:
db FACILITY ; tileset
db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm
index 02dcc082..82d83042 100755
--- a/data/mapHeaders/redshouse1f.asm
+++ b/data/mapHeaders/redshouse1f.asm
@@ -1,4 +1,4 @@
-RedsHouse1F_h: ; 4815c (12:415c)
+RedsHouse1F_h:
db REDS_HOUSE_1 ; tileset
db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions
dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript
diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm
index 6b72d7db..c4b0969c 100755
--- a/data/mapHeaders/redshouse2f.asm
+++ b/data/mapHeaders/redshouse2f.asm
@@ -1,4 +1,4 @@
-RedsHouse2F_h: ; 5c0a4 (17:40a4)
+RedsHouse2F_h:
db REDS_HOUSE_2 ; tileset
db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions
dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript
diff --git a/data/mapHeaders/rockethideout1.asm b/data/mapHeaders/rockethideout1.asm
index 9af33f1d..a9dcf424 100755
--- a/data/mapHeaders/rockethideout1.asm
+++ b/data/mapHeaders/rockethideout1.asm
@@ -1,4 +1,4 @@
-RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
+RocketHideout1_h:
db FACILITY ; tileset
db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x)
dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/rockethideout2.asm b/data/mapHeaders/rockethideout2.asm
index b4629ccb..8f034360 100755
--- a/data/mapHeaders/rockethideout2.asm
+++ b/data/mapHeaders/rockethideout2.asm
@@ -1,4 +1,4 @@
-RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
+RocketHideout2_h:
db FACILITY ; tileset
db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x)
dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/rockethideout3.asm b/data/mapHeaders/rockethideout3.asm
index 1ec94195..5fc9fb95 100755
--- a/data/mapHeaders/rockethideout3.asm
+++ b/data/mapHeaders/rockethideout3.asm
@@ -1,4 +1,4 @@
-RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
+RocketHideout3_h:
db FACILITY ; tileset
db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x)
dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/rockethideout4.asm b/data/mapHeaders/rockethideout4.asm
index 9ee9ec58..0cde5bee 100755
--- a/data/mapHeaders/rockethideout4.asm
+++ b/data/mapHeaders/rockethideout4.asm
@@ -1,4 +1,4 @@
-RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
+RocketHideout4_h:
db FACILITY ; tileset
db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x)
dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/rockethideoutelevator.asm b/data/mapHeaders/rockethideoutelevator.asm
index 209c2ba8..d4917812 100755
--- a/data/mapHeaders/rockethideoutelevator.asm
+++ b/data/mapHeaders/rockethideoutelevator.asm
@@ -1,4 +1,4 @@
-RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
+RocketHideoutElevator_h:
db LOBBY ; tileset
db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/rocktunnel1.asm b/data/mapHeaders/rocktunnel1.asm
index cc734b28..db67517d 100755
--- a/data/mapHeaders/rocktunnel1.asm
+++ b/data/mapHeaders/rocktunnel1.asm
@@ -1,4 +1,4 @@
-RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
+RockTunnel1_h:
db CAVERN ; tileset
db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x)
dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/rocktunnel2.asm b/data/mapHeaders/rocktunnel2.asm
index ec43cddc..5b85701b 100755
--- a/data/mapHeaders/rocktunnel2.asm
+++ b/data/mapHeaders/rocktunnel2.asm
@@ -1,4 +1,4 @@
-RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
+RockTunnel2_h:
db CAVERN ; tileset
db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x)
dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/rocktunnelpokecenter.asm b/data/mapHeaders/rocktunnelpokecenter.asm
index 390cc20e..e1bad3bd 100755
--- a/data/mapHeaders/rocktunnelpokecenter.asm
+++ b/data/mapHeaders/rocktunnelpokecenter.asm
@@ -1,4 +1,4 @@
-RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
+RockTunnelPokecenter_h:
db POKECENTER ; tileset
db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route1.asm b/data/mapHeaders/route1.asm
index 6a8db0c4..5f6a858e 100755
--- a/data/mapHeaders/route1.asm
+++ b/data/mapHeaders/route1.asm
@@ -1,4 +1,4 @@
-Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12)
+Route1_h:
db OVERWORLD ; tileset
db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x)
dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route10.asm b/data/mapHeaders/route10.asm
index fab0e4a5..7ee588cf 100755
--- a/data/mapHeaders/route10.asm
+++ b/data/mapHeaders/route10.asm
@@ -1,4 +1,4 @@
-Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21)
+Route10_h:
db OVERWORLD ; tileset
db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x)
dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route11.asm b/data/mapHeaders/route11.asm
index 66c54bbe..04ae8f24 100755
--- a/data/mapHeaders/route11.asm
+++ b/data/mapHeaders/route11.asm
@@ -1,4 +1,4 @@
-Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22)
+Route11_h:
db OVERWORLD ; tileset
db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x)
dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route11gate.asm b/data/mapHeaders/route11gate.asm
index 56b9381c..26539a19 100755
--- a/data/mapHeaders/route11gate.asm
+++ b/data/mapHeaders/route11gate.asm
@@ -1,4 +1,4 @@
-Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
+Route11Gate_h:
db GATE ; tileset
db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route11gateupstairs.asm b/data/mapHeaders/route11gateupstairs.asm
index 3428de6a..ac556804 100755
--- a/data/mapHeaders/route11gateupstairs.asm
+++ b/data/mapHeaders/route11gateupstairs.asm
@@ -1,4 +1,4 @@
-Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
+Route11GateUpstairs_h:
db GATE ; tileset
db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm
index 6132a244..b11e0128 100755
--- a/data/mapHeaders/route12.asm
+++ b/data/mapHeaders/route12.asm
@@ -1,4 +1,4 @@
-Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23)
+Route12_h:
db OVERWORLD ; tileset
db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route12gate.asm b/data/mapHeaders/route12gate.asm
index 0afcf06b..bcd36d73 100755
--- a/data/mapHeaders/route12gate.asm
+++ b/data/mapHeaders/route12gate.asm
@@ -1,4 +1,4 @@
-Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
+Route12Gate_h:
db GATE ; tileset
db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route12gateupstairs.asm b/data/mapHeaders/route12gateupstairs.asm
index acad7e9f..96109a38 100755
--- a/data/mapHeaders/route12gateupstairs.asm
+++ b/data/mapHeaders/route12gateupstairs.asm
@@ -1,4 +1,4 @@
-Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
+Route12GateUpstairs_h:
db GATE ; tileset
db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route12house.asm b/data/mapHeaders/route12house.asm
index 0116270c..11f45d24 100755
--- a/data/mapHeaders/route12house.asm
+++ b/data/mapHeaders/route12house.asm
@@ -1,4 +1,4 @@
-Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
+Route12House_h:
db HOUSE ; tileset
db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x)
dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route13.asm b/data/mapHeaders/route13.asm
index 9a821208..53a88633 100755
--- a/data/mapHeaders/route13.asm
+++ b/data/mapHeaders/route13.asm
@@ -1,4 +1,4 @@
-Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24)
+Route13_h:
db OVERWORLD ; tileset
db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x)
dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route14.asm b/data/mapHeaders/route14.asm
index e4163126..f860d332 100755
--- a/data/mapHeaders/route14.asm
+++ b/data/mapHeaders/route14.asm
@@ -1,4 +1,4 @@
-Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25)
+Route14_h:
db OVERWORLD ; tileset
db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x)
dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route15.asm b/data/mapHeaders/route15.asm
index 6d2e8859..48d5ff20 100755
--- a/data/mapHeaders/route15.asm
+++ b/data/mapHeaders/route15.asm
@@ -1,4 +1,4 @@
-Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26)
+Route15_h:
db OVERWORLD ; tileset
db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x)
dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route15gate.asm b/data/mapHeaders/route15gate.asm
index 55ee5cc9..072d8f72 100755
--- a/data/mapHeaders/route15gate.asm
+++ b/data/mapHeaders/route15gate.asm
@@ -1,4 +1,4 @@
-Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
+Route15Gate_h:
db GATE ; tileset
db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm
index 0687ab28..96e7e2ca 100755
--- a/data/mapHeaders/route15gateupstairs.asm
+++ b/data/mapHeaders/route15gateupstairs.asm
@@ -1,4 +1,4 @@
-Route15GateUpstairs_h: ; 4963e (12:563e)
+Route15GateUpstairs_h:
db GATE ; tileset
db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route16.asm b/data/mapHeaders/route16.asm
index 42678ed3..eee71ba2 100755
--- a/data/mapHeaders/route16.asm
+++ b/data/mapHeaders/route16.asm
@@ -1,4 +1,4 @@
-Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27)
+Route16_h:
db OVERWORLD ; tileset
db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x)
dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route16gate.asm b/data/mapHeaders/route16gate.asm
index a155125e..b3381258 100755
--- a/data/mapHeaders/route16gate.asm
+++ b/data/mapHeaders/route16gate.asm
@@ -1,4 +1,4 @@
-Route16Gate_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
+Route16Gate_h:
db GATE ; tileset
db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route16gateupstairs.asm b/data/mapHeaders/route16gateupstairs.asm
index 878c4eca..e8dd7d45 100755
--- a/data/mapHeaders/route16gateupstairs.asm
+++ b/data/mapHeaders/route16gateupstairs.asm
@@ -1,4 +1,4 @@
-Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
+Route16GateUpstairs_h:
db GATE ; tileset
db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route16house.asm b/data/mapHeaders/route16house.asm
index c3649b84..5945e11b 100755
--- a/data/mapHeaders/route16house.asm
+++ b/data/mapHeaders/route16house.asm
@@ -1,4 +1,4 @@
-Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
+Route16House_h:
db HOUSE ; tileset
db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x)
dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route17.asm b/data/mapHeaders/route17.asm
index 577fe009..82a5d0f4 100755
--- a/data/mapHeaders/route17.asm
+++ b/data/mapHeaders/route17.asm
@@ -1,4 +1,4 @@
-Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28)
+Route17_h:
db OVERWORLD ; tileset
db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x)
dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm
index 8fb1b3bc..180111b5 100755
--- a/data/mapHeaders/route18.asm
+++ b/data/mapHeaders/route18.asm
@@ -1,4 +1,4 @@
-Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29)
+Route18_h:
db OVERWORLD ; tileset
db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x)
dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route18gate.asm b/data/mapHeaders/route18gate.asm
index a0e463e8..090d43df 100755
--- a/data/mapHeaders/route18gate.asm
+++ b/data/mapHeaders/route18gate.asm
@@ -1,4 +1,4 @@
-Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
+Route18Gate_h:
db GATE ; tileset
db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route18gateupstairs.asm b/data/mapHeaders/route18gateupstairs.asm
index 2043c2ef..ac9e3d0a 100755
--- a/data/mapHeaders/route18gateupstairs.asm
+++ b/data/mapHeaders/route18gateupstairs.asm
@@ -1,4 +1,4 @@
-Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
+Route18GateUpstairs_h:
db GATE ; tileset
db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route19.asm b/data/mapHeaders/route19.asm
index 2ca85cc1..1de353f8 100755
--- a/data/mapHeaders/route19.asm
+++ b/data/mapHeaders/route19.asm
@@ -1,4 +1,4 @@
-Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30)
+Route19_h:
db OVERWORLD ; tileset
db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x)
dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm
index 564f4a58..38e80842 100755
--- a/data/mapHeaders/route2.asm
+++ b/data/mapHeaders/route2.asm
@@ -1,4 +1,4 @@
-Route2_h: ; 54000 (15:4000)
+Route2_h:
db 00 ; Tileset
db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles)
dw Route2Blocks, Route2TextPointers, Route2Script
diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm
index d4f645d8..f871179f 100755
--- a/data/mapHeaders/route20.asm
+++ b/data/mapHeaders/route20.asm
@@ -1,4 +1,4 @@
-Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31)
+Route20_h:
db OVERWORLD ; tileset
db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x)
dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm
index 7f3e0a2f..a2c06868 100755
--- a/data/mapHeaders/route21.asm
+++ b/data/mapHeaders/route21.asm
@@ -1,4 +1,4 @@
-Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32)
+Route21_h:
db OVERWORLD ; tileset
db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x)
dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route22.asm b/data/mapHeaders/route22.asm
index 598e9224..c227d433 100755
--- a/data/mapHeaders/route22.asm
+++ b/data/mapHeaders/route22.asm
@@ -1,4 +1,4 @@
-Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33)
+Route22_h:
db OVERWORLD ; tileset
db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x)
dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route22gate.asm b/data/mapHeaders/route22gate.asm
index 3daa30a3..7b8963ba 100755
--- a/data/mapHeaders/route22gate.asm
+++ b/data/mapHeaders/route22gate.asm
@@ -1,4 +1,4 @@
-Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
+Route22Gate_h:
db GATE ; tileset
db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route23.asm b/data/mapHeaders/route23.asm
index 32dc36fd..bec192c2 100755
--- a/data/mapHeaders/route23.asm
+++ b/data/mapHeaders/route23.asm
@@ -1,4 +1,4 @@
-Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34)
+Route23_h:
db PLATEAU ; tileset
db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x)
dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route24.asm b/data/mapHeaders/route24.asm
index a445c144..9a313aba 100755
--- a/data/mapHeaders/route24.asm
+++ b/data/mapHeaders/route24.asm
@@ -1,4 +1,4 @@
-Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35)
+Route24_h:
db OVERWORLD ; tileset
db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x)
dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route25.asm b/data/mapHeaders/route25.asm
index a6e62a00..39ffa45d 100755
--- a/data/mapHeaders/route25.asm
+++ b/data/mapHeaders/route25.asm
@@ -1,4 +1,4 @@
-Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36)
+Route25_h:
db OVERWORLD ; tileset
db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x)
dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route2gate.asm b/data/mapHeaders/route2gate.asm
index 343c0f09..5cb7bcbc 100755
--- a/data/mapHeaders/route2gate.asm
+++ b/data/mapHeaders/route2gate.asm
@@ -1,4 +1,4 @@
-Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
+Route2Gate_h:
db GATE ; tileset
db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route2house.asm b/data/mapHeaders/route2house.asm
index f99a365d..c7c140f6 100755
--- a/data/mapHeaders/route2house.asm
+++ b/data/mapHeaders/route2house.asm
@@ -1,4 +1,4 @@
-Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
+Route2House_h:
db HOUSE ; tileset
db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x)
dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route3.asm b/data/mapHeaders/route3.asm
index 0003b90a..19adfea8 100755
--- a/data/mapHeaders/route3.asm
+++ b/data/mapHeaders/route3.asm
@@ -1,4 +1,4 @@
-Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14)
+Route3_h:
db OVERWORLD ; tileset
db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x)
dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm
index 6e8724c9..a322f23c 100755
--- a/data/mapHeaders/route4.asm
+++ b/data/mapHeaders/route4.asm
@@ -1,4 +1,4 @@
-Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15)
+Route4_h:
db OVERWORLD ; tileset
db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x)
dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts
diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm
index 1b8c3ee1..b982c02d 100755
--- a/data/mapHeaders/route5.asm
+++ b/data/mapHeaders/route5.asm
@@ -1,4 +1,4 @@
-Route5_h: ; 0x54589 to 0x545ab (34 bytes) (id=16)
+Route5_h:
db OVERWORLD ; tileset
db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route5gate.asm b/data/mapHeaders/route5gate.asm
index 79a44874..68810da1 100755
--- a/data/mapHeaders/route5gate.asm
+++ b/data/mapHeaders/route5gate.asm
@@ -1,4 +1,4 @@
-Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
+Route5Gate_h:
db GATE ; tileset
db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route6.asm b/data/mapHeaders/route6.asm
index 21dd0872..6ed13d4e 100755
--- a/data/mapHeaders/route6.asm
+++ b/data/mapHeaders/route6.asm
@@ -1,4 +1,4 @@
-Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17)
+Route6_h:
db OVERWORLD ; tileset
db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x)
dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route6gate.asm b/data/mapHeaders/route6gate.asm
index 3bafb448..f689240c 100755
--- a/data/mapHeaders/route6gate.asm
+++ b/data/mapHeaders/route6gate.asm
@@ -1,4 +1,4 @@
-Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
+Route6Gate_h:
db GATE ; tileset
db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route7.asm b/data/mapHeaders/route7.asm
index 38fd1e15..62f3bedf 100755
--- a/data/mapHeaders/route7.asm
+++ b/data/mapHeaders/route7.asm
@@ -1,4 +1,4 @@
-Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18)
+Route7_h:
db OVERWORLD ; tileset
db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x)
dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route7gate.asm b/data/mapHeaders/route7gate.asm
index b5d26672..9e01914f 100755
--- a/data/mapHeaders/route7gate.asm
+++ b/data/mapHeaders/route7gate.asm
@@ -1,4 +1,4 @@
-Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
+Route7Gate_h:
db GATE ; tileset
db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route8.asm b/data/mapHeaders/route8.asm
index 14c867ea..5187fd8f 100755
--- a/data/mapHeaders/route8.asm
+++ b/data/mapHeaders/route8.asm
@@ -1,4 +1,4 @@
-Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19)
+Route8_h:
db OVERWORLD ; tileset
db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x)
dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/route8gate.asm b/data/mapHeaders/route8gate.asm
index 2bd505a2..d206e978 100755
--- a/data/mapHeaders/route8gate.asm
+++ b/data/mapHeaders/route8gate.asm
@@ -1,4 +1,4 @@
-Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
+Route8Gate_h:
db GATE ; tileset
db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/route9.asm b/data/mapHeaders/route9.asm
index 30982dd4..044a4ec0 100755
--- a/data/mapHeaders/route9.asm
+++ b/data/mapHeaders/route9.asm
@@ -1,4 +1,4 @@
-Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20)
+Route9_h:
db OVERWORLD ; tileset
db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x)
dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizonecenter.asm b/data/mapHeaders/safarizonecenter.asm
index a1388fa1..6da27c12 100755
--- a/data/mapHeaders/safarizonecenter.asm
+++ b/data/mapHeaders/safarizonecenter.asm
@@ -1,4 +1,4 @@
-SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
+SafariZoneCenter_h:
db FOREST ; tileset
db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizoneeast.asm b/data/mapHeaders/safarizoneeast.asm
index dec95d2a..089620dc 100755
--- a/data/mapHeaders/safarizoneeast.asm
+++ b/data/mapHeaders/safarizoneeast.asm
@@ -1,4 +1,4 @@
-SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
+SafariZoneEast_h:
db FOREST ; tileset
db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizoneentrance.asm b/data/mapHeaders/safarizoneentrance.asm
index e7340c4a..1122d5a3 100755
--- a/data/mapHeaders/safarizoneentrance.asm
+++ b/data/mapHeaders/safarizoneentrance.asm
@@ -1,4 +1,4 @@
-SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
+SafariZoneEntrance_h:
db GATE ; tileset
db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x)
dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizonenorth.asm b/data/mapHeaders/safarizonenorth.asm
index 310ead4c..a3a46769 100755
--- a/data/mapHeaders/safarizonenorth.asm
+++ b/data/mapHeaders/safarizonenorth.asm
@@ -1,4 +1,4 @@
-SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
+SafariZoneNorth_h:
db FOREST ; tileset
db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizoneresthouse1.asm b/data/mapHeaders/safarizoneresthouse1.asm
index f788b6c4..b2988b47 100755
--- a/data/mapHeaders/safarizoneresthouse1.asm
+++ b/data/mapHeaders/safarizoneresthouse1.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
+SafariZoneRestHouse1_h:
db GATE ; tileset
db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x)
dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizoneresthouse2.asm b/data/mapHeaders/safarizoneresthouse2.asm
index 5ccdb947..589d9850 100755
--- a/data/mapHeaders/safarizoneresthouse2.asm
+++ b/data/mapHeaders/safarizoneresthouse2.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
+SafariZoneRestHouse2_h:
db GATE ; tileset
db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x)
dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizoneresthouse3.asm b/data/mapHeaders/safarizoneresthouse3.asm
index acf87854..21ffd3b6 100755
--- a/data/mapHeaders/safarizoneresthouse3.asm
+++ b/data/mapHeaders/safarizoneresthouse3.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
+SafariZoneRestHouse3_h:
db GATE ; tileset
db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x)
dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizoneresthouse4.asm b/data/mapHeaders/safarizoneresthouse4.asm
index 8a1ad30f..fa7de7ad 100755
--- a/data/mapHeaders/safarizoneresthouse4.asm
+++ b/data/mapHeaders/safarizoneresthouse4.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
+SafariZoneRestHouse4_h:
db GATE ; tileset
db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x)
dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizonesecrethouse.asm b/data/mapHeaders/safarizonesecrethouse.asm
index 7fa71fe4..6b081b1a 100755
--- a/data/mapHeaders/safarizonesecrethouse.asm
+++ b/data/mapHeaders/safarizonesecrethouse.asm
@@ -1,4 +1,4 @@
-SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
+SafariZoneSecretHouse_h:
db LAB ; tileset
db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/safarizonewest.asm b/data/mapHeaders/safarizonewest.asm
index 590ae21d..c1c54d13 100755
--- a/data/mapHeaders/safarizonewest.asm
+++ b/data/mapHeaders/safarizonewest.asm
@@ -1,4 +1,4 @@
-SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
+SafariZoneWest_h:
db FOREST ; tileset
db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/saffroncity.asm b/data/mapHeaders/saffroncity.asm
index 3a39b396..8f4ea922 100755
--- a/data/mapHeaders/saffroncity.asm
+++ b/data/mapHeaders/saffroncity.asm
@@ -1,4 +1,4 @@
-SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10)
+SaffronCity_h:
db OVERWORLD ; tileset
db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x)
dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/saffrongym.asm b/data/mapHeaders/saffrongym.asm
index 23601c75..da3b4c04 100755
--- a/data/mapHeaders/saffrongym.asm
+++ b/data/mapHeaders/saffrongym.asm
@@ -1,4 +1,4 @@
-SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
+SaffronGym_h:
db FACILITY ; tileset
db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/saffronhouse1.asm b/data/mapHeaders/saffronhouse1.asm
index 71cd5395..9e22b03b 100755
--- a/data/mapHeaders/saffronhouse1.asm
+++ b/data/mapHeaders/saffronhouse1.asm
@@ -1,4 +1,4 @@
-SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
+SaffronHouse1_h:
db HOUSE ; tileset
db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x)
dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/saffronhouse2.asm b/data/mapHeaders/saffronhouse2.asm
index a91bcaec..c38d0231 100755
--- a/data/mapHeaders/saffronhouse2.asm
+++ b/data/mapHeaders/saffronhouse2.asm
@@ -1,4 +1,4 @@
-SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
+SaffronHouse2_h:
db HOUSE ; tileset
db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x)
dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/saffronmart.asm b/data/mapHeaders/saffronmart.asm
index 0c6fc1d8..747e4da9 100755
--- a/data/mapHeaders/saffronmart.asm
+++ b/data/mapHeaders/saffronmart.asm
@@ -1,4 +1,4 @@
-SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
+SaffronMart_h:
db MART ; tileset
db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/saffronpokecenter.asm b/data/mapHeaders/saffronpokecenter.asm
index 341b415a..aa972289 100755
--- a/data/mapHeaders/saffronpokecenter.asm
+++ b/data/mapHeaders/saffronpokecenter.asm
@@ -1,4 +1,4 @@
-SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182)
+SaffronPokecenter_h:
db POKECENTER ; tileset
db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/school.asm b/data/mapHeaders/school.asm
index 336ce26e..8ace4fba 100755
--- a/data/mapHeaders/school.asm
+++ b/data/mapHeaders/school.asm
@@ -1,4 +1,4 @@
-School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
+School_h:
db HOUSE ; tileset
db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x)
dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/seafoamislands1.asm b/data/mapHeaders/seafoamislands1.asm
index 8cb1c847..f52a65a8 100755
--- a/data/mapHeaders/seafoamislands1.asm
+++ b/data/mapHeaders/seafoamislands1.asm
@@ -1,4 +1,4 @@
-SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
+SeafoamIslands1_h:
db CAVERN ; tileset
db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x)
dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/seafoamislands2.asm b/data/mapHeaders/seafoamislands2.asm
index 9edbcc72..08ec4bfa 100755
--- a/data/mapHeaders/seafoamislands2.asm
+++ b/data/mapHeaders/seafoamislands2.asm
@@ -1,4 +1,4 @@
-SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
+SeafoamIslands2_h:
db CAVERN ; tileset
db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x)
dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/seafoamislands3.asm b/data/mapHeaders/seafoamislands3.asm
index 6ff1d8ff..4050cd71 100755
--- a/data/mapHeaders/seafoamislands3.asm
+++ b/data/mapHeaders/seafoamislands3.asm
@@ -1,4 +1,4 @@
-SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
+SeafoamIslands3_h:
db CAVERN ; tileset
db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x)
dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/seafoamislands4.asm b/data/mapHeaders/seafoamislands4.asm
index d3b6fca0..d3912ce0 100755
--- a/data/mapHeaders/seafoamislands4.asm
+++ b/data/mapHeaders/seafoamislands4.asm
@@ -1,4 +1,4 @@
-SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
+SeafoamIslands4_h:
db CAVERN ; tileset
db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x)
dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/seafoamislands5.asm b/data/mapHeaders/seafoamislands5.asm
index 330b1d0e..2ae6d4b7 100755
--- a/data/mapHeaders/seafoamislands5.asm
+++ b/data/mapHeaders/seafoamislands5.asm
@@ -1,4 +1,4 @@
-SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
+SeafoamIslands5_h:
db CAVERN ; tileset
db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x)
dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco1.asm b/data/mapHeaders/silphco1.asm
index eecb49b6..203f08b7 100755
--- a/data/mapHeaders/silphco1.asm
+++ b/data/mapHeaders/silphco1.asm
@@ -1,4 +1,4 @@
-SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
+SilphCo1_h:
db FACILITY ; tileset
db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco10.asm b/data/mapHeaders/silphco10.asm
index efef2235..a16a6323 100755
--- a/data/mapHeaders/silphco10.asm
+++ b/data/mapHeaders/silphco10.asm
@@ -1,4 +1,4 @@
-SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
+SilphCo10_h:
db FACILITY ; tileset
db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco11.asm b/data/mapHeaders/silphco11.asm
index 829fc9de..a5d2f1b0 100755
--- a/data/mapHeaders/silphco11.asm
+++ b/data/mapHeaders/silphco11.asm
@@ -1,4 +1,4 @@
-SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
+SilphCo11_h:
db INTERIOR ; tileset
db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco2.asm b/data/mapHeaders/silphco2.asm
index 1f345127..f0783e98 100755
--- a/data/mapHeaders/silphco2.asm
+++ b/data/mapHeaders/silphco2.asm
@@ -1,4 +1,4 @@
-SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
+SilphCo2_h:
db FACILITY ; tileset
db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco3.asm b/data/mapHeaders/silphco3.asm
index 56119f41..b89a3802 100755
--- a/data/mapHeaders/silphco3.asm
+++ b/data/mapHeaders/silphco3.asm
@@ -1,4 +1,4 @@
-SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
+SilphCo3_h:
db FACILITY ; tileset
db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco4.asm b/data/mapHeaders/silphco4.asm
index 3d6289cf..3c03a771 100755
--- a/data/mapHeaders/silphco4.asm
+++ b/data/mapHeaders/silphco4.asm
@@ -1,4 +1,4 @@
-SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
+SilphCo4_h:
db FACILITY ; tileset
db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco5.asm b/data/mapHeaders/silphco5.asm
index aa40ca2f..42704025 100755
--- a/data/mapHeaders/silphco5.asm
+++ b/data/mapHeaders/silphco5.asm
@@ -1,4 +1,4 @@
-SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
+SilphCo5_h:
db FACILITY ; tileset
db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco6.asm b/data/mapHeaders/silphco6.asm
index af9b3d6b..c204360a 100755
--- a/data/mapHeaders/silphco6.asm
+++ b/data/mapHeaders/silphco6.asm
@@ -1,4 +1,4 @@
-SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
+SilphCo6_h:
db FACILITY ; tileset
db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco7.asm b/data/mapHeaders/silphco7.asm
index 335d3b6b..bc31b335 100755
--- a/data/mapHeaders/silphco7.asm
+++ b/data/mapHeaders/silphco7.asm
@@ -1,4 +1,4 @@
-SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
+SilphCo7_h:
db FACILITY ; tileset
db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco8.asm b/data/mapHeaders/silphco8.asm
index 31c9617c..aa3e0317 100755
--- a/data/mapHeaders/silphco8.asm
+++ b/data/mapHeaders/silphco8.asm
@@ -1,4 +1,4 @@
-SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
+SilphCo8_h:
db FACILITY ; tileset
db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphco9.asm b/data/mapHeaders/silphco9.asm
index 1cc8b3f2..97427fa3 100755
--- a/data/mapHeaders/silphco9.asm
+++ b/data/mapHeaders/silphco9.asm
@@ -1,4 +1,4 @@
-SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
+SilphCo9_h:
db FACILITY ; tileset
db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/silphcoelevator.asm b/data/mapHeaders/silphcoelevator.asm
index b8a59b7a..8a6ae1ca 100755
--- a/data/mapHeaders/silphcoelevator.asm
+++ b/data/mapHeaders/silphcoelevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
+SilphCoElevator_h:
db LOBBY ; tileset
db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne1.asm b/data/mapHeaders/ssanne1.asm
index c31de5d4..e6b48564 100755
--- a/data/mapHeaders/ssanne1.asm
+++ b/data/mapHeaders/ssanne1.asm
@@ -1,4 +1,4 @@
-SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
+SSAnne1_h:
db SHIP ; tileset
db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x)
dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne10.asm b/data/mapHeaders/ssanne10.asm
index e0e5c6a7..ef07424b 100755
--- a/data/mapHeaders/ssanne10.asm
+++ b/data/mapHeaders/ssanne10.asm
@@ -1,4 +1,4 @@
-SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
+SSAnne10_h:
db SHIP ; tileset
db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x)
dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne2.asm b/data/mapHeaders/ssanne2.asm
index 50ca0562..cd5f3aa4 100755
--- a/data/mapHeaders/ssanne2.asm
+++ b/data/mapHeaders/ssanne2.asm
@@ -1,4 +1,4 @@
-SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
+SSAnne2_h:
db SHIP ; tileset
db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x)
dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne3.asm b/data/mapHeaders/ssanne3.asm
index acde90a2..ffa57ddd 100755
--- a/data/mapHeaders/ssanne3.asm
+++ b/data/mapHeaders/ssanne3.asm
@@ -1,4 +1,4 @@
-SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
+SSAnne3_h:
db SHIP ; tileset
db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x)
dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne4.asm b/data/mapHeaders/ssanne4.asm
index 7f3e9ab2..492b4b8d 100755
--- a/data/mapHeaders/ssanne4.asm
+++ b/data/mapHeaders/ssanne4.asm
@@ -1,4 +1,4 @@
-SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
+SSAnne4_h:
db SHIP ; tileset
db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x)
dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne5.asm b/data/mapHeaders/ssanne5.asm
index 7da4a6bf..29ffb6b9 100755
--- a/data/mapHeaders/ssanne5.asm
+++ b/data/mapHeaders/ssanne5.asm
@@ -1,4 +1,4 @@
-SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99)
+SSAnne5_h:
db SHIP ; tileset
db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x)
dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne6.asm b/data/mapHeaders/ssanne6.asm
index 6d27509e..e347528a 100755
--- a/data/mapHeaders/ssanne6.asm
+++ b/data/mapHeaders/ssanne6.asm
@@ -1,4 +1,4 @@
-SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100)
+SSAnne6_h:
db SHIP ; tileset
db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x)
dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne7.asm b/data/mapHeaders/ssanne7.asm
index 66da59c0..9b437688 100755
--- a/data/mapHeaders/ssanne7.asm
+++ b/data/mapHeaders/ssanne7.asm
@@ -1,4 +1,4 @@
-SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101)
+SSAnne7_h:
db SHIP ; tileset
db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x)
dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne8.asm b/data/mapHeaders/ssanne8.asm
index dcb12993..64b5c565 100755
--- a/data/mapHeaders/ssanne8.asm
+++ b/data/mapHeaders/ssanne8.asm
@@ -1,4 +1,4 @@
-SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102)
+SSAnne8_h:
db SHIP ; tileset
db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x)
dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/ssanne9.asm b/data/mapHeaders/ssanne9.asm
index 5a293576..c8e6e16f 100755
--- a/data/mapHeaders/ssanne9.asm
+++ b/data/mapHeaders/ssanne9.asm
@@ -1,4 +1,4 @@
-SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103)
+SSAnne9_h:
db SHIP ; tileset
db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x)
dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm
index b9759bbb..09217ff0 100644
--- a/data/mapHeaders/tradecenter.asm
+++ b/data/mapHeaders/tradecenter.asm
@@ -1,4 +1,4 @@
-TradeCenter_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
+TradeCenter_h:
db CLUB ; tileset
db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/undergroundpathentranceroute5.asm b/data/mapHeaders/undergroundpathentranceroute5.asm
index 75e881ba..6e2c5727 100755
--- a/data/mapHeaders/undergroundpathentranceroute5.asm
+++ b/data/mapHeaders/undergroundpathentranceroute5.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
+UndergroundPathEntranceRoute5_h:
db GATE ; tileset
db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x)
dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/undergroundpathentranceroute6.asm b/data/mapHeaders/undergroundpathentranceroute6.asm
index 91835507..bb22e93e 100755
--- a/data/mapHeaders/undergroundpathentranceroute6.asm
+++ b/data/mapHeaders/undergroundpathentranceroute6.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
+UndergroundPathEntranceRoute6_h:
db GATE ; tileset
db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x)
dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/undergroundpathentranceroute7.asm b/data/mapHeaders/undergroundpathentranceroute7.asm
index 1ad53899..49b03415 100755
--- a/data/mapHeaders/undergroundpathentranceroute7.asm
+++ b/data/mapHeaders/undergroundpathentranceroute7.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
+UndergroundPathEntranceRoute7_h:
db GATE ; tileset
db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm
index e5e6cfa0..e12ee454 100755
--- a/data/mapHeaders/undergroundpathentranceroute7copy.asm
+++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d)
+UndergroundPathEntranceRoute7Copy_h:
db GATE ; tileset
db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/undergroundpathentranceroute8.asm b/data/mapHeaders/undergroundpathentranceroute8.asm
index ac6fd87d..c70cb697 100755
--- a/data/mapHeaders/undergroundpathentranceroute8.asm
+++ b/data/mapHeaders/undergroundpathentranceroute8.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80)
+UndergroundPathEntranceRoute8_h:
db GATE ; tileset
db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x)
dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/undergroundpathns.asm b/data/mapHeaders/undergroundpathns.asm
index 78a02053..4dc86647 100755
--- a/data/mapHeaders/undergroundpathns.asm
+++ b/data/mapHeaders/undergroundpathns.asm
@@ -1,4 +1,4 @@
-UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
+UndergroundPathNS_h:
db UNDERGROUND ; tileset
db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x)
dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/undergroundpathwe.asm b/data/mapHeaders/undergroundpathwe.asm
index e5561767..df2f98e1 100755
--- a/data/mapHeaders/undergroundpathwe.asm
+++ b/data/mapHeaders/undergroundpathwe.asm
@@ -1,4 +1,4 @@
-UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
+UndergroundPathWE_h:
db UNDERGROUND ; tileset
db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x)
dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/unknowndungeon1.asm b/data/mapHeaders/unknowndungeon1.asm
index 8bac389a..e784ffac 100755
--- a/data/mapHeaders/unknowndungeon1.asm
+++ b/data/mapHeaders/unknowndungeon1.asm
@@ -1,4 +1,4 @@
-UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
+UnknownDungeon1_h:
db CAVERN ; tileset
db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x)
dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/unknowndungeon2.asm b/data/mapHeaders/unknowndungeon2.asm
index 0bea5b16..3c4c8d4e 100755
--- a/data/mapHeaders/unknowndungeon2.asm
+++ b/data/mapHeaders/unknowndungeon2.asm
@@ -1,4 +1,4 @@
-UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
+UnknownDungeon2_h:
db CAVERN ; tileset
db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x)
dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/unknowndungeon3.asm b/data/mapHeaders/unknowndungeon3.asm
index a29d39dd..2e01c079 100755
--- a/data/mapHeaders/unknowndungeon3.asm
+++ b/data/mapHeaders/unknowndungeon3.asm
@@ -1,4 +1,4 @@
-UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
+UnknownDungeon3_h:
db CAVERN ; tileset
db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x)
dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/vermilioncity.asm b/data/mapHeaders/vermilioncity.asm
index a4118084..c162ab24 100755
--- a/data/mapHeaders/vermilioncity.asm
+++ b/data/mapHeaders/vermilioncity.asm
@@ -1,4 +1,4 @@
-VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
+VermilionCity_h:
db OVERWORLD ; tileset
db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x)
dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/vermiliondock.asm b/data/mapHeaders/vermiliondock.asm
index d8d2993c..16b1c7d8 100755
--- a/data/mapHeaders/vermiliondock.asm
+++ b/data/mapHeaders/vermiliondock.asm
@@ -1,4 +1,4 @@
-VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
+VermilionDock_h:
db SHIP_PORT ; tileset
db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/vermiliongym.asm b/data/mapHeaders/vermiliongym.asm
index 5627257e..7624ed75 100755
--- a/data/mapHeaders/vermiliongym.asm
+++ b/data/mapHeaders/vermiliongym.asm
@@ -1,4 +1,4 @@
-VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
+VermilionGym_h:
db GYM ; tileset
db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/vermilionhouse1.asm b/data/mapHeaders/vermilionhouse1.asm
index 34f99023..94aac1d0 100755
--- a/data/mapHeaders/vermilionhouse1.asm
+++ b/data/mapHeaders/vermilionhouse1.asm
@@ -1,4 +1,4 @@
-VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
+VermilionHouse1_h:
db HOUSE ; tileset
db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x)
dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/vermilionhouse2.asm b/data/mapHeaders/vermilionhouse2.asm
index ce810bb4..b4124088 100755
--- a/data/mapHeaders/vermilionhouse2.asm
+++ b/data/mapHeaders/vermilionhouse2.asm
@@ -1,4 +1,4 @@
-VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
+VermilionHouse2_h:
db HOUSE ; tileset
db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x)
dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/vermilionhouse3.asm b/data/mapHeaders/vermilionhouse3.asm
index 62651a4f..01683532 100755
--- a/data/mapHeaders/vermilionhouse3.asm
+++ b/data/mapHeaders/vermilionhouse3.asm
@@ -1,4 +1,4 @@
-VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
+VermilionHouse3_h:
db HOUSE ; tileset
db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x)
dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/vermilionmart.asm b/data/mapHeaders/vermilionmart.asm
index ecf71946..97fccc4d 100755
--- a/data/mapHeaders/vermilionmart.asm
+++ b/data/mapHeaders/vermilionmart.asm
@@ -1,4 +1,4 @@
-VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
+VermilionMart_h:
db MART ; tileset
db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/vermilionpokecenter.asm b/data/mapHeaders/vermilionpokecenter.asm
index 6033585f..e1a63f9e 100755
--- a/data/mapHeaders/vermilionpokecenter.asm
+++ b/data/mapHeaders/vermilionpokecenter.asm
@@ -1,4 +1,4 @@
-VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
+VermilionPokecenter_h:
db POKECENTER ; tileset
db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/victoryroad1.asm b/data/mapHeaders/victoryroad1.asm
index 972d3866..6d2f4338 100755
--- a/data/mapHeaders/victoryroad1.asm
+++ b/data/mapHeaders/victoryroad1.asm
@@ -1,4 +1,4 @@
-VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
+VictoryRoad1_h:
db CAVERN ; tileset
db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x)
dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/victoryroad2.asm b/data/mapHeaders/victoryroad2.asm
index 3fb24eee..fa9803b2 100755
--- a/data/mapHeaders/victoryroad2.asm
+++ b/data/mapHeaders/victoryroad2.asm
@@ -1,4 +1,4 @@
-VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
+VictoryRoad2_h:
db CAVERN ; tileset
db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x)
dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/victoryroad3.asm b/data/mapHeaders/victoryroad3.asm
index e35c32c1..4202bfb6 100755
--- a/data/mapHeaders/victoryroad3.asm
+++ b/data/mapHeaders/victoryroad3.asm
@@ -1,4 +1,4 @@
-VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
+VictoryRoad3_h:
db CAVERN ; tileset
db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x)
dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts
diff --git a/data/mapHeaders/viridiancity.asm b/data/mapHeaders/viridiancity.asm
index f7faa568..79b19368 100755
--- a/data/mapHeaders/viridiancity.asm
+++ b/data/mapHeaders/viridiancity.asm
@@ -1,4 +1,4 @@
-ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1)
+ViridianCity_h:
db OVERWORLD ; tileset
db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x)
dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/viridianforest.asm b/data/mapHeaders/viridianforest.asm
index 43433c9e..ef7905b0 100755
--- a/data/mapHeaders/viridianforest.asm
+++ b/data/mapHeaders/viridianforest.asm
@@ -1,4 +1,4 @@
-ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51)
+ViridianForest_h:
db FOREST ; tileset
db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/viridianforestentrance.asm b/data/mapHeaders/viridianforestentrance.asm
index 21fdc56b..6e861c58 100755
--- a/data/mapHeaders/viridianforestentrance.asm
+++ b/data/mapHeaders/viridianforestentrance.asm
@@ -1,4 +1,4 @@
-ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
+ViridianForestEntrance_h:
db FOREST_GATE ; tileset
db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x)
dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/viridianforestexit.asm b/data/mapHeaders/viridianforestexit.asm
index 285e6416..8e1dd25e 100755
--- a/data/mapHeaders/viridianforestexit.asm
+++ b/data/mapHeaders/viridianforestexit.asm
@@ -1,4 +1,4 @@
-ViridianForestExit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
+ViridianForestExit_h:
db FOREST_GATE ; tileset
db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/viridiangym.asm b/data/mapHeaders/viridiangym.asm
index c983ab71..40b0d69f 100755
--- a/data/mapHeaders/viridiangym.asm
+++ b/data/mapHeaders/viridiangym.asm
@@ -1,4 +1,4 @@
-ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45)
+ViridianGym_h:
db GYM ; tileset
db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm
index 392c6a20..c8724b4e 100755
--- a/data/mapHeaders/viridianhouse.asm
+++ b/data/mapHeaders/viridianhouse.asm
@@ -1,4 +1,4 @@
-ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
+ViridianHouse_h:
db HOUSE ; tileset
db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x)
dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/viridianmart.asm b/data/mapHeaders/viridianmart.asm
index 1bbe80f0..3d799a5b 100755
--- a/data/mapHeaders/viridianmart.asm
+++ b/data/mapHeaders/viridianmart.asm
@@ -1,4 +1,4 @@
-ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
+ViridianMart_h:
db MART ; tileset
db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts
diff --git a/data/mapHeaders/viridianpokecenter.asm b/data/mapHeaders/viridianpokecenter.asm
index 673be44e..3218e89d 100755
--- a/data/mapHeaders/viridianpokecenter.asm
+++ b/data/mapHeaders/viridianpokecenter.asm
@@ -1,4 +1,4 @@
-ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41)
+ViridianPokecenter_h:
db POKECENTER ; tileset
db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts
diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm
index e33172ae..22000dde 100755
--- a/data/mapObjects/agatha.asm
+++ b/data/mapObjects/agatha.asm
@@ -1,4 +1,4 @@
-AgathaObject: ; 0x76534 (size=44)
+AgathaObject:
db $0 ; border block
db $4 ; warps
diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm
index ab763bc3..5a7e832c 100755
--- a/data/mapObjects/bikeshop.asm
+++ b/data/mapObjects/bikeshop.asm
@@ -1,4 +1,4 @@
-BikeShopObject: ; 0x1d866 (size=38)
+BikeShopObject:
db $e ; border block
db $2 ; warps
diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm
index 9da1efd1..ef52e1dd 100755
--- a/data/mapObjects/billshouse.asm
+++ b/data/mapObjects/billshouse.asm
@@ -1,4 +1,4 @@
-BillsHouseObject: ; 0x1e8df (size=38)
+BillsHouseObject:
db $d ; border block
db $2 ; warps
diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm
index 3dfce6e1..08b11853 100755
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/blueshouse.asm
@@ -1,4 +1,4 @@
-BluesHouseObject: ; 19bce (6:5bce)
+BluesHouseObject:
db $0A ; border block
db $2 ; warps
diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm
index 8d55461f..a734b07b 100755
--- a/data/mapObjects/bruno.asm
+++ b/data/mapObjects/bruno.asm
@@ -1,4 +1,4 @@
-BrunoObject: ; 0x763d7 (size=44)
+BrunoObject:
db $3 ; border block
db $4 ; warps
diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm
index 0e420221..c2a7fd78 100755
--- a/data/mapObjects/celadoncity.asm
+++ b/data/mapObjects/celadoncity.asm
@@ -1,4 +1,4 @@
-CeladonCityObject: ; 0x18022 (size=189)
+CeladonCityObject:
db $f ; border block
db $d ; warps
diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm
index 74141df9..fd202a96 100755
--- a/data/mapObjects/celadondiner.asm
+++ b/data/mapObjects/celadondiner.asm
@@ -1,4 +1,4 @@
-CeladonDinerObject: ; 0x491bc (size=50)
+CeladonDinerObject:
db $f ; border block
db $2 ; warps
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm
index a44cf0a6..af59d2b1 100755
--- a/data/mapObjects/celadongamecorner.asm
+++ b/data/mapObjects/celadongamecorner.asm
@@ -1,4 +1,4 @@
-CeladonGameCornerObject: ; 0x48fa0 (size=99)
+CeladonGameCornerObject:
db $f ; border block
db $3 ; warps
diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm
index a38dd535..212c389e 100755
--- a/data/mapObjects/celadongym.asm
+++ b/data/mapObjects/celadongym.asm
@@ -1,4 +1,4 @@
-CeladonGymObject: ; 0x48b30 (size=84)
+CeladonGymObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm
index 33c442c2..8d7dcb03 100755
--- a/data/mapObjects/celadonhotel.asm
+++ b/data/mapObjects/celadonhotel.asm
@@ -1,4 +1,4 @@
-CeladonHotelObject: ; 0x49281 (size=38)
+CeladonHotelObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm
index 0fcb08f5..6bd847a4 100755
--- a/data/mapObjects/celadonhouse.asm
+++ b/data/mapObjects/celadonhouse.asm
@@ -1,4 +1,4 @@
-CeladonHouseObject: ; 0x49227 (size=38)
+CeladonHouseObject:
db $f ; border block
db $2 ; warps
diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm
index a308e8bc..47fbb0e5 100755
--- a/data/mapObjects/celadonmansion1.asm
+++ b/data/mapObjects/celadonmansion1.asm
@@ -1,4 +1,4 @@
-CeladonMansion1Object: ; 0x486cf (size=71)
+CeladonMansion1Object:
db $f ; border block
db $5 ; warps
diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm
index 9271c22d..883cae36 100755
--- a/data/mapObjects/celadonmansion2.asm
+++ b/data/mapObjects/celadonmansion2.asm
@@ -1,4 +1,4 @@
-CeladonMansion2Object: ; 0x48745 (size=39)
+CeladonMansion2Object:
db $f ; border block
db $4 ; warps
diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm
index 36bf36d5..0564b1cb 100755
--- a/data/mapObjects/celadonmansion3.asm
+++ b/data/mapObjects/celadonmansion3.asm
@@ -1,4 +1,4 @@
-CeladonMansion3Object: ; 0x487ff (size=72)
+CeladonMansion3Object:
db $f ; border block
db $4 ; warps
diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm
index 0241725d..c4f667fa 100755
--- a/data/mapObjects/celadonmansion4.asm
+++ b/data/mapObjects/celadonmansion4.asm
@@ -1,4 +1,4 @@
-CeladonMansion4Object: ; 0x48875 (size=31)
+CeladonMansion4Object:
db $9 ; border block
db $3 ; warps
diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm
index 2f20323d..243e345b 100755
--- a/data/mapObjects/celadonmansion5.asm
+++ b/data/mapObjects/celadonmansion5.asm
@@ -1,4 +1,4 @@
-CeladonMansion5Object: ; 0x1dd5c (size=32)
+CeladonMansion5Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm
index dbbc0a36..af647cf2 100755
--- a/data/mapObjects/celadonmart1.asm
+++ b/data/mapObjects/celadonmart1.asm
@@ -1,4 +1,4 @@
-CeladonMart1Object: ; 0x60f9e (size=64)
+CeladonMart1Object:
db $f ; border block
db $6 ; warps
diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm
index 061ac6e0..a6c9af59 100755
--- a/data/mapObjects/celadonmart2.asm
+++ b/data/mapObjects/celadonmart2.asm
@@ -1,4 +1,4 @@
-CeladonMart2Object: ; 0x56111 (size=55)
+CeladonMart2Object:
db $f ; border block
db $3 ; warps
diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm
index 36760d25..45f12b2c 100755
--- a/data/mapObjects/celadonmart3.asm
+++ b/data/mapObjects/celadonmart3.asm
@@ -1,4 +1,4 @@
-CeladonMart3Object: ; 0x482c4 (size=94)
+CeladonMart3Object:
db $f ; border block
db $3 ; warps
diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm
index 7dce43dc..386dba8c 100755
--- a/data/mapObjects/celadonmart4.asm
+++ b/data/mapObjects/celadonmart4.asm
@@ -1,4 +1,4 @@
-CeladonMart4Object: ; 0x48370 (size=49)
+CeladonMart4Object:
db $f ; border block
db $3 ; warps
diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm
index 23b7cf4f..df47a70d 100755
--- a/data/mapObjects/celadonmart5.asm
+++ b/data/mapObjects/celadonmart5.asm
@@ -1,4 +1,4 @@
-CeladonMart5Object: ; 0x49085 (size=55)
+CeladonMart5Object:
db $f ; border block
db $3 ; warps
diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm
index 6b778043..2db8635a 100755
--- a/data/mapObjects/celadonmartelevator.asm
+++ b/data/mapObjects/celadonmartelevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevatorObject: ; 0x4866d (size=23)
+CeladonMartElevatorObject:
db $f ; border block
db $2 ; warps
diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm
index 82830cf2..63a1b4d7 100755
--- a/data/mapObjects/celadonmartroof.asm
+++ b/data/mapObjects/celadonmartroof.asm
@@ -1,4 +1,4 @@
-CeladonMartRoofObject: ; 0x485a8 (size=36)
+CeladonMartRoofObject:
db $42 ; border block
db $1 ; warps
diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm
index 7429c190..6691eaaa 100755
--- a/data/mapObjects/celadonpokecenter.asm
+++ b/data/mapObjects/celadonpokecenter.asm
@@ -1,4 +1,4 @@
-CeladonPokecenterObject: ; 0x488d2 (size=44)
+CeladonPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm
index 73ca7598..c440bad5 100755
--- a/data/mapObjects/celadonprizeroom.asm
+++ b/data/mapObjects/celadonprizeroom.asm
@@ -1,4 +1,4 @@
-CeladonPrizeRoomObject: ; 0x49108 (size=41)
+CeladonPrizeRoomObject:
db $f ; border block
db $2 ; warps
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm
index ff0f2c66..318f03b9 100755
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/ceruleancity.asm
@@ -1,4 +1,4 @@
-CeruleanCityObject: ; 0x18786 (size=170)
+CeruleanCityObject:
db $a ; border block
db $a ; warps
diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm
index 68d74547..66d22260 100755
--- a/data/mapObjects/ceruleangym.asm
+++ b/data/mapObjects/ceruleangym.asm
@@ -1,4 +1,4 @@
-CeruleanGymObject: ; 0x5c834 (size=50)
+CeruleanGymObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm
index aa9f66a4..97e5b52d 100755
--- a/data/mapObjects/ceruleanhouse1.asm
+++ b/data/mapObjects/ceruleanhouse1.asm
@@ -1,4 +1,4 @@
-CeruleanHouse1Object: ; 0x1d710 (size=32)
+CeruleanHouse1Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm
index 24fe3a5e..669cd098 100755
--- a/data/mapObjects/ceruleanhouse2.asm
+++ b/data/mapObjects/ceruleanhouse2.asm
@@ -1,4 +1,4 @@
-CeruleanHouse2Object: ; 0x74ebe (size=34)
+CeruleanHouse2Object:
db $c ; border block
db $3 ; warps
diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm
index 0c896120..4f154191 100755
--- a/data/mapObjects/ceruleanhousetrashed.asm
+++ b/data/mapObjects/ceruleanhousetrashed.asm
@@ -1,4 +1,4 @@
-CeruleanHouseTrashedObject: ; 0x1d6bf (size=43)
+CeruleanHouseTrashedObject:
db $a ; border block
db $3 ; warps
diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm
index fc400e73..301d11a2 100755
--- a/data/mapObjects/ceruleanmart.asm
+++ b/data/mapObjects/ceruleanmart.asm
@@ -1,4 +1,4 @@
-CeruleanMartObject: ; 0x5c8a8 (size=38)
+CeruleanMartObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm
index 4b92f0d8..a8ad26d4 100755
--- a/data/mapObjects/ceruleanpokecenter.asm
+++ b/data/mapObjects/ceruleanpokecenter.asm
@@ -1,4 +1,4 @@
-CeruleanPokecenterObject: ; 0x5c65f (size=44)
+CeruleanPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm
index 2b9f34cb..28960150 100755
--- a/data/mapObjects/cinnabargym.asm
+++ b/data/mapObjects/cinnabargym.asm
@@ -1,4 +1,4 @@
-CinnabarGymObject: ; 0x75acc (size=90)
+CinnabarGymObject:
db $2e ; border block
db $2 ; warps
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm
index 7c8e80fb..05f4c06c 100755
--- a/data/mapObjects/cinnabarisland.asm
+++ b/data/mapObjects/cinnabarisland.asm
@@ -1,4 +1,4 @@
-CinnabarIslandObject: ; 0x1c022 (size=71)
+CinnabarIslandObject:
db $43 ; border block
db $5 ; warps
diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm
index 057ce048..79494686 100755
--- a/data/mapObjects/cinnabarmart.asm
+++ b/data/mapObjects/cinnabarmart.asm
@@ -1,4 +1,4 @@
-CinnabarMartObject: ; 0x75e91 (size=38)
+CinnabarMartObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm
index b855464e..b9779eb5 100755
--- a/data/mapObjects/cinnabarpokecenter.asm
+++ b/data/mapObjects/cinnabarpokecenter.asm
@@ -1,4 +1,4 @@
-CinnabarPokecenterObject: ; 0x75e46 (size=44)
+CinnabarPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm
index 5be02b44..91fea6b9 100644
--- a/data/mapObjects/colosseum.asm
+++ b/data/mapObjects/colosseum.asm
@@ -1,4 +1,4 @@
-ColosseumObject: ; 0x4fd87 (size=10)
+ColosseumObject:
db $e ; border block
db $0 ; warps
diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm
index 983baa99..c6702cfa 100755
--- a/data/mapObjects/copycatshouse1f.asm
+++ b/data/mapObjects/copycatshouse1f.asm
@@ -1,4 +1,4 @@
-CopycatsHouse1FObject: ; 0x75ee3 (size=46)
+CopycatsHouse1FObject:
db $a ; border block
db $3 ; warps
diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm
index 204c429f..0d53965a 100755
--- a/data/mapObjects/copycatshouse2f.asm
+++ b/data/mapObjects/copycatshouse2f.asm
@@ -1,4 +1,4 @@
-CopycatsHouse2FObject: ; 0x5cd21 (size=48)
+CopycatsHouse2FObject:
db $a ; border block
db $1 ; warps
diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm
index 7fbbf13b..98d4c184 100755
--- a/data/mapObjects/daycarem.asm
+++ b/data/mapObjects/daycarem.asm
@@ -1,4 +1,4 @@
-DayCareMObject: ; 0x56459 (size=26)
+DayCareMObject:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm
index 74bbf775..cdcffce0 100755
--- a/data/mapObjects/diglettscave.asm
+++ b/data/mapObjects/diglettscave.asm
@@ -1,4 +1,4 @@
-DiglettsCaveObject: ; 0x61f72 (size=20)
+DiglettsCaveObject:
db $19 ; border block
db $2 ; warps
diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm
index d77e649d..e5d6b69f 100755
--- a/data/mapObjects/diglettscaveroute11.asm
+++ b/data/mapObjects/diglettscaveroute11.asm
@@ -1,4 +1,4 @@
-DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34)
+DiglettsCaveEntranceRoute11Object:
db $7d ; border block
db $3 ; warps
diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm
index a905305b..f1310cce 100755
--- a/data/mapObjects/diglettscaveroute2.asm
+++ b/data/mapObjects/diglettscaveroute2.asm
@@ -1,4 +1,4 @@
-DiglettsCaveRoute2Object: ; 0x1debf (size=34)
+DiglettsCaveRoute2Object:
db $7d ; border block
db $3 ; warps
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm
index cbe0cb31..1dbb2dca 100755
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/fanclub.asm
@@ -1,4 +1,4 @@
-FanClubObject: ; 0x59c97 (size=62)
+FanClubObject:
db $d ; border block
db $2 ; warps
diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm
index aa9c0bd7..44fed88f 100755
--- a/data/mapObjects/fightingdojo.asm
+++ b/data/mapObjects/fightingdojo.asm
@@ -1,4 +1,4 @@
-FightingDojoObject: ; 0x5cf9b (size=72)
+FightingDojoObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm
index c64760c0..f4bb842b 100755
--- a/data/mapObjects/fuchsiacity.asm
+++ b/data/mapObjects/fuchsiacity.asm
@@ -1,4 +1,4 @@
-FuchsiaCityObject: ; 0x18bd4 (size=178)
+FuchsiaCityObject:
db $f ; border block
db $9 ; warps
diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm
index c7fc3799..86f62d21 100755
--- a/data/mapObjects/fuchsiagym.asm
+++ b/data/mapObjects/fuchsiagym.asm
@@ -1,4 +1,4 @@
-FuchsiaGymObject: ; 0x75658 (size=82)
+FuchsiaGymObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm
index 0789ea2c..4d3c3b6e 100755
--- a/data/mapObjects/fuchsiahouse1.asm
+++ b/data/mapObjects/fuchsiahouse1.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse1Object: ; 0x75031 (size=38)
+FuchsiaHouse1Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm
index f3aa5e7c..3a3d07c3 100755
--- a/data/mapObjects/fuchsiahouse2.asm
+++ b/data/mapObjects/fuchsiahouse2.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse2Object: ; 0x75180 (size=45)
+FuchsiaHouse2Object:
db $17 ; border block
db $2 ; warps
diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm
index 3fd056e9..aaf05bd6 100755
--- a/data/mapObjects/fuchsiahouse3.asm
+++ b/data/mapObjects/fuchsiahouse3.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse3Object: ; 0x56221 (size=34)
+FuchsiaHouse3Object:
db $c ; border block
db $3 ; warps
diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm
index eb85d110..431e7c2f 100755
--- a/data/mapObjects/fuchsiamart.asm
+++ b/data/mapObjects/fuchsiamart.asm
@@ -1,4 +1,4 @@
-FuchsiaMartObject: ; 0x1dd9b (size=38)
+FuchsiaMartObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm
index 36afcfd8..8106b9ec 100755
--- a/data/mapObjects/fuchsiameetingroom.asm
+++ b/data/mapObjects/fuchsiameetingroom.asm
@@ -1,4 +1,4 @@
-FuchsiaMeetingRoomObject: ; 0x756fc (size=38)
+FuchsiaMeetingRoomObject:
db $17 ; border block
db $2 ; warps
diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm
index 8a1c392b..bf9abe99 100755
--- a/data/mapObjects/fuchsiapokecenter.asm
+++ b/data/mapObjects/fuchsiapokecenter.asm
@@ -1,4 +1,4 @@
-FuchsiaPokecenterObject: ; 0x7507d (size=44)
+FuchsiaPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm
index c14efcf0..e0f37b91 100755
--- a/data/mapObjects/gary.asm
+++ b/data/mapObjects/gary.asm
@@ -1,4 +1,4 @@
-GaryObject: ; 0x7612f (size=48)
+GaryObject:
db $3 ; border block
db $4 ; warps
diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm
index b21b1f4e..8e245c2c 100755
--- a/data/mapObjects/halloffameroom.asm
+++ b/data/mapObjects/halloffameroom.asm
@@ -1,4 +1,4 @@
-HallofFameRoomObject: ; 0x5a571 (size=26)
+HallofFameRoomObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm
index a30cfbfe..145f2f39 100755
--- a/data/mapObjects/indigoplateau.asm
+++ b/data/mapObjects/indigoplateau.asm
@@ -1,4 +1,4 @@
-IndigoPlateauObject: ; 0x50936 (size=20)
+IndigoPlateauObject:
db $e ; border block
db $2 ; warps
diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm
index c41e2cfc..dbeaa85b 100755
--- a/data/mapObjects/indigoplateaulobby.asm
+++ b/data/mapObjects/indigoplateaulobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobbyObject: ; 0x19c95 (size=58)
+IndigoPlateauLobbyObject:
db $0 ; border block
db $3 ; warps
diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm
index a2e05e14..e0adaedc 100755
--- a/data/mapObjects/lab1.asm
+++ b/data/mapObjects/lab1.asm
@@ -1,4 +1,4 @@
-Lab1Object: ; 0x75bb3 (size=62)
+Lab1Object:
db $17 ; border block
db $5 ; warps
diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm
index 89ed5f2c..ed541ada 100755
--- a/data/mapObjects/lab2.asm
+++ b/data/mapObjects/lab2.asm
@@ -1,4 +1,4 @@
-Lab2Object: ; 0x75c45 (size=38)
+Lab2Object:
db $17 ; border block
db $2 ; warps
diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm
index 8aca194b..c5ee01c3 100755
--- a/data/mapObjects/lab3.asm
+++ b/data/mapObjects/lab3.asm
@@ -1,4 +1,4 @@
-Lab3Object: ; 0x75cec (size=41)
+Lab3Object:
db $17 ; border block
db $2 ; warps
diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm
index 47f301c9..361f9533 100755
--- a/data/mapObjects/lab4.asm
+++ b/data/mapObjects/lab4.asm
@@ -1,4 +1,4 @@
-Lab4Object: ; 0x75df0 (size=32)
+Lab4Object:
db $17 ; border block
db $2 ; warps
diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm
index cdfbc7a6..e7bf0ad6 100755
--- a/data/mapObjects/lance.asm
+++ b/data/mapObjects/lance.asm
@@ -1,4 +1,4 @@
-LanceObject: ; 0x5a3c5 (size=36)
+LanceObject:
db $3 ; border block
db $3 ; warps
diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm
index 45707121..54f57270 100755
--- a/data/mapObjects/lavenderhouse1.asm
+++ b/data/mapObjects/lavenderhouse1.asm
@@ -1,4 +1,4 @@
-LavenderHouse1Object: ; 0x1d96a (size=56)
+LavenderHouse1Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm
index a8641204..7638ff66 100755
--- a/data/mapObjects/lavenderhouse2.asm
+++ b/data/mapObjects/lavenderhouse2.asm
@@ -1,4 +1,4 @@
-LavenderHouse2Object: ; 0x1d9e6 (size=32)
+LavenderHouse2Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm
index d23f21ae..2d8e7636 100755
--- a/data/mapObjects/lavendermart.asm
+++ b/data/mapObjects/lavendermart.asm
@@ -1,4 +1,4 @@
-LavenderMartObject: ; 0x5c95d (size=38)
+LavenderMartObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm
index 702e67b7..f98cede4 100755
--- a/data/mapObjects/lavenderpokecenter.asm
+++ b/data/mapObjects/lavenderpokecenter.asm
@@ -1,4 +1,4 @@
-LavenderPokecenterObject: ; 0x5c8f4 (size=44)
+LavenderPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm
index fb78f139..49347aba 100755
--- a/data/mapObjects/lavendertown.asm
+++ b/data/mapObjects/lavendertown.asm
@@ -1,4 +1,4 @@
-LavenderTownObject: ; 0x4402d (size=88)
+LavenderTownObject:
db $2c ; border block
db $6 ; warps
diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm
index 4ce080f7..5b985369 100755
--- a/data/mapObjects/lorelei.asm
+++ b/data/mapObjects/lorelei.asm
@@ -1,4 +1,4 @@
-LoreleiObject: ; 0x76280 (size=44)
+LoreleiObject:
db $3 ; border block
db $4 ; warps
diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm
index 0bb168bb..ed6529f2 100755
--- a/data/mapObjects/mansion1.asm
+++ b/data/mapObjects/mansion1.asm
@@ -1,4 +1,4 @@
-Mansion1Object: ; 0x443a4 (size=90)
+Mansion1Object:
db $2e ; border block
db $8 ; warps
diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm
index 2cb45879..bda2ad27 100755
--- a/data/mapObjects/mansion2.asm
+++ b/data/mapObjects/mansion2.asm
@@ -1,4 +1,4 @@
-Mansion2Object: ; 0x520d1 (size=63)
+Mansion2Object:
db $1 ; border block
db $4 ; warps
diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm
index 288b4753..72431402 100755
--- a/data/mapObjects/mansion3.asm
+++ b/data/mapObjects/mansion3.asm
@@ -1,4 +1,4 @@
-Mansion3Object: ; 0x522e6 (size=64)
+Mansion3Object:
db $1 ; border block
db $3 ; warps
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm
index eddbda8e..94a6f612 100755
--- a/data/mapObjects/mansion4.asm
+++ b/data/mapObjects/mansion4.asm
@@ -1,4 +1,4 @@
-Mansion4Object: ; 0x52498 (size=69)
+Mansion4Object:
db $1 ; border block
db $1 ; warps
diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm
index a59f2a20..42c45016 100755
--- a/data/mapObjects/mtmoon1.asm
+++ b/data/mapObjects/mtmoon1.asm
@@ -1,4 +1,4 @@
-MtMoon1Object: ; 0x49b06 (size=145)
+MtMoon1Object:
db $3 ; border block
db $5 ; warps
diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm
index 2cf6be6b..f39cd4a5 100755
--- a/data/mapObjects/mtmoon2.asm
+++ b/data/mapObjects/mtmoon2.asm
@@ -1,4 +1,4 @@
-MtMoon2Object: ; 0x51a4d (size=68)
+MtMoon2Object:
db $3 ; border block
db $8 ; warps
diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm
index 4a9b1946..43891ec3 100755
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/mtmoon3.asm
@@ -1,4 +1,4 @@
-MtMoon3Object: ; 0x49fdb (size=102)
+MtMoon3Object:
db $3 ; border block
db $4 ; warps
diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm
index 935c4a40..d1ac34fb 100755
--- a/data/mapObjects/mtmoonpokecenter.asm
+++ b/data/mapObjects/mtmoonpokecenter.asm
@@ -1,4 +1,4 @@
-MtMoonPokecenterObject: ; 0x49376 (size=56)
+MtMoonPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm
index 208a19c8..56932af8 100755
--- a/data/mapObjects/museum1f.asm
+++ b/data/mapObjects/museum1f.asm
@@ -1,4 +1,4 @@
-Museum1FObject: ; 0x5c2c1 (size=74)
+Museum1FObject:
db $a ; border block
db $5 ; warps
diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm
index 77ea061b..689391d9 100755
--- a/data/mapObjects/museum2f.asm
+++ b/data/mapObjects/museum2f.asm
@@ -1,4 +1,4 @@
-Museum2FObject: ; 0x5c34b (size=48)
+Museum2FObject:
db $a ; border block
db $1 ; warps
diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm
index 28dcf48f..0118b2f7 100755
--- a/data/mapObjects/namerater.asm
+++ b/data/mapObjects/namerater.asm
@@ -1,4 +1,4 @@
-NameRaterObject: ; 0x1dad6 (size=26)
+NameRaterObject:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm
index 5b9a01d5..1efb1e72 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -1,4 +1,4 @@
-OaksLabObject: ; 0x1d40a (size=88)
+OaksLabObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm
index 0d45fea3..e22f79a6 100755
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/pallettown.asm
@@ -1,4 +1,4 @@
-PalletTownObject: ; 0x182c3 (size=58)
+PalletTownObject:
db $b ; border block
db $3 ; warps
diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm
index 27a559fc..7b389bd2 100755
--- a/data/mapObjects/pewtercity.asm
+++ b/data/mapObjects/pewtercity.asm
@@ -1,4 +1,4 @@
-PewterCityObject: ; 0x18577 (size=111)
+PewterCityObject:
db $a ; border block
db $7 ; warps
diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm
index b0224a11..280f1a7e 100755
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/pewtergym.asm
@@ -1,4 +1,4 @@
-PewterGymObject: ; 0x5c52e (size=42)
+PewterGymObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm
index 8dcac05c..d973e53b 100755
--- a/data/mapObjects/pewterhouse1.asm
+++ b/data/mapObjects/pewterhouse1.asm
@@ -1,4 +1,4 @@
-PewterHouse1Object: ; 0x1d616 (size=38)
+PewterHouse1Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm
index b4b8f2e7..6c111acb 100755
--- a/data/mapObjects/pewterhouse2.asm
+++ b/data/mapObjects/pewterhouse2.asm
@@ -1,4 +1,4 @@
-PewterHouse2Object: ; 0x1d659 (size=32)
+PewterHouse2Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm
index 2ef08e29..50ccd288 100755
--- a/data/mapObjects/pewtermart.asm
+++ b/data/mapObjects/pewtermart.asm
@@ -1,4 +1,4 @@
-PewterMartObject: ; 0x74cda (size=38)
+PewterMartObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm
index d3f87326..4c7444bb 100755
--- a/data/mapObjects/pewterpokecenter.asm
+++ b/data/mapObjects/pewterpokecenter.asm
@@ -1,4 +1,4 @@
-PewterPokecenterObject: ; 0x5c60d (size=44)
+PewterPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm
index eb71be9e..54af9efc 100755
--- a/data/mapObjects/pokemontower1.asm
+++ b/data/mapObjects/pokemontower1.asm
@@ -1,4 +1,4 @@
-PokemonTower1Object: ; 0x60452 (size=58)
+PokemonTower1Object:
db $1 ; border block
db $3 ; warps
diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm
index 57ba7363..33bc048d 100755
--- a/data/mapObjects/pokemontower2.asm
+++ b/data/mapObjects/pokemontower2.asm
@@ -1,4 +1,4 @@
-PokemonTower2Object: ; 0x60646 (size=32)
+PokemonTower2Object:
db $1 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm
index 4591cbe3..9899276a 100755
--- a/data/mapObjects/pokemontower3.asm
+++ b/data/mapObjects/pokemontower3.asm
@@ -1,4 +1,4 @@
-PokemonTower3Object: ; 0x6075d (size=51)
+PokemonTower3Object:
db $1 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm
index 722f6e08..19f4f4e3 100755
--- a/data/mapObjects/pokemontower4.asm
+++ b/data/mapObjects/pokemontower4.asm
@@ -1,4 +1,4 @@
-PokemonTower4Object: ; 0x6088b (size=65)
+PokemonTower4Object:
db $1 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm
index 1d23abbf..5a73825c 100755
--- a/data/mapObjects/pokemontower5.asm
+++ b/data/mapObjects/pokemontower5.asm
@@ -1,4 +1,4 @@
-PokemonTower5Object: ; 0x60a48 (size=65)
+PokemonTower5Object:
db $1 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm
index cd7453d8..d0035faa 100755
--- a/data/mapObjects/pokemontower6.asm
+++ b/data/mapObjects/pokemontower6.asm
@@ -1,4 +1,4 @@
-PokemonTower6Object: ; 0x60c5b (size=58)
+PokemonTower6Object:
db $1 ; border block
db $2 ; warps
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index 4d1e26c2..76435c04 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -1,4 +1,4 @@
-PokemonTower7Object: ; 0x60ef6 (size=42)
+PokemonTower7Object:
db $1 ; border block
db $1 ; warps
diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm
index a4c5d8ea..a04cb657 100755
--- a/data/mapObjects/powerplant.asm
+++ b/data/mapObjects/powerplant.asm
@@ -1,4 +1,4 @@
-PowerPlantObject: ; 0x1e3bf (size=135)
+PowerPlantObject:
db $2e ; border block
db $3 ; warps
diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm
index 4f977b2c..4d32ea3d 100755
--- a/data/mapObjects/redshouse1f.asm
+++ b/data/mapObjects/redshouse1f.asm
@@ -1,4 +1,4 @@
-RedsHouse1FObject: ; 481e4 (12:41e4)
+RedsHouse1FObject:
db $0A ; border block
db $3 ; warps
diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm
index d668d441..ebd57e59 100755
--- a/data/mapObjects/redshouse2f.asm
+++ b/data/mapObjects/redshouse2f.asm
@@ -1,4 +1,4 @@
-RedsHouse2FObject: ; 0x5c0d0
+RedsHouse2FObject:
db $0A ; border block
db $1 ; warps
diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm
index 55c0c101..0b2bf374 100755
--- a/data/mapObjects/rockethideout1.asm
+++ b/data/mapObjects/rockethideout1.asm
@@ -1,4 +1,4 @@
-RocketHideout1Object: ; 0x44ce7 (size=98)
+RocketHideout1Object:
db $2e ; border block
db $5 ; warps
diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm
index b14dc0e6..6689110c 100755
--- a/data/mapObjects/rockethideout2.asm
+++ b/data/mapObjects/rockethideout2.asm
@@ -1,4 +1,4 @@
-RocketHideout2Object: ; 0x450f7 (size=80)
+RocketHideout2Object:
db $2e ; border block
db $5 ; warps
diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm
index d7933ddf..90bfbb57 100755
--- a/data/mapObjects/rockethideout3.asm
+++ b/data/mapObjects/rockethideout3.asm
@@ -1,4 +1,4 @@
-RocketHideout3Object: ; 0x4534d (size=50)
+RocketHideout3Object:
db $2e ; border block
db $2 ; warps
diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm
index 616f5a75..42e58b23 100755
--- a/data/mapObjects/rockethideout4.asm
+++ b/data/mapObjects/rockethideout4.asm
@@ -1,4 +1,4 @@
-RocketHideout4Object: ; 0x455f1 (size=95)
+RocketHideout4Object:
db $2e ; border block
db $3 ; warps
diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm
index 477e62c9..c1dfe961 100755
--- a/data/mapObjects/rockethideoutelevator.asm
+++ b/data/mapObjects/rockethideoutelevator.asm
@@ -1,4 +1,4 @@
-RocketHideoutElevatorObject: ; 0x45791 (size=23)
+RocketHideoutElevatorObject:
db $f ; border block
db $2 ; warps
diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm
index 70ffa438..932efb87 100755
--- a/data/mapObjects/rocktunnel1.asm
+++ b/data/mapObjects/rocktunnel1.asm
@@ -1,4 +1,4 @@
-RockTunnel1Object: ; 0x445f6 (size=127)
+RockTunnel1Object:
db $3 ; border block
db $8 ; warps
diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm
index e343fc0b..3589ec60 100755
--- a/data/mapObjects/rocktunnel2.asm
+++ b/data/mapObjects/rocktunnel2.asm
@@ -1,4 +1,4 @@
-RockTunnel2Object: ; 0x4613d (size=100)
+RockTunnel2Object:
db $3 ; border block
db $4 ; warps
diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm
index 3cd937cf..06a2e39d 100755
--- a/data/mapObjects/rocktunnelpokecenter.asm
+++ b/data/mapObjects/rocktunnelpokecenter.asm
@@ -1,4 +1,4 @@
-RockTunnelPokecenterObject: ; 0x493d4 (size=44)
+RockTunnelPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm
index d2abf51f..0e6237e7 100755
--- a/data/mapObjects/route1.asm
+++ b/data/mapObjects/route1.asm
@@ -1,4 +1,4 @@
-Route1Object: ; 0x1c0e5 (size=19)
+Route1Object:
db $b ; border block
db $0 ; warps
diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm
index 3623b79f..a1590ded 100755
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/route10.asm
@@ -1,4 +1,4 @@
-Route10Object: ; 0x582f6 (size=96)
+Route10Object:
db $2c ; border block
db $4 ; warps
diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm
index d0c9af20..8b6b5d3f 100755
--- a/data/mapObjects/route11.asm
+++ b/data/mapObjects/route11.asm
@@ -1,4 +1,4 @@
-Route11Object: ; 0x584e0 (size=127)
+Route11Object:
db $f ; border block
db $5 ; warps
diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm
index 351b922c..d8e6bff1 100755
--- a/data/mapObjects/route11gate.asm
+++ b/data/mapObjects/route11gate.asm
@@ -1,4 +1,4 @@
-Route11GateObject: ; 0x49416 (size=50)
+Route11GateObject:
db $a ; border block
db $5 ; warps
diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm
index 421de945..6228851d 100755
--- a/data/mapObjects/route11gateupstairs.asm
+++ b/data/mapObjects/route11gateupstairs.asm
@@ -1,4 +1,4 @@
-Route11GateUpstairsObject: ; 0x494da (size=30)
+Route11GateUpstairsObject:
db $a ; border block
db $1 ; warps
diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm
index 783fd49b..2dc7f9e7 100755
--- a/data/mapObjects/route12.asm
+++ b/data/mapObjects/route12.asm
@@ -1,4 +1,4 @@
-Route12Object: ; 0x5869a (size=118)
+Route12Object:
db $43 ; border block
db $4 ; warps
diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm
index 1e2fe3f9..27e8532a 100755
--- a/data/mapObjects/route12gate.asm
+++ b/data/mapObjects/route12gate.asm
@@ -1,4 +1,4 @@
-Route12GateObject: ; 0x4950e (size=50)
+Route12GateObject:
db $a ; border block
db $5 ; warps
diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm
index 9a8e4d4a..f1221c44 100755
--- a/data/mapObjects/route12gateupstairs.asm
+++ b/data/mapObjects/route12gateupstairs.asm
@@ -1,4 +1,4 @@
-Route12GateUpstairsObject: ; 0x495de (size=24)
+Route12GateUpstairsObject:
db $a ; border block
db $1 ; warps
diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm
index fad89578..104b01f7 100755
--- a/data/mapObjects/route12house.asm
+++ b/data/mapObjects/route12house.asm
@@ -1,4 +1,4 @@
-Route12HouseObject: ; 0x564de (size=26)
+Route12HouseObject:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm
index e6fdf8e6..a01e25a3 100755
--- a/data/mapObjects/route13.asm
+++ b/data/mapObjects/route13.asm
@@ -1,4 +1,4 @@
-Route13Object: ; 0x5482e (size=93)
+Route13Object:
db $43 ; border block
db $0 ; warps
diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm
index ce6d52b0..48edd284 100755
--- a/data/mapObjects/route14.asm
+++ b/data/mapObjects/route14.asm
@@ -1,4 +1,4 @@
-Route14Object: ; 0x549bb (size=87)
+Route14Object:
db $43 ; border block
db $0 ; warps
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm
index bd6283b0..30fc39c4 100755
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/route15.asm
@@ -1,4 +1,4 @@
-Route15Object: ; 0x5894e (size=126)
+Route15Object:
db $43 ; border block
db $4 ; warps
diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm
index f571ee03..06a6790a 100755
--- a/data/mapObjects/route15gate.asm
+++ b/data/mapObjects/route15gate.asm
@@ -1,4 +1,4 @@
-Route15GateObject: ; 0x4960c (size=50)
+Route15GateObject:
db $a ; border block
db $5 ; warps
diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm
index 4362ade0..c4cdcea8 100755
--- a/data/mapObjects/route15gateupstairs.asm
+++ b/data/mapObjects/route15gateupstairs.asm
@@ -1,4 +1,4 @@
-Route15GateUpstairsObject: ; 4969d (12:569d)
+Route15GateUpstairsObject:
db $a ; border block
db $1 ; warps
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm
index 529b59bf..b7da1dbb 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -1,4 +1,4 @@
-Route16Object: ; 0x58afc (size=136)
+Route16Object:
db $f ; border block
db $9 ; warps
diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm
index e1da990d..fce6c292 100755
--- a/data/mapObjects/route16gate.asm
+++ b/data/mapObjects/route16gate.asm
@@ -1,4 +1,4 @@
-Route16GateObject: ; 0x4978b (size=88)
+Route16GateObject:
db $a ; border block
db $9 ; warps
diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm
index d8c2db12..9119bf5e 100755
--- a/data/mapObjects/route16gateupstairs.asm
+++ b/data/mapObjects/route16gateupstairs.asm
@@ -1,4 +1,4 @@
-Route16GateUpstairsObject: ; 0x4984c (size=30)
+Route16GateUpstairsObject:
db $a ; border block
db $1 ; warps
diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm
index 12a846c6..e1e4244d 100755
--- a/data/mapObjects/route16house.asm
+++ b/data/mapObjects/route16house.asm
@@ -1,4 +1,4 @@
-Route16HouseObject: ; 0x1e657 (size=32)
+Route16HouseObject:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm
index c496373e..3c8e3bce 100755
--- a/data/mapObjects/route17.asm
+++ b/data/mapObjects/route17.asm
@@ -1,4 +1,4 @@
-Route17Object: ; 0x54b42 (size=102)
+Route17Object:
db $43 ; border block
db $0 ; warps
diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm
index 40b50b08..41b971b0 100755
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/route18.asm
@@ -1,4 +1,4 @@
-Route18Object: ; 0x58c5a (size=66)
+Route18Object:
db $43 ; border block
db $4 ; warps
diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm
index d42026da..08b10050 100755
--- a/data/mapObjects/route18gate.asm
+++ b/data/mapObjects/route18gate.asm
@@ -1,4 +1,4 @@
-Route18GateObject: ; 0x49937 (size=50)
+Route18GateObject:
db $a ; border block
db $5 ; warps
diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm
index 93438044..1ad911e8 100755
--- a/data/mapObjects/route18gateupstairs.asm
+++ b/data/mapObjects/route18gateupstairs.asm
@@ -1,4 +1,4 @@
-Route18GateUpstairsObject: ; 0x499a4 (size=24)
+Route18GateUpstairsObject:
db $a ; border block
db $1 ; warps
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm
index 151cc4a8..0f963cfd 100755
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -1,4 +1,4 @@
-Route19Object: ; 0x54e9a (size=87)
+Route19Object:
db $43 ; border block
db $1 ; warps
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm
index 9731f450..a8b0a7a5 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/route2.asm
@@ -1,4 +1,4 @@
-Route2Object: ; 0x54022 (size=72)
+Route2Object:
db $f ; border block
db $7 ; warps
diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm
index 6939ffad..a3527525 100755
--- a/data/mapObjects/route20.asm
+++ b/data/mapObjects/route20.asm
@@ -1,4 +1,4 @@
-Route20Object: ; 0x50113 (size=106)
+Route20Object:
db $43 ; border block
db $2 ; warps
diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm
index e98c8425..1ed7b1cb 100755
--- a/data/mapObjects/route21.asm
+++ b/data/mapObjects/route21.asm
@@ -1,4 +1,4 @@
-Route21Object: ; 0x55021 (size=76)
+Route21Object:
db $43 ; border block
db $0 ; warps
diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm
index 999b9d8a..ef568ae8 100755
--- a/data/mapObjects/route22.asm
+++ b/data/mapObjects/route22.asm
@@ -1,4 +1,4 @@
-Route22Object: ; 0x50022 (size=27)
+Route22Object:
db $2c ; border block
db $1 ; warps
diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm
index 02f11d58..e75c4d50 100755
--- a/data/mapObjects/route22gate.asm
+++ b/data/mapObjects/route22gate.asm
@@ -1,4 +1,4 @@
-Route22GateObject: ; 0x1e720 (size=42)
+Route22GateObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm
index af8c8dab..3995e510 100755
--- a/data/mapObjects/route23.asm
+++ b/data/mapObjects/route23.asm
@@ -1,4 +1,4 @@
-Route23Object: ; 0x50361 (size=81)
+Route23Object:
db $f ; border block
db $4 ; warps
diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm
index 115f08d3..78a4d573 100755
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/route24.asm
@@ -1,4 +1,4 @@
-Route24Object: ; 0x506a4 (size=67)
+Route24Object:
db $2c ; border block
db $0 ; warps
diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm
index 5c6811f3..b26f62ef 100755
--- a/data/mapObjects/route25.asm
+++ b/data/mapObjects/route25.asm
@@ -1,4 +1,4 @@
-Route25Object: ; 0x507b2 (size=94)
+Route25Object:
db $2c ; border block
db $1 ; warps
diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm
index 9a0b79e0..53590f69 100755
--- a/data/mapObjects/route2gate.asm
+++ b/data/mapObjects/route2gate.asm
@@ -1,4 +1,4 @@
-Route2GateObject: ; 0x5d620 (size=48)
+Route2GateObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm
index 463d9a1a..7d1d224d 100755
--- a/data/mapObjects/route2house.asm
+++ b/data/mapObjects/route2house.asm
@@ -1,4 +1,4 @@
-Route2HouseObject: ; 0x1df07 (size=32)
+Route2HouseObject:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm
index a2df6925..ba446dca 100755
--- a/data/mapObjects/route3.asm
+++ b/data/mapObjects/route3.asm
@@ -1,4 +1,4 @@
-Route3Object: ; 0x54208 (size=77)
+Route3Object:
db $2c ; border block
db $0 ; warps
diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm
index 14e59684..e52f4909 100755
--- a/data/mapObjects/route4.asm
+++ b/data/mapObjects/route4.asm
@@ -1,4 +1,4 @@
-Route4Object: ; 0x543b2 (size=58)
+Route4Object:
db $2c ; border block
db $3 ; warps
diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm
index 7ace428a..eefcaa92 100755
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/route5.asm
@@ -1,4 +1,4 @@
-Route5Object: ; 0x545ab (size=47)
+Route5Object:
db $a ; border block
db $5 ; warps
diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm
index db2f4564..9588f511 100755
--- a/data/mapObjects/route5gate.asm
+++ b/data/mapObjects/route5gate.asm
@@ -1,4 +1,4 @@
-Route5GateObject: ; 0x1dffb (size=42)
+Route5GateObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm
index c854c91f..6ab90621 100755
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/route6.asm
@@ -1,4 +1,4 @@
-Route6Object: ; 0x58022 (size=87)
+Route6Object:
db $f ; border block
db $4 ; warps
diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm
index 59d08e57..79f17007 100755
--- a/data/mapObjects/route6gate.asm
+++ b/data/mapObjects/route6gate.asm
@@ -1,4 +1,4 @@
-Route6GateObject: ; 0x1e0be (size=42)
+Route6GateObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm
index b84fa190..3f753830 100755
--- a/data/mapObjects/route7.asm
+++ b/data/mapObjects/route7.asm
@@ -1,4 +1,4 @@
-Route7Object: ; 0x48022 (size=47)
+Route7Object:
db $f ; border block
db $5 ; warps
diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm
index 9e80ca39..8f65891b 100755
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/route7gate.asm
@@ -1,4 +1,4 @@
-Route7GateObject: ; 0x1e185 (size=42)
+Route7GateObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm
index 38bcca5e..8f336e03 100755
--- a/data/mapObjects/route8.asm
+++ b/data/mapObjects/route8.asm
@@ -1,4 +1,4 @@
-Route8Object: ; 0x5814f (size=119)
+Route8Object:
db $2c ; border block
db $5 ; warps
diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm
index 61d70dfc..a3e21618 100755
--- a/data/mapObjects/route8gate.asm
+++ b/data/mapObjects/route8gate.asm
@@ -1,4 +1,4 @@
-Route8GateObject: ; 0x1e247 (size=42)
+Route8GateObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm
index 6a759608..cdfd801c 100755
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/route9.asm
@@ -1,4 +1,4 @@
-Route9Object: ; 0x546a8 (size=86)
+Route9Object:
db $2c ; border block
db $0 ; warps
diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm
index 41886e9f..b5fa0107 100755
--- a/data/mapObjects/safarizonecenter.asm
+++ b/data/mapObjects/safarizonecenter.asm
@@ -1,4 +1,4 @@
-SafariZoneCenterObject: ; 0x45bc5 (size=89)
+SafariZoneCenterObject:
db $0 ; border block
db $9 ; warps
diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm
index 4cb1e0ae..6c2f8138 100755
--- a/data/mapObjects/safarizoneeast.asm
+++ b/data/mapObjects/safarizoneeast.asm
@@ -1,4 +1,4 @@
-SafariZoneEastObject: ; 0x4588b (size=81)
+SafariZoneEastObject:
db $0 ; border block
db $5 ; warps
diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm
index 543cf7dc..9d26aa17 100755
--- a/data/mapObjects/safarizoneentrance.asm
+++ b/data/mapObjects/safarizoneentrance.asm
@@ -1,4 +1,4 @@
-SafariZoneEntranceObject: ; 0x753f5 (size=48)
+SafariZoneEntranceObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm
index e3c4cddb..d0305507 100755
--- a/data/mapObjects/safarizonenorth.asm
+++ b/data/mapObjects/safarizonenorth.asm
@@ -1,4 +1,4 @@
-SafariZoneNorthObject: ; 0x459d5 (size=105)
+SafariZoneNorthObject:
db $0 ; border block
db $9 ; warps
diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm
index d27a967f..79156825 100755
--- a/data/mapObjects/safarizoneresthouse1.asm
+++ b/data/mapObjects/safarizoneresthouse1.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse1Object: ; 0x45cfe (size=32)
+SafariZoneRestHouse1Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm
index eb6c7a25..82f04f9d 100755
--- a/data/mapObjects/safarizoneresthouse2.asm
+++ b/data/mapObjects/safarizoneresthouse2.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse2Object: ; 0x45d43 (size=38)
+SafariZoneRestHouse2Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm
index 4d698782..ae973fa8 100755
--- a/data/mapObjects/safarizoneresthouse3.asm
+++ b/data/mapObjects/safarizoneresthouse3.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse3Object: ; 0x45d8e (size=38)
+SafariZoneRestHouse3Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm
index 1d928420..7502732c 100755
--- a/data/mapObjects/safarizoneresthouse4.asm
+++ b/data/mapObjects/safarizoneresthouse4.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse4Object: ; 0x45dd9 (size=38)
+SafariZoneRestHouse4Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm
index 471ec40b..a96115b8 100755
--- a/data/mapObjects/safarizonesecrethouse.asm
+++ b/data/mapObjects/safarizonesecrethouse.asm
@@ -1,4 +1,4 @@
-SafariZoneSecretHouseObject: ; 0x4a365 (size=26)
+SafariZoneSecretHouseObject:
db $17 ; border block
db $2 ; warps
diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm
index 724476ae..64ed0876 100755
--- a/data/mapObjects/safarizonewest.asm
+++ b/data/mapObjects/safarizonewest.asm
@@ -1,4 +1,4 @@
-SafariZoneWestObject: ; 0x4a1dc (size=108)
+SafariZoneWestObject:
db $0 ; border block
db $8 ; warps
diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm
index 5980659b..730d8be5 100755
--- a/data/mapObjects/saffroncity.asm
+++ b/data/mapObjects/saffroncity.asm
@@ -1,4 +1,4 @@
-SaffronCityObject: ; 0x509e2 (size=188)
+SaffronCityObject:
db $f ; border block
db $8 ; warps
diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm
index 20d91991..629ab760 100755
--- a/data/mapObjects/saffrongym.asm
+++ b/data/mapObjects/saffrongym.asm
@@ -1,4 +1,4 @@
-SaffronGymObject: ; 0x5d259 (size=330)
+SaffronGymObject:
db $2e ; border block
db $20 ; warps
diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm
index 0480cbd9..9f6d7750 100755
--- a/data/mapObjects/saffronhouse1.asm
+++ b/data/mapObjects/saffronhouse1.asm
@@ -1,4 +1,4 @@
-SaffronHouse1Object: ; 0x1de04 (size=44)
+SaffronHouse1Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm
index ffcbd64d..e57bdbb7 100755
--- a/data/mapObjects/saffronhouse2.asm
+++ b/data/mapObjects/saffronhouse2.asm
@@ -1,4 +1,4 @@
-SaffronHouse2Object: ; 0x1de8a (size=26)
+SaffronHouse2Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm
index be3803af..113a1ea9 100755
--- a/data/mapObjects/saffronmart.asm
+++ b/data/mapObjects/saffronmart.asm
@@ -1,4 +1,4 @@
-SaffronMartObject: ; 0x5d41c (size=38)
+SaffronMartObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm
index bda46343..b82be083 100755
--- a/data/mapObjects/saffronpokecenter.asm
+++ b/data/mapObjects/saffronpokecenter.asm
@@ -1,4 +1,4 @@
-SaffronPokecenterObject: ; 0x5d54f (size=44)
+SaffronPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm
index 4c802e64..3fe629da 100755
--- a/data/mapObjects/school.asm
+++ b/data/mapObjects/school.asm
@@ -1,4 +1,4 @@
-SchoolObject: ; 0x1d55d (size=32)
+SchoolObject:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm
index 3b3d4f7a..eaa9036e 100755
--- a/data/mapObjects/seafoamislands1.asm
+++ b/data/mapObjects/seafoamislands1.asm
@@ -1,4 +1,4 @@
-SeafoamIslands1Object: ; 0x4484f (size=72)
+SeafoamIslands1Object:
db $7d ; border block
db $7 ; warps
diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm
index 29cdfa59..d25e5375 100755
--- a/data/mapObjects/seafoamislands2.asm
+++ b/data/mapObjects/seafoamislands2.asm
@@ -1,4 +1,4 @@
-SeafoamIslands2Object: ; 0x46376 (size=72)
+SeafoamIslands2Object:
db $7d ; border block
db $7 ; warps
diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm
index 28a5e67b..a660f2ed 100755
--- a/data/mapObjects/seafoamislands3.asm
+++ b/data/mapObjects/seafoamislands3.asm
@@ -1,4 +1,4 @@
-SeafoamIslands3Object: ; 0x464b2 (size=72)
+SeafoamIslands3Object:
db $7d ; border block
db $7 ; warps
diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm
index e90b3865..c7043a93 100755
--- a/data/mapObjects/seafoamislands4.asm
+++ b/data/mapObjects/seafoamislands4.asm
@@ -1,4 +1,4 @@
-SeafoamIslands4Object: ; 0x466a6 (size=96)
+SeafoamIslands4Object:
db $7d ; border block
db $7 ; warps
diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm
index e5fbaecd..a05c00cc 100755
--- a/data/mapObjects/seafoamislands5.asm
+++ b/data/mapObjects/seafoamislands5.asm
@@ -1,4 +1,4 @@
-SeafoamIslands5Object: ; 0x468bc (size=62)
+SeafoamIslands5Object:
db $7d ; border block
db $4 ; warps
diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm
index a953f376..fe779393 100755
--- a/data/mapObjects/silphco1.asm
+++ b/data/mapObjects/silphco1.asm
@@ -1,4 +1,4 @@
-SilphCo1Object: ; 0x5d470 (size=50)
+SilphCo1Object:
db $2e ; border block
db $5 ; warps
diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm
index cc608e64..185a23c9 100755
--- a/data/mapObjects/silphco10.asm
+++ b/data/mapObjects/silphco10.asm
@@ -1,4 +1,4 @@
-SilphCo10Object: ; 0x5a1fb (size=95)
+SilphCo10Object:
db $2e ; border block
db $6 ; warps
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm
index bae7eda5..a1bb5d81 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/silphco11.asm
@@ -1,4 +1,4 @@
-SilphCo11Object: ; 0x62380 (size=72)
+SilphCo11Object:
db $d ; border block
db $4 ; warps
diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm
index 44271d70..ae3aca74 100755
--- a/data/mapObjects/silphco2.asm
+++ b/data/mapObjects/silphco2.asm
@@ -1,4 +1,4 @@
-SilphCo2Object: ; 0x59e66 (size=98)
+SilphCo2Object:
db $2e ; border block
db $7 ; warps
diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm
index 48bb8c1a..ddea9062 100755
--- a/data/mapObjects/silphco3.asm
+++ b/data/mapObjects/silphco3.asm
@@ -1,4 +1,4 @@
-SilphCo3Object: ; 0x5a035 (size=113)
+SilphCo3Object:
db $2e ; border block
db $a ; warps
diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm
index 762ca7f8..a2320112 100755
--- a/data/mapObjects/silphco4.asm
+++ b/data/mapObjects/silphco4.asm
@@ -1,4 +1,4 @@
-SilphCo4Object: ; 0x19e35 (size=111)
+SilphCo4Object:
db $2e ; border block
db $7 ; warps
diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm
index 0c956cd3..62e30fac 100755
--- a/data/mapObjects/silphco5.asm
+++ b/data/mapObjects/silphco5.asm
@@ -1,4 +1,4 @@
-SilphCo5Object: ; 0x1a08d (size=137)
+SilphCo5Object:
db $2e ; border block
db $7 ; warps
diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm
index 66372f57..19d66e50 100755
--- a/data/mapObjects/silphco6.asm
+++ b/data/mapObjects/silphco6.asm
@@ -1,4 +1,4 @@
-SilphCo6Object: ; 0x1a2fb (size=112)
+SilphCo6Object:
db $2e ; border block
db $5 ; warps
diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm
index ef665ac0..47e881fe 100755
--- a/data/mapObjects/silphco7.asm
+++ b/data/mapObjects/silphco7.asm
@@ -1,4 +1,4 @@
-SilphCo7Object: ; 0x51ed7 (size=128)
+SilphCo7Object:
db $2e ; border block
db $6 ; warps
diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm
index a4b97a91..188b27b6 100755
--- a/data/mapObjects/silphco8.asm
+++ b/data/mapObjects/silphco8.asm
@@ -1,4 +1,4 @@
-SilphCo8Object: ; 0x56613 (size=90)
+SilphCo8Object:
db $2e ; border block
db $7 ; warps
diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm
index 204f0d1d..76d82895 100755
--- a/data/mapObjects/silphco9.asm
+++ b/data/mapObjects/silphco9.asm
@@ -1,4 +1,4 @@
-SilphCo9Object: ; 0x5d93f (size=74)
+SilphCo9Object:
db $2e ; border block
db $5 ; warps
diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm
index 0e0f03c6..2de795ae 100755
--- a/data/mapObjects/silphcoelevator.asm
+++ b/data/mapObjects/silphcoelevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevatorObject: ; 0x45844 (size=23)
+SilphCoElevatorObject:
db $f ; border block
db $2 ; warps
diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm
index c631074c..7f6a826c 100755
--- a/data/mapObjects/ssanne1.asm
+++ b/data/mapObjects/ssanne1.asm
@@ -1,4 +1,4 @@
-SSAnne1Object: ; 0x61277 (size=104)
+SSAnne1Object:
db $c ; border block
db $b ; warps
diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm
index c57925f1..a8f49cf7 100755
--- a/data/mapObjects/ssanne10.asm
+++ b/data/mapObjects/ssanne10.asm
@@ -1,4 +1,4 @@
-SSAnne10Object: ; 0x61e75 (size=165)
+SSAnne10Object:
db $c ; border block
db $a ; warps
diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm
index 9f3691cf..eb761685 100755
--- a/data/mapObjects/ssanne2.asm
+++ b/data/mapObjects/ssanne2.asm
@@ -1,4 +1,4 @@
-SSAnne2Object: ; 0x61514 (size=90)
+SSAnne2Object:
db $c ; border block
db $9 ; warps
diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm
index 1037d118..567f0363 100755
--- a/data/mapObjects/ssanne3.asm
+++ b/data/mapObjects/ssanne3.asm
@@ -1,4 +1,4 @@
-SSAnne3Object: ; 0x4493c (size=26)
+SSAnne3Object:
db $c ; border block
db $2 ; warps
diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm
index 9d752480..fbd1df5b 100755
--- a/data/mapObjects/ssanne4.asm
+++ b/data/mapObjects/ssanne4.asm
@@ -1,4 +1,4 @@
-SSAnne4Object: ; 0x61632 (size=52)
+SSAnne4Object:
db $c ; border block
db $6 ; warps
diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm
index e18f1074..6031327e 100755
--- a/data/mapObjects/ssanne5.asm
+++ b/data/mapObjects/ssanne5.asm
@@ -1,4 +1,4 @@
-SSAnne5Object: ; 0x6172b (size=54)
+SSAnne5Object:
db $23 ; border block
db $2 ; warps
diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm
index 159a3ed2..8c2444f8 100755
--- a/data/mapObjects/ssanne6.asm
+++ b/data/mapObjects/ssanne6.asm
@@ -1,4 +1,4 @@
-SSAnne6Object: ; 0x6181b (size=54)
+SSAnne6Object:
db $c ; border block
db $1 ; warps
diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm
index 6179a28e..6002e85b 100755
--- a/data/mapObjects/ssanne7.asm
+++ b/data/mapObjects/ssanne7.asm
@@ -1,4 +1,4 @@
-SSAnne7Object: ; 0x61946 (size=24)
+SSAnne7Object:
db $c ; border block
db $1 ; warps
diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm
index f089b35d..0d1ea2f3 100755
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/ssanne8.asm
@@ -1,4 +1,4 @@
-SSAnne8Object: ; 0x61a60 (size=127)
+SSAnne8Object:
db $c ; border block
db $6 ; warps
diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm
index 7fddc058..6b5e4b7d 100755
--- a/data/mapObjects/ssanne9.asm
+++ b/data/mapObjects/ssanne9.asm
@@ -1,4 +1,4 @@
-SSAnne9Object: ; 0x61c8d (size=188)
+SSAnne9Object:
db $c ; border block
db $c ; warps
diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm
index 57a3eee5..f482fc4f 100644
--- a/data/mapObjects/tradecenter.asm
+++ b/data/mapObjects/tradecenter.asm
@@ -1,4 +1,4 @@
-TradeCenterObject: ; 0x4fd53 (size=10)
+TradeCenterObject:
db $e ; border block
db $0 ; warps
diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm
index a2f18179..14d7232e 100755
--- a/data/mapObjects/undergroundpathentranceroute5.asm
+++ b/data/mapObjects/undergroundpathentranceroute5.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute5Object: ; 0x5d6c1 (size=34)
+UndergroundPathEntranceRoute5Object:
db $a ; border block
db $3 ; warps
diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm
index 834263b5..7bce8774 100755
--- a/data/mapObjects/undergroundpathentranceroute6.asm
+++ b/data/mapObjects/undergroundpathentranceroute6.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute6Object: ; 0x5d6fe (size=34)
+UndergroundPathEntranceRoute6Object:
db $a ; border block
db $3 ; warps
diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm
index 909ff4a0..51b4bcda 100755
--- a/data/mapObjects/undergroundpathentranceroute7.asm
+++ b/data/mapObjects/undergroundpathentranceroute7.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34)
+UndergroundPathEntranceRoute7Object:
db $a ; border block
db $3 ; warps
diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm
index 707a0e0e..04a5bf2f 100755
--- a/data/mapObjects/undergroundpathentranceroute7copy.asm
+++ b/data/mapObjects/undergroundpathentranceroute7copy.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787)
+UndergroundPathEntranceRoute7CopyObject:
db $a ; border block
db $3 ; warps
diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm
index 9a1d9d37..9e98c987 100755
--- a/data/mapObjects/undergroundpathentranceroute8.asm
+++ b/data/mapObjects/undergroundpathentranceroute8.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34)
+UndergroundPathEntranceRoute8Object:
db $a ; border block
db $3 ; warps
diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm
index d9ae7499..d0188a76 100755
--- a/data/mapObjects/undergroundpathns.asm
+++ b/data/mapObjects/undergroundpathns.asm
@@ -1,4 +1,4 @@
-UndergroundPathNSObject: ; 0x61f2a (size=20)
+UndergroundPathNSObject:
db $1 ; border block
db $2 ; warps
diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm
index 303f60b9..42bbb9bf 100755
--- a/data/mapObjects/undergroundpathwe.asm
+++ b/data/mapObjects/undergroundpathwe.asm
@@ -1,4 +1,4 @@
-UndergroundPathWEObject: ; 0x61f4e (size=20)
+UndergroundPathWEObject:
db $1 ; border block
db $2 ; warps
diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm
index 0635e9a7..5348dab8 100755
--- a/data/mapObjects/unknowndungeon1.asm
+++ b/data/mapObjects/unknowndungeon1.asm
@@ -1,4 +1,4 @@
-UnknownDungeon1Object: ; 0x74d15 (size=97)
+UnknownDungeon1Object:
db $7d ; border block
db $9 ; warps
diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm
index 88cc6ba0..8e696462 100755
--- a/data/mapObjects/unknowndungeon2.asm
+++ b/data/mapObjects/unknowndungeon2.asm
@@ -1,4 +1,4 @@
-UnknownDungeon2Object: ; 0x45e14 (size=73)
+UnknownDungeon2Object:
db $7d ; border block
db $6 ; warps
diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm
index cb2d8f83..18439368 100755
--- a/data/mapObjects/unknowndungeon3.asm
+++ b/data/mapObjects/unknowndungeon3.asm
@@ -1,4 +1,4 @@
-UnknownDungeon3Object: ; 0x45f36 (size=34)
+UnknownDungeon3Object:
db $7d ; border block
db $1 ; warps
diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm
index 3bfbc947..8342a2a6 100755
--- a/data/mapObjects/vermilioncity.asm
+++ b/data/mapObjects/vermilioncity.asm
@@ -1,4 +1,4 @@
-VermilionCityObject: ; 0x189ba (size=133)
+VermilionCityObject:
db $43 ; border block
db $9 ; warps
diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm
index b8aa659d..54d6790a 100755
--- a/data/mapObjects/vermiliondock.asm
+++ b/data/mapObjects/vermiliondock.asm
@@ -1,4 +1,4 @@
-VermilionDockObject: ; 0x1dcc6 (size=20)
+VermilionDockObject:
db $f ; border block
db $2 ; warps
diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm
index 892403a3..9058ec4c 100755
--- a/data/mapObjects/vermiliongym.asm
+++ b/data/mapObjects/vermiliongym.asm
@@ -1,4 +1,4 @@
-VermilionGymObject: ; 0x5cbfe (size=58)
+VermilionGymObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm
index 952661cc..199489ba 100755
--- a/data/mapObjects/vermilionhouse1.asm
+++ b/data/mapObjects/vermilionhouse1.asm
@@ -1,4 +1,4 @@
-VermilionHouse1Object: ; 0x1db20 (size=38)
+VermilionHouse1Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm
index 03c3c1a2..0108233b 100755
--- a/data/mapObjects/vermilionhouse2.asm
+++ b/data/mapObjects/vermilionhouse2.asm
@@ -1,4 +1,4 @@
-VermilionHouse2Object: ; 0x560cf (size=26)
+VermilionHouse2Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm
index 161ad090..3d269364 100755
--- a/data/mapObjects/vermilionhouse3.asm
+++ b/data/mapObjects/vermilionhouse3.asm
@@ -1,4 +1,4 @@
-VermilionHouse3Object: ; 0x19c25 (size=26)
+VermilionHouse3Object:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm
index 56c52944..01df824e 100755
--- a/data/mapObjects/vermilionmart.asm
+++ b/data/mapObjects/vermilionmart.asm
@@ -1,4 +1,4 @@
-VermilionMartObject: ; 0x5c9f4 (size=38)
+VermilionMartObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm
index cd11d653..1440531f 100755
--- a/data/mapObjects/vermilionpokecenter.asm
+++ b/data/mapObjects/vermilionpokecenter.asm
@@ -1,4 +1,4 @@
-VermilionPokecenterObject: ; 0x5c9a9 (size=44)
+VermilionPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm
index 9e66e95b..05680b9f 100755
--- a/data/mapObjects/victoryroad1.asm
+++ b/data/mapObjects/victoryroad1.asm
@@ -1,4 +1,4 @@
-VictoryRoad1Object: ; 0x5dab8 (size=76)
+VictoryRoad1Object:
db $7d ; border block
db $3 ; warps
diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm
index 348cae03..1bada62a 100755
--- a/data/mapObjects/victoryroad2.asm
+++ b/data/mapObjects/victoryroad2.asm
@@ -1,4 +1,4 @@
-VictoryRoad2Object: ; 0x51915 (size=154)
+VictoryRoad2Object:
db $7d ; border block
db $7 ; warps
diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm
index 19a06c65..20e43583 100755
--- a/data/mapObjects/victoryroad3.asm
+++ b/data/mapObjects/victoryroad3.asm
@@ -1,4 +1,4 @@
-VictoryRoad3Object: ; 0x44acd (size=106)
+VictoryRoad3Object:
db $7d ; border block
db $4 ; warps
diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm
index 79b177f4..465d53bc 100755
--- a/data/mapObjects/viridiancity.asm
+++ b/data/mapObjects/viridiancity.asm
@@ -1,4 +1,4 @@
-ViridianCityObject: ; 0x18384 (size=104)
+ViridianCityObject:
db $f ; border block
db $5 ; warps
diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm
index 8f5d6b0b..0bb67f82 100755
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/viridianforest.asm
@@ -1,4 +1,4 @@
-ViridianForestObject: ; 0x611da (size=127)
+ViridianForestObject:
db $3 ; border block
db $6 ; warps
diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm
index 891c0636..8fe934ae 100755
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/viridianforestentrance.asm
@@ -1,4 +1,4 @@
-ViridianForestEntranceObject: ; 0x5d66d (size=48)
+ViridianForestEntranceObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm
index be8b65ea..0f48fd1c 100755
--- a/data/mapObjects/viridianforestexit.asm
+++ b/data/mapObjects/viridianforestexit.asm
@@ -1,4 +1,4 @@
-ViridianForestExitObject: ; 0x5d598 (size=48)
+ViridianForestExitObject:
db $a ; border block
db $4 ; warps
diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm
index 468b9022..8efa5e22 100755
--- a/data/mapObjects/viridiangym.asm
+++ b/data/mapObjects/viridiangym.asm
@@ -1,4 +1,4 @@
-ViridianGymObject: ; 0x74bde (size=105)
+ViridianGymObject:
db $3 ; border block
db $2 ; warps
diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm
index ba45adac..c06bb9c8 100755
--- a/data/mapObjects/viridianhouse.asm
+++ b/data/mapObjects/viridianhouse.asm
@@ -1,4 +1,4 @@
-ViridianHouseObject: ; 0x1d5bb (size=44)
+ViridianHouseObject:
db $a ; border block
db $2 ; warps
diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm
index ed2642f9..4b90bee3 100755
--- a/data/mapObjects/viridianmart.asm
+++ b/data/mapObjects/viridianmart.asm
@@ -1,4 +1,4 @@
-ViridianMartObject: ; 0x1d50a (size=38)
+ViridianMartObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm
index 74c27d46..39432c17 100755
--- a/data/mapObjects/viridianpokecenter.asm
+++ b/data/mapObjects/viridianpokecenter.asm
@@ -1,4 +1,4 @@
-ViridianPokecenterObject: ; 0x44277 (size=44)
+ViridianPokecenterObject:
db $0 ; border block
db $2 ; warps
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index eef36242..f26b305d 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -1,5 +1,5 @@
; see also MapHeaderPointers
-MapHeaderBanks:: ; fc3e4 (3f:43e4)
+MapHeaderBanks::
db BANK(PalletTown_h) ;PALLET_TOWN
db BANK(ViridianCity_h) ; VIRIDIAN_CITY
db BANK(PewterCity_h) ; PEWTER_CITY
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 730038f3..325ff4bb 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -1,5 +1,5 @@
; see also MapHeaderBanks
-MapHeaderPointers:: ; fc1f2 (3f:41f2)
+MapHeaderPointers::
dw PalletTown_h
dw ViridianCity_h
dw PewterCity_h
diff --git a/data/map_songs.asm b/data/map_songs.asm
index b65822e7..973f6945 100644
--- a/data/map_songs.asm
+++ b/data/map_songs.asm
@@ -1,4 +1,4 @@
-MapSongBanks: ; fc000 (3f:4000)
+MapSongBanks:
db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN
db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY
db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY
@@ -247,4 +247,4 @@ MapSongBanks: ; fc000 (3f:4000)
db MUSIC_GYM, BANK(Music_Gym) ; Lorelei
db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno
db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha
- db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse \ No newline at end of file
+ db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm
index b271aa5a..065db93e 100755
--- a/data/mon_palettes.asm
+++ b/data/mon_palettes.asm
@@ -1,4 +1,4 @@
-MonsterPalettes: ; 72921 (1c:6921)
+MonsterPalettes:
db PAL_MEWMON ; MISSINGNO
db PAL_GREENMON ; BULBASAUR
db PAL_GREENMON ; IVYSAUR
@@ -151,4 +151,4 @@ MonsterPalettes: ; 72921 (1c:6921)
db PAL_BROWNMON ; DRAGONITE
db PAL_MEWMON ; MEWTWO
db PAL_MEWMON ; MEW
-; 1c:69b9 \ No newline at end of file
+; 1c:69b9
diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm
index 017c8d7c..81600f45 100755
--- a/data/mon_party_sprites.asm
+++ b/data/mon_party_sprites.asm
@@ -1,4 +1,4 @@
-MonPartyData: ; 719ba (1c:59ba)
+MonPartyData:
; MON = 0
; BALL_M = 1
; HELIX = 2
@@ -85,4 +85,4 @@ MonPartyData: ; 719ba (1c:59ba)
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres
dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair
dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo
- dn SPRITE_MON, 0 ;Mew/Padding \ No newline at end of file
+ dn SPRITE_MON, 0 ;Mew/Padding
diff --git a/data/pikachu_emotions.asm b/data/pikachu_emotions.asm
index a1d902c3..f72beaa4 100755
--- a/data/pikachu_emotions.asm
+++ b/data/pikachu_emotions.asm
@@ -1,266 +1,266 @@
-PikachuEmotion0_fd115: ; fd115 (3f:5115)
+PikachuEmotion0:
db $ff
-PikachuEmotion2_fd116: ; fd116 (3f:5116)
+PikachuEmotion2:
pikaemotion_dummy2
pikaemotion_emotebubble SMILE_BUBBLE
pikaemotion_pcm PikachuCry35
- pikaemotion_pikapic $2
+ pikaemotion_pikapic PikaPicAnimScript2
db $ff
-PikachuEmotion10_fd11e: ; fd11e (3f:511e)
+PikachuEmotion10:
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
pikaemotion_emotebubble HEART_BUBBLE
pikaemotion_pcm PikachuCry5
- pikaemotion_pikapic $a
+ pikaemotion_pikapic PikaPicAnimScript10
db $ff
-PikachuEmotion7_fd128: ; fd128 (3f:5128)
+PikachuEmotion7:
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
- pikaemotion_movement Pointer_fd224
+ pikaemotion_movement PikachuMovementData_fd224
pikaemotion_pcm PikachuCry1
- pikaemotion_movement Pointer_fd224
- pikaemotion_pikapic $7
+ pikaemotion_movement PikachuMovementData_fd224
+ pikaemotion_pikapic PikaPicAnimScript7
db $ff
-PikachuEmotion4_fd136: ; fd136 (3f:5136)
+PikachuEmotion4:
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
- pikaemotion_movement Pointer_fd230
+ pikaemotion_movement PikachuMovementData_fd230
pikaemotion_pcm PikachuCry29
- pikaemotion_pikapic $4
+ pikaemotion_pikapic PikaPicAnimScript4
db $ff
-PikachuEmotion1_fd141: ; fd141 (3f:5141)
+PikachuEmotion1:
pikaemotion_dummy2
pikaemotion_pcm
- pikaemotion_pikapic $1
+ pikaemotion_pikapic PikaPicAnimScript1
db $ff
-PikachuEmotion8_fd147: ; fd147 (3f:5147)
+PikachuEmotion8:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry39
- pikaemotion_pikapic $8
+ pikaemotion_pikapic PikaPicAnimScript8
db $ff
-PikachuEmotion5_fd14d: ; fd14d (3f:514d)
+PikachuEmotion5:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry31
- pikaemotion_pikapic $5
+ pikaemotion_pikapic PikaPicAnimScript5
db $ff
-PikachuEmotion6_fd153: ; fd153 (3f:5153)
+PikachuEmotion6:
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
pikaemotion_pcm
- pikaemotion_movement Pointer_fd21e
+ pikaemotion_movement PikachuMovementData_fd21e
pikaemotion_emotebubble SKULL_BUBBLE
- pikaemotion_pikapic $6
+ pikaemotion_pikapic PikaPicAnimScript6
db $ff
-PikachuEmotion3_fd160: ; fd160 (3f:5160)
+PikachuEmotion3:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry40
- pikaemotion_pikapic $3
+ pikaemotion_pikapic PikaPicAnimScript3
db $ff
-PikachuEmotion9_fd166: ; fd166 (3f:5166)
+PikachuEmotion9:
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
pikaemotion_pcm PikachuCry6
- pikaemotion_movement Pointer_fd218
+ pikaemotion_movement PikachuMovementData_fd218
pikaemotion_emotebubble SKULL_BUBBLE
- pikaemotion_pikapic $9
+ pikaemotion_pikapic PikaPicAnimScript9
db $ff
-PikachuEmotion11_fd173: ; fd173 (3f:5173)
+PikachuEmotion11:
pikaemotion_emotebubble ZZZ_BUBBLE
pikaemotion_pcm PikachuCry37
- pikaemotion_pikapic $b
+ pikaemotion_pikapic PikaPicAnimScript11
db $ff
-PikachuEmotion12_fd17a: ; fd17a (3f:517a)
+PikachuEmotion12:
pikaemotion_dummy2
pikaemotion_pcm
- pikaemotion_pikapic $c
+ pikaemotion_pikapic PikaPicAnimScript12
db $ff
-PikachuEmotion13_fd180: ; fd180 (3f:5180)
+PikachuEmotion13:
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
- pikaemotion_movement Pointer_fd21e
- pikaemotion_pikapic $d
+ pikaemotion_movement PikachuMovementData_fd21e
+ pikaemotion_pikapic PikaPicAnimScript13
db $ff
-PikachuEmotion14_fd189: ; fd189 (3f:5189)
+PikachuEmotion14:
pikaemotion_dummy2
pikaemotion_emotebubble BOLT_BUBBLE
pikaemotion_pcm PikachuCry10
- pikaemotion_pikapic $e
+ pikaemotion_pikapic PikaPicAnimScript14
db $ff
-PikachuEmotion15_fd191: ; fd191 (3f:5191)
+PikachuEmotion15:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry34
- pikaemotion_pikapic $f
+ pikaemotion_pikapic PikaPicAnimScript15
db $ff
-PikachuEmotion16_fd197: ; fd197 (3f:5197)
+PikachuEmotion16:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry33
- pikaemotion_pikapic $10
+ pikaemotion_pikapic PikaPicAnimScript16
db $ff
-PikachuEmotion17_fd19d: ; fd19d (3f:519d)
+PikachuEmotion17:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry13
- pikaemotion_pikapic $11
+ pikaemotion_pikapic PikaPicAnimScript17
db $ff
-PikachuEmotion18_fd1a3: ; fd1a3 (3f:51a3)
+PikachuEmotion18:
pikaemotion_dummy2
pikaemotion_pcm
- pikaemotion_pikapic $12
+ pikaemotion_pikapic PikaPicAnimScript18
db $ff
-PikachuEmotion19_fd1a9: ; fd1a9 (3f:51a9)
+PikachuEmotion19:
pikaemotion_dummy2
pikaemotion_emotebubble HEART_BUBBLE
pikaemotion_pcm PikachuCry33
- pikaemotion_pikapic $13
+ pikaemotion_pikapic PikaPicAnimScript19
db $ff
-PikachuEmotion20_fd1b1: ; fd1b1 (3f:51b1)
+PikachuEmotion20:
pikaemotion_dummy2
pikaemotion_emotebubble HEART_BUBBLE
pikaemotion_pcm PikachuCry5
- pikaemotion_pikapic $14
+ pikaemotion_pikapic PikaPicAnimScript20
db $ff
-PikachuEmotion21_fd1b9: ; fd1b9 (3f:51b9)
+PikachuEmotion21:
pikaemotion_dummy2
pikaemotion_emotebubble FISH_BUBBLE
pikaemotion_pcm
- pikaemotion_pikapic $15
+ pikaemotion_pikapic PikaPicAnimScript21
db $ff
-PikachuEmotion22_fd1c1: ; fd1c1 (3f:51c1)
+PikachuEmotion22:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry4
- pikaemotion_pikapic $16
+ pikaemotion_pikapic PikaPicAnimScript22
db $ff
-PikachuEmotion23_fd1c7: ; fd1c7 (3f:51c7)
+PikachuEmotion23:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry19
- pikaemotion_pikapic $17
+ pikaemotion_pikapic PikaPicAnimScript23
pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
db $ff
-PikachuEmotion24_fd1cf: ; fd1cf (3f:51cf)
+PikachuEmotion24:
pikaemotion_dummy2
pikaemotion_emotebubble EXCLAMATION_BUBBLE
pikaemotion_pcm
- pikaemotion_pikapic $18
+ pikaemotion_pikapic PikaPicAnimScript24
db $ff
-PikachuEmotion25_fd1d7: ; fd1d7 (3f:51d7)
+PikachuEmotion25:
pikaemotion_dummy2
pikaemotion_emotebubble BOLT_BUBBLE
pikaemotion_pcm PikachuCry35
- pikaemotion_pikapic $19
+ pikaemotion_pikapic PikaPicAnimScript25
db $ff
-PikachuEmotion26_fd1df: ; fd1df (3f:51df)
+PikachuEmotion26:
pikaemotion_dummy2
pikaemotion_emotebubble ZZZ_BUBBLE
pikaemotion_pcm PikachuCry37
- pikaemotion_pikapic $1a
+ pikaemotion_pikapic PikaPicAnimScript26
pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKPEWTERCENTER
db $ff
-PikachuEmotion27_fd1eb: ; fd1eb (3f:51eb)
+PikachuEmotion27:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry9
- pikaemotion_pikapic $1b
+ pikaemotion_pikapic PikaPicAnimScript27
db $ff
-PikachuEmotion28_fd1f1: ; fd1f1 (3f:51f1)
+PikachuEmotion28:
pikaemotion_dummy2
pikaemotion_pcm PikachuCry15
- pikaemotion_pikapic $1c
+ pikaemotion_pikapic PikaPicAnimScript28
db $ff
-PikachuEmotion29_fd1f7: ; fd1f7 (3f:51f7)
+PikachuEmotion29:
pikaemotion_pcm PikachuCry5
- pikaemotion_pikapic $a
+ pikaemotion_pikapic PikaPicAnimScript10
db $ff
-PikachuEmotion30_fd1fc: ; fd1fc (3f:51fc)
+PikachuEmotion30:
pikaemotion_9
pikaemotion_emotebubble HEART_BUBBLE
pikaemotion_pcm PikachuCry5
- pikaemotion_pikapic $14
+ pikaemotion_pikapic PikaPicAnimScript20
pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADFONT
pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKLAVENDERTOWER
db $ff
-PikachuEmotion31_fd20a: ; fd20a (3f:520a)
+PikachuEmotion31:
pikaemotion_pcm PikachuCry19
- pikaemotion_pikapic $17
+ pikaemotion_pikapic PikaPicAnimScript23
pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKBILLSHOUSE
db $ff
-PikachuEmotion32_fd213: ; fd213 (3f:5213)
+PikachuEmotion32:
pikaemotion_pcm PikachuCry26
- pikaemotion_pikapic $17
+ pikaemotion_pikapic PikaPicAnimScript23
db $ff
-Pointer_fd218: ; fd218 (3f:5218)
+PikachuMovementData_fd218:
db $00
- db $39, $01
- db $3e, $1e
+ db $39, 2 - 1
+ db $3e, 31 - 1
db $3f
-Pointer_fd21e: ; fd21e (3f:521e)
+PikachuMovementData_fd21e:
db $00
- db $39, $00
- db $3e, $1e
+ db $39, 1 - 1
+ db $3e, 31 - 1
db $3f
-Pointer_fd224: ; fd224 (3f:5224)
+PikachuMovementData_fd224:
db $00
- db $3c, $07, $2f
- db $3c, $07, $2f
+ db $3c, 8 - 1, (2 << 4) | (16 - 1)
+ db $3c, 8 - 1, (2 << 4) | (16 - 1)
db $3f
-Pointer_fd22c: ; fd22c (3f:522c)
- db $3b, $1f, $03
+PikachuMovementData_fd22c:
+ db $3b, 32 - 1, 4 - 1
db $3f
-Pointer_fd230: ; fd230 (3f:5230)
+PikachuMovementData_fd230:
db $00
- db $3c, $0f, $1f
- db $3c, $0f, $1f
+ db $3c, 16 - 1, (1 << 4) | (16 - 1)
+ db $3c, 16 - 1, (1 << 4) | (16 - 1)
db $3f
-Pointer_fd238: ; fd238 (3f:5238)
+PikachuMovementData_fd238:
db $00
- db $05, $07
- db $39, $00
- db $05, $07
- db $06, $07
- db $39, $00
- db $06, $07
- db $08, $07
- db $39, $00
- db $08, $07
- db $07, $07
- db $39, $00
- db $07, $07
+ db $05, 8 - 1
+ db $39, 1 - 1
+ db $05, 8 - 1
+ db $06, 8 - 1
+ db $39, 1 - 1
+ db $06, 8 - 1
+ db $08, 8 - 1
+ db $39, 1 - 1
+ db $08, 8 - 1
+ db $07, 8 - 1
+ db $39, 1 - 1
+ db $07, 8 - 1
db $3f
diff --git a/data/pikachu_pic_animation.asm b/data/pikachu_pic_animation.asm
index f1f6bd68..d10f65dd 100755
--- a/data/pikachu_pic_animation.asm
+++ b/data/pikachu_pic_animation.asm
@@ -1,4 +1,4 @@
-Data_fe242:
+PikaPicAnimThunderboltPals:
db 4, %11000000
db 4, %11100100
db 4, %11000000
@@ -21,268 +21,270 @@ Data_fe242:
db 4, %11100100
db $ff
-Data_fe26b: ; fe26b (3f:626b)
+Data_fe26b:
pikapic_loadgfx Pic_e4000
pikapic_loadgfx Pic_e49d1
pikapic_loadgfx PikachuSprite
- pikapic_object $1, $80, $0, $0
- pikapic_object $2, $b2, $5, $5
- pikapic_object $3, $b6, $5, $5
+ pikapic_animation PikaPicAnimBGFrames_1, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_2, $b2, $5, $5
+ pikapic_animation PikaPicAnimBGFrames_3, $b6, $5, $5
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe28a: ; fe28a (3f:628a)
+PikaPicAnimScript0:
+PikaPicAnimScript1:
+PikaPicAnimScript29:
pikapic_setduration 40
pikapic_loadgfx Pic_e4000
pikapic_loadgfx GFX_e40cc
- pikapic_object $4, $80, $0, $0
- pikapic_object $6, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_6, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry3
pikapic_looptofinish
-Data_fe2a4: ; fe2a4 (3f:62a4)
+PikaPicAnimScript2:
pikapic_setduration 44
pikapic_loadgfx Pic_e411c
pikapic_loadgfx GFX_e41d2
- pikapic_object $4, $80, $0, $0
- pikapic_object $7, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_7, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe2be: ; fe2be (3f:62be)
+PikaPicAnimScript3:
pikapic_setduration 80
pikapic_loadgfx Pic_e4272
pikapic_loadgfx GFX_e4323
- pikapic_object $4, $80, $0, $0
- pikapic_object $8, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_8, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe2d8: ; fe2d8 (3f:62d8)
+PikaPicAnimScript4:
pikapic_setduration 70
pikapic_loadgfx Pic_e4383
pikapic_loadgfx GFX_e444b
- pikapic_object $4, $80, $0, $0
- pikapic_object $9, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_9, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe2f2: ; fe2f2 (3f:62f2)
+PikaPicAnimScript5:
pikapic_setduration 32
pikapic_loadgfx Pic_e458b
pikapic_loadgfx GFX_e463b
- pikapic_object $4, $80, $0, $0
- pikapic_object $a, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_10, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe30c: ; fe30c (3f:630c)
+PikaPicAnimScript6:
pikapic_setduration 50
pikapic_loadgfx Pic_e467b
pikapic_loadgfx GFX_e472e
- pikapic_object $4, $80, $0, $0
- pikapic_object $b, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_11, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry38
pikapic_looptofinish
-Data_fe326: ; fe326 (3f:6326)
+PikaPicAnimScript7:
pikapic_setduration 58
pikapic_loadgfx Pic_e476e
pikapic_loadgfx GFX_e4841
- pikapic_object $4, $80, $0, $0
- pikapic_object $c, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_12, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe340: ; fe340 (3f:6340)
+PikaPicAnimScript8:
pikapic_setduration 44
pikapic_loadgfx Pic_e49d1
pikapic_loadgfx GFX_e4a99
- pikapic_object $4, $80, $0, $0
- pikapic_object $d, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_13, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe35a: ; fe35a (3f:635a)
+PikaPicAnimScript9:
pikapic_setduration 56
pikapic_loadgfx Pic_e4b39
pikapic_loadgfx GFX_e4bde
- pikapic_object $4, $80, $0, $0
- pikapic_object $e, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_14, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe374: ; fe374 (3f:6374)
+PikaPicAnimScript10:
pikapic_setduration 56
pikapic_loadgfx Pic_e4c3e
pikapic_loadgfx GFX_e4ce0
pikapic_loadgfx GFX_e4e70
- pikapic_object $4, $80, $0, $0
- pikapic_object $10, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_16, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe390: ; fe390 (3f:6390)
+PikaPicAnimScript11:
pikapic_setduration 100
pikapic_loadgfx Pic_e5000
pikapic_loadgfx GFX_e50af
- pikapic_object $4, $80, $0, $0
- pikapic_object $11, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_17, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe3aa: ; fe3aa (3f:63aa)
+PikaPicAnimScript12:
pikapic_setduration 50
pikapic_loadgfx Pic_e523f
pikapic_loadgfx GFX_e52fe
- pikapic_object $4, $80, $0, $0
- pikapic_object $12, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_18, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry25
pikapic_looptofinish
-Data_fe3c4: ; fe3c4 (3f:63c4)
+PikaPicAnimScript13:
pikapic_setduration 50
pikapic_loadgfx Pic_e548e
pikapic_loadgfx GFX_e5541
- pikapic_object $4, $80, $0, $0
- pikapic_object $13, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_19, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe3de: ; fe3de (3f:63de)
+PikaPicAnimScript14:
pikapic_setduration 40
pikapic_loadgfx Pic_e56d1
pikapic_loadgfx GFX_e5794
- pikapic_object $4, $80, $0, $0
- pikapic_object $14, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_20, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe3f8: ; fe3f8 (3f:63f8)
+PikaPicAnimScript15:
pikapic_setduration 50
pikapic_loadgfx Pic_e5924
pikapic_loadgfx GFX_e59ed
- pikapic_object $4, $80, $0, $0
- pikapic_object $15, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_21, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe412: ; fe412 (3f:6412)
+PikaPicAnimScript16:
pikapic_setduration 32
pikapic_loadgfx Pic_e5b7d
pikapic_loadgfx GFX_e5c4d
- pikapic_object $4, $80, $0, $0
- pikapic_object $16, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_22, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe42c: ; fe42c (3f:642c)
+PikaPicAnimScript17:
pikapic_setduration 100
pikapic_loadgfx Pic_e5ddd
pikapic_loadgfx GFX_e5e90
- pikapic_object $4, $80, $0, $0
- pikapic_object $17, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_23, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe446: ; fe446 (3f:6446)
+PikaPicAnimScript18:
pikapic_setduration 32
pikapic_loadgfx GFX_e6020
pikapic_loadgfx GFX_e61b0
- pikapic_object $5, $80, $0, $0
- pikapic_object $18, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_24, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry18
pikapic_looptofinish
-Data_fe460: ; fe460 (3f:6460)
+PikaPicAnimScript19:
pikapic_setduration 44
pikapic_loadgfx Pic_e6340
pikapic_loadgfx GFX_e63f7
- pikapic_object $4, $80, $0, $0
- pikapic_object $19, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_25, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe47a: ; fe47a (3f:647a)
+PikaPicAnimScript20:
pikapic_setduration 50
pikapic_loadgfx Pic_e6587
pikapic_loadgfx GFX_e6646
- pikapic_object $4, $80, $0, $0
- pikapic_object $1a, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_26, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe494: ; fe494 (3f:6494)
+PikaPicAnimScript21:
pikapic_setduration 40
pikapic_loadgfx Pic_e67d6
pikapic_loadgfx GFX_e682f
pikapic_loadgfx GFX_e69bf
pikapic_loadgfx GFX_e6b4f
pikapic_loadgfx GFX_e6cdf
- pikapic_object $4, $80, $0, $0
- pikapic_object $1b, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_27, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry20
pikapic_looptofinish
-Data_fe4b4: ; fe4b4 (3f:64b4)
+PikaPicAnimScript22:
pikapic_setduration 40
pikapic_loadgfx GFX_e6e6f
pikapic_loadgfx GFX_e6fff
- pikapic_object $5, $80, $0, $0
- pikapic_object $1c, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_28, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe4ce: ; fe4ce (3f:64ce)
+PikaPicAnimScript23:
pikapic_setduration 70
pikapic_loadgfx GFX_e718f
pikapic_loadgfx GFX_e731f
- pikapic_object $5, $80, $0, $0
- pikapic_object $1d, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_29, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe4e8: ; fe4e8 (3f:64e8)
+PikaPicAnimScript24:
pikapic_setduration 60
pikapic_loadgfx GFX_e74af
pikapic_loadgfx GFX_e763f
- pikapic_object $5, $80, $0, $0
- pikapic_object $1e, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_30, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe502: ; fe502 (3f:6502)
+PikaPicAnimScript25:
pikapic_setduration 50
pikapic_loadgfx Pic_e77cf
pikapic_loadgfx GFX_e7863
pikapic_loadgfx GFX_e79f3
- pikapic_object $4, $80, $0, $0
- pikapic_object $1f, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_31, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_writebyte 13
@@ -290,37 +292,36 @@ Data_fe502: ; fe502 (3f:6502)
pikapic_thunderbolt
pikapic_ret
-Data_fe51f: ; fe51f (3f:651f)
+Data_fe51f:
pikapic_waitbgmap
-
-Data_fe520: ; fe520 (3f:6520)
+PikaPicAnimScript26:
pikapic_setduration 100
pikapic_loadgfx Pic_e5000
pikapic_loadgfx GFX_e50af
pikapic_loadgfx GFX_e7b83
pikapic_loadgfx GFX_e7d13
- pikapic_object $4, $80, $0, $0
- pikapic_object $20, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_32, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe53e: ; fe53e (3f:653e)
+PikaPicAnimScript27:
pikapic_setduration 30
pikapic_loadgfx Pic_f0abf
pikapic_loadgfx GFX_f0b64
- pikapic_object $4, $80, $0, $0
- pikapic_object $21, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_33, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
-Data_fe558: ; fe558 (3f:6558)
+PikaPicAnimScript28:
pikapic_setduration 64
pikapic_loadgfx Pic_f0cf4
pikapic_loadgfx GFX_f0d82
- pikapic_object $4, $80, $0, $0
- pikapic_object $22, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_34, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -328,10 +329,11 @@ Data_fe558: ; fe558 (3f:6558)
PikaPicAnimGFXHeaders:
pikapicanimgfx: MACRO
\2_id::
- db \1 ; size
+ db \1 ; size (-1 if compressed)
dba \2 ; pointer
endm
+PikaPicAnimGFX_Null_id::
dbbw 1, $39,$0000 ; 00
pikapicanimgfx -1, Pic_e4000 ; 01
pikapicanimgfx 5, GFX_e40cc ; 02
diff --git a/data/pikachu_pic_objects.asm b/data/pikachu_pic_objects.asm
new file mode 100755
index 00000000..940c1141
--- /dev/null
+++ b/data/pikachu_pic_objects.asm
@@ -0,0 +1,300 @@
+PikaPicAnimBGFramesPointers:
+pikaanim_def: macro
+\1_id: dw \1
+ endm
+
+ pikaanim_def PikaPicAnimBGFrames_0 ; 00
+ pikaanim_def PikaPicAnimBGFrames_1 ; 01
+ pikaanim_def PikaPicAnimBGFrames_2 ; 02
+ pikaanim_def PikaPicAnimBGFrames_3 ; 03
+ pikaanim_def PikaPicAnimBGFrames_4 ; 04
+ pikaanim_def PikaPicAnimBGFrames_5 ; 05
+ pikaanim_def PikaPicAnimBGFrames_6 ; 06
+ pikaanim_def PikaPicAnimBGFrames_7 ; 07
+ pikaanim_def PikaPicAnimBGFrames_8 ; 08
+ pikaanim_def PikaPicAnimBGFrames_9 ; 09
+ pikaanim_def PikaPicAnimBGFrames_10 ; 0a
+ pikaanim_def PikaPicAnimBGFrames_11 ; 0b
+ pikaanim_def PikaPicAnimBGFrames_12 ; 0c
+ pikaanim_def PikaPicAnimBGFrames_13 ; 0d
+ pikaanim_def PikaPicAnimBGFrames_14 ; 0e
+ pikaanim_def PikaPicAnimBGFrames_15 ; 0f
+ pikaanim_def PikaPicAnimBGFrames_16 ; 10
+ pikaanim_def PikaPicAnimBGFrames_17 ; 11
+ pikaanim_def PikaPicAnimBGFrames_18 ; 12
+ pikaanim_def PikaPicAnimBGFrames_19 ; 13
+ pikaanim_def PikaPicAnimBGFrames_20 ; 14
+ pikaanim_def PikaPicAnimBGFrames_21 ; 15
+ pikaanim_def PikaPicAnimBGFrames_22 ; 16
+ pikaanim_def PikaPicAnimBGFrames_23 ; 17
+ pikaanim_def PikaPicAnimBGFrames_24 ; 18
+ pikaanim_def PikaPicAnimBGFrames_25 ; 19
+ pikaanim_def PikaPicAnimBGFrames_26 ; 1a
+ pikaanim_def PikaPicAnimBGFrames_27 ; 1b
+ pikaanim_def PikaPicAnimBGFrames_28 ; 1c
+ pikaanim_def PikaPicAnimBGFrames_29 ; 1d
+ pikaanim_def PikaPicAnimBGFrames_30 ; 1e
+ pikaanim_def PikaPicAnimBGFrames_31 ; 1f
+ pikaanim_def PikaPicAnimBGFrames_32 ; 20
+ pikaanim_def PikaPicAnimBGFrames_33 ; 21
+ pikaanim_def PikaPicAnimBGFrames_34 ; 22
+ pikaanim_def PikaPicAnimBGFrames_35 ; 23
+
+PikaPicAnimBGFrames_0:
+PikaPicAnimBGFrames_1:
+ ; Tilemap idx, duration
+ pikaframe PikaAnimTilemap_1, 20
+ pikaframe PikaAnimTilemap_7, 2
+ pikaframe PikaAnimTilemap_1, 1
+ pikaframe PikaAnimTilemap_7, 2
+ pikaframe PikaAnimTilemap_1, 1
+ pikaframe PikaAnimTilemap_7, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_fdc1e: ; unreferenced
+ pikaframe PikaAnimTilemap_2, 2
+ pikaframe PikaAnimTilemap_1, 1
+ pikaframe PikaAnimTilemap_2, 2
+ pikaframe PikaAnimTilemap_1, 1
+ pikaframe PikaAnimTilemap_2, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_2:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_8, 8
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_8, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_3:
+ pikaframe PikaAnimTilemap_8, 8
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_8, 8
+ pikaframedelay 8
+ pikaframeend
+
+PikaPicAnimBGFrames_4:
+PikaPicAnimBGFrames_35:
+ pikaframe PikaAnimTilemap_1, 0
+ pikaframeend
+
+PikaPicAnimBGFrames_5:
+ pikaframe PikaAnimTilemap_9, 0
+ pikaframeend
+
+PikaPicAnimBGFrames_6:
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_14, 4
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_14, 4
+ pikaframedelay 64
+ pikaframe PikaAnimTilemap_14, 4
+ pikaframedelay 64
+ pikaframeend
+
+PikaPicAnimBGFrames_7:
+ pikaframedelay 4
+ pikaframe PikaAnimTilemap_15, 4
+ pikaframedelay 4
+ pikaframe PikaAnimTilemap_15, 4
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_15, 4
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_15, 4
+ pikaframeend
+
+PikaPicAnimBGFrames_8:
+ pikaframe PikaAnimTilemap_16, 1
+ pikaframedelay 1
+ pikaframe PikaAnimTilemap_16, 1
+ pikaframedelay 64
+ pikaframe PikaAnimTilemap_16, 1
+ pikaframedelay 64
+ pikaframeend
+
+PikaPicAnimBGFrames_9:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_17, 8
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_17, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_10:
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_18, 2
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_18, 64
+ pikaframedelay 3
+ pikaframe PikaAnimTilemap_18, 64
+ pikaframeend
+
+PikaPicAnimBGFrames_11:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_19, 64
+ pikaframedelay 4
+ pikaframe PikaAnimTilemap_19, 64
+ pikaframeend
+
+PikaPicAnimBGFrames_12:
+ pikaframe PikaAnimTilemap_20, 8
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_20, 8
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_20, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_13:
+ pikaframe PikaAnimTilemap_21, 4
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_21, 4
+ pikaframedelay 64
+ pikaframe PikaAnimTilemap_21, 4
+ pikaframedelay 64
+ pikaframeend
+
+PikaPicAnimBGFrames_14:
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_22, 2
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_22, 2
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_22, 2
+ pikaframeend
+
+PikaPicAnimBGFrames_15:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_23, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_16:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_23, 3
+ pikaframe PikaAnimTilemap_24, 5
+ pikaframe PikaAnimTilemap_23, 3
+ pikaframedelay 5
+ pikaframeend
+
+PikaPicAnimBGFrames_17:
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_25, 8
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_25, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_18:
+ pikaframedelay 13
+ pikaframe PikaAnimTilemap_26, 12
+ pikaframedelay 100
+ pikaframe PikaAnimTilemap_26, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_19:
+ pikaframedelay 5
+ pikaframe PikaAnimTilemap_27, 5
+ pikaframedelay 5
+ pikaframe PikaAnimTilemap_27, 5
+ pikaframedelay 100
+ pikaframeend
+
+PikaPicAnimBGFrames_20:
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_28, 2
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_28, 2
+ pikaframeend
+
+PikaPicAnimBGFrames_21:
+ pikaframedelay 5
+ pikaframe PikaAnimTilemap_29, 5
+ pikaframedelay 5
+ pikaframe PikaAnimTilemap_29, 5
+ pikaframeend
+
+PikaPicAnimBGFrames_22:
+ pikaframe PikaAnimTilemap_30, 8
+ pikaframedelay 100
+ pikaframeend
+
+PikaPicAnimBGFrames_23:
+ pikaframedelay 10
+ pikaframe PikaAnimTilemap_31, 3
+ pikaframedelay 3
+ pikaframe PikaAnimTilemap_31, 3
+ pikaframedelay 100
+ pikaframeend
+
+PikaPicAnimBGFrames_24:
+ pikaframedelay 3
+ pikaframe PikaAnimTilemap_32, 100
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_32, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_25:
+ pikaframe PikaAnimTilemap_33, 6
+ pikaframedelay 6
+ pikaframe PikaAnimTilemap_33, 6
+ pikaframedelay 6
+ pikaframeend
+
+PikaPicAnimBGFrames_26:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_34, 12
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_34, 12
+ pikaframeend
+
+PikaPicAnimBGFrames_27:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_9, 2
+ pikaframe PikaAnimTilemap_10, 1
+ pikaframe PikaAnimTilemap_11, 1
+ pikaframe PikaAnimTilemap_12, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_28:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_36, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_29:
+ pikaframedelay 16
+ pikaframe PikaAnimTilemap_37, 16
+ pikaframedelay 16
+ pikaframe PikaAnimTilemap_37, 16
+ pikaframeend
+
+PikaPicAnimBGFrames_30:
+ pikaframedelay 6
+ pikaframe PikaAnimTilemap_38, 6
+ pikaframedelay 6
+ pikaframe PikaAnimTilemap_38, 6
+ pikaframedelay 100
+ pikaframeend
+
+PikaPicAnimBGFrames_31:
+ pikaframedelay 6
+ pikaframe PikaAnimTilemap_9, 6
+ pikaframe PikaAnimTilemap_10, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_32:
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_9, 8
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_9, 8
+ pikaframe PikaAnimTilemap_10, 8
+ pikaframe PikaAnimTilemap_11, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_33:
+ pikaframedelay 4
+ pikaframe PikaAnimTilemap_9, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_34:
+ pikaframedelay 12
+ pikaframe PikaAnimTilemap_9, 12
+ pikaframedelay 12
+ pikaframe PikaAnimTilemap_9, 100
+ pikaframeend
diff --git a/data/pikachu_pic_tilemaps.asm b/data/pikachu_pic_tilemaps.asm
new file mode 100755
index 00000000..95882711
--- /dev/null
+++ b/data/pikachu_pic_tilemaps.asm
@@ -0,0 +1,253 @@
+PikaPicTilemapPointers:
+pikatilemap_def: macro
+\1_id: dw \1
+ endm
+
+ pikatilemap_def PikaAnimTilemap_0
+ pikatilemap_def PikaAnimTilemap_1
+ pikatilemap_def PikaAnimTilemap_2
+ pikatilemap_def PikaAnimTilemap_3
+ pikatilemap_def PikaAnimTilemap_4
+ pikatilemap_def PikaAnimTilemap_5
+ pikatilemap_def PikaAnimTilemap_6
+ pikatilemap_def PikaAnimTilemap_7
+ pikatilemap_def PikaAnimTilemap_8
+ pikatilemap_def PikaAnimTilemap_9
+ pikatilemap_def PikaAnimTilemap_10
+ pikatilemap_def PikaAnimTilemap_11
+ pikatilemap_def PikaAnimTilemap_12
+ pikatilemap_def PikaAnimTilemap_13
+ pikatilemap_def PikaAnimTilemap_14
+ pikatilemap_def PikaAnimTilemap_15
+ pikatilemap_def PikaAnimTilemap_16
+ pikatilemap_def PikaAnimTilemap_17
+ pikatilemap_def PikaAnimTilemap_18
+ pikatilemap_def PikaAnimTilemap_19
+ pikatilemap_def PikaAnimTilemap_20
+ pikatilemap_def PikaAnimTilemap_21
+ pikatilemap_def PikaAnimTilemap_22
+ pikatilemap_def PikaAnimTilemap_23
+ pikatilemap_def PikaAnimTilemap_24
+ pikatilemap_def PikaAnimTilemap_25
+ pikatilemap_def PikaAnimTilemap_26
+ pikatilemap_def PikaAnimTilemap_27
+ pikatilemap_def PikaAnimTilemap_28
+ pikatilemap_def PikaAnimTilemap_29
+ pikatilemap_def PikaAnimTilemap_30
+ pikatilemap_def PikaAnimTilemap_31
+ pikatilemap_def PikaAnimTilemap_32
+ pikatilemap_def PikaAnimTilemap_33
+ pikatilemap_def PikaAnimTilemap_34
+ pikatilemap_def PikaAnimTilemap_35
+ pikatilemap_def PikaAnimTilemap_36
+ pikatilemap_def PikaAnimTilemap_37
+ pikatilemap_def PikaAnimTilemap_38
+ pikatilemap_def PikaAnimTilemap_39
+ pikatilemap_def PikaAnimTilemap_40
+ pikatilemap_def PikaAnimTilemap_41
+ pikatilemap_def PikaAnimTilemap_42
+
+PikaAnimTilemap_0:
+ db $ff ; unused
+
+
+ ; $ff inhibits overwriting that tile
+PikaAnimTilemap_1:
+PikaAnimTilemap_42:
+ db 5, 5
+ db $00, $05, $0a, $0f, $14
+ db $01, $06, $0b, $10, $15
+ db $02, $07, $0c, $11, $16
+ db $03, $08, $0d, $12, $17
+ db $04, $09, $0e, $13, $18
+
+PikaAnimTilemap_2:
+ db 5, 5
+ db $19, $1e, $23, $28, $2d
+ db $1a, $1f, $24, $29, $2e
+ db $1b, $20, $25, $2a, $2f
+ db $1c, $21, $26, $2b, $30
+ db $1d, $22, $27, $2c, $31
+
+PikaAnimTilemap_7:
+ db 5, 5
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $20, $25, $ff, $ff
+ db $ff, $21, $26, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+
+PikaAnimTilemap_3:
+ db 1, 1
+ db $00
+
+PikaAnimTilemap_4:
+ db 2, 1
+ db $00
+ db $01
+
+PikaAnimTilemap_5:
+ db 1, 2
+ db $00, $01
+
+PikaAnimTilemap_6:
+PikaAnimTilemap_8:
+ db 2, 2
+ db $00, $01
+ db $02, $03
+
+PikaAnimTilemap_fde71: ; unused
+ db 3, 2
+ db $00, $01
+ db $02, $03
+ db $04, $05
+
+PikaAnimTilemap_fde79: ; unused
+ db 2, 3
+ db $00, $01, $02
+ db $03, $04, $05
+
+PikaAnimTilemap_14:
+ db 5, 5
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+ db $00, $01, $02, $03, $04
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+
+PikaAnimTilemap_15:
+ db 5, 5
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+ db $00, $01, $02, $03, $04
+ db $05, $06, $07, $08, $09
+
+PikaAnimTilemap_16:
+ db 5, 5
+ db $00, $01, $ff, $ff, $ff
+ db $02, $03, $ff, $ff, $ff
+ db $04, $05, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+
+PikaAnimTilemap_17:
+ db 5, 5
+ db $ff, $ff, $ff, $ff, $ff
+ db $00, $01, $02, $03, $04
+ db $05, $06, $07, $08, $09
+ db $0a, $0b, $0c, $0d, $0e
+ db $0f, $10, $11, $12, $13
+
+PikaAnimTilemap_18:
+ db 5, 5
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $00, $01
+ db $ff, $ff, $ff, $02, $03
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+
+PikaAnimTilemap_19:
+ db 5, 5
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+ db $00, $01, $ff, $ff, $ff
+ db $02, $03, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+
+PikaAnimTilemap_20:
+ db 5, 5
+ db $00, $01, $02, $03, $04
+ db $05, $06, $07, $08, $09
+ db $0a, $0b, $0c, $0d, $0e
+ db $0f, $10, $11, $12, $13
+ db $14, $15, $16, $17, $18
+
+PikaAnimTilemap_21:
+ db 5, 5
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+ db $00, $01, $02, $03, $04
+ db $05, $06, $07, $08, $09
+ db $ff, $ff, $ff, $ff, $ff
+
+PikaAnimTilemap_22:
+ db 5, 5
+ db $ff, $ff, $ff, $ff, $ff
+ db $ff, $ff, $ff, $ff, $ff
+ db $00, $01, $ff, $ff, $ff
+ db $02, $03, $ff, $ff, $ff
+ db $04, $05, $ff, $ff, $ff
+
+PikaAnimTilemap_23:
+ db 5, 5
+ db $00, $01, $02, $03, $04
+ db $05, $06, $07, $08, $09
+ db $0a, $0b, $0c, $0d, $0e
+ db $0f, $10, $11, $12, $13
+ db $14, $15, $16, $17, $18
+
+PikaAnimTilemap_24:
+ db 5, 5
+ db $19, $1a, $1b, $1c, $1d
+ db $1e, $1f, $20, $21, $22
+ db $23, $24, $25, $26, $27
+ db $28, $29, $2a, $2b, $2c
+ db $2d, $2e, $2f, $30, $31
+
+PikaAnimTilemap_9:
+PikaAnimTilemap_25:
+PikaAnimTilemap_26:
+PikaAnimTilemap_27:
+PikaAnimTilemap_28:
+PikaAnimTilemap_29:
+PikaAnimTilemap_30:
+PikaAnimTilemap_31:
+PikaAnimTilemap_32:
+PikaAnimTilemap_33:
+PikaAnimTilemap_34:
+PikaAnimTilemap_35:
+PikaAnimTilemap_36:
+PikaAnimTilemap_37:
+PikaAnimTilemap_38:
+PikaAnimTilemap_39:
+ db 5, 5
+ db $00, $01, $02, $03, $04
+ db $05, $06, $07, $08, $09
+ db $0a, $0b, $0c, $0d, $0e
+ db $0f, $10, $11, $12, $13
+ db $14, $15, $16, $17, $18
+
+PikaAnimTilemap_10:
+PikaAnimTilemap_40:
+ db 5, 5
+ db $19, $1a, $1b, $1c, $1d
+ db $1e, $1f, $20, $21, $22
+ db $23, $24, $25, $26, $27
+ db $28, $29, $2a, $2b, $2c
+ db $2d, $2e, $2f, $30, $31
+
+PikaAnimTilemap_11:
+PikaAnimTilemap_41:
+ db 5, 5
+ db $32, $33, $34, $35, $36
+ db $37, $38, $39, $3a, $3b
+ db $3c, $3d, $3e, $3f, $40
+ db $41, $42, $43, $44, $45
+ db $46, $47, $48, $49, $4a
+
+PikaAnimTilemap_12:
+ db 5, 5
+ db $4b, $4c, $4d, $4e, $4f
+ db $50, $51, $52, $53, $54
+ db $55, $56, $57, $58, $59
+ db $5a, $5b, $5c, $5d, $5e
+ db $5f, $60, $61, $62, $63
+
+PikaAnimTilemap_13:
+ db 5, 5
+ db $64, $65, $66, $67, $68
+ db $69, $6a, $6b, $6c, $6d
+ db $6e, $6f, $70, $71, $72
+ db $73, $74, $75, $76, $77
+ db $78, $79, $7a, $7b, $7c
diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
index 8b021287..1f35a0d5 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -1,4 +1,4 @@
-PokedexEntryPointers: ; 4050b (10:450b)
+PokedexEntryPointers:
dw RhydonDexEntry
dw KangaskhanDexEntry
dw NidoranMDexEntry
@@ -195,1064 +195,1064 @@ PokedexEntryPointers: ; 4050b (10:450b)
; weight in pounds
; text entry
-BulbasaurDexEntry: ; 40687 (10:4687)
+BulbasaurDexEntry:
db "SEED@"
db 2,4
dw 150
TX_FAR _BulbasaurDexEntry
db "@"
-IvysaurDexEntry: ; 40695 (10:4695)
+IvysaurDexEntry:
db "SEED@"
db 3,3
dw 290
TX_FAR _IvysaurDexEntry
db "@"
-VenusaurDexEntry: ; 406a3 (10:46a3)
+VenusaurDexEntry:
db "SEED@"
db 6,7
dw 2210
TX_FAR _VenusaurDexEntry
db "@"
-CharmanderDexEntry: ; 406b1 (10:46b1)
+CharmanderDexEntry:
db "LIZARD@"
db 2,
dw 190
TX_FAR _CharmanderDexEntry
db "@"
-CharmeleonDexEntry: ; 406c1 (10:46c1)
+CharmeleonDexEntry:
db "FLAME@"
db 3,7
dw 420
TX_FAR _CharmeleonDexEntry
db "@"
-CharizardDexEntry: ; 406d0 (10:46d0)
+CharizardDexEntry:
db "FLAME@"
db 5,7
dw 2000
TX_FAR _CharizardDexEntry
db "@"
-SquirtleDexEntry: ; 406df (10:46df)
+SquirtleDexEntry:
db "TINYTURTLE@"
db 1,8
dw 200
TX_FAR _SquirtleDexEntry
db "@"
-WartortleDexEntry: ; 406f3 (10:46f3)
+WartortleDexEntry:
db "TURTLE@"
db 3,3
dw 500
TX_FAR _WartortleDexEntry
db "@"
-BlastoiseDexEntry: ; 40703 (10:4703)
+BlastoiseDexEntry:
db "SHELLFISH@"
db 5,3
dw 1890
TX_FAR _BlastoiseDexEntry
db "@"
-CaterpieDexEntry: ; 40716 (10:4716)
+CaterpieDexEntry:
db "WORM@"
db 1,
dw 60
TX_FAR _CaterpieDexEntry
db "@"
-MetapodDexEntry: ; 40724 (10:4724)
+MetapodDexEntry:
db "COCOON@"
db 2,4
dw 220
TX_FAR _MetapodDexEntry
db "@"
-ButterfreeDexEntry: ; 40734 (10:4734)
+ButterfreeDexEntry:
db "BUTTERFLY@"
db 3,7
dw 710
TX_FAR _ButterfreeDexEntry
db "@"
-WeedleDexEntry: ; 40747 (10:4747)
+WeedleDexEntry:
db "HAIRY BUG@"
db 1,
dw 70
TX_FAR _WeedleDexEntry
db "@"
-KakunaDexEntry: ; 4075a (10:475a)
+KakunaDexEntry:
db "COCOON@"
db 2,
dw 220
TX_FAR _KakunaDexEntry
db "@"
-BeedrillDexEntry: ; 4076a (10:476a)
+BeedrillDexEntry:
db "POISON BEE@"
db 3,3
dw 650
TX_FAR _BeedrillDexEntry
db "@"
-PidgeyDexEntry: ; 4077e (10:477e)
+PidgeyDexEntry:
db "TINY BIRD@"
db 1,
dw 40
TX_FAR _PidgeyDexEntry
db "@"
-PidgeottoDexEntry: ; 40791 (10:4791)
+PidgeottoDexEntry:
db "BIRD@"
db 3,7
dw 660
TX_FAR _PidgeottoDexEntry
db "@"
-PidgeotDexEntry: ; 4079f (10:479f)
+PidgeotDexEntry:
db "BIRD@"
db 4,11
dw 870
TX_FAR _PidgeotDexEntry
db "@"
-RattataDexEntry: ; 407ad (10:47ad)
+RattataDexEntry:
db "RAT@"
db 1,
dw 80
TX_FAR _RattataDexEntry
db "@"
-RaticateDexEntry: ; 407ba (10:47ba)
+RaticateDexEntry:
db "RAT@"
db 2,4
dw 410
TX_FAR _RaticateDexEntry
db "@"
-SpearowDexEntry: ; 407c7 (10:47c7)
+SpearowDexEntry:
db "TINY BIRD@"
db 1,
dw 40
TX_FAR _SpearowDexEntry
db "@"
-FearowDexEntry: ; 407da (10:47da)
+FearowDexEntry:
db "BEAK@"
db 3,11
dw 840
TX_FAR _FearowDexEntry
db "@"
-EkansDexEntry: ; 407e8 (10:47e8)
+EkansDexEntry:
db "SNAKE@"
db 6,7
dw 150
TX_FAR _EkansDexEntry
db "@"
-ArbokDexEntry: ; 407f7 (10:47f7)
+ArbokDexEntry:
db "COBRA@"
db 11,6
dw 1430
TX_FAR _ArbokDexEntry
db "@"
-PikachuDexEntry: ; 40806 (10:4806)
+PikachuDexEntry:
db "MOUSE@"
db 1,4
dw 130
TX_FAR _PikachuDexEntry
db "@"
-RaichuDexEntry: ; 40815 (10:4815)
+RaichuDexEntry:
db "MOUSE@"
db 2,7
dw 660
TX_FAR _RaichuDexEntry
db "@"
-SandshrewDexEntry: ; 40824 (10:4824)
+SandshrewDexEntry:
db "MOUSE@"
db 2,
dw 260
TX_FAR _SandshrewDexEntry
db "@"
-SandslashDexEntry: ; 40833 (10:4833)
+SandslashDexEntry:
db "MOUSE@"
db 3,3
dw 650
TX_FAR _SandslashDexEntry
db "@"
-NidoranFDexEntry: ; 40842 (10:4842)
+NidoranFDexEntry:
db "POISON PIN@"
db 1,4
dw 150
TX_FAR _NidoranFDexEntry
db "@"
-NidorinaDexEntry: ; 40856 (10:4856)
+NidorinaDexEntry:
db "POISON PIN@"
db 2,7
dw 440
TX_FAR _NidorinaDexEntry
db "@"
-NidoqueenDexEntry: ; 4086a (10:486a)
+NidoqueenDexEntry:
db "DRILL@"
db 4,3
dw 1320
TX_FAR _NidoqueenDexEntry
db "@"
-NidoranMDexEntry: ; 40879 (10:4879)
+NidoranMDexEntry:
db "POISON PIN@"
db 1,8
dw 200
TX_FAR _NidoranMDexEntry
db "@"
-NidorinoDexEntry: ; 4088d (10:488d)
+NidorinoDexEntry:
db "POISON PIN@"
db 2,11
dw 430
TX_FAR _NidorinoDexEntry
db "@"
-NidokingDexEntry: ; 408a1 (10:48a1)
+NidokingDexEntry:
db "DRILL@"
db 4,7
dw 1370
TX_FAR _NidokingDexEntry
db "@"
-ClefairyDexEntry: ; 408b0 (10:48b0)
+ClefairyDexEntry:
db "FAIRY@"
db 2,
dw 170
TX_FAR _ClefairyDexEntry
db "@"
-ClefableDexEntry: ; 408bf (10:48bf)
+ClefableDexEntry:
db "FAIRY@"
db 4,3
dw 880
TX_FAR _ClefableDexEntry
db "@"
-VulpixDexEntry: ; 408ce (10:48ce)
+VulpixDexEntry:
db "FOX@"
db 2,
dw 220
TX_FAR _VulpixDexEntry
db "@"
-NinetalesDexEntry: ; 408db (10:48db)
+NinetalesDexEntry:
db "FOX@"
db 3,7
dw 440
TX_FAR _NinetalesDexEntry
db "@"
-JigglypuffDexEntry: ; 408e8 (10:48e8)
+JigglypuffDexEntry:
db "BALLOON@"
db 1,8
dw 120
TX_FAR _JigglypuffDexEntry
db "@"
-WigglytuffDexEntry: ; 408f9 (10:48f9)
+WigglytuffDexEntry:
db "BALLOON@"
db 3,3
dw 260
TX_FAR _WigglytuffDexEntry
db "@"
-ZubatDexEntry: ; 4090a (10:490a)
+ZubatDexEntry:
db "BAT@"
db 2,7
dw 170
TX_FAR _ZubatDexEntry
db "@"
-GolbatDexEntry: ; 40917 (10:4917)
+GolbatDexEntry:
db "BAT@"
db 5,3
dw 1210
TX_FAR _GolbatDexEntry
db "@"
-OddishDexEntry: ; 40924 (10:4924)
+OddishDexEntry:
db "WEED@"
db 1,8
dw 120
TX_FAR _OddishDexEntry
db "@"
-GloomDexEntry: ; 40932 (10:4932)
+GloomDexEntry:
db "WEED@"
db 2,7
dw 190
TX_FAR _GloomDexEntry
db "@"
-VileplumeDexEntry: ; 40940 (10:4940)
+VileplumeDexEntry:
db "FLOWER@"
db 3,11
dw 410
TX_FAR _VileplumeDexEntry
db "@"
-ParasDexEntry: ; 40950 (10:4950)
+ParasDexEntry:
db "MUSHROOM@"
db 1,
dw 120
TX_FAR _ParasDexEntry
db "@"
-ParasectDexEntry: ; 40962 (10:4962)
+ParasectDexEntry:
db "MUSHROOM@"
db 3,3
dw 650
TX_FAR _ParasectDexEntry
db "@"
-VenonatDexEntry: ; 40974 (10:4974)
+VenonatDexEntry:
db "INSECT@"
db 3,3
dw 660
TX_FAR _VenonatDexEntry
db "@"
-VenomothDexEntry: ; 40984 (10:4984)
+VenomothDexEntry:
db "POISONMOTH@"
db 4,11
dw 280
TX_FAR _VenomothDexEntry
db "@"
-DiglettDexEntry: ; 40998 (10:4998)
+DiglettDexEntry:
db "MOLE@"
db ,8
dw 20
TX_FAR _DiglettDexEntry
db "@"
-DugtrioDexEntry: ; 409a6 (10:49a6)
+DugtrioDexEntry:
db "MOLE@"
db 2,4
dw 730
TX_FAR _DugtrioDexEntry
db "@"
-MeowthDexEntry: ; 409b4 (10:49b4)
+MeowthDexEntry:
db "SCRATCHCAT@"
db 1,4
dw 90
TX_FAR _MeowthDexEntry
db "@"
-PersianDexEntry: ; 409c8 (10:49c8)
+PersianDexEntry:
db "CLASSY CAT@"
db 3,3
dw 710
TX_FAR _PersianDexEntry
db "@"
-PsyduckDexEntry: ; 409dc (10:49dc)
+PsyduckDexEntry:
db "DUCK@"
db 2,7
dw 430
TX_FAR _PsyduckDexEntry
db "@"
-GolduckDexEntry: ; 409ea (10:49ea)
+GolduckDexEntry:
db "DUCK@"
db 5,7
dw 1690
TX_FAR _GolduckDexEntry
db "@"
-MankeyDexEntry: ; 409f8 (10:49f8)
+MankeyDexEntry:
db "PIG MONKEY@"
db 1,8
dw 620
TX_FAR _MankeyDexEntry
db "@"
-PrimeapeDexEntry: ; 40a0c (10:4a0c)
+PrimeapeDexEntry:
db "PIG MONKEY@"
db 3,3
dw 710
TX_FAR _PrimeapeDexEntry
db "@"
-GrowlitheDexEntry: ; 40a20 (10:4a20)
+GrowlitheDexEntry:
db "PUPPY@"
db 2,4
dw 420
TX_FAR _GrowlitheDexEntry
db "@"
-ArcanineDexEntry: ; 40a2f (10:4a2f)
+ArcanineDexEntry:
db "LEGENDARY@"
db 6,3
dw 3420
TX_FAR _ArcanineDexEntry
db "@"
-PoliwagDexEntry: ; 40a42 (10:4a42)
+PoliwagDexEntry:
db "TADPOLE@"
db 2,
dw 270
TX_FAR _PoliwagDexEntry
db "@"
-PoliwhirlDexEntry: ; 40a53 (10:4a53)
+PoliwhirlDexEntry:
db "TADPOLE@"
db 3,3
dw 440
TX_FAR _PoliwhirlDexEntry
db "@"
-PoliwrathDexEntry: ; 40a64 (10:4a64)
+PoliwrathDexEntry:
db "TADPOLE@"
db 4,3
dw 1190
TX_FAR _PoliwrathDexEntry
db "@"
-AbraDexEntry: ; 40a75 (10:4a75)
+AbraDexEntry:
db "PSI@"
db 2,11
dw 430
TX_FAR _AbraDexEntry
db "@"
-KadabraDexEntry: ; 40a82 (10:4a82)
+KadabraDexEntry:
db "PSI@"
db 4,3
dw 1250
TX_FAR _KadabraDexEntry
db "@"
-AlakazamDexEntry: ; 40a8f (10:4a8f)
+AlakazamDexEntry:
db "PSI@"
db 4,11
dw 1060
TX_FAR _AlakazamDexEntry
db "@"
-MachopDexEntry: ; 40a9c (10:4a9c)
+MachopDexEntry:
db "SUPERPOWER@"
db 2,7
dw 430
TX_FAR _MachopDexEntry
db "@"
-MachokeDexEntry: ; 40ab0 (10:4ab0)
+MachokeDexEntry:
db "SUPERPOWER@"
db 4,11
dw 1550
TX_FAR _MachokeDexEntry
db "@"
-MachampDexEntry: ; 40ac4 (10:4ac4)
+MachampDexEntry:
db "SUPERPOWER@"
db 5,3
dw 2870
TX_FAR _MachampDexEntry
db "@"
-BellsproutDexEntry: ; 40ad8 (10:4ad8)
+BellsproutDexEntry:
db "FLOWER@"
db 2,4
dw 90
TX_FAR _BellsproutDexEntry
db "@"
-WeepinbellDexEntry: ; 40ae8 (10:4ae8)
+WeepinbellDexEntry:
db "FLYCATCHER@"
db 3,3
dw 140
TX_FAR _WeepinbellDexEntry
db "@"
-VictreebelDexEntry: ; 40afc (10:4afc)
+VictreebelDexEntry:
db "FLYCATCHER@"
db 5,7
dw 340
TX_FAR _VictreebelDexEntry
db "@"
-TentacoolDexEntry: ; 40b10 (10:4b10)
+TentacoolDexEntry:
db "JELLYFISH@"
db 2,11
dw 1000
TX_FAR _TentacoolDexEntry
db "@"
-TentacruelDexEntry: ; 40b23 (10:4b23)
+TentacruelDexEntry:
db "JELLYFISH@"
db 5,3
dw 1210
TX_FAR _TentacruelDexEntry
db "@"
-GeodudeDexEntry: ; 40b36 (10:4b36)
+GeodudeDexEntry:
db "ROCK@"
db 1,4
dw 440
TX_FAR _GeodudeDexEntry
db "@"
-GravelerDexEntry: ; 40b44 (10:4b44)
+GravelerDexEntry:
db "ROCK@"
db 3,3
dw 2320
TX_FAR _GravelerDexEntry
db "@"
-GolemDexEntry: ; 40b52 (10:4b52)
+GolemDexEntry:
db "MEGATON@"
db 4,7
dw 6620
TX_FAR _GolemDexEntry
db "@"
-PonytaDexEntry: ; 40b63 (10:4b63)
+PonytaDexEntry:
db "FIRE HORSE@"
db 3,3
dw 660
TX_FAR _PonytaDexEntry
db "@"
-RapidashDexEntry: ; 40b77 (10:4b77)
+RapidashDexEntry:
db "FIRE HORSE@"
db 5,7
dw 2090
TX_FAR _RapidashDexEntry
db "@"
-SlowpokeDexEntry: ; 40b8b (10:4b8b)
+SlowpokeDexEntry:
db "DOPEY@"
db 3,11
dw 790
TX_FAR _SlowpokeDexEntry
db "@"
-SlowbroDexEntry: ; 40b9a (10:4b9a)
+SlowbroDexEntry:
db "HERMITCRAB@"
db 5,3
dw 1730
TX_FAR _SlowbroDexEntry
db "@"
-MagnemiteDexEntry: ; 40bae (10:4bae)
+MagnemiteDexEntry:
db "MAGNET@"
db 1,
dw 130
TX_FAR _MagnemiteDexEntry
db "@"
-MagnetonDexEntry: ; 40bbe (10:4bbe)
+MagnetonDexEntry:
db "MAGNET@"
db 3,3
dw 1320
TX_FAR _MagnetonDexEntry
db "@"
-FarfetchdDexEntry: ; 40bce (10:4bce)
+FarfetchdDexEntry:
db "WILD DUCK@"
db 2,7
dw 330
TX_FAR _FarfetchdDexEntry
db "@"
-DoduoDexEntry: ; 40be1 (10:4be1)
+DoduoDexEntry:
db "TWIN BIRD@"
db 4,7
dw 860
TX_FAR _DoduoDexEntry
db "@"
-DodrioDexEntry: ; 40bf4 (10:4bf4)
+DodrioDexEntry:
db "TRIPLEBIRD@"
db 5,11
dw 1880
TX_FAR _DodrioDexEntry
db "@"
-SeelDexEntry: ; 40c08 (10:4c08)
+SeelDexEntry:
db "SEA LION@"
db 3,7
dw 1980
TX_FAR _SeelDexEntry
db "@"
-DewgongDexEntry: ; 40c1a (10:4c1a)
+DewgongDexEntry:
db "SEA LION@"
db 5,7
dw 2650
TX_FAR _DewgongDexEntry
db "@"
-GrimerDexEntry: ; 40c2c (10:4c2c)
+GrimerDexEntry:
db "SLUDGE@"
db 2,11
dw 660
TX_FAR _GrimerDexEntry
db "@"
-MukDexEntry: ; 40c3c (10:4c3c)
+MukDexEntry:
db "SLUDGE@"
db 3,11
dw 660
TX_FAR _MukDexEntry
db "@"
-ShellderDexEntry: ; 40c4c (10:4c4c)
+ShellderDexEntry:
db "BIVALVE@"
db 1,
dw 90
TX_FAR _ShellderDexEntry
db "@"
-CloysterDexEntry: ; 40c5d (10:4c5d)
+CloysterDexEntry:
db "BIVALVE@"
db 4,11
dw 2920
TX_FAR _CloysterDexEntry
db "@"
-GastlyDexEntry: ; 40c6e (10:4c6e)
+GastlyDexEntry:
db "GAS@"
db 4,3
dw 2
TX_FAR _GastlyDexEntry
db "@"
-HaunterDexEntry: ; 40c7b (10:4c7b)
+HaunterDexEntry:
db "GAS@"
db 5,3
dw 2
TX_FAR _HaunterDexEntry
db "@"
-GengarDexEntry: ; 40c88 (10:4c88)
+GengarDexEntry:
db "SHADOW@"
db 4,11
dw 890
TX_FAR _GengarDexEntry
db "@"
-OnixDexEntry: ; 40c98 (10:4c98)
+OnixDexEntry:
db "ROCK SNAKE@"
db 28,10
dw 4630
TX_FAR _OnixDexEntry
db "@"
-DrowzeeDexEntry: ; 40cac (10:4cac)
+DrowzeeDexEntry:
db "HYPNOSIS@"
db 3,3
dw 710
TX_FAR _DrowzeeDexEntry
db "@"
-HypnoDexEntry: ; 40cbe (10:4cbe)
+HypnoDexEntry:
db "HYPNOSIS@"
db 5,3
dw 1670
TX_FAR _HypnoDexEntry
db "@"
-KrabbyDexEntry: ; 40cd0 (10:4cd0)
+KrabbyDexEntry:
db "RIVER CRAB@"
db 1,4
dw 140
TX_FAR _KrabbyDexEntry
db "@"
-KinglerDexEntry: ; 40ce4 (10:4ce4)
+KinglerDexEntry:
db "PINCER@"
db 4,3
dw 1320
TX_FAR _KinglerDexEntry
db "@"
-VoltorbDexEntry: ; 40cf4 (10:4cf4)
+VoltorbDexEntry:
db "BALL@"
db 1,8
dw 230
TX_FAR _VoltorbDexEntry
db "@"
-ElectrodeDexEntry: ; 40d02 (10:4d02)
+ElectrodeDexEntry:
db "BALL@"
db 3,11
dw 1470
TX_FAR _ElectrodeDexEntry
db "@"
-ExeggcuteDexEntry: ; 40d10 (10:4d10)
+ExeggcuteDexEntry:
db "EGG@"
db 1,4
dw 60
TX_FAR _ExeggcuteDexEntry
db "@"
-ExeggutorDexEntry: ; 40d1d (10:4d1d)
+ExeggutorDexEntry:
db "COCONUT@"
db 6,7
dw 2650
TX_FAR _ExeggutorDexEntry
db "@"
-CuboneDexEntry: ; 40d2e (10:4d2e)
+CuboneDexEntry:
db "LONELY@"
db 1,4
dw 140
TX_FAR _CuboneDexEntry
db "@"
-MarowakDexEntry: ; 40d3e (10:4d3e)
+MarowakDexEntry:
db "BONEKEEPER@"
db 3,3
dw 990
TX_FAR _MarowakDexEntry
db "@"
-HitmonleeDexEntry: ; 40d52 (10:4d52)
+HitmonleeDexEntry:
db "KICKING@"
db 4,11
dw 1100
TX_FAR _HitmonleeDexEntry
db "@"
-HitmonchanDexEntry: ; 40d63 (10:4d63)
+HitmonchanDexEntry:
db "PUNCHING@"
db 4,7
dw 1110
TX_FAR _HitmonchanDexEntry
db "@"
-LickitungDexEntry: ; 40d75 (10:4d75)
+LickitungDexEntry:
db "LICKING@"
db 3,11
dw 1440
TX_FAR _LickitungDexEntry
db "@"
-KoffingDexEntry: ; 40d86 (10:4d86)
+KoffingDexEntry:
db "POISON GAS@"
db 2,
dw 20
TX_FAR _KoffingDexEntry
db "@"
-WeezingDexEntry: ; 40d9a (10:4d9a)
+WeezingDexEntry:
db "POISON GAS@"
db 3,11
dw 210
TX_FAR _WeezingDexEntry
db "@"
-RhyhornDexEntry: ; 40dae (10:4dae)
+RhyhornDexEntry:
db "SPIKES@"
db 3,3
dw 2540
TX_FAR _RhyhornDexEntry
db "@"
-RhydonDexEntry: ; 40dbe (10:4dbe)
+RhydonDexEntry:
db "DRILL@"
db 6,3
dw 2650
TX_FAR _RhydonDexEntry
db "@"
-ChanseyDexEntry: ; 40dcd (10:4dcd)
+ChanseyDexEntry:
db "EGG@"
db 3,7
dw 760
TX_FAR _ChanseyDexEntry
db "@"
-TangelaDexEntry: ; 40dda (10:4dda)
+TangelaDexEntry:
db "VINE@"
db 3,3
dw 770
TX_FAR _TangelaDexEntry
db "@"
-KangaskhanDexEntry: ; 40de8 (10:4de8)
+KangaskhanDexEntry:
db "PARENT@"
db 7,3
dw 1760
TX_FAR _KangaskhanDexEntry
db "@"
-HorseaDexEntry: ; 40df8 (10:4df8)
+HorseaDexEntry:
db "DRAGON@"
db 1,4
dw 180
TX_FAR _HorseaDexEntry
db "@"
-SeadraDexEntry: ; 40e08 (10:4e08)
+SeadraDexEntry:
db "DRAGON@"
db 3,11
dw 550
TX_FAR _SeadraDexEntry
db "@"
-GoldeenDexEntry: ; 40e18 (10:4e18)
+GoldeenDexEntry:
db "GOLDFISH@"
db 2,
dw 330
TX_FAR _GoldeenDexEntry
db "@"
-SeakingDexEntry: ; 40e2a (10:4e2a)
+SeakingDexEntry:
db "GOLDFISH@"
db 4,3
dw 860
TX_FAR _SeakingDexEntry
db "@"
-StaryuDexEntry: ; 40e3c (10:4e3c)
+StaryuDexEntry:
db "STARSHAPE@"
db 2,7
dw 760
TX_FAR _StaryuDexEntry
db "@"
-StarmieDexEntry: ; 40e4f (10:4e4f)
+StarmieDexEntry:
db "MYSTERIOUS@"
db 3,7
dw 1760
TX_FAR _StarmieDexEntry
db "@"
-MrMimeDexEntry: ; 40e63 (10:4e63)
+MrMimeDexEntry:
db "BARRIER@"
db 4,3
dw 1200
TX_FAR _MrMimeDexEntry
db "@"
-ScytherDexEntry: ; 40e74 (10:4e74)
+ScytherDexEntry:
db "MANTIS@"
db 4,11
dw 1230
TX_FAR _ScytherDexEntry
db "@"
-JynxDexEntry: ; 40e84 (10:4e84)
+JynxDexEntry:
db "HUMANSHAPE@"
db 4,7
dw 900
TX_FAR _JynxDexEntry
db "@"
-ElectabuzzDexEntry: ; 40e98 (10:4e98)
+ElectabuzzDexEntry:
db "ELECTRIC@"
db 3,7
dw 660
TX_FAR _ElectabuzzDexEntry
db "@"
-MagmarDexEntry: ; 40eaa (10:4eaa)
+MagmarDexEntry:
db "SPITFIRE@"
db 4,3
dw 980
TX_FAR _MagmarDexEntry
db "@"
-PinsirDexEntry: ; 40ebc (10:4ebc)
+PinsirDexEntry:
db "STAGBEETLE@"
db 4,11
dw 1210
TX_FAR _PinsirDexEntry
db "@"
-TaurosDexEntry: ; 40ed0 (10:4ed0)
+TaurosDexEntry:
db "WILD BULL@"
db 4,7
dw 1950
TX_FAR _TaurosDexEntry
db "@"
-MagikarpDexEntry: ; 40ee3 (10:4ee3)
+MagikarpDexEntry:
db "FISH@"
db 2,11
dw 220
TX_FAR _MagikarpDexEntry
db "@"
-GyaradosDexEntry: ; 40ef1 (10:4ef1)
+GyaradosDexEntry:
db "ATROCIOUS@"
db 21,4
dw 5180
TX_FAR _GyaradosDexEntry
db "@"
-LaprasDexEntry: ; 40f04 (10:4f04)
+LaprasDexEntry:
db "TRANSPORT@"
db 8,2
dw 4850
TX_FAR _LaprasDexEntry
db "@"
-DittoDexEntry: ; 40f17 (10:4f17)
+DittoDexEntry:
db "TRANSFORM@"
db 1,
dw 90
TX_FAR _DittoDexEntry
db "@"
-EeveeDexEntry: ; 40f2a (10:4f2a)
+EeveeDexEntry:
db "EVOLUTION@"
db 1,
dw 140
TX_FAR _EeveeDexEntry
db "@"
-VaporeonDexEntry: ; 40f3d (10:4f3d)
+VaporeonDexEntry:
db "BUBBLE JET@"
db 3,3
dw 640
TX_FAR _VaporeonDexEntry
db "@"
-JolteonDexEntry: ; 40f51 (10:4f51)
+JolteonDexEntry:
db "LIGHTNING@"
db 2,7
dw 540
TX_FAR _JolteonDexEntry
db "@"
-FlareonDexEntry: ; 40f64 (10:4f64)
+FlareonDexEntry:
db "FLAME@"
db 2,11
dw 550
TX_FAR _FlareonDexEntry
db "@"
-PorygonDexEntry: ; 40f73 (10:4f73)
+PorygonDexEntry:
db "VIRTUAL@"
db 2,7
dw 800
TX_FAR _PorygonDexEntry
db "@"
-OmanyteDexEntry: ; 40f84 (10:4f84)
+OmanyteDexEntry:
db "SPIRAL@"
db 1,4
dw 170
TX_FAR _OmanyteDexEntry
db "@"
-OmastarDexEntry: ; 40f94 (10:4f94)
+OmastarDexEntry:
db "SPIRAL@"
db 3,3
dw 770
TX_FAR _OmastarDexEntry
db "@"
-KabutoDexEntry: ; 40fa4 (10:4fa4)
+KabutoDexEntry:
db "SHELLFISH@"
db 1,8
dw 250
TX_FAR _KabutoDexEntry
db "@"
-KabutopsDexEntry: ; 40fb7 (10:4fb7)
+KabutopsDexEntry:
db "SHELLFISH@"
db 4,3
dw 890
TX_FAR _KabutopsDexEntry
db "@"
-AerodactylDexEntry: ; 40fca (10:4fca)
+AerodactylDexEntry:
db "FOSSIL@"
db 5,11
dw 1300
TX_FAR _AerodactylDexEntry
db "@"
-SnorlaxDexEntry: ; 40fda (10:4fda)
+SnorlaxDexEntry:
db "SLEEPING@"
db 6,11
dw 10140
TX_FAR _SnorlaxDexEntry
db "@"
-ArticunoDexEntry: ; 40fec (10:4fec)
+ArticunoDexEntry:
db "FREEZE@"
db 5,7
dw 1220
TX_FAR _ArticunoDexEntry
db "@"
-ZapdosDexEntry: ; 40ffc (10:4ffc)
+ZapdosDexEntry:
db "ELECTRIC@"
db 5,3
dw 1160
TX_FAR _ZapdosDexEntry
db "@"
-MoltresDexEntry: ; 4100e (10:500e)
+MoltresDexEntry:
db "FLAME@"
db 6,7
dw 1320
TX_FAR _MoltresDexEntry
db "@"
-DratiniDexEntry: ; 4101d (10:501d)
+DratiniDexEntry:
db "DRAGON@"
db 5,11
dw 70
TX_FAR _DratiniDexEntry
db "@"
-DragonairDexEntry: ; 4102d (10:502d)
+DragonairDexEntry:
db "DRAGON@"
db 13,1
dw 360
TX_FAR _DragonairDexEntry
db "@"
-DragoniteDexEntry: ; 4103d (10:503d)
+DragoniteDexEntry:
db "DRAGON@"
db 7,3
dw 4630
TX_FAR _DragoniteDexEntry
db "@"
-MewtwoDexEntry: ; 4104d (10:504d)
+MewtwoDexEntry:
db "GENETIC@"
db 6,7
dw 2690
TX_FAR _MewtwoDexEntry
db "@"
-MewDexEntry: ; 4105e (10:505e)
+MewDexEntry:
db "NEW SPECIE@"
db 1,4
dw 90
TX_FAR _MewDexEntry
db "@"
-MissingNoDexEntry: ; 41072 (10:5072)
+MissingNoDexEntry:
db "???@"
db 10 ; 1.0 m
db 100 ; 10.0 kg
@@ -1262,4 +1262,4 @@ MissingNoDexEntry: ; 41072 (10:5072)
; db "???@"
; db 10,100 ; 10 feet, 100 inches
; dw 35072 ; dw ("コ" << 8 | 0), 3507.2 lbs
-; db "メント さくせいちゅう@" ; a whole bunch of sound effects \ No newline at end of file
+; db "メント さくせいちゅう@" ; a whole bunch of sound effects
diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm
index b3d7305e..0e293946 100755
--- a/data/pokedex_order.asm
+++ b/data/pokedex_order.asm
@@ -1,4 +1,4 @@
-PokedexOrder: ; 410b1 (10:50b1)
+PokedexOrder:
db DEX_RHYDON
db DEX_KANGASKHAN
db DEX_NIDORAN_M
diff --git a/data/prize_mon_levels.asm b/data/prize_mon_levels.asm
index a48fd347..eb126d37 100755
--- a/data/prize_mon_levels.asm
+++ b/data/prize_mon_levels.asm
@@ -1,4 +1,4 @@
-PrizeMonLevelDictionary: ; 528ea (14:68ea)
+PrizeMonLevelDictionary:
db ABRA,15
db VULPIX,18
db WIGGLYTUFF,22
diff --git a/data/prizes.asm b/data/prizes.asm
index 103ed415..b113c7cb 100755
--- a/data/prizes.asm
+++ b/data/prizes.asm
@@ -1,4 +1,4 @@
-PrizeDifferentMenuPtrs: ; 527ae (14:67ae)
+PrizeDifferentMenuPtrs:
dw PrizeMenuMon1Entries
dw PrizeMenuMon1Cost
@@ -8,37 +8,37 @@ PrizeDifferentMenuPtrs: ; 527ae (14:67ae)
dw PrizeMenuTMsEntries
dw PrizeMenuTMsCost
-PrizeMenuMon1Entries: ; 527b9 (14:67b9)
+PrizeMenuMon1Entries:
db ABRA
db VULPIX
db WIGGLYTUFF
db "@"
-PrizeMenuMon1Cost: ; 527be (14:67be)
+PrizeMenuMon1Cost:
coins 230
coins 1000
coins 2680
db "@"
-PrizeMenuMon2Entries: ; 527c5 (14:67c5)
+PrizeMenuMon2Entries:
db SCYTHER
db PINSIR
db PORYGON
db "@"
-PrizeMenuMon2Cost: ; 527c9 (14:67c9)
+PrizeMenuMon2Cost:
coins 6500
coins 6500
coins 9999
db "@"
-PrizeMenuTMsEntries: ; 527df (14:67df)
+PrizeMenuTMsEntries:
db TM_23
db TM_15
db TM_50
db "@"
-PrizeMenuTMsCost: ; 527e4 (14:67e4)
+PrizeMenuTMsCost:
coins 3300
coins 5500
coins 7700
diff --git a/data/sgb_border.asm b/data/sgb_border.asm
index 694f97b6..0080b4d2 100755
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -1,4 +1,4 @@
-BorderPalettes: ; 72c39 (1c:6c39)
+BorderPalettes:
INCBIN "gfx/tilemaps/sgbborder.map"
ds $100
@@ -83,5 +83,5 @@ BorderPalettes: ; 72c39 (1c:6c39)
RGB 31, 31, 25
RGB 31, 31, 25
-SGBBorderGraphics: ; 734b9 (1c:74b9)
+SGBBorderGraphics:
INCBIN "gfx/pokemon_yellow.t6.2bpp"
diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm
index c00a7f58..b2cb6e9b 100755
--- a/data/sgb_packets.asm
+++ b/data/sgb_packets.asm
@@ -51,32 +51,32 @@ DATA_SND: MACRO
db \3 ; length (1-11)
ENDM
-BlkPacket_WholeScreen: ; 72611 (1c:6611)
+BlkPacket_WholeScreen:
db $21
db $1,$3,$0,$0,$0,$13,$11,$0
db $0,$0,$0,$0,$0,$0,$0
-BlkPacket_Battle: ; 72621 (1c:6621)
+BlkPacket_Battle:
db $22
db $5,$7,$a,$0,$c,$13,$11,$3,$5,$1
db $0,$a,$3,$3,$0,$a,$7,$13,$a
db $3,$a,$0,$4,$8,$b,$3,$f,$b
db $0,$13,$6
-BlkPacket_StatusScreen: ; 72641 (1c:6641)
+BlkPacket_StatusScreen:
db $21
db $1,$7,$5,$1,$0
db $7,$6,$0,$0,$0,$0,$0,$0,$0
db $0
-BlkPacket_Pokedex: ; 72651 (1c:6651)
+BlkPacket_Pokedex:
db $21
db $1,$7,$5,$1,$1,$8,$8
db $0,$0,$0,$0,$0,$0,$0,$0
-BlkPacket_Slots: ; 72661 (1c:6661)
+BlkPacket_Slots:
db $22
db $5,$3,$5,$0,$0,$13,$b,$3,$a
db $0,$4,$13,$9,$2,$f,$0,$6,$13
db $7,$3,$0,$4,$4,$f,$9,$3,$0
db $0,$c,$13,$11
-BlkPacket_Titlescreen: ; 72681 (1c:6681)
+BlkPacket_Titlescreen:
db $22
db $3,$3,$0,$0
db $0,$13,$7,$3,$a,$0,$8,$13,$11
@@ -88,7 +88,7 @@ BlkPacket_NidorinoIntro ; 726a1 (1c:66a1)
db $0,$0,$4,$13,$d,$3,$5,$0,$e
db $13,$11,$0,$0,$0,$0,$0,$0,$0
db $0,$0,$0,$0,$0
-BlkPacket_PartyMenu: ; 726c1 (1c:66c1)
+BlkPacket_PartyMenu:
db $23
db $7,$6,$10
db $1,$0,$2,$c,$2,$0,$5,$1,$b
@@ -96,7 +96,7 @@ BlkPacket_PartyMenu: ; 726c1 (1c:66c1)
db $5,$5,$b,$5,$2,$0,$5,$7,$b
db $7,$2,$0,$5,$9,$b,$9,$2,$0
db $5,$b,$b,$b,$0,$0,$0,$0
-BlkPacket_TrainerCard: ; 726f1 (1c:66f1)
+BlkPacket_TrainerCard:
db $24
db $a,$2,$0,$3,$c,$4,$d,$2,$5
db $7,$c,$8,$d,$2,$f,$b,$c,$c
@@ -105,70 +105,70 @@ BlkPacket_TrainerCard: ; 726f1 (1c:66f1)
db $d,$2,$a,$3,$f,$4,$10,$2,$f
db $7,$f,$8,$10,$2,$a,$b,$f,$c
db $10,$2,$5,$f,$f,$10,$10,$0,$0
-BlkPacket_GameFreakIntro: ; 72731 (1c:6731)
+BlkPacket_GameFreakIntro:
db $22
db $3,$7,$5,$5,$b,$7,$d,$2
db $a,$8,$b,$9,$d,$3,$f,$c,$b
db $e,$d,$0,$0,$0,$0,$0,$0,$0
db $0,$0,$0,$0,$0
-UnknownPacket_72751: ; 72751 (1c:6751)
+UnknownPacket_72751:
db $21,$1,$7,$5
db $4,$0,$f,$5,$0,$0,$0,$0,$0
db $0,$0,$0
-PalPacket_Empty: ; 72761 (1c:6761)
+PalPacket_Empty:
PAL_SET 0, 0, 0, 0
-PalPacket_PartyMenu: ; 72771 (1c:6771)
+PalPacket_PartyMenu:
PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR
-PalPacket_Black: ; 72781 (1c:6781)
+PalPacket_Black:
PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK
-PalPacket_TownMap: ; 72791 (1c:6791)
+PalPacket_TownMap:
PAL_SET PAL_TOWNMAP, 0, 0, 0
-PalPacket_Pokedex: ; 727a1 (1c:67a1)
+PalPacket_Pokedex:
PAL_SET PAL_BROWNMON, 0, 0, 0
-PalPacket_Slots: ; 727b1 (1c:67b1)
+PalPacket_Slots:
PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4
-PalPacket_Titlescreen: ; 727c1 (1c:67c1)
+PalPacket_Titlescreen:
PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON
-PalPacket_TrainerCard: ; 727d1 (1c:67d1)
+PalPacket_TrainerCard:
PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON
-PalPacket_Generic: ; 727e1 (1c:67e1)
+PalPacket_Generic:
PAL_SET PAL_MEWMON, 0, 0, 0
-PalPacket_NidorinoIntro: ; 727f1 (1c:67f1)
+PalPacket_NidorinoIntro:
PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0
-PalPacket_GameFreakIntro: ; 72801 (1c:6801)
+PalPacket_GameFreakIntro:
PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON
-UnknownPalPacket_72811: ; 72811 (1c:6811)
+UnknownPalPacket_72811:
db $51,$25,$0,$25,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0
-UnknownPalPacket_72821: ; 72821 (1c:6821)
+UnknownPalPacket_72821:
db $51,$25,$0,$27,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0
-PalTrnPacket: ; 72831 (1c:6831)
+PalTrnPacket:
PAL_TRN
-MltReq1Packet: ; 72841 (1c:6841)
+MltReq1Packet:
MLT_REQ 1
-MltReq2Packet: ; 72851 (1c:6851)
+MltReq2Packet:
MLT_REQ 2
-ChrTrnPacket: ; 72861 (1c:6861)
+ChrTrnPacket:
CHR_TRN 0, 0
-PctTrnPacket: ; 72871 (1c:6871)
+PctTrnPacket:
PCT_TRN
-MaskEnFreezePacket: ; 72881 (1c:6881)
+MaskEnFreezePacket:
MASK_EN 1
-MaskEnCancelPacket: ; 72891 (1c:6891)
+MaskEnCancelPacket:
MASK_EN 0
; These are DATA_SND packets containing SNES code.
@@ -245,4 +245,4 @@ DataSnd_72911: DATA_SND $810, $0, 11 ; 72911 (1c:6911)
db $EA ; nop
db $60 ; rts
db $EA ; nop
- db $EA ; nop \ No newline at end of file
+ db $EA ; nop
diff --git a/data/slot_machine_wheels.asm b/data/slot_machine_wheels.asm
index dc9accca..88a89822 100755
--- a/data/slot_machine_wheels.asm
+++ b/data/slot_machine_wheels.asm
@@ -1,4 +1,4 @@
-SlotMachineWheel1: ; 37c15 (d:7c15)
+SlotMachineWheel1:
dw SLOTS7
dw SLOTSMOUSE
dw SLOTSFISH
@@ -18,7 +18,7 @@ SlotMachineWheel1: ; 37c15 (d:7c15)
dw SLOTSMOUSE
dw SLOTSFISH
-SlotMachineWheel2: ; 37c39 (d:7c39)
+SlotMachineWheel2:
dw SLOTS7
dw SLOTSFISH
dw SLOTSCHERRY
@@ -38,7 +38,7 @@ SlotMachineWheel2: ; 37c39 (d:7c39)
dw SLOTSFISH
dw SLOTSCHERRY
-SlotMachineWheel3: ; 37c5d (d:7c5d)
+SlotMachineWheel3:
dw SLOTS7
dw SLOTSBIRD
dw SLOTSFISH
diff --git a/data/special_warps.asm b/data/special_warps.asm
index e883f3e2..27837109 100755
--- a/data/special_warps.asm
+++ b/data/special_warps.asm
@@ -1,7 +1,7 @@
; Format: (size 2 bytes)
; 00: target map ID
; 01: which dungeon warp in the source map was used
-DungeonWarpList: ; 6133 (1:6133)
+DungeonWarpList:
db SEAFOAM_ISLANDS_2,$01
db SEAFOAM_ISLANDS_2,$02
db SEAFOAM_ISLANDS_3,$01
@@ -16,7 +16,7 @@ DungeonWarpList: ; 6133 (1:6133)
db MANSION_2,$03
db $FF
-DungeonWarpData: ; 614c (1:614c)
+DungeonWarpData:
FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,18
FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,23
FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,19
@@ -34,32 +34,32 @@ DungeonWarpData: ; 614c (1:614c)
; db Map_id
; FLYWARP_DATA [Map Width][Y-pos][X-pos]
; db Tileset_id
-FirstMapSpec: ; 6194 (1:6194)
+FirstMapSpec:
db REDS_HOUSE_2F
FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3
db REDS_HOUSE_2
-TradeCenterSpec1: ; 619a (1:619a)
+TradeCenterSpec1:
db TRADE_CENTER
FLYWARP_DATA TRADE_CENTER_WIDTH,4,3
db CLUB
-TradeCenterSpec2: ; 61a3 (1:61a3)
+TradeCenterSpec2:
db TRADE_CENTER
FLYWARP_DATA TRADE_CENTER_WIDTH,4,6
db CLUB
-ColosseumSpec1: ; 61ac (1:61ac)
+ColosseumSpec1:
db COLOSSEUM
FLYWARP_DATA COLOSSEUM_WIDTH,4,3
db CLUB
-ColosseumSpec2: ; 61b3 (1:61b3)
+ColosseumSpec2:
db COLOSSEUM
FLYWARP_DATA COLOSSEUM_WIDTH,4,6
db CLUB
-FlyWarpDataPtr: ; 61bc (1:61bc)
+FlyWarpDataPtr:
db PALLET_TOWN, 0
dw PalletTownFlyWarp
db VIRIDIAN_CITY, 0
@@ -91,29 +91,29 @@ FlyWarpDataPtr: ; 61bc (1:61bc)
; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block]
; Macro Format:
; FLYWARP_DATA [Map Width][Y-pos][X-pos]
-PalletTownFlyWarp: ; 61f0 (1:61f0)
+PalletTownFlyWarp:
FLYWARP_DATA PALLET_TOWN_WIDTH, 6, 5
-ViridianCityFlyWarp: ; 61f6 (1:61f6)
+ViridianCityFlyWarp:
FLYWARP_DATA VIRIDIAN_CITY_WIDTH, 26, 23
-PewterCityFlyWarp: ; 61fc (1:61fc)
+PewterCityFlyWarp:
FLYWARP_DATA PEWTER_CITY_WIDTH, 26, 13
-CeruleanCityFlyWarp: ; 6202 (1:6202)
+CeruleanCityFlyWarp:
FLYWARP_DATA CERULEAN_CITY_WIDTH, 18, 19
-LavenderTownFlyWarp: ; 6208 (1:6208)
+LavenderTownFlyWarp:
FLYWARP_DATA LAVENDER_TOWN_WIDTH, 6, 3
-VermilionCityFlyWarp: ; 620e (1:620e)
+VermilionCityFlyWarp:
FLYWARP_DATA VERMILION_CITY_WIDTH, 4, 11
-CeladonCityFlyWarp: ; 6214 (1:6214)
+CeladonCityFlyWarp:
FLYWARP_DATA CELADON_CITY_WIDTH, 10, 41
-FuchsiaCityFlyWarp: ; 621a (1:621a)
+FuchsiaCityFlyWarp:
FLYWARP_DATA FUCHSIA_CITY_WIDTH, 28, 19
-CinnabarIslandFlyWarp: ; 6220 (1:6220)
+CinnabarIslandFlyWarp:
FLYWARP_DATA CINNABAR_ISLAND_WIDTH, 12, 11
-IndigoPlateauFlyWarp: ; 6226 (1:6226)
+IndigoPlateauFlyWarp:
FLYWARP_DATA INDIGO_PLATEAU_WIDTH, 6, 9
-SaffronCityFlyWarp: ; 622c (1:622c)
+SaffronCityFlyWarp:
FLYWARP_DATA SAFFRON_CITY_WIDTH, 30, 9
-Route4FlyWarp: ; 6232 (1:6232)
+Route4FlyWarp:
FLYWARP_DATA ROUTE_4_WIDTH, 6, 11
-Route10FlyWarp: ; 6238 (1:6238)
- FLYWARP_DATA ROUTE_10_WIDTH, 20, 11 \ No newline at end of file
+Route10FlyWarp:
+ FLYWARP_DATA ROUTE_10_WIDTH, 20, 11
diff --git a/data/sprite_sets.asm b/data/sprite_sets.asm
index 50e50e07..d74c9d2f 100755
--- a/data/sprite_sets.asm
+++ b/data/sprite_sets.asm
@@ -1,4 +1,4 @@
-MapSpriteSets: ; 141e6 (5:41e6)
+MapSpriteSets:
db $01 ; PALLET_TOWN
db $01 ; VIRIDIAN_CITY
db $02 ; PEWTER_CITY
@@ -44,7 +44,7 @@ MapSpriteSets: ; 141e6 (5:41e6)
; 01: coordinate of dividing line
; 02: sprite set ID if in the West or North side
; 03: sprite set ID if in the East or South side
-SplitMapSpriteSets: ; 1402b (5:420b)
+SplitMapSpriteSets:
db $02,$25,$02,$01 ; $f1
db $02,$32,$02,$03 ; $f2
db $01,$39,$04,$08 ; $f3
@@ -58,7 +58,7 @@ SplitMapSpriteSets: ; 1402b (5:420b)
db $01,$11,$05,$07 ; $fb
db $01,$03,$07,$03 ; $fc
-SpriteSets: ; 1423d (5:423d)
+SpriteSets:
; sprite set $01
db SPRITE_PIKACHU
db SPRITE_BLUE
@@ -189,7 +189,7 @@ SpriteSets: ; 1423d (5:423d)
db SPRITE_BALL
db SPRITE_OMANYTE
-SpriteSheetPointerTable: ; 142a9 (5:42a9)
+SpriteSheetPointerTable:
; SPRITE_RED
dw RedSprite
db $c0 ; byte count
diff --git a/data/super_rod.asm b/data/super_rod.asm
index 14a3b9b7..1303edbb 100755
--- a/data/super_rod.asm
+++ b/data/super_rod.asm
@@ -1,4 +1,4 @@
-FishingSlots:: ; f5eda (3d:5eda)
+FishingSlots::
db PALLET_TOWN,STARYU,10,TENTACOOL,10,STARYU,5,TENTACOOL,20
db VIRIDIAN_CITY,POLIWAG,5,POLIWAG,10,POLIWAG,15,POLIWAG,10
db CERULEAN_CITY,GOLDEEN,25,GOLDEEN,30,SEAKING,30,SEAKING,40
@@ -30,4 +30,4 @@ FishingSlots:: ; f5eda (3d:5eda)
db SEAFOAM_ISLANDS_5,KRABBY,25,STARYU,20,KINGLER,35,STARYU,40
db UNKNOWN_DUNGEON_1,GOLDEEN,25,SEAKING,35,SEAKING,45,SEAKING,55
db UNKNOWN_DUNGEON_3,GOLDEEN,30,SEAKING,40,SEAKING,50,SEAKING,60
- db $ff \ No newline at end of file
+ db $ff
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
index e81d11ff..c85a51e5 100755
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -1,5 +1,4 @@
-Tilesets: ; c558 (3:4558)
- ; dr $c558,$c684
+Tilesets:
tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR
tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR
diff --git a/data/tm_prices.asm b/data/tm_prices.asm
index 2aa72f28..ccc8be05 100755
--- a/data/tm_prices.asm
+++ b/data/tm_prices.asm
@@ -1,4 +1,4 @@
-TechnicalMachinePrices: ; f65f5 (3d:65f5)
+TechnicalMachinePrices:
; In thousands (nybbles).
dn 3, 2 ; TM_01, TM_02
dn 2, 1 ; TM_03, TM_04
diff --git a/data/tms.asm b/data/tms.asm
index e41a60e9..d61392c4 100755
--- a/data/tms.asm
+++ b/data/tms.asm
@@ -1,4 +1,4 @@
-TechnicalMachines: ; 13773 (4:7773)
+TechnicalMachines:
db MEGA_PUNCH
db RAZOR_WIND
db SWORDS_DANCE
diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm
index 5223f435..e9ced645 100755
--- a/data/town_map_entries.asm
+++ b/data/town_map_entries.asm
@@ -1,4 +1,4 @@
-ExternalMapEntries: ; 7139c (1c:539c)
+ExternalMapEntries:
EMAP $2,$B,PalletTownName
EMAP $2,$8,ViridianCityName
EMAP $2,$3,PewterCityName
@@ -37,7 +37,7 @@ ExternalMapEntries: ; 7139c (1c:539c)
EMAP $A,$1,Route24Name
EMAP $B,$0,Route25Name
-InternalMapEntries: ; 7140b (1c:540b)
+InternalMapEntries:
IMAP OAKS_LAB, $2,$B,PalletTownName
IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName
IMAP VIRIDIAN_FOREST_ENTRANCE, $2,$6,Route2Name
diff --git a/data/town_map_order.asm b/data/town_map_order.asm
index b43ed010..10131a31 100755
--- a/data/town_map_order.asm
+++ b/data/town_map_order.asm
@@ -1,4 +1,4 @@
-TownMapOrder: ; 70f95 (1c:4f95)
+TownMapOrder:
db PALLET_TOWN
db ROUTE_1
db VIRIDIAN_CITY
diff --git a/data/trades.asm b/data/trades.asm
index 77fc55f4..4fa52d30 100755
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,4 +1,4 @@
-TradeMons: ; 71c1d (1c:5c1d)
+TradeMons:
; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@"
db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@"
diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm
index dbff96f4..696253e3 100755
--- a/data/trainer_moves.asm
+++ b/data/trainer_moves.asm
@@ -3,7 +3,7 @@
; entry = trainerclass, trainerid, moveset+, 0
; moveset = partymon location, partymon's move, moveid
-SpecialTrainerMoves: ; 39c6b (e:5c6b)
+SpecialTrainerMoves:
db BUG_CATCHER,$f
db 2,2,TACKLE
db 2,3,STRING_SHOT
diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm
index 8f75f41e..48de8bce 100755
--- a/data/trainer_parties.asm
+++ b/data/trainer_parties.asm
@@ -1,4 +1,4 @@
-TrainerDataPointers: ; 39dd1 (e:5dd1)
+TrainerDataPointers:
dw YoungsterData
dw BugCatcherData
dw LassData
diff --git a/data/trainer_types.asm b/data/trainer_types.asm
index bb8bd0ec..cc7ca605 100755
--- a/data/trainer_types.asm
+++ b/data/trainer_types.asm
@@ -1,11 +1,11 @@
-FemaleTrainerList:: ; 33c3 (0:33c3)
+FemaleTrainerList::
db OPP_LASS
db OPP_JR_TRAINER_F
db OPP_BEAUTY
db OPP_COOLTRAINER_F
db $FF
-EvilTrainerList:: ; 33c8 (0:33c8)
+EvilTrainerList::
db OPP_JUGGLER_X
db OPP_GAMBLER
db OPP_ROCKER
@@ -14,5 +14,4 @@ EvilTrainerList:: ; 33c8 (0:33c8)
db OPP_SCIENTIST
db OPP_GIOVANNI
db OPP_ROCKET
-
- db $ff
+ db $FF
diff --git a/data/type_effects.asm b/data/type_effects.asm
index 8885ae19..1321a3d9 100755
--- a/data/type_effects.asm
+++ b/data/type_effects.asm
@@ -1,4 +1,4 @@
-TypeEffects: ; 3e5fa (f:65fa)
+TypeEffects:
; format: attacking type, defending type, damage multiplier
; the multiplier is a (decimal) fixed-point number:
; 20 is ×2.0
diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm
index 672d7382..4edc48a5 100755
--- a/data/warp_tile_ids.asm
+++ b/data/warp_tile_ids.asm
@@ -1,4 +1,4 @@
-WarpTileIDPointers: ; c215 (3:4215)
+WarpTileIDPointers:
dw OverworldWarpTileIDs
dw RedsHouse1WarpTileIDs
dw MartWarpTileIDs
@@ -25,65 +25,65 @@ WarpTileIDPointers: ; c215 (3:4215)
dw PlateauWarpTileIDs
dw BeachHouseWarpTileIDs
-OverworldWarpTileIDs: ; c247 (3:4247)
+OverworldWarpTileIDs:
db $1B,$58,$FF
-ForestGateWarpTileIDs: ; c24a (3:424a)
-MuseumWarpTileIDs: ; c24a (3:424a)
-GateWarpTileIDs: ; c24a (3:424a)
+ForestGateWarpTileIDs:
+MuseumWarpTileIDs:
+GateWarpTileIDs:
db $3B
-RedsHouse1WarpTileIDs: ; c24b (3:424b)
-RedsHouse2WarpTileIDs: ; c24b (3:424b)
+RedsHouse1WarpTileIDs:
+RedsHouse2WarpTileIDs:
db $1A,$1C,$FF
-MartWarpTileIDs: ; c24e (3:424e)
-PokecenterWarpTileIDs: ; c24e (3:424e)
+MartWarpTileIDs:
+PokecenterWarpTileIDs:
db $5E,$FF
-ForestWarpTileIDs: ; c250 (3:4250)
+ForestWarpTileIDs:
db $5A,$5C,$3A,$FF
-DojoWarpTileIDs: ; c254 (3:4254)
-GymWarpTileIDs: ; c254 (3:4254)
+DojoWarpTileIDs:
+GymWarpTileIDs:
db $4A,$FF
-HouseWarpTileIDs: ; c256 (3:4256)
+HouseWarpTileIDs:
db $54,$5C,$32,$FF
-ShipWarpTileIDs: ; c25a (3:425a)
+ShipWarpTileIDs:
db $37,$39,$1E,$4A,$FF
-InteriorWarpTileIDs: ; c25f (3:425f)
+InteriorWarpTileIDs:
db $15,$55,$04,$FF
-CavernWarpTileIDs: ; c263 (3:4263)
+CavernWarpTileIDs:
db $18,$1A,$22,$FF
-LobbyWarpTileIDs: ; c267 (3:4267)
+LobbyWarpTileIDs:
db $1A,$1C,$38,$FF
-MansionWarpTileIDs: ; c26b (3:426b)
+MansionWarpTileIDs:
db $1A,$1C,$53,$FF
-LabWarpTileIDs: ; c26f (3:426f)
+LabWarpTileIDs:
db $34,$FF
-FacilityWarpTileIDs: ; c271 (3:4571)
+FacilityWarpTileIDs:
db $43,$58,$20
-CemeteryWarpTileIDs: ; c274 (3:4274)
+CemeteryWarpTileIDs:
db $1B
-UndergroundWarpTileIDs: ; c275 (3:4275)
+UndergroundWarpTileIDs:
db $13,$FF
-PlateauWarpTileIDs: ; c277 (3:4277)
+PlateauWarpTileIDs:
db $1B,$3B
-ShipPortWarpTileIDs: ; c279 (3:4279)
-ClubWarpTileIDs: ; c279 (3:4279)
+ShipPortWarpTileIDs:
+ClubWarpTileIDs:
db $FF
-BeachHouseWarpTileIDs: ; c27a (3:427a)
- db $FF \ No newline at end of file
+BeachHouseWarpTileIDs:
+ db $FF
diff --git a/data/wild_mons.asm b/data/wild_mons.asm
index 15cbccc7..c1c44e95 100755
--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -1,4 +1,4 @@
-WildDataPointers: ; cb95 (3:4b95)
+WildDataPointers:
dw NoMons ; PALLET_TOWN
dw NoMons ; VIRIDIAN_CITY
dw NoMons ; PEWTER_CITY