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
..
scripts	Default macro parameters use recursion; avoids repeating internal structure	2018-02-25 20:12:58 -05:00
code.asm	Macro factors out sine code, just like sine data, since it's used 5 times	2018-02-03 21:11:55 -05:00
coords.asm	Prefix wram labels with w, part 2.	2018-01-23 17:39:09 -05:00
data.asm	Macro factors out sine code, just like sine data, since it's used 5 times	2018-02-03 21:11:55 -05:00
enum.asm	const_def N	2018-01-31 11:38:45 -05:00
gfx.asm	PALETTE_SIZE	2018-01-22 19:57:35 -05:00
legacy.asm	Merge branch 'master' of https://github.com/pret/pokecrystal	2018-02-25 20:39:54 -05:00
predef.asm	Long lists of db/dw series with struct-defining macros belong in data/	2018-01-15 14:11:11 -05:00
rst.asm	Similar formatting for similar WRAM areas	2018-02-02 21:15:15 -05:00
wram.asm	Merge branch 'master' of https://github.com/pret/pokecrystal	2018-02-25 20:39:54 -05:00