Commit Graph

141 Commits

Author SHA1 Message Date
GriffinR 81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
PikalaxALT 99dd461bef Merge pull request #1189 from aaaaaa123456789/reverts
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
aaaaaa123456789 bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
GriffinR be1685c87f Use constants for menu info icon table 2020-10-29 16:34:33 -04: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 7c8bc0fbe3 Merge pull request #1149 from PokeCodec/datatypes
gflib documenting
2020-09-01 14:25:21 -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
PokeCodec 86a1e89879 Documentation of unk field 2020-08-23 21:34:31 -04:00
GriffinR 3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR 3779422489 Split contest funcs from script_pokemon_util 2020-08-13 17:42:12 -04:00
GriffinR 4911849723 Document link contest connection 2020-08-13 16:27:40 -04:00
GriffinR 2859900ea9 Second pass on documenting union room 2020-06-10 17:30:59 -04:00
GriffinR 35867f531b Some link rfu cleanup / link.c documentation 2020-06-08 15:24:25 -04:00
GriffinR e6f5c4f264 Sync link_rfu_2.c 2020-06-07 12:54:50 -04:00
GriffinR 3f97763181 Document cable_club.c 2020-06-06 16:10:03 -04:00
GriffinR 9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
GriffinR f53e2491bf Document union_room_player_avatar.c 2020-06-01 10:23:12 -04:00
GriffinR 4fe507e453 Document union_room.c 2020-05-31 13:11:18 -04:00
PikalaxALT 867734a791 Fix alignment in AgbRfu_LinkManager.h 2020-02-16 15:32:10 -05:00
PikalaxALT 91dd7f5cc3 Port librfu from firered 2020-02-16 13:49:36 -05:00
GriffinR 956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR 084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR 4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
jiangzhengwenjz c2be2e8c69 sync documentation from firered 2020-01-16 08:14:27 -06:00
jiangzhengwenjz 8a5f292618 document symbols 2020-01-16 08:14:27 -06:00
GriffinR 68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome 026e1108b2 Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
2019-12-20 23:44:56 -08:00
GriffinR 949509aade Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00
GriffinR d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR 96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -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 6556b556dd Merge branch 'master' into fix-eventobj 2019-12-11 01:09:06 -05:00
GriffinR ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR 1b30f0c973 Rename event_obj_lock to event_object_lock 2019-12-06 02:55:30 -05:00
GriffinR ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR ef8370566f Document Contest scripts 2019-11-13 18:20:55 -06:00
huderlem 906a1ec4ab Merge pull request #883 from GriffinRichards/fix-colossname
Fix Battle Colosseum names
2019-11-08 17:24:05 -06:00
GriffinR bae4a586d8 Document Hall of Fame scripts 2019-11-07 13:26:53 -05:00
GriffinR 35ed8de51b Fix Battle Colosseum names 2019-11-07 12:37:11 -05:00
GriffinR 6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
Marcus Huderle 8df4982b3f Merge remote-tracking branch 'upstream/master' into document-trade 2019-10-12 15:39:17 -05:00
GriffinR 1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
GriffinR 2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
GriffinR 66a68159b1 Continue trade doc 2019-10-05 10:41:37 -04:00
GriffinR dadb1cb9f1 More trade/union room doc, incidental party_menu doc 2019-10-04 23:31:25 -04:00