657 Commits

Author	SHA1	Message	Date
ghoulslash	a595b213b4	merge with be	2021-03-28 17:29:22 -06:00
ultima-soul	7abfe7469a	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-03-23 18:41:53 -07:00
ultima-soul	56a1cab314	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-03-23 15:21:19 -07:00
ultima-soul	5bab9474dc	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-03-22 23:08:19 -07:00
PikalaxALT	925e68c03f	Update newly named fields	2021-03-15 15:22:41 -04:00
PikalaxALT	8d4dcb228a	More documentation in battle_main	2021-03-12 16:55:58 -05:00
PikalaxALT	e32a1571af	Resolve link comm buffers in gBattleStruct	2021-03-12 15:37:31 -05:00
PikalaxALT	e6b1b97aa1	Nonmatching resoltuion ... - Fix fakematch in Cmd_get_used_held_item - Remove `static` overrides in MODERN in four objects	2021-03-12 13:55:07 -05:00
GriffinR	55a40b901f	Label battle tower link script	2021-03-04 19:30:19 -06:00
Evan	2ccdf1d89e	merge with be. magic guard checks	2021-03-03 09:21:06 -07:00
ghoulslash	bcb6fe154b	Update src/battle_main.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 09:14:00 -07:00
Evan	b130396c0e	merge with be	2021-03-01 17:05:10 -07:00
Evan	55b8538f68	merge with be	2021-03-01 11:22:37 -07:00
ultima-soul	ef054c5d48	Merge pull request #1342 from ghoulslash/fixes ... Magic Room Affects Macho Brace/Power Item Speed Drop	2021-03-01 08:50:59 -08:00
GriffinR	b71b10623b	Add palette selection constants	2021-02-24 11:03:51 -05: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
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
Evan	0483114a05	merge and some fixes	2021-02-02 11:45:15 -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
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
Evan	c009b51ae8	add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot	2021-01-28 13:27:00 -07: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
Evan	4611c71bd1	merge with be	2021-01-21 08:55:14 -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
Evan	6b59a9ac01	add ai info debug option	2021-01-19 12:58:58 -07:00
GriffinR	bc20fda604	Use GET_UNOWN_LETTER macro	2021-01-19 04:03:16 -05:00
Evan	9902f6e603	merge with be	2021-01-13 14:32:14 -07:00
Evan	8ef6a2c80d	merge with be	2021-01-13 14:23:30 -07:00
GriffinR	b9e1b050e1	Label remaining battle types	2021-01-13 15:20:29 -05:00
Evan	56395a060f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-13 09:23:07 -07:00
ultima-soul	3cb09b6507	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal	2021-01-11 15:19:11 -08:00
Evan	8bad377a2e	magic room affects macho brace/power item speed drop	2021-01-10 16:57:27 -07:00
Evan	1e22ae4cf2	merge with be	2021-01-10 09:08:25 -07:00
Evan	e748db8ef4	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-10 08:58:16 -07:00
Evan	6dabff1ee3	merge with be	2021-01-07 21:24:21 -07:00
Evan	5eb49722c0	add red card effect	2021-01-07 19:33:39 -07:00
SphericalIce	3c2a33b9b2	Use constants for max IVs & the random IV generation flag	2021-01-07 22:13:14 +00:00
ultima-soul	d2d961e447	Merge pull request #1262 from LOuroboros/gen8_abilities_BE ... Implemented various Gen. 8 abilities	2021-01-07 13:31:17 -08:00
Evan	f2e486eb0d	custap berry effect, custap/quick claw activation message	2021-01-06 09:37:31 -07:00
ExpoSeed	7dadcb94b8	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-03 17:14:43 -06:00
ExpoSeed	10f4b48215	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-01 14:14:51 -08:00
ExpoSeed	208e0abe04	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2020-12-31 18:44:43 -06:00