9 Commits

Author	SHA1	Message	Date
Rangi	335c2699f0	Merge branch 'master' of https://github.com/pret/pokecrystal ... # Conflicts: # constants/map_constants.asm # constants/wram_constants.asm # data/radio/oaks_pkmn_talk_routes.asm # data/radio/pnp_hidden_places.asm # engine/battle/core.asm # engine/breeding.asm # engine/phone/phone_scripts.asm # engine/radio.asm # maps/BattleTower1F.asm # maps/OlivineLighthouse2F.asm # maps/OlivineLighthouse6F.asm # maps/PokemonFanClub.asm # maps/RadioTower1F.asm # maps/RadioTower2F.asm # maps/Route30BerryHouse.asm # maps/Route34IlexForestGate.asm # maps/Route36NationalParkGate.asm # maps/RuinsOfAlphKabutoChamber.asm # maps/RuinsOfAlphResearchCenter.asm # maps/VermilionPort.asm # maps/VictoryRoad.asm	2018-02-25 20:39:54 -05:00
Rangi	48f4f2366e	Align map event coordinate columns	2018-02-01 22:22:07 -05:00
Rangi	3088a77a21	warp_event x, y, map, warp_id	2018-02-01 21:54:00 -05:00
Rangi	08891da822	const_def N	2018-01-31 11:38:45 -05:00
Rangi	50a78c0876	Forgot the person→object rename	2018-01-31 11:08:47 -05:00
Rangi	a2607623d3	Comment the person constants sections, like the others	2018-01-31 11:04:17 -05:00
Rangi	65480605e9	Remove unreferenced map script heading labels	2018-01-30 14:15:47 -05:00
Rangi	477adc72af	grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g	2018-01-28 13:20:04 -05:00
Rangi	517eab6526	"Speech" houses just have dialog NPCs	2018-01-23 12:54:17 -05:00