1110 Commits

Author	SHA1	Message	Date
DizzyEggg	34f5d9e2ae	Burn Up And Purify	2020-04-17 21:14:26 +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
GriffinR	8d3b7bd0b1	Use metatile labels for decor gfx	2020-04-13 14:43:50 -04:00
DizzyEggg	cb5b673f8a	Big Root and STRENGTH Sap	2020-04-13 15:00:17 +02:00
DizzyEggg	060b795d8e	Merge with master	2020-04-11 19:48:24 +02:00
DizzyEggg	1435cd4692	Change inner structure of semi invulerable moves	2020-04-11 11:47:13 +02:00
GriffinR	7a5deff0bc	Add misc party constant usage	2020-04-09 15:18:53 -04:00
GriffinR	8e4b987699	Revert more porymap-breaking changes	2020-03-18 03:22:07 -04:00
PikalaxALT	39da49495d	Merge pull request #1000 from GriffinRichards/doc-dex ... Document pokedex.c	2020-03-17 10:43:57 -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
Eduardo Alvaro Quezada D'Ottone	64031dd672	Option for Toxic never missing if user is Poison type. (#304)	2020-03-14 12:15:36 +01:00
GriffinR	31b0cbe9b4	Document pokedex.c	2020-03-09 16:24:01 -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
GriffinR	4637085390	Clarify event ticket flag names	2020-03-03 01:36:20 -05:00
DizzyEggg	6968124529	Merge battle anim documentation	2020-02-29 13:59:41 +01:00
GriffinR	51cd0ac081	Rename battle anim type files, remove unneeded ARG_RET_IDs	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	501d0d3c18	Document move anims C-H	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
GriffinR	f6275cce57	Misc constant use in TV	2020-02-17 13:09:35 -06:00
DizzyEggg	6c71f9b57b	Abilities up to gen7	2020-02-17 15:26:04 +01: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	084bd66924	Document Trainer Card	2020-02-08 14:31:17 -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	14bc2f65f3	Fix AI trying to switch when it can't, also ghosts can escape	2020-02-08 14:20:02 +01:00
Eduardo Alvaro Quezada D'Ottone	90442ffbc2	Battle config options (#243) ... * Option to use pre-GenVI critical hit multiplier. * Clarified the option that multiplies EXP by 1.5 for trainer battles. * Fixed code style. * Option to change Burn damage. * Option to change to Gen 7 paralysis drop. * Ordered settings. * Implemented review suggestions.	2020-02-08 09:51:55 +01:00
DizzyEggg	834b7b52d3	Merge with master	2020-02-08 09:38:29 +01:00
GriffinR	86354f1d50	Document some pokenav and region map	2020-02-05 21:04:43 -05:00
GriffinR	27c4329e45	Use friendship event constants	2020-02-04 12:16:15 -06: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	9a6c2c25d0	Add some capacity constants	2020-01-26 09:42:55 -06:00
GriffinR	25d7577d9d	Label animated doors	2020-01-26 09:40:35 -06:00
GriffinR	4c12ad00d2	Merge branch 'master' into fix-eventobj	2020-01-19 21:57:29 -05:00
Eduardo Alvaro Quezada D'Ottone	b87dac459b	Implemented missing Neuroforce. (#242) ... * Added ID, name and description. * Added damage multiplier.	2020-01-18 18:34:04 +01:00
Eduardo Alvaro Quezada D'Ottone	000a709363	Gen7 trainer exp multiplier. (#200) ... * Gen7 trainer exp multiplier. * Changed check for TRAINER_BATTLE_MULTIPLIER from "before Gen 7" to "not Gen 7" as requested. .	2020-01-18 18:29:56 +01:00
DizzyEggg	d8aab3d112	Merge with master	2020-01-18 18:17:25 +01:00
GriffinR	a40f054900	Move/rename gfx start/end vars	2020-01-18 08:49:34 -06: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	6a470ddfda	Some script clean up, document secret base secrets show	2020-01-12 19:39:30 -06: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	017fa294b5	Add battle tent mon/trainer constants	2020-01-08 01:07:53 -05:00
GriffinR	fb5bea98ce	More battle_dome.c doc	2020-01-07 22:30:37 -05:00
GriffinR	bb692a03eb	Add frontier mon constants	2020-01-03 23:20:11 -05:00
DizzyEggg	b69292248c	Add constants for special multi battles	2020-01-01 00:22:42 +01:00
DizzyEggg	39e3b0b740	Form changes layout and Stance Change Aegi	2019-12-31 19:11:53 +01:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
Marcus Huderle	ef751c8d1b	Fix formatting and remove unnecessary comments	2019-12-28 12:07:02 -06: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	8d64bc9df8	Merge pull request #944 from GriffinRichards/doc-itemuse ... Document item_use.c	2019-12-25 11:59:07 -06:00
huderlem	ee61726136	Merge pull request #936 from GriffinRichards/doc-tower ... Document Battle Tower scripts	2019-12-25 11:39:20 -06: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	749965d56b	Document item_use.c	2019-12-21 21:39:30 -05:00
GriffinR	68cdd7b1cb	Merge master into ObjEvent rename	2019-12-21 05:19:27 -05: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
GriffinR	d137a1a0c1	Use constants in compare macro	2019-12-18 19:12:09 -05: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
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05: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	75b0c9d7a9	Document Battle Pyramid scripts	2019-12-14 08:38:26 -06:00
GriffinR	ea9a2c848a	Define start and ends for temp vars and daily/temp/special flags	2019-12-14 08:27:49 -06:00
GriffinR	1a672dac8d	Use constant for daily flag offset	2019-12-14 08:27:49 -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
DizzyEggg	740ab29c7c	Merge pull request #204 from cfmnephrite/beta ... Dancer	2019-12-09 08:36:22 +01:00
DizzyEggg	ac499bc896	Merge with master	2019-12-09 08:16:18 +01:00
Nephrite	0343f63eda	Dancer ... Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc	2019-12-07 10:19:01 +00:00
GriffinR	b93101bbeb	Merge master into ObjEvent rename	2019-12-06 21:37:33 -05:00
GriffinR	22fd579fd9	Add comment for ABNORMAL_WEATHER	2019-12-06 19:05:28 -06:00
GriffinR	7f22fc9879	Update old weather names in field_weather_effect	2019-12-06 19:05:28 -06:00
GriffinR	955bfe3f5c	Add comment for original weather name	2019-12-06 19:05:28 -06:00
GriffinR	efaea2a3ab	Revert WEATHER_CLOUDY to WEATHER_SHADE	2019-12-06 19:05:28 -06:00
GriffinR	a4191040c9	Sync weather names	2019-12-06 19:05:28 -06:00
GriffinR	c51e0f3bae	Merge branch 'master' into fix-eventobj	2019-12-06 02:34:54 -05:00
GriffinR	467a103bcc	Set up Battle Tent macros	2019-12-05 21:11:17 -06:00
GriffinR	fdae25eab2	Set up Battle Pyramid macros	2019-12-05 21:11:17 -06:00
GriffinR	9fcfbdbef5	Set up Battle Factory macros	2019-12-05 21:11:17 -06:00
GriffinR	41c1c9ca8a	Set up Battle Pike macros	2019-12-05 21:11:17 -06:00
GriffinR	9b3d1cfab6	Set up Battle Dome and Tower macros	2019-12-05 21:11:17 -06:00
GriffinR	be17c1602d	Set up remaining facility script doc, use Palace macros	2019-12-05 21:11:17 -06:00
GriffinR	548af3c0f1	Document a bit of Match Call	2019-12-05 15:33:36 -05:00
DizzyEggg	dcb5d16cb3	Merge with master	2019-11-29 21:47:31 +01:00
GriffinR	cb90f22c5e	Merge master into ObjEvent rename	2019-11-27 12:51:10 -05:00
GriffinR	8d870d94c9	Document Battle Arena scripts	2019-11-26 18:47:48 -06:00
GriffinR	f559fa3fe2	Merge master into ObjEvent rename	2019-11-25 20:00:04 -05:00
GriffinR	63ee15fc28	Document Frontier Util	2019-11-25 18:37:48 -06:00
GriffinR	08a8dc46e3	Use macros for Trainer Hill	2019-11-25 18:37:48 -06:00
GriffinR	4dfa959fa2	Begin documenting Battle Pike and Frontier Util	2019-11-25 18:37:48 -06:00
huderlem	9a81661075	Merge pull request #851 from Sewef/patch-3 ... battle_anim_effects_3	2019-11-24 12:02:54 -06:00
Sewef	07b79c3fc3	battle_anim_effects_3 (5)	2019-11-24 18:00:51 +01:00
huderlem	bef6150b59	Merge pull request #909 from GriffinRichards/doc-apprentice ... Document Apprentice	2019-11-23 09:27:02 -06:00
Sewef	1dfe34dee3	TriForce → TriAttack	2019-11-23 15:51:08 +01:00
DizzyEggg	88244463e9	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-11-22 22:50:03 +01:00
DizzyEggg	8cc0439182	merge master	2019-11-22 22:47:19 +01:00
GriffinR	4c52cf9ed1	Fix event constant file names	2019-11-21 14:03:35 -05:00
GriffinR	86c08330c4	Fix Event Object include guards	2019-11-21 14:03:11 -05:00
GriffinR	82cb741d8b	Standardize EVENT_OBJECT to OBJECT_EVENT	2019-11-20 23:12:51 -05:00
GriffinR	ec3e86f1d2	Standardize Event Object to Object Event	2019-11-20 22:55:44 -05:00
GriffinR	b2eb49888d	Clean up Apprentice doc	2019-11-20 19:00:08 -05:00
GriffinR	a05006421b	Document Apprentice	2019-11-20 17:36:52 -05:00
GriffinR	215bb31d67	Clean up Trainer Fan Club doc	2019-11-20 09:08:24 -06:00
GriffinR	5c5c1836bb	Document Trainer Fan Club	2019-11-20 09:08:24 -06:00
GriffinR	4e6a69c297	WIP Document Apprentice	2019-11-19 11:36:38 -05:00
GriffinR	a486c8affd	Begin documenting Apprentice, merge with master	2019-11-18 12:47:10 -05:00
GriffinR	5393b42f7c	Remove SpriteCB_Null name	2019-11-17 08:16:28 -06:00
GriffinR	f6ab6934ae	Align battle tower func spacing	2019-11-17 08:16:28 -06:00
GriffinR	6ac7efb54f	Document Scotts House and begin frontier macros	2019-11-17 08:16:28 -06:00
GriffinR	3bbdee61b8	Clean up Trainer Hill doc	2019-11-16 13:02:35 -06:00
GriffinR	5e01871f8b	Document Trainer Hill	2019-11-16 13:02:35 -06:00
GriffinR	248b85c3cb	Document Frontier Exchange Corner scripts	2019-11-16 12:00:35 -06:00
GriffinR	57a66bb22d	Document Battle Frontier lounges	2019-11-16 11:37:34 -06:00
GriffinR	fc3783b739	WIP Document apprentice	2019-11-16 12:28:49 -05:00
GriffinR	0f53aeb19b	Document SS Tidal scripts	2019-11-14 18:07:56 -06:00
GriffinR	ba65719090	Typo fix	2019-11-14 17:51:02 -06:00
GriffinR	00f22b6400	Document remaining routes (104, 119-123)	2019-11-14 17:51:02 -06:00
GriffinR	525ec2025d	Document Routes 111-118	2019-11-14 17:41:01 -06:00
GriffinR	ef8370566f	Document Contest scripts	2019-11-13 18:20:55 -06:00
GriffinR	af83b41dd1	Document Contest Hall berry blenders and misc	2019-11-13 18:20:55 -06:00
GriffinR	a3ee92a4e7	Document some frontier util funcs	2019-11-10 16:37:14 -06:00
DizzyEggg	b4ac979600	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-11-10 12:09:43 +01:00
DizzyEggg	ea6736cd8d	merge	2019-11-10 12:09:14 +01:00
huderlem	ed76620d28	Merge pull request #880 from GriffinRichards/doc-trickhouse ... Document Trick House scripts	2019-11-09 08:48:49 -06:00
GriffinR	8702972067	Document Sky Pillar outside	2019-11-09 08:41:43 -06:00
GriffinR	a38bff8c17	Document Slateport scripts	2019-11-09 08:37:06 -06:00
GriffinR	1174a20a17	Document Fallarbor and Verdanturf scripts	2019-11-09 08:37:06 -06:00
huderlem	906a1ec4ab	Merge pull request #883 from GriffinRichards/fix-colossname ... Fix Battle Colosseum names	2019-11-08 17:24:05 -06:00
GriffinR	9140594b23	Merge branch 'master' into doc-littleroot	2019-11-08 03:07:50 -05:00
GriffinR	bef24a45f0	Document Littleroot scripts	2019-11-08 02:47:55 -05:00
huderlem	030784dece	Merge pull request #882 from GriffinRichards/doc-mauville ... Document Mauville and New Mauville scripts	2019-11-07 20:22:56 -06:00
huderlem	1ceee6ef70	Merge pull request #884 from GriffinRichards/doc-halloffame ... Document a few towns/cities	2019-11-07 19:55:19 -06:00
GriffinR	de933000e3	Document Lavaridge scripts	2019-11-07 15:21:32 -05:00
GriffinR	35ed8de51b	Fix Battle Colosseum names	2019-11-07 12:37:11 -05:00
GriffinR	0b5c2c2721	Document New Mauville scripts	2019-11-07 10:32:21 -05:00
GriffinR	43b7fd741a	Document Game Corner scripts	2019-11-07 09:41:59 -05:00
GriffinR	3a00b66407	Document cave scripts	2019-11-07 07:57:51 -05:00
GriffinR	2b944fd721	Merge branch 'master' into doc-trickhouse	2019-11-06 19:49:14 -05:00
GriffinR	25d026aded	Document Trick House scripts	2019-11-06 19:41:19 -05:00
GriffinR	fbc3eee1f2	Document Fossil Maniac and Berry Master route houses	2019-11-06 17:01:23 -06:00
GriffinR	6730df2321	Document Abandoned Ship scripts	2019-11-06 16:41:56 -06:00
GriffinR	58dcd6d99d	Clean up mystery event msg	2019-11-06 16:38:02 -06:00
GriffinR	d9da932dad	Document Rustboro scripts	2019-11-05 16:43:57 -06:00
GriffinR	f056328e37	Align trainer constant values	2019-11-04 16:45:00 -06:00
GriffinR	5c627518b3	Rename Grunts to use location-specific names	2019-11-04 16:45:00 -06:00
GriffinR	878eb523d7	Document remainder of poke centers	2019-11-04 16:42:28 -06:00
huderlem	a4b4ecd470	Merge pull request #787 from GriffinRichards/rename-tablecmds ... Rename table cmds	2019-11-04 16:31:27 -06:00
DizzyEggg	1d8cc9b741	Fix merge conflicts	2019-11-03 19:55:19 +01:00
GriffinR	5f1fcdd023	Document aqua/magma area scripts	2019-11-01 17:22:45 -05:00
huderlem	6eaac9ea9d	Merge pull request #863 from GriffinRichards/doc-partymenu ... Document party menu	2019-10-31 21:36:56 -05:00
GriffinR	27169f634b	Review changes for party menu doc	2019-10-31 21:33:01 -04:00
GriffinR	8055548fa4	Document legendary scripts	2019-10-31 18:28:34 -05:00
GriffinR	b1ea2592c3	Merge branch 'master' into doc-partymenu	2019-10-31 14:22:51 -04:00
GriffinR	e01ec84837	Document party_menu second pass	2019-10-31 03:25:56 -04:00
GriffinR	93e2851fc1	Document players_house.inc and Littleroot house scripts	2019-10-30 17:51:35 -05:00
GriffinR	ff0109e0fd	Define unused hidden item flags	2019-10-27 11:01:40 -05:00
GriffinR	c31aafed57	Name unknown flag from R/S	2019-10-27 10:23:06 -05:00
Marcus Huderle	13f9760187	Document route 109 scripts	2019-10-26 12:55:53 -05:00
GriffinR	5fd44d1e74	Rename some STAT_CHANGE macros	2019-10-26 11:53:00 -04:00
GriffinR	6db014cc32	Document party_menu first pass	2019-10-25 15:41:06 -04:00
GriffinR	973e6f9667	Document mauville_man.inc	2019-10-21 17:21:53 -05:00
GriffinR	ac399ade4a	Document safari zone scripts	2019-10-20 09:53:21 -05:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
GriffinR	b4a9298205	Merge branch 'master' into document-gyms2	2019-10-16 04:22:34 -04:00
GriffinR	0f15264595	Document rotating_tile_puzzle	2019-10-16 04:09:30 -04:00
GriffinR	90a05cf824	Finish Mossdeep Gym doc, beging documenting rotating tile puzzle	2019-10-15 05:06:13 -04:00
GriffinR	1b41b8b7ca	Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms	2019-10-15 05:05:57 -04:00
GriffinR	928cdf2531	Merge branch 'master' into doc-inc2	2019-10-14 19:25:10 -04:00
huderlem	26962b7725	Merge pull request #830 from GriffinRichards/doc-inc ... Document some .incs split from event_scripts	2019-10-14 18:22:35 -05:00
garak	92d28c5daf	add MIN_LEVEL define to pokemon constants	2019-10-14 18:12:03 -05:00
GriffinR	30ef494163	Merge branch 'master' into doc-inc2	2019-10-13 15:44:07 -04:00
GriffinR	bb23128b77	Merge conflict resolves into review changes	2019-10-13 15:33:19 -04:00
GriffinR	144c5888a1	Fix map script names	2019-10-13 15:29:53 -04:00
GriffinR	a081124a20	Merge branch 'master' into doc-inc	2019-10-13 15:26:44 -04:00
Marcus Huderle	8df4982b3f	Merge remote-tracking branch 'upstream/master' into document-trade	2019-10-12 15:39:17 -05:00
GriffinR	4e2be7ff5e	Review changes for #835	2019-10-12 15:14:57 -05:00
GriffinR	1b7607bd91	Document cable_club.inc	2019-10-12 15:14:57 -05:00
DizzyEggg	bae5d2038f	Update with master	2019-10-10 16:18:48 +02:00
GriffinR	07fa82c911	Last non-anim trade.c doc	2019-10-10 03:50:51 -04:00
GriffinR	32aa87c7e1	More trade doc, fix switch indentations	2019-10-09 14:21:29 -04:00
GriffinR	2c062dc764	More trade documentation	2019-10-09 05:56:44 -04:00
GriffinR	d1bcd60b58	Document more trade.c	2019-10-08 20:25:46 -04:00
GriffinR	d8f5e73bb7	Merge branch 'master' into doc-inc	2019-10-07 17:37:04 -04:00
GriffinR	0df304d629	Document roulette.inc	2019-10-07 02:00:16 -04:00
GriffinR	c4deb4db96	Document field_poison	2019-10-06 20:04:30 -04:00
GriffinR	f179ab95c0	Document move tutors	2019-10-06 17:30:17 -04:00
GriffinR	02070eaf73	Document kecleon	2019-10-06 16:06:34 -04:00
Marcus Huderle	799edaf3e6	Document hide/show reflection movement actions	2019-10-06 14:17:34 -05:00
GriffinR	66a68159b1	Continue trade doc	2019-10-05 10:41:37 -04:00
GriffinR	dadb1cb9f1	More trade/union room doc, incidental party_menu doc	2019-10-04 23:31:25 -04:00
GriffinR	6b556900f8	Move union room data, more trade doc	2019-10-04 17:24:03 -04:00
GriffinR	4a7f061885	Document some of trade	2019-10-03 19:39:37 -04:00
GriffinR	c3c8fb40cf	Move trade data, some trade.c clean up documentation	2019-10-03 01:16:22 -04:00
GriffinR	73b96fe145	Rename CONTACT macros to ON_DAMAGE	2019-09-27 12:27:36 -04:00
GriffinR	3bf8129396	Clean up new Cmd macro names	2019-09-27 02:54:28 -04:00
GriffinR	1491b1855b	Merge branch 'master' into document-eventscripts	2019-09-26 15:03:22 -04:00
GriffinR	1016b23918	Merge branch 'master' into rename-tablecmds	2019-09-26 15:02:38 -04:00
GriffinR	4e98a0cc4b	Remove Egg parent constants	2019-09-25 18:46:25 -05:00
GriffinR	801ca37f04	Document day_care.inc and related	2019-09-25 18:46:25 -05:00
GriffinR	de6e1e9ecf	Use multi constants from merge	2019-09-23 00:36:49 -04:00
GriffinR	a180d2af49	Merge branch 'master' into document-eventscripts	2019-09-22 12:18:48 -04:00
GriffinR	8e4e344c7d	Merge branch 'master' into document-scriptmenu	2019-09-22 09:45:44 -04:00
GriffinR	1ffa890d27	Consolidate remaining pokemon constants	2019-09-22 08:14:22 -05:00
GriffinR	80f58f7b24	Document PLAYER_HAS constants, consolidate poke constants	2019-09-22 08:14:22 -05:00
GriffinR	b6dffcf8b7	Clean up script_menu documentation	2019-09-19 19:23:24 -04:00
GriffinR	9fb24bbbce	Remainder of script_menu documentation	2019-09-19 18:31:09 -04:00
GriffinR	275695c189	Document more script_menu, lilycove harbor	2019-09-19 17:27:34 -04:00
GriffinR	de0084ef7a	Document multichoice ids	2019-09-19 00:56:51 -04:00
GriffinR	b596322ca2	Initial script_menu documentation	2019-09-18 18:57:25 -04:00
GriffinR	58b8d7c297	Merge branch 'master' into document-eventscripts	2019-09-17 18:01:20 -04:00
GriffinR	6ab192e739	Review changes for #807	2019-09-17 16:50:17 -05:00
GriffinR	6ab49da811	Clean up field_specials documentation	2019-09-17 16:50:17 -05:00
GriffinR	3dbd375779	Some frontier field_specials documentation	2019-09-17 16:50:17 -05:00
GriffinR	aac9658a8e	Document some field_specials data	2019-09-17 16:50:17 -05:00
GriffinR	945d3d3a27	Merge branch 'master' into document-eventscripts	2019-09-17 00:10:23 -04:00
GriffinR	06af24bce5	Use misc ScrCmd constants	2019-09-16 19:44:47 -05:00
GriffinR	85d97542cd	Use MAX_MON_MOVES constants	2019-09-16 19:21:23 -05:00
GriffinR	bb236b490d	Update BS constants for Cmd rename	2019-09-15 17:58:12 -04:00
GriffinR	9fbcd552de	document remainder of secret_base scripts, delete unneeded scripts.incs	2019-09-06 02:12:00 -04:00
GriffinR	6b04ea0727	Merge branch 'master' into document-eventscripts	2019-09-03 22:22:14 -04:00
DizzyEggg	91b364e8d6	Ai use most powerful move smarrter	2019-08-27 18:29:34 +02:00
DizzyEggg	e96e98a8de	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-08-25 13:10:32 +02:00
GriffinR	869d0eebc0	Rename atk## constants and states	2019-08-23 08:46:21 -04:00
GriffinR	a46f7952f9	Use DIR constants for createvobject ... Also uses event object ids in LinkContestRoom1	2019-08-21 17:11:06 -05:00
GriffinR	f08615881e	Changes from review	2019-08-21 17:06:55 -05:00
GriffinR	5fb7ab05dd	clean up	2019-08-21 17:06:55 -05:00
GriffinR	d931ba9602	document remaining funcs	2019-08-21 17:06:55 -05:00
DizzyEggg	e4787bacbc	merge	2019-08-19 14:50:47 +02:00
Tustin2121	1069adae46	Renaming unknown link room ids to be the same as name ... This descrepency was causing a lot of annoyance when using porymap, because porymap generated the ids in map_groups.h from the name, and mapjson was generating map_groups.h from the id in the json files. So just name them the same already like every other map in the repo.	2019-08-17 13:26:57 -04:00
GriffinR	ecf2097abb	initial event_scripts documentation	2019-08-14 23:38:42 -04:00
DizzyEggg	fabbc9ae31	Merge with master	2019-08-14 11:48:08 +02:00
DizzyEggg	c9de753ecc	Illusion	2019-08-08 13:06:55 +02:00
GriffinR	191f74525d	name unused route state vars	2019-08-05 11:50:29 -04:00
GriffinR	c2bf668fdd	rename town/city vars	2019-08-05 11:23:45 -04:00
DizzyEggg	2863045241	Fix switch-in abilities text/pop-up	2019-08-05 11:24:49 +02:00
GriffinR	0f5d96e5f5	name used and unnamed vars	2019-08-03 14:12:48 -04:00
Xhyzi	d66b9022a6	Added 46 move animations ... - Magnet Bomb. - Mirror Shot. - Aqua Ring. - Aqua Tail. - Aqua Jet. - Attack Order. - Defend Order. - Heal Order. - Dragon Rush. - Dragon Pulse. - Discharge. - Magnet Rise. - Charge Beam. - Shadow Claw. - Shadow Force. - Ominous Wind. - Lava Plume. - Magma Storm. - Avalanche. - Vacuum Wave. - Force Palm. - Lucky Chant. - Double Hit. - Giga Impact. - Captivate. - Rock Climb. - Last Resort. - Grass Knot. - Wood Hammer. - Zen Headbutt. - Lunar Dance. - Trick Room. - Psycho Cut. - Power Gem. - Stone Edge. - Rock Wrecker. - Head Smash. - Sealth Rock. - Punishment. - Sucker Punch. - Nasty Plot. - Switcheroo. - Earth Power. - Gunk Shot. - Defog. Fix Pyscho Shift Hollow Orb graphics were not being loaded before creating the sprite Fix Gastro Acid anim Fix gastro acid palette asignation. .	2019-07-13 01:02:09 +02:00
DizzyEggg	fc84033e3d	Merge with master	2019-07-12 11:20:24 +02:00
Gudf	75f165ed74	Use a constant instead of integer literals when checking for shinyness	2019-07-11 20:16:39 +02:00
DizzyEggg	385fc49ef3	Merge pull request #163 from SBird1337/feature/animpack2 ... Some animations	2019-07-07 09:49:09 +02:00
Karathan	d9b54c3c1c	add power swap, guard swap, worry seed	2019-07-06 05:22:18 +02:00
Karathan	e9884154a9	added acupressure and wring out	2019-07-03 03:45:11 +02:00
Karathan	501ae27390	add trump card, fix a few issues with pluck	2019-07-02 18:26:59 +02:00
Karathan	5f7b5ba453	add feint and pluck animation sprites and implementations	2019-07-02 06:22:05 +02:00
DizzyEggg	a98c5ab78a	Merge branch 'master' into battle_engine_v2	2019-06-24 12:12:56 +02:00
garak	2c22a82a25	clean metatile constants file	2019-06-16 10:08:07 -05:00
garak	a43dcd26bd	finish labeling metatiles	2019-06-16 10:08:07 -05:00
garak	713f61de7c	continue labeling metatiles for scripts	2019-06-16 10:08:07 -05:00
garak	fbbc2b1d8b	finish src metatile labels	2019-06-16 10:08:07 -05:00
garak	9f8a30e4e7	label metatiles in fldeff_cut.c	2019-06-16 10:08:07 -05:00
garak	8b26bd1e09	label metatiles for general, fallarbor, and sootopolis gym tilesets	2019-06-16 10:08:07 -05:00
garak	aad839995f	label metatiles for pacifidlog and fortree bridges	2019-06-16 10:08:07 -05:00
garak	724add638c	label regi cave metatiles	2019-06-16 10:08:07 -05:00
garak	7e35b8a710	label remaining metatiles in field_specials.c	2019-06-16 10:08:07 -05:00
garak	a9560d9c62	give metatile labels to petalburg gym and pcs	2019-06-16 10:08:07 -05:00
garak	c68ba9f4e8	label mauville gym metatiles	2019-06-16 10:08:07 -05:00
DizzyEggg	9e175c9f1b	Merge branch 'master' into battle_engine_v2	2019-06-10 11:21:16 +02:00
DizzyEggg	453be19670	change cooltrainer unused class name	2019-05-25 08:26:40 -05:00
DizzyEggg	a074f36766	USE PROTAG	2019-05-25 08:26:40 -05:00
DizzyEggg	e706280503	Rename PKMN TRAINER CALSS 4	2019-05-25 08:26:40 -05:00
DizzyEggg	76c5287629	Bug Bite	2019-05-23 12:32:14 +02:00
DizzyEggg	e1ea4b62e9	Natural Gift	2019-05-20 12:03:00 +02:00
DizzyEggg	09c0a195ac	Merge branch 'master' into battle_engine_v2	2019-05-20 09:05:12 +02:00
Flametix	dbdb827e54	Fix typos (#713) ... * fix typos	2019-05-18 21:56:19 -05:00
DizzyEggg	a9b4d0208b	Move new species to battle_config.h	2019-05-17 10:38:48 +02:00
DizzyEggg	f22f7866ac	Merge with master, fix conficts	2019-05-17 09:52:20 +02:00
garak	daecd5ec40	name some trainer card related functions	2019-05-16 17:10:13 -05:00
DizzyEggg	824a95fe07	Incinerate	2019-05-10 15:12:33 +02:00
DizzyEggg	d027bb0d7a	Life Flame toxic orbs	2019-05-10 11:03:33 +02:00
DizzyEggg	875b413a09	Various battle target items	2019-05-09 20:31:58 +02:00
DizzyEggg	bb8e397e5b	Gems and dmg reducing berries	2019-05-07 15:26:58 +02:00
DizzyEggg	900c15c20c	Mega evo animation	2019-05-03 17:27:49 +02:00
DizzyEggg	a7f2fa67ef	Merge pull request #142 from thechurchofcage/beta ... Magnetic Flux + Gear Up	2019-05-01 11:11:46 +02:00
DizzyEggg	bbe3a28b78	Merge with master	2019-05-01 11:10:41 +02:00
Fontbane	2c076f1f3e	Doc most OnTransitions	2019-04-22 17:23:59 -05:00
Papa Cancer	3cde800bd0	Magnetic Flux + Gear Up ... Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.	2019-04-20 20:17:56 +01:00
Papa Cancer	b50007e861	Instruct ... Re-PR'd due to excess "merges"	2019-04-20 20:11:49 +01:00
Papa Cancer	7e99272482	Laser Focus ... Re-PR'd due to excess "merges"	2019-04-20 20:02:52 +01:00
Papa Cancer	c4acc3dbf8	Merge branch 'battle_engine_v2' into beta	2019-04-20 16:49:57 +01:00
DizzyEggg	5b43a9289d	Merge pull request #134 from thechurchofcage/epsilon ... Baneful Bunker + King's Shield	2019-04-20 08:42:35 +02:00
Papa Cancer	e310d0f10e	Core Enforcer ... New code - uses Gastro Acid script instead through own move effect	2019-04-18 12:10:18 +01:00
Papa Cancer	754befe393	Baneful Bunker + King's Shield ... Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!	2019-04-17 14:54:21 +01:00
Papa Cancer	e5e45bbcf5	Throat Chop ... Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.	2019-04-17 13:52:25 +01:00
DizzyEggg	b4e1375bb6	Document pokemon item effects	2019-04-16 11:23:09 -05:00
DizzyEggg	59797e4801	Use constants in battle_anim_special.c	2019-04-14 10:19:50 -05:00
Fontbane	e430fe4b02	Add Dance flag	2019-04-13 21:15:00 -04:00
DizzyEggg	93e86e6a76	Tweak Stomping Tantrum	2019-04-13 14:36:08 +02:00
DizzyEggg	549a9cdcc2	Merge pull request #118 from thechurchofcage/beta ... Stomping Tantrum	2019-04-13 14:09:15 +02:00
DizzyEggg	4e5c543327	Remove new items data from battle engine	2019-04-13 14:02:04 +02:00
DizzyEggg	cf73a3ba28	Merge pull request #126 from thechurchofcage/zeta ... Ability-ignoring moves	2019-04-08 15:21:08 +02:00
DizzyEggg	0e02c28927	Merge with master	2019-04-08 09:37:41 +02:00
Marcus Huderle	78151b6d88	Start decompiling pokemon_jump.c	2019-04-07 13:12:27 -05:00
Papa Cancer	fc8e59403a	Ability-ignoring moves ... Just Moongeist Meme and Sunsteel Strike for now. Added a special flag and modified "GetBattlerAbility" to check the current move for it.	2019-04-07 13:03:40 +01:00
DizzyEggg	f8713f9c15	Merge with master	2019-04-06 20:43:13 +02:00
DizzyEggg	b85a74afc5	Give names to battle anim backgrounds	2019-04-06 12:44:27 -05:00
DizzyEggg	19f151417e	Rename sprite sheet to sprite gfx	2019-04-06 10:14:48 -05:00
DizzyEggg	b93581b519	Rename battle anim sprites	2019-04-06 10:14:48 -05:00
DizzyEggg	311c1b9cba	Change anim tag names	2019-04-06 10:14:48 -05:00
Papa Cancer	33d484a7ed	Merge branch 'battle_engine_v2' into beta	2019-04-06 00:38:56 +01:00
Papa Cancer	43525d2a9c	Merge branch 'battle_engine_v2' into delta	2019-04-05 23:13:41 +01:00
DizzyEggg	794c9aa255	Merge pull request #121 from thechurchofcage/epsilon ... Three pointless moves	2019-04-05 23:47:54 +02:00
DizzyEggg	7c8f69e6e3	Merge pull request #109 from Fontbane/patch-4 ... Field Effects for Gen IV Abilities	2019-04-05 23:40:30 +02:00
Marcus Huderle	033580da96	Document secret base	2019-04-05 16:24:57 -05:00
Papa Cancer	4c8bc9d526	Three pointless moves ... Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)	2019-04-05 18:10:02 +01:00
DizzyEggg	183b714ff1	Merge with master and fix web moves	2019-04-05 12:43:44 +02:00
Phlosioneer	6916f09cd5	Expand MatchCallStruct defs, use REMATCH_* enum	2019-04-02 07:28:30 -05:00
DizzyEggg	5c44f44ad2	Organize new battle anim gfx	2019-04-02 12:26:24 +02:00
DizzyEggg	cd3de7821e	Merge branch 'master' into battle_engine_v2	2019-04-02 08:37:54 +02:00
PikalaxALT	7571969a45	Finish union room battle	2019-04-01 22:08:50 -05:00
Papa Cancer	c9ad96d228	Stomping Tantrum ... Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles base power if the timer is set.	2019-04-01 20:06:45 +01:00
PikalaxALT	1fe5208560	through sub_801A02C	2019-04-01 12:05:58 -04:00
DizzyEggg	62192b86f7	Aroma Veil	2019-04-01 11:42:37 +02:00
Phlosioneer	cd069446e0	Merge branch 'master' into pokedex-area-const-array	2019-03-31 20:43:42 -04:00
Phlosioneer	3181c64c64	Change names from MAP_AREA_ to MAP_GROUP_	2019-03-31 20:40:14 -04:00
DizzyEggg	e878de782e	Merge pull request #114 from thechurchofcage/gamma ... Misc. move updates	2019-03-31 22:08:14 +02:00
DizzyEggg	6f9096c613	Add Sweet Veil	2019-03-31 22:02:39 +02:00
DizzyEggg	b12334c88b	Remove cases from ABE, add functionality of Flower Veil	2019-03-31 21:38:58 +02:00
Papa Cancer	1d5cf3acb5	Misc. move updates ... Bind: 75% Acc -> 85% Acc Disable: 55% Acc. -> 100% Acc. Freeze-Dry: 10% chance to freeze Hammer Arm and Ice Hammer: lower user's speed High Jump Kick: 130BP, 10 PP Jump Kick: 100BP, 10 PP Tail Glow: raises Sp. Atk by 3 stages Waterfall: 20% chance to flinch	2019-03-31 18:25:37 +01:00
Papa Cancer	ebe2dc6bbb	Mat Block ... Nothing more needs to be said	2019-03-31 17:17:13 +01:00
DizzyEggg	17e74756cb	Merge with master, add defines to atk49 and statbuffchange commands	2019-03-31 15:19:25 +02:00
DizzyEggg	35cffea987	Helpful macros for atk49	2019-03-30 08:29:56 -05:00
scnorton	c6c0c9582f	Port menews_jisan.c from FireRed	2019-03-27 07:40:08 -05:00
Fontbane	fc69631a10	Field effects for Gen IV Abilities ... Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.	2019-03-25 17:49:29 -04:00
Marcus Huderle	e6caf0ff10	Port mevent2.c from pokefirered	2019-03-24 18:29:00 -05:00
Marcus Huderle	456cc3a6f0	Split out the remaining wireless-related files	2019-03-24 13:15:37 -05:00
Papa Cancer	61a7bd2788	Taunt fix etc. ... Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's. Heal Block now displays the correct string when preventing usage of a move.	2019-03-24 12:54:01 +00:00
Fontbane	e8add87bf3	Document Field Effects and some related text ... Also VAR_TRICK_HOUSE_LEVEL	2019-03-23 09:57:37 -05:00
DizzyEggg	53c60ab292	Merge branch 'master' into battle_engine_v2	2019-03-23 15:54:08 +01:00
Marcus Huderle	f4f666f5af	Finish decompiling ereader.c	2019-03-22 13:36:06 -05:00
DizzyEggg	54ab6b43dc	Merge with master	2019-03-22 10:40:31 +01:00
Phlosioneer	092608aef6	Add a constant for "no music" on maps.	2019-03-16 12:31:29 -05:00
Phlosioneer	7f70b629f5	Document sAreaGlowTilemapMapping ... I used a script to generate the format for the array, so I can easily change its formatting if needed.	2019-03-12 05:35:15 -04:00
Phlosioneer	8e1537fb57	Document map name popup flag	2019-03-10 09:23:58 -05:00
DizzyEggg	c329252ce3	Add Safety Googles effect	2019-03-08 10:16:54 +01:00
DizzyEggg	055f5a17b4	Merge pull request #103 from LOuroboros/battle_engine_v2 ... Protective Pads' description and Safety Goggles	2019-03-07 19:20:51 +01:00
DizzyEggg	b3ec24ab12	Merge pull request #102 from LOuroboros/battle_engine_v2 ... Gen. 5 Gems and Gen. 7 hold items stuff	2019-03-07 18:53:48 +01:00
LOuroboros	25ff138ead	Reordered the Item IDs a little bit to add the Safety Goggles and also added their item data.	2019-03-07 13:52:46 -03:00
DizzyEggg	f9ee31903d	VCreate and fix stat stage changes functions	2019-03-07 12:20:57 +01:00
LOuroboros	2f4aceb4a9	Defined a hold effect for the terrain effect boosting seeds and the Adrenaline Orb.	2019-03-07 07:09:19 -03:00
LOuroboros	7dc39298d6	Added a new hold effect for the Gen. 5 gems.	2019-03-06 15:29:00 -03:00
LOuroboros	36421d81eb	Reordered the Item IDs a little bit, in order to include battle items like the Gen. 5 Gems and the Gen. 7 Seeds.	2019-03-06 15:07:25 -03:00
DizzyEggg	7a8f524bc5	Proper Roar handling in double battles	2019-03-06 12:09:34 +01:00
DizzyEggg	fddb5159b4	Merge with master	2019-03-05 21:46:45 +01:00
Papa Cancer	2050ac3963	Grassy Terrain v2 ... All corrected, simplest version Also includes proper ending strings for all terrains	2019-03-05 19:13:25 +00:00
Papa Cancer	cfd50eb65a	Grassy Terrain + minor fixes ... Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack	2019-03-02 22:52:43 +00:00
DizzyEggg	5dd7ab98d1	Merge pull request #99 from LOuroboros/battle_engine_v2 ... Various Things	2019-03-02 22:42:50 +01:00
LOuroboros	e15c745cf5	Fixed 2 typos. Loppunite>Lopunnite and Loppunny>Lopunny.	2019-03-02 12:35:11 -03:00
LOuroboros	07f9bcad10	Swapped Keystone with Mega Bracelet.	2019-03-02 12:31:43 -03:00
huderlem	ee9694d9ba	Merge pull request #587 from Phlosioneer/document-all-event-vars ... Document all event vars	2019-03-02 08:24:46 -06:00
DizzyEggg	bf70861798	Powder moves on grass types	2019-03-02 13:08:50 +01:00
huderlem	3b04cfa437	Merge pull request #551 from Phlosioneer/multiplayer-stuff ... Document overworld.c and link stuff in general	2019-03-01 08:43:55 -06:00
Phlosioneer	a7e5852f1d	More minor fixes	2019-03-01 01:49:11 -05:00
DizzyEggg	cebada80d0	Merge with master	2019-02-28 20:56:52 +01:00
Phlosioneer	99bfd8c80f	VAR_0x3F20 is not a var	2019-02-28 00:10:44 -05:00
Phlosioneer	373d73eb3b	Fix last special var	2019-02-28 00:06:27 -05:00
Phlosioneer	bf45b83c65	Finish documenting event vars	2019-02-27 23:54:51 -05:00
Phlosioneer	782979f1fc	Finish documenting trainer hill ... Trainer hill isn't anywhere close to done, but I figured out enough to name the VAR. That's all this PR should do.	2019-02-27 22:16:01 -05:00
Phlosioneer	66f0616a2d	I guess I'm documenting Trainer Hill now	2019-02-27 21:31:05 -05:00
Phlosioneer	e77e7844ea	Name several vars, document some related events	2019-02-27 20:25:09 -05:00
Phlosioneer	648fc3d4f3	Name more unknown vars	2019-02-27 15:18:56 -05:00
Phlosioneer	4137dd7b0b	Identify unused, never read, and never written vars	2019-02-27 14:42:32 -05:00
Marcus Huderle	4b9e93850c	Document easy chat screen types	2019-02-27 12:55:29 -06:00
Phlosioneer	fe55580fe1	Reverse engineer unusual weather events	2019-02-27 03:42:04 -05:00
Phlosioneer	3a44b090d1	Merge branch 'master' into multiplayer-stuff	2019-02-26 22:07:29 -05:00
huderlem	153f134318	Merge pull request #583 from huderlem/easy_chat ... Decompile more easy_chat.c	2019-02-25 14:12:18 -06:00
Marcus Huderle	7ea05431a5	Decompile more easy_chat.c	2019-02-25 14:11:31 -06:00
DizzyEggg	df9e6a6889	Free up two status3 flags	2019-02-25 16:17:23 +01:00
huderlem	b3a7a1278a	Merge pull request #577 from Phlosioneer/weather-15 ... Document the weather state functions	2019-02-25 08:03:22 -06:00
huderlem	84573f1774	Merge pull request #574 from Phlosioneer/event-vars ... Event vars	2019-02-25 08:02:28 -06:00
Phlosioneer	5f7a971313	Source file part of map script renaming	2019-02-25 08:01:22 -06:00
Phlosioneer	87859a655b	Fix flag formatting for fun	2019-02-25 02:20:38 -05:00
DizzyEggg	da33c38183	Merge pull request #78 from thechurchofcage/beta ... Gravity fix	2019-02-24 19:38:42 +01:00
Papa Cancer	d704b9cd5b	Gravity fix ... Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity	2019-02-24 13:28:24 +00:00
DizzyEggg	842e379a7b	Merge branch 'master' into battle_engine_v2	2019-02-23 22:50:46 +01:00
Phlosioneer	b2866fae21	Document the weather state functions ... All weather types are now documented (including WEATHER_15)	2019-02-22 22:20:42 -05:00
Phlosioneer	cea5696f23	Finish moving pokeruby vars	2019-02-22 04:18:43 -05:00
Phlosioneer	e12a7790cf	Start porting pokeruby vars to pokeemerald	2019-02-22 04:01:38 -05:00
Phlosioneer	eca329f9c5	Merge branch 'master' into multiplayer-stuff	2019-02-21 21:22:10 -05:00
Phlosioneer	486cf449b8	Make flag names more consistent	2019-02-18 14:17:02 -05:00
Phlosioneer	fcb541189d	Rename some flags, and use map ID macros	2019-02-18 02:02:20 -05:00
Phlosioneer	e90e3458cb	Document the regi* code more ... Fixed some confusing naming, named some unknown symbols, and fixed the names of some flags.	2019-02-15 18:24:55 -05:00
DizzyEggg	94cd547e9a	Change move effect to u16	2019-02-14 13:17:27 +01:00
DizzyEggg	dc39f76a95	Spectral Thief effect	2019-02-14 12:15:53 +01:00
Phlosioneer	e75f45dbcf	Reverse engineered many of the multiplayer events ... Some corrections to the way events are handled and identified.	2019-02-10 20:42:50 -05:00
DizzyEggg	4c535a1b03	Merge pull request #71 from thechurchofcage/partingshot ... Parting Shot	2019-02-10 18:18:49 +01:00
DizzyEggg	b5d0253890	Merge with master	2019-02-10 18:17:33 +01:00
Marcus Huderle	6f1d2b870c	Give proper names to dynamic map layouts	2019-02-09 09:57:30 -06:00
DizzyEggg	3d616dfffe	Add Surge Abilities	2019-02-09 14:30:16 +01:00
DizzyEggg	aa33a61e58	Merge branch 'master' into battle_engine_v2	2019-02-07 21:17:30 +01:00
Papa Cancer	62fd90caa0	Parting Shot ... Effect plus animation (looks like Snarl)	2019-02-05 21:47:50 +00:00
Marcus Huderle	d4125fef9b	Cleanup and add game version flag to mapjson tool	2019-02-04 17:28:45 -06:00
DizzyEggg	a42bba755b	Add Crafty Shield effect	2019-02-01 14:34:16 +01:00
DizzyEggg	a3460c9e45	Code Belch effect	2019-02-01 14:17:24 +01:00
Marcus Huderle	29d6221935	Convert map data to JSON	2019-01-31 15:51:20 -06:00
Marcus Huderle	5c1667b41a	Define layout constants	2019-01-29 16:55:25 -06:00
DizzyEggg	736826e863	New feature - battle 2 vs 1 opponent	2019-01-27 20:54:34 +01:00
DizzyEggg	88b788bfab	Fix Charge Beam effect	2019-01-27 11:57:13 +01:00
DizzyEggg	897592a8d4	Merge branch 'master' into battle_engine_v2	2019-01-27 10:58:57 +01:00
Diegoisawesome	900f294011	Add var const prefix for some missed var numbers	2019-01-21 22:34:01 -06:00
DizzyEggg	f34ab49f63	Merge pull request #56 from SBird1337/feature/battle-engine-animpack1 ... Add some animations (see below)	2019-01-18 23:06:19 +01:00
DizzyEggg	2c3210f4d1	merge with master	2019-01-18 22:30:34 +01:00
DizzyEggg	4b420643dc	Merge branch 'master' into trainer_hill	2019-01-13 20:51:05 +01:00
DizzyEggg	c0bc01d301	Move some vars to C	2019-01-13 13:15:23 +01:00
Karathan	832c0d6333	add toxic spike animation	2019-01-12 17:02:24 +01:00
Diegoisawesome	af2c39860d	Rename non-mapsec constants	2019-01-08 13:40:11 -06:00
Slawter666	aeaf390706	Update constants	2019-01-05 20:12:50 +00:00
DizzyEggg	4827776a3c	Merge with master	2019-01-05 10:14:20 +01:00
Tetrable	97ebeef1db	Relabel TEMP_FLAG_20 into FLAG_UNUSED_0x020	2019-01-03 18:13:16 +00:00
Tetrable	30e7ac0dca	Fix merge conflicts	2019-01-03 02:28:18 +00:00
Tetrable	50aa222aff	Corrected typos	2019-01-03 01:54:55 +00:00
Marcus Huderle	e1092028ec	Decompile match_call.c	2019-01-02 19:46:15 -06:00
Tetrable	a3ebca4d81	Fix merge conflicts	2019-01-02 21:25:14 +00:00
Tetrable	1e3da62d24	Finish off labelling flags	2019-01-02 21:12:43 +00:00
Melody	dc6c0ed17e	add event object var references	2018-12-29 11:56:53 -06:00
DizzyEggg	55e44b0951	a bit more of contest painting effect	2018-12-29 11:48:28 -06:00
Marcus Huderle	d0d870e193	Cleanup formatting	2018-12-29 11:36:54 -06:00
Marcus Huderle	67636b7c64	Document deoxys rock	2018-12-29 11:36:54 -06:00
DizzyEggg	27b1d74dad	Merge branch 'master' into battle_engine_v2	2018-12-29 15:11:54 +01:00
Melody	6d556f8cf7	improve checkplayergender calls ... clean up constant definitions make tweaks from review	2018-12-28 08:22:21 -06:00
Marcus Huderle	d59f5a8e56	Misc overworld documentation	2018-12-27 16:52:13 -06:00
DizzyEggg	6411d1d693	Merge pull request #55 from huderlem/anims ... Some battle anims	2018-12-26 17:48:03 +01:00
DizzyEggg	517573eb4b	Update with master	2018-12-26 17:46:51 +01:00
Marcus Huderle	dcbc8db6a3	Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)	2018-12-25 11:46:35 -06:00
Marcus Huderle	c17f7d73fa	Merge remote-tracking branch 'origin/battle_engine_v2' into features ... # Conflicts: # ld_script.txt # src/effects_1.c	2018-12-23 17:24:14 -06:00
DizzyEggg	bd817d70d6	Refactor battle intro, allow to speed it up	2018-12-23 18:47:00 +01:00
DizzyEggg	ef55bdac89	Merge branch 'master' into battle_engine_v2	2018-12-22 23:57:42 +01:00
DizzyEggg	f7a7ddde0c	Fix Quick Guard	2018-12-22 15:10:24 +01:00
DizzyEggg	0748069705	Merge pull request #53 from ultima-soul/battle_engine ... Added new battle items.	2018-12-22 13:54:19 +01:00
DizzyEggg	e54dd6a02b	Merge with master	2018-12-22 13:53:07 +01:00
DizzyEggg	ecee02816d	Merge with master	2018-12-20 22:53:08 +01:00
Marcus Huderle	ecda59a406	Add Poison Jab animation	2018-12-20 11:58:21 -06:00
Marcus Huderle	0369780db9	Add Rock Polish animation	2018-12-20 10:18:17 -06:00
Diegoisawesome	6ef9671718	Merge pull request #440 from garakmon/fldeff ... Decompile / port fldeff_80F9BCC	2018-12-19 22:16:59 -06:00
Melody	5e6ceeb631	update applymovement to remove magic numbers	2018-12-19 14:08:01 -05:00
garak	e292d0ca83	Merge branch 'master' into fldeff	2018-12-16 20:05:31 -05:00
DizzyEggg	f1421d94c3	Up to sub 0x80ce580	2018-12-15 23:58:47 +01:00