341 Commits

Author	SHA1	Message	Date
Eduardo Quezada	d596fa7e12	Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption ... # Conflicts: # include/battle_util.h # include/constants/battle_config.h # src/battle_util.c	2020-10-23 21:49:59 -03:00
Kurausukun	64ba8c8061	port fakematch fixes from #1155	2020-10-22 05:45:53 -04:00
LOuroboros	00bc6ab96b	More review corrections	2020-10-21 16:39:06 -03:00
LOuroboros	503134167a	Review corrections	2020-10-21 15:01:53 -03:00
LOuroboros	4794c63066	Reincorporated badge based stat boosts	2020-10-21 12:57:57 -03:00
Eduardo Quezada	a6e88b82ee	Review changes and option to hide split icon.	2020-10-15 20:15:44 -03:00
LOuroboros	e4635525e7	Renamed the HOLD_EFFECT_EV_BOOST label	2020-10-15 04:52:03 -03:00
Eduardo Quezada	0d39b29691	Option to use Gen 3 Physical/Special split.	2020-10-15 00:16:50 -03:00
ExpoSeed	d4e58d9746	Fix style, sync moved functions properly	2020-10-13 09:40:01 -05:00
ExpoSeed	9e2c8a95c1	Sync bev2 with pret	2020-10-11 01:01:47 -05:00
GriffinR	5259898325	Replace POKEMON_SLOTS_NUMBER	2020-10-01 17:07:12 -05:00
Kaz	847878eae9	battle_gfx_sfx_util.c: Very annoying fakematch fix. ... daycare.c: -g eliminates the need for the brace hack. battle_transition.c: Fix Phase2_Ripple_Func2...?	2020-09-19 17:12:25 -04:00
aaaaaa123456789	7dc95a0103	Undo PokeCodec's PRs ... This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.	2020-09-13 06:30:55 -03:00
PokeCodec	bb5da949f2	Fix build	2020-09-08 19:44:33 -04:00
PokeCodec	e84da39d8a	Match BattleIntroOpponent1SendsOutMonAnimation	2020-09-08 18:54:51 -04:00
PokeCodec	3336eb341d	More adjustments	2020-09-08 14:26:37 -04:00
DizzyEggg	97d0643110	Merge with master	2020-09-08 12:48:28 +02:00
PokeCodec	5f7a410359	Preparation for matching BattleIntroOpponent1SendsOutMonAnimation	2020-09-06 20:01:16 -04:00
PokeCodec	8200682b21	u8 position	2020-09-06 19:02:30 -04:00
PokeCodec	8b729cf225	While to do_while	2020-09-05 18:15:53 -04:00
PokeCodec	fe9ab67063	Change division to explicit shifts for consistency	2020-09-05 18:13:51 -04:00
PokeCodec	3ce29ee7bf	Refactor Use Item	2020-09-05 17:36:10 -04:00
PokeCodec	0039542e19	Match CheckBagHasSpace	2020-09-05 14:41:43 -04:00
PokeCodec	28ef2fb774	Switch to button macros	2020-09-04 21:11:55 -04:00
PikalaxALT	135ed6a162	Merge pull request #1163 from GriffinRichards/doc-animthrow ... Minor battle_anim_throw cleanup	2020-09-04 19:44:33 -04:00
Thomas Winwood	a529bcf0b6	Tidy up naked functions	2020-09-02 14:49:04 +01:00
GriffinR	afb3472282	Minor battle_anim_throw cleanup	2020-08-30 15:11:44 -04:00
GriffinR	09cfed64b5	Merge pull request #1146 from GriffinRichards/rename-songs ... Give songs meaningful english names	2020-08-28 16:14:21 -04:00
PokeCodec	a04b0ff487	More formatting fixes	2020-08-28 14:35:37 -04:00
pi1024e	5faf250708	format	2020-08-28 11:59:16 -04:00
pi1024e	4ac10eb807	Make formatting corrections	2020-08-28 11:52:48 -04:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
PokeCodec	5054cff7e8	removed fakematch	2020-08-26 20:30:04 -04:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
GriffinR	65bd2faf94	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest	2020-08-16 05:59:10 -04:00
GriffinR	4911849723	Document link contest connection	2020-08-13 16:27:40 -04:00
GriffinR	5e8ffff62f	Add stat stage constants	2020-08-04 20:38:57 -04:00
DizzyEggg	0066640a1e	Merge with master	2020-07-27 14:51:39 +02:00
GriffinR	aba42513d3	Clean up some battle scr cmd data	2020-07-18 18:10:15 -04:00
DizzyEggg	62dc94e9c8	Merge with master	2020-07-15 10:13:19 +02:00
GriffinR	a583dfcc42	Merge pull request #1094 from DizzyEggg/rename ... Give proper names to some functions	2020-07-14 19:56:46 -04:00
GriffinR	c177872c9c	Merge pull request #1080 from AsparagusEduardo/EndBalls ... Created constant for easier Ball Expansion.	2020-07-14 19:56:20 -04:00
DizzyEggg	0425cb66ef	Give proper names to some functions	2020-07-14 11:13:03 +02:00
Eduardo Quezada	b31efcd6e3	Renamed constant,	2020-07-12 01:49:32 -04:00
DizzyEggg	4c3f40a361	Merge with master	2020-07-11 12:59:23 +02:00
DizzyEggg	52c63cd671	lightning rod no longer redirects mold braker	2020-07-02 11:58:48 +02:00
DizzyEggg	3bdf675221	Hopefully illusion works as intended now	2020-06-28 19:45:48 +02:00
DizzyEggg	f19ba68cb9	Fix mega indicator sprite overwriting ram	2020-06-24 12:55:08 +02:00
Eduardo Quezada	7244b80fc6	Created constant for easier Ball Expansion.	2020-06-21 02:36:46 -04:00
GriffinR	9190af73b7	Label union room battle trainer	2020-06-03 15:28:29 -04:00
ultima-soul	9ee5db6a96	Expand ability ids to u16. Thanks to ghoulslash for some assistance!	2020-05-18 14:54:12 -07:00
DizzyEggg	f71f1c9d62	Possibly fix gem issue	2020-04-29 11:53:03 +02:00
DizzyEggg	36b52eb063	Shed Shell	2020-04-28 11:14:20 +02:00
DizzyEggg	e2524bed49	Metronome item	2020-04-22 12:49:25 +02:00
DizzyEggg	0f628c8ff2	Fairy Lock	2020-04-20 19:41:07 +02:00
Eduardo Alvaro Quezada D'Ottone	4697a5b687	More Battle configs (#339) ... * Fixed naming of King Shield's description variable. * Config for King Shield lowering attack. * Config for terrain type attack boost. * Standarized battle config descriptions. * Adjusted config logic accounting for GEN_8. * Changed KING_S_SHIELD back to KINGS_SHIELD * Missed B_ABILITY_WEATHER.	2020-04-20 14:11:28 +02:00
DizzyEggg	a2813e63de	Slow Start	2020-04-18 12:52:15 +02:00
DizzyEggg	83b251a69c	Stamina, Liquid Voice, Water Compaction	2020-04-15 09:37:12 +02:00
DizzyEggg	8f61445dfe	Berserk	2020-04-12 12:41:26 +02:00
DizzyEggg	060b795d8e	Merge with master	2020-04-11 19:48:24 +02:00
DizzyEggg	1435cd4692	Change inner structure of semi invulerable moves	2020-04-11 11:47:13 +02:00
AsparagusEduardo	f45336c546	Using Battle Action constants	2020-03-17 22:14:14 -03:00
DizzyEggg	5054727167	Allow second mon to throw a ball if first dead	2020-02-16 13:24:50 +01:00
DizzyEggg	360665fac8	Fix ability preventing escape string	2020-02-09 11:02:22 +01:00
DizzyEggg	14bc2f65f3	Fix AI trying to switch when it can't, also ghosts can escape	2020-02-08 14:20:02 +01:00
Eduardo Alvaro Quezada D'Ottone	90442ffbc2	Battle config options (#243) ... * Option to use pre-GenVI critical hit multiplier. * Clarified the option that multiplies EXP by 1.5 for trainer battles. * Fixed code style. * Option to change Burn damage. * Option to change to Gen 7 paralysis drop. * Ordered settings. * Implemented review suggestions.	2020-02-08 09:51:55 +01:00
DizzyEggg	834b7b52d3	Merge with master	2020-02-08 09:38:29 +01:00
GriffinR	27c4329e45	Use friendship event constants	2020-02-04 12:16:15 -06:00
DizzyEggg	39e3b0b740	Form changes layout and Stance Change Aegi	2019-12-31 19:11:53 +01:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
GriffinR	ddfa0c6298	Document Battle Tower scripts	2019-12-17 20:56:13 -05:00
DizzyEggg	b4ac979600	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-11-10 12:09:43 +01:00
DizzyEggg	ea6736cd8d	merge	2019-11-10 12:09:14 +01:00
Marcus Huderle	01e6fb6dd0	Document some battle_bg-related things	2019-11-07 18:24:04 -06:00
huderlem	a4b4ecd470	Merge pull request #787 from GriffinRichards/rename-tablecmds ... Rename table cmds	2019-11-04 16:31:27 -06:00
DizzyEggg	1d8cc9b741	Fix merge conflicts	2019-11-03 19:55:19 +01:00
GriffinR	27169f634b	Review changes for party menu doc	2019-10-31 21:33:01 -04:00
GriffinR	e01ec84837	Document party_menu second pass	2019-10-31 03:25:56 -04:00
GriffinR	6db014cc32	Document party_menu first pass	2019-10-25 15:41:06 -04:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
DizzyEggg	bae5d2038f	Update with master	2019-10-10 16:18:48 +02:00
GriffinR	2c062dc764	More trade documentation	2019-10-09 05:56:44 -04:00
PikalaxALT	7b8b5b5c8c	Merge branch 'master' into gflib	2019-09-27 09:11:22 -04:00
GriffinR	1016b23918	Merge branch 'master' into rename-tablecmds	2019-09-26 15:02:38 -04:00
GriffinR	b46c4b6703	more constant usage	2019-09-16 19:21:23 -05:00
PikalaxALT	306ce048ad	Move gflib srcs and headers to gflib subdir	2019-09-08 21:07:54 -04:00
PikalaxALT	1e1a4076f0	Merge pull request #798 from GriffinRichards/constants-baction ... Use misc battle constants	2019-09-05 09:06:31 -04:00
GriffinR	4a0cad80b0	Use B_SIDE constants ... Also includes a CHAR_X constant use for X items	2019-09-04 17:06:59 -04:00
GriffinR	5f457dd459	Use B_ACTION constants	2019-09-03 15:08:25 -04:00
GriffinR	5d30304f4e	Use OTID constants for CreateMon	2019-08-30 22:13:14 -05:00
DizzyEggg	f979987c2f	Fix Intimidate and Trace on new switch in system	2019-08-30 12:25:21 +02:00
DizzyEggg	63355d6a3b	Fix no targets issue and switching faint issu	2019-08-26 14:55:55 +02:00
GriffinR	869d0eebc0	Rename atk## constants and states	2019-08-23 08:46:21 -04:00
DizzyEggg	143cb7ad35	Updated switch mechanics	2019-08-22 15:57:33 +02:00
DizzyEggg	2863045241	Fix switch-in abilities text/pop-up	2019-08-05 11:24:49 +02:00
DizzyEggg	c219776034	Merge with master	2019-08-04 23:09:28 +02:00
PikalaxALT	20863ac85b	Resolve compile warnings in modern	2019-07-18 20:46:00 -04:00
DizzyEggg	d3d9051c4a	Allow evolution after exp from mon catching	2019-07-08 13:26:21 +02:00
DizzyEggg	e1ea4b62e9	Natural Gift	2019-05-20 12:03:00 +02:00
DizzyEggg	f22f7866ac	Merge with master, fix conficts	2019-05-17 09:52:20 +02:00