Commit Graph

107 Commits

Author SHA1 Message Date
GriffinR 0ce4481a6e Name map groups 2021-04-28 16:34:06 -04:00
GriffinR ed3bb5b080 Remove deadnaming, sync BgEvent and 2 function names 2020-12-31 14:33:45 -05:00
GriffinR d3bfb6cfc6 Merge pull request #779 from Sierraffinity/master
gbagfx: Various fixes and improvements
2020-07-14 22:43:57 -04:00
Sierraffinity fa83439732 Fix clang warning 2020-05-21 10:41:11 -07:00
Kurausukun bddfe5c6d1 Fix compilation on gcc 10 2020-05-18 23:41:28 -04:00
Kurausukun 9f51d25145 Fix compilation on gcc 10 2020-05-18 01:50:40 -04:00
Sierraffinity 8c01d4f937 gbagfx: Check for nullptr for new output path 2020-04-22 16:55:01 -07:00
Sierraffinity ef107002b5 gbagfx: Various fixes and improvements
Bring over Huffman compression/decompression from pokeemerald
Fix num_colors exceeding amount of colors in palette leading to use of uninitialized colors
Handle png -> pal conversion (aka extracting JASC palettes from png)
Allow JASC pal files to be used as -palette argument when converting from GBA to PNG
Allow using only file extension as output to reuse entire path from input before extension
2020-04-22 15:03:58 -07:00
Diegoisawesome 0f7e6403d6 Make aif2pcm looping not dependent on order of MARK and INST chunks 2020-02-19 08:54:21 -08:00
Diegoisawesome bf05e8fe85 Fix aif2pcm Pascal string bug and follow AIFF loop point standard 2020-02-18 22:40:32 -08:00
PikalaxALT 3b2eaeedbc Merge branch 'master' into modern_gcc 2020-02-13 15:13:30 -05:00
GriffinR 98ca62cf91 Standardize Event Object to Object Event 2020-02-12 18:35:27 -06:00
PikalaxALT 04d158cfcd Merge branch 'master' of github.com:pret/pokeruby into modern_gcc 2019-12-14 11:56:41 -05:00
garak 0bc41d1fd3 remove empty groups from wild encounter fields json objects 2019-10-16 20:09:49 -05:00
garak fc2926aa46 add fishing rod groups to encounter json 2019-10-16 20:09:49 -05:00
PikalaxALT 8c86b656d2 Merge branch 'master' into modern_gcc 2019-10-02 11:44:50 -04:00
PikalaxALT c33effb95c Configure Travis to build nonmatching (#746)
* Configure Travis to build nonmatching
2019-09-05 16:03:17 -04:00
PikalaxALT 082093aa36 Merge pull request #755 from garakmon/encounter_json
Wild Encounters to Json
2019-09-05 10:47:39 -04:00
PikalaxALT 3d3ec3150a Merge branch 'master' into modern_gcc 2019-09-05 09:38:27 -04:00
garak 06af013e50 allow CRLF line endings in asm files for preproc 2019-08-29 16:37:58 -05:00
garak c73de8bed7 convert wild encounters to json 2019-08-01 18:13:42 -04:00
garak 02f4d3e420 add jsonproc tool 2019-07-30 16:20:20 -04:00
PikalaxALT 5d268f0acf Make Ruby compile with gcc-8 2019-06-26 19:47:30 -04:00
huderlem c4b5496848 Merge pull request #724 from Diegoisawesome/master
scaninc: Fix C comment consumption logic
2019-03-18 18:24:05 -05:00
PikalaxALT d4f953f87a minor optimization 2019-03-18 17:15:08 -04:00
PikalaxALT f29b9d30ea preproc supports GNU-processed C pipe from stdin 2019-03-18 16:39:47 -04:00
Diegoisawesome b96dc56f0c scaninc: Fix C comment consumption logic 2019-03-18 12:20:37 -05:00
Marcus Huderle 309d2b1246 Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields 2019-02-16 16:56:20 -06:00
garak b8253e3906 use strings for map json coord_event var_value 2019-02-16 16:15:19 -06:00
Marcus Huderle f91325d4a5 Cleanup and add game version flag to mapjson tool 2019-02-04 17:30:13 -06:00
Marcus Huderle a0ba1b7c63 Convert map data to JSON 2019-02-04 10:44:11 -06:00
Marcus Huderle 09b8f4c09e Fix build 2018-10-03 18:00:08 -05:00
aplumafreak500 79149e717f Add support for gbafix 2018-09-29 13:20:25 -04:00
Kermalis 5d56632d03 mid2agb changes from #380
https://github.com/pret/pokeruby/pull/380
2018-09-15 00:40:55 -04:00
Marcus Huderle 53adea30cc Update scaninc and preproc with multi-file incbins (ported from pokeemerald) (#685) 2018-09-11 17:39:20 -05:00
Marcus Huderle cbf9067c3b Add ability to specify metatile dimensions to gbagfx (#684) 2018-09-06 13:46:22 -05:00
Konrad Borowski 9d96147bbf Fix "catching polymorphic type" errors with newest gcc 2018-06-03 16:26:04 -05:00
yenatch 669ec39a83 suppress make tools noise 2018-04-06 01:09:08 -04:00
camthesaxman cafb3b54d1 allow bit depth conversion when possible 2017-12-04 23:02:18 -06:00
sceptillion 81de5a0a1c fix issue with line numbers in errors when using preproc with C 2017-11-25 22:08:30 -08:00
sceptillion 7de07844ee fix global labels in preproc 2017-11-20 14:57:07 -08:00
camthesaxman 7529e63a5a fix out of bounds read when scanning comments 2017-10-22 23:40:14 -05:00
Cameron Hall 3e03d362fa Merge pull request #443 from camthesaxman/png_palettes
add png -> gbapal conversion
2017-10-09 00:05:22 -05:00
yenatch b0d49dbbfb Merge branch 'master' into scaninc 2017-10-08 23:54:46 -04:00
camthesaxman d2ca90a04f add png -> gbapal conversion 2017-10-08 17:01:56 -05:00
yenatch b21c159b08 scaninc: fix buffer overflow 2017-07-29 14:57:06 -04:00
camthesaxman 0a856fda0c fix std::string buffer overflow in scaninc 2017-07-28 17:07:01 -05:00
yenatch c0ebc30a60 scaninc: skip whitespace/comments in the read loop
fixes e73ec108ad
2017-07-24 00:17:38 -04:00
yenatch e98e074138 scaninc: allow multiple include paths
also use a queue instead of a stack for filesToProcess
2017-07-23 23:11:26 -04:00
yenatch d2a1118862 scaninc: optimize for unix newlines
this probably has no effect whatsoever
2017-07-23 22:37:53 -04:00