2614 Commits

Author	SHA1	Message	Date
BuffelSaft	ef41a4c14d	Fix Jump Kick ... * Now inflicts recoil damage on the user if the target was immune to the attack * Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.	2020-12-06 16:14:02 +13:00
LOuroboros	42a06c6003	Fixed softlock caused by the majority of Techno Blast's animations ... And made the checks that sets its animation use the Type constants instead of their internal IDs.	2020-12-05 21:23:59 -03:00
LOuroboros	6a0fee9c56	Fixed Intrepid Sword and Dauntless Shield ... And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn	2020-12-05 14:03:13 -03:00
LOuroboros	002973d373	Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn ... This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.	2020-12-05 13:50:47 -03:00
LOuroboros	6bbd88049a	Ball Fetch tweaks	2020-12-05 03:03:55 -03:00
LOuroboros	e2f4ca27b0	BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn	2020-12-05 02:43:29 -03:00
ultima-soul	e05b5fc8a3	Merge pull request #1260 from ghoulslash/BE_test ... Fix Babydoll eyes animation	2020-12-04 15:46:17 -08:00
Evan	39cbc21925	fix trainer theft, update config option	2020-12-03 08:42:12 -05:00
LOuroboros	9e1d7cc827	Implemented Ball Fetch	2020-12-02 23:09:35 -03:00
LOuroboros	0c4c6fc778	Implemented Cotton Down	2020-12-02 22:53:00 -03:00
LOuroboros	e11fa09632	Implemented Intrepid Sword and Dauntless Shield and... ... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.	2020-12-02 19:07:08 -03:00
Evan	3102e499da	fix babydoll eyes anim priority	2020-12-02 14:23:03 -05:00
Evan	4ad5e368a9	fix merge conflicts	2020-12-01 17:57:57 -05:00
Evan	58a79a4f37	shorten between-turn infestation anim length	2020-12-01 17:52:44 -05:00
Evan	1e68c46890	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation	2020-12-01 17:51:38 -05:00
Evan	5478179464	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims	2020-12-01 17:46:26 -05:00
ExpoSeed	aa7facf57b	Merge pull request #1243 from ghoulslash/abilities ... Finish Switch In Ability Activation Messages	2020-11-28 20:27:32 -06:00
Evan	6c0878b5fe	infestation between turn anim	2020-11-24 17:21:59 -05:00
GriffinR	513c7c5f45	Clarify Kecleon objects	2020-11-23 14:42:47 -05:00
Eduardo Quezada D'Ottone	47fe30f0a1	Merge pull request #1246 from ExpoSeed/BE-patch ... Remove Techno Blast and Judgment from battle scripts	2020-11-20 20:49:38 -03:00
ExpoSeed	914c830616	Remove Techno Blast and Judgment from battle scripts	2020-11-19 21:21:34 -06:00
Evan	07a4400d50	finish switch in ability messages	2020-11-19 11:42:00 -07:00
Evan	1c398c3d4b	totem format fixes	2020-11-19 10:37:15 -07:00
Evan	99d9a36860	add totem boosts	2020-11-19 10:35:37 -07:00
Evan	c026f705b3	permanent terrain move bgs	2020-11-17 19:45:27 -07:00
Evan	479f6be51a	redo power trick anim	2020-11-17 15:31:18 -07:00
ghoulslash	686ff59b11	Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves ... LGPE & Isle of Armor move data.	2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone	f0154028ff	Review changes 2	2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone	e87f0f1ddb	Review changes	2020-11-13 14:51:50 -03:00
Evan	64bcac4589	move pickpocket to back of moveend sequence	2020-11-12 23:30:00 -07:00
Evan	e585be6f2e	format fix	2020-11-11 18:37:11 -07:00
Evan	520f00f4ae	add pickpocket	2020-11-11 18:08:46 -07:00
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	98d3427e62	Prevent Ability Popup overwrites #1218 from ghoulslash	2020-11-10 17:34:33 -03: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
LOuroboros	bb4f00737e	B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE	2020-11-10 14:26:47 -03:00
Evan	0683dc9c3f	longer ability popup delay to prevent overwriting	2020-11-10 10:05:11 -07:00
LOuroboros	a25190f357	A few things. ... -Introduced a Gen. 8 styled text string for Intimidate -Added an ability popup to BattleScript_IntimidatePrevented	2020-11-10 10:34:51 -03:00
LOuroboros	e179b9b5fe	Updated Intimidate to Gen. 8 standard	2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone	09a5d6c722	Implemented Wish Mega Evolution	2020-11-07 10:13:32 -03:00
LOuroboros	c66b77fbf8	Changed Hurricane's animation	2020-11-06 21:06:04 -03:00
Eduardo Quezada	b5834b617d	Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves ... # Conflicts: # src/data/text/move_descriptions.h	2020-10-24 00:36:29 -03:00
Eduardo Quezada D'Ottone	c783f789ed	Merge pull request #523 from LOuroboros/eerie_impulse ... Fixed Eerie Impulse's animation again	2020-10-20 18:52:36 -03:00
LOuroboros	22093e75fc	Fixed Electrify's animation again ... For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634	2020-10-20 10:30:32 -03:00
LOuroboros	ea54afbdc7	Fixed Eerie Impulse's animation again ... For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634	2020-10-20 10:15:49 -03:00
Eduardo Quezada	d0feac8fe4	Fix comment identation.	2020-10-19 17:48:27 -03:00
Eduardo Quezada	5f7c01bd41	Replaced spaces to tabs.	2020-10-19 11:58:19 -03:00
Eduardo Quezada	8f9659f846	Fixed Pika Papow's name.	2020-10-19 11:45:54 -03:00
Eduardo Alvaro Quezada D'Ottone	1df696c1fb	Merge pull request #17 from LOuroboros/move_updates ... Updated many moves' data to Gen. 8 standards	2020-10-15 20:56:58 -03:00
LOuroboros	fcc3c6c6ba	Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8	2020-10-15 04:21:40 -03:00
Eduardo Quezada	47259092e3	LGPE & Isle of Armor move data.	2020-10-14 21:50:22 -03:00
ExpoSeed	88b9847772	Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2	2020-10-12 12:42:37 -05:00
GriffinR	1472111c5d	Fix PutAwayDecorationLoop UB comment	2020-10-11 19:02:10 -04:00
ExpoSeed	9e2c8a95c1	Sync bev2 with pret	2020-10-11 01:01:47 -05:00
Eduardo Quezada	96e4b43ce5	Documenting where each of the berries are generated in new_game.inc	2020-10-03 21:52:09 -03:00
ExpoSeed	032669e2ab	Change script command table comment alignment from tabs to spaces	2020-09-25 14:05:17 -05:00
ExpoSeed	31d12383b1	Add byte comments to mystery event script command table	2020-09-25 13:27:15 -05:00
ExpoSeed	e7340ca0e1	Add byte comments to script command table	2020-09-25 13:25:36 -05:00
Eduardo Quezada	46ccb91155	Fixed "Ultra Rope" name.	2020-09-13 11:35:05 -03:00
GriffinR	921f389e4e	Fix Rusboro and Lavarige typos	2020-09-11 14:47:47 -04:00
DizzyEggg	97d0643110	Merge with master	2020-09-08 12:48:28 +02:00
PikalaxALT	135ed6a162	Merge pull request #1163 from GriffinRichards/doc-animthrow ... Minor battle_anim_throw cleanup	2020-09-04 19:44:33 -04:00
GriffinR	1264c4615a	Merge pull request #1158 from GriffinRichards/doc-cablecar ... Document cable car	2020-09-03 16:24:27 -04:00
GriffinR	4ad147f75d	Merge pull request #1156 from GriffinRichards/doc-rayscene ... Document Rayquaza cutscene	2020-09-01 14:46:14 -04:00
GriffinR	f5495d1220	Give proper names to underwater maps	2020-09-01 03:03:14 -04:00
GriffinR	bf61de01a7	Start documenting battle factory screen	2020-08-31 13:36:48 -04:00
GriffinR	5773bb8643	Merge pull request #1152 from GriffinRichards/doc-blender ... Document berry blender	2020-08-30 15:33:17 -04:00
GriffinR	afb3472282	Minor battle_anim_throw cleanup	2020-08-30 15:11:44 -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
GriffinR	08a8aad65a	Merge branch 'master' into doc-cablecar	2020-08-28 16:17:48 -04:00
GriffinR	0cfc279af5	Merge branch 'master' into doc-rayscene	2020-08-28 16:17:11 -04:00
GriffinR	c830731734	Merge branch 'master' into doc-blender	2020-08-28 16:16:00 -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
GriffinR	71a066f945	Document cable car	2020-08-28 03:54:04 -04:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
GriffinR	95ea0e92e7	Start documenting rayquaza_scene	2020-08-25 17:49:42 -04:00
GriffinR	0ff767a9b5	Start documenting berry blender	2020-08-22 19:39:39 -04:00
GriffinR	fbb70b3727	Document contest AI scripts	2020-08-21 14:57:17 -04:00
GriffinR	469ec5f248	Document contest AI commands	2020-08-21 02:36:48 -04:00
GriffinR	d356e35b64	Fix incorrect pike curtain SE names	2020-08-20 20:23:08 -04:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
GriffinR	6c34effda9	Merge pull request #1138 from GriffinRichards/doc-contest ... Document contest	2020-08-20 16:03:47 -04:00
LOuroboros	1b9aa1f023	Updated many moves' data to Gen. 8 standards	2020-08-20 15:44:58 -03:00
GriffinR	503dafd210	Fix wallys parents misnamed as uncle/aunt	2020-08-18 17:51:41 -04:00
GriffinR	3ba8cabd80	Fix Brenday typo	2020-08-18 15:56:44 -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	2749948eeb	Clean up contest doc	2020-08-16 05:52:17 -04:00
GriffinR	e98e4652fd	Document contest live updates	2020-08-16 05:18:09 -04:00
GriffinR	3779422489	Split contest funcs from script_pokemon_util	2020-08-13 17:42:12 -04:00
GriffinR	8b95e1964b	Merge pull request #1121 from GriffinRichards/doc-roulette ... Document roulette	2020-08-10 17:18:09 -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
GriffinR	5e8ffff62f	Add stat stage constants	2020-08-04 20:38:57 -04:00
GriffinR	22b5b6b074	Start documenting roulette	2020-07-30 19:37:16 -04:00
DizzyEggg	356216d15e	Mirror Shot improve animation	2020-07-27 22:11:52 +02:00
DizzyEggg	0066640a1e	Merge with master	2020-07-27 14:51:39 +02:00
DizzyEggg	3a220d0733	ai tweaks	2020-07-26 13:48:25 +02:00
GriffinR	aca50c87be	Continue new contest documentation	2020-07-24 00:14:53 -04:00
GriffinR	52a4428ba6	Begin new contest documentation	2020-07-23 17:55:40 -04:00
GriffinR	4a42e2a710	Merge branch 'master' into doc-overworld	2020-07-23 10:31:52 -04:00
PikalaxALT	2e077f09e4	Merge pull request #1111 from GriffinRichards/sync-flags ... Sync unused flags with pokeruby	2020-07-23 09:12:33 -04:00
PikalaxALT	5348674bc4	Merge pull request #1102 from GriffinRichards/doc-faraway ... Document faraway island	2020-07-23 09:12:19 -04:00
GriffinR	60ca1aa3fd	Restore tabs in field_effect_scripts.s	2020-07-23 05:07:20 -04:00
GriffinR	a4e47f1201	Clean some battle_message.c data	2020-07-23 05:01:42 -04:00
GriffinR	813f0c724f	Sync flags with pokeruby	2020-07-22 18:00:41 -04:00
GriffinR	33523d1b06	Comment gBattleAI_ScriptsTable with constants	2020-07-20 14:20:25 -04:00
GriffinR	a1cc7d2bd6	Document faraway island	2020-07-19 14:12:38 -04:00
GriffinR	af09e73d67	Merge branch 'master' into doc-overworld	2020-07-18 20:24:09 -04:00
GriffinR	1a27af8855	Merge pull request #1100 from GriffinRichards/clean-battlescrdata ... Misc battle and battle palace documentation	2020-07-18 20:22:44 -04:00
GriffinR	aba42513d3	Clean up some battle scr cmd data	2020-07-18 18:10:15 -04:00
GriffinR	96fd719a19	Merge pull request #1081 from GriffinRichards/add-localids ... Add local object event ids for referenced objects	2020-07-17 18:18:47 -04:00
DizzyEggg	759bde46bb	Cheek Pouch	2020-07-16 15:20:03 +02:00
DizzyEggg	ec4c73711e	Rest Sleep Talk wake up awaraness	2020-07-15 21:30:24 +02:00
DizzyEggg	1a94d27fe6	Emergency Exit	2020-07-15 17:21:12 +02:00
DizzyEggg	7cf5611c18	Double battle frost breath ai strat	2020-07-15 13:20:52 +02:00
GriffinR	e129d04b93	Merge branch 'master' into doc-overworld	2020-07-15 00:40:47 -04:00
ghoulslash	8f669bb57d	Add critical capture (#402) ... * add critical capture * synax and format fixes	2020-07-14 17:47:15 +02:00
DizzyEggg	4c3f40a361	Merge with master	2020-07-11 12:59:23 +02:00
GriffinR	ebb6c4ee66	Merge branch 'master' into doc-overworld	2020-07-08 15:51:58 -04:00
GriffinR	89bcf3cbd9	Merge branch 'master' into add-localids	2020-07-08 15:47:45 -04:00
GriffinR	431c60c92c	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti	2020-07-08 15:45:31 -04:00
DizzyEggg	c93ab64e46	UTurn Battle Arena no switchin	2020-07-08 17:38:28 +02:00
GriffinR	1ce929157f	Clean up field effect doc	2020-07-02 05:05:13 -04:00
GriffinR	eb80012757	Document more misc field effects	2020-06-29 16:32:46 -04:00
DizzyEggg	5a2d9fe9fe	Fix Grassy Terrain bad loop	2020-06-29 18:26:53 +02:00
DizzyEggg	5ddb4634f5	berries work like in gen4	2020-06-29 18:04:13 +02:00
GriffinR	4ea6992172	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
DizzyEggg	3bdf675221	Hopefully illusion works as intended now	2020-06-28 19:45:48 +02:00
Eduardo Alvaro Quezada D'Ottone	9fb073ca23	Some cleanup (#454) ... * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word.	2020-06-27 11:21:13 +02:00
DizzyEggg	3cf091d635	Improve animations of moves hitting all foes	2020-06-26 23:28:46 +02:00
DizzyEggg	db715335c3	Fix Gastro Acid animation	2020-06-26 22:20:00 +02:00
DizzyEggg	04833ef6cf	Purify works on steel types	2020-06-26 21:58:37 +02:00
DizzyEggg	5698af3742	Magic Guard leech seed and slight ai tweaks	2020-06-26 15:14:15 +02:00
DizzyEggg	219a43304a	Improve Electro Ball animation	2020-06-26 13:58:34 +02:00
DizzyEggg	548a43f8d9	Rocky Helmet before Knock Off	2020-06-25 16:15:11 +02:00
DizzyEggg	f252cd8003	Fix Terrain moves animations	2020-06-25 11:44:05 +02:00
GriffinR	a88676094b	Add missed deoxys rock local id	2020-06-23 15:51:23 -04:00
GriffinR	18d57a3802	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
GriffinR	fac6288156	Add local object event ids for referenced objects	2020-06-22 17:18:58 -04:00
DizzyEggg	d5ffdbf896	Focus Sash removed on use	2020-06-22 10:50:50 +02:00
DizzyEggg	8998e54ce7	Fix Heal Block Leech Seed	2020-06-22 10:40:08 +02:00
DizzyEggg	f2d2c1b76f	Merge pull request #438 from LOuroboros/effect_sleep_hit ... Implemented Relic Song's effect	2020-06-22 10:10:15 +02:00
DizzyEggg	56bd08e7fe	Merge pull request #436 from LOuroboros/techno_blast ... Fixed Techno Blast's animation	2020-06-22 10:08:50 +02:00
DizzyEggg	e449018b83	Merge pull request #425 from LOuroboros/eerie_impulse ... Fixed Eerie Impulse's animation	2020-06-22 10:08:20 +02:00
DizzyEggg	7821bd00e3	Merge pull request #429 from LOuroboros/revelation_dance ... Fixed Revelation Dance's animation	2020-06-22 10:07:54 +02:00
DizzyEggg	9741e026f5	Merge pull request #432 from LOuroboros/freeze_dry ... Fixed Freeze Dry's animation	2020-06-22 10:07:34 +02:00
DizzyEggg	d5213ad9ec	Merge pull request #435 from LOuroboros/blue_flare ... Fixed Blue Flare's animation	2020-06-22 10:07:11 +02:00
DizzyEggg	a78deb85e2	Merge pull request #430 from LOuroboros/trop_kick ... Fixed Trop Kick's animation	2020-06-22 10:06:49 +02:00
DizzyEggg	8a22d9180c	Merge pull request #437 from LOuroboros/night_daze ... Fixed Night Daze's animation	2020-06-22 10:06:16 +02:00
DizzyEggg	fde2c25b3f	Merge pull request #434 from LOuroboros/freeze_shock ... Fixed Freeze Shock	2020-06-22 10:04:43 +02:00
DizzyEggg	ba61970edb	Merge pull request #431 from LOuroboros/electrify ... Fixed Electrify	2020-06-22 10:03:49 +02:00
DizzyEggg	d0617e0270	Merge pull request #426 from LOuroboros/dragon_hammer ... Fixed Dragon Hammer's animation	2020-06-22 10:01:19 +02:00
GriffinR	24569583e4	Document contest results	2020-06-18 17:50:13 -04:00
GriffinR	76f6d05173	Document confetti	2020-06-17 03:39:03 -04:00
LOuroboros	33a45ba181	Implemented Relic Song's effect	2020-06-16 07:06:38 -03:00
LOuroboros	8d6a602970	Fixed Night Daze's animation	2020-06-16 04:30:53 -03:00
LOuroboros	dca5016d8e	Fixed Techno Blast's animation	2020-06-16 04:28:04 -03:00
LOuroboros	3cf073b614	Fixed Blue Flare's animation	2020-06-16 04:22:31 -03:00
LOuroboros	5f763a8380	Fixed Freeze Shock's 1st turn battle string	2020-06-16 04:11:37 -03:00
LOuroboros	575c5a5882	Fixed Freeze Shock's 2nd turn animation	2020-06-16 04:11:09 -03:00
LOuroboros	bef8a701fc	Fixed Freeze Dry's animation	2020-06-16 03:32:41 -03:00
LOuroboros	abd1288268	Fixed Electrify's animation	2020-06-16 03:06:32 -03:00
LOuroboros	6abfac2c65	Fixed Trop Kick's animation	2020-06-16 00:17:40 -03:00
LOuroboros	da4fba6d41	Fixed Revelation Dance's animation	2020-06-16 00:01:06 -03:00
LOuroboros	5013a04ba3	Fixed Diamond Storm's animation	2020-06-15 23:25:35 -03:00
LOuroboros	f7c6729b75	Fixed Dragon Hammer's animation	2020-06-15 22:46:22 -03:00
LOuroboros	ed7675b11b	Fixed Eerie Impulse's animation	2020-06-15 21:41:43 -03:00
GriffinR	2859900ea9	Second pass on documenting union room	2020-06-10 17:30:59 -04:00
GriffinR	3f97763181	Document cable_club.c	2020-06-06 16:10:03 -04:00
GriffinR	fd77eb1eb9	Document wireless_communication_status_screen.c	2020-06-03 14:07:40 -04:00
Evan	5d232c34fe	fix a bunch of anims	2020-05-29 11:15:00 -06:00
DizzyEggg	19699bee23	Merge pull request #390 from ghoulslash/battle_engine ... add animations for all moves	2020-05-29 12:53:17 +02:00
DizzyEggg	013f9b6a17	merge wiith masteer and summary screen change	2020-05-29 12:50:54 +02:00
Evan	fdc6e80e1e	fix anim defines	2020-05-28 12:19:07 -06:00
Eduardo Alvaro Quezada D'Ottone	8d848997c9	Battle Configs: The Revenge (#363) ... * Turns for Uproar * Chances for the amount of hits with multi-hit moves. * Electric type mon's immunity to paralysis * (Hi) Jump Kick to always do 1/2 of maxHP when crashing * Turns for Disable. * Minimized mons can always be hit by moves like Stomp * Grass types immune to powder and spore moves. * Psywave's damage formula * Fixed random usage.	2020-05-28 10:38:27 +02:00
DizzyEggg	0f6b83f286	Entry hazards on 1 poke ai	2020-05-27 12:09:14 +02:00
Jaizu	a90b624c23	Fix Nasty Plot move animation (#392) ... Fixes #391	2020-05-26 17:28:55 +02:00
Evan	6c20a49dc6	animations for all moves	2020-05-25 00:37:32 -06:00
Philipp AUER	f1f4000914	anim: add some animation moves (#383) ... - fell stinger - draining kiss - kings shield (==protect) - scald - fire pledge - water pledge - grass pledge Co-authored-by: SBird <sbird@no.tld>	2020-05-24 18:14:59 +02:00
ghoulslash	13cf2cb217	Animation Particles, BGs, and gen 4 anims (#384) ... * undo some revert(?) * cfru particles and bgs * remove commented out particles	2020-05-24 18:13:40 +02:00
GriffinR	f9e6f7540f	Use fixed point macros for math util	2020-05-24 08:28:02 -05:00
DizzyEggg	f5b55ddff2	Vacuum wave	2020-05-24 11:04:29 +02:00
DizzyEggg	cfc1ea7db2	Storm Drain Ai fix	2020-05-24 10:40:14 +02:00
DizzyEggg	675ed1c610	Fix rooms ai	2020-05-24 10:38:22 +02:00
DizzyEggg	4fc88d18aa	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-04-29 09:17:25 +02:00
GriffinR	cb5b8da77b	More trainer type usage	2020-04-28 19:59:08 -05:00
GriffinR	e5757a3def	Use trainer type constants	2020-04-28 19:59:08 -05:00
GriffinR	ecd4824f67	Index heal location data, use better names	2020-04-28 19:59:08 -05:00
GriffinR	b1d26e10a8	Sync map header property names with pokefirered	2020-04-28 19:59:08 -05:00
DizzyEggg	ee68f0f826	Fix switch-in abilities when shift style switch	2020-04-25 11:17:59 +02:00
DizzyEggg	738d92e39d	Infiltrator affects mist safeguard	2020-04-23 11:29:19 +02:00
DizzyEggg	40ce053ce1	Adrenaline Orb	2020-04-22 15:12:25 +02:00
DizzyEggg	d56aaf7c0b	Destiny Knot	2020-04-22 14:40:44 +02:00
DizzyEggg	c8ba013539	Power Herb	2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone	c5a6acc7db	Corrosion (#306) ... * Status move poisoning for Steel and Poison types. * Can poison itself with Toxic Orb. * Secondary effect poisoning now working. * Created a function that checks if abilities can bypass type immunities. * Created macro to handle typeimmunity * Applied review changes. * Applied review requests. * Left more readable version of HOLD_EFFECT_TOXIC_ORB.	2020-04-21 15:59:19 +02:00
DizzyEggg	328e951afa	Ally Switch, tbd	2020-04-20 20:05:04 +02:00
DizzyEggg	0f628c8ff2	Fairy Lock	2020-04-20 19:41:07 +02:00
DizzyEggg	2daf1fbbf8	Geomancy	2020-04-20 19:02:03 +02:00
DizzyEggg	9c44adba98	Low Sweep anim	2020-04-20 15:04:04 +02:00
DizzyEggg	33442c3f91	Fix Rock Polish anim sfx	2020-04-20 15:01:57 +02:00
DizzyEggg	5d412d37d8	More Ai tweaks	2020-04-20 14:47:00 +02:00
DizzyEggg	3dfd19b3e2	AI Weather moves tweaks	2020-04-20 13:00:04 +02:00
DizzyEggg	28805b0f98	AI powder moves	2020-04-20 12:14:56 +02:00
DizzyEggg	5486b33784	AI hwords alignment	2020-04-20 11:51:32 +02:00
DizzyEggg	d38e0d8ae5	AI dont rely on power if bad effects	2020-04-20 11:27:09 +02:00
DizzyEggg	dd17360ab0	Zen Mode and Shields Down	2020-04-19 21:18:39 +02:00
DizzyEggg	ad481c8688	Moody	2020-04-19 15:44:44 +02:00
DizzyEggg	6a3944d27c	Frisk, would be easier if it didnt scan 2 opponents	2020-04-19 13:37:56 +02:00
DizzyEggg	e62f1475d4	Beast Boost and Receiver	2020-04-19 12:07:56 +02:00
DizzyEggg	e42ead10c9	Soul Heart	2020-04-18 19:59:09 +02:00
DizzyEggg	cbc0d8a57d	Healer	2020-04-18 19:09:17 +02:00
DizzyEggg	7178ea6b46	Shore Up	2020-04-18 18:34:18 +02:00
DizzyEggg	093eca07b3	Volt Switch UTurn anim fix when cant switch out	2020-04-18 18:04:20 +02:00
DizzyEggg	1395a7d382	Loafing Around bug fix	2020-04-18 13:04:28 +02:00
DizzyEggg	a2813e63de	Slow Start	2020-04-18 12:52:15 +02:00
DizzyEggg	bc86292c93	Psycho Cut fix, small AI tweak	2020-04-18 12:19:07 +02:00
DizzyEggg	34f5d9e2ae	Burn Up And Purify	2020-04-17 21:14:26 +02:00
DizzyEggg	01b6b63e99	Some more move animations. Thanks Doesnt	2020-04-17 17:44:28 +02:00
DizzyEggg	90486324c6	Animation for Tupsy Toruvy	2020-04-16 16:52:25 +02:00
DizzyEggg	e00b76b8da	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-04-15 13:31:52 +02:00
Eduardo Alvaro Quezada D'Ottone	2b9eb00486	Mind blown (#302) ... * Mind Blown Part 1 (Definition and self-damage) * Mind Blown Part 2 (Damp interaction)	2020-04-14 09:27:29 +02:00
DizzyEggg	51e1639513	Magic Guard protects from stuff	2020-04-13 15:49:40 +02:00
DizzyEggg	cb5b673f8a	Big Root and STRENGTH Sap	2020-04-13 15:00:17 +02:00
GriffinR	dde4a0416c	Label GCN link flags field	2020-04-13 08:42:31 -04:00
GriffinR	d478156ad9	Split stormy_water png for kyogre/groudon	2020-04-12 13:04:05 -04:00
DizzyEggg	060b795d8e	Merge with master	2020-04-11 19:48:24 +02:00
Eduardo Alvaro Quezada D'Ottone	6078cd3e15	Anticipation ability (#282)	2020-04-11 12:24:25 +02:00
DizzyEggg	6daab7a5c9	Fix Damp loop	2020-04-11 12:02:51 +02:00
DizzyEggg	1435cd4692	Change inner structure of semi invulerable moves	2020-04-11 11:47:13 +02:00
GriffinR	097ddb0677	Re-export tileset anim pngs to use palettes	2020-04-02 11:18:47 -04:00
GriffinR	8e4b987699	Revert more porymap-breaking changes	2020-03-18 03:22:07 -04:00
PikalaxALT	784e29352d	Merge pull request #985 from mrgriffin/decoration ... Document decoration.c	2020-03-17 10:39:37 -04:00
PikalaxALT	7a059c75a6	Merge pull request #968 from GriffinRichards/doc-regionmap ... Document some pokenav and region map	2020-03-17 10:38:20 -04:00
DizzyEggg	efe17d995c	Fix Healing Wish	2020-03-14 12:31:42 +01:00
DizzyEggg	cf4d5f6e59	Merge with master	2020-03-13 23:02:17 +01:00
garakmon	b1dd945cbf	move fonts from data/graphics/ to graphics/	2020-03-12 13:40:00 -04:00
DizzyEggg	5db3449b50	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-03-06 11:40:41 +01:00
Martin Griffin	4485d51522	Document decoration.c	2020-03-06 09:47:20 +00:00
PikalaxALT	9259b378ef	Merge pull request #991 from GriffinRichards/fix-eventticket ... Clarify event ticket flag names	2020-03-03 16:15:27 -05:00
GriffinR	b6c9ad505d	Minor fixes in trainer_battle.inc	2020-03-03 14:47:14 -05:00
GriffinR	4637085390	Clarify event ticket flag names	2020-03-03 01:36:20 -05:00
GriffinR	53724e2b43	Delete asm siirtc data	2020-03-01 00:35:42 -05:00
DizzyEggg	6968124529	Merge battle anim documentation	2020-02-29 13:59:41 +01:00
Eduardo Alvaro Quezada D'Ottone	147f954ab5	Fixed Damp ability popup (#295)	2020-02-29 09:45:37 +01:00
GriffinR	51cd0ac081	Rename battle anim type files, remove unneeded ARG_RET_IDs	2020-02-25 12:54:08 -06:00
GriffinR	dc3c2b72f2	Clean up move anim doc	2020-02-25 12:54:08 -06:00
GriffinR	68dc68907b	Label move anim data	2020-02-25 12:54:08 -06:00
GriffinR	efd53d080c	Clean up battle anim C for doc	2020-02-25 12:54:08 -06:00
GriffinR	afa1ae2209	Finish documenting move anim scripts	2020-02-25 12:54:08 -06:00
GriffinR	e633b57593	Document remaining status/general/special anims	2020-02-25 12:54:08 -06:00
GriffinR	208057d7ae	Document move anims S-Z	2020-02-25 12:54:08 -06:00
GriffinR	0d651c7c9e	Some battle anim review changes	2020-02-25 12:54:08 -06:00
GriffinR	1ba12dc050	Document move anims I-S	2020-02-25 12:54:08 -06:00
GriffinR	501d0d3c18	Document move anims C-H	2020-02-25 12:54:08 -06:00
GriffinR	6eb44dc507	Document move anims A-C	2020-02-25 12:54:08 -06:00
DizzyEggg	108f6b711f	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-02-23 10:58:26 +01:00
DizzyEggg	3ce29d0559	Fix AI Volt Absorb	2020-02-22 20:07:51 +01:00
DizzyEggg	da965700ff	Draining abilities have the pop-up appear now	2020-02-22 19:25:35 +01:00
GriffinR	3456578c0f	Move berry crush data to src	2020-02-17 13:10:23 -06:00
DizzyEggg	e64b810463	Fix Dragon Pulse and Shadow Force animations	2020-02-17 10:55:55 +01:00
DizzyEggg	7c81accf7b	Switch-in abilities for megas	2020-02-16 13:34:25 +01:00
LOuroboros	0bccf91f1a	Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273)	2020-02-16 13:14:18 +01:00
GriffinR	ac1738e11d	Move smokescreen data to src	2020-02-13 14:48:19 -06:00
GriffinR	d11cd5d217	Move text input strings to src	2020-02-13 14:48:19 -06:00
GriffinR	956090b05f	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-02-12 13:05:57 -05:00
GriffinR	eaf508ba5e	Resolve missing parens errors	2020-02-12 00:44:09 -05:00
GriffinR	689acd3613	Move slot machine data to src	2020-02-09 14:11:50 -06:00
GriffinR	43ec11b92a	Move berry powder data to src	2020-02-08 14:22:53 -06:00
GriffinR	d1035f027e	Move contest_link_80F57C4 data to src	2020-02-08 14:22:53 -06:00
GriffinR	85dc8a528c	Move rotating tile puzzle data to src	2020-02-08 14:22:53 -06:00
Eduardo Alvaro Quezada D'Ottone	33e8e20118	Disguise ability (#258) ... * Protection from attacks. * Changes form when Busting Disguise. * Ability changing moves set to fail. - Simple Beam and Worry Seed now fail if the target has Disguise. - Role Play and Skill Swap now fail if either the attacker or the target have Disguise. * Disguise no longer triggers when transformed. * Mimikyu reverts to Disguised * No longer blocks from entry hazards and weather. * Applied review changes * Oops, new line * yeah	2020-02-08 19:29:51 +01:00
DizzyEggg	97eaf8b559	Fix Shadow Claw anim	2020-02-08 12:22:10 +01:00
DizzyEggg	e7d5ebb3b6	Make Charge raise sp.def	2020-02-08 11:55:16 +01:00
LOuroboros	6d39eb8826	Fixed Charge Beam's animation. (#252)	2020-02-08 11:41:44 +01:00
GriffinR	86354f1d50	Document some pokenav and region map	2020-02-05 21:04:43 -05:00
DizzyEggg	8889039a57	Merge with master	2020-01-31 21:15:08 +01:00
GriffinR	9c934c9664	Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers	2020-01-26 12:23:08 -05:00
GriffinR	6f392632c2	Note AI weather bug	2020-01-22 18:05:42 -05:00
GriffinR	4c12ad00d2	Merge branch 'master' into fix-eventobj	2020-01-19 21:57:29 -05:00
DizzyEggg	4a5a84e5c7	Facade AI fix; AI uses fake out more often	2020-01-19 11:07:09 +01:00
DizzyEggg	a6bf183653	Fix Aegi ability pop up sliding	2020-01-18 20:33:46 +01:00
DizzyEggg	1d13004a0b	Fix Power Gem anim	2020-01-18 20:28:36 +01:00
DizzyEggg	5c486c15dd	Fix Moxie battler	2020-01-18 19:40:49 +01:00
DizzyEggg	06a9165f75	Fix Ice Body not working	2020-01-18 19:18:57 +01:00
DizzyEggg	d8aab3d112	Merge with master	2020-01-18 18:17:25 +01:00
jiangzhengwenjz	aa631825fc	resolve data sections	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	8a5f292618	document symbols	2020-01-16 08:14:27 -06:00
GriffinR	ea8b1011d3	Merge master into fix-eventobj	2020-01-15 16:11:20 -05:00
GriffinR	22931846d6	Fix Colosseum name porymap issue	2020-01-13 20:20:48 -06:00
GriffinR	e92cc7752b	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-01-13 20:41:57 -05:00
huderlem	6d6c57f383	Merge pull request #953 from GriffinRichards/sync-script ... Port some macro/script fixes from pokefirered	2020-01-13 19:33:47 -06:00
GriffinR	96720db083	Remove unnecessary removeitem arguments	2020-01-12 23:29:19 -05:00
GriffinR	c19289596d	Give/Take to Add/Remove for silent script macros	2020-01-12 23:24:52 -05:00
GriffinR	655910a16f	Merge branch 'master' into fix-eventobj	2020-01-12 22:42:43 -05:00
huderlem	fa5816915d	Merge pull request #949 from GriffinRichards/doc-dome ... Document Battle Dome and add facility party constants	2020-01-12 20:10:03 -06:00
GriffinR	10220d3b76	Label TryRecordMixLinkup	2020-01-12 19:39:30 -06:00
GriffinR	e736c2d2fd	Document some easy chat specials	2020-01-12 19:39:30 -06:00
GriffinR	c27a4778ee	Standardize prebattle -> intro	2020-01-12 19:39:30 -06:00
GriffinR	6a470ddfda	Some script clean up, document secret base secrets show	2020-01-12 19:39:30 -06:00
GriffinR	e497fc64e3	if_undefeated macro to if_not_defeated	2020-01-12 20:20:02 -05:00
GriffinR	f2e7b1507e	Port some macro/script fixes from pokefirered	2020-01-11 14:12:31 -05:00
GriffinR	635267ce32	Merge branch 'master' into fix-eventobj	2020-01-08 05:51:49 -05:00
GriffinR	ef67f2d33b	Merge master into ObjEvent rename and prune accidental inclusions	2020-01-08 05:43:06 -05:00
GriffinR	e5df61e362	Merge branch 'master' into doc-dome	2020-01-08 01:15:36 -05:00
GriffinR	fb5bea98ce	More battle_dome.c doc	2020-01-07 22:30:37 -05:00
DizzyEggg	952bdbd9f5	Steadfast string fix	2020-01-04 18:41:59 +01:00
DizzyEggg	d21449e19c	Fix Lava Plume animation in double battles	2020-01-01 10:57:27 +01:00
DizzyEggg	39e3b0b740	Form changes layout and Stance Change Aegi	2019-12-31 19:11:53 +01:00
DizzyEggg	b15f0b3bb3	Comatose	2019-12-31 16:36:53 +01:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
huderlem	3b05398975	Merge pull request #945 from Fontbane/patch-5 ... Give rival and Maxie parties better names	2019-12-28 12:06:35 -06:00
GriffinR	3efc8199d4	More battle_dome.c documentation	2019-12-25 22:27:33 -08:00
Fontbane	31b4656324	Labels better	2019-12-25 22:39:06 -05:00
huderlem	ee61726136	Merge pull request #936 from GriffinRichards/doc-tower ... Document Battle Tower scripts	2019-12-25 11:39:20 -06:00
DizzyEggg	eb029d557b	Merge pull request #215 from LOuroboros/aftermath ... Implemented Aftermath's effect	2019-12-25 12:04:09 +01:00
LOuroboros	3367bdaf51	Made Aftermath trigger the Ability Pop Up sign	2019-12-23 14:17:54 -03:00
DizzyEggg	308e1594c9	Merge pull request #212 from Fontbane/gooey ... Queenly Majesty, Big Pecks, Gooey and Tangling Hair	2019-12-23 17:23:33 +01:00
DizzyEggg	e4a9a228c5	Merge pull request #210 from ultima-soul/battle_engine ... Implement Leaf Guard.	2019-12-23 17:15:51 +01:00
DizzyEggg	9e3d5672e6	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-12-23 16:40:21 +01:00
GriffinR	68cdd7b1cb	Merge master into ObjEvent rename	2019-12-21 05:19:27 -05:00
LOuroboros	c690d577a5	Implemented Aftermath's effect	2019-12-21 05:01:42 -03:00
Diegoisawesome	026e1108b2	Merge pull request #935 from GriffinRichards/doc-warp ... Document some warp/field screen effect	2019-12-20 23:44:56 -08:00
GriffinR	ff2d8a9c4e	Add frontier trainer constants	2019-12-20 21:14:05 -05:00
GriffinR	63c8cf97d1	Document Battle Dome scripts and some battle_dome.c	2019-12-20 16:53:33 -05:00
Fontbane	2fb6ea4fc4	Big Pecks	2019-12-19 14:01:46 -05:00
GriffinR	9e08cfe55f	Remove uses of compare_var_to	2019-12-18 19:22:39 -05:00
ultima-soul	df95c4801a	Spaces to tabs	2019-12-18 13:03:01 -08:00
GriffinR	949509aade	Merge branch 'master' into fix-eventobj	2019-12-18 13:16:38 -05:00
GriffinR	23f952b34e	Merge master into doc-tower	2019-12-17 21:17:46 -05:00
GriffinR	ddfa0c6298	Document Battle Tower scripts	2019-12-17 20:56:13 -05:00
GriffinR	4879c1eab2	Merge branch 'master' into constants-fade	2019-12-17 19:11:51 -05:00
huderlem	edb5df1716	Merge pull request #933 from GriffinRichards/doc-tents ... Document Battle Tent scripts	2019-12-17 18:09:49 -06:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
ultima-soul	029ab67ff4	Implement Leaf Guard.	2019-12-16 00:29:20 -08:00
GriffinR	db8a5c6c2b	Merge branch 'master' into fix-eventobj	2019-12-15 11:47:27 -05:00
GriffinR	96ec5e1b84	Use fadescreen constants	2019-12-15 11:42:50 -05:00
huderlem	fee36224ed	Merge pull request #925 from GriffinRichards/doc-matchcall ... Document some pokenav match call	2019-12-15 09:42:13 -06:00
GriffinR	82f55f2381	Merge master into ObjEvent rename	2019-12-15 02:00:00 -05:00
GriffinR	97b5560bdb	Document Battle Tent scripts	2019-12-15 01:47:01 -05:00
GriffinR	6967caefb2	Split finditem_std from giveitem_std	2019-12-14 08:41:46 -06:00
GriffinR	75b0c9d7a9	Document Battle Pyramid scripts	2019-12-14 08:38:26 -06:00
GriffinR	aa72c0ada3	Document Battle Factory scripts	2019-12-14 08:32:32 -06:00
GriffinR	6556b556dd	Merge branch 'master' into fix-eventobj	2019-12-11 01:09:06 -05:00
GriffinR	47b0d8a597	Merge branch 'master' into doc-matchcall	2019-12-10 20:43:27 -05:00
GriffinR	49f1a90534	Document Battle Pike scripts	2019-12-10 19:31:27 -06:00
GriffinR	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -06:00
GriffinR	fe16452999	Typo fix	2019-12-10 19:28:16 -06:00
GriffinR	fcd8d37d62	Document Battle Palace scripts	2019-12-10 19:28:16 -06:00
Exory	7e6f34777b	Don't burn the opponent if it has Flare Boost.	2019-12-10 22:29:20 +01:00
Exory	3c7e60a441	Don't use Toxic if opponent has Toxic Boost.	2019-12-10 22:01:20 +01:00