Commit Graph

1574 Commits

Author SHA1 Message Date
DizzyEggg 91349324c6 up to CB2_BattleDome 2018-08-25 11:55:16 +02:00
DizzyEggg dea1de3fed More battle dome 2018-08-21 23:36:59 +02:00
DizzyEggg a12b69eae1 DisplayMatchInfoOnCard decompiled 2018-08-20 22:56:05 +02:00
DizzyEggg 5da12f2b21 battle dome - more work 2018-08-19 22:26:07 +02:00
DizzyEggg 4a0f7398ec Cant believe Ive matched this 2018-08-19 20:21:37 +02:00
DizzyEggg 239c56496b This is impossible 2018-08-19 17:13:05 +02:00
DizzyEggg fb19a8fc59 battle dome cards sensibly renamed 2018-08-19 01:06:10 +02:00
DizzyEggg e4649245ba this file is too much 2018-08-18 19:52:25 +02:00
DizzyEggg 63cbc8f3cc battle dome - a couple more functions 2018-08-18 00:54:18 +02:00
DizzyEggg 0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
Diegoisawesome 13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
DizzyEggg e2f5e73445 More battle dome 2018-08-15 23:04:46 +02:00
DizzyEggg a54fa23b5f Begin battle frontier 1 2018-08-15 15:49:50 +02:00
DizzyEggg 92c4fc6345 Contest AI clean-up 2018-08-15 11:50:18 +02:00
DizzyEggg c806992cfc Port contest ai from pokeruby 2018-08-15 11:43:57 +02:00
Diegoisawesome 0bc975bf57 Document and cleanup pokemon_summary_screen 2018-08-15 01:44:20 -07:00
Diegoisawesome a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
DizzyEggg 1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
Diegoisawesome 6dac87abfd Cleanup and document learn_move 2018-08-12 14:28:15 -07:00
DizzyEggg 0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
Diegoisawesome 9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07: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
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
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 cb9127ccaf Revert "Rename some specials"
This reverts commit 658f9351fe.
2018-08-11 15:16:41 -07: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 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
DizzyEggg 59d8d56868 merge easy chat with master 2018-08-11 14:14:51 +02:00
Diegoisawesome 1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07: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
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
DizzyEggg 9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg 4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02: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
MCboy ed3a698b98 Update field_player_avatar.s 2018-07-24 17:01:44 +04:30
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
MCboy 05c5469f61 Update field_player_avatar.s 2018-07-21 03:07:19 +04:30