Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,360 Commits 3 Branches 0 Tags 882 MiB
Commit Graph

520 Commits

Author SHA1 Message Date
DizzyEggg 37a6e1b6c7 Merge branch 'master' of https://github.com/itskobold/pokeemerald into kobold_fixes 2017-12-19 20:09:28 +01:00
DizzyEggg 54dccc8512 give batter script command names 2017-12-17 20:38:01 +01:00
DizzyEggg 7517f6a030 fix battle setup conflicts 2017-12-17 20:26:13 +01:00
PikalaxALT 6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
PikalaxALT da2e0dfe50 Merge branch 'master' into clock 2017-12-15 21:04:25 -05:00
DizzyEggg 44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
Diegoisawesome e3c366df64 Merge remote-tracking branch 'pret/master' 2017-12-15 00:08:48 -06:00
camthesaxman 9525fdd54d convert more constants 2017-12-11 12:41:13 -06:00
camthesaxman c681b482c2 convert more constants 2017-12-11 12:27:51 -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
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 2fe25da65a move pokeball data to rom 2017-12-02 21:27:00 +01:00
DizzyEggg c2fdde3a49 pokeball file is decompiled 2017-12-02 20:38:26 +01:00
DizzyEggg c27f7a8131 start working on pokeball 2017-12-02 19:39:07 +01:00
DizzyEggg d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
DizzyEggg 273474d57a give names to some battlescripts 2017-12-02 00:03:46 +01:00
DizzyEggg 039c9f4bd8 merge with master 2017-12-01 21:27:29 +01:00
DizzyEggg 646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
DizzyEggg e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
Diegoisawesome 70743f4b95 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-29 00:52:32 -06:00
DizzyEggg 10470ef536 start working on battle setup 2017-11-28 23:02:09 +01:00
PikalaxALT 88636dfc2a Merge branch 'master' into clock 2017-11-27 20:09:53 -05:00
PikalaxALT b9d08ed83b Merge branch 'master' into unk_81BAD84 2017-11-27 20:08:34 -05:00
Cameron Hall 6e317c6463
Merge pull request #124 from DizzyEggg/dump_battlescripts 
Dump Battle Scripts
 2017-11-27 14:00:29 -06:00
DizzyEggg 77a6c30bd4 make various macros 2017-11-26 21:04:00 +01:00
DizzyEggg b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +01: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 9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00
DizzyEggg cc572f7c00 clear battle code and battlescripts 2017-11-26 11:55:17 +01:00
DizzyEggg 938d346b6d fixes and labels 2017-11-26 01:19:57 +01:00
DizzyEggg 76f4a8b195 clean up and use names for printfromtable 2017-11-26 00:33:40 +01:00
DizzyEggg 847bfa1540 add more battlescript macros 2017-11-25 21:32:17 +01:00
DizzyEggg fe658cc2fd create setword macro 2017-11-25 21:11:20 +01:00
DizzyEggg 9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
PikalaxALT 2746967bef through sub_8134CE8 2017-11-24 20:46:29 -05:00
PikalaxALT 24009ea941 through Cb2_StartWallClock and associated data 2017-11-24 19:49:03 -05:00
PikalaxALT 2280614a14 Start decompiling data 2017-11-24 19:06:01 -05:00
PikalaxALT f54f2c424f LoadWallClockGraphics 2017-11-24 18:00:26 -05:00
PikalaxALT 772da493f9 data/unk_81BAD84 2017-11-23 21:15:57 -05:00
itskobold deec6f21db Pointer fixes etc 
Fixed up the last of my old dumps
 2017-11-23 10:48:56 +00:00
itskobold 40638a48e7 battle_frontier_1.s fix 
sorted out most of the other raw pointers
 2017-11-22 15:15:58 +00:00
itskobold a9f7a41edd battle_frontier_1 buncha pointers fixed 2017-11-22 13:05:28 +00:00
itskobold caf952e02e Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-20 18:27:23 +00:00
DizzyEggg 4e25ef10f2 wild encounter review changes 2017-11-20 16:40:02 +01:00
DizzyEggg a3b5af17ea berry blender is done 2017-11-19 22:48:46 +01:00
itskobold 625be4bf04 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-19 10:50:39 +00:00