4 Commits

Author	SHA1	Message	Date
DizzyEggg	356eb34e32	undo revert	2017-10-23 14:40:22 +02:00
DizzyEggg	5b70307962	revert merge coz its bugged	2017-10-23 13:36:55 +02:00
U-User-PC\User	d4532c70cb	fix merge conflicts	2017-10-18 19:28:36 -04:00
PikalaxALT	4e1c9920b2	Split data/data_emerald2.s	2017-09-21 13:51:32 -04:00