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,102 Commits 1 Branch 0 Tags 235 MiB
5e593a62fb
Commit Graph

115 Commits

Author SHA1 Message Date
garak
c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
garak
74477471a6 update inja 2019-10-14 18:12:03 -05:00
GriffinR
2884f4ee4a Fix extraneous parentheses warning 2019-09-16 19:22:07 -05:00
PikalaxALT
36723a235a
Merge pull request #735 from garakmon/encounter_json 
Add Different Field Info to Wild Encounters JSON
 2019-09-04 16:50:39 -04: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
garak
b420b98d63 allow CRLF line endings in asm files for preproc 2019-08-29 16:37:32 -05:00
aaaaaa123456789
e28cf5406b Fix Makefiles to account for the $CC and $CXX environment variables 2019-08-06 20:30:57 -03:00
PikalaxALT
6ff1426abe Quieter "make tools" 2019-07-23 16:17:00 -04:00
garak
4594c955b4 create defines to support encounter index ratios 2019-07-01 23:47:45 -04:00
garak
adb0a44457 add field info to wild pokemon json 2019-06-30 12:05:45 -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
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
Marcus Huderle
483648e372 Create jsonproc tool 
Add custom function hooks to jsonproc

Add jsonproc to build_tools.sh

Newer g++
 2019-05-08 17:06:39 -05:00
Phlosioneer
fe1c14db76 Fix warning for extra parens (#646) 
* Fix warning for extra parens

* Committed too many files
 2019-04-01 19:27:55 -05:00
Marcus Huderle
bd157b301d Scaninc: Don't insert missing headers into dependencies 2019-03-07 09:46:14 -06:00
Phlosioneer
6638ebe7fd Fix copyright mixup 2019-03-07 08:46:55 -06: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
Marcus Huderle
19b76bffda Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields 2019-02-16 16:56:41 -06:00
garak
0b1bb9e4e9 use strings for map json coord_event var_value 2019-02-16 16:14:43 -06:00
Diegoisawesome
05d02e804e Fix C comment consumption logic 2019-02-13 21:55:39 -06:00
Marcus Huderle
d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
garak
82abc164dc convert mapjson.py to mapjson.cpp 2019-02-03 09:38:29 -06:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
garak
da1b5365a7 label a flag in the asm 2018-10-17 08:55:09 -04:00
Diegoisawesome
c13d2b567c mid2agb fix: compare whole note details before compression 2018-10-02 12:07:37 -05:00
Kermalis
dc53e35a60 Fix mid2agb argument parsing 2018-09-29 21:18:30 -04:00
Diegoisawesome
6a82bbe973 Fix the fix that was buggy 2018-09-29 14:46:59 -05:00
Diegoisawesome
f143e184a8 Fix compression score code bug reintroduction 2018-09-25 23:09:42 -05:00
Diegoisawesome
7522d2e16a Partial implementation of MEMACC command 2018-09-25 15:07:14 -05:00
Diegoisawesome
d86b290419 Change initial state of lastNote 2018-09-25 11:43:46 -05:00
Diegoisawesome
7f38a03093 mid2agb compression algorithm less buggy than originally thought 2018-09-25 11:41:18 -05:00
Diegoisawesome
af4ff89e55 Comment out unused variable so GCC doesn't complain 2018-09-25 01:32:24 -05:00
Diegoisawesome
48b65eecee Match compression behavior, for real 2018-09-25 01:26:09 -05:00
Diegoisawesome
98e1c1994b Completely blind guess to fix compression score 2018-09-24 02:00:09 -05:00
Diegoisawesome
ef95a13288 Fix compression score lower limit 2018-09-23 23:37:47 -05:00
Diegoisawesome
e0acb92a3f mid2agb: allow -L param to take string 2018-09-23 00:40:37 -05:00
Diegoisawesome
f613176308 Fix order of initial vol command 2018-09-22 13:54:00 -05:00
Diegoisawesome
3028fdc353 Update mid2agb source 
Credit to @camthesaxman
 2018-09-15 15:49:31 -05:00
Diegoisawesome
e8be47abb8 Add running status to mid2agb 2018-09-14 22:35:04 -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
Diegoisawesome
12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome
f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
Diegoisawesome
ef62393289
Merge pull request #316 from huderlem/gbagfx-metatiles 
Add ability to specify metatile dimensions to gbagfx
 2018-09-06 12:56:04 -05:00
Marcus Huderle
78cdd97c8b Add ability to specify metatile dimensions to gbagfx 2018-09-06 11:44:50 -05:00
Diegoisawesome
e0a83e3d72 Update scaninc and preproc with multi-file incbins 2018-09-06 03:45:50 -05:00
Diegoisawesome
064216d3be Add gbafix from devkitPro/gba-tools 2018-08-29 23:39:03 -05:00
Garak
96ab357bed
Merge pull request #3 from pret/master 
syncing with source repo
 2018-08-07 22:21:10 -04:00
einstein95
aeceecea3d Port over 9d96147bbf 2018-07-29 20:11:04 +12:00
garakmon
9acd55ae4f re-initializing structs in tools/aif2pcm/main.c 
initializing all fields because clang doesn’t understand {0}
 2018-06-16 19:20:10 -04:00
garakmon
13ed20c6e3 compiler fixes 
The compiler flag -s is not necessary and causes build failure on some
systems (macOS, clang compilers) due to it being deprecated.
Additionally, on those same systems, tools/aif2pcm/main.c failed to
compile due to an overly cautious compiler not liking some struct
declarations.
These changes afaik do not affect other builds.
 2018-06-16 18:49:27 -04:00
golem galvanize
5a5eb4ff59 dumped most of pokenav.s 2018-01-15 23:38:10 -05:00
xenonnsmb
e649e3d248 adding tools from pokeruby 2017-12-03 19:55:01 -06:00
YamaArashi
74834c0ca0 remove old tools 2016-11-01 07:59:44 -07:00
YamaArashi
b4781cdf03 gpu_regs.c 2016-01-08 01:08:16 -08:00
YamaArashi
69d1b312f6 title screen background tiles and palettes 2015-11-24 01:41:14 -08:00
YamaArashi
066d199fe3 add space in include directive 2015-11-23 19:06:19 -08:00
YamaArashi
b951fb1113 dumped fonts 2015-11-23 17:44:06 -08:00
YamaArashi
3e95160b25 tilesets 2015-11-22 15:29:11 -08:00
YamaArashi
8d0d89c00c formatting and license 2015-11-13 22:44:23 -08:00
YamaArashi
4c733f3811 pokemon PNGs and palettes 2015-11-13 21:57:22 -08:00