Commit Graph

  • 4c12ad00d2 Merge branch 'master' into fix-eventobj GriffinR 2020-01-19 20:21:53 -05:00
  • a40f054900 Move/rename gfx start/end vars GriffinR 2020-01-17 18:34:37 -05:00
  • aa631825fc resolve data sections jiangzhengwenjz 2020-01-16 07:28:23 +08:00
  • 46b00b11d4 match all the functions jiangzhengwenjz 2020-01-16 07:21:54 +08:00
  • c2be2e8c69 sync documentation from firered jiangzhengwenjz 2020-01-16 05:38:24 +08:00
  • 8a5f292618 document symbols jiangzhengwenjz 2020-01-16 04:46:17 +08:00
  • ea8b1011d3 Merge master into fix-eventobj GriffinR 2020-01-15 16:11:20 -05:00
  • 5fff2f2234 Use SHINY_ODDS macro where intended Sebastian Gabl 2020-01-15 14:48:17 +01:00
  • 69833181d9 Merge pull request #803 from tustin2121/tustin2121-patch-5 huderlem 2020-01-13 20:43:49 -06:00
  • 755ae0facc Use empty braces for last null entry in sTransitionTypes array Marcus Huderle 2020-01-13 20:31:40 -06:00
  • 5a2d676e71 Merge remote-tracking branch 'upstream' into tustin2121-patch-5 Marcus Huderle 2020-01-13 20:26:20 -06:00
  • 22931846d6 Fix Colosseum name porymap issue GriffinR 2020-01-13 21:13:33 -05:00
  • e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj GriffinR 2020-01-13 20:41:57 -05:00
  • 736f3bbbe0 Remove false positives from partial doc calcrom GriffinR 2020-01-13 13:52:15 -05:00
  • 6d6c57f383 Merge pull request #953 from GriffinRichards/sync-script huderlem 2020-01-13 19:33:47 -06:00
  • 96720db083 Remove unnecessary removeitem arguments GriffinR 2020-01-12 23:28:38 -05:00
  • c19289596d Give/Take to Add/Remove for silent script macros GriffinR 2020-01-12 23:24:52 -05:00
  • 655910a16f Merge branch 'master' into fix-eventobj GriffinR 2020-01-12 22:42:43 -05:00
  • fa5816915d Merge pull request #949 from GriffinRichards/doc-dome huderlem 2020-01-12 20:10:03 -06:00
  • 43962fe141 Fix BuffeInGameTradeMonName typo GriffinR 2020-01-08 13:19:41 -05:00
  • 10220d3b76 Label TryRecordMixLinkup GriffinR 2020-01-08 15:46:49 -05:00
  • e736c2d2fd Document some easy chat specials GriffinR 2020-01-08 15:26:14 -05:00
  • c27a4778ee Standardize prebattle -> intro GriffinR 2020-01-08 15:12:10 -05:00
  • 6a470ddfda Some script clean up, document secret base secrets show GriffinR 2020-01-08 04:26:26 -05:00
  • e497fc64e3 if_undefeated macro to if_not_defeated GriffinR 2020-01-12 20:20:02 -05:00
  • 0284014e0e Add missing save status use GriffinR 2020-01-12 17:50:27 -05:00
  • 58e64b9524 Clean up some of save.c GriffinR 2020-01-12 15:27:37 -05:00
  • f2e7b1507e Port some macro/script fixes from pokefirered GriffinR 2020-01-11 12:02:58 -05:00
  • de49445a79 Merge pull request #952 from PikalaxALT/real_match_8072308 PikalaxALT 2020-01-10 17:39:18 -05:00
  • 98b2ab9a77 Match sub_8072308 PikalaxALT 2020-01-10 16:38:47 -05:00
  • 635267ce32 Merge branch 'master' into fix-eventobj GriffinR 2020-01-08 05:51:49 -05:00
  • ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions GriffinR 2020-01-08 05:43:06 -05:00
  • e5df61e362 Merge branch 'master' into doc-dome GriffinR 2020-01-08 01:15:36 -05:00
  • 017fa294b5 Add battle tent mon/trainer constants GriffinR 2020-01-08 01:07:53 -05:00
  • fb5bea98ce More battle_dome.c doc GriffinR 2020-01-05 10:50:32 -05:00
  • 8b1595ebc3 Pokédex search menu documentation Slawter666 2020-01-03 01:35:35 +00:00
  • c85ca4b860 Standardize farfetchd spelling GriffinR 2019-12-30 10:58:32 -05:00
  • 379f7f5149 Add braces to trainer party moves GriffinR 2019-12-29 12:59:42 -05:00
  • bb692a03eb Add frontier mon constants GriffinR 2019-12-27 02:26:27 -08:00
  • ef751c8d1b Fix formatting and remove unnecessary comments Marcus Huderle 2019-12-28 12:03:22 -06:00
  • 3b05398975 Merge pull request #945 from Fontbane/patch-5 huderlem 2019-12-28 12:06:35 -06:00
  • 3efc8199d4 More battle_dome.c documentation GriffinR 2019-12-21 04:27:12 -05:00
  • 31b4656324 Labels better Fontbane 2019-12-25 22:39:06 -05:00
  • 2e8c20d72f Update trainers.h Fontbane 2019-12-25 20:48:40 -05:00
  • 8d64bc9df8 Merge pull request #944 from GriffinRichards/doc-itemuse huderlem 2019-12-25 11:59:07 -06:00
  • ee61726136 Merge pull request #936 from GriffinRichards/doc-tower huderlem 2019-12-25 11:39:20 -06:00
  • b80fa767ab Give rivals and Maxie battles better names AJ Fontaine 2019-12-23 10:42:06 -05:00
  • 749965d56b Document item_use.c GriffinR 2019-12-21 19:01:38 -05:00
  • 68cdd7b1cb Merge master into ObjEvent rename GriffinR 2019-12-21 05:19:27 -05:00
  • 026e1108b2 Merge pull request #935 from GriffinRichards/doc-warp Diegoisawesome 2019-12-20 23:44:56 -08:00
  • d42ea06dc5 Merge pull request #939 from GriffinRichards/fix-compare Diegoisawesome 2019-12-20 23:40:12 -08:00
  • e4e3d439dc Merge pull request #941 from GriffinRichards/fix-lastresult Diegoisawesome 2019-12-20 23:38:56 -08:00
  • 4e10133545 Merge pull request #940 from Kurausukun/master Diegoisawesome 2019-12-20 23:38:30 -08:00
  • ff2d8a9c4e Add frontier trainer constants GriffinR 2019-12-20 18:52:29 -05:00
  • 324a81ed5d Reword yesnobox comment GriffinR 2019-12-20 18:53:58 -05:00
  • 773a599bbb Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo Diegoisawesome 2019-12-20 15:49:14 -08:00
  • 929a093fc1 Merge pull request #943 from jiangzhengwenjz/CanSpinTradeMon Diegoisawesome 2019-12-20 15:49:05 -08:00
  • 4d8ea3a2d9 CanSpinTradeMon jiangzhengwenjz 2019-12-21 06:15:41 +08:00
  • 681d929892 DrawTradeMenuPartyInfo jiangzhengwenjz 2019-12-21 06:09:59 +08:00
  • 63c8cf97d1 Document Battle Dome scripts and some battle_dome.c GriffinR 2019-12-18 02:32:52 -05:00
  • 7628019952 Remove references to LASTRESULT GriffinR 2019-12-20 08:47:31 -05:00
  • 3a7bb65077 update instrument sample names Kurausukun 2019-12-19 03:42:09 -05:00
  • 9e08cfe55f Remove uses of compare_var_to GriffinR 2019-12-18 19:22:39 -05:00
  • d137a1a0c1 Use constants in compare macro GriffinR 2019-12-18 19:12:09 -05:00
  • 3b240b2ad4 Merge pull request #938 from pret/ubuntu_bionic Diegoisawesome 2019-12-18 13:32:25 -08:00
  • 949509aade Merge branch 'master' into fix-eventobj GriffinR 2019-12-18 13:16:38 -05:00
  • 5f1c7c9e93 Bump travis to bionic (Ubuntu 18.04 LTS) PikalaxALT 2019-12-18 13:03:00 -05:00
  • 23f952b34e Merge master into doc-tower GriffinR 2019-12-17 21:17:46 -05:00
  • ddfa0c6298 Document Battle Tower scripts GriffinR 2019-12-14 03:58:20 -05:00
  • f8cef9a6a8 Merge pull request #932 from jiangzhengwenjz/berry_crush huderlem 2019-12-17 19:35:00 -06:00
  • 45eefac5b9 Merge pull request #934 from GriffinRichards/constants-fade huderlem 2019-12-17 19:26:04 -06:00
  • 4879c1eab2 Merge branch 'master' into constants-fade GriffinR 2019-12-17 19:11:51 -05:00
  • edb5df1716 Merge pull request #933 from GriffinRichards/doc-tents huderlem 2019-12-17 18:09:49 -06:00
  • 420b4b3fea use STR_CONV_MODE_* constants jiangzhengwenjz 2019-12-18 04:17:10 +08:00
  • 5bec27aa34 nonmatch sub_8024604 jiangzhengwenjz 2019-12-18 03:35:41 +08:00
  • 67690df65f sub_8023CAC jiangzhengwenjz 2019-12-17 15:20:38 +08:00
  • d1cf9006fb Document some warp/field screen effect GriffinR 2019-12-17 03:24:44 -05:00
  • 50c48d7ef6 sub_8023BC0 jiangzhengwenjz 2019-12-15 14:04:15 +08:00
  • efa1ee1822 sub_8022250 jiangzhengwenjz 2019-12-14 13:30:47 +08:00
  • 3f858c1c26 sub_8022F04 jiangzhengwenjz 2019-12-12 10:16:05 +08:00
  • db8a5c6c2b Merge branch 'master' into fix-eventobj GriffinR 2019-12-15 11:47:27 -05:00
  • 96ec5e1b84 Use fadescreen constants GriffinR 2019-12-15 11:42:50 -05:00
  • fee36224ed Merge pull request #925 from GriffinRichards/doc-matchcall huderlem 2019-12-15 09:42:13 -06:00
  • a04347816f Split PokenavMatchCallEntries from PokenavMonList GriffinR 2019-12-15 10:25:47 -05:00
  • 82f55f2381 Merge master into ObjEvent rename GriffinR 2019-12-15 02:00:00 -05:00
  • 97b5560bdb Document Battle Tent scripts GriffinR 2019-12-15 00:55:21 -05:00
  • 6967caefb2 Split finditem_std from giveitem_std GriffinR 2019-12-12 02:35:37 -05:00
  • 75b0c9d7a9 Document Battle Pyramid scripts GriffinR 2019-12-11 03:28:55 -05:00
  • aa72c0ada3 Document Battle Factory scripts GriffinR 2019-12-09 14:00:13 -05:00
  • ea9a2c848a Define start and ends for temp vars and daily/temp/special flags GriffinR 2019-12-11 00:36:39 -05:00
  • 09840efc64 Name last event_data funcs GriffinR 2019-12-08 13:19:52 -05:00
  • 1a672dac8d Use constant for daily flag offset GriffinR 2019-12-08 13:10:12 -05:00
  • 6556b556dd Merge branch 'master' into fix-eventobj GriffinR 2019-12-11 01:09:06 -05:00
  • 47b0d8a597 Merge branch 'master' into doc-matchcall GriffinR 2019-12-10 20:43:27 -05:00
  • 49f1a90534 Document Battle Pike scripts GriffinR 2019-12-09 02:10:42 -05:00
  • b7ab9cbf4c Update JP translation and fix typo GriffinR 2019-12-10 19:31:12 -05:00
  • ed1ff0ad77 Document misc strings and text colors GriffinR 2019-12-10 13:48:20 -05:00
  • fe16452999 Typo fix GriffinR 2019-12-06 21:30:22 -05:00
  • fcd8d37d62 Document Battle Palace scripts GriffinR 2019-12-06 21:25:46 -05:00
  • 8da7a94423 Merge branch 'master' into fix-eventobj GriffinR 2019-12-10 17:41:08 -05:00