Commit Graph

47 Commits

Author SHA1 Message Date
aaaaaa123456789 bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
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 c830731734 Merge branch 'master' into doc-blender 2020-08-28 16:16:00 -04:00
GriffinR 22c1bf965a Finish documenting berry blender 2020-08-24 17:06: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 4911849723 Document link contest connection 2020-08-13 16:27:40 -04:00
GriffinR 463d79c7c1 Start documenting naming screen 2020-08-07 02:00:41 -04:00
GriffinR ebb6c4ee66 Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -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 35867f531b Some link rfu cleanup / link.c documentation 2020-06-08 15:24:25 -04:00
GriffinR 3f97763181 Document cable_club.c 2020-06-06 16:10:03 -04:00
GriffinR 4fe507e453 Document union_room.c 2020-05-31 13:11:18 -04:00
GriffinR e485857df3 Sync minigame_countdown 2020-04-08 17:23:32 -04:00
jiangzhengwenjz 69aff34afd sub_8027E30 2020-03-06 05:31:27 +08:00
GriffinR ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR 4e2be7ff5e Review changes for #835 2019-10-12 15:14:57 -05:00
GriffinR 1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
PikalaxALT 306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
DizzyEggg 3280d40506 Match sub_8026324 2019-08-02 11:20:15 +02:00
DizzyEggg 02d975a837 Tabs to spaces 2019-08-02 00:49:31 +02:00
DizzyEggg 4d2d8779bf Dodrio berry picking decompiled 2019-08-02 00:41:55 +02:00
DizzyEggg 02cadbee60 MORE DODRIO BERRY PICKINGgit status! 2019-08-01 19:01:50 +02:00
DizzyEggg ba1a70419a Start dodrio magic 2019-07-31 00:27:30 +02:00
PikalaxALT 8d224bf941 Merge branch 'master' into modern_gcc 2019-07-02 13:47:34 -04:00
DizzyEggg 11ef698344 Match sub_802671C
Also got sub_8026324 a bit closer, but it's still a mess.
2019-06-30 20:26:48 +02:00
PikalaxALT fb06e4a3c9 Modernize code
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04:00
PikalaxALT 539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
scnorton a677d1f4cb Failed attempt at sub_8026988 2019-03-26 14:46:58 -04:00
scnorton 2eba82b0fb sub_8026634 2019-03-26 11:59:39 -04:00
PikalaxALT df538ff7ab WIP sub_8026324 2019-03-26 09:47:13 -04:00
scnorton 03e58d7dc9 through sub_80262C0 2019-03-25 18:08:25 -04:00
scnorton 5de624783c through sub_8026044 2019-03-25 17:27:27 -04:00
scnorton e3a11bc3ca through sub_80259FC 2019-03-25 15:26:23 -04:00
scnorton c3e26a58df through sub_8025758 2019-03-25 12:08:56 -04:00
scnorton 4780f208d3 through sub_8025324 2019-03-25 11:22:48 -04:00
PikalaxALT c005c2f737 sub_8024FFC 2019-03-25 08:31:29 -04:00
PikalaxALT d4cca4ffa2 through sub_8024F38 2019-03-24 22:56:16 -04:00
PikalaxALT d49d3b6858 through sub_8024E38 2019-03-24 21:17:25 -04:00
scnorton 2136187c11 sub_8024BC8 2019-03-24 17:32:59 -04:00
scnorton 98ab62a7af Dodrio: through sub_8024A30 2019-03-24 16:42:42 -04:00