dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
7,925 Commits 4 Branches 0 Tags
20012cba6e0f5d5e273afd1788a47ea318c885b5
Commit Graph

168 Commits

Author SHA1 Message Date
GriffinR
20012cba6e Merge pull request #2130 from Catnip-Consumer/preproc-windows-fixes 
Apply fixes to preproc for Windows compatibility
 2025-07-21 18:56:37 -04:00
Philipp AUER
e63e89e270 Fix potential stack memory leak in gbagfx due to out of bounds read (#2162) 
* fix(tools): gbagfx potential oob read

---------

Co-authored-by: sbird <sbird@no.tld>
 2025-07-21 18:33:44 +01:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
Alex
2044bea883 Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01:00
Hedara
c8d3a6b4df Added missing include due to g++ changes 2025-05-02 16:03:55 +02:00
Catnip-Consumer
2cc013ff3e Apply fixes to preproc for Windows compatibility 2025-04-28 14:36:19 +03:00
GriffinR
cdadd7d2ed Generate heal location constants automatically, move data back to a single file. 2025-02-03 20:25:11 -05:00
GriffinR
0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants 2024-10-15 22:04:45 -04:00
GriffinR
da9c0239d9 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-15 22:02:40 -04:00
luckytyphlosion
a55c75d350 Get rid of common syms (#2040) 2024-10-14 23:52:11 -04:00
GriffinR
a2a3255bdd Fix typo, remove old size check 2024-10-12 03:30:35 -04:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
GriffinR
6518f1e3ff Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-11 15:26:58 -04:00
GriffinR
091b7269df Move heal locations data to their associated map.json (#2034) 2024-10-11 15:15:55 -04:00
GriffinR
b6892f5b67 Let scaninc ignore empty C files 2024-10-11 15:03:38 -04:00
mid-kid
2c7964dbc2 Fix deleting files with dependency files (#2045) 2024-10-11 14:33:32 -04:00
Martin Griffin
fcc067e515 [preproc] support C23 enum underlying type syntax (#2043) 2024-10-11 13:50:26 -04:00
GriffinR
8f41d9eb17 Merge branch 'master' into fix-toolchain 2024-09-19 12:20:51 -04:00
Kurausukun
52c2728ff6 remove gflib 2024-09-18 10:37:34 -04:00
GriffinR
302193a814 Have scaninc ignore non-existing files 2024-09-14 00:28:57 -04:00
GriffinR
b8c71fa84d Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings 2024-09-13 23:38:50 -04:00
GriffinR
d9b824db3f Sync missing alignment from pokefirered 2024-09-12 12:27:31 -04:00
GriffinR
2d5231149e Merge branch 'master' of https://github.com/pret/pokeemerald into build-scaninc-speed 2024-08-31 00:39:48 -04:00
Icedude907
625a006cab [Build System Rewrite] mapjson now takes output directory parameters. (#1949) 2024-08-29 14:01:01 -04:00
Martin Griffin
5c55cc3748 [preproc] support arbitrary expressions in enums 2024-08-21 07:50:41 +01:00
Philipp AUER
550e6688aa Support C-Style enum in preproc (#1984) 
* [preproc] C-style enums

- asm files parseable from stdin
- 2nd preproc pass
- add parser for C-style `enum`
- positional arguments at end of command

---------

Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2024-07-13 18:26:33 +01:00
Alex Nash
c0d630ee63 Add support for LF line endings to gbagfx 2024-06-20 21:44:32 +02:00
GriffinR
232eab4bee Merge pull request #1975 from Sierraffinity/jsonproc-fix 
jsonproc: filter out every non-alphanumeric character
 2024-01-28 13:54:11 -05:00
Sierraffinity
b98e044ce9 jsonproc: filter out every non-alphanumeric character 2024-01-27 19:29:29 -08:00
Sierraffinity
e85750bb55 gbagfx bit depth upconversion fix 2024-01-27 14:29:31 -08:00
Icedude907
4b2054c3ea Parallel SCANINC via .d generation. 
Secondary expansion is redundant.
 2023-11-12 16:38:32 +13:00
Icedude907
7fa9819d9a Makefile uses make_tools, mapjson takes out dir. 
Removed generated files (layouts.h, map_groups.h) from git.
 2023-11-12 00:53:34 +13:00
kittenchilly
333523e5f7 Remove all leading whitespace 2023-10-23 13:24:38 -05:00
grunt-lucas
9d170c7e35 gbagfx to respect user CC setting 2023-08-22 07:37:48 -07:00
GriffinR
6fdf75bd8c Support plain pixel conversion, convert spinda spots to .png 2023-05-11 13:41:38 -04:00
GriffinR
8e5347b450 Fix mapjson misreporting errors when processing map_groups.json 2023-04-30 23:29:31 -04:00
GriffinR
be84793713 Let scaninc/preproc ignore empty asm files 2023-02-27 12:47:35 -05:00
GriffinR
c29cf5a5e5 Remove unnecessary version check 2023-02-08 13:34:38 -05:00
GriffinR
de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
GriffinR
118a9701c9 Add event type errors 2023-02-08 12:52:28 -05:00
GriffinR
db5edc49d7 Sync mapjson 2023-02-08 12:52:06 -05:00
GriffinR
713e1825bd Report JSON field names in errors 2023-01-17 16:25:33 -05:00
GriffinR
1e3b0e8d76 Treat all mapjson fields as strings 2023-01-17 16:00:09 -05:00
GriffinR
b836d9ebfb Stop some redundant JSON reads 2023-01-17 15:40:39 -05:00
GriffinR
15431bd397 Add initial mapsjon type conversions 2023-01-17 15:25:39 -05:00
GriffinR
3ee3d6e346 Support reducing png bit depth 2023-01-11 10:11:11 -05:00
tustin2121
116364334d Fix build of jsonproc 
- Changing uint to unsigned int, as uint is not standard.
 2022-11-02 19:51:43 -05:00
Marcus Huderle
ae6ec3b1b8 Change cleanString() to convert invalid chars to underscores 2022-10-22 15:09:37 -05:00
GriffinR
a418f8d976 Merge pull request #1755 from GriffinRichards/map-dynamic 
Rename special map constants, treat warp ids as strings
 2022-10-18 22:45:56 -04:00