2344 Commits

Author	SHA1	Message	Date
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	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
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	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