Commit Graph

277 Commits

Author SHA1 Message Date
Diegoisawesome 15c92318d3 Extract data from misc files
Also split data4d.s
2017-12-25 00:32:01 -06:00
Diegoisawesome ca25068ae8 Extract baseroms from battle_tower 2017-12-23 16:17:31 -06:00
Diegoisawesome 4eccc06973 Finish extracting battle_frontier_2 data 2017-12-23 13:56:52 -06:00
sceptillion 3c286feec6 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs 2017-12-22 00:17:34 -08:00
sceptillion 96511dc214 use internal song names 2017-12-22 00:10:20 -08:00
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 b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +01:00
DizzyEggg 4e25ef10f2 wild encounter review changes 2017-11-20 16:40:02 +01:00
DizzyEggg a3b5af17ea berry blender is done 2017-11-19 22:48:46 +01:00
DizzyEggg 3de416662b wild encounter, fix merge conflicts 2017-11-18 21:45:52 +01:00
DizzyEggg 8fd3081306 start working on berry blender 2017-11-18 16:11:34 +01:00
DizzyEggg 1b7246395d merge conflicts, review changes, daycare 2017-11-17 19:31:03 +01:00
DizzyEggg a2a17bba92 more work on wild encounter 2017-11-17 17:50:07 +01:00
Diegoisawesome a98c6bf210 Fix build by renaming specials 2017-11-16 09:30:04 -06:00
DizzyEggg 616edd6c3f daycare file is decompiled 2017-11-15 20:08:31 +01:00
DizzyEggg 1e79d53d2f merge daycare with master 2017-11-15 17:18:05 +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