ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,406 Commits 1 Branch 0 Tags 235 MiB
677da7b5e7
Commit Graph

167 Commits

Author SHA1 Message Date
ultima-soul
3f75a58137 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-11 16:55:29 -07:00
luckytyphlosion
b3d66f5528 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-07-02 12:53:12 -04:00
luckytyphlosion
9fd27fe855 Fix modern builds when devkitARM is not in PATH. 2021-07-02 12:52:31 -04:00
PikalaxALT
6ca73737cf Fix regex error 2021-06-18 12:53:15 -04:00
PikalaxALT
ae8f6e29f8 Symplifi symfiles 2021-06-16 14:43:35 -04:00
PikalaxALT
5ccac26f26 Port symfile implementation from Ruby, FireRed 2021-06-16 11:03:23 -04:00
ultima-soul
cf19635a80 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-06-07 13:15:46 -07:00
luckytyphlosion
7e1ae9f95d Remove debug print statements in Makefile. 2021-06-03 18:22:49 -04:00
luckytyphlosion
4687847ace Fix building with KEEP_TEMPS=1, and NODEP=1. 
KEEP_TEMPS=1 not working was due to the pattern substitution in the old makefile rules for compiling C files ($*) not working with the explicit generation of dependencies. NODEP=1 not working was due to the NODEP rule for src/%.s not being updated to use preproc and cpp.
 2021-06-03 17:46:09 -04:00
luckytyphlosion
92152e45e2 Fixes to makefile. 
Merge C_ASM_DEP and DATA_ASM_DEP, NODEP and SCAN_DEPS can be overridden, add --no-print-directory to MAKEFLAGS in make_tools.mk (also removed some unused variables), add newline to help message in preproc.
 2021-06-01 23:22:15 -04:00
luckytyphlosion
f0b41debc3 Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps 2021-06-01 20:40:27 -04:00
luckytyphlosion
a839463c84 Optimize Makefile. 
Don't do recursive makes for COMPARE and MODERN, use minimal makefile for making tools.
 2021-06-01 20:40:11 -04:00
luckytyphlosion
c723d980e7 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
luckytyphlosion
c50a21fba0 Tidy just cleans both normal and modern. 2021-05-05 16:07:21 -04:00
luckytyphlosion
9da2142a39 Scan all deps of time, also prevent deps from being scanned twice for compare and modern. 2021-05-04 10:08:54 -04:00
Michael Panzlaff
2859fa60cb Makefile: use different linker library sets for modern 2021-04-17 23:19:01 +02:00
Michael Panzlaff
38d0cca903 modern: link against libnosys 
Without libnosys undefined references will occur if
libc functions are used.
 2021-04-17 22:48:57 +02:00
Michael Panzlaff
0767f4b9ce Makefile: resolve libgcc and libc in correct order 
When actually utilizing functions from libc, linking will fail
because the functions used from libc have to be defined after libc.

This is the case with libgcc, so we swap their order.
 2021-04-17 19:00:02 +02:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
ExpoSeed
4a8e18cea2
Merge pull request #1336 from LOuroboros/cries_PE_redux 
Various tweaks related to Pokémon cries
 2021-02-03 11:26:44 -06:00
GriffinR
45ee3a687d Add comments for some data in crt0.s 2021-01-29 18:36:39 -05:00
luckytyphlosion
57bc32e300 Fix templess builds from not exiting on error. 2021-01-27 09:57:50 -05:00
luckytyphlosion
10c0566121 Don't keep temporary C build files by default. 2021-01-19 11:43:50 -05:00
LOuroboros
c2805ff35b Tweaked Makefile after cry changes 2021-01-18 11:42:42 -03:00
luckytyphlosion
98f8c96c9e Fix $(AR) define, remove \u warns on macOS. 2021-01-04 11:35:59 -05:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
luckytyphlosion
3d686116d8 [Round 3] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 21:24:44 -05:00
luckytyphlosion
5a5acfb0ad [Round 3] Revert multiple source change commits for re-commit. 2020-12-16 21:24:08 -05:00
luckytyphlosion
32e566def0 Don't define CPP until MODERN is defined. 2020-12-16 21:16:55 -05:00
luckytyphlosion
166183d5ed [Round 2] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 20:31:56 -05:00
luckytyphlosion
345aab63cf [Round 2] Revert multiple source change commits for re-commit. 2020-12-16 20:31:10 -05:00
luckytyphlosion
11df2113d9 Use arm-none-eabi-cpp for modern. 2020-12-16 20:29:58 -05:00
luckytyphlosion
d597c5c883 Fix modern builds. 
We actually need standard includes for modern.
 2020-12-16 20:17:27 -05:00
luckytyphlosion
2783eed825 Check for $(TOOLCHAIN) before checking for $(TOOLCHAIN)/bin 
if TOOLCHAIN is blank, wildcard can still detect the `/bin` directory.
 2020-12-16 19:54:12 -05:00
luckytyphlosion
936ba7f1bf Apply all source related changes for the new INSTALL.md in one commit. 
For people who want to have dkPless builds in their repo.
 2020-12-16 15:10:01 -05:00
GriffinR
49bdaeb940
Remove redundant modern CFLAGS 2020-12-16 14:10:30 -05:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
luckytyphlosion
70b6e05a47 Remove useless comment. 2020-11-18 21:31:04 -05:00
luckytyphlosion
68b53c7437 Optimize Makefile, also add *.sna to gitignore. 2020-11-18 20:53:42 -05:00
luckytyphlosion
5029c90979 Missing inc files in asm/*.s and data/*.s will raise an actual error message. 2020-11-12 11:04:38 -05:00
Eduardo Quezada D'Ottone
68627882a5 Merge remote-tracking branch 'pret/master' into PE-pretSync 2020-11-07 15:00:10 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
ExpoSeed
8f7e212967 Remove *.rl in make clean 2020-10-05 23:33:55 -05:00
ExpoSeed
5794fc69e8 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion 2020-10-04 02:35:23 -05:00
Kaz
171154a097 Convert to -g; will be required for eliminating fakematches. 2020-09-16 19:36:30 -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
6fb1d55c33 Reverted -nostdlib changes 2020-09-08 19:54:58 -04:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
PikalaxALT
9ff261ac2a
Merge pull request #1078 from GriffinRichards/move-cries 
Move Pokemon cries to own directory
 2020-07-08 15:45:32 -04:00