Commit Graph

153 Commits

Author SHA1 Message Date
DizzyEggg 382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
PikalaxALT 590c4b500b Merge branch 'master' into record_mixing 2018-02-11 20:12:40 -05:00
PikalaxALT ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05: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
PikalaxALT d52f52fa73 Merge branch 'master' into link 2018-02-03 09:42:19 -05:00
ProjectRevoTPP 78bd2b0849 move save rodata to source and use saveblock chunk macros 2018-01-31 15:26:57 -05:00
Diegoisawesome 3793152bc3 More work on menu 2018-01-29 17:26:36 -06:00
PikalaxALT d4e8c20f84 Merge branch 'master' into link 2018-01-21 23:20:13 -05:00
PikalaxALT d35cf06854 nonmatching sub_801120C 2018-01-21 18:25:23 -05:00
scnorton 89bbecd34b Include <string.h> in global.h 2018-01-21 14:40:19 -05:00
scnorton c6ff1a6ce3 Merge branch 'master' into link 2018-01-18 12:53:31 -05:00
ProjectRevoTPP 10ddfac7ab consistency 2018-01-06 22:00:08 -05:00
ProjectRevoTPP 7be61cfb1a add assert support to pokeemerald. 2018-01-06 21:12:42 -05:00
camthesaxman 601ec28721 remove explicit memcpy and add HEAP_SIZE constant 2018-01-06 00:35:48 -06:00
DizzyEggg cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
Diegoisawesome 6a674e1e83 Merge remote-tracking branch 'Egg/decompile_mail_data' 2017-12-17 22:51:40 -06:00
DizzyEggg 46fa2557d7 merge mail with master, fix conflicts 2017-12-17 20:22:56 +01:00
PikalaxALT 190a2cba61 Merge branch 'master' into link 2017-12-16 11:27:10 -05: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
Diegoisawesome e3c366df64 Merge remote-tracking branch 'pret/master' 2017-12-15 00:08:48 -06:00
camthesaxman caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
PikalaxALT 0b58905eea sub_800E3A8 2017-12-04 19:10:37 -05:00
DizzyEggg 4faa442d5a decompile and label mail 2017-12-03 19:19:11 +01:00
DizzyEggg e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
Diegoisawesome 8e9428c482 Add languages to enum 2017-11-29 00:53:18 -06:00
PikalaxALT cbd2718b5e Merge branch 'master' into link 2017-11-27 20:05:51 -05:00
PikalaxALT a875d665b8 Merge branch 'master' into easy_chat 2017-11-25 10:56:55 -05:00
PikalaxALT d6d315d817 Merge branch 'master' into link 2017-11-19 00:07:56 -05:00
DizzyEggg 3de416662b wild encounter, fix merge conflicts 2017-11-18 21:45:52 +01:00
Diegoisawesome 5dc8beb034 Merge pull request #112 from DizzyEggg/decompile_recorded_battle
Decompile recorded battle
2017-11-18 13:29:27 -06:00
DizzyEggg 6b075ae0ff wild encounter file is decompiled 2017-11-17 22:28:55 +01:00
DizzyEggg a2a17bba92 more work on wild encounter 2017-11-17 17:50:07 +01:00
DizzyEggg b37d8c0821 start decompiling wild encounter 2017-11-16 20:38:10 +01:00
DizzyEggg a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
DizzyEggg 209b6eb467 more of recorded battle done 2017-11-13 18:07:23 +01:00
DizzyEggg c4674735d2 start working on recorded battle 2017-11-12 22:59:36 +01:00
PikalaxALT d76901ff64 through sub_800A0AC 2017-11-10 08:37:50 -05:00
PikalaxALT 1c3e7f169f sub_80E6E24 2017-11-03 22:26:12 -04:00
PikalaxALT f8486b31c5 sub_80E6CA0 2017-11-03 21:56:18 -04:00
PikalaxALT ca2bc94c2b through sub_80E6BF8 2017-11-03 20:59:29 -04:00
PikalaxALT 01d6114da2 easy_chat_input_maybe 2017-11-02 19:26:14 -04:00
PikalaxALT ed7ded0748 Merge branch 'master' into easy_chat 2017-11-02 18:34:41 -04:00
PikalaxALT 17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
PikalaxALT 975e28c01e Merge branch 'master' into easy_chat 2017-10-28 20:03:24 -04:00
PikalaxALT 84a9441267 MWF: sub_80E9914 2017-10-25 19:54:24 -04:00
PikalaxALT eb2c2f0a3f through sub_80E8BC8 2017-10-23 19:21:08 -04:00
DizzyEggg 356eb34e32 undo revert 2017-10-23 14:40:22 +02:00