Commit Graph

131 Commits

Author SHA1 Message Date
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 66bd1e6d3f Use constants for item digits 2020-09-25 11:18:52 -04: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 e84da39d8a Match BattleIntroOpponent1SendsOutMonAnimation 2020-09-08 18:54:51 -04:00
PokeCodec 3e25d9e5a2 Removed unused parentheses 2020-09-05 10:01:21 -04: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 09cfed64b5 Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
2020-08-28 16:14:21 -04:00
GriffinR e9b734c1ef Merge branch 'master' into doc-blender 2020-08-28 16:07:35 -04:00
Eduardo Quezada a2fb98934e Partially document item_menu.c 2020-08-28 13:32:23 -04:00
GriffinR 0ff767a9b5 Start documenting berry blender 2020-08-22 19:39:39 -04:00
GriffinR 3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR e129d04b93 Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
PikalaxALT 535189bf14 Fix some UB exposed with GCC 10.1.0 2020-07-11 10:22:34 -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 4fe507e453 Document union_room.c 2020-05-31 13:11:18 -04:00
AsparagusEduardo c73fdb8954 Restored some tItemCount instances as requested. 2020-03-10 17:46:26 -05:00
AsparagusEduardo 130929a7a4 Slight item_menu.c documentation 2020-03-10 17:46:26 -05:00
GriffinR 956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
Sebastian Gabl 0cf84d13ef Use correct prefix 2020-02-04 07:42:04 -06:00
Sebastian Gabl 0bd9639478 Name Wally struct and use bag macros 2020-02-04 07:42:04 -06:00
GriffinR ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
huderlem 8d64bc9df8 Merge pull request #944 from GriffinRichards/doc-itemuse
Document item_use.c
2019-12-25 11:59:07 -06:00
GriffinR 749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05: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 f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
GriffinR ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR a05006421b Document Apprentice 2019-11-20 17:36:52 -05:00
GriffinR 4e6a69c297 WIP Document Apprentice 2019-11-19 11:36:38 -05:00
GriffinR af83b41dd1 Document Contest Hall berry blenders and misc 2019-11-13 18:20:55 -06:00
GriffinR b1ea2592c3 Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR 6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
GriffinR 0db188b487 Clean up berry_tree.inc and misc adjacent documentation 2019-10-20 09:46:46 -05:00
PikalaxALT 9317d114a9 Merge pull request #823 from GriffinRichards/constants-strconv
Use STR_CONV constants
2019-10-02 09:18:48 -04:00
GriffinR c5cb45991b Document PrintItemXAmount 2019-09-30 15:53:24 -04:00
GriffinR 5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
PikalaxALT 306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
GriffinR d931ba9602 document remaining funcs 2019-08-21 17:06:55 -05:00
PikalaxALT 8d0d5cfd55 Merge branch 'master' into modern_gcc 2019-07-20 11:51:22 -04:00
PikalaxALT 20863ac85b Resolve compile warnings in modern 2019-07-18 20:46:00 -04:00
pokballs 717c3350c4 updated function name for deposit item amount to pc 2019-07-09 16:40:04 -05:00
Papa Cancer e53ba4773d Documenting bags, berries and graphics
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00