ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,565 Commits 1 Branch 0 Tags 235 MiB
56a1cab314
Commit Graph

137 Commits

Author SHA1 Message Date
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
LOuroboros
c2805ff35b Tweaked Makefile after cry changes 2021-01-18 11:42:42 -03:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08: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
Michael Panzlaff
3264cf697f fix aggressive loop optimizations 
Previously, aggressive loop optimizations with a new compiler were not
possible due to undefined behaviour at end of arrays.

A macro "UBFIX" is added to allow ifdefs for fixes which resolve
undefined behavior. For example newer GCC versions will detect various
bugs in the original game code and will otherwise not compile with -Werror.
 2020-07-05 18:09:59 +02:00
GriffinR
4c8fd5af7c Move Pokemon cries to own directory 2020-06-15 13:00:24 -04:00
DizzyEggg
cca1dcc04a merge with master 2020-05-29 13:07:53 +02:00
PikalaxALT
4054f16e71 Fix building modern from clean 2020-05-15 09:53:06 -04:00
Michael Panzlaff
c11fb6a3fd Fix MODERN=1 for non-devkitARM compilation 
gcc has this nice option "-print-file-name=" to locate a file
in its search path. This is a more portable way to locate
libgcc.a and libc.a so there is no longer the need to mess around with
devkitARM's path's.
 2020-05-05 00:09:06 +02:00
DizzyEggg
3c938d1809 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-23 12:42:21 +01:00
PikalaxALT
91dd7f5cc3 Port librfu from firered 2020-02-16 13:49:36 -05:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
PikalaxALT
ab139bf254 Clean up leftover Makefile clean instruction 2019-09-27 09:31:31 -04:00
PikalaxALT
27aae9da9a Fix modern 2019-09-08 21:41:40 -04:00
PikalaxALT
888cbd634c libagbsyscall as an actual lib 2019-09-08 21:26:46 -04:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
PikalaxALT
904bba9e16 NULL_BATTLE_TOWER_POKEMON define 2019-09-05 20:48:48 -05:00
PikalaxALT
900a51932d Don't look for src/crt0.c, it doesn't exist 2019-09-05 20:48:48 -05:00
PikalaxALT
1f4c88c952
Copy Berry Fix MB dism from FR (#777) 
* Copy Berry Fix MB dism from FR
 2019-09-03 15:33:11 -04:00
Marcus Huderle
1a2b430646 Update scaninc to include missing .include files in assembler files 2019-08-29 16:37:42 -05:00
DizzyEggg
58b313956d Merge with master 2019-08-25 12:51:09 +02:00
PikalaxALT
a4d5624ad6 Move asm srcs to src 2019-08-21 17:08:40 -05:00
DizzyEggg
0252270515 Merge with master 2019-08-12 11:25:05 +02:00
aaaaaa123456789
e28cf5406b Fix Makefiles to account for the $CC and $CXX environment variables 2019-08-06 20:30:57 -03:00
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
PikalaxALT
cd876292d1 Merge branch 'master' into pokenav_unk_2 2019-08-04 15:35:35 -04:00
PikalaxALT
bb07f06fc6
Fix "arm-none-eabi-gcc not found" error (#751) 2019-07-24 10:38:48 -04:00
PikalaxALT
6ff1426abe Quieter "make tools" 2019-07-23 16:17:00 -04:00
PikalaxALT
6edacdee36 Pad the GBA using gbafix instead of objcopy 2019-07-20 12:00:45 -04:00
PikalaxALT
4a239c4604 Deprecate build_tools.sh 2019-07-19 20:54:02 -04:00
PikalaxALT
17c76432f4 Fix libgcc path 2019-07-02 13:46:53 -04:00
PikalaxALT
8b73ba61ee Misc. changes 
use the TOOLCHAIN variable instead of overriding DEVKITARM
remove redunant DEBUG variable, substitute DINFO
 2019-06-29 18:32:49 -04:00
PikalaxALT
f9d8678db4 Additional fixes 
Rearrange gbafix to not modify file in the event of failure
Fix bug where Dma3Manager may get stuck when compiled with gcc-9.1.0
 2019-06-29 11:41:26 -04:00
PikalaxALT
4b759da714 Wildcard bss, ewram_data, and COMMON in modern toolchain 2019-06-29 08:35:52 -04:00