Commit Graph

38 Commits

Author SHA1 Message Date
Diegoisawesome fbb51bc24b Extract baseroms from party_menu.s 2018-01-19 21:38:57 -06:00
Diegoisawesome e3585d7d66 Review fixes 2018-01-01 19:21:30 -06:00
ProjectRevoTPP 0af942e0b8 twelfth wave of graphics.s dumps 2017-12-26 01:39:01 -05:00
DizzyEggg cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
DizzyEggg 46fa2557d7 merge mail with master, fix conflicts 2017-12-17 20:22:56 +01:00
PikalaxALT 6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
DizzyEggg 6561b62986 start pokeblock feed 2017-12-09 21:23:40 +01:00
DizzyEggg 4faa442d5a decompile and label mail 2017-12-03 19:19:11 +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 1e79d53d2f merge daycare with master 2017-11-15 17:18:05 +01:00
PikalaxALT 89b695278d Merge branch 'master' into heal_location 2017-11-15 09:01:56 -05:00
Diegoisawesome ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
Diegoisawesome 118bf4f4b1 Merge pull request #108 from DizzyEggg/decompile_starter_choose
Decompile starter choose
2017-11-14 16:41:53 -06:00
DizzyEggg a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
Diegoisawesome 2e40384fa2 Extract baseroms from event_scripts 2017-11-10 18:12:18 -06:00
Diegoisawesome 09e431077a Merge remote-tracking branch 'pret/master' into dump_maps 2017-11-09 20:30:56 -06:00
Diegoisawesome e6ef86e4b0 Update variable and flag names 2017-11-08 15:20:10 -06:00
DizzyEggg 61408456e8 starter choose file is decompiled 2017-11-08 18:05:47 +01:00
DizzyEggg 135c4ea1f6 dump some of the item menu 2017-11-05 00:16:09 +01:00
PikalaxALT 9cfdc8b7e8 Merge branch 'master' into heal_location 2017-11-01 23:37:41 -04:00
PikalaxALT f61822535b MCB2_FlyMap 2017-10-31 22:34:12 -04:00
DizzyEggg 6cb1c4fd6e fix merge conflicts, evo scene 2017-10-31 19:36:25 +01:00
DizzyEggg 51df918c04 evo scene file is done 2017-10-29 16:15:23 +01:00
DizzyEggg 3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
DizzyEggg 11bead31e9 battle interface is done 2017-10-19 15:28:41 +02:00
Diegoisawesome 924c0c6b5a Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd 2017-10-13 20:29:11 -05:00
Diegoisawesome f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00
DizzyEggg ab03b03c4b decompile reshow battle screen 2017-10-09 18:18:40 +02:00
DizzyEggg 342e616d4b battle2 more and more and more 2017-10-06 00:12:01 +02:00
DizzyEggg 69928d3904 battle 4 up to 0xE5 2017-09-27 23:43:45 +02:00
DizzyEggg d769ec1374 battle 4 up to a8 2017-09-26 22:39:59 +02:00
DizzyEggg 9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
Diegoisawesome 9ed9f7de94 Finish renaming strings in strings.s 2017-09-20 16:46:59 -05:00
DizzyEggg 3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
DizzyEggg c253bf5e75 add important headers, const ptrs and egg hatch start 2017-09-18 18:36:05 +02:00
scnorton 71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
ProjectRevoTPP 16c05694fb split remaining rom files. 2017-09-16 21:32:37 -04:00