Commit graph

6 commits

Author SHA1 Message Date
scnorton
55bae5e8ad data/script_menu.s 2017-09-25 14:47:44 -04:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00
DizzyEggg
b1e90c1d50 review berry cleanings 2017-09-13 19:30:05 +02:00
DizzyEggg
a08cd8e5a7 define number of map objects 2017-09-13 12:17:48 +02:00
DizzyEggg
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
DizzyEggg
625b1b6949 start berry porting 2017-09-12 18:47:27 +02:00