484 Commits

Author	SHA1	Message	Date
Sewef	fd55a0d015	Update src/battle_message.c ... Nothing happened. Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-06-17 14:12:06 +02:00
Sewef	d02be421bc	Fix sATypeMove_Table definition	2021-06-17 14:06:40 +02:00
Xhyzi	c2bd046ea6	Shell Trap	2021-06-15 20:22:50 +02:00
Xhyzi	155e9b6332	Court Change	2021-06-15 20:14:10 +02:00
Xhyzi	0202b75822	Beak Blast	2021-06-15 19:57:21 +02:00
Xhyzi	7799e49e3a	Corrosive Gas	2021-06-15 19:45:24 +02:00
Xhyzi	ee3f3eb78f	Meteor Beam	2021-06-15 17:06:21 +02:00
Xhyzi	5a094a3033	Snap Trap	2021-06-15 16:22:42 +02:00
ExpoSeed	c8fc141287	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-06-10 11:54:20 -05:00
DizzyEggg	540719c483	Add support for only one enemy pokemon in double battles start	2021-06-08 22:50:37 +02:00
DizzyEggg	4b29ae39ad	Allow one mon double battles	2021-06-08 16:40:47 +02:00
ultima-soul	092f02f119	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-06-07 12:00:23 -07:00
MissingNoL	bfc66a21cc	gBattlescriptCurrInstr[3] is not reading species parameter	2021-06-06 19:14:11 -07:00
AJ Fontaine	2fe7184d10	Rename sText_WildPkmnAppeared2 to reflect its use ... sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.	2021-06-04 22:32:33 -04:00
LOuroboros	b552db7193	Tweaked the Oblivious immunities ... Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.	2021-06-04 19:23:07 -03:00
ghoulslash	c356ffaed4	merge with be. fix null ptr check in GetBattleMoveSplit	2021-05-24 10:46:53 -06:00
Flametix	a8fab62c89	Fix Substitute typo	2021-05-06 20:49:04 -04:00
ultima-soul	e864c39a5d	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-05-04 10:04:35 -07:00
ghoulslash	afea2cf5fa	Merge pull request #1482 from BuffelSaft/room_moves_text ... Fix Wonder Room, Magic Room battle messages	2021-05-04 09:32:37 -06:00
BuffelSaft	ec4012e95d	Fix "Room" move battle messages ... Move new line so these messages fit in the text box.	2021-05-04 23:57:43 +12:00
ultima-soul	14a0303e2f	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-27 18:36:37 -07:00
GriffinR	f6016838b1	Merge pull request #1397 from GriffinRichards/doc-moremisc ... Clean up battle scripts	2021-04-10 12:41:35 -04:00
Kurausukun	3e725272fc	standardize "grey" to "gray"	2021-04-09 22:39:34 -04:00
GriffinR	f4d8a91ba4	Misc battle script cleanup	2021-04-03 14:07:31 -04:00
GriffinR	9ea9ffde09	Add remaining multistring chooser constants	2021-04-03 11:49:06 -04:00
ghoulslash	d89e2c1775	merge with be	2021-04-02 08:55:54 -06:00
GriffinR	c9d3b26ff7	Label miss string indexes	2021-04-02 02:12:46 -04:00
ultima-soul	5bab9474dc	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-03-22 23:08:19 -07:00
ghoulslash	f83e8b4f94	Update src/battle_message.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 10:48:17 -07:00
Evan	2ccdf1d89e	merge with be. magic guard checks	2021-03-03 09:21:06 -07:00
Evan	b130396c0e	merge with be	2021-03-01 17:05:10 -07:00
Evan	6cb8c6309a	merge with be	2021-03-01 11:28:51 -07:00
GriffinR	0851c34bac	Add berry tree id constants	2021-02-05 15:25:12 -05: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	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
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
Evan	0d8f804194	update mental herb to gen 5	2021-01-15 18:11:55 -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
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
ghoulslash	fba17a96a4	Merge pull request #1253 from surskitty/battle_engine ... Increase readability of too-long names	2021-01-12 09:20:53 -07:00
GriffinR	a733b211a3	Merge pull request #1297 from SatoMew/master ... Document the unused battle strings for downpour weather	2021-01-11 10:01:57 -05:00
opakedragon	295ec313f5	rename string id/variable to reflect usage	2021-01-11 08:49:31 -05:00