Commit Graph

  • 239c56496b This is impossible DizzyEggg 2018-08-19 17:13:05 +02:00
  • fb19a8fc59 battle dome cards sensibly renamed DizzyEggg 2018-08-19 01:06:10 +02:00
  • e4649245ba this file is too much DizzyEggg 2018-08-18 19:52:25 +02:00
  • f7fd5ce75c Match one of the hardest battle dome functions DizzyEggg 2018-08-18 18:23:40 +02:00
  • 63cbc8f3cc battle dome - a couple more functions DizzyEggg 2018-08-18 00:54:18 +02:00
  • 1fd1faef92 Merge pull request #297 from DizzyEggg/contest_table Diegoisawesome 2018-08-16 14:16:00 -07:00
  • 5dd1afd383 contest effect review changes DizzyEggg 2018-08-16 22:55:36 +02:00
  • 0bfe894566 Merge with master DizzyEggg 2018-08-16 22:53:01 +02:00
  • 7669a94f0d this function is driving me insane DizzyEggg 2018-08-16 22:46:02 +02:00
  • 2b81db7ace Fix Task_Truck1 Diegoisawesome 2018-08-15 18:50:56 -07:00
  • 8ac98f7441 Merge pull request #298 from Diegoisawesome/master Diegoisawesome 2018-08-15 16:27:49 -07:00
  • 13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald Diegoisawesome 2018-08-15 16:22:54 -07:00
  • f65da613cf Merge pull request #299 from DizzyEggg/contest_ai Diegoisawesome 2018-08-15 16:19:18 -07:00
  • e7da514382 Finish documenting and cleaning up summary_screen Diegoisawesome 2018-08-15 15:58:41 -07:00
  • d28398b8dd Merge pull request #301 from Tetrable/master Diegoisawesome 2018-08-15 14:17:41 -07:00
  • e2f5e73445 More battle dome DizzyEggg 2018-08-15 23:04:46 +02:00
  • 8896b54e8f Add national/hoenn dex defines, update dex arrays Tetrable 2018-08-15 20:10:28 +01:00
  • ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen Diegoisawesome 2018-08-15 11:47:10 -07:00
  • a54fa23b5f Begin battle frontier 1 DizzyEggg 2018-08-15 15:49:50 +02:00
  • dc6cf391ce Make contest ai compile. DizzyEggg 2018-08-15 12:06:23 +02:00
  • 92c4fc6345 Contest AI clean-up DizzyEggg 2018-08-15 11:50:18 +02:00
  • c806992cfc Port contest ai from pokeruby DizzyEggg 2018-08-15 11:43:57 +02:00
  • 0bc975bf57 Document and cleanup pokemon_summary_screen Diegoisawesome 2018-08-15 01:44:20 -07:00
  • 332a8bcb1d Extract rodata for unk_pokedex_area_screen_helper Diegoisawesome 2018-08-14 22:05:48 -07:00
  • a07d69d7c2 Finish pokemon_summary_screen Diegoisawesome 2018-08-14 21:56:11 -07:00
  • ba225f8eaa Fix fakematching in contest effect DizzyEggg 2018-08-15 00:25:19 +02:00
  • 0b22ad4ab5 make contest effect build DizzyEggg 2018-08-15 00:01:43 +02:00
  • 0c7063c5ba Make contest effect table easier to edit in the future DizzyEggg 2018-08-14 23:50:58 +02:00
  • c72b55a5c4 Match the worst function ever DizzyEggg 2018-08-14 22:28:25 +02:00
  • 1a0e6f7aed match contest effect DizzyEggg 2018-08-13 21:24:11 +02:00
  • 6dac87abfd Cleanup and document learn_move Diegoisawesome 2018-08-12 14:01:08 -07:00
  • 0d68af7f06 copy contest effect from ruby DizzyEggg 2018-08-12 23:20:17 +02:00
  • b40957c09b Finish decompiling learn_move Diegoisawesome 2018-08-12 13:33:41 -07:00
  • bd2b7beb07 Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move Diegoisawesome 2018-08-12 13:17:51 -07:00
  • 335f4c1e81 Merge pull request #296 from DizzyEggg/event_data Diegoisawesome 2018-08-12 13:17:36 -07:00
  • f1daf7442d event data review changes DizzyEggg 2018-08-12 22:04:49 +02:00
  • 9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move Diegoisawesome 2018-08-12 12:55:21 -07:00
  • 577e6e7c1f Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data DizzyEggg 2018-08-12 21:55:20 +02:00
  • 2dd5fc23d4 Prepare learn_move for merge Diegoisawesome 2018-08-12 12:54:07 -07:00
  • 25832810f6 Merge pull request #288 from DizzyEggg/slot_machine Diegoisawesome 2018-08-12 12:27:23 -07:00
  • 32b0e102cf Merge pull request #287 from DizzyEggg/easy_chat Diegoisawesome 2018-08-12 12:17:23 -07:00
  • 6bb761a711 Merge pull request #277 from atasro2/player_field_avatar Diegoisawesome 2018-08-12 12:09:09 -07:00
  • 26e18f2292 Merge pull request #289 from DizzyEggg/contests Diegoisawesome 2018-08-12 12:04:53 -07:00
  • 1bc93c5a66 Merge branch 'master' into player_field_avatar MCboy 2018-08-12 23:26:00 +04:30
  • 9e9ec8dc96 god damn it contributers :c MCboy 2018-08-12 23:17:27 +04:30
  • 21060091d1 Merge pull request #295 from DizzyEggg/pokemon_storage_system Diegoisawesome 2018-08-12 11:38:39 -07:00
  • 2ddabca996 apply some changes MCboy 2018-08-12 22:31:58 +04:30
  • f7c3151ef2 add functions to header MCboy 2018-08-12 22:31:19 +04:30
  • e6db9c5d19 add function to header MCboy 2018-08-12 22:29:44 +04:30
  • 8650f2345d define function in header MCboy 2018-08-12 22:28:41 +04:30
  • 7dac22314e Decompile a bit of pokemon storarage system DizzyEggg 2018-08-12 16:40:31 +02:00
  • 957dcd01b3 merge with master DizzyEggg 2018-08-12 12:11:35 +02:00
  • e787d5b602 Contest review changes DizzyEggg 2018-08-12 12:08:51 +02:00
  • 1229bead2e slot machine review changes DizzyEggg 2018-08-12 11:50:26 +02:00
  • 3a72e6a80d Easy chat review changes DizzyEggg 2018-08-12 11:39:09 +02:00
  • a000eb4f36 Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move Diegoisawesome 2018-08-11 19:03:38 -07:00
  • 40cf61307b Merge pull request #267 from garakmon/master Diegoisawesome 2018-08-11 18:37:09 -07:00
  • e0a9faacb5 sha1sum -> sha1 Garak 2018-08-11 21:29:54 -04:00
  • 2cfc7bd358 change darwin check Garak 2018-08-11 21:21:43 -04:00
  • 296a539664 add faster builds and NODEP sections from pokeruby Garak 2018-08-11 21:19:27 -04:00
  • 0d6f8ba5e4 add INSTALL sections for faster builds and NODEP garak 2018-08-11 21:13:37 -04:00
  • 9ee4c23a46 remove -j4 Garak 2018-08-11 21:11:28 -04:00
  • 5d899d00e0 tone down INSTALL steps garak 2018-08-11 21:06:27 -04:00
  • 419917cdb0 Merge branch 'master' of github.com:pret/pokeemerald Diegoisawesome 2018-08-11 16:59:08 -07:00
  • 18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' Diegoisawesome 2018-08-11 16:57:46 -07:00
  • 73bdef2f67 Merge pull request #293 from Diegoisawesome/master Diegoisawesome 2018-08-11 16:37:06 -07:00
  • cf9518f237 Merge branch 'master' of github.com:pret/pokeemerald Diegoisawesome 2018-08-11 16:32:03 -07:00
  • 94eef0bfa5 Merge pull request #294 from DizzyEggg/learnsets Diegoisawesome 2018-08-11 16:27:52 -07:00
  • 0c29447717 Merge pull request #292 from DizzyEggg/move_desc Diegoisawesome 2018-08-11 16:26:16 -07:00
  • 57ce548020 Merge pull request #291 from DizzyEggg/patch-3 Diegoisawesome 2018-08-11 16:24:34 -07:00
  • 7b9a7765e0 Make learnsets easier to edit DizzyEggg 2018-08-12 00:42:25 +02:00
  • 57b3393192 Fix compile error Diegoisawesome 2018-08-11 15:42:08 -07:00
  • cb9127ccaf Revert "Rename some specials" Diegoisawesome 2018-08-11 15:16:41 -07:00
  • 9bb7a2c7a5 make move desc compile DizzyEggg 2018-08-12 00:09:53 +02:00
  • df5009cb3e Move move descriptions to C DizzyEggg 2018-08-12 00:03:19 +02:00
  • 658f9351fe Rename some specials Diegoisawesome 2018-08-11 14:58:51 -07:00
  • b54793be91 Finish decompiling field_specials Diegoisawesome 2018-08-11 14:51:54 -07:00
  • 7f167ca9f4 Update battle_script_commands.c DizzyEggg 2018-08-11 23:00:16 +02:00
  • feee4751eb Make event data look cleaner DizzyEggg 2018-08-11 22:54:34 +02:00
  • 537ebd36ac Merge contests with master DizzyEggg 2018-08-11 19:04:28 +02:00
  • 0e0d103044 port more of slot machine DizzyEggg 2018-08-11 18:47:56 +02:00
  • 7961aa44ba start porting slot machine DizzyEggg 2018-08-11 17:57:20 +02:00
  • 2fc3b7f171 change sUnknown_085A1E3C to sMapHealLocations garak 2018-08-11 10:28:13 -04:00
  • 59d8d56868 merge easy chat with master DizzyEggg 2018-08-11 14:14:51 +02:00
  • 1e0f3ec433 Continue decompiling field_specials Diegoisawesome 2018-08-10 14:07:23 -07:00
  • c3512e3b39 port larger heal location changes from poke ruby pr garak 2018-08-10 10:45:15 -04:00
  • 12ff59f9c1 Continue decompiling field_specials Diegoisawesome 2018-08-10 00:42:06 -07:00
  • bc42c5054c Merge remaining overworld frames Slawter666 2018-08-10 00:20:19 +01:00
  • 877a80d3bc Merge berry tree frames Slawter666 2018-08-09 23:19:45 +01:00
  • bad170b0cb Continue decompiling field_specials Diegoisawesome 2018-08-08 23:53:21 -07:00
  • dea0bba64e Merge "pokemon" frames Slawter666 2018-08-09 00:55:32 +01:00
  • 90896e38c9 Begin porting/decompiling field_specials Diegoisawesome 2018-08-08 01:37:12 -07:00
  • 45b730e474 copy heal_location changes from pokeruby garak 2018-08-07 23:05:48 -04:00
  • 96ab357bed Merge pull request #3 from pret/master Garak 2018-08-07 22:21:10 -04:00
  • 704e3c7334 Merge https://github.com/pret/pokeemerald into spritesheet Slawter666 2018-08-07 22:18:30 +01:00
  • ab2cc59629 Merge remaining "people" overworld frames Slawter666 2018-08-07 22:16:03 +01:00
  • 85ebd76cd0 Fix fanfare constant to use define Diegoisawesome 2018-08-04 18:41:53 -07:00
  • 4070152b0e Merge pull request #284 from DizzyEggg/patch-1 Diegoisawesome 2018-08-04 18:32:04 -07:00
  • 002016e764 Merge pull request #283 from DizzyEggg/battle_pr_again Diegoisawesome 2018-08-04 18:31:49 -07:00
  • 3d5f512aec Use constant in a battle script. DizzyEggg 2018-08-03 18:07:45 +02:00