Commit Graph

76 Commits

Author SHA1 Message Date
DizzyEggg
5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01:00
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
96ab6f8353 match secret base func and fix struct 2018-02-07 13:49:33 +01:00
Diegoisawesome
d396a8f89c Merge new_menu_helpers and menu 2018-02-07 00:07:42 -06:00
DizzyEggg
76fc1d1c12 make time events compile 2018-01-29 16:25:09 +01:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
DizzyEggg
f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01: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
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
camthesaxman
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
DizzyEggg
646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
DizzyEggg
ba00a1c688 daycare file fully done 2017-11-15 22:12:18 +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
PikalaxALT
1406084fdd More camelCase, 2 2017-11-01 23:59:48 -04:00
PikalaxALT
9884147cd9 More camelCase 2017-11-01 23:54:11 -04:00
PikalaxALT
9945d57f07 Address review items 2017-11-01 23:50:13 -04:00
PikalaxALT
17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
PikalaxALT
16e30598db Remove unused includes 2017-10-27 23:22:35 -04:00
PikalaxALT
a5951592be Decompile data 2017-10-27 23:21:09 -04:00
PikalaxALT
4c274f6030 Last remaining function in secret base 2017-10-27 22:46:57 -04:00
PikalaxALT
f601525474 sub_80EBB28 2017-10-27 22:43:11 -04:00
PikalaxALT
9a5320135b sub_80EB9E0 2017-10-27 22:38:33 -04:00
PikalaxALT
939d728405 sub_80EB56C 2017-10-27 22:34:38 -04:00
PikalaxALT
69d206c255 sub_80EB498 2017-10-27 22:24:54 -04:00
PikalaxALT
b8b2a7ca40 through sub_80EB438 2017-10-27 22:20:13 -04:00
PikalaxALT
9c3a79f3de through sub_80EB218 2017-10-27 22:12:11 -04:00
PikalaxALT
d17ff9430a sub_80EAF80 2017-10-27 21:55:07 -04:00
PikalaxALT
8634537b8b through sub_80EAEF4 2017-10-27 21:17:17 -04:00
PikalaxALT
6341dbf61f sub_80EAD94 2017-10-27 21:03:27 -04:00
PikalaxALT
3d01d999c6 sub_80EAD14 2017-10-27 21:00:59 -04:00
PikalaxALT
5aaa4c099b DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords 2017-10-27 20:57:46 -04:00
PikalaxALT
d60ae05cbb sub_80EABDC 2017-10-27 20:50:32 -04:00
PikalaxALT
b30232a2e8 sub_80EABA4 2017-10-27 20:47:07 -04:00
PikalaxALT
5ac53054a8 sub_80EAAF4 2017-10-27 20:39:02 -04:00
PikalaxALT
aa134d42fb sub_80EAA64 2017-10-27 20:32:05 -04:00
PikalaxALT
75b52fe80a through sub_80EAA18 2017-10-27 08:43:10 -04:00
PikalaxALT
f61795ab47 through sub_80EA990 2017-10-27 08:38:54 -04:00
PikalaxALT
bef07a4bba sub_80EA828 2017-10-27 08:29:58 -04:00
PikalaxALT
fbfcce3f35 sub_80EA3E4 2017-10-26 23:35:41 -04:00
PikalaxALT
afcb30ccb0 sub_80EA354 2017-10-26 22:54:11 -04:00
PikalaxALT
fcaccb8501 through sub_80EA30C 2017-10-26 22:49:51 -04:00
PikalaxALT
1ed15b3952 through sub_80EA20C 2017-10-26 22:37:16 -04:00
PikalaxALT
81100d155a sub_80EA08C 2017-10-26 22:21:20 -04:00
PikalaxALT
68a253990d through sub_80E9FB0 2017-10-26 22:10:38 -04:00
PikalaxALT
ae3119a9c8 sub_80E9E90 2017-10-26 21:59:54 -04:00
PikalaxALT
48f38a888b through sub_80E9E44 2017-10-26 21:53:00 -04:00