grintoul
8c812e0e1a
Remove need to run make clean when switching between frlg and emerald ( #9406 )
2026-03-08 09:49:26 +01:00
FosterProgramming
0c89094756
Ease vanilla maps deletions ( #9199 )
...
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2026-02-24 10:26:33 -08:00
cawtds
97e83ebe6a
Add FRLG ( #7423 )
2026-01-28 17:41:12 +01:00
Hedara
647c786c53
Merge commit '07c897a' into pret-merge
...
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
2025-05-27 19:46:13 +02:00
Hedara
c27930eabf
Merge commit '678fdf9' into pret-merge
...
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
2025-05-27 19:22:40 +02:00
Hedara
4a442cc3e6
Merge commit '091b726' into pret-merge
...
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
2025-05-27 19:02:53 +02:00
hedara90
2bc82a886a
Add AUTO_GEN_TARGETS for .party files and map_groups_count, but on master ( #6824 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-11 22:37:11 +02:00
GriffinR
cdadd7d2ed
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
Philipp AUER
cdd6361a90
fix(makefile): dependencies for map_group_count.h ( #5648 )
...
Co-authored-by: sbird <sbird@no.tld>
2024-11-09 21:00:00 -03:00
GriffinR
0ee9b3cf08
Fix event_constants recipe running twice
2024-10-15 22:17:38 -04:00
GriffinR
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
GriffinR
091b7269df
Move heal locations data to their associated map.json ( #2034 )
2024-10-11 15:15:55 -04:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. ( #1949 )
2024-08-29 14:01:01 -04:00
GriffinR
3f49c5cbaf
Fix trainer match call flags
2024-08-15 23:00:20 +02:00
Raymond Dodge
650127e857
clean and generate src/data/map_group_count.h ( #4727 )
...
`src/data/map_group_count.h` is currently in `.gitignore`. However, git
does not ignore a file if that file is already in the index. To actually
ignore the file, the file must be deleted and that deletion must be
committed.
In addition, the Makefile did not previously clean `src/data/map_group_count.h`,
nor know how to generate `src/data/map_group_count.h`.
It did generate the file as a side-effect of a different rule, but if
asked to generate, it did not know how to.
2024-06-09 17:16:32 +02:00
luckytyphlosion
3d686116d8
[Round 3] Apply all source related changes for the new INSTALL.md in one commit.
2020-12-16 21:24:44 -05:00
luckytyphlosion
5a5acfb0ad
[Round 3] Revert multiple source change commits for re-commit.
2020-12-16 21:24:08 -05:00
luckytyphlosion
166183d5ed
[Round 2] Apply all source related changes for the new INSTALL.md in one commit.
2020-12-16 20:31:56 -05:00
luckytyphlosion
345aab63cf
[Round 2] Revert multiple source change commits for re-commit.
2020-12-16 20:31:10 -05:00
luckytyphlosion
936ba7f1bf
Apply all source related changes for the new INSTALL.md in one commit.
...
For people who want to have dkPless builds in their repo.
2020-12-16 15:10:01 -05:00
luckytyphlosion
cc5db41f30
Revert multiple source change commits for rebase.
2020-12-16 13:29:02 -05:00
luckytyphlosion
1536295872
Add support for dkp-less instructions.
...
Todo: actually test building with dkP.
2020-11-25 09:20:45 -05:00
Phlosioneer
18902219ad
Fix make to look for .json files instead of folders
...
Currently, when Make is building the maps, it considers every
folder in the data/maps/ directory as a map that needs to be built,
even folders that are empty. This can be a problem when modding on
a separate branch, because git doesn't always clean up directories
when switching branches (usually because of hidden files in those
directories), so switching back to an unmodded branch will leave
an empty folder that confuses make.
This commit changes the makefile so that it only checks directories
that have map.json files in them.
2019-03-05 01:46:20 -05:00
Marcus Huderle
d4125fef9b
Cleanup and add game version flag to mapjson tool
2019-02-04 17:28:45 -06:00
Marcus Huderle
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -06:00
