Commit Graph

8 Commits

Author SHA1 Message Date
Marcus Huderle
e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
Phlosioneer
4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
Phlosioneer
3ceb1667c9 Reduce externs 2019-03-01 22:32:50 -05:00
Marcus Huderle
abebd2b864 Cleanup externs in overworld.c 2019-02-08 11:48:51 -06:00
Marcus Huderle
a1ad1bad3a Document a bunch of battle pyramid 2019-02-06 21:14:28 -06:00
Marcus Huderle
6e7bdb3ca4 Document misc field_specials things 2018-12-29 11:36:54 -06:00
DizzyEggg
4ec14b3d43 Finish field screen 2018-12-08 22:05:11 +01:00
Diegoisawesome
f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00