1874 Commits

Author SHA1 Message Date
Diegoisawesome
52624c4fb7 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-17 15:07:17 -06: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
itskobold
370e47beee Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-17 09:25:40 +00:00
PikalaxALT
236cbf96c8 Merge origin/master into pikalaxalt/link 2017-11-16 19:00:07 -05:00
DizzyEggg
b37d8c0821 start decompiling wild encounter 2017-11-16 20:38:10 +01:00
Diegoisawesome
a98c6bf210 Fix build by renaming specials 2017-11-16 09:30:04 -06:00
Diegoisawesome
f8402b3d74 Rename contest string symbols 2017-11-15 23:57:38 -06:00
Diegoisawesome
c0d180a870
Merge pull request #100 from PikalaxALT/heal_location
Heal location and Field Region Map
2017-11-15 23:24:45 -06:00
Diegoisawesome
6a73c89e54
Merge pull request #113 from DizzyEggg/decompile_pss
Start Pokemon Storage System
2017-11-15 20:55:38 -06:00
DizzyEggg
ba00a1c688 daycare file fully done 2017-11-15 22:12:18 +01: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
PikalaxALT
89b695278d Merge branch 'master' into heal_location 2017-11-15 09:01:56 -05:00
itskobold
46ee15b962 Getting myself organised
durr
2017-11-15 12:55:16 +00:00
itskobold
7c79b030e9 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-15 12:42:18 +00:00
itskobold
2acab81713 Merge branch 'master' of https://github.com/pret/pokeemerald
also started fixing pointers in my dumps
2017-11-15 12:41:25 +00: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
95949c772e more of daycare done 2017-11-14 21:43:23 +01:00
DizzyEggg
a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
DizzyEggg
516a5b2219 fix merge conflicts, review changes 2017-11-13 20:00:20 +01:00
Diegoisawesome
d1fe93bf4a
Merge pull request #105 from DizzyEggg/dump_things
Get rid of a couple of baseroms
2017-11-13 12:46:40 -06:00
DizzyEggg
4d615350c8 added berry blender start gfx 2017-11-13 19:36:23 +01:00
DizzyEggg
bb9c928330 starter choose review changes 2017-11-13 18:30:17 +01:00
PikalaxALT
1ca032c6ff Address review items, 1 2017-11-12 21:13:18 -05:00
DizzyEggg
c967ba1d5f dump couple of baseroms review changes 2017-11-12 18:41:04 +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
itskobold
e373cf4bb9 field_effect dataroms
quite a few pointers and stuff done
2017-11-11 15:26:39 +00:00
itskobold
1e495b2837 contest_painting.s, cute_sketch.s
simple stuff
2017-11-11 15:05:05 +00:00
DizzyEggg
fa3691ca40 start pss 2017-11-11 14:45:08 +01:00
PikalaxALT
e874cbd9d9 Rename functions in link.c 2017-11-11 00:05:44 -05:00
PikalaxALT
b92d85fd30 Decompile link data 2017-11-10 20:55:03 -05:00
PikalaxALT
50c1622507 Split link.s and link_rfu.s 2017-11-10 20:47:24 -05:00
Diegoisawesome
2e40384fa2 Extract baseroms from event_scripts 2017-11-10 18:12:18 -06:00
Diegoisawesome
a6c30ba951 More file organization 2017-11-10 13:20:27 -06:00
Diegoisawesome
d5af24fb2d Extract tilesets 2017-11-10 12:46:01 -06:00
Diegoisawesome
6ecad1a59d Organize map data 2017-11-10 12:39:00 -06:00
Diegoisawesome
a81deec3b3 Extract unused maps 2017-11-10 11:42:04 -06:00
Diegoisawesome
de8a058714 Extract more baseroms from maps 2017-11-10 02:52:05 -06:00
Diegoisawesome
29079c4b99 Dump numerous baseroms, begin moving data to proper files 2017-11-10 01:49:12 -06:00
Diegoisawesome
09e431077a Merge remote-tracking branch 'pret/master' into dump_maps 2017-11-09 20:30:56 -06:00
PikalaxALT
d94f74d261 sub_8009AA0 2017-11-09 21:14:43 -05:00
Diegoisawesome
2d3044aaa6 Begin map dump cleanup 2017-11-09 19:38:57 -06:00
Diegoisawesome
455a979819 Add dummy Sootopolis map connections 2017-11-09 19:21:54 -06:00
Diegoisawesome
f61810a8f9 Dump maps 2017-11-09 19:21:31 -06:00
Diegoisawesome
e6ef86e4b0 Update variable and flag names 2017-11-08 15:20:10 -06:00
DizzyEggg
045e7d6382 split starter choose data 2017-11-08 20:53:39 +01:00
DizzyEggg
61408456e8 starter choose file is decompiled 2017-11-08 18:05:47 +01:00