Commit Graph

8 Commits

Author SHA1 Message Date
Marcus Huderle 4fd2b0b484 Decompile remaining functions in use_pokeblock.s 2019-03-23 17:23:14 -05:00
Marcus Huderle 511ff2f20f Match sub_8166BEC and do some cleanup 2019-03-23 10:41:09 -05:00
Marcus Huderle a5ee2c14fd Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	include/menu_specialized.h
2019-03-23 10:14:31 -05:00
Marcus Huderle 91fa5faf4a Match sub_8166564 2019-03-23 10:10:51 -05:00
DizzyEggg 77c4856e62 Nonmatchings go away 2019-03-23 09:51:27 -05:00
Marcus Huderle 65391a1eb2 Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	src/use_pokeblock.c
2019-03-23 09:39:46 -05:00
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 eac70acab6 Change filename to something more descriptive 2019-03-08 02:17:01 -05:00