507f1d8d36
Modern fixes ( #697 )
2025-06-11 14:27:42 -04:00
5f9f173b6a
Generate heal location constants automatically, move data back to a single file.
2025-02-03 16:00:29 -05:00
587d494421
Merge branch 'porymap-6' into generate-map-constants
2024-12-17 20:48:28 -05:00
b10c2f7584
Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6
2024-11-26 12:47:28 -05:00
2a3e92e10f
Sync Makefile and common syms ( #676 )
2024-11-26 12:46:12 -05:00
a2e408cf4e
Add support for local IDs in map.json
2024-10-14 22:44:16 -04:00
d2c592030d
Sync toolchain fixes from pokeemerald
2024-10-11 15:21:06 -04:00
bb50006fc9
Move heal locations data to their associated map.json ( #673 )
2024-10-11 15:17:18 -04:00
e47a054393
Sync remaining tools
2024-09-14 11:26:14 -04:00
f89a69a2d9
Have scaninc ignore non-existing files
2024-09-13 23:12:50 -04:00
ab80760dfc
Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings
2024-09-13 23:12:20 -04:00
93b4a7b815
Toolchain sync fixes
2024-09-12 17:49:50 -04:00
f0566e68f0
Sync tools directory
2024-09-12 12:39:00 -04:00
7df4038c86
Ensure Alignment for Map Events ( #649 )
2023-11-21 15:46:51 -05:00
3a26fce16b
Merge pull request #621 from Gamr13/master
...
Fix macOS building
2023-05-19 13:11:20 -04:00
42332a824e
Sync mapjson with pokeemerald
2023-05-09 10:52:53 -04:00
9efcec167b
Update Makefile
2023-05-07 21:11:54 +01:00
349c545939
Update Makefile
2023-05-07 21:11:15 +01:00
46a38eb3f4
Let scaninc/preproc ignore empty asm files
2023-02-27 12:51:03 -05:00
993aedc64a
Remove unnecessary version check
2023-02-08 13:31:20 -05:00
5847466f08
Sync mapjson
2023-02-08 13:12:12 -05:00
1ad8469e8e
Support reducing png bit depth
2023-01-11 14:25:21 -05:00
75b9950ec7
Allow object type field to be missing
2022-11-22 10:40:26 -05:00
21220c9427
Merge branch 'master' into sync-numtiles
2022-11-10 12:27:47 -05:00
c77adaf6bf
Sync map data macros
2022-10-25 14:31:01 -04:00
32ab6087d8
Merge pull request #484 from GriffinRichards/clone-union
...
Separate connection clone objects from normal objects
2022-10-17 21:29:52 -04:00
edc478c1c4
Sync -num_tiles flags
2022-10-08 20:15:22 -04:00
7b5f4a00cb
Merge pull request #500 from garakmon/rme_updates
...
use json for region map sections
2022-09-25 21:58:27 -04:00
bfd1fb2419
MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants
2022-09-03 14:59:18 -04:00
2b93687ade
Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union
2022-08-10 13:48:30 -04:00
60ce72fa5a
Synced src/mon_markings.c and partly synced PSS
2022-07-30 12:29:20 -04:00
f341e9bea3
use floats for tempo calculation
2022-06-28 00:14:11 -04:00
c518cba3ec
use json for region map sections
...
- also update wild encounters inja template to consider whitespace trimming
2022-04-21 20:21:58 -04:00
38601cf09b
Reformat clone objects in JSON
2022-02-05 14:34:53 -05:00
75f2be2e29
Name map groups
2021-04-28 16:37:08 -04:00
9350e2d338
Sync mapjson with pokeemerald
2021-01-19 01:38:15 -05:00
393a6bd5b6
Sync gbagfx with pokeemerald
2021-01-19 01:28:49 -05:00
538c1d0efd
Sync preproc with pokeemerald
2021-01-19 01:19:32 -05:00
cd67c5e240
Sync scaninc with pokeemerald
2021-01-18 23:39:05 -05:00
9509797b98
Remove deadnaming, sync BgEvent
2020-12-31 14:24:30 -05:00
f75c048434
Merge pull request #343 from Kurausukun/patch-2
...
Fix compilation on gcc 10
2020-05-27 07:57:02 -04:00
56ff0ac34d
Fix compilation on gcc 10
2020-05-18 23:39:37 -04:00
5a1b1c6aca
Fix compilation on gcc 10
2020-05-18 01:49:49 -04:00
7d4f294c20
make gbagfx build
2020-05-16 01:56:36 +08:00
060e97303a
gbagfx: Check for nullptr for new output path
2020-04-22 16:54:22 -07:00
8c1d0d77a5
gbagfx: Various fixes and improvements
...
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:06:34 -07:00
d450d5d406
var_value to string
2020-03-13 01:21:46 -04:00
a0f951b09c
trainer_type and trainer_sight_or_berry_tree_id to string
2020-03-11 12:08:08 -04:00
6191739a4d
Label sign bg events
2020-03-02 12:24:05 -05:00
4280723f0e
Merge pull request #260 from GriffinRichards/doc-connection
...
Split connection field from graphics id in object events
2020-02-19 14:49:14 -05:00
Jaizu