64 Commits

Author	SHA1	Message	Date
GriffinR	75b9950ec7	Allow object type field to be missing	2022-11-22 10:40:26 -05:00
GriffinR	21220c9427	Merge branch 'master' into sync-numtiles	2022-11-10 12:27:47 -05:00
GriffinR	c77adaf6bf	Sync map data macros	2022-10-25 14:31:01 -04:00
GriffinR	32ab6087d8	Merge pull request #484 from GriffinRichards/clone-union ... Separate connection clone objects from normal objects	2022-10-17 21:29:52 -04:00
GriffinR	edc478c1c4	Sync -num_tiles flags	2022-10-08 20:15:22 -04:00
GriffinR	7b5f4a00cb	Merge pull request #500 from garakmon/rme_updates ... use json for region map sections	2022-09-25 21:58:27 -04:00
GriffinR	bfd1fb2419	MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants	2022-09-03 14:59:18 -04:00
GriffinR	2b93687ade	Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union	2022-08-10 13:48:30 -04:00
Eduardo Quezada	60ce72fa5a	Synced src/mon_markings.c and partly synced PSS	2022-07-30 12:29:20 -04:00
Kurausukun	f341e9bea3	use floats for tempo calculation	2022-06-28 00:14:11 -04:00
garakmon	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
GriffinR	38601cf09b	Reformat clone objects in JSON	2022-02-05 14:34:53 -05:00
GriffinR	75f2be2e29	Name map groups	2021-04-28 16:37:08 -04:00
GriffinR	9350e2d338	Sync mapjson with pokeemerald	2021-01-19 01:38:15 -05:00
GriffinR	393a6bd5b6	Sync gbagfx with pokeemerald	2021-01-19 01:28:49 -05:00
GriffinR	538c1d0efd	Sync preproc with pokeemerald	2021-01-19 01:19:32 -05:00
GriffinR	cd67c5e240	Sync scaninc with pokeemerald	2021-01-18 23:39:05 -05:00
GriffinR	9509797b98	Remove deadnaming, sync BgEvent	2020-12-31 14:24:30 -05:00
PikalaxALT	f75c048434	Merge pull request #343 from Kurausukun/patch-2 ... Fix compilation on gcc 10	2020-05-27 07:57:02 -04:00
Kurausukun	56ff0ac34d	Fix compilation on gcc 10	2020-05-18 23:39:37 -04:00
Kurausukun	5a1b1c6aca	Fix compilation on gcc 10	2020-05-18 01:49:49 -04:00
jiangzhengwenjz	7d4f294c20	make gbagfx build	2020-05-16 01:56:36 +08:00
Sierraffinity	060e97303a	gbagfx: Check for nullptr for new output path	2020-04-22 16:54:22 -07:00
Sierraffinity	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
GriffinR	d450d5d406	var_value to string	2020-03-13 01:21:46 -04:00
GriffinR	a0f951b09c	trainer_type and trainer_sight_or_berry_tree_id to string	2020-03-11 12:08:08 -04:00
GriffinR	6191739a4d	Label sign bg events	2020-03-02 12:24:05 -05:00
PikalaxALT	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
Diegoisawesome	cd6a83d955	Make aif2pcm looping not dependent on order of MARK and INST chunks	2020-02-19 08:55:12 -08:00
Diegoisawesome	9f8670ccb9	Fix aif2pcm Pascal string bug and follow AIFF loop point standard	2020-02-18 22:41:12 -08:00
GriffinR	3e80641915	in_connection to bool	2020-02-18 19:52:37 -05:00
GriffinR	2a2db28e57	Split connection field from graphics id in object events	2020-02-18 18:13:31 -05:00
GriffinR	e94f9c1483	Name allow_escaping, allow_running, show_map_name header properties	2020-02-18 15:11:44 -05:00
GriffinR	4643330fdd	Name allow_cycling, floor_number header properties	2020-02-18 14:08:29 -05:00
GriffinR	ca5fc4d176	Remove extraneous parens in gbafix	2020-01-16 14:09:43 -05:00
PikalaxALT	d0e15e34c5	Dump LeafGreen encounters	2019-12-20 13:30:27 -05:00
PikalaxALT	34378fe3fb	Final Smash on FireRed baserom.gba	2019-12-18 09:07:53 -05:00
garak	ddaa88390e	eventobject -> objectevent take 3	2019-12-17 18:49:34 -05:00
PikalaxALT	3f7c66703b	Dump wild_encounter data to C/JSON	2019-10-31 20:05:10 -04:00
PikalaxALT	a64503e744	Update br_ips to generate an empty patch when no hunks are found	2019-10-26 10:41:31 -04:00
PikalaxALT	c5db703229	Update hidden item json fields	2019-10-21 13:34:31 -04:00
PikalaxALT	8635868582	Fix cygwin define check	2019-10-15 14:07:35 -04:00
PikalaxALT	c3ea8e0272	Feature test for getline in br_ips	2019-10-15 10:09:41 -04:00
PikalaxALT	31d2164c95	Bump baserom.ips	2019-10-12 16:35:02 -04:00
PikalaxALT	7e8bff29bb	review comments; br_ips std=c99	2019-10-04 15:45:26 -04:00
PikalaxALT	136464ce94	Update Makefile rules to correctly detect changes in berry fix mb	2019-10-04 13:28:48 -04:00
PikalaxALT	23d917f7c8	Quieter make tools	2019-07-30 19:50:52 -04:00
PikalaxALT	09b94d8b34	Merge branch 'master' of github.com:pret/pokefirered	2019-07-12 17:11:58 -04:00
PikalaxALT	f64421dd8c	Remove hardcoded gap	2019-07-12 17:11:27 -04:00
dheu	2b92e8f9d4	fix: ld_script.txt, tabs vs spaces & add: asmdiff.sh	2019-07-08 18:12:33 +08:00