Commit Graph

139 Commits

Author SHA1 Message Date
aaaaaa123456789 1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
GriffinR 5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
aaaaaa123456789 7dc95a0103 Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
2020-09-13 06:30:55 -03:00
PokeCodec 28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
GriffinR 3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR 65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR 3779422489 Split contest funcs from script_pokemon_util 2020-08-13 17:42:12 -04:00
GriffinR e06de33cbd Merge branch 'master' into doc-overworld 2020-07-28 17:46:17 -04:00
PokeCodec c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
GriffinR ebb6c4ee66 Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR 4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR 18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR c2a07276ae Merge branch 'master' into doc-link 2020-06-13 16:15:11 -04:00
Sierraffinity 74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
GriffinR e6f5c4f264 Sync link_rfu_2.c 2020-06-07 12:54:50 -04:00
GriffinR b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
PikalaxALT 91dd7f5cc3 Port librfu from firered 2020-02-16 13:49:36 -05:00
GriffinR ea8b1011d3 Merge master into fix-eventobj 2020-01-15 16:11:20 -05:00
Marcus Huderle 5a2d676e71 Merge remote-tracking branch 'upstream' into tustin2121-patch-5 2020-01-13 20:26:20 -06:00
GriffinR 22931846d6 Fix Colosseum name porymap issue 2020-01-13 20:20:48 -06:00
GriffinR 655910a16f Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
GriffinR 6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR 58e64b9524 Clean up some of save.c 2020-01-12 18:42:41 -06:00
GriffinR ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR 749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR 68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
GriffinR d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR 82f55f2381 Merge master into ObjEvent rename 2019-12-15 02:00:00 -05:00
GriffinR 75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
GriffinR b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
GriffinR f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
GriffinR 63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR 7034f59c14 Rename EventObj to ObjEvent 2019-11-21 00:14:40 -05:00
GriffinR 82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR 5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR 35ed8de51b Fix Battle Colosseum names 2019-11-07 12:37:11 -05:00
GriffinR b4a9298205 Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR 1b41b8b7ca Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms 2019-10-15 05:05:57 -04:00
GriffinR 1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
GriffinR 7ba11b7a1b Use VAR_FACING constants 2019-10-07 16:36:02 -05:00
PikalaxALT 7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
GriffinR aac9658a8e Document some field_specials data 2019-09-17 16:50:17 -05:00
GriffinR b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
tustin2121 711e7d884c Document cave transition code. 2019-09-10 13:43:33 -04:00
PikalaxALT 306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
GriffinR c2bf668fdd rename town/city vars 2019-08-05 11:23:45 -04:00
PikalaxALT b839c21307 Fix/suppress warnings when building with gcc-8 2019-06-26 16:42:57 -04:00
Phlosioneer 50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00