Commit Graph

  • 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
  • eb4d9f6fed Tabs to spaces DizzyEggg 2018-08-03 00:24:10 +02:00
  • d6537c811b Battle code enums in case switches DizzyEggg 2018-08-03 00:13:44 +02:00
  • 759bc2671c Merge pull request #280 from DizzyEggg/decompile_part_mon_summary Diegoisawesome 2018-08-02 08:27:05 -07:00
  • 722b07707c Merge pull request #282 from DizzyEggg/stats_bits Diegoisawesome 2018-08-02 08:11:44 -07:00
  • 5917f7d108 Merge frontier brains, team magma and team aqua frames Slawter666 2018-08-02 00:34:28 +01:00
  • 52aa9cedcf Merge May frames into sprite sheets Slawter666 2018-07-29 17:29:36 +01:00
  • 9febcd3a0a Document a bit of atk47 DizzyEggg 2018-07-29 15:51:08 +02:00
  • 68145cd002 Document atk48 DizzyEggg 2018-07-29 15:33:16 +02:00
  • df4c20f1f8 Merge pull request #281 from einstein95/master Diegoisawesome 2018-07-29 02:19:09 -07:00
  • aeceecea3d Port over https://github.com/pret/pokeruby/commit/9d96147bbf8dabc2a28105d73905808e70b73b0f einstein95 2018-07-29 20:02:31 +12:00
  • 4080c6f831 Decompile a few pokemon summary screen functions DizzyEggg 2018-07-28 23:26:19 +02:00
  • d5825230e5 Merge "brendan" frames into sprite sheets Slawter666 2018-07-28 18:11:28 +01:00
  • 919e7b4387 Merge pull request #279 from Diegoisawesome/master Diegoisawesome 2018-07-25 08:10:18 -07:00
  • 6c365fdc94 Update field_player_avatar.c MCboy 2018-07-25 17:47:04 +04:30
  • 3a15012085 Update field_player_avatar.c MCboy 2018-07-25 17:28:25 +04:30
  • 94a5f8d529 made file better ? MCboy 2018-07-25 17:18:49 +04:30
  • 7270e73fee Move strings to C Diegoisawesome 2018-07-25 01:15:36 -07:00
  • e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald Diegoisawesome 2018-07-24 21:18:36 -07:00
  • 156fb472e1 Clean up files and add entries to charmap Diegoisawesome 2018-07-24 21:18:23 -07:00
  • 5883f867f0 Merge pull request #278 from vblm12/trainer_data Diegoisawesome 2018-07-24 18:58:56 -07:00
  • c47aac3538 Merge pull request #260 from DizzyEggg/decompile_union_room Diegoisawesome 2018-07-24 18:48:23 -07:00
  • 1b3d7a5bef Update field_player_avatar.s MCboy 2018-07-24 17:04:02 +04:30
  • 64f40bbfee Add field_player_avatar to rodata MCboy 2018-07-24 17:03:16 +04:30
  • ed3a698b98 Update field_player_avatar.s MCboy 2018-07-24 17:01:44 +04:30
  • 82d88479ce decompiled a bunch of functions MCboy 2018-07-24 16:59:52 +04:30
  • 1e9143e0b2 merge union room with master DizzyEggg 2018-07-22 13:14:58 +02:00
  • c9d486a5d3 make union room compile i guess DizzyEggg 2018-07-22 12:49:49 +02:00
  • 3d04105488 Remove unnecessary files. vblm12 2018-07-21 01:51:44 -05:00
  • 29276cc76c Move some trainer data from data2b.s to c structs. vblm12 2018-07-20 22:14:31 -05:00
  • 07ea34e4c2 Make TrainerMonPtr fields const vblm12 2018-07-20 22:08:38 -05:00
  • c41b8123e3 Move trainer defines to one place in opponent.h... vblm12 2018-07-20 22:03:22 -05:00
  • 05c5469f61 Update field_player_avatar.s MCboy 2018-07-21 03:07:19 +04:30
  • 201fb6f818 ported code over from pokeruby MCboy 2018-07-21 03:06:40 +04:30
  • 62a4193f8f Update field_player_avatar.s MCboy 2018-07-20 03:46:55 +04:30
  • 43fa9da52a decompile more code MCboy 2018-07-20 03:44:20 +04:30
  • 416db8e751 oops MCboy 2018-07-19 21:23:45 +04:30
  • a8f9adeaf5 decompile player_field_avatar MCboy 2018-07-19 21:22:35 +04:30
  • e3a82bd2c5 decompile player_field_avatar.s MCboy 2018-07-19 21:18:09 +04:30
  • 34e3638f6c decompile field_player_avatar.s MCboy 2018-07-19 21:17:27 +04:30
  • 663bb3112a add player_field_avatar.c MCboy 2018-07-19 21:15:35 +04:30
  • 9bb23388a5 Fixed a typo MCboy 2018-07-19 20:51:40 +04:30
  • 1ab872c68e Allow make compare to work on all platforms garakmon 2018-07-18 15:06:18 -04:00
  • 5e46a0fcc5 Merge pull request #2 from pret/master Garak 2018-07-17 09:24:30 -04:00
  • 06b3ce408f Merge pull request #272 from DizzyEggg/final_battle_files_touches Diegoisawesome 2018-07-16 13:35:17 -07:00
  • 118fa3afce IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL DizzyEggg 2018-07-16 22:00:27 +02:00
  • bf0178238a Battle files - review changes DizzyEggg 2018-07-16 20:47:30 +02:00
  • ea5ffa3375 Merge with master DizzyEggg 2018-07-16 20:23:05 +02:00
  • 07ef762770 Merge pull request #275 from Diegoisawesome/master Diegoisawesome 2018-07-15 04:43:03 -07:00
  • 731d6d59bc Document list_menu.c and main_menu.c Diegoisawesome 2018-07-15 04:23:38 -07:00
  • 24f6484643 Merge pull request #274 from huderlem/movement_constants Marcus Huderle 2018-07-13 18:53:27 -07:00
  • 94650495c6 Use map battle scene constants in map headers Marcus Huderle 2018-07-12 22:45:41 -05:00
  • 546819bc72 Use map type constants in map headers Marcus Huderle 2018-07-12 22:39:38 -05:00
  • d53e8137cd Use weather constants in map headers Marcus Huderle 2018-07-12 22:15:35 -05:00
  • d5eb94330a Use region map section constants in map headers Marcus Huderle 2018-07-12 21:47:04 -05:00
  • 7d375972ba Sync bg_event macros with pokeruby Marcus Huderle 2018-07-11 11:12:26 -05:00
  • 8ffd7a70fc Use movement type constants in object_event macros Marcus Huderle 2018-07-10 18:04:51 -05:00
  • d675b7578c Move movement type constants into include/constants/event_object_movement_constants.h Marcus Huderle 2018-07-10 18:04:41 -05:00
  • abc1905cab Merge pull request #273 from Slawter666/pokedex-doc Diegoisawesome 2018-07-08 15:13:03 -07:00
  • 08774bdd88 Merge https://github.com/pret/pokeemerald into pokedex-doc Slawter666 2018-07-08 01:23:28 +01:00
  • dd228fae5a Minor variable labelling Slawter666 2018-07-08 01:20:01 +01:00
  • ee3d505b58 little touches for HandleTurnActionSelectionState DizzyEggg 2018-07-07 21:14:41 +02:00
  • 008d961b2a add party menu defines DizzyEggg 2018-07-07 19:57:09 +02:00
  • 1c48e58574 small fixes DizzyEggg 2018-07-07 14:24:19 +02:00
  • 9892298645 Merge branch 'master' into final_battle_files_touches DizzyEggg 2018-07-07 14:11:04 +02:00
  • 6313f360d5 Merge branch 'DizzyEggg-decompile_cut' Diegoisawesome 2018-07-05 20:33:47 -07:00
  • f79ac26ce3 Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer Diegoisawesome 2018-07-05 20:33:07 -07:00
  • 5189442bcc Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut Diegoisawesome 2018-07-05 20:32:12 -07:00
  • e06b63efc9 Merge pull request #1 from pret/master Garak 2018-07-04 11:11:45 -04:00
  • e6d67c7c22 give labels to player controller functions DizzyEggg 2018-07-01 15:45:47 +02:00