7285 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Evan	25abdeacc5	tidy up z move code	2020-12-01 16:36:44 -05:00
GriffinR	c76aaa2aa4	Merge pull request #1259 from GriffinRichards/fix-backpicindex ... Designated initializers for gTrainerBackPicTable	2020-12-01 16:26:42 -05:00
Evan	2bfc7ea9b1	merge upstream	2020-12-01 15:42:04 -05:00
Evan	f54cd0b25d	fix z effect scripts	2020-12-01 15:35:39 -05:00
Evan	9755923cc3	light that burns the sky split, fix electric z move anims	2020-12-01 14:44:45 -05:00
Evan	ce19e33cc4	handle double and multi battles	2020-12-01 13:43:15 -05:00
Evan	fd8951d040	trainer z move ai	2020-12-01 08:24:33 -05:00
GriffinR	076b2c2edc	Designated initializers for gTrainerBackPicTable	2020-11-30 15:32:08 -05:00
Evan	a0bde70493	z move effects	2020-11-30 10:55:46 -05:00
Evan	71857f4c89	secondary id for type-z moves, fix signature z move loading	2020-11-29 10:16:01 -05:00
Evan	752aca7698	finish z move anims	2020-11-29 09:22:31 -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	f114534ae3	z move anim/effect, black hole eclipse anim	2020-11-28 13:09:43 -05:00
Eduardo Quezada D'Ottone	7aa999af59	Merge pull request #1235 from ultima-soul/ability_expansion ... Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony	2020-11-28 14:56:01 -03:00
Evan	2b1dfe73cf	z move unleash anim, fix active/used flags	2020-11-27 23:38:29 -05:00
Evan	4060b09bd6	expand top left move window. add z move init anim	2020-11-27 17:06:36 -05:00
GriffinR	571c5988ec	Merge pull request #1257 from Kurausukun/menu_nonmatching ... [LEAK INFORMED] match sub_819A080	2020-11-27 11:10:03 -05:00
GriffinR	7b1fee3239	Merge pull request #1258 from V-FEXrt/master ... Rename graphics files for COOLTRAINER to match define	2020-11-27 10:57:18 -05:00
Evan	348d70b309	z move indicator and some data	2020-11-26 15:56:18 -05:00
Ashley Coleman	0f04944b81	Rename graphics files for COOLTRAINER to match define	2020-11-26 11:05:02 -08:00
Kurausukun	54becd2303	whitespace	2020-11-26 01:35:08 -05:00
Kurausukun	94cbd3ff1b	[LEAK INFORMED] match sub_819A080	2020-11-26 01:30:59 -05:00
Evan	7c6e74ab69	update terrain bg config option comment	2020-11-24 21:17:31 -05:00
Evan	6c0878b5fe	infestation between turn anim	2020-11-24 17:21:59 -05:00
Evan	9ec67db8fa	keep permanent terrain bg from party menu, bag	2020-11-24 17:03:40 -05:00
GriffinR	8d29f65c6c	Merge pull request #1255 from GriffinRichards/doc-paltags ... Name object event palettes and tags	2020-11-24 15:59:14 -05:00
GriffinR	9d056e8656	Move object event pal declarations to graphics	2020-11-23 14:45:16 -05:00
GriffinR	513c7c5f45	Clarify Kecleon objects	2020-11-23 14:42:47 -05:00
GriffinR	bf65c1fb25	Name object event pals/tags	2020-11-23 14:24:48 -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
Evan	9472bc894f	formatting	2020-11-20 08:26:50 -07:00
ExpoSeed	914c830616	Remove Techno Blast and Judgment from battle scripts	2020-11-19 21:21:34 -06:00
Evan	ef43596a79	toggleable manual ability popup destruction	2020-11-19 15:16:27 -07:00
Evan	56c0a39206	fix pressure typo	2020-11-19 11:53:47 -07: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
GriffinR	c0e3c71673	Merge pull request #1252 from luckytyphlosion/master ... Missing inc files in asm/*.s and data/*.s will raise an actual error message.	2020-11-18 22:10:33 -05:00
luckytyphlosion	70b6e05a47	Remove useless comment.	2020-11-18 21:31:04 -05:00
luckytyphlosion	68b53c7437	Optimize Makefile, also add *.sna to gitignore.	2020-11-18 20:53:42 -05:00
ultima-soul	fdfe330330	Merge pull request #519 from Pyredrid/doublescriptedwilds ... Added commands for scripted double wild battles	2020-11-18 08:57:19 -08:00
Evan	5c658c6950	config option for terrain bg change	2020-11-17 20:26:09 -07:00
Evan	c026f705b3	permanent terrain move bgs	2020-11-17 19:45:27 -07:00
ExpoSeed	7dcc7dae23	Merge pull request #1239 from ghoulslash/battle_anims ... redo power trick anim	2020-11-17 16:36:45 -06:00
Evan	479f6be51a	redo power trick anim	2020-11-17 15:31:18 -07:00
GriffinR	0aa06c307b	Merge pull request #1251 from ExpoSeed/patch-1 ... Document bugged IV inheritance difference	2020-11-17 14:25:36 -05:00
GriffinR	116fbecbe4	Merge pull request #1254 from kageru/pret ... Use more constants in Battle Tower code	2020-11-17 13:49:58 -05:00
ultima-soul	e15a86caae	Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8.	2020-11-17 10:32:24 -08:00
kageru	6f91f7e0e3	Use more constants in Battle Tower code	2020-11-17 17:40:26 +01:00