525 Commits

Author	SHA1	Message	Date
ExpoSeed	0912577ea1	Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo ... Implemented Wish Mega Evolution	2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone	e6f8d57f08	Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo ... # Conflicts: # include/constants/battle_string_ids.h	2020-11-10 17:28:17 -03:00
Evan	03f480fa17	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-11-08 15:21:48 -07:00
Evan	980f208b78	use NATIONAL_DEX_COUNT for critical capture odds	2020-11-08 14:07:43 -07:00
ultima-soul	99fdc13e61	Merge branch 'master' into battle_engine_sync	2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone	09a5d6c722	Implemented Wish Mega Evolution	2020-11-07 10:13:32 -03:00
Evan	b3d1e8b5b8	turn crit capture odds into a ratio	2020-11-03 08:57:11 -07:00
aaaaaa123456789	bacc831aa9	Re-apply joypad macros (minus merge conflicts)	2020-11-02 22:02:39 -03:00
Evan	e7372e7c5b	add B_ prefix to critical capture configs	2020-11-01 21:50:34 -07:00
Evan	a6c3d950f6	critical capture config option and catching charm	2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone	5a201f006f	More exp options in battle_config (#530) from MandL27	2020-11-01 19:41:29 -03:00
MandL27	5c6b8376fc	long equations on one line	2020-11-01 11:45:01 -05:00
aaaaaa123456789	1c3d75f673	Merge branch 'master' into reverts	2020-10-26 12:16:36 -03:00
Kurausukun	9ca406b15d	port Cmd_forcerandomswitch fakematch fix	2020-10-26 00:17:26 -04:00
MandL27	bc5ba41f80	Document sExperienceScalingFactors	2020-10-24 02:02:58 -04:00
Kurausukun	90211248af	re-match Cmd_unknown_24 (from #1140) ... changes to data structs are necessary. other things that look unnecessary, like the order of operands, are also necessary. fuck this function.	2020-10-23 20:47:10 -04:00
MandL27	9c574f3adb	Fixed some comparison operators	2020-10-23 19:49:27 -04:00
MandL27	f8dabc37ae	Use #if more often ... Avoided it on a couple lines to avoid splitting compound ifs.	2020-10-23 12:44:20 -04:00
ExpoSeed	34729ce99c	Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs ... More Battle Config options	2020-10-23 10:59:12 -05:00
Eduardo Quezada	d7c5ce3602	Idented battle_script_commands.c comments	2020-10-22 09:33:46 -03:00
MandL27	37aff56cc7	turns out gen 7 did indeed use a denominator of 5	2020-10-21 16:57:54 -04:00
MandL27	efdaa25640	Add B_SCALED_EXP and B_SPLIT_EXP	2020-10-21 16:19:07 -04:00
Eduardo Quezada	1bc38feca5	Fixed indentation for various files.	2020-10-19 18:01:19 -03:00
Eduardo Quezada	faca6c4867	Organized interface settings into their own category.	2020-10-17 14:31:58 -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
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	c1286c2fe2	Change according to feedback	2020-09-10 18:07:46 -04:00
PokeCodec	029db24adb	Make return	2020-09-10 09:32:36 -04:00
PokeCodec	56afdee7fc	Remove register variable mention	2020-09-09 14:43:41 -04:00
PokeCodec	a3a8c23e00	Match battle_script commands	2020-09-09 11:18:04 -04:00
PokeCodec	779764b70d	Fix Battle_Script_commands fakematch	2020-09-09 10:35:40 -04:00
DizzyEggg	97d0643110	Merge with master	2020-09-08 12:48:28 +02:00
PokeCodec	28ef2fb774	Switch to button macros	2020-09-04 21:11:55 -04:00
GriffinR	7c8bc0fbe3	Merge pull request #1149 from PokeCodec/datatypes ... gflib documenting	2020-09-01 14:25:21 -04:00
hondew	e46b35455d	Merge branch 'master' into pokeball-doc	2020-08-30 14:14:38 -04:00
hondew	328aecc96e	Document throwing pokeball ... continue Document more Doc more funcs Remove workspace Document shiny stars Document PokeBlock Clean up Clean more	2020-08-30 14:08:06 -04:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
PokeCodec	86a1e89879	Documentation of unk field	2020-08-23 21:34:31 -04:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
PokeCodec	e27975afaa	Match battle script commands by correcting a function and the pokemon struct	2020-08-18 22:05:01 -04:00
GriffinR	cc4255d4c0	Add some charmap constant usage	2020-08-11 00:23:28 -04:00
GriffinR	078c341b2b	Merge pull request #1122 from GriffinRichards/clean-battlemsg ... Add stat stage constants, clean up misc battle msg data	2020-08-10 14:29:27 -04:00
DizzyEggg	a42bd3f37d	Fix multiple turn moves staying after hitting no target	2020-08-05 12:35:51 +02:00
GriffinR	5e8ffff62f	Add stat stage constants	2020-08-04 20:38:57 -04:00
ExpoSeed	71dc5edf2e	Document some battle_util.c	2020-07-27 17:10:42 -05: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	759bde46bb	Cheek Pouch	2020-07-16 15:20:03 +02:00