ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 04:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,890 Commits 1 Branch 0 Tags 235 MiB
313f522622
Commit Graph

181 Commits

Author SHA1 Message Date
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
PikalaxALT
e92e9a184c Support for non-dkA toolchains 2019-06-28 22:26:11 -04:00
PikalaxALT
10a88b6a71 Simplify ld_script for modern, use devkitARM libs 2019-06-26 20:12:40 -04:00
PikalaxALT
b839c21307 Fix/suppress warnings when building with gcc-8 2019-06-26 16:42:57 -04:00
PikalaxALT
fb06e4a3c9 Modernize code 
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
 2019-06-26 12:12:10 -04:00
DizzyEggg
dfb9a1fa16 Add all new cries 2019-05-14 10:58:11 +02:00
PikalaxALT
657068359d Better dependency handling for wild_encounters 2019-05-08 17:06:39 -05:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
Phlosioneer
b0c634d531 Support absolute paths 2019-03-07 08:46:55 -06:00
Phlosioneer
105e1721d6 Overhaul scaninc to work recursively 
This also fixes the bug where scaninc would ignore #include lines
in assembly files.
 2019-03-07 08:46:55 -06:00
Phlosioneer
05ad946b83 Ignore trigraph warning 2019-02-10 22:12:43 -05:00
huderlem
b0ee100975
Merge pull request #543 from pret/mapdata 
Convert map data to JSON
 2019-02-04 21:36:18 -06:00
garak
82abc164dc convert mapjson.py to mapjson.cpp 2019-02-03 09:38:29 -06:00
DizzyEggg
26b371e080 Update Makefile 2019-02-01 10:37:50 +01:00
DizzyEggg
b4055e4fc0 Merge m4a files into one, get rid of one asm 2019-02-01 10:37:13 +01:00
DizzyEggg
7750a8126d CgbSound is decompiled. 2019-02-01 00:25:31 +01:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
Philipp AUER
e13895e58a fix debug symbol in Makefile 2019-01-11 10:41:51 -06:00
Philipp AUER
372d5f63d8 add debug flag to Makefile 2019-01-11 10:41:51 -06:00
nullableVoidPtr
7c57699fa5 Remove sed from ld_script, replace with INCLUDEs 2019-01-01 00:38:49 +08:00
DizzyEggg
89866652fa
Remove superfluous compiler flags 2018-12-29 12:46:03 +01:00
Diegoisawesome
09d09122bc
Merge pull request #384 from garakmon/subdirs 
Subdirectories in build
 2018-11-15 14:25:21 -06:00
garak
c067c4e617 fix dependency scanning 2018-11-14 19:12:12 -05:00
garak
87ec71f71b subdirs in build 2018-11-14 17:59:30 -05:00
Diegoisawesome
ec5360364b Use relative path for mid2agb 2018-10-03 23:16:52 -05:00
Diegoisawesome
7ceabffc84 Clean .s files in midi folder 2018-09-23 23:52:04 -05:00
Diegoisawesome
a63f3ce872 Set up Makefile for MIDIs 2018-09-22 20:28:32 -05:00
Diegoisawesome
b9e0cf9f6f
Merge pull request #323 from Diegoisawesome/master 
Fix gbafix
 2018-09-11 17:34:37 -05:00
Marcus Huderle
ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05:00
Diegoisawesome
8026188e36 Make long param use two dashes 2018-09-10 13:15:53 -05:00
Diegoisawesome
aa0782c40b Make gbafix silent 2018-09-10 12:13:07 -05:00
Slawter666
291ac2cee9 Add build rules for overworld sprite sheets 2018-09-08 00:28:32 +01:00
Diegoisawesome
064216d3be Add gbafix from devkitPro/gba-tools 2018-08-29 23:39:03 -05:00
Diegoisawesome
7737025f4e Use gbafix to generate header and checksum 2018-08-29 16:34:59 -05:00
Garak
e0a9faacb5
sha1sum -> sha1 2018-08-11 21:29:54 -04:00
Garak
2cfc7bd358
change darwin check 2018-08-11 21:21:43 -04:00
garakmon
1ab872c68e Allow make compare to work on all platforms 2018-07-18 15:06:18 -04:00
Garak
e06b63efc9
Merge pull request #1 from pret/master 
synching with source repo
 2018-07-04 11:11:45 -04:00
Marcus Huderle
89d35e82a2 Move 'map attributes' into 'layouts' 2018-06-20 19:54:21 -05:00
garakmon
9766108fbc adding agbcc include path 
For some reason the headers for agbcc are being installed in
tools/agbcc instead of tools/agbcc/include. This is a simple
(potentially temporary) workaround.
 2018-06-16 19:03:20 -04:00
Diegoisawesome
dd28854a22
Merge pull request #255 from DizzyEggg/decomp_record_mixing 
Fix pika's Record Mixing PR
Also closes #107.
 2018-05-30 16:51:30 -07:00
Diegoisawesome
489f90b832 Update Makefile with help from devkitPro maintainers 2018-05-22 18:46:38 -05:00
PikalaxALT
590c4b500b Merge branch 'master' into record_mixing 2018-02-11 20:12:40 -05:00
PikalaxALT
19864d3cd9 Fix for windows 2018-01-21 19:16:15 -05:00
scnorton
454e44aa43 Use standard flags to link libgcc, libc 2018-01-21 12:37:17 -05:00
golem galvanize
311a18ee9a edit instructions and makefile 2018-01-20 22:58:42 -05:00
Diegoisawesome
fd267b2dc3 Remove duplicate LIBC line from makefile 2018-01-17 00:38:18 -06:00
Diegoisawesome
6fa37dc82c Merge remote-tracking branch 'Pikalax/mac_build_and_libc' 2018-01-16 23:52:11 -06:00
scnorton
d8bb1d15e7 Merge branch 'master' into mac_build_and_libc 2018-01-16 17:09:36 -05:00
yenatch
84d364819a add a rule for baserom.gba 2018-01-13 01:32:10 -05:00
yenatch
98ee41806e use .SECONDARY instead of .PRECIOUS to prevent files from being deleted 2018-01-13 01:30:43 -05:00
yenatch
294c9656be fix broken build after building without tools 2018-01-13 01:30:08 -05:00
Marcus Huderle
d1630d481a
Merge pull request #155 from ProjectRevoTPP/assert 
add assert support to pokeemerald.
 2018-01-11 18:25:42 -08:00
Diegoisawesome
80cfce776b Mark sound files as precious 2018-01-09 20:01:01 -06:00
Diegoisawesome
4e4b18e04f Remove sample bins and update makefile 2018-01-09 19:37:10 -06:00
scnorton
09d3da101b Implement agbcc's libc and allow a custom cxx compiler to be passed to build_tools.sh 2018-01-09 15:53:17 -05:00
ProjectRevoTPP
7be61cfb1a add assert support to pokeemerald. 2018-01-06 21:12:42 -05:00