Commit Graph
10 Commits
Author SHA1 Message Date
aaaaaa123456789 ca950a8daf Solve merge conflicts from previous commit 2020-11-02 22:18:26 -03:00
aaaaaa123456789 bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
aaaaaa123456789andSeija 9794b077b5 Update src/digit_obj_util.c
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 19:14:08 -03:00
aaaaaa123456789 bcbd05e151 Fix whitespace issues 2020-10-26 15:52:44 -03:00
aaaaaa123456789andSeija 4bbc14ecdd Remove unused variable
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 15:51:10 -03:00
aaaaaa123456789 00db69a302 Port back improvements from later commits 2020-10-26 12:31:07 -03:00
aaaaaa123456789 1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03: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
aaaaaa123456789 e28cf5406b Fix Makefiles to account for the $CC and $CXX environment variables 2019-08-06 20:30:57 -03:00
aaaaaa123456789 f4a65dbb1c Fix LD script to not contain huge gap sections 2019-07-10 05:01:15 -03:00