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

..

images

Remove EXIF metadata from images

2018-02-08 19:38:14 +01:00

assembly_programming.md

Expand assembly documentation

2017-12-25 14:33:18 -05:00

battle_anim_commands.md

</code>

2018-01-17 14:53:08 -05:00

bugs_and_glitches.md

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

design_flaws.md

Macro factors out sine code, just like sine data, since it's used 5 times

2018-02-03 21:11:55 -05:00

event_commands.md

* loadmenuheader -> loadmenu (ead103d)

2018-02-25 20:05:37 -05:00

map_event_scripts.md

warp_event x, y, map, warp_id

2018-02-01 21:54:00 -05:00

menu.md

MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)

2018-01-23 16:08:43 -05:00

move_effect_commands.md

Other files belong in data/battle/

2018-01-10 17:49:19 -05:00

movement_commands.md

Allow italics/bold within inline code

2018-01-17 13:58:50 -05:00

music_commands.md

Allow italics/bold within inline code

2018-01-17 13:58:50 -05:00

pic_animations.md

Allow italics/bold within inline code

2018-01-17 13:58:50 -05:00

text_commands.md

More charmap and home/text.asm documentation for JP chars

2018-01-18 18:34:20 -05:00