Hedara
8e11c5b554
Merge branch 'master' into master-merge
...
Conflicts:
spritesheet_rules.mk
src/data/graphics/items.h
src/data/graphics/trainers.h
src/data/object_events/object_event_graphics.h
src/decoration.c
src/pokedex_area_region_map.c
src/pokemon.c
tools/preproc/c_file.cpp
tools/preproc/c_file.h
2026-04-30 18:55:19 +02:00
Martin Griffin
2a5dec304c
Merge branch 'pret-master-2283' into rhh-master
2026-04-30 14:20:42 +01:00
Martin Griffin
df02d49e9b
INCGFX: in-source arguments for gbagfx
...
'INCGFX' is like 'INCBIN' except that it specifies the arguments to pass
to 'gbagfx' which alleviates the user-unfriendliness caused by catch-all
rules.
Specifically, users frequently forget to add to 'spritesheet_rules.mk'
when adding object event graphics, and then the built '.4bpp' file is
not invalidated when the add their rule so they have to 'touch' the
source file or similar.
The built artifacts are placed in 'build/assets'.
2026-04-19 07:06:17 +01:00
Martin Griffin
84e8d23425
Remove INCBIN_S*
...
The signed INCBINs are unused, I assume they were once for audio data
but that is handled in assembly now.
2026-04-19 07:06:17 +01:00
FosterProgramming
80933058c2
Use PRIu64 to print appropriate variable length in preproc ( #9463 )
2026-03-07 21:01:17 +00:00
Martin Griffin
44e9991e8b
preproc: (shared) COMPOUND_STRING ( #9086 )
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-03-04 17:09:12 +01:00
hedara90
0917af214c
Replace all usages of lz compression with smol ( #7032 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-31 19:47:54 +02:00
Eduardo Quezada
2b40e79ac3
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle_util.h
# src/battle_ai_main.c
2024-07-14 22:44:00 -04: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
Eduardo Quezada
6eba5bcb80
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-05-16 17:31:46 -04:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything ( #3949 )" ( #4525 )
...
This reverts commit e2d70d440e0d2b400953
2024-05-13 19:19:37 +02:00
Eduardo Quezada
502a56efd1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/global.h
# src/data.c
# src/data/pokemon/species_info/gen_7.h
2024-02-13 20:35:05 -03:00
Ariel A
1ce961768e
Added automatic runtime decapitalization.
2024-01-07 20:21:14 -05:00
Ariel A
398a9ee8fa
Merge branch 'followers' into followers-expanded-id
2023-12-31 01:49:56 -05:00
Ariel A
dcaaac92d9
Added support for compressed OW graphics.
...
Added CpuSmartCopy macros (Credit: luckytyphlosion)
2023-12-31 00:35:27 -05:00
kittenchilly
333523e5f7
Remove all leading whitespace
2023-10-23 13:24:38 -05:00
luckytyphlosion
7189e4e26f
Fix build on macos.
...
Needs <cerrno> include in tools/preproc/c_file.cpp
2021-06-03 21:05:56 -04:00
luckytyphlosion
10c0566121
Don't keep temporary C build files by default.
2021-01-19 11:43:50 -05:00
Kurausukun
65fb2e9957
Fix compilation on gcc 10 (for real this time)
2020-05-18 23:42:42 -04:00
Diegoisawesome
e0a83e3d72
Update scaninc and preproc with multi-file incbins
2018-09-06 03:45:50 -05:00
einstein95
aeceecea3d
Port over 9d96147bbf
2018-07-29 20:11:04 +12:00
xenonnsmb
e649e3d248
adding tools from pokeruby
2017-12-03 19:55:01 -06:00
