818 Commits

Author	SHA1	Message	Date
Eduardo Quezada D'Ottone	292993e360	Merge pull request #1338 from ghoulslash/ripen ... Add Ripen and Finish Gen4 Berries	2021-03-13 11:16:42 -03:00
LOuroboros	68980cf18c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-03-10 03:58:21 -03:00
ExpoSeed	685c8283ed	Merge pull request #1411 from BuffelSaft/Batte_Engine_Only ... Fix Spiky Shield/Jump Kick freeze	2021-03-08 17:24:36 -06: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
ultima-soul	e5fa583a08	Merge pull request #1334 from ghoulslash/gen8_abilities ... More Gen 8 Abilities	2021-03-01 10:40:09 -08:00
Evan	6cb8c6309a	merge with be	2021-03-01 11:28:51 -07:00
Evan	55b8538f68	merge with be	2021-03-01 11:22:37 -07:00
BuffelSaft	2b90c0b945	Fix Spiky Shield/Jump Kick bug ... Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield.	2021-02-19 13:57:29 +13:00
LOuroboros	43d6340b92	Corrected the order of actions in BattleScript_FirstChargingTurn	2021-02-08 17:51:46 -03: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	f428e5e2dc	some quick claw/custap berry fixes	2021-01-31 23:31:27 -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
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	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	a49b5d1ad0	prankster updated to gen 7	2021-01-16 16:14:36 -07:00
Evan	0dabbc2d31	fix misty terrain check	2021-01-16 12:39:44 -07:00
Evan	c2dfc571b2	misty terrain blocks confusion	2021-01-16 12:21:04 -07:00
Evan	10b1d33d13	handle battler being affected by terrain	2021-01-16 12:05:51 -07:00
Evan	9e29d303ec	electric and misty terrain preventions	2021-01-16 11:40:02 -07:00
Evan	0d8f804194	update mental herb to gen 5	2021-01-15 18:11:55 -07:00
LOuroboros	c2f718d3d3	Implemented Cramorant's Gulp Missile form change	2021-01-14 17:23:09 -03:00
LOuroboros	c21c0f8c37	Fixed incorrect preprocessor directive in ASM file	2021-01-13 22:42:56 -03:00
Evan	d26605c9fe	fix bad bg fade if no permanent terrain	2021-01-13 16:01:47 -07: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
opakedragon	3ce4e6b24b	rename string id to reflect usage	2021-01-11 08:47:11 -05:00
Evan	1e22ae4cf2	merge with be	2021-01-10 09:08:25 -07:00
Evan	d4e4405cf5	merge with be	2021-01-10 09:04:21 -07:00
Evan	b5128be68b	eject packer invisible before openpartymenu	2021-01-08 08:02:00 -07:00
Evan	6dabff1ee3	merge with be	2021-01-07 21:24:21 -07:00
Evan	2bd5167a6c	eject pack	2021-01-07 21:11:56 -07:00
Evan	0118723a9c	add eject button	2021-01-07 20:31:27 -07:00
Evan	5eb49722c0	add red card effect	2021-01-07 19:33:39 -07:00
LOuroboros	8511ed57e4	Tweaked Steam Engine's battle string	2021-01-07 18:13:16 -03:00
LOuroboros	339aa95c1d	Review corrections ... -Intrepid Sword and Dauntless Shield are now properly affecting the user -Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.	2021-01-07 04:31:26 -03:00
Evan	7fffe23e63	add terrain seeds	2021-01-06 20:22:05 -07:00
Evan	c1dd3fca21	add room service	2021-01-06 18:00:14 -07:00
Evan	db6f9d05ec	add throat spray	2021-01-06 15:28:58 -07:00
Evan	c3615485f3	merge in berry branch	2021-01-06 12:54:02 -07:00
Evan	7646855e79	jaboca, rowap berry effects	2021-01-06 11:15:56 -07:00