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

2381 Commits

Author SHA1 Message Date
Diegoisawesome 40cf61307b
Merge pull request #267 from garakmon/master 
macOS support
 2018-08-11 18:37:09 -07:00
Garak e0a9faacb5
sha1sum -> sha1 2018-08-11 21:29:54 -04:00
Garak 2cfc7bd358
change darwin check 2018-08-11 21:21:43 -04:00
Garak 296a539664
add faster builds and NODEP sections from pokeruby 2018-08-11 21:19:27 -04:00
Garak 9ee4c23a46
remove -j4 2018-08-11 21:11:28 -04:00
garak 5d899d00e0 tone down INSTALL steps 2018-08-11 21:06:27 -04:00
Diegoisawesome 419917cdb0 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:59:08 -07:00
Diegoisawesome 18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome 73bdef2f67
Merge pull request #293 from Diegoisawesome/master 
Decompile field_specials
 2018-08-11 16:37:06 -07:00
Diegoisawesome cf9518f237 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:32:03 -07:00
Diegoisawesome 94eef0bfa5
Merge pull request #294 from DizzyEggg/learnsets 
Make learnsets easier to edit
 2018-08-11 16:27:52 -07:00
Diegoisawesome 0c29447717
Merge pull request #292 from DizzyEggg/move_desc 
Move move descriptions to C
 2018-08-11 16:26:16 -07:00
Diegoisawesome 57ce548020
Merge pull request #291 from DizzyEggg/patch-3 
Update battle_script_commands.c
 2018-08-11 16:24:34 -07:00
DizzyEggg 7b9a7765e0 Make learnsets easier to edit 2018-08-12 00:42:25 +02:00
Diegoisawesome 57b3393192 Fix compile error 2018-08-11 15:42:08 -07:00
Diegoisawesome cb9127ccaf Revert "Rename some specials" 
This reverts commit 658f9351fe.
 2018-08-11 15:16:41 -07:00
DizzyEggg 9bb7a2c7a5 make move desc compile 2018-08-12 00:09:53 +02:00
DizzyEggg df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
Diegoisawesome 658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg 7f167ca9f4
Update battle_script_commands.c 2018-08-11 23:00:16 +02:00
garak 2fc3b7f171 change sUnknown_085A1E3C to sMapHealLocations 2018-08-11 10:28:13 -04:00
Diegoisawesome 1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07:00
garak c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome 12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Diegoisawesome bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Diegoisawesome 90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
garak 45b730e474 copy heal_location changes from pokeruby 2018-08-07 23:05:48 -04:00
Garak 96ab357bed
Merge pull request #3 from pret/master 
syncing with source repo
 2018-08-07 22:21:10 -04:00
Diegoisawesome 85ebd76cd0 Fix fanfare constant to use define 2018-08-04 18:41:53 -07:00
Diegoisawesome 4070152b0e
Merge pull request #284 from DizzyEggg/patch-1 
Use constant in a battle script.
 2018-08-04 18:32:04 -07:00
Diegoisawesome 002016e764
Merge pull request #283 from DizzyEggg/battle_pr_again 
Battle code enums in switches
 2018-08-04 18:31:49 -07:00
DizzyEggg 3d5f512aec
Use constant in a battle script. 2018-08-03 18:07:45 +02:00
DizzyEggg eb4d9f6fed Tabs to spaces 2018-08-03 00:24:10 +02:00
DizzyEggg d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
Diegoisawesome 759bc2671c
Merge pull request #280 from DizzyEggg/decompile_part_mon_summary 
Decompile a few pokemon summary screen functions
 2018-08-02 08:27:05 -07:00
Diegoisawesome 722b07707c
Merge pull request #282 from DizzyEggg/stats_bits 
Add some more stat defines for battle scripts
 2018-08-02 08:11:44 -07:00
DizzyEggg 9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg 68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
Diegoisawesome df4c20f1f8
Merge pull request #281 from einstein95/master 
Port over preproc commit from pokeruby
 2018-07-29 02:19:09 -07:00
einstein95 aeceecea3d Port over 9d96147bbf 2018-07-29 20:11:04 +12:00
DizzyEggg 4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02:00
Diegoisawesome 919e7b4387
Merge pull request #279 from Diegoisawesome/master 
Move strings to C, misc cleanup
 2018-07-25 08:10:18 -07:00
Diegoisawesome 7270e73fee Move strings to C 2018-07-25 01:15:36 -07:00
Diegoisawesome e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome 156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
Diegoisawesome 5883f867f0
Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
Diegoisawesome c47aac3538
Merge pull request #260 from DizzyEggg/decompile_union_room 
Decompile part of union room
 2018-07-24 18:48:23 -07:00
DizzyEggg 1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
DizzyEggg c9d486a5d3 make union room compile i guess 2018-07-22 12:49:49 +02:00