2583 Commits

Author	SHA1	Message	Date
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
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	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	7beddd16dd	Document missed scripts/text	2019-12-05 21:20:55 -06:00
GriffinR	49c6ae1ac6	Add some macro comments	2019-12-05 21:11:17 -06: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	df1fce705c	Fix hard-coded string ptr	2019-11-29 00:10:55 -05: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	0db46e84bc	Use macros for FRONTIER_DATA_6, fix offset comment	2019-11-25 18:37:48 -06: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
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
GriffinR	2bf1e0600e	Consolidate apprentice_buff macros	2019-11-23 08:09:25 -05:00
Sewef	4f590e8f61	battle_anim_effects_3 (4)	2019-11-23 11:57:39 +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	7034f59c14	Rename EventObj to ObjEvent	2019-11-21 00:14:40 -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	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	6ac7efb54f	Document Scotts House and begin frontier macros	2019-11-17 08:16:28 -06:00
GriffinR	f7e17ca985	Document Ranking Hall scripts	2019-11-17 08:16:28 -06:00
GriffinR	d6e681066b	Document Battle Frontier outside scripts	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	2c3726a328	Document contest strings	2019-11-16 12:50:01 -06:00
GriffinR	0513e05c38	Document Frontier Reception Gate	2019-11-16 12:00:35 -06:00
GriffinR	248b85c3cb	Document Frontier Exchange Corner scripts	2019-11-16 12:00:35 -06:00
GriffinR	dadaba3075	Fix bet amount typo	2019-11-16 11:37:34 -06:00
GriffinR	57a66bb22d	Document Battle Frontier lounges	2019-11-16 11:37:34 -06:00
huderlem	0a43f2ce53	Merge pull request #899 from GriffinRichards/doc-scriptclean ... Document interview and TV scripts, and misc script clean up	2019-11-16 11:34:47 -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	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	0ba591d26f	Document ocean routes	2019-11-14 17:29:46 -06:00
GriffinR	ff7e11c0b0	Merge branch 'master' into doc-scriptclean	2019-11-13 19:25:41 -05: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	c0ae1cbc1c	Document Lilycove scripts	2019-11-13 18:20:55 -06:00
GriffinR	7455bd9b9a	Document interview and TV scripts, and misc script clean up	2019-11-12 14:20:05 -05:00
Marcus Huderle	8e65f0188f	Rename contest_painting_effects to image_processing_effects	2019-11-10 16:37:26 -06:00
Marcus Huderle	1ed3af66eb	Document contest painting image processing effects	2019-11-10 16:37:26 -06:00
GriffinR	6c863f6724	Document Sootopolis scripts	2019-11-10 16:37:14 -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
GriffinR	5ac8b126e9	Document Mt Pyre scripts	2019-11-09 12:32:13 -06:00
GriffinR	e4d65addf4	Document Mossdeep scripts	2019-11-09 10:42:52 -06:00
huderlem	ed76620d28	Merge pull request #880 from GriffinRichards/doc-trickhouse ... Document Trick House scripts	2019-11-09 08:48:49 -06:00
GriffinR	ae1767fe46	Document Mystery Event Club script	2019-11-09 08:41:43 -06:00
GriffinR	06bb4ba402	Document Secret Power TM script	2019-11-09 08:41:43 -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	e19b9c9d46	Resolve Littleroot merge conflict	2019-11-08 03:07:19 -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	4334e31a7e	Fix sailing typo	2019-11-07 16:46:56 -05:00
GriffinR	5e4dd022a6	Document Dewford scripts	2019-11-07 16:36:48 -05:00
GriffinR	5d35662c4c	Document Pacifidlog scripts	2019-11-07 15:41:42 -05:00
GriffinR	de933000e3	Document Lavaridge scripts	2019-11-07 15:21:32 -05:00
GriffinR	979ece7d56	Document Fortree scripts	2019-11-07 14:49:52 -05:00
GriffinR	03a7995570	Move hall of fame script	2019-11-07 13:28:33 -05:00
GriffinR	bae4a586d8	Document Hall of Fame scripts	2019-11-07 13:26:53 -05:00
GriffinR	35ed8de51b	Fix Battle Colosseum names	2019-11-07 12:37:11 -05:00
GriffinR	09afa7992d	Document Shoal Cave	2019-11-07 12:17:28 -05:00
GriffinR	d5685db19a	Fold nops into hidemoneybox	2019-11-07 10:37:15 -05:00
GriffinR	0b5c2c2721	Document New Mauville scripts	2019-11-07 10:32:21 -05:00
GriffinR	c132989679	Document Mauville scripts	2019-11-07 10:18:56 -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	1475c4d8da	Document other cable car station	2019-11-06 17:01:23 -06:00
GriffinR	fbc3eee1f2	Document Fossil Maniac and Berry Master route houses	2019-11-06 17:01:23 -06:00
GriffinR	7d5d12877e	Document cycling, cable car, and tunneler route houses	2019-11-06 17:01:23 -06:00
GriffinR	d0198088d9	Document Lanettes, Winstrates, Old Ladys, and Wingull houses	2019-11-06 17:01:23 -06:00
GriffinR	903b8060a7	Document Glass Workshop	2019-11-06 17:01:23 -06:00
GriffinR	dba94e3971	Update fldeff sparkle macro	2019-11-06 16:41:56 -06:00
GriffinR	6730df2321	Document Abandoned Ship scripts	2019-11-06 16:41:56 -06:00
GriffinR	37bd93ec6c	Rename mystery event msg scripts	2019-11-06 16:38:02 -06:00
GriffinR	e7f6459a89	Split mystery event msg	2019-11-06 16:38:02 -06:00
GriffinR	58dcd6d99d	Clean up mystery event msg	2019-11-06 16:38:02 -06:00
GriffinR	481c09fcad	Clean up Rustboro script doc	2019-11-05 16:43:57 -06:00
GriffinR	d9da932dad	Document Rustboro scripts	2019-11-05 16:43:57 -06:00
GriffinR	1d421f2f71	Document Devon Corp scripts	2019-11-05 16:43:57 -06:00
GriffinR	5ef300c10b	Document dept store	2019-11-04 16:49:06 -06:00
GriffinR	5c627518b3	Rename Grunts to use location-specific names	2019-11-04 16:45:00 -06:00
GriffinR	290df23130	Document remaining poke marts	2019-11-04 16:42:28 -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
GriffinR	347d1e20b6	Use constants in io_reg.s	2019-11-04 16:26:09 -06:00
DizzyEggg	1d8cc9b741	Fix merge conflicts	2019-11-03 19:55:19 +01:00
GriffinR	033c6cea3b	Use YES/NO constants for MSGBOX_YESNO	2019-11-02 16:36:43 -05:00
GriffinR	a90b828bb8	Use YES/NO constants	2019-11-02 16:32:58 -05:00
GriffinR	e4fe21786e	Document misc special houses	2019-11-02 16:32:58 -05:00
GriffinR	390d594e21	Fix indentation	2019-11-01 17:22:45 -05:00
GriffinR	5f1fcdd023	Document aqua/magma area scripts	2019-11-01 17:22:45 -05:00
GriffinR	dd01942c4f	Document aqua/magma hideout 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	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	67ce8c9cc2	Clean up players_house doc	2019-10-30 17:51:35 -05:00
GriffinR	93e2851fc1	Document players_house.inc and Littleroot house scripts	2019-10-30 17:51:35 -05:00
DizzyEggg	48cb0d898d	Fix Psycho Shift string	2019-10-26 22:39:07 +02:00
Marcus Huderle	aad430c049	Document route 110 scripts	2019-10-26 12:55:53 -05:00
Marcus Huderle	8b75d977e3	Document seashore house scripts	2019-10-26 12:55:53 -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	f35a3f73b2	Document gabby_and_ty.inc	2019-10-26 09:32:04 -05:00
GriffinR	6db014cc32	Document party_menu first pass	2019-10-25 15:41:06 -04:00
Marcus Huderle	83d0a87d0c	Document several route scripts	2019-10-24 20:14:11 -05:00
GriffinR	7d24f2d62c	Document record_mix.inc and clean surf.inc	2019-10-22 17:57:28 -05:00
GriffinR	ca2c6fa9b1	Document pc_transfer.inc	2019-10-22 17:57:28 -05:00
GriffinR	9a86769847	Document obtain_item.inc	2019-10-22 17:57:28 -05:00
GriffinR	c0aaa01424	Document flash.inc	2019-10-22 17:57:28 -05:00
Marcus Huderle	4fd848e689	Document early route scripts	2019-10-22 16:47:19 -05:00
GriffinR	a4d6ce417d	Fix resetintimidatetracebits typo	2019-10-22 15:54:11 -05:00
GriffinR	fa4940ee44	Clean up lilycove_lady.inc doc	2019-10-21 20:19:37 -05:00
GriffinR	6923f0e369	Document lilycove_lady.inc	2019-10-21 20:19:37 -05:00
GriffinR	a7ffa96578	Rename mart_attendant to mart_clerk	2019-10-21 17:22:19 -05:00
GriffinR	c70162086b	Split some smaller files from event_scripts	2019-10-21 17:22:19 -05:00
GriffinR	973e6f9667	Document mauville_man.inc	2019-10-21 17:21:53 -05:00
Marcus Huderle	2f36bd62d7	Document Oldale scripts	2019-10-21 16:44:20 -05:00
Sewef	64cf2d70fa	battle_anim_effects_3 (3)	2019-10-21 18:36:45 +02:00
Sewef	b24e7a5933	battle_anim_effects_3 (2)	2019-10-21 18:29:59 +02:00
Sewef	c8e0e89f8e	battle_anim_effects_3	2019-10-21 18:19:07 +02:00
Sewef	afdc8da297	Update battle_anim_scripts.s	2019-10-21 18:06:36 +02:00
Marcus Huderle	04ea8eea5a	Document rest of Petalburg scripts	2019-10-20 12:36:35 -05:00
Sewef	41e952a668	battle_anims_effects_2 ... Fixes	2019-10-20 12:29:08 -05:00
Sewef	e9675bdd24	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	def7a4a18a	more battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	8531a17e10	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	e90c708383	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	3b0d9e134f	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	49ad6da8fb	starting battle_anim_effects_2	2019-10-20 12:29:08 -05:00
GriffinR	ac399ade4a	Document safari zone scripts	2019-10-20 09:53:21 -05:00
GriffinR	0db188b487	Clean up berry_tree.inc and misc adjacent documentation	2019-10-20 09:46:46 -05:00
Marcus Huderle	cefc31dd1e	Document Petalburg City scripts	2019-10-19 15:05:15 -05:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
huderlem	cb9f89925f	Merge pull request #841 from GriffinRichards/document-gyms2 ... Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms	2019-10-19 08:05:11 -05:00
Sewef	19fb0fb220	Merge branch 'master' into patch-2	2019-10-16 19:35:33 +02:00
Sewef	9dcfc5ba73	Fix labels	2019-10-16 19:10:39 +02:00
GriffinR	b4a9298205	Merge branch 'master' into document-gyms2	2019-10-16 04:22:34 -04:00
GriffinR	20fa13616f	Condense fallthrough script	2019-10-16 04:14:51 -04:00
GriffinR	0f15264595	Document rotating_tile_puzzle	2019-10-16 04:09:30 -04:00
GriffinR	60a592a2c3	Condense fallthrough scripts	2019-10-15 17:09:47 -05:00
GriffinR	348bb002a8	Document Gym scripts first half	2019-10-15 17:09:47 -05:00
huderlem	a0b3f5d9e3	Merge pull request #833 from GriffinRichards/doc-inc2 ... Document .incs split from event_scripts Round 2	2019-10-15 16:30:27 -05: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
Sewef	07ac727c6d	Document Oamdata in battle_anim (#838)	2019-10-14 18:26:47 -05:00
GriffinR	928cdf2531	Merge branch 'master' into doc-inc2	2019-10-14 19:25:10 -04:00
Sewef	975c0ce1d0	Label battle_anim_effects_1	2019-10-14 23:27:12 +02:00
Sewef	65b82d67c9	Revert "More battle_anim_effects_1 labels" ... This reverts commit 00331a644a.	2019-10-14 23:22:44 +02:00
Sewef	5a366e8d72	More battle_anim_effects_1 labels	2019-10-14 22:51:45 +02:00
Sewef	00331a644a	More battle_anim_effects_1 labels	2019-10-14 22:42:15 +02:00
Sewef	299166edee	Document subs & AnimTask in battle_anim_effects_1	2019-10-14 22:08:03 +02:00
Sewef	46f2cc5449	battle_anim_effects_1 main callbacks	2019-10-14 21:17:38 +02:00
Sewef	63b5be9259	Ended battle_anims_effects_1 SpriteTemplates	2019-10-14 21:05:40 +02:00
Sewef	a49756a8fe	Update battle_anim_scripts.s	2019-10-13 22:37:39 +02:00
GriffinR	30ef494163	Merge branch 'master' into doc-inc2	2019-10-13 15:44:07 -04:00
GriffinR	60a9dc6a0e	Fix map script names	2019-10-13 15:40:15 -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	e47b3efdfe	Unify showmonpic and hidemonpic script command names with their function names	2019-10-12 18:58:54 -05: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	714b122da6	Fix indentation	2019-10-12 15:14:57 -05:00
GriffinR	1c99f5b7c9	Split text from cable_club.inc	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	70d1d8956e	Document elite_four.inc and the E4 map scripts	2019-10-08 02:25:31 -04:00
GriffinR	2368f57669	Merge branch 'master' into doc-inc	2019-10-07 17:37:35 -04:00
GriffinR	d8f5e73bb7	Merge branch 'master' into doc-inc	2019-10-07 17:37:04 -04:00
GriffinR	bcf74df27f	Use B_OUTCOME constants for GetBattleOutcome	2019-10-07 16:36:47 -05:00
GriffinR	7ba11b7a1b	Use VAR_FACING constants	2019-10-07 16:36:02 -05:00
GriffinR	628301d6d5	Document unusual_weather.inc	2019-10-07 11:29:14 -04:00
GriffinR	9553ec1d28	Document mevent.inc	2019-10-07 10:34:12 -04:00
GriffinR	0df304d629	Document roulette.inc	2019-10-07 02:00:16 -04:00
GriffinR	81ee8f07ef	Document pc.inc and prof_birch.inc	2019-10-07 01:13:34 -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
GriffinR	748a1dbdd4	Document cave hole	2019-10-06 14:16:37 -04:00
GriffinR	d914c1d659	Document common movements	2019-10-06 13:55:30 -04:00
GriffinR	749247b910	Convert 4 spaces in .inc to tab	2019-10-05 10:52:48 -04:00
GriffinR	dadb1cb9f1	More trade/union room doc, incidental party_menu doc	2019-10-04 23:31:25 -04:00
GriffinR	c3c8fb40cf	Move trade data, some trade.c clean up documentation	2019-10-03 01:16:22 -04:00
GriffinR	2ac3ad3e60	Review changes for #819 and merge	2019-10-02 12:40:00 -04:00
PikalaxALT	cb528cb543	Merge pull request #821 from GriffinRichards/document-textinput ... Document text input strings	2019-10-02 09:49:26 -04:00
GriffinR	9aed405851	Document a few field specials	2019-09-30 01:42:52 -04:00
GriffinR	53bc1bd0d1	Document text input strings	2019-09-30 00:09:29 -04:00
GriffinR	67152b9242	Split off more files from event_scripts	2019-09-28 02:37:01 -04:00
GriffinR	75869a880c	Move running shoes script	2019-09-27 15:27:08 -04:00
GriffinR	12cc7ef34c	Split more files from event_scripts	2019-09-27 14:20:51 -04:00
GriffinR	73b96fe145	Rename CONTACT macros to ON_DAMAGE	2019-09-27 12:27:36 -04:00
GriffinR	86f1f9066a	Split some files from event_scripts	2019-09-27 12:22:58 -04:00
GriffinR	0c1f1281da	Review changes for #778	2019-09-27 10:08:47 -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	37373c1b21	Review changes for #817	2019-09-25 18:46:25 -05: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	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	f4160ded98	Fix misnamed function	2019-09-16 00:29:59 -04:00
GriffinR	bb236b490d	Update BS constants for Cmd rename	2019-09-15 17:58:12 -04:00
GriffinR	826fc3154e	condense secret base mapscript labels	2019-09-06 13:01:45 -04:00
GriffinR	cb82d868af	fix secret base jsons	2019-09-06 02:49:26 -04:00
GriffinR	9fbcd552de	document remainder of secret_base scripts, delete unneeded scripts.incs	2019-09-06 02:12:00 -04:00
PikalaxALT	f3bed6045e	Disassemble data/ereader_screen.s	2019-09-05 20:48:48 -05:00
PikalaxALT	b510100503	Port trainer hill sets to C objects	2019-09-05 20:48:48 -05:00
Eduardo Quezada D'Ottone	de02805388	Changed names.	2019-09-05 20:42:15 -05:00
Eduardo Quezada D'Ottone	e2689d2a27	Documented Mechadoll answers.	2019-09-05 20:42:15 -05:00
GriffinR	8c6b5648d4	document secret_base_1.inc	2019-09-05 16:16:21 -04:00
GriffinR	1d703e786b	move some data out of event_scripts, use game stat constants	2019-09-05 14:56:34 -04:00
GriffinR	6b04ea0727	Merge branch 'master' into document-eventscripts	2019-09-03 22:22:14 -04:00
PikalaxALT	1f4c88c952	Copy Berry Fix MB dism from FR (#777) ... * Copy Berry Fix MB dism from FR	2019-09-03 15:33:11 -04:00
DizzyEggg	a41ecf7101	more ai stuff, baton pass perish song strats	2019-08-30 17:57:19 +02:00
DizzyEggg	f979987c2f	Fix Intimidate and Trace on new switch in system	2019-08-30 12:25:21 +02:00
DizzyEggg	6a3b74c59c	Use item constant in pretty petal flower shop	2019-08-30 09:48:59 +02:00
DizzyEggg	91b364e8d6	Ai use most powerful move smarrter	2019-08-27 18:29:34 +02:00
DizzyEggg	bfa357a608	Fix Ai Roost	2019-08-27 14:00:47 +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
DizzyEggg	30dd8942e5	Don't use Protect when burned	2019-08-22 16:42:55 +02: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
GriffinR	7fc99f3952	favor lady funcs	2019-08-21 17:06:55 -05:00
GriffinR	009caa21c8	some contest lady funcs	2019-08-21 17:06:55 -05:00
GriffinR	23979c4d7d	initial documentation commit	2019-08-21 17:06:55 -05:00
tustin2121	82744ba636	Replace {STRING 5} with {KUN} ... Since we already have the KUN placeholder, there's no need for this {STRING 5} stuff. Also, it makes it easier to delete all the {KUN}s in hacks later on if desired.	2019-08-21 14:05:22 -04:00
DizzyEggg	e4787bacbc	merge	2019-08-19 14:50:47 +02:00
Tustin2121	18dee14170	Review fixes	2019-08-17 23:26:46 -04:00
Tustin2121	d63a8ba817	Replaced createvobject numbers with EVENT_OBJ_GTX defines ... Doing this allows someone to renumber the event object graphics and still have working contests.	2019-08-17 13:38:13 -04: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
Tustin2121	f4d4424618	Folded nops into hidemoneybox and updatemoneybox ... The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.	2019-08-17 13:25:36 -04:00
Tustin2121	6508469259	Rename movobjectoffscreen to copyobjectxytoperm ... Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.	2019-08-17 13:18:56 -04:00
Tustin2121	ea724278b7	Juan text buffer overflow note	2019-08-17 13:05:55 -04:00
GriffinR	ecf2097abb	initial event_scripts documentation	2019-08-14 23:38:42 -04:00
DizzyEggg	aebac38922	Fix AnimTask_ShakeMon arguments	2019-08-14 12:20:06 +02: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
PikalaxALT	9beeba8424	Merge pull request #764 from GriffinRichards/document-varnames ... Document vars that are used and unnamed	2019-08-05 11:59:53 -04: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
DizzyEggg	c219776034	Merge with master	2019-08-04 23:09:28 +02:00
DizzyEggg	1641579297	Merge branch 'master' into pok_jump	2019-08-04 00:02:13 +02:00
GriffinR	0f5d96e5f5	name used and unnamed vars	2019-08-03 14:12:48 -04:00
PikalaxALT	9f50c4fa80	Merge pull request #760 from ultima-soul/use_pokeblock_data ... Decompile use_pokeblock data	2019-08-03 11:01:05 -04:00
DizzyEggg	9306c142b3	Merge dodrio with master	2019-08-02 00:45:49 +02:00
DizzyEggg	4d2d8779bf	Dodrio berry picking decompiled	2019-08-02 00:41:55 +02:00
DizzyEggg	02cadbee60	MORE DODRIO BERRY PICKINGgit status!	2019-08-01 19:01:50 +02:00
ultima-soul	9a152f8fe6	Decompile data/use_pokeblock.s	2019-07-30 17:21:17 -07:00
DizzyEggg	ba1a70419a	Start dodrio magic	2019-07-31 00:27:30 +02:00
DizzyEggg	e634e722cc	Decompile pokemon jump	2019-07-29 12:35:57 +02:00
garak	dfa3e079c0	finish pokenav data decomp	2019-07-19 22:57:33 -04:00
garak	f9a9297d4f	decompile pokenav 7/8 data	2019-07-19 22:06:42 -04:00
garak	f6d55db535	decompile pokenav_unk_5 data	2019-07-19 21:05:55 -04:00
garak	690a0c4390	decompile pokenav_unk_4 rodata	2019-07-19 19:36:17 -04:00
garak	c400d1dc7f	decompile pokenav_unk_3 data	2019-07-19 18:31:42 -04:00
garak	b68ab6106d	pokenav unk 2 data decomp	2019-07-19 17:23:52 -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	3e476adf4a	Stockpile gen4 effect and fixed spit up	2019-07-09 19:06:12 +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	8126662cfb	update wring out with trace, remove AGBPrintf	2019-07-03 14:10:29 +02:00
Karathan	e9884154a9	added acupressure and wring out	2019-07-03 03:45:11 +02:00
Karathan	f1c82abc7e	fix change requests	2019-07-02 18:34:53 +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	10c27ac6a6	Fix a typo that crashes the gamae	2019-06-25 12:26:27 +02:00
DizzyEggg	a98c5ab78a	Merge branch 'master' into battle_engine_v2	2019-06-24 12:12:56 +02: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
DizzyEggg	aaea5398f4	Fix Castfrom ability pop-up and refactor one function	2019-06-14 12:58:29 +02:00
DizzyEggg	9e175c9f1b	Merge branch 'master' into battle_engine_v2	2019-06-10 11:21:16 +02:00
DizzyEggg	f64c1dfabf	Some pokenav work	2019-05-26 07:20:51 -05:00
Slawter666	5f292d621a	Use event object constants	2019-05-25 14:41:48 -05:00
DizzyEggg	39770f7fde	Use constants for new game berries setting script	2019-05-25 08:27:07 -05:00
DizzyEggg	76c5287629	Bug Bite	2019-05-23 12:32:14 +02:00
DizzyEggg	32aeba21e0	Some AI tweaking	2019-05-23 11:41:35 +02:00
DizzyEggg	1b7493e47a	Fix Flame Burst crashing the game	2019-05-23 10:02:04 +02:00
DizzyEggg	8e904ebacb	helping hand ai	2019-05-20 14:36:46 +02:00
DizzyEggg	e00890a555	Fix Air Baloon msg	2019-05-20 12:20:49 +02:00
DizzyEggg	e1ea4b62e9	Natural Gift	2019-05-20 12:03:00 +02:00
DizzyEggg	269f573297	Fix powder and resist berry string	2019-05-20 10:10: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	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	94045ace0b	Merge branch 'master' into battle_engine_v2	2019-05-15 13:31:53 +02:00
Fontbane	d9115ada86	Use species constants for VAR_TEMP_1 before givemon	2019-05-13 10:16:28 -05:00
PikalaxALT	539d472796	Merge branch 'master' into dodrio_berry_picking	2019-05-11 21:22:09 -04: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	d0f91a996d	Tweak up mega evo	2019-05-02 23:10:01 +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	901a83d249	Fix some labels and include decorations.h ... Include decorations.h in shop.c Include decorations.h in event_scripts.s	2019-04-22 17:23:59 -05:00
Fontbane	6cf06d5f95	Doc some event scripts ... Doc decoration shops Revert "Doc decoration shops" This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435. Document through comments Un-revert decor documentation	2019-04-22 17:23:59 -05:00
Fontbane	2c076f1f3e	Doc most OnTransitions	2019-04-22 17:23:59 -05:00
AJ Fontaine	dbdb51e1a5	Start documenting event scripts	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	59797e4801	Use constants in battle_anim_special.c	2019-04-14 10:19:50 -05:00
Marcus Huderle	1268691410	Finish decompiling pokenav_unk_1.c	2019-04-13 16:18:04 -05:00
DizzyEggg	549a9cdcc2	Merge pull request #118 from thechurchofcage/beta ... Stomping Tantrum	2019-04-13 14:09:15 +02:00
DizzyEggg	2646f3b26a	Merge with master	2019-04-13 13:42:44 +02:00
Marcus Huderle	a65cffef42	Decompile more pokemon_jump.c	2019-04-10 20:34:17 -05:00
DizzyEggg	91aafa2ebc	Heal Block anim with volume change task	2019-04-09 12:49:50 +02:00
DizzyEggg	1c73e61a2b	Parabolic Charge anim	2019-04-08 16:48:04 +02:00
DizzyEggg	27d645ad8a	Merge pull request #123 from thechurchofcage/delta ... Leaf Storm animation	2019-04-08 15:20:09 +02:00
DizzyEggg	9ffa74674c	Merge pull request #125 from thechurchofcage/epsilon ... Hold Hands fix	2019-04-08 15:19:14 +02:00
DizzyEggg	0e02c28927	Merge with master	2019-04-08 09:37:41 +02:00
Phlosioneer	50350cc2e1	Merge branch 'master' into contest-ai-cleanup	2019-04-07 20:20:22 -04:00
huderlem	a4ea0ac816	Merge pull request #645 from Phlosioneer/pokenav-decomp-again ... Pokenav decomp again	2019-04-07 18:03:32 -05:00
Phlosioneer	0dc73b0b3a	Break up pokenav into subfiles ... The files are separated based on the pokenav resources substruct ID they use.	2019-04-07 14:40:35 -04:00
Marcus Huderle	78151b6d88	Start decompiling pokemon_jump.c	2019-04-07 13:12:27 -05:00
Phlosioneer	d84d94e29a	Merge branch 'master' into pokenav-decomp-again	2019-04-07 01:56:36 -04:00
Papa Cancer	fd6dc98045	Hold Hands fix ... Better check for valid ally. If there isn't one, the target defaults to the attacker, causing the move to fail.	2019-04-06 22:23:34 +01:00
Papa Cancer	255ac6b54d	Leaf Storm animation ... All credit to Doesnt, just stole it from his pokeruby build	2019-04-06 22:02:22 +01:00
Marcus Huderle	c3cfd60658	Generate zoom_tiles palette from correct image	2019-04-06 15:16:05 -05:00
Marcus Huderle	146da2df96	Generate palette from zoom_tiles.png	2019-04-06 14:48:46 -05:00
DizzyEggg	f8713f9c15	Merge with master	2019-04-06 20:43:13 +02:00
Fontbane	6a14cd418e	Match	2019-04-06 12:48:50 -05:00
Fontbane	4a09a5da33	Doc field move scripts completely, use fldeff constants for dofieldeffect ... Fix labels Fix labels again Delete extra boulder scripts Now it should build fine	2019-04-06 12:48:50 -05:00
AJ Fontaine	621e5d2263	Start documenting field move scripts	2019-04-06 12:48:50 -05:00
DizzyEggg	b85a74afc5	Give names to battle anim backgrounds	2019-04-06 12:44:27 -05:00
DizzyEggg	5183cdb357	change anim sprite name	2019-04-06 10:14:48 -05:00
Phlosioneer	bc50686158	Decomp everything onvolving UnknownSubStruct_81C81D4 ... Now I can start cleaning up the fields and substructs	2019-04-06 03:42:14 -04: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	a83255d103	fix after prs	2019-04-06 00:03:03 +02:00
DizzyEggg	0aefbe1098	Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-04-05 23:47:55 +02: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
Fontbane	e8dd8f93d1	Remove Honey functionality	2019-04-05 10:33:19 -04:00
DizzyEggg	dd24597d52	Finish up menu specialised	2019-04-05 07:53:23 -05:00
PikalaxALT	a58d9a16dd	Merge branch 'master' into dodrio_berry_picking	2019-04-05 08:41:31 -04:00
DizzyEggg	05487c8820	animation for power whip, it sucks i know	2019-04-05 14:21:33 +02:00
DizzyEggg	c9cabe8d59	Bug Buzz animation	2019-04-05 14:04:38 +02:00
DizzyEggg	978781d656	Improve Tailwind animation	2019-04-05 13:38:13 +02:00
DizzyEggg	183b714ff1	Merge with master and fix web moves	2019-04-05 12:43:44 +02:00
Fontbane	9e74409bb2	Fix labels, label more scripts	2019-04-04 19:34:35 -05:00
Fontbane	8b88ef3e01	Document berry tree events	2019-04-04 19:34:35 -05:00
Fontbane	90e32f4ec5	Document landmark setting and item balls	2019-04-04 19:34:35 -05:00
PikalaxALT	c46f271f67	Documentation of ereader_helpers, 1	2019-04-04 19:26:45 -05:00
PikalaxALT	53efbe2832	Finish decomp of union_room_chat	2019-04-04 19:26:45 -05:00
PikalaxALT	a47abb3949	union_room_chat data, 1	2019-04-04 19:26:45 -05:00
Phlosioneer	3b3b2dd031	General cleanup of the second half of contest.c	2019-04-03 20:43:23 -04:00
PikalaxALT	4fadbaf161	Minor fixes ... gotoram --> returnram cmdCF/execram --> gotoram fix indentation in sym_ewram.txt fix mevent_client.h guard name	2019-04-03 17:04:42 -05:00
PikalaxALT	28646ea64e	Decompile mevent server scripts	2019-04-03 17:04:42 -05:00
PikalaxALT	6c12d154e7	Reformat mevent server and client scripts	2019-04-03 17:04:42 -05:00
PikalaxALT	03badd9c40	mevent_server_ish	2019-04-03 17:04:42 -05:00
PikalaxALT	dabd1f6177	finish mevent_server.s	2019-04-03 17:04:42 -05:00
PikalaxALT	a455d98385	start porting mevent_server from firered	2019-04-03 17:04:42 -05:00
Phlosioneer	3a2ea40188	Rename and document more contest setup functions ... Also properly label the link contest flags variable, and label the contest window ID's.	2019-04-03 17:24:32 -04:00
Marcus Huderle	181baf9fe5	Merge remote-tracking branch 'upstream/master' into misc_docs ... # Conflicts: # src/field_weather_effect.c	2019-04-02 18:29:51 -05:00
Marcus Huderle	1241700b20	Finish documenting the other weather effects	2019-04-02 18:28:56 -05:00
DizzyEggg	baa187665b	Document a bit of script menu and battle anims	2019-04-02 16:28:38 -05:00
DizzyEggg	1aa95a1821	Document a bit of anims	2019-04-02 07:31:06 -05:00
DizzyEggg	79fec8a38d	Energy Ball animation	2019-04-02 13:05:20 +02:00
DizzyEggg	7f07aae89b	Power-up-Punch animation	2019-04-02 09:22:28 +02:00
DizzyEggg	cd3de7821e	Merge branch 'master' into battle_engine_v2	2019-04-02 08:37:54 +02:00
DizzyEggg	63b04d5d6f	Iron Head animatiion	2019-04-02 07:33:19 +02:00
PikalaxALT	7571969a45	Finish union room battle	2019-04-01 22:08:50 -05:00
PikalaxALT	4be97b2dc6	through sub_801A960	2019-04-01 22:08:50 -05:00
Phlosioneer	845307b3a6	Rename contest AI stuff	2019-04-01 22:16:07 -04:00
DizzyEggg	743a42fec2	Cross Poison animation	2019-04-01 23:39:30 +02:00
DizzyEggg	22be08f723	Revert Bubblebeam to hit only one target	2019-04-01 23:17:50 +02:00
DizzyEggg	737c49853b	Fix Flare Blitz	2019-04-01 23:08:21 +02:00
DizzyEggg	88424b0ea3	Support for custom multi battle choose mons	2019-04-01 21:56:25 +02: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	08f4d3e105	Rename these objects to union_room_battle	2019-04-01 14:41:37 -04:00