5 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
mid-kid	e8bc86d1fe	Pkmn -> Mon ... Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.	2018-02-22 17:39:06 +01:00
Rangi	6ff2cb20e6	map → map_id; map_def → map; map_data → map_attributes	2018-02-03 17:11:55 -05:00
Rangi	7cef012335	wUnlockedUnowns engine flag constants ... Use local labels for "End"ings	2018-01-22 13:00:35 -05:00
Remy Oukaour	22b607b664	Move radio channel data into data/	2018-01-10 11:30:12 -05:00