3694 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
GriffinR	fe99ef341d	Correct colors in item_pc/bg.png	2023-06-01 13:39:51 -04:00
GriffinR	febf864bf6	Sync trainer card graphics	2023-06-01 13:39:17 -04:00
GriffinR	8b17c6d36d	Colorize tm_case/hm.png	2023-06-01 10:29:53 -04:00
GriffinR	b52ace21c4	Merge pull request #628 from GriffinRichards/pal-macros ... Sync palette macros	2023-06-01 10:28:30 -04:00
GriffinR	c212795217	Fix index comment for ScrCmd_playslotmachine	2023-05-31 21:47:33 -04:00
GriffinR	dcdb9024d8	Sync palette macros	2023-05-26 14:52:21 -04:00
GriffinR	f93d5a8ae1	Merge pull request #623 from GriffinRichards/item-icons ... Give proper names to item icon graphics	2023-05-23 12:53:23 -04:00
GriffinR	1de6a20483	Merge pull request #625 from sophxm/master ... Remove unnecessary linker script preprocessing	2023-05-23 12:46:56 -04:00
Sophia	cb6409224f	Remove unnecessary linker script preprocessing ... The previous build process ran sed against the linker scripts twice: once to replace <X> with the contents of sym_x.ld, a second time to correct any paths referencing tools/. The first can be replaced with INCLUDE commands, as was done in pret/pokeemerald@7c57699 (in 2018). The second has been unnecessary since 942c248 (also 2018). With both of these removed there is no longer a need to have a build step for them, and $(ELF) can take the sym_x.ld files as prerequisites instead.	2023-05-22 07:53:28 +01:00
GriffinR	cea26f20c5	Merge pull request #626 from LOuroboros/patch-1 ... Updated BattleScripting addresses	2023-05-21 23:55:49 -04:00
LOuroboros	d249267aac	Updated BattleScripting addresses	2023-05-21 21:06:08 -03:00
GriffinR	3a26fce16b	Merge pull request #621 from Gamr13/master ... Fix macOS building	2023-05-19 13:11:20 -04:00
GriffinR	86c2142719	Give proper names to item icon graphics	2023-05-12 10:52:07 -04:00
GriffinR	b83a178b18	Add some missing constants in wild_encounter.c	2023-05-12 02:16:33 -04:00
GriffinR	42332a824e	Sync mapjson with pokeemerald	2023-05-09 10:52:53 -04:00
GriffinR	ac16ba797f	Merge pull request #622 from SombrAbsol/master ... Remove Magma Emblem and Old Sea Map item icons	2023-05-09 09:32:31 -04:00
SombrAbsol	3c1e954afa	Remove Old Sea Map’s palette	2023-05-09 15:04:35 +02:00
SombrAbsol	aa0ac4abed	Remove Magma Emblem’s palette	2023-05-09 15:04:16 +02:00
SombrAbsol	bb15b280b9	Old Sea Map is not in the game	2023-05-09 09:25:20 +02:00
SombrAbsol	5e9bf2f8dc	Magma Emblem is not in the game	2023-05-09 09:24:54 +02:00
Gamr13	9efcec167b	Update Makefile	2023-05-07 21:11:54 +01:00
Gamr13	349c545939	Update Makefile	2023-05-07 21:11:15 +01:00
GriffinR	5c0bb3a18e	Merge pull request #619 from GriffinRichards/sync-charmap ... Sync some charmap characters with pokeemerald	2023-05-05 15:19:29 -04:00
GriffinR	1824a9fea2	Sync some charmap characters with pokeemerald	2023-05-03 14:22:01 -04:00
GriffinR	f9f4b6ebbd	Merge pull request #617 from waterwheels/patch-1 ... Red and Leaf back palettes swapped	2023-04-27 07:27:46 -04:00
Jo	6ac61a1ccc	Red and Leaf back palettes swapped ... Not sure if maybe this is an idiosyncrasy of pkmn fire red, but it looks like it's probably just a typo; Red and Leaf each use the other's back pic palette	2023-04-27 18:57:59 +10:00
GriffinR	055dee9832	Merge pull request #616 from fdeblasio/oakSpeechSpecies ... Made variable for Oak's introduction Pokemon	2023-04-10 15:06:13 -04:00
Frank	82b3d51743	Made variable for Oak's introduction Pokemon	2023-04-10 15:00:20 -04:00
GriffinR	74782403c1	Merge pull request #615 from fdeblasio/moreFireRedConstants ... Added constants for nature and species length	2023-04-10 09:46:22 -04:00
Frank	59101819de	Added constants for nature and species length	2023-04-10 08:51:24 -04:00
GriffinR	f6aa148946	Merge pull request #614 from GriffinRichards/metatile-labels ... Format metatile labels	2023-03-24 09:54:02 -04:00
GriffinR	31d4dabcda	Merge pull request #613 from GriffinRichards/const-map ... Treat map data as const	2023-03-22 13:15:50 -04:00
GriffinR	adf1437074	Format metatile labels	2023-03-21 13:09:32 -04:00
GriffinR	a2f30a3382	Merge pull request #611 from GriffinRichards/sync-pokemon ... Sync pokemon.c	2023-03-18 13:24:51 -04:00
GriffinR	ac9bd3ec8f	Treat map data as const	2023-03-16 12:46:46 -04:00
GriffinR	9b6fa95778	Merge pull request #612 from cbt6/graphics ... Rename "undocumented" graphics	2023-03-16 11:24:45 -04:00
cbt6	dd7ff3194c	Rename all other graphics	2023-03-16 22:15:44 +08:00
cbt6	fed868ddf6	Rename special anim scene graphics	2023-03-16 22:14:14 +08:00
cbt6	981d4a34d8	Rename union room chat graphics	2023-03-16 22:13:05 +08:00
cbt6	62f745d646	Rename summary screen graphics	2023-03-16 22:12:02 +08:00
GriffinR	a7881d3ae4	Merge pull request #610 from cbt6/graphics ... Document src/graphics.c	2023-03-16 01:46:17 -04:00
cbt6	7a322ba04e	Document more of src/graphics.c	2023-03-13 23:09:19 +08:00
GriffinR	55e9b04e64	Add missing task data define use	2023-03-11 11:25:18 -05:00
cbt6	242bb41682	Document src/graphics.c	2023-03-11 23:57:01 +08:00
GriffinR	f5e9f9be48	Merge pull request #609 from cbt6/field-door ... Sync src/field_door.c	2023-03-09 13:18:00 -05:00
cbt6	b2526bbb48	Sync src/field_door.c	2023-03-10 00:00:17 +08:00
GriffinR	ab417d1255	Sync pokemon.c	2023-03-06 15:23:11 -05:00
GriffinR	2c11a2dc76	Merge pull request #608 from GriffinRichards/hiddenitem ... Add hidden item constant usage	2023-03-06 13:59:57 -05:00
GriffinR	3a4eaa0ff5	Merge pull request #607 from GriffinRichards/doc-gfx ... Correct berry fix colors, misc graphics sync	2023-02-28 11:49:52 -05:00
GriffinR	7b4c931aae	Merge pull request #499 from jarechiga11/patch-1 ... Updates to INSTALL.md for Apple Silicon Macs	2023-02-28 11:44:52 -05:00