Commit Graph

146 Commits

Author SHA1 Message Date
GriffinR
c786a9b20c Document pokeblock menu 2021-04-11 18:10:05 -04:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
GriffinR
81a7f491b7 Use WINDOW_NONE constant 2021-02-24 11:03:08 -05:00
GriffinR
6899acfb6f
Merge pull request #1317 from opakedragon/master
Fix Spelling of BagMenu_RemoveBagItemMessageindow
2021-02-07 13:43:05 -05:00
opakedragon
1e8edcbfcd Revert "Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow""
This reverts commit be50fab8f2.
2021-01-29 13:36:24 -05:00
opakedragon
be50fab8f2 Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow"
This reverts commit 3a6be5a34c.
2021-01-29 13:30:09 -05:00
opakedragon
3a6be5a34c Fix Spelling of BagMenu_RemoveBagItemMessageindow 2021-01-27 06:18:29 -05:00
GriffinR
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
18b8e0ee8e
Merge pull request #1311 from GriffinRichards/clean-unused
Remove unused local variables and functions
2021-01-19 23:22:44 -05:00
GriffinR
b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
GriffinR
3f9037d63a Use ARRAY_COUNT in InitBgsFromTemplates 2021-01-19 04:14:07 -05:00
GriffinR
06af0f0fe5 Remove unnecessary string.h includes 2021-01-03 13:36:07 -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
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