Commit Graph

73 Commits

Author SHA1 Message Date
scnorton c6ff1a6ce3 Merge branch 'master' into link 2018-01-18 12:53:31 -05:00
Diegoisawesome 3241b1405f Add symbols to music_player_table
Also rename gMPlay structs to gMPlayInfo
2018-01-09 21:30:54 -06:00
sceptillion 96511dc214 use internal song names 2017-12-22 00:10:20 -08:00
DizzyEggg 7581218569 Merge branch 'master' into decompile_battle1 2017-12-19 17:37:53 +01:00
Diegoisawesome 6a674e1e83 Merge remote-tracking branch 'Egg/decompile_mail_data' 2017-12-17 22:51:40 -06:00
DizzyEggg 720bd555bc add constants trainers file 2017-12-17 21:19:08 +01:00
DizzyEggg 46fa2557d7 merge mail with master, fix conflicts 2017-12-17 20:22:56 +01:00
DizzyEggg eb8055eb07 battle 1 is decompiled 2017-12-17 20:10:57 +01:00
PikalaxALT 190a2cba61 Merge branch 'master' into link 2017-12-16 11:27:10 -05:00
DizzyEggg 930fea6fad mail review changes 2017-12-16 01:18:31 +01:00
DizzyEggg 44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
camthesaxman c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
camthesaxman 19fbf024ff fix merge conflicts 2017-12-05 12:42:30 -06:00
camthesaxman 00896cb3b5 rename rng.c to random.c and rom4.c to overworld.c 2017-12-05 12:27:33 -06:00
Cameron Hall fd75493bc6 Merge pull request #129 from DizzyEggg/dumb_naming
Name some battle labels
2017-12-05 12:05:06 -06:00
camthesaxman caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
PikalaxALT 8b5d6fe5d9 CreateWirelessStatusIndicatorSprite 2017-12-03 22:01:06 -05:00
DizzyEggg 4faa442d5a decompile and label mail 2017-12-03 19:19:11 +01:00
DizzyEggg 790df7159e more battlescript labels 2017-12-03 00:47:21 +01:00
DizzyEggg e10aea9a51 give some more labels to battle struct fields 2017-12-02 23:31:58 +01:00
DizzyEggg ce6e97fa0b sprite data fields to array 2017-12-02 21:44:50 +01:00
DizzyEggg d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
PikalaxALT cbd2718b5e Merge branch 'master' into link 2017-11-27 20:05:51 -05:00
DizzyEggg d48392e677 change battle variables names 2017-11-26 18:07:00 +01:00
DizzyEggg 59f64c622b name more battlescripts 2017-11-26 17:26:11 +01:00
DizzyEggg 1bb5b1fd07 more battle labels 2017-11-26 17:15:28 +01:00
DizzyEggg 8c30c42c36 more labelling and changes 2017-11-26 14:17:02 +01:00
DizzyEggg 9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00
DizzyEggg 9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
PikalaxALT d6d315d817 Merge branch 'master' into link 2017-11-19 00:07:56 -05:00
DizzyEggg d0245cf8d2 recorded battle merge conflicts fix 2017-11-17 19:34:55 +01:00
PikalaxALT 236cbf96c8 Merge origin/master into pikalaxalt/link 2017-11-16 19:00:07 -05:00
Diegoisawesome ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
DizzyEggg 3e1f3d0e1e recorded battle file is decompiled 2017-11-13 19:01:23 +01:00
DizzyEggg 209b6eb467 more of recorded battle done 2017-11-13 18:07:23 +01:00
PikalaxALT f21c5ebea5 through sub_800B1A0 2017-11-12 23:58:05 -05:00
DizzyEggg 716590c165 one more battle label change 2017-11-12 17:11:06 +01:00
DizzyEggg 9febe24d9f label some battle struct fields 2017-11-12 17:06:31 +01:00
DizzyEggg 47a8c6c432 battle5 decompiled and renamed 2017-11-12 16:39:21 +01:00
PikalaxALT 27c0dc0fd5 through sub_800A588 2017-11-10 22:08:17 -05: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 6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01: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
Diegoisawesome 49c88e6343 Merge branch 'master' of github.com:pret/pokeemerald into dump_maps 2017-10-27 02:02:36 -05:00
Diegoisawesome cd7c3476d5 Rename script commands again 2017-10-23 00:34:55 -05:00
DizzyEggg df4e32a307 player battle controller is done 2017-10-22 18:43:15 +02:00
DizzyEggg 813b1bfd4a label and do more work at player controller 2017-10-22 01:04:02 +02:00