4870 Commits

Author	SHA1	Message	Date
MandL27	073218d544	Mind Blown has contest data (#332) ... * uncomment mind blown * more contest moves	2020-04-25 11:22:12 +02:00
DizzyEggg	ee68f0f826	Fix switch-in abilities when shift style switch	2020-04-25 11:17:59 +02:00
PikalaxALT	14f76fbe03	Add tilemap rendering capability to gbagfx	2020-04-24 08:47:22 -04:00
DizzyEggg	738d92e39d	Infiltrator affects mist safeguard	2020-04-23 11:29:19 +02:00
Eduardo Alvaro Quezada D'Ottone	d529ac3b60	More Battle config (#352) ... * Binding move turns. * Binding damage. * Incineratable Gems. * Flash Fire while frozen. * Sleep turns. * Synchronized natures % * Confusion self damage chance. * Fixed confused self-damage check	2020-04-23 09:01:28 +02:00
DizzyEggg	40ce053ce1	Adrenaline Orb	2020-04-22 15:12:25 +02:00
DizzyEggg	d56aaf7c0b	Destiny Knot	2020-04-22 14:40:44 +02:00
DizzyEggg	e2524bed49	Metronome item	2020-04-22 12:49:25 +02:00
DizzyEggg	c8ba013539	Power Herb	2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone	2de60b5562	Fix for Avalanche's description. (#350)	2020-04-22 08:32:27 +02:00
DizzyEggg	633ebe6148	Schooling	2020-04-21 20:43:47 +02:00
LOuroboros	f8f61c10ac	Added data for Plasma Fists, Photon Geyser and Double Iron Bash (#348)	2020-04-21 20:09:28 +02:00
LOuroboros	b1afb96a02	Added descriptions for the moves that were missing one (#346)	2020-04-21 20:08:49 +02:00
Eduardo Alvaro Quezada D'Ottone	c5a6acc7db	Corrosion (#306) ... * Status move poisoning for Steel and Poison types. * Can poison itself with Toxic Orb. * Secondary effect poisoning now working. * Created a function that checks if abilities can bypass type immunities. * Created macro to handle typeimmunity * Applied review changes. * Applied review requests. * Left more readable version of HOLD_EFFECT_TOXIC_ORB.	2020-04-21 15:59:19 +02:00
DizzyEggg	a80150f890	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-04-21 11:51:35 +02:00
DizzyEggg	328e951afa	Ally Switch, tbd	2020-04-20 20:05:04 +02:00
DizzyEggg	0f628c8ff2	Fairy Lock	2020-04-20 19:41:07 +02:00
DizzyEggg	2daf1fbbf8	Geomancy	2020-04-20 19:02:03 +02:00
DizzyEggg	5d412d37d8	More Ai tweaks	2020-04-20 14:47:00 +02:00
LOuroboros	260cbe6b65	Fixed the definitions of King's Shield, Forest's Curse and Land's Wrath (#340)	2020-04-20 14:12:09 +02:00
Eduardo Alvaro Quezada D'Ottone	4697a5b687	More Battle configs (#339) ... * Fixed naming of King Shield's description variable. * Config for King Shield lowering attack. * Config for terrain type attack boost. * Standarized battle config descriptions. * Adjusted config logic accounting for GEN_8. * Changed KING_S_SHIELD back to KINGS_SHIELD * Missed B_ABILITY_WEATHER.	2020-04-20 14:11:28 +02:00
Eduardo Alvaro Quezada D'Ottone	1fdb195bd9	Added Gen 8 overworld effects. (#342) ... - LIGHTNING_ROD - FLASH_FIRE - HARVEST - STORM_DRAIN - MAGNET_PULL - INFILTRATOR - SUPER LUCK	2020-04-20 13:22:42 +02:00
DizzyEggg	3dfd19b3e2	AI Weather moves tweaks	2020-04-20 13:00:04 +02:00
DizzyEggg	28805b0f98	AI powder moves	2020-04-20 12:14:56 +02:00
DizzyEggg	d38e0d8ae5	AI dont rely on power if bad effects	2020-04-20 11:27:09 +02:00
DizzyEggg	ce28454461	Fix Life Orb fainting an already fainted mon	2020-04-20 08:55:21 +02:00
Eduardo Alvaro Quezada D'Ottone	30900879a9	Option for setting Payback's damage double damage if the opponent switches out. (#338) ... * Option for setting Payback's damage double damage if the opponent switches out. * Simplified * Moody moved to ability settings	2020-04-20 00:00:44 +02:00
DizzyEggg	dd17360ab0	Zen Mode and Shields Down	2020-04-19 21:18:39 +02:00
DizzyEggg	726af8efaa	Moody small fix	2020-04-19 16:51:29 +02:00
DizzyEggg	ad481c8688	Moody	2020-04-19 15:44:44 +02:00
DizzyEggg	c01ed5325c	Poison Touch fix	2020-04-19 14:43:54 +02:00
DizzyEggg	d5307c3e54	Poison Touch	2020-04-19 14:24:31 +02:00
DizzyEggg	6a3944d27c	Frisk, would be easier if it didnt scan 2 opponents	2020-04-19 13:37:56 +02:00
DizzyEggg	e62f1475d4	Beast Boost and Receiver	2020-04-19 12:07:56 +02:00
DizzyEggg	ee8a00be81	some ability tweaks	2020-04-18 20:34:09 +02:00
DizzyEggg	6ef28be22b	Innards Out	2020-04-18 20:12:29 +02:00
DizzyEggg	e42ead10c9	Soul Heart	2020-04-18 19:59:09 +02:00
DizzyEggg	307bbcfe97	Stakeout	2020-04-18 19:15:24 +02:00
DizzyEggg	cbc0d8a57d	Healer	2020-04-18 19:09:17 +02:00
DizzyEggg	7178ea6b46	Shore Up	2020-04-18 18:34:18 +02:00
DizzyEggg	093eca07b3	Volt Switch UTurn anim fix when cant switch out	2020-04-18 18:04:20 +02:00
DizzyEggg	68bcc76538	Fix trainer slide in shadow steal	2020-04-18 13:26:40 +02:00
DizzyEggg	1395a7d382	Loafing Around bug fix	2020-04-18 13:04:28 +02:00
DizzyEggg	a2813e63de	Slow Start	2020-04-18 12:52:15 +02:00
DizzyEggg	b5ba1de7cf	Intimidate affects defiant	2020-04-18 12:29:35 +02:00
DizzyEggg	bc86292c93	Psycho Cut fix, small AI tweak	2020-04-18 12:19:07 +02:00
DizzyEggg	34f5d9e2ae	Burn Up And Purify	2020-04-17 21:14:26 +02:00
DizzyEggg	01b6b63e99	Some more move animations. Thanks Doesnt	2020-04-17 17:44:28 +02:00
DizzyEggg	90486324c6	Animation for Tupsy Toruvy	2020-04-16 16:52:25 +02:00
PlatinumMaster	3ff8b0cb5c	Remove debug sound check.	2020-04-15 14:19:46 -04:00
PlatinumMaster	1b696e8119	Finalized pull request.	2020-04-15 13:35:12 -04:00
Eduardo Alvaro Quezada D'Ottone	81617eb577	Overworld effects (#245) ... * Snow Cloak's overworld effect. (reduces the chance of encountering wild Pokémon on Snow by 50%) * Quick Feet's overworld effect. (reduces the chance of encountering wild Pokémon by 50%) * No Guard's overworld effect. (raises the chance of encountering wild Pokémon by 50%) * Honey Gather. * Checks if honey is defined. * Applied review changes. * Fixed pointer reference * Applied requested changes. * Using weather constants.	2020-04-15 14:45:07 +02:00
DizzyEggg	4c473d057e	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-04-15 14:41:50 +02:00
AsparagusEduardo	6eefcb1f82	Using sandstorm weather constant for Sand Veil encounter rate.	2020-04-15 07:40:39 -05:00
DizzyEggg	e00b76b8da	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-04-15 13:31:52 +02:00
DizzyEggg	83b251a69c	Stamina, Liquid Voice, Water Compaction	2020-04-15 09:37:12 +02:00
PikalaxALT	a12de6e480	Merge pull request #1022 from GriffinRichards/doc-gcn ... Label GCN link flags field	2020-04-14 15:54:34 -04:00
DizzyEggg	8ea7fcc348	better ai debug	2020-04-14 13:40:27 +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
GriffinR	96958ba5e9	Drop unnecessary decor prefix	2020-04-13 13:04:22 -04:00
DizzyEggg	51e1639513	Magic Guard protects from stuff	2020-04-13 15:49:40 +02:00
MandL27	2c9ee80004	Gen 4+ moves get contest effects (#319) ... * Add contest move effects * Fix constants and also fix some laughable combo coding * comment usum moves for cleaner merge * clean up gitignore * revert gitignore * also revert moves.h because I'm bad at reading messages * add some missing effects because the spreadsheet I sourced is bad	2020-04-13 15:05:10 +02:00
DizzyEggg	cb5b673f8a	Big Root and STRENGTH Sap	2020-04-13 15:00:17 +02:00
GriffinR	dde4a0416c	Label GCN link flags field	2020-04-13 08:42:31 -04:00
DizzyEggg	51e2e0ad10	Ability pop-up for levitate and wonder guard	2020-04-13 13:06:31 +02:00
brain_face	9abda59bd1	Renamed sub_808C1B4 -> PlayerUseAcroBikeOnBumpySlope	2020-04-12 16:22:03 +02:00
brain_face	007a038031	Renamed sub_808B9D4 -> PlayerEndWheelieWhileMoving	2020-04-12 15:43:45 +02:00
brain_face	ce2fe10bec	Renamed sub_808B9A4 -> PlayerPopWheelieWhileMoving	2020-04-12 15:35:38 +02:00
brain_face	1be48a61c1	Renamed sub_808B9BC -> PlayerWheelieMove	2020-04-12 15:31:11 +02:00
brain_face	1472a3a7d4	Renamed sub_808B980 -> PlayerWheelieInPlace	2020-04-12 14:38:18 +02:00
DizzyEggg	8f61445dfe	Berserk	2020-04-12 12:41:26 +02:00
DizzyEggg	458809c5f7	Fix Payback not boosting on switching	2020-04-12 12:14:22 +02:00
DizzyEggg	060b795d8e	Merge with master	2020-04-11 19:48:24 +02:00
DizzyEggg	a2a9f259c8	Change handlinf of forbidden moves for mimic metronome etc	2020-04-11 13:22:35 +02:00
DizzyEggg	d28992d2ed	Anticipation clean-up	2020-04-11 12:34:53 +02:00
Eduardo Alvaro Quezada D'Ottone	6078cd3e15	Anticipation ability (#282)	2020-04-11 12:24:25 +02:00
DizzyEggg	bfd1874945	Assurance, attacker -> target fix	2020-04-11 12:18:58 +02:00
LOuroboros	3a202ea850	Made the opponent's self damage induced by the confusion status affect Assurance's power (#313)	2020-04-11 12:18:45 +02:00
DizzyEggg	6daab7a5c9	Fix Damp loop	2020-04-11 12:02:51 +02:00
DizzyEggg	1435cd4692	Change inner structure of semi invulerable moves	2020-04-11 11:47:13 +02:00
PikalaxALT	7eaabab3f0	Merge pull request #1020 from GriffinRichards/doc-unkanim ... Give partial labels to unknown anims	2020-04-10 14:07:23 -04:00
PikalaxALT	c08b4ff3e1	Merge pull request #1019 from GriffinRichards/constants-party ... Add misc party constant usage	2020-04-10 14:05:35 -04:00
PikalaxALT	8188615db8	Merge pull request #1018 from GriffinRichards/sync-util ... Sync link game util files	2020-04-10 14:02:53 -04:00
PikalaxALT	384a7cdef8	Merge pull request #1011 from GriffinRichards/doc-avflag ... Minor player avatar doc	2020-04-10 13:56:52 -04:00
PikalaxALT	6133c6b0af	Merge pull request #1006 from AsparagusEduardo/UsingBattleAction ... Using Battle Action constants	2020-04-10 13:56:25 -04:00
GriffinR	2615a6838e	Label unknown anims	2020-04-09 19:24:47 -04:00
GriffinR	7a5deff0bc	Add misc party constant usage	2020-04-09 15:18:53 -04:00
GriffinR	e485857df3	Sync minigame_countdown	2020-04-08 17:23:32 -04:00
GriffinR	8853588af0	Sync digit_obj_util	2020-04-08 16:27:11 -04:00
jiangzhengwenjz	afdcb69bf4	better matching approach than upstream	2020-04-02 20:30:31 +08:00
jiangzhengwenjz	61b7b45084	Merge branch 'master' of https://github.com/pret/pokeemerald into nonmatching	2020-04-02 20:26:16 +08:00
Sewef	1c895bb8d0	Match HighlightSubmenuScreenSelectBarItem	2020-04-02 13:17:33 +02:00
Sewef	096e57f56c	Match HighlightScreenSelectBarItem	2020-04-02 13:11:18 +02:00
jiangzhengwenjz	0fe5ff34dc	Pokeblock_BufferEnhancedStatText	2020-04-02 13:53:53 +08:00
jiangzhengwenjz	cd60736e36	PrintMonWeight	2020-04-02 12:15:03 +08:00
jiangzhengwenjz	69f6d2afad	HighlightSubmenuScreenSelectBarItem	2020-04-02 01:03:44 +08:00
jiangzhengwenjz	3d2c42adfe	HighlightScreenSelectBarItem	2020-04-02 01:03:25 +08:00
GriffinR	487080b425	Minor player avatar doc	2020-04-01 02:54:26 -04:00
Sewef	685f120b5e	Fix 'AnimMovmentWaves' typo	2020-03-27 14:50:15 +01:00
GriffinR	8e4b987699	Revert more porymap-breaking changes	2020-03-18 03:22:07 -04:00
AsparagusEduardo	f45336c546	Using Battle Action constants	2020-03-17 22:14:14 -03:00
GriffinR	ab87c90998	Revert city_zoom_tiles.png name	2020-03-17 12:08:05 -04:00
PikalaxALT	39da49495d	Merge pull request #1000 from GriffinRichards/doc-dex ... Document pokedex.c	2020-03-17 10:43:57 -04:00
PikalaxALT	784e29352d	Merge pull request #985 from mrgriffin/decoration ... Document decoration.c	2020-03-17 10:39:37 -04:00
PikalaxALT	7a059c75a6	Merge pull request #968 from GriffinRichards/doc-regionmap ... Document some pokenav and region map	2020-03-17 10:38:20 -04:00
DizzyEggg	3d1b546e05	Eviolite	2020-03-14 12:23:51 +01:00
Eduardo Alvaro Quezada D'Ottone	1fc89941ac	Fixed Ability Pop Up for Immunity-type abilities with Mold Breaker. (#301) ... * Fixed Ability Pop Up for Immunity-type abilities with Mold Breaker When a mon with Mold Breaker caused a status move to another one with an Immunity-type ability such as that mon healed inmiediatly from it, the ability pop up would incorrectly show the attacker's ability instead. * Compressed 3 lines into one.	2020-03-14 12:16:18 +01: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
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
AsparagusEduardo	c73fdb8954	Restored some tItemCount instances as requested.	2020-03-10 17:46:26 -05:00
AsparagusEduardo	130929a7a4	Slight item_menu.c documentation	2020-03-10 17:46:26 -05:00
AsparagusEduardo	97096aab07	Applied review changes	2020-03-10 17:45:29 -05:00
AsparagusEduardo	1b9a01798e	monMarks	2020-03-10 17:45:29 -05:00
AsparagusEduardo	fdf1faa563	SetMonIconTransparency	2020-03-10 17:45:29 -05:00
AsparagusEduardo	1159180a25	sMovingItemId	2020-03-10 17:45:29 -05:00
AsparagusEduardo	f9725affd0	MODE_2 renamed to MODE_MOVING	2020-03-10 17:45:29 -05:00
GriffinR	a495379ff0	Document pokedex cry screen	2020-03-10 14:02:03 -04:00
GriffinR	31b0cbe9b4	Document pokedex.c	2020-03-09 16:24:01 -04:00
Eduardo Quezada	f821303429	Using True/False on SetMoveEffect.	2020-03-07 16:54:13 -06: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
jiangzhengwenjz	93f0bff49c	sub_8021A28	2020-03-06 07:01:12 +08:00
jiangzhengwenjz	69aff34afd	sub_8027E30	2020-03-06 05:31:27 +08:00
GriffinR	8e1e09562e	Use array count for InitBgsFromTemplates	2020-03-03 22:46:48 -05: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
DizzyEggg	6968124529	Merge battle anim documentation	2020-02-29 13:59:41 +01:00
PikalaxALT	afe081cbba	Match MultiplyInvertedPaletteRGBComponents and MultiplyPaletteRGBComponents	2020-02-27 14:00:36 -06:00
GriffinR	172cb7bae9	Sync Unown and qmark mon folders with pokefirered	2020-02-25 14:18:28 -06: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	faf0ba8662	Use macro for randomization with ISO value	2020-02-25 12:54:08 -06:00
GriffinR	6eb44dc507	Document move anims A-C	2020-02-25 12:54:08 -06:00
GriffinR	b1d131ace2	Convert base_stats.h to UTF-8	2020-02-25 12:46:03 -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
Eduardo Alvaro Quezada D'Ottone	e1dbf8e064	Fix for Turboblaze's Battle string formatting (#281) ... * Fix for Turboblaze's Battle string formatting * Moved the "a" down the line.	2020-02-22 19:27:45 +01:00
DizzyEggg	b1b1bf7f12	Fix two turn moves not activating moxie	2020-02-22 18:43:16 +01:00
DizzyEggg	bd75f16a9b	Clear move effect after each turn	2020-02-22 18:22:04 +01:00
DizzyEggg	517974ebcb	Can't Knock Off mega stones	2020-02-22 17:30:07 +01:00
jiangzhengwenjz	097b847303	sub_802C838	2020-02-19 06:23:01 +08:00
GriffinR	3456578c0f	Move berry crush data to src	2020-02-17 13:10:23 -06:00
GriffinR	f6275cce57	Misc constant use in TV	2020-02-17 13:09:35 -06:00
GriffinR	e7ff7fb032	Fix move relearner struct	2020-02-17 13:08:03 -06:00
Eduardo Alvaro Quezada D'Ottone	1acd82ece6	Added non-traceable abilities. (#275) ... * Added non-traceable abilities. * Added ABILITIES_COUNT to array size	2020-02-17 10:59:39 +01:00
PikalaxALT	867734a791	Fix alignment in AgbRfu_LinkManager.h	2020-02-16 15:32:10 -05:00
PikalaxALT	91dd7f5cc3	Port librfu from firered	2020-02-16 13:49:36 -05:00
DizzyEggg	edb581af1f	Mega evo elevation shadow	2020-02-16 13:46:35 +01:00
DizzyEggg	5054727167	Allow second mon to throw a ball if first dead	2020-02-16 13:24:50 +01:00
LOuroboros	a1c425fffb	Fixed Bad Dreams' in battle text. (#272)	2020-02-16 13:17:00 +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
Marcus Huderle	49421a41b2	Move field effects data and graphics into own directory, and cleanup naming for object events	2020-02-12 17:32:51 -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	689acd3613	Move slot machine data to src	2020-02-09 14:11:50 -06:00
DizzyEggg	360665fac8	Fix ability preventing escape string	2020-02-09 11:02:22 +01:00
GriffinR	084bd66924	Document Trainer Card	2020-02-08 14:31:17 -06:00
GriffinR	faeb974c46	Minor berry fix data clean up	2020-02-08 14:23:41 -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	14bc2f65f3	Fix AI trying to switch when it can't, also ghosts can escape	2020-02-08 14:20:02 +01:00
DizzyEggg	c9774f6e25	Transformed Aegi cannot change forms	2020-02-08 12:09:38 +01:00
DizzyEggg	afe96552af	Fix Unnerve string	2020-02-08 11:01:39 +01:00
DizzyEggg	41f0c0acb5	Sort out ohko moves	2020-02-08 10:39:22 +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
Eduardo Alvaro Quezada D'Ottone	bd8d304c01	Spark is now Physical (#261)	2020-02-08 09:40:51 +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
GriffinR	8a96aa9e97	Name pokenav files	2020-02-04 08:02:28 -06:00
GriffinR	be5d417236	Document some pokenav menu handlers	2020-02-04 08:02:28 -06:00
Sebastian Gabl	0cf84d13ef	Use correct prefix	2020-02-04 07:42:04 -06:00
Sebastian Gabl	0bd9639478	Name Wally struct and use bag macros	2020-02-04 07:42:04 -06:00
PikalaxALT	462acaa7dc	sCombinedMoves	2020-02-01 12:07:40 -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	9a6c2c25d0	Add some capacity constants	2020-01-26 09:42:55 -06:00
GriffinR	7232bfecc2	Name null palettes	2020-01-26 09:40:35 -06:00
GriffinR	a152900211	Combine animated door frames	2020-01-26 09:40:35 -06:00
GriffinR	25d7577d9d	Label animated doors	2020-01-26 09:40:35 -06:00
Sahith Nallapareddy	25df146054	using item constant	2020-01-20 07:51:18 -06:00
GriffinR	4c12ad00d2	Merge branch 'master' into fix-eventobj	2020-01-19 21:57:29 -05:00
DizzyEggg	1d13004a0b	Fix Power Gem anim	2020-01-18 20:28:36 +01:00
DizzyEggg	06a9165f75	Fix Ice Body not working	2020-01-18 19:18:57 +01:00
DizzyEggg	bcf6b02a55	Fix Last Resort	2020-01-18 18:57:23 +01: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
jiangzhengwenjz	aa631825fc	resolve data sections	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	46b00b11d4	match all the functions	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	c2be2e8c69	sync documentation from firered	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
Sebastian Gabl	5fff2f2234	Use SHINY_ODDS macro where intended ... The 3 locations where SHINY_ODDS was added generate mon sprites for display in the dex, at game start and on starter choice. The arguments are intended for otId but in this case they are set to the same value as SHINY_ODDS to prevent the pictures created from using the shiny palette.	2020-01-15 08:10:20 -06:00
Marcus Huderle	755ae0facc	Use empty braces for last null entry in sTransitionTypes array	2020-01-13 20:31:40 -06:00
Marcus Huderle	5a2d676e71	Merge remote-tracking branch 'upstream' into tustin2121-patch-5	2020-01-13 20:26:20 -06: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	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	43962fe141	Fix BuffeInGameTradeMonName typo	2020-01-12 19:45:04 -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	6a470ddfda	Some script clean up, document secret base secrets show	2020-01-12 19:39:30 -06:00
GriffinR	0284014e0e	Add missing save status use	2020-01-12 18:42:41 -06:00
GriffinR	58e64b9524	Clean up some of save.c	2020-01-12 18:42:41 -06:00
DizzyEggg	1141e733eb	Merge with master	2020-01-12 14:29:43 +01:00
PikalaxALT	98b2ab9a77	Match sub_8072308	2020-01-10 16:38:47 -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	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
Slawter666	8b1595ebc3	Pokédex search menu documentation	2020-01-06 15:18:58 -06:00
GriffinR	c85ca4b860	Standardize farfetchd spelling	2020-01-06 15:17:11 -06:00
GriffinR	379f7f5149	Add braces to trainer party moves	2020-01-06 15:16:49 -06:00
DizzyEggg	ed46cde304	Fix Persim Berry and cure attract battler assignment	2020-01-06 21:33:44 +01:00
DizzyEggg	cafb0c3b6a	Fix Surf taking 3 pp	2020-01-04 18:17:26 +01:00
GriffinR	bb692a03eb	Add frontier mon constants	2020-01-03 23:20:11 -05:00
DizzyEggg	fcf5870062	Fix wild mons in double battles not having item	2020-01-01 11:12:04 +01: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	b15f0b3bb3	Comatose	2019-12-31 16:36:53 +01:00
DizzyEggg	7051f261d1	Fix Queenly Majesty	2019-12-31 13:33:54 +01:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
DizzyEggg	770a57bec7	Fix some moves hitting the user	2019-12-30 13:14:20 +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
Fontbane	2e8c20d72f	Update trainers.h	2019-12-25 20:48:40 -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	77842b0376	Contact moves for Aftermath and Bestow for Unburden	2019-12-25 12:19:09 +01:00
DizzyEggg	eb029d557b	Merge pull request #215 from LOuroboros/aftermath ... Implemented Aftermath's effect	2019-12-25 12:04:09 +01:00
ultima-soul	332aa80a33	Resolve review comments and encapsulate Unburden check and set.	2019-12-23 09:25:26 -08:00
ultima-soul	5786745d15	Merge branch 'battle_engine' into unburden	2019-12-23 09:01:16 -08:00
DizzyEggg	ea9109943d	Aurora Veil now only works in Hail	2019-12-23 17:50:13 +01:00
DizzyEggg	63621da46c	Heatproof lowers burn dmg	2019-12-23 17:41:42 +01:00
DizzyEggg	cec9e177d6	Gooey add check for not displaying ability pop up when not necessary	2019-12-23 17:26:48 +01: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	34bd81871c	Merge pull request #208 from Fontbane/patch-4 ... Change move names to CamelCase	2019-12-23 17:11:32 +01:00
DizzyEggg	15d34c3513	Fix strings coz they had the same name for some unknown to me reason	2019-12-23 17:09:13 +01:00
AJ Fontaine	b80fa767ab	Give rivals and Maxie battles better names ... Name describes where the battle is and for rivals, which starter the player chose.	2019-12-23 10:42:06 -05:00
DizzyEggg	9e3d5672e6	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-12-23 16:40:21 +01:00
ultima-soul	1146de4561	Implement Unburden.	2019-12-21 23:09:06 -08: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
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
Diegoisawesome	773a599bbb	Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo ... 'real' match DrawTradeMenuPartyInfo	2019-12-20 15:49:14 -08:00
Fontbane	40b7d8573d	Gooey and Tangling Hair	2019-12-20 17:38:38 -05:00
jiangzhengwenjz	4d8ea3a2d9	CanSpinTradeMon	2019-12-21 06:18:20 +08:00
jiangzhengwenjz	681d929892	DrawTradeMenuPartyInfo	2019-12-21 06:09:59 +08: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
Fontbane	186822ed0c	Fix missing parentheses	2019-12-19 13:53:07 -05:00
Fontbane	8b3a40162b	Queenly Majesty	2019-12-19 13:50:19 -05:00
Fontbane	98ce80d231	Fix move names	2019-12-19 13:47:31 -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
huderlem	f8cef9a6a8	Merge pull request #932 from jiangzhengwenjz/berry_crush ... berry crush	2019-12-17 19:35:00 -06:00
GriffinR	4879c1eab2	Merge branch 'master' into constants-fade	2019-12-17 19:11:51 -05:00
jiangzhengwenjz	420b4b3fea	use STR_CONV_MODE_* constants	2019-12-18 06:42:53 +08:00
jiangzhengwenjz	5bec27aa34	nonmatch sub_8024604	2019-12-18 03:36:51 +08:00
jiangzhengwenjz	67690df65f	sub_8023CAC	2019-12-17 23:12:01 +08:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
jiangzhengwenjz	50c48d7ef6	sub_8023BC0	2019-12-17 14:49:57 +08:00
ultima-soul	029ab67ff4	Implement Leaf Guard.	2019-12-16 00:29:20 -08:00
jiangzhengwenjz	efa1ee1822	sub_8022250	2019-12-16 14:17:29 +08:00
jiangzhengwenjz	3f858c1c26	sub_8022F04	2019-12-16 14:17:29 +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	a04347816f	Split PokenavMatchCallEntries from PokenavMonList	2019-12-15 10:25:47 -05:00
GriffinR	82f55f2381	Merge master into ObjEvent rename	2019-12-15 02:00:00 -05:00
AJ Fontaine	2e7c21e528	Vise Grip to Vice Grip ... The weird thing is "vice" is the British way of saying it and "vise" is the American way, but the change happened in games based on the UK. Now matches its Gen 7 name.	2019-12-14 17:01:33 -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	09840efc64	Name last event_data funcs	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
GriffinR	b7ab9cbf4c	Update JP translation and fix typo	2019-12-10 19:29:23 -06:00
GriffinR	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -06:00
GriffinR	8da7a94423	Merge branch 'master' into fix-eventobj	2019-12-10 17:41:08 -05:00
Diegoisawesome	49b56d0136	Merge pull request #929 from jiangzhengwenjz/nonmatching ... fake match InitEventObjectStateFromTemplate	2019-12-10 14:32:57 -08:00
jiangzhengwenjz	f34b8f564a	InitEventObjectStateFromTemplate	2019-12-11 05:35:40 +08:00
AJ Fontaine	25434b5179	Change move names to CamelCase ... To match with Gen 4 and 5. "Vicegrip" was changed to "Vice Grip" in Gen 6 and then "Vise Grip" in Gen 8, so I changed it to "Vise Grip".	2019-12-09 11:09:57 -05:00
DizzyEggg	9b459eb64a	Fix atk49state	2019-12-09 08:41:09 +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
GriffinR	77bf40d32b	Fix modern build for #925	2019-12-08 16:57:09 -05:00
GriffinR	51179df017	Clean up match call doc	2019-12-08 15:49:36 -05:00
GriffinR	0086cd1efa	More pokenav match call documentation	2019-12-08 15:25:21 -05: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
Slawter666	47ea65b96e	Requested changes	2019-12-06 19:06:21 -06:00
Slawter666	9fc176f272	Document pokedex info page	2019-12-06 19:06:21 -06:00
GriffinR	05af6b467c	Fix Subsprite formatting	2019-12-06 19:05:44 -06:00
GriffinR	c26e8b8ddb	More SPRITE macro usage	2019-12-06 19:05:44 -06:00
GriffinR	2756771958	More usage of ST_OAM constants and SPRITE macros	2019-12-06 19:05:44 -06:00
GriffinR	c40879aa36	Use ST_OAM constants for OamData definitions	2019-12-06 19:05:44 -06: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	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	1b30f0c973	Rename event_obj_lock to event_object_lock	2019-12-06 02:55:30 -05:00
GriffinR	cc9b923dc2	More pokenav match call documentation	2019-12-06 02:35:08 -05: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
AJ Fontaine	2d1a780dd8	Fix Hondrew Berry typo	2019-11-28 11:44:13 -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	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
GriffinR	cfdde42b00	Name text speed delays	2019-11-25 09:16:05 -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
GriffinR	f039e897ca	Use APPRENTICE_COUNT for record_mixing mod	2019-11-23 10:11:05 -05:00
Sewef	1dfe34dee3	TriForce → TriAttack	2019-11-23 15:51:08 +01:00
Thomas Winwood	e3f7f47321	Turn some magic numbers into named constants	2019-11-23 07:53:26 -06: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	8910739d8c	Rename mapObect to objectEvent	2019-11-21 01:40:38 -05:00
GriffinR	570881b119	Rename event_object directories	2019-11-21 00:44:55 -05:00
GriffinR	7034f59c14	Rename EventObj to ObjEvent	2019-11-21 00:14:40 -05:00
GriffinR	98b81722e7	Rename field_objet_palettes	2019-11-20 23:54:22 -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	81507fc8b7	Move Apprentice data	2019-11-20 19:04:25 -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
Slawter666	c455fcfa59	Pokedex documentation	2019-11-20 09:01:50 -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	f7e17ca985	Document Ranking Hall scripts	2019-11-17 08:16:28 -06:00
GriffinR	0dd73a03de	Update comment for CheckFinalTime	2019-11-16 13:02:35 -06:00
GriffinR	b96fad074b	Rename neverRead fields	2019-11-16 13:02:35 -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	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
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	eb38922e42	Fix mislabeled SS Tidal movements	2019-11-14 18:07:56 -06: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	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	7455bd9b9a	Document interview and TV scripts, and misc script clean up	2019-11-12 14:20:05 -05:00
DizzyEggg	e82fc06e08	Match ConvertImageProcessingToGBA	2019-11-12 17:25:02 +01: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	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
Thomas Winwood	a727c16012	Use descriptive constant for ScriptGiveMon call	2019-11-09 08:37:45 -06:00
GriffinR	a38bff8c17	Document Slateport 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
huderlem	662a9915cf	Merge pull request #881 from GriffinRichards/doc-caves ... Document cave scripts	2019-11-07 18:29:48 -06:00
Marcus Huderle	01e6fb6dd0	Document some battle_bg-related things	2019-11-07 18:24:04 -06: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	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	fbc3eee1f2	Document Fossil Maniac and Berry Master route houses	2019-11-06 17:01:23 -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	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
huderlem	a4b4ecd470	Merge pull request #787 from GriffinRichards/rename-tablecmds ... Rename table cmds	2019-11-04 16:31:27 -06:00
tustin2121	d4582cb874	Requested change from pkmn to mon	2019-11-04 16:25:46 -06:00
Tustin2121	2fe9d7a81f	Document showing pokemon in credits	2019-11-04 16:25:46 -06:00
DizzyEggg	149b3453f6	Fix Punishment dmg	2019-11-03 19:58:04 +01: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
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
tustin2121	218fcd99b3	Itemfinder code should use flag constant	2019-10-31 21:34:03 -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	b33db9b96c	Move party menu data	2019-10-31 14:16:43 -04:00
GriffinR	aec7eb6089	Clean up party_menu doc	2019-10-31 14:11:55 -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
DizzyEggg	780517fec7	Fix weather for pre gen6	2019-10-26 18:28:02 +02: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	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
GriffinR	5b845bb0a0	Review changes for #852	2019-10-21 17:21:53 -05:00
GriffinR	973e6f9667	Document mauville_man.inc	2019-10-21 17:21:53 -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	dcefd3c593	Update battle_anim_effects_3.c	2019-10-21 18:01:18 +02:00
DizzyEggg	621dd4f0bf	Fix Sheer Force moves and effects happening	2019-10-21 14:48:03 +02: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
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	ed1f5a7455	Conflits 3/2 ... Nice one, git	2019-10-16 19:32:02 +02:00
Sewef	c280d0e00e	Another fix, Conflicts 2/2	2019-10-16 19:26:08 +02:00
Sewef	e7d36a76e1	Forgotten fix, conflits 1/2	2019-10-16 19:21:58 +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	0f15264595	Document rotating_tile_puzzle	2019-10-16 04:09:30 -04: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
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	9b9b14ad0a	remove empty groups from wild encounter fields json objects	2019-10-14 18:12:03 -05:00
garak	c73e20b6af	add subgroups for fishing rods to encounter json	2019-10-14 18:12:03 -05:00
Sewef	8dacb53029	Update battle_anim_effects_1.c	2019-10-14 23:31:29 +02: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	ddd4639b82	Started labelling battle_anim_effects_1	2019-10-13 22:35:31 +02:00
GriffinR	30ef494163	Merge branch 'master' into doc-inc2	2019-10-13 15:44:07 -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
jiangzhengwenjz	9b81fe1b62	sub_810E520	2019-10-11 20:11:00 -05:00
GriffinR	3514f9dd6b	Clean up trade.c doc	2019-10-10 18:46:42 -04: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	7ba11b7a1b	Use VAR_FACING constants	2019-10-07 16:36:02 -05: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
Marcus Huderle	4494b5d4cb	Document collision types	2019-10-06 15:48:26 -05:00
Marcus Huderle	799edaf3e6	Document hide/show reflection movement actions	2019-10-06 14:17:34 -05:00
GriffinR	748a1dbdd4	Document cave hole	2019-10-06 14:16:37 -04:00
GriffinR	66a68159b1	Continue trade doc	2019-10-05 10:41:37 -04:00
GriffinR	a6847ca1d9	Note overflow in ModifyStatByNature	2019-10-05 09:24:57 -05: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	2b0c944286	Document more of trade	2019-10-04 07:42:45 -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
PikalaxALT	cb528cb543	Merge pull request #821 from GriffinRichards/document-textinput ... Document text input strings	2019-10-02 09:49:26 -04:00
PikalaxALT	0d13a85855	Merge pull request #822 from GriffinRichards/document-fieldspecials ... Document a few field specials	2019-10-02 09:22:09 -04:00
PikalaxALT	9317d114a9	Merge pull request #823 from GriffinRichards/constants-strconv ... Use STR_CONV constants	2019-10-02 09:18:48 -04:00
GriffinR	c5cb45991b	Document PrintItemXAmount	2019-09-30 15:53:24 -04:00
GriffinR	5325835ee7	Use STR_CONV constants	2019-09-30 15:43:44 -04:00
GriffinR	9aed405851	Document a few field specials	2019-09-30 01:42:52 -04:00
GriffinR	a923ae78c3	Add missing page num usage	2019-09-30 00:13:08 -04:00
GriffinR	53bc1bd0d1	Document text input strings	2019-09-30 00:09:29 -04:00
Tustin2121	5007d279fe	Review fixes	2019-09-29 16:33:13 -04:00
GriffinR	73b96fe145	Rename CONTACT macros to ON_DAMAGE	2019-09-27 12:27:36 -04:00
PikalaxALT	301822603e	Merge pull request #802 from PikalaxALT/gflib ... Gflib and libagbsyscall	2019-09-27 11:34:55 -04:00
PikalaxALT	7b8b5b5c8c	Merge branch 'master' into gflib	2019-09-27 09:11:22 -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
Ariel Antonitis	208e1c9689	Removed 'Summary_' prefix.	2019-09-25 20:44:17 -05:00
Ariel Antonitis	ea638b82fa	Fixed typo.	2019-09-25 20:44:17 -05:00
Ariel Antonitis	4b7f096bbd	Relabeled unknown functions in pokemon_summary_screen.c	2019-09-25 20:44:17 -05: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
Marcus Huderle	1ae352bcb6	Cleanup whitespace	2019-09-25 16:45:57 -05:00
jiangzhengwenjz	405384de89	Phase2_Ripple_Func2	2019-09-25 16:45:57 -05:00
jiangzhengwenjz	9aaf498471	CopyTileMapEntry	2019-09-25 16:37:42 -05:00
huderlem	886f043025	Merge pull request #816 from jiangzhengwenjz/ptch-3 ... get rid of goto in battle_script_commands	2019-09-25 16:31:53 -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	459fca289c	Review changes for #806	2019-09-17 16:50:42 -05:00
GriffinR	5092ad376d	Dynamic ordering for options names	2019-09-17 16:50:42 -05:00
GriffinR	1be131f843	Dynamic ordering for options menu	2019-09-17 16:50:42 -05: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	340c4e1411	Clean up script_movement documentation	2019-09-16 19:30:36 -05:00
GriffinR	f9a8f44a29	Document script_movement	2019-09-16 19:30:36 -05:00
GriffinR	6c9997a906	Document decor icons	2019-09-16 19:23:21 -05:00
GriffinR	b46c4b6703	more constant usage	2019-09-16 19:21:23 -05:00
GriffinR	85d97542cd	Use MAX_MON_MOVES constants	2019-09-16 19:21:23 -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
tustin2121	711e7d884c	Document cave transition code.	2019-09-10 13:43:33 -04:00
PikalaxALT	27aae9da9a	Fix modern	2019-09-08 21:41:40 -04:00
PikalaxALT	306ce048ad	Move gflib srcs and headers to gflib subdir	2019-09-08 21:07:54 -04:00
GriffinR	9fbcd552de	document remainder of secret_base scripts, delete unneeded scripts.incs	2019-09-06 02:12:00 -04:00
PikalaxALT	e87f4f4cc7	Unify TrHillTag struct definitions (variable floors)	2019-09-05 20:48:48 -05:00
PikalaxALT	904bba9e16	NULL_BATTLE_TOWER_POKEMON define	2019-09-05 20:48:48 -05:00
PikalaxALT	e2fbce996e	Use designated initializers (C99 feat)	2019-09-05 20:48:48 -05:00
PikalaxALT	f3bed6045e	Disassemble data/ereader_screen.s	2019-09-05 20:48:48 -05:00
PikalaxALT	a9918c3b89	Partial refactor of TryWriteTrainerHill_r	2019-09-05 20:48:48 -05:00
PikalaxALT	cb0fa2fdc3	Minor edit to save trainer hill routine	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
PikalaxALT	8d910465f8	Minor refactor of ereader_helpers.c	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
PikalaxALT	1e1a4076f0	Merge pull request #798 from GriffinRichards/constants-baction ... Use misc battle constants	2019-09-05 09:06:31 -04:00
GriffinR	eb0b73c14e	Use CountAliveMonsInBattle constants	2019-09-04 17:47:29 -04:00
GriffinR	c647a8329f	Use gBattlerPositions constants	2019-09-04 17:45:04 -04:00
GriffinR	4a0cad80b0	Use B_SIDE constants ... Also includes a CHAR_X constant use for X items	2019-09-04 17:06:59 -04:00
PikalaxALT	5c7eac7134	Merge pull request #744 from PikalaxALT/remove_tutor_casts ... Remove unnecessary tutor learnset casts	2019-09-04 16:51:06 -04:00
PikalaxALT	36723a235a	Merge pull request #735 from garakmon/encounter_json ... Add Different Field Info to Wild Encounters JSON	2019-09-04 16:50:39 -04:00
GriffinR	6b04ea0727	Merge branch 'master' into document-eventscripts	2019-09-03 22:22:14 -04:00
GriffinR	5f457dd459	Use B_ACTION constants	2019-09-03 15:08:25 -04:00
DizzyEggg	cfb49cdd0b	Truant not dumb	2019-09-01 14:23:11 +02:00
GriffinR	5d30304f4e	Use OTID constants for CreateMon	2019-08-30 22:13:14 -05:00
DizzyEggg	a41ecf7101	more ai stuff, baton pass perish song strats	2019-08-30 17:57:19 +02:00
DizzyEggg	7647941ec4	Fix Truant in new switch in system	2019-08-30 12:51:56 +02:00
DizzyEggg	f979987c2f	Fix Intimidate and Trace on new switch in system	2019-08-30 12:25:21 +02:00
tustin2121	cdae0c1444	Change event object graphics pointer table to use explicit indexes ... - This makes it easier for future hack makers to rearrange, add, or delete graphic object ids without having to count indexes or keep them in order. - Porymap will have to be updated, but I have some code for this already in a fork.	2019-08-29 16:44:10 -05:00
jiangzhengwenjz	4f9052cb96	get rid of goto in battle_script_commands	2019-08-28 06:06:17 +08:00
DizzyEggg	f19a51eea6	More ai tweaks	2019-08-27 18:54:01 +02:00
DizzyEggg	91b364e8d6	Ai use most powerful move smarrter	2019-08-27 18:29:34 +02:00
DizzyEggg	63355d6a3b	Fix no targets issue and switching faint issu	2019-08-26 14:55:55 +02:00
DizzyEggg	cda75bca70	lol am dumb	2019-08-25 15:39:56 +02:00
DizzyEggg	c97869018d	Fix Mega Indicator appearing and priority	2019-08-25 15:33:28 +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
ultima-soul	d3ea25ee7f	Synchronize with pokefirered pokedex.c.	2019-08-24 11:17:11 -07:00
GriffinR	869d0eebc0	Rename atk## constants and states	2019-08-23 08:46:21 -04:00
GriffinR	2cb174b4ea	rename BattleAICmd prefix	2019-08-23 08:10:37 -04:00
GriffinR	68905e3961	rename atk## prefixes	2019-08-23 07:55:36 -04:00
Diegoisawesome	8e7abad720	Merge pull request #786 from DizzyEggg/u8 ... GetAbilityBySpecies's arg from bool8 to u8	2019-08-22 17:45:56 -05:00
DizzyEggg	d09c290eba	bool8 to u8	2019-08-22 16:46:33 +02:00
DizzyEggg	143cb7ad35	Updated switch mechanics	2019-08-22 15:57:33 +02:00
Kevin Mills	f76f395563	use MENU_FIELD_MOVES in sub_81B31B0	2019-08-21 18:20:45 -05:00
GriffinR	4228750e38	more documentation in match_call_data ... Documents everything related to UnkStruct_08625388, names HasCheckPage functions, fixes mislabeled Brendan/May headers, and adds header count to pokenav_unk_3	2019-08-21 17:18:38 -05:00
PikalaxALT	5b8d0f1c33	Remove MNUM from oam flip constant names	2019-08-21 17:15:23 -05:00
PikalaxALT	f7cf4fa154	Use HFLIP, VFLIP	2019-08-21 17:15:23 -05:00
PikalaxALT	a4d5624ad6	Move asm srcs to src	2019-08-21 17:08:40 -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	771a7b25fa	move data, more contest 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	5d96a0cc97	minor fixes	2019-08-21 17:06:55 -05:00
GriffinR	fc467a9d52	standardize favour/favor	2019-08-21 17:06:55 -05:00
GriffinR	23979c4d7d	initial documentation commit	2019-08-21 17:06:55 -05:00
DizzyEggg	f05375112b	Erase isEgg field from battlemon, ability num to 2 bits	2019-08-21 11:56:49 +02:00
DizzyEggg	e4787bacbc	merge	2019-08-19 14:50:47 +02:00
Diegoisawesome	90edf596d8	Merge pull request #780 from GriffinRichards/document-rematchconstants ... trainer rematch macro	2019-08-17 22:41:41 -05:00
Tustin2121	a708caac6d	Suggested changes from review	2019-08-17 13:32:26 -04:00
Tustin2121	d12a8c10ee	Documenting credits a bit	2019-08-17 13:26:44 -04:00
Tustin2121	bac8974ce3	Added note about addvar ... The contest scripts actually use addvar to add a -1 to a variable instead of using subvar to subtract a positive number. This is fine in vanilla, where addvar script command does NOT support adding the value of a variable to another variable (like subvar supports), but should anyone want to change it, contests will be inexplicably broken.	2019-08-17 13:26:31 -04:00
Tustin2121	9bcd39d86c	Document the braille window id.	2019-08-17 13:20:18 -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
GriffinR	3c2576d3a3	trainer rematch macro	2019-08-16 13:48:45 -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	08fe3b21ed	Fix modern ... Fixes freeze on entering Pokemon Storage System	2019-08-12 11:43:31 +02:00
DizzyEggg	c9de753ecc	Illusion	2019-08-08 13:06:55 +02:00
PikalaxALT	37d23230fa	Address review comments	2019-08-06 09:26:55 -04:00
PikalaxALT	1cff6672cf	fix s32/int type mismatch on modern	2019-08-06 09:13:19 -04:00
PikalaxALT	5040a5f96b	Move pokenav syms around	2019-08-05 20:23:56 -04:00
PikalaxALT	b05df0377e	Finish pokenav_unk_9	2019-08-05 17:17:05 -04:00
PikalaxALT	1f62caae43	Some cleanup	2019-08-05 15:49:05 -04:00
PikalaxALT	195137b001	Merge pull request #768 from PikalaxALT/pokenav_unk_8 ... Finish pokenav_unk_8	2019-08-05 15:21:20 -04:00
PikalaxALT	5d07123354	Remove unnecessary casts	2019-08-05 14:32:30 -04:00
PikalaxALT	a7eb4f9dd2	Make pokenav_unk_8 syms static, fix gcc-9 warnings	2019-08-05 14:00:38 -04:00
PikalaxALT	e2e667d4b5	Finish pokenav_unk_8	2019-08-05 13:47:04 -04:00
PikalaxALT	330fc46df8	through sub_81CF3F8	2019-08-05 12:21:45 -04: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
PikalaxALT	18f29c566a	through sub_81CF278	2019-08-05 10:54:56 -04:00
PikalaxALT	463e1eb6b8	Name some fields in Pokenav2Struct	2019-08-05 09:17:21 -04:00
PikalaxALT	329670e16e	Minor fixes	2019-08-05 08:46:52 -04:00
PikalaxALT	a42e5c24e6	Use LT return defines	2019-08-05 08:40:03 -04:00
PikalaxALT	51d5ee771d	Merge branch 'master' into pokenav_unk_2	2019-08-05 08:33:45 -04:00
PikalaxALT	1fc64b8582	Merge pull request #767 from DizzyEggg/pokenav_8 ... More pokenav	2019-08-05 08:21:36 -04:00
DizzyEggg	0dd9a3dd0c	Fix Stealth Rock msg and target	2019-08-05 12:26:53 +02:00
DizzyEggg	9823d2bdf1	Fix mega evo indicator priority on lvl-up-box	2019-08-05 12:15:15 +02:00
DizzyEggg	2c2b807a57	Special Def boost for rock types in sandstorm	2019-08-05 11:48:50 +02:00
DizzyEggg	8542e7fb1f	Blizzard 100% accuracy in hail	2019-08-05 11:39:31 +02:00
DizzyEggg	34a7b8bf76	Burn affects physical moves only	2019-08-05 11:30:25 +02:00
DizzyEggg	2863045241	Fix switch-in abilities text/pop-up	2019-08-05 11:24:49 +02:00
PikalaxALT	ffc7a9be27	Fix build errors	2019-08-04 21:23:38 -04:00
PikalaxALT	ff2166b8fe	pokenav_unk_2: unclutter global namespace	2019-08-04 21:10:08 -04:00
PikalaxALT	299c3cf1dc	Finish pokenav_unk_2	2019-08-04 20:39:36 -04:00
PikalaxALT	2dee42dbaf	through sub_81CA474	2019-08-04 18:15:02 -04:00
DizzyEggg	c219776034	Merge with master	2019-08-04 23:09:28 +02:00
PikalaxALT	cd876292d1	Merge branch 'master' into pokenav_unk_2	2019-08-04 15:35:35 -04:00
DizzyEggg	c8cc39cb57	More pokemav, massive clean-up, seriously who the left the file in this state???	2019-08-04 19:09:12 +02:00
PikalaxALT	fa5bfc1627	Merge pull request #766 from DizzyEggg/pokenav_10 ... Decompile pokenav 10	2019-08-04 11:07:10 -04:00
PikalaxALT	41e1f9b224	Merge pull request #763 from DizzyEggg/patch-8 ... Fakematch sub_819A080	2019-08-04 11:05:17 -04:00
DizzyEggg	252df94bc1	Decompile pokenav 10	2019-08-04 13:53:00 +02:00
DizzyEggg	bb7e5ecc19	Pokemon jump	2019-08-04 00:18:58 +02:00
DizzyEggg	1641579297	Merge branch 'master' into pok_jump	2019-08-04 00:02:13 +02:00
DizzyEggg	5fbb11313b	Fakematch sub_819A080 ... Really wanted to match this one, but it just doesn't cooperate, oh well	2019-08-03 20:10:28 +02:00
PikalaxALT	ce941e6f56	Merge pull request #762 from GriffinRichards/GriffinRichards-documentation ... Documenting MAPSEC use in pokenav match call data	2019-08-03 11:10:42 -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
GriffinR	851a814912	typo fix	2019-08-02 22:23:40 -04:00
GriffinR	cff8331a8f	Update pokenav_match_call_data.c	2019-08-02 13:47:30 -04:00
GriffinR	3c4843f273	Update pokenav_unk_3.c	2019-08-02 12:46:18 -04:00
GriffinR	38a69d3e5f	sub_81D16DC in pokenav_match_call_data	2019-08-02 12:43:49 -04:00
GriffinR	97d58669b7	Document MapSec get functions	2019-08-02 12:40:14 -04:00
GriffinR	37ebfa40f9	Two more uses of MAPSEC_NONE and mapSec field name	2019-08-02 12:30:00 -04:00
GriffinR	cf253062b9	Use MAPSEC constants in sWallyAdditionalData	2019-08-02 10:58:03 -04:00
GriffinR	a9247181e8	Update pokenav_match_call_data.c	2019-08-02 10:52:40 -04:00
DizzyEggg	3280d40506	Match sub_8026324	2019-08-02 11:20:15 +02:00
GriffinR	4cea2ffa32	Use MAPSEC constants for pokenav match call data ... Wally and Prof. Birch are skipped. Wally has a variable location, and Prof Birch (despite being listed as .v1 = 0, which is Littleroot) is actually listed as location unknown in the pokenav. Rival is also skipped, as they dont have a location field and are also listed as unknown	2019-08-01 23:01:53 -04:00
DizzyEggg	02d975a837	Tabs to spaces	2019-08-02 00:49:31 +02: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	07015aa7ae	Fix tabs.	2019-07-30 17:25:19 -07:00
ultima-soul	9a152f8fe6	Decompile data/use_pokeblock.s	2019-07-30 17:21:17 -07:00
PikalaxALT	a08cbaee0a	pokenav_unk_2 staging	2019-07-30 19:46:56 -04:00
DizzyEggg	ba1a70419a	Start dodrio magic	2019-07-31 00:27:30 +02:00
Diegoisawesome	242bed733f	Merge pull request #755 from DizzyEggg/patch-7 ... Functionally equivalent CopyGlyphToWindow	2019-07-30 14:35:04 -05:00
PikalaxALT	370e9afb37	Merge pull request #746 from garakmon/navdata ... Pokenav Data	2019-07-30 15:03:12 -04:00
PikalaxALT	520eeae678	Merge pull request #756 from camthesaxman/vram ... remove hardcoded VRAM addresses	2019-07-30 15:00:05 -04:00
DizzyEggg	7133f5db94	Clean up battle anim effects file	2019-07-30 15:08:49 +02:00
DizzyEggg	bcb17af751	Clean up contest link 80f57c4 file	2019-07-30 13:48:12 +02:00
ultima-soul	c77dc74410	Match TryInterruptEventObjectSpecialAnim without asm hack.	2019-07-29 17:52:01 -07:00
garak	08a3ff77dd	index to slot in c file	2019-07-29 20:02:43 -04:00
DizzyEggg	81a11c4fc9	Gets rid of unnecesary casts in pokemon.c	2019-07-29 21:45:06 +02:00
DizzyEggg	af55029843	Prettier GetDeoxysStat	2019-07-29 21:44:03 +02:00
DizzyEggg	ff2dcf5413	Two fakematches out	2019-07-29 21:09:05 +02:00
garak	0c35ec2f7b	fix build	2019-07-29 13:40:47 -04:00
garak	2580693ea5	INDEX to SLOT in encounter inja template	2019-07-29 13:12:20 -04:00
garak	5b57c001f5	Merge branch 'master' into navdata	2019-07-29 13:06:45 -04:00
garak	54c635683c	fix some more pokenav	2019-07-29 13:03:03 -04:00
garak	b6483d7026	name match call messages by trainers	2019-07-29 12:58:15 -04:00
DizzyEggg	a4a382a004	Match sub_81D2278 and poke jump clean	2019-07-29 16:22:50 +02:00
DizzyEggg	e634e722cc	Decompile pokemon jump	2019-07-29 12:35:57 +02:00
camthesaxman	87ac555e71	remove hardcoded VRAM addresses	2019-07-28 21:18:28 -05:00
DizzyEggg	3ad14f2b33	Functionally equivalent CopyGlyphToWindow	2019-07-28 10:37:44 +02:00
DizzyEggg	9ff4c0695e	bss data to static	2019-07-26 10:16:00 +02:00
DizzyEggg	56b124fdec	Some more pokenav	2019-07-25 21:41:02 +02:00
DizzyEggg	fd07c608fc	Decompile pokemon unk 6	2019-07-25 18:56:08 +02:00
DizzyEggg	33c036e7ff	Decompile pokemonav 7	2019-07-24 17:02:52 +02:00
PikalaxALT	6ff1426abe	Quieter "make tools"	2019-07-23 16:17:00 -04:00
DizzyEggg	8cc776e2ee	tilemap glitch gpu reg fix hopefully	2019-07-23 21:30:53 +02:00
garak	cd6fd3110f	fix modern build	2019-07-20 13:27:57 -04:00
garak	c39d25ff4d	Merge branch 'master' into navdata	2019-07-20 12:30:41 -04:00
PikalaxALT	8d0d5cfd55	Merge branch 'master' into modern_gcc	2019-07-20 11:51:22 -04: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
PikalaxALT	20863ac85b	Resolve compile warnings in modern	2019-07-18 20:46:00 -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
PikalaxALT	71dff6dbf1	Remove unnecessary tutor learnset casts	2019-07-10 16:38:05 -04:00
pokballs	717c3350c4	updated function name for deposit item amount to pc	2019-07-09 16:40:04 -05:00
DizzyEggg	c3733f4b95	Decompile 4 berry crush functions	2019-07-09 16:39:29 -05:00
DizzyEggg	11fb13d635	Some pokemon jump work	2019-07-09 16:39:29 -05:00
DizzyEggg	3e476adf4a	Stockpile gen4 effect and fixed spit up	2019-07-09 19:06:12 +02:00
DizzyEggg	d3d9051c4a	Allow evolution after exp from mon catching	2019-07-08 13:26:21 +02:00
PikalaxALT	7fd327d632	Stack-free IWRAM clear	2019-07-07 21:41:11 -04:00
DizzyEggg	d1fa9c24cc	Fix Wory Seed string	2019-07-07 09:58:36 +02:00
DizzyEggg	ed28b46cc5	Merge branch 'master' into battle_engine_v2	2019-07-07 09:49:21 +02:00
DizzyEggg	385fc49ef3	Merge pull request #163 from SBird1337/feature/animpack2 ... Some animations	2019-07-07 09:49:09 +02:00
Karathan	bcffc2655e	fix style issues	2019-07-06 05:25:56 +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
PikalaxALT	8d224bf941	Merge branch 'master' into modern_gcc	2019-07-02 13:47:34 -04: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
Diegoisawesome	81b84503fa	Merge pull request #734 from DizzyEggg/patch-1 ... Match sub_81D1B40	2019-07-02 20:25:31 +09:00
Diegoisawesome	ba7fe29d47	Merge pull request #736 from DizzyEggg/patch-2 ... Match sub_802671C	2019-07-02 20:07:20 +09:00
Diegoisawesome	f25a75f9e9	Merge pull request #737 from DizzyEggg/patch-3 ... Match sub_800EFB0	2019-07-02 20:06:33 +09:00
Diegoisawesome	b123e4a73b	Merge pull request #738 from DizzyEggg/patch-4 ... Match unref_sub_8119094	2019-07-02 20:05:58 +09:00
Diegoisawesome	c3e683789c	Merge pull request #739 from DizzyEggg/patch-5 ... Clean up code in HoldContestPainting	2019-07-02 20:05:27 +09:00
Karathan	5f7b5ba453	add feint and pluck animation sprites and implementations	2019-07-02 06:22:05 +02:00
garak	4594c955b4	create defines to support encounter index ratios	2019-07-01 23:47:45 -04:00
DizzyEggg	2da0e73ec7	Get rid of unneccesary cast in text.c	2019-07-01 21:08:49 +02:00
DizzyEggg	548f486398	Clean up code in HoldContestPainting	2019-07-01 17:47:47 +02:00
DizzyEggg	5ce047c26c	Match unref_sub_8119094 ... Gotta match these unused functions, am I right?	2019-07-01 15:06:58 +02:00
PikalaxALT	f300f9e699	Revert FLOAT_U* and DOUBLE_U* macros	2019-06-30 19:31:29 -04:00
PikalaxALT	92f17e8812	Document pokemon_animations sprite ptr bug	2019-06-30 19:19:26 -04:00
DizzyEggg	42462b6730	Match sub_800EFB0	2019-06-30 21:07:25 +02:00
DizzyEggg	11ef698344	Match sub_802671C ... Also got sub_8026324 a bit closer, but it's still a mess.	2019-06-30 20:26:48 +02:00
PikalaxALT	04c9793429	Fix pokemon_animation.c	2019-06-30 13:49:24 -04:00
garak	adb0a44457	add field info to wild pokemon json	2019-06-30 12:05:45 -04:00
DizzyEggg	c409d19530	Match sub_81D1B40	2019-06-30 17:14:41 +02:00
Michael Panzlaff	7500534676	fix unaligned memory access in BlendPalette ... This problem is only going to occur in versions where the palette buffer isn't aligned to 4 bytes (which it is in a matching pokeemerald). Since agbcc returns sizeof(PlttData) = 4, it will read words instead of half words. This causes unnecessary emulator warnings in the function "BlendPalette". Aligning the buffers to 4 bytes fixes this.	2019-06-29 11:08:46 -05:00
PikalaxALT	f9d8678db4	Additional fixes ... Rearrange gbafix to not modify file in the event of failure Fix bug where Dma3Manager may get stuck when compiled with gcc-9.1.0	2019-06-29 11:41:26 -04:00
PikalaxALT	4b759da714	Wildcard bss, ewram_data, and COMMON in modern toolchain	2019-06-29 08:35:52 -04:00
DizzyEggg	c14cc798af	Add bs cap to switching	2019-06-28 09:30:35 +02:00
PikalaxALT	b839c21307	Fix/suppress warnings when building with gcc-8	2019-06-26 16:42:57 -04:00
PikalaxALT	fb06e4a3c9	Modernize code ... Can compile with arm-none-eabi-gcc 8.3.0 gbafix correctly handles ELF input	2019-06-26 12:12:10 -04:00
DizzyEggg	48c801245c	Fix Synchronize	2019-06-25 13:04:14 +02:00
DizzyEggg	a98c5ab78a	Merge branch 'master' into battle_engine_v2	2019-06-24 12:12:56 +02:00
PikalaxALT	f3c7e1cc81	Add comment to merged field	2019-06-21 18:18:29 -05:00
PikalaxALT	d22c630b2b	Merge two fields in party_menu heap struct	2019-06-21 18:18:29 -05:00
PikalaxALT	3f43523352	Add comment to merged field	2019-06-21 12:38:11 -04:00
PikalaxALT	d0bd1df531	Merge two fields in party_menu heap struct	2019-06-21 09:54:48 -04: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	aade9f5f5a	Cherrim	2019-06-16 09:30:05 +02:00
DizzyEggg	c80861d85e	Add hopefully support for Cherrim	2019-06-15 14:46:35 +02:00
DizzyEggg	aaea5398f4	Fix Castfrom ability pop-up and refactor one function	2019-06-14 12:58:29 +02:00
DizzyEggg	594b363730	Fix Assurance	2019-06-12 13:57:14 +02:00
DizzyEggg	dd5c9c790d	Fix Flash Fire string	2019-06-11 10:57:02 +02:00
DizzyEggg	272fa07799	AI switch mons if all moves are not usable	2019-06-11 10:45:12 +02:00
DizzyEggg	30bd85a58a	Fix changed name	2019-06-10 11:32:23 +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
DizzyEggg	818e1909ff	Make nonmatching PSS functions functionally equivalent	2019-05-26 07:17:05 -05:00
Slawter666	5f292d621a	Use event object constants	2019-05-25 14:41:48 -05: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	ad63540522	Fix mega evo issues	2019-05-24 11:27:02 +02:00
DizzyEggg	65be7868ec	Fix string	2019-05-23 12:38:41 +02: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	01ee73adf6	Fix Flame Body Static ability pop-up activation	2019-05-23 09:47:21 +02:00
DizzyEggg	28227dfd88	Fix Life Orb string	2019-05-23 09:20:02 +02:00
Papa Cancer	e53ba4773d	Documenting bags, berries and graphics ... Bag graphics and berry graphics mostly documented item_menu.c significantly documented Bag structs documented and functions renamed to match formatting	2019-05-22 21:10:16 -05: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	e9829c16c4	Correct effect for seed flare	2019-05-20 09:18:49 +02:00
DizzyEggg	7ec9123b0a	Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-05-20 09:16:13 +02:00
DizzyEggg	a70dceefb2	Merge pull request #154 from LOuroboros/patch-1 ... FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance	2019-05-20 09:15:58 +02:00
DizzyEggg	88bbdc494b	Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-05-20 09:14:32 +02:00
DizzyEggg	09c0a195ac	Merge branch 'master' into battle_engine_v2	2019-05-20 09:05:12 +02:00
LOuroboros	a14016240a	Razor Leaf is a Physical move, not a Special one.	2019-05-20 03:34:13 -03:00
LOuroboros	f81daeab45	FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance ... Title is self-explanatory. As of Gen. 5, Healing Wish and Lunar Dance are affected by Snatch.	2019-05-19 23:32:59 -03:00
Flametix	dbdb827e54	Fix typos (#713) ... * fix typos	2019-05-18 21:56:19 -05:00
DizzyEggg	ab421f1089	Use array count for trainer parties	2019-05-17 07:33:22 -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	60baf19d45	rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses	2019-05-16 17:10:13 -05:00
garak	daecd5ec40	name some trainer card related functions	2019-05-16 17:10:13 -05:00
DizzyEggg	188f2aa29e	ability random define for battle pyramind	2019-05-16 17:09:43 -05:00
DizzyEggg	4ae1e014bc	Change abilities in base stats to array	2019-05-16 17:09:43 -05:00
DizzyEggg	33979f0fa6	use ability num instead of alt ability	2019-05-16 17:09:43 -05:00
DizzyEggg	6624306024	Ring Target	2019-05-16 10:40:44 +02:00
Slawter666	2fdc489bc0	Further documentation of party_menu.c	2019-05-15 16:55:39 -05:00
Slawter666	d1a12be53a	Minor party_menu.c documentation	2019-05-15 16:55:39 -05:00
DizzyEggg	94045ace0b	Merge branch 'master' into battle_engine_v2	2019-05-15 13:31:53 +02: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
Marcus Huderle	0babaa8c07	Convert wild encounter data to JSON	2019-05-08 17:06:39 -05:00
DizzyEggg	bb8e397e5b	Gems and dmg reducing berries	2019-05-07 15:26:58 +02:00
DizzyEggg	5bc63ab550	Merge branch 'master' into battle_engine_v2	2019-05-07 10:23:14 +02:00
huderlem	fe59902b8a	Fix indentation	2019-05-03 18:21:11 -05:00
hjk321	26114d4579	Update comparison	2019-05-03 18:21:11 -05:00
hjk321	ee4049d93e	Fix indentation Error	2019-05-03 18:21:11 -05:00
hjk321	438c5432aa	Document MON_DATA_10	2019-05-03 18:21:11 -05:00
hjk321	106a89eace	Document magic number from atk04_critcalc	2019-05-03 18:21:11 -05:00
DizzyEggg	c0470c3932	Remove skarmory mega evo	2019-05-03 17:31:23 +02:00
DizzyEggg	900c15c20c	Mega evo animation	2019-05-03 17:27:49 +02:00
PikalaxALT	f13e1c78b2	through sub_81CA0EC	2019-05-02 17:53:00 -04:00
DizzyEggg	d0f91a996d	Tweak up mega evo	2019-05-02 23:10:01 +02:00
PikalaxALT	a14162eb9f	through sub_81C9F28	2019-05-02 16:43:32 -04:00
PikalaxALT	518865d8d9	sub_81C9A10	2019-05-02 16:19:25 -04:00
PikalaxALT	9b40cdaeb9	through sub_81C99FC	2019-05-02 14:27:59 -04: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