Eduardo Quezada
6546971313
Merge branch '_pret/master' into pret_europe
2025-07-27 11:15:48 -04:00
DizzyEggg
01fc7e76ef
Fix wrong keep temps files directory in makefile
2025-06-22 11:26:31 +02:00
Eduardo Quezada
acef8d208e
Merge branch '_pret/master' into pret_europe
2025-06-11 09:45:39 -04:00
GriffinR
0c32d840fa
Merge pull request #2141 from pret/porymap-6
...
Update for Porymap 6
2025-05-27 10:53:17 -04:00
Kurausukun
bd0a02c456
Correct C23 Checks ( #2144 )
CI / build (push) Has been cancelled
2025-05-19 15:43:06 +01:00
Eduardo Quezada
f027f3264d
Restore some makefile configs
2025-01-19 16:29:54 -03:00
Eduardo Quezada
2fea3d44e7
Fixed make clean not removing build directories for languages
2025-01-14 14:52:29 -03:00
Eduardo Quezada
b10eecc49d
Fixed matching French and Italian
2025-01-12 21:12:05 -03:00
Eduardo Quezada
d8b92f98cd
Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage
2025-01-12 17:40:40 -03:00
GriffinR
dbff8c4360
Merge branch 'porymap-6' into generate-map-constants
2024-12-09 20:25:41 -05:00
GriffinR
6560bbab21
Restore .map file creation
CI / build (push) Has been cancelled
2024-11-23 14:17:40 -05:00
GriffinR
f04c2faeb0
Silence 'Nothing to be done for generated' messages ( #2059 )
CI / build (push) Waiting to run
2024-11-03 23:53:53 +01: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
luckytyphlosion
a55c75d350
Get rid of common syms ( #2040 )
CI / build (push) Has been cancelled
2024-10-14 23:52:11 -04:00
mid-kid
253d3dd7ef
Remove unnecessary looping for rule generation and unroll macros ( #2046 )
2024-10-14 23:47:07 -04:00
GriffinR
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
mid-kid
2c7964dbc2
Fix deleting files with dependency files ( #2045 )
2024-10-11 14:33:32 -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
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
7007439be8
Remove old ld_script processing
2024-09-12 13:50:47 -04:00
GriffinR
9e22bf1af4
Merge pull request #1957 from Icedude907/build-music-config
...
[Build System Rewrite] Improved audio rules
2024-09-12 10:46:30 -04:00
GriffinR
c265c3f837
Merge branch 'master' of https://github.com/pret/pokeemerald into build-music-config
2024-08-31 00:51:15 -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
GriffinR
19ad2e16ac
Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup
2024-08-31 00:17:07 -04:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. ( #1949 )
2024-08-29 14:01:01 -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
70bad62f9b
Merge remote-tracking branch '_pret_origin/master' into multilanguage/sync
...
# Conflicts:
# Makefile
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/maps/OldaleTown/scripts.inc
# data/maps/Route110_TrickHousePuzzle7/scripts.inc
# data/maps/Route110_TrickHousePuzzle8/scripts.inc
# data/scripts/roulette.inc
# data/tilesets/graphics.inc
# data/tilesets/metatiles.inc
# graphics/trainer_card/0star_fr.pal
# graphics/trainer_card/four_stars_fr.pal
# graphics/trainer_card/frlg/0star.pal
# graphics/trainer_card/frlg/blue.pal
# graphics/trainer_card/frlg/bronze.pal
# graphics/trainer_card/frlg/card.png
# graphics/trainer_card/frlg/four_stars.pal
# graphics/trainer_card/frlg/gold.pal
# graphics/trainer_card/frlg/green.pal
# graphics/trainer_card/frlg/one_star.pal
# graphics/trainer_card/frlg/silver.pal
# graphics/trainer_card/frlg/three_stars.pal
# graphics/trainer_card/frlg/two_stars.pal
# graphics/trainer_card/one_star_fr.pal
# graphics/trainer_card/three_stars_fr.pal
# graphics/trainer_card/two_stars_fr.pal
# src/battle_message.c
# src/battle_tent.c
# src/berry_blender.c
# src/berry_tag_screen.c
# src/data/bard_music/length_table.h
# src/data/credits.h
# src/data/items.h
# src/data/pokemon/pokedex_orders.h
# src/data/region_map/region_map_entries.h
# src/easy_chat.c
# src/field_region_map.c
# src/graphics.c
# src/item.c
# src/item_menu.c
# src/menu_specialized.c
# src/pokedex.c
# src/pokedex_cry_screen.c
# src/pokemon_jump.c
# src/pokenav_conditions_search_results.c
# src/pokenav_match_call_gfx.c
# src/pokenav_ribbons_list.c
# src/shop.c
# src/trade.c
# src/trainer_card.c
# src/wireless_communication_status_screen.c
2024-07-05 18:38:49 -04:00
Eduardo Quezada
e26a0629ae
English as proper default
2024-07-05 07:31:42 -04:00
Eduardo Quezada
23e0fec9ad
Initial Spanish (can't compile yet)
2024-07-01 23:07:26 -04:00
Eduardo Quezada
fdb4a6c155
Added make compare_all
2024-07-01 16:32:09 -04:00
leo60228
ef2330593c
Don't assume bash is at /bin/bash
2024-05-29 19:32:17 -04:00
Icedude907
cf1eaea7f7
Coalesced audio rules into audio.mk
2023-11-15 13:36:35 +13:00
Icedude907
4b2054c3ea
Parallel SCANINC via .d generation.
...
Secondary expansion is redundant.
2023-11-12 16:38:32 +13:00
Icedude907
a0bf504bc1
Linkerscript now tracks RAM/ROM usage
2023-11-12 15:24:10 +13:00
Icedude907
2198ca31c7
Reordered makefile.
...
Added some documentation and simplified dependency scanning.
2023-11-12 13:57:44 +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
quocmanh94
a093e402d5
Delete the redundant files generated after running build
2023-11-03 12:50:47 +07:00
Michael Panzlaff
2651401e6b
Fix PATH for modern target for non dkp systems
...
When prepending something to PATH, we should use PATH=/foo/bar:$PATH
and not PATH=/foo/bar:PATH. Because your shell won't certainly find
something under the literal name PATH.
If one is not using devkitarm, TOOLCHAIN will resolve to an empty
string. If TOOLCHAIN is an empty string the only search path for the
modern gcc will be /bin which may work on some installations but is
probably not what was originally intended with this line. So let's just
search the standard search path if nothing can be found under $(TOOLCHAIN).
Either way, PATH is already set up previously, so we can make sure
MODERNCC is invoked properly by calling MODERNCC with PATH=$(PATH).
2023-06-08 12:42:17 +02:00
Eduardo Quezada
d00c8902f9
Whitelist instead of Blacklist for TOOLDIRS in Makefiles
2023-02-25 16:49:41 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
Eduardo Quezada
d45fda5666
(241/665)
2022-08-16 14:30:29 -04:00
Eduardo Quezada
27f2b85efe
Incorporated Italian changes, enough to compile (still needs to sync a couple of them)
2022-08-12 00:28:16 -04:00
Eduardo Quezada
860df0bd97
Merge remote-tracking branch 'pret/master' into pret_french
...
# Conflicts:
# ld_script.txt
# src/battle_controller_player.c
# src/battle_main.c
# src/battle_script_commands.c
# src/evolution_scene.c
# src/field_specials.c
# src/pokedex.c
# src/union_room.c
2022-08-08 11:22:44 -04:00
Eduardo Quezada
fa3abf90c4
(148/654)
2022-08-03 11:25:11 -04:00
Eduardo Quezada
4e137fb43c
(55/654) src/battle_message.c and adjustments to Makefile
2022-08-02 10:01:19 -04:00
Eduardo Quezada
b2160d50bb
37/654
2022-08-01 23:35:34 -04:00
Eduardo Quezada
bec4127e20
Added missing makefile changes
2022-08-01 17:41:25 -04:00
Eduardo Quezada
62b81fea84
Setting up french makefile
2022-08-01 16:16:52 -04:00
Kurausukun
0bda107188
don't build modern with -g by default
2022-04-20 01:07:10 -04:00