3507 Commits

Author	SHA1	Message	Date
GriffinR	20b76c6071	Fix swapped route 102 berries	2021-02-10 16:26:09 -05:00
GriffinR	987fdf6fcd	Merge pull request #1321 from GriffinRichards/doc-evoscene ... Document evolution scene	2021-02-08 18:21:30 -05:00
GriffinR	2237d0748f	Label unused layouts	2021-02-08 14:45:56 -05:00
GriffinR	0851c34bac	Add berry tree id constants	2021-02-05 15:25:12 -05:00
GriffinR	a240481d5f	Document secret_base.c	2021-02-05 12:08:25 -05:00
Deokishisu	ac43365d58	Fix "Compatibility" Misspelling ... Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.	2021-02-05 01:27:11 -05:00
ultima-soul	46e853c13b	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-02-03 16:23:23 -08:00
ultima-soul	daf5e0167e	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-02-03 16:06:48 -08:00
GriffinR	15906ca143	Document evolution scene	2021-02-03 17:55:37 -05:00
amiosi	762dcb8a7c	cry fixes, type null	2021-02-03 14:10:39 -05:00
amiosi	663cc5b15c	oricorio...	2021-02-03 13:02:13 -05:00
Evan	6139b12a49	fix hp boxes not dissapearing	2021-02-02 23:30:08 -07:00
amiosi	f46f21bb38	tapus again	2021-02-02 14:40:04 -05:00
amiosi	9c2c337e6f	tapu case	2021-02-02 14:24:15 -05:00
amiosi	f700004188	proper CamelCase	2021-02-02 14:21:00 -05:00
amiosi	2d6b80455d	Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr	2021-02-02 13:25:53 -05:00
amiosi	47e1d6b790	MIMEJR -> MIME_JR	2021-02-02 12:36:05 -05:00
Evan	f4d4cf262e	fix screen cleaner, curious medicine, as one	2021-02-02 09:00:07 -07:00
GriffinR	64460e01ae	Merge pull request #1314 from GriffinRichards/doc-controllers ... Document battle controllers, misc other battle	2021-02-02 00:24:16 -05:00
GriffinR	7e26aa3d21	Merge pull request #1316 from GriffinRichards/doc-scrcmd ... Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree	2021-02-01 21:04:00 -05:00
ultima-soul	5fdb578747	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-02-01 15:58:18 -08:00
ultima-soul	2a20d50904	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-02-01 15:54:08 -08:00
Evan	f428e5e2dc	some quick claw/custap berry fixes	2021-01-31 23:31:27 -07:00
ultima-soul	96232ea166	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-01-28 23:59:08 -08:00
GriffinR	12af03cd62	Label bard music pitch table	2021-01-28 16:36:56 -05:00
GriffinR	89b85a49ec	Index gBardSounds_Moves and gBardSounds_Pokemon with constants	2021-01-28 15:55:33 -05:00
Evan	c003f1c023	check move effectiveness with status effects	2021-01-26 15:41:59 -07:00
GriffinR	92bd6400b7	Fix up berry sparkle	2021-01-26 05:40:34 -05:00
GriffinR	9e59581220	Document object lock and some trainer approach	2021-01-26 04:42:18 -05:00
GriffinR	0064333e4a	Clean up scrcmd.c	2021-01-26 02:16:26 -05:00
GriffinR	3fd5e143a9	Misc battle anim documentation	2021-01-23 00:40:46 -05:00
GriffinR	a392cca928	Misc battle documentation	2021-01-23 00:40:31 -05:00
GriffinR	c106f7f130	Document battle_controller_opponent.c	2021-01-22 21:35:16 -05:00
GriffinR	63a7828772	Document battle_controller_player.c	2021-01-22 20:03:27 -05:00
GriffinR	4eca05ccf5	Document remainder of battle_controllers.c	2021-01-22 02:48:22 -05:00
ghoulslash	32cc04c91c	Merge pull request #1311 from ultima-soul/deoxys_handling_removal ... Remove Special Handling for Deoxys	2021-01-21 12:22:03 -07:00
Evan	5aff5333dc	fix B_MEMENTO_FAIL comment	2021-01-21 12:05:01 -07:00
Evan	bfb7333507	memento gen4 failing	2021-01-21 12:03:30 -07:00
GriffinR	8fe4d004e3	Merge pull request #1305 from GriffinRichards/doc-battletv ... Document battle tv data	2021-01-21 12:27:14 -05:00
Evan	4611c71bd1	merge with be	2021-01-21 08:55:14 -07:00
Evan	8ec12c665c	merge with be	2021-01-20 17:36:13 -07:00
GriffinR	3ceb43177d	Merge pull request #1312 from sphericalice/pokeemerald ... Fix misnamed ground effect flags & document reflections	2021-01-20 18:50:31 -05:00
ghoulslash	9b1a482837	Merge pull request #1317 from ultima-soul/form_species_tables_ie ... Add Form Species ID Tables	2021-01-20 13:54:58 -07:00
ghoulslash	71f18bfbf4	Merge pull request #1316 from ultima-soul/form_species_tables_be ... Add Form Species ID Tables	2021-01-20 13:54:39 -07:00
ghoulslash	b4b1d2b9e2	Merge pull request #1315 from ultima-soul/form_species_tables_pe ... Add Form Species ID Tables	2021-01-20 13:54:20 -07:00
ultima-soul	9663ed0d3c	Merge branch 'form_species_tables' into form_species_tables_pe	2021-01-20 12:06:59 -08:00
ultima-soul	d3b0e98325	Merge branch 'form_species_tables' into form_species_tables_be	2021-01-20 11:40:48 -08:00
ultima-soul	f571c8af2a	Merge branch 'form_species_tables' into form_species_tables_ie	2021-01-20 11:34:59 -08:00
ultima-soul	267900bdcb	Add Form Species ID tables and functions to access them.	2021-01-20 11:31:20 -08:00
SphericalIce	4334f7a379	Include NUM_REFLECTION_TYPES in the ReflectionTypes enum	2021-01-20 10:17:07 +00:00