2049 Commits

Author	SHA1	Message	Date
GriffinR	be0699bd64	Merge pull request #1326 from GriffinRichards/doc-layouts ... Label unused layouts	2021-02-14 14:22:28 -05:00
GriffinR	a85ac11b28	Merge pull request #1325 from GriffinRichards/constants-berrytree ... Add berry tree id constants	2021-02-14 14:15:51 -05:00
Evan	d65d5cb8fd	add AI_FLAG_SMART_SWITCHING, some burn checks	2021-02-14 09:37:04 -07:00
GriffinR	8634710996	Document PokemonUseItemEffects	2021-02-12 16:02:04 -05:00
Evan	f3d975e239	merge with be	2021-02-12 08:59:55 -07:00
LOuroboros	21ee6cb9fb	Added constant labels for EV manipulating item effects	2021-02-12 07:26:11 -03:00
amiosi	1df295a582	battle config and zippy zap ... plus fix mirror move mistakes	2021-02-11 17:11:07 -05:00
amiosi	c0ba7436af	water shuriken and howl	2021-02-11 16:20:13 -05:00
GriffinR	20b76c6071	Fix swapped route 102 berries	2021-02-10 16:26:09 -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
amiosi	663cc5b15c	oricorio...	2021-02-03 13:02:13 -05:00
Evan	0483114a05	merge and some fixes	2021-02-02 11:45:15 -07: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
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
ultima-soul	96232ea166	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-01-28 23:59:08 -08:00
Evan	9fcf7d2453	zero terrain timers for steel roll, remove unused move effectd	2021-01-28 13:51:39 -07:00
Evan	c009b51ae8	add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot	2021-01-28 13:27:00 -07:00
Evan	a37acb8345	coaching, lash out, burning jealousy	2021-01-28 12:21:11 -07:00
Evan	dd51edd881	add eerie spell, surging strikes, jungle healing	2021-01-28 10:51:00 -07:00
ExpoSeed	34c6771e94	Create form change table	2021-01-27 16:30:43 -06:00
Evan	c003f1c023	check move effectiveness with status effects	2021-01-26 15:41:59 -07:00
GriffinR	0064333e4a	Clean up scrcmd.c	2021-01-26 02:16:26 -05: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
Evan	e61309dce6	merge with be	2021-01-20 17:34:24 -07:00
Evan	16d54b6d32	merge with be, add form checks to CanBattlerGetOrLoseItem	2021-01-20 14:28:03 -07: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
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
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
LOuroboros	77d714ead5	Included global.h into battle_config.h ... Fixes the dupplicated defines issue.	2021-01-16 20:37:34 -03:00
Evan	a49b5d1ad0	prankster updated to gen 7	2021-01-16 16:14:36 -07:00
Evan	10b1d33d13	handle battler being affected by terrain	2021-01-16 12:05:51 -07:00
Evan	544d598506	update tailwind timer	2021-01-15 18:34:47 -07:00