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

2570 Commits

Author SHA1 Message Date
Diegoisawesome bd2b7beb07 Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 13:17:51 -07:00
Diegoisawesome 335f4c1e81
Merge pull request #296 from DizzyEggg/event_data 
Event data
 2018-08-12 13:17:36 -07:00
DizzyEggg f1daf7442d event data review changes 2018-08-12 22:04:49 +02:00
Diegoisawesome 9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
DizzyEggg 577e6e7c1f Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data 2018-08-12 21:55:20 +02:00
Diegoisawesome 2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
Diegoisawesome 25832810f6
Merge pull request #288 from DizzyEggg/slot_machine 
Port a little bit of slot machine
 2018-08-12 12:27:23 -07:00
Diegoisawesome 32b0e102cf
Merge pull request #287 from DizzyEggg/easy_chat 
Pikalax's Easy chat
 2018-08-12 12:17:23 -07:00
Diegoisawesome 6bb761a711
Merge pull request #277 from atasro2/player_field_avatar 
decompile a portion of field_player_avatar.s
 2018-08-12 12:09:09 -07:00
Diegoisawesome 26e18f2292
Merge pull request #289 from DizzyEggg/contests 
Pikalax's contests
 2018-08-12 12:04:53 -07:00
MCboy 1bc93c5a66
Merge branch 'master' into player_field_avatar 2018-08-12 23:26:00 +04:30
MCboy 9e9ec8dc96
god damn it contributers :c 2018-08-12 23:17:27 +04:30
Diegoisawesome 21060091d1
Merge pull request #295 from DizzyEggg/pokemon_storage_system 
Decompile a bit of pokemon storarage system
 2018-08-12 11:38:39 -07:00
MCboy 2ddabca996
apply some changes 2018-08-12 22:31:58 +04:30
MCboy f7c3151ef2
add functions to header 2018-08-12 22:31:19 +04:30
MCboy e6db9c5d19
add function to header 2018-08-12 22:29:44 +04:30
MCboy 8650f2345d
define function in header 2018-08-12 22:28:41 +04:30
DizzyEggg 7dac22314e Decompile a bit of pokemon storarage system 2018-08-12 16:40:31 +02:00
DizzyEggg 957dcd01b3 merge with master 2018-08-12 12:11:35 +02:00
DizzyEggg e787d5b602 Contest review changes 2018-08-12 12:08:51 +02:00
DizzyEggg 1229bead2e slot machine review changes 2018-08-12 11:50:26 +02:00
DizzyEggg 3a72e6a80d Easy chat review changes 2018-08-12 11:39:09 +02:00
Diegoisawesome a000eb4f36 Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move 2018-08-11 19:03:38 -07:00
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
DizzyEggg feee4751eb
Make event data look cleaner 2018-08-11 22:54:34 +02:00
DizzyEggg 537ebd36ac Merge contests with master 2018-08-11 19:04:28 +02:00
DizzyEggg 0e0d103044 port more of slot machine 2018-08-11 18:47:56 +02:00
DizzyEggg 7961aa44ba start porting slot machine 2018-08-11 17:57:20 +02:00
garak 2fc3b7f171 change sUnknown_085A1E3C to sMapHealLocations 2018-08-11 10:28:13 -04:00
DizzyEggg 59d8d56868 merge easy chat with master 2018-08-11 14:14:51 +02:00