14 Commits

Author	SHA1	Message	Date
Diegoisawesome	0403f6eea9	Merge remote-tracking branch 'Egg/decompile_use_pokeblock'	2017-12-21 16:19:50 -06:00
Marcus Huderle	173761a5a1	Port generic event script macros from pokeruby	2017-12-21 13:47:52 -06:00
DizzyEggg	cb229f56e8	fix pokeblock conflicts	2017-12-18 16:58:14 +01:00
DizzyEggg	7517f6a030	fix battle setup conflicts	2017-12-17 20:26:13 +01:00
PikalaxALT	6d73bb4b57	Import function labels from Ruby	2017-12-16 10:23:05 -05:00
DizzyEggg	44abbae60b	nerge with master, fix conflicts	2017-12-16 01:08:55 +01:00
DizzyEggg	4351676749	decompile more of pokeblock.s	2017-12-16 00:08:23 +01:00
DizzyEggg	646664ff29	battle setup file is decompiled	2017-12-01 21:25:13 +01:00
DizzyEggg	e8ecb01ab2	more work on battle setup	2017-11-29 19:54:15 +01:00
DizzyEggg	10470ef536	start working on battle setup	2017-11-28 23:02:09 +01:00
DizzyEggg	4e25ef10f2	wild encounter review changes	2017-11-20 16:40:02 +01:00
DizzyEggg	1b7246395d	merge conflicts, review changes, daycare	2017-11-17 19:31:03 +01:00
Diegoisawesome	6e6e11205d	Fix capitalized symbol names	2017-11-11 18:17:46 -06:00
Diegoisawesome	f497c1508b	Split files from event_scripts.s ... Also move maps/scripts to scripts/maps	2017-11-11 16:10:17 -06:00