3064 Commits

Author	SHA1	Message	Date
ghoulslash	71b85031e0	update NUM_BATTLE_MOVE_EFFECTS	2021-04-06 15:42:21 -06:00
ghoulslash	42c7a5fea2	fix z move move IDs	2021-04-02 10:28:08 -06:00
ghoulslash	d89e2c1775	merge with be	2021-04-02 08:55:54 -06:00
Eduardo Quezada D'Ottone	292993e360	Merge pull request #1338 from ghoulslash/ripen ... Add Ripen and Finish Gen4 Berries	2021-03-13 11:16:42 -03:00
ghoulslash	3f9bf5acc0	merge with be	2021-03-09 10:33:48 -07:00
ghoulslash	68388f633f	merge with be	2021-03-08 18:58:16 -07:00
Evan	41d47a867e	format fixes	2021-03-03 10:48:57 -07:00
Evan	2ccdf1d89e	merge with be. magic guard checks	2021-03-03 09:21:06 -07:00
ghoulslash	0ee9425599	Update include/battle_scripts.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 09:14:07 -07:00
ghoulslash	3a30fe900a	Update include/constants/hold_effects.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 09:13:49 -07:00
Evan	b130396c0e	merge with be	2021-03-01 17:05:10 -07:00
ultima-soul	e5fa583a08	Merge pull request #1334 from ghoulslash/gen8_abilities ... More Gen 8 Abilities	2021-03-01 10:40:09 -08:00
Evan	6cb8c6309a	merge with be	2021-03-01 11:28:51 -07:00
Evan	55649a67cc	Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain	2021-03-01 11:23:05 -07:00
Evan	55b8538f68	merge with be	2021-03-01 11:22:37 -07:00
ultima-soul	f6147ee054	Merge pull request #1356 from ghoulslash/tailwind_turns ... Update tailwind timer To Gen5	2021-03-01 08:51:40 -08:00
Evan	6139b12a49	fix hp boxes not dissapearing	2021-02-02 23:30:08 -07:00
Evan	0483114a05	merge and some fixes	2021-02-02 11:45:15 -07:00
Evan	f4d4cf262e	fix screen cleaner, curious medicine, as one	2021-02-02 09:00:07 -07: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
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	39139323f6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove	2021-01-20 17:36:37 -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	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
ultima-soul	d3b0e98325	Merge branch 'form_species_tables' into form_species_tables_be	2021-01-20 11:40:48 -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
ExpoSeed	61db82e64a	Revert "Included global.h into battle_config.h"	2021-01-19 22:55:08 -06:00
GriffinR	6999b237eb	Merge pull request #1309 from GriffinRichards/misc-macro ... Use constants for item data, misc other constants/fixes	2021-01-19 20:49:58 -05:00
SphericalIce	2746fd1f95	Name object event ID arguments properly	2021-01-19 23:35:57 +00:00
SphericalIce	6dd973012b	Correct ground effect flag names for reflections & document sprite data usage	2021-01-19 23:21:50 +00:00
ghoulslash	9d9da6a485	Update include/constants/battle_config.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-19 15:01:51 -07:00
Evan	b576eb5247	fix var_terrain default, wording	2021-01-19 13:26:36 -07:00
GriffinR	752982552e	Add FIRST_BALL, some FIRST_BERRY_INDEX usage	2021-01-19 13:39:18 -05:00
SphericalIce	2dfaba9472	Name color return values more accurately	2021-01-19 17:59:36 +00:00
GriffinR	305ebdbc4a	Parentheses for GET_UNOWN_LETTER	2021-01-19 12:36:36 -05:00
SphericalIce	8de76ed533	Make broader use of RGB macros	2021-01-19 17:15:12 +00:00
GriffinR	cf9f8d01c5	Add misc item data constants	2021-01-19 05:49:20 -05:00
GriffinR	bc20fda604	Use GET_UNOWN_LETTER macro	2021-01-19 04:03:16 -05:00
LOuroboros	77d714ead5	Included global.h into battle_config.h ... Fixes the dupplicated defines issue.	2021-01-16 20:37:34 -03:00
Evan	544d598506	update tailwind timer	2021-01-15 18:34:47 -07:00
Evan	f1d89b2d79	merge with be	2021-01-15 11:17:45 -07:00
ExpoSeed	b166e9a5e3	Merge pull request #1276 from LOuroboros/x_items_BE ... Reworked the effects of the X Items #1	2021-01-15 12:05:07 -06:00
GriffinR	2da0c3436e	Make filler in PokemonSubstruct0 explicit	2021-01-15 00:14:46 -05:00
GriffinR	564278fd49	Document battle tv data	2021-01-14 06:29:59 -05:00