pokeemerald

mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 09:33:22 +01:00

Author	SHA1	Message	Date
LOuroboros	4f251e6ec2	Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN	2021-11-04 12:13:55 -03:00
LOuroboros	e0b53f87fc	Primal Reversion Tweaks -Fixed the inconsistent Primal Reversion activation in double battles. -Optimized the primal weather checks in attackcanceler a little. -Fixed the issue with multi-target fire/water moves during primal rain/sun.	2021-11-04 12:04:14 -03:00
BuffelSaft	cecd341011	Fix Tar Shot If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.	2021-11-04 20:47:45 +13:00
BuffelSaft	28e78cb6c4	Gen 8 moves initial commit Full credit to Nunuchu42 and cfmnephrite for this code.	2021-11-04 19:50:54 +13:00
BuffelSaft	7d10097684	Replace IsTwoStrikesMove with FLAG_TWO_STRIKES Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.	2021-11-04 17:11:56 +13:00
BuffelSaft	616be576fc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-04 15:29:38 +13:00
LOuroboros	b931e34172	Handled Mimicry's interaction with Steel Roller's effect	2021-11-03 23:23:28 -03:00
BuffelSaft	eeb40daede	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2	2021-11-04 13:52:58 +13:00
LOuroboros	f6628e301f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-03 20:43:33 -03:00
BuffelSaft	6132f9a9fe	Merge pull request #1750 from ghoulslash/mirror_armor Mirror Armor	2021-11-04 11:43:59 +13:00
ghoulslash	48c29a9cd8	proper mirror armor sticky web targeting	2021-11-03 15:05:52 -04:00
GriffinR	3e49ac804b	Merge branch 'master' into doc-finalmisc	2021-11-03 13:56:22 -04:00
GriffinR	0ba22ca112	Merge pull request #1534 from GriffinRichards/doc-btrans Document battle transition	2021-11-03 11:26:20 -04:00
LOuroboros	af6e72ecfe	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-03 08:56:01 -03:00
BuffelSaft	6ce1f01b8c	Hunger Switch and Aura Wheel Implement the ability Hunger Switch and the move Aura Wheel.	2021-11-03 19:45:03 +13:00
BuffelSaft	74c85b5818	Implement Relic Song's form change Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.	2021-11-03 17:23:33 +13:00
BuffelSaft	f323e2c047	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil	2021-11-03 14:18:28 +13:00
GriffinR	afb9ff3a40	Document files with a few remaining symbols	2021-11-02 18:06:06 -04:00
cbt6	4cedd2d551	Rename WalkFastest functions to WalkFaster	2021-11-03 01:50:53 +08:00
LOuroboros	69b42de0d9	Implemented Mimicry Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.	2021-11-02 14:44:55 -03:00
ghoulslash	4c9f48e9d8	Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData Added Gen 8 contest data	2021-11-02 12:50:45 -04:00
ghoulslash	ffcba355b0	merge w be	2021-11-02 10:36:08 -04:00
BuffelSaft	95435b5f7f	Pastel Veil switchin effect attempt Battle script isn't working for partner for some reason.	2021-11-02 23:06:10 +13:00
BuffelSaft	40bced517a	Pastel Veil blocks poison for whole side Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.	2021-11-02 20:00:57 +13:00
BuffelSaft	1e3b3d482b	Merge pull request #1838 from Blackforest92/battle_engine Edit Spacial Rend and Hurricane background	2021-11-02 17:11:47 +13:00
Eduardo Quezada D'Ottone	8332bfae46	Gen 8 combo moves	2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone	f3013d8ee9	Standarized Solarbeam into Solar Beam	2021-11-01 18:36:35 -03:00
ghoulslash	98b4b821dc	merge with be	2021-11-01 13:55:55 -04:00
ghoulslash	a1e64fce4f	handle simple beam, gastro acid	2021-11-01 13:50:57 -04:00
ghoulslash	b5d20da927	merge with be	2021-11-01 11:36:18 -04:00
BuffelSaft	5d678bc2ce	Fix move effect defines Had a define in a comment, which offset all the new move effects and misaligned their battle scripts.	2021-11-01 23:51:03 +13:00
BuffelSaft	0345dea918	Replace EFFECT_DOUBLE_HIT with FLAG_TWO_STRIKES This removes the need to have separate move effects for Twineedle, Double Iron Bash, and any custom two strike moves.	2021-11-01 23:39:37 +13:00
BuffelSaft	fb25e1ac98	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-01 22:37:23 +13:00
Blackforest92	9b6cd383a4	Optimized Rock Wrecker and Hurricane	2021-11-01 01:06:39 +07:00
ghoulslash	52d4d1cd34	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-31 11:40:00 -04:00
ghoulslash	bc170f3a43	merge with be	2021-10-31 11:04:39 -04:00
ghoulslash	e1f0e6285b	Merge pull request #1828 from BuffelSaft/gorilla-tactics Implement Gorilla Tactics	2021-10-30 21:44:33 -04:00
ghoulslash	468ee66cd8	fix synthesis and leaf guard w utility umbrella	2021-10-30 11:04:50 -04:00
ghoulslash	ee7b63e372	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-30 09:26:33 -04:00
ghoulslash	f4537b1213	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit	2021-10-30 09:14:32 -04:00
Blackforest92	799852ea77	Introduce alternate Steel Beam	2021-10-30 17:00:55 +07:00
BuffelSaft	47bfeaeecd	Implement Gorilla Tactics It's Choice Band but as an ability.	2021-10-30 18:31:44 +13:00
ghoulslash	af914ee7ed	merge w be	2021-10-29 22:33:50 -04:00
ghoulslash	28bc7dc14d	start ability	2021-10-29 22:32:19 -04:00
cbt6	9a1764f83e	Label some animation index numbers	2021-10-30 01:37:49 +08:00
GriffinR	07bf225f94	Continue battle_transition documenting	2021-10-29 11:24:36 -04:00
ghoulslash	2502820e83	document a couple hitmarkers. fix failing moves not updating hp from own healing effects	2021-10-29 09:03:14 -04:00
ghoulslash	f342e7c590	merge with be	2021-10-28 17:03:10 -04:00
ghoulslash	e2e31f0b74	skill swap config option for switchin abilities	2021-10-28 16:53:00 -04:00
LOuroboros	a77f058146	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-10-28 14:24:43 -03:00
ghoulslash	34e966fdee	Merge pull request #1815 from LOuroboros/hyperspaceFury Implemented Hyperspace Fury	2021-10-28 13:20:33 -04:00
LOuroboros	82101d3581	Optimizations	2021-10-28 14:02:43 -03:00
LOuroboros	28522f3ffb	Fixed Hyperspace Fury not breaking through protections Also repositioned VARIOUS_JUMP_IF_SPECIES.	2021-10-28 12:09:44 -03:00
ghoulslash	bebaded415	merge with be	2021-10-27 16:48:38 -04:00
LOuroboros	fc7f1acf20	Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser	2021-10-27 11:13:59 -03:00
LOuroboros	1ab8c84f41	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury	2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone	773c773bac	Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape # Conflicts: # include/constants/battle_config.h	2021-10-26 20:35:01 -03:00
GriffinR	d6571f2355	Merge pull request #1525 from GriffinRichards/doc-recmix Document remainder of Record Mixing	2021-10-26 14:18:38 -04:00
GriffinR	4f7f6c1082	Merge pull request #1526 from sphericalice/doc-curtain-special Document the CloseBattlePikeCurtain special	2021-10-25 16:10:45 -04:00
ghoulslash	07d2f73306	Merge pull request #1804 from AsparagusEduardo/PE_shedinjaball Config for Shedinja needing a Poké Ball to be created	2021-10-25 15:49:25 -04:00
sphericalice	120e75d275	Document the CloseBattlePikeCurtain special	2021-10-25 18:03:14 +01:00
GriffinR	6dc3c9864c	Merge pull request #1520 from GriffinRichards/doc-random Document random remaining symbols	2021-10-24 23:43:17 -04:00
Eduardo Quezada D'Ottone	44625561e5	Taunt turn config	2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone	70aeaf288f	Rough Skin damage config	2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone	8699db942b	More ordering	2021-10-24 20:03:21 -03:00
GriffinR	7a89ad98c3	Document record mixing hall records	2021-10-24 16:13:07 -04:00
GriffinR	ab80264921	Merge pull request #1519 from GriffinRichards/doc-mgift Document Mystery Gift	2021-10-24 15:50:39 -04:00
GriffinR	7f3c529935	Document record mixing mail swap	2021-10-24 15:49:19 -04:00
Eduardo Quezada D'Ottone	71ff664700	Ordered config into new categories	2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone	d95351dd97	Merge branch 'BattleEngine' into BE_config # Conflicts: # include/constants/battle_config.h	2021-10-23 19:46:33 -03:00
Eduardo Quezada D'Ottone	abb8a97d21	Merge pull request #1616 from LOuroboros/statCalcs Added configs for modern post-battle stat calcs	2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone	9a8b88bdb3	Updated config description	2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone	76b6250104	Merge branch 'battle_engine' into plasmaFists	2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone	d0253640fb	Merge pull request #1739 from LOuroboros/primalReversionBE Implemented Primal Reversion	2021-10-22 22:27:45 -03:00
Eduardo Quezada D'Ottone	35d5bc4367	Config for Shedinja needing a Poké Ball to be created	2021-10-22 20:50:53 -03:00
GriffinR	303ce856ad	Fix GET_CARD_BATTLE_LOST typo	2021-10-21 16:54:16 -04:00
LOuroboros	a6315ffc75	Implemented Plasma Fists	2021-10-19 09:50:18 -03:00
ghoulslash	eda99fcf29	Merge pull request #1742 from AsparagusEduardo/be_gStatuses4 Add gStatutes4	2021-10-19 08:45:47 -04:00
GriffinR	934a7e7a5d	Merge pull request #1516 from GriffinRichards/doc-miscbattle Miscellaneous battle documentation	2021-10-19 08:09:17 -04:00
LOuroboros	d9b8e11a9c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE	2021-10-19 07:47:42 -03:00
GriffinR	24b4e898ad	More mauville_old_man clean up	2021-10-18 14:40:04 -04:00
GriffinR	b31bddddca	Clean up metatile_behavior	2021-10-18 12:54:29 -04:00
GriffinR	db8ce5d7f9	Clean up mauville_old_man, drop ScrSpecial prefix	2021-10-18 01:09:41 -04:00
ghoulslash	8dc77e6fe3	Merge pull request #1782 from LOuroboros/glare Updated Glare	2021-10-17 22:11:33 -04:00
Eduardo Quezada D'Ottone	ead5c92469	Merge branch 'battle_engine' into PLG	2021-10-17 17:38:54 -03:00
LOuroboros	e7ad7319e3	Updated Glare	2021-10-17 12:03:35 -03:00
Eduardo Quezada D'Ottone	df817fb2ab	Merge pull request #1772 from LOuroboros/gravApple Added Grav Apple's power boost	2021-10-17 09:51:29 -03:00
LOuroboros	59cfbe55c1	Gave Grav Apple a move effect of its own	2021-10-17 09:27:35 -03:00
GriffinR	ece7ef3410	Correct usage of MysteryEvent to MysteryGift	2021-10-17 03:00:48 -04:00
GriffinR	3cd27acbea	Document wonder news	2021-10-17 02:09:31 -04:00
GriffinR	5f9069628d	Clean up mevent2	2021-10-17 01:35:26 -04:00
GriffinR	c7d550e96c	Clean up wonder card/news view	2021-10-17 01:15:16 -04:00
GriffinR	845a5e99cc	General mystery gift documentation, finish mystery gift client/server/scripts	2021-10-16 23:35:17 -04:00
ghoulslash	964e7efba9	fix MOVE_TARGET_ALL_BATTLERS and other u8 vars	2021-10-16 16:23:17 -04:00
ghoulslash	5509ceea04	expand move target field	2021-10-16 16:10:45 -04:00
GriffinR	e1900efe1e	Merge branch 'master' into doc-miscbattle	2021-10-15 22:46:43 -04:00
GriffinR	1f39c34ca4	Merge branch 'master' into minor-constants	2021-10-15 22:44:49 -04:00
GriffinR	a4a3c1c9e5	Merge pull request #1511 from GriffinRichards/doc-union Document link_rfu / Union Room	2021-10-15 22:44:01 -04:00
ghoulslash	c077091dbf	small fixes, check GetCatchingBattler's semi-invulnerability	2021-10-15 14:57:26 -04:00
GriffinR	c02001c46d	Document mystery gift link scripts, general mystery gift	2021-10-15 12:05:06 -04:00
ghoulslash	ef19c8c415	fix gen define	2021-10-15 09:22:50 -04:00
ghoulslash	883a249836	config for catching semi-invulnerable mons	2021-10-15 09:20:32 -04:00
BuffelSaft	e59be67023	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-10-15 16:25:11 +13:00
Eduardo Quezada D'Ottone	b9816f0f28	Saftety Goggles typo for Item Expansion	2021-10-14 20:38:13 -03:00
Eduardo Quezada D'Ottone	21837b659a	Merge branch 'battle_engine' into bug_bite	2021-10-14 19:46:50 -03:00
GriffinR	95406384f4	Start wonder card/news documenting	2021-10-14 13:24:20 -04:00
BuffelSaft	fc6e8f598c	Merge branch 'battle_engine' into battle_bond	2021-10-14 16:24:59 +13:00
GriffinR	9ab03f454d	Small correction to map script comments	2021-10-13 23:24:10 -04:00
BuffelSaft	bb8d0e3d6b	Fix Battle Bond Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.	2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone	d689842689	Merge pull request #1657 from ghoulslash/rototiller Rototiller Fix + MOVE_TARGET_ALL_BATTLERS	2021-10-13 22:45:50 -03:00
ghoulslash	a3d2bdc9cf	merge with be	2021-10-13 18:30:53 -04:00
GriffinR	def6cc8158	Label battle script macro arguments	2021-10-13 17:44:04 -04:00
GriffinR	fc15b0d5f0	Add controller buffer constants, finish misc battle doc	2021-10-13 16:21:39 -04:00
ghoulslash	996301d5d3	add mirror armor	2021-10-12 18:04:34 -04:00
ghoulslash	bbd09fdcf7	add wandering spirit	2021-10-12 10:32:51 -04:00
GriffinR	f23e0beeba	Rename battle anim cmds, move its data, name remaining symbols	2021-10-11 13:18:21 -04:00
ghoulslash	06bcfea3b8	merge with be	2021-10-10 19:56:33 -04:00
Eduardo Quezada D'Ottone	c3f8b77d82	Setting for pre-Gen6 Hidden Power Damage.	2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone	7798468ce9	Merge pull request #1738 from BuffelSaft/safety-googles Fix Safety Googles	2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone	cf6e3873b4	Moved Electrified to Status4.	2021-10-10 01:13:23 -03:00
Eduardo Quezada D'Ottone	903c4cbf68	Config for Blizzard + Hail	2021-10-09 23:52:37 -03:00
Eduardo Quezada D'Ottone	004f705607	Merge pull request #1549 from ghoulslash/last_ball add last used ball	2021-10-09 17:27:28 -03:00
GriffinR	862febe03a	Add MAP_OFFSET	2021-10-09 13:19:27 -04:00
GriffinR	d8e65fc4b6	More battle doc, add battle window ids	2021-10-09 03:01:10 -04:00
LOuroboros	2a7d78e68b	Oopsie	2021-10-09 01:55:36 -03:00
LOuroboros	91a68cd5db	Implemented Primal Reversion	2021-10-09 00:36:41 -03:00
BuffelSaft	07bdd2ffe6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-10-09 15:18:51 +13:00
BuffelSaft	274e964d91	Fix Safety Googles Fix typo and update gLastUsedItem before calling the safety goggles battle script.	2021-10-09 15:05:01 +13:00
GriffinR	31b501e7eb	Start misc battle documentation	2021-10-08 16:39:46 -04:00
ghoulslash	ce455ac7e7	merge with be	2021-10-08 07:44:32 -04:00
BuffelSaft	fbc4d7584e	Merge pull request #1610 from LOuroboros/primalAbilities Implement Desolate Land, Primordial Sea and Delta Stream	2021-10-08 20:01:09 +13:00
ghoulslash	9a4e0cf757	magician fixes, handle edge cases	2021-10-07 17:37:47 -04:00
GriffinR	a2655ba9ab	Merge branch 'master' into doc-union	2021-10-07 16:10:35 -04:00
GriffinR	6aaf50ee27	Rename GF Gname, Rfu, finish bulk of Union Room, more link doc	2021-10-07 10:43:03 -04:00
ghoulslash	4aeadd96c9	merge with be	2021-10-06 14:49:23 -04:00
ghoulslash	658235c03d	merge with be	2021-10-06 14:33:26 -04:00
ghoulslash	391cfabcac	merge with be	2021-10-06 14:31:21 -04:00
ghoulslash	ee3a2c97ee	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball	2021-10-06 13:54:40 -04:00
ghoulslash	4382420dd2	merge with be	2021-10-06 13:32:59 -04:00
ultima-soul	ce4375a10c	Ported new Ball catch rate modifier effects from Item Expansion.	2021-10-06 10:28:18 -07:00
ghoulslash	1f4844c7f5	Merge pull request #1710 from AsparagusEduardo/BE_Struggle Implemented modern effect of struggle with config	2021-10-06 09:27:10 -04:00
ghoulslash	245ef1ad2d	Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag Config for Shadow Tag vs Shadow Tag	2021-10-06 09:02:58 -04:00
ultima-soul	06f36595d6	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-10-05 19:25:52 -07:00
Eduardo Quezada D'Ottone	2b54b48b04	Merge branch 'PokemonExpansion' into PE_FormChangeHoldItems # Conflicts: # src/pokemon.c	2021-10-05 21:13:36 -03:00
Eduardo Quezada D'Ottone	43d42c95cf	Terrain Pulse effect implemented	2021-10-04 22:45:37 -03:00
ultima-soul	78d2215196	Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding.	2021-10-03 10:16:09 -07:00
LOuroboros	b85b3094c8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev	2021-10-03 07:05:56 -03:00
GriffinR	6e62c057f5	Document remaining symbols in pokemon.c	2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone	978f73475b	Config for Shadow Tag vs Shadow Tag	2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone	57ea20bc6d	Implemented modern effect of struggle with config	2021-10-02 13:32:36 -03:00
LOuroboros	c464b1b5dd	STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES	2021-10-01 23:12:59 -03:00
LOuroboros	f3ded43a88	Implemented Battle Bond	2021-10-01 22:49:17 -03:00
Eduardo Quezada D'Ottone	5593a83783	Fixed compile	2021-09-30 22:35:28 -03:00
Eduardo Quezada D'Ottone	5bf300f97c	Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE	2021-09-30 22:12:02 -03:00
Pokestia	38a4dea402	Rename Battle Weather flags	2021-09-30 12:08:20 +02:00
ghoulslash	761006a164	merge with be	2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone	4fbe4da7d0	Sitrus Berry Gen4+ heal. Credit to SBird1337	2021-09-26 18:46:34 -03:00
LOuroboros	1b039062da	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-09-25 22:20:34 -03:00
LOuroboros	234f3290c3	Added a day time exclusive equivalent to `FORM_USE_ITEM` Primarily for Shaymin, since it can only change its form with the Gracidea during the day. Special thanks to AsparagusEduardo.	2021-09-25 22:00:10 -03:00
LOuroboros	813d114132	Synced include/constants/hold_effects.h with the BE	2021-09-25 20:58:07 -03:00
GriffinR	a66d7e1b43	Document some single-remaining symbols	2021-09-24 17:14:20 -04:00
Syreldar	4c05520bf3	Fixed Retaliate's naming.	2021-09-24 16:02:26 +02:00
GriffinR	a6ab2eb883	Merge branch 'master' into trailingSpaces	2021-09-23 21:39:21 -04:00
ghoulslash	2f69748e0d	merge with be	2021-09-23 14:38:01 -04:00
ghoulslash	94ec25319f	syntax fixes. Use BlocksPrankster for perish song battle script	2021-09-23 14:35:37 -04:00
ghoulslash	33972b5493	merge with be	2021-09-23 12:04:13 -04:00
BuffelSaft	530998c4b7	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-09-23 16:41:35 +12:00
BuffelSaft	2f03ac31b9	Multihit refactor and Parental Bond Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.	2021-09-23 14:31:21 +12:00
ghoulslash	d738297f24	merge with be	2021-09-22 16:26:09 -04:00
ghoulslash	1309eea8ec	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects	2021-09-22 09:43:48 -04:00
ghoulslash	13062b5a8f	fix lash out, obstruct, and decorate	2021-09-22 09:43:40 -04:00
Eduardo Quezada D'Ottone	f9d1375451	Merge pull request #1375 from ExpoSeed/PE/form-change-table Form change table	2021-09-22 00:04:26 -03:00
Eduardo Quezada D'Ottone	287ffff2e2	Merge branch 'battle_engine' into burmy-form-change	2021-09-21 22:34:37 -03:00
ghoulslash	0ea6c65b83	merge with be	2021-09-17 09:10:09 -04:00
ghoulslash	faa963fd04	merge with be	2021-09-17 09:07:38 -04:00
ghoulslash	b916d7991c	merge with be	2021-09-16 21:52:29 -04:00
ghoulslash	e756b0accc	merge with be	2021-09-16 21:41:29 -04:00
ghoulslash	af8d86f0c9	merge with be	2021-09-16 13:33:35 -04:00
ghoulslash	c2e0990aab	fix some merge conflicts	2021-09-16 13:29:36 -04:00
ghoulslash	9d8672e3df	merge with be	2021-09-16 13:12:59 -04:00
ghoulslash	ac42b19de7	some formatting fixes	2021-09-16 11:54:27 -04:00
ghoulslash	aac7ae3595	add MOVE_TARGET_ALL_BATTLERS	2021-09-16 10:45:33 -04:00
ghoulslash	9c94eb6140	but it failed check for rototiller	2021-09-16 10:24:32 -04:00
ghoulslash	f61d516aad	some syntax/format fixes	2021-09-15 17:15:50 -04:00
ghoulslash	aa475ab300	merge with be	2021-09-15 16:42:23 -04:00
ghoulslash	0bca01cb74	mental herb fixes	2021-09-15 12:56:58 -04:00
ghoulslash	b85586a33a	merge with be	2021-09-15 12:54:39 -04:00
ghoulslash	60713a8f2d	fix room service activation msg, stat target	2021-09-14 12:50:36 -04:00
ghoulslash	95af97593b	fix some comment styling. fix throat spray for multi-target moves	2021-09-14 11:53:35 -04:00
ghoulslash	f3f26d1a6f	merge with be	2021-09-13 19:40:28 -04:00
GriffinR	cbf8863e5b	Clean up Lilycove Lady	2021-09-09 15:24:34 -04:00
ghoulslash	d7938bc2dc	Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster	2021-09-09 09:44:25 -04:00
ghoulslash	b8a71cabd1	merge with be	2021-09-09 09:44:18 -04:00
BuffelSaft	a4b630e6b5	Fix MOVE_EFFECT_REMOVE_STATUS Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured. Also, fix Ice Hammer's effect chance.	2021-09-07 16:34:32 +12:00
DizzyEggg	cdec3077b2	Merge pull request #1630 from BuffelSaft/disguise2 Fix many Disguise bugs	2021-09-06 10:32:37 +02:00
BuffelSaft	bdbb4b5f7e	Fix many Disguise bugs Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.	2021-09-06 18:27:42 +12:00
LOuroboros	376b65f6bf	Update hold_effects.h	2021-09-04 15:36:47 -03:00
ghoulslash	933696b3cd	merge with be	2021-09-03 17:41:00 -04:00
ghoulslash	6ce1227447	fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case	2021-09-03 11:05:11 -04:00
ExpoSeed	5a5c257f68	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-09-02 21:43:20 -05:00
ghoulslash	7c53214dad	merge with be	2021-09-02 15:33:42 -04:00
ultima-soul	a10a02a536	Merge pull request #1221 from ghoulslash/battle_engine Implement Pickpocket	2021-09-02 11:33:34 -07:00
ghoulslash	dfe59992d3	merge with be	2021-09-01 07:37:45 -04:00
LOuroboros	d2bcc2ad5b	Added configs for modern post-battle stat calcs	2021-09-01 00:31:50 -03:00
LOuroboros	69b7910f47	Gave an entrance animation to Delta Stream	2021-08-31 00:15:17 -03:00
ultima-soul	5cb73a012c	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-08-30 11:57:27 -07:00
ExpoSeed	0f99d9d4c6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-08-30 13:26:40 -05:00
LOuroboros	9e4f33d09e	Implemented Desolate Land, Primordial Sea and Delta Stream	2021-08-27 17:56:43 -03:00
LOuroboros	554210c5e3	Removed trailing spaces in the most relevant files Command used for the job: egrep -rl ' $' --include .c --include .h --include .s --include .inc --include .txt \| xargs sed -i 's/\s\+$//g' Credits to Grant Murphy from Stack Overflow.	2021-08-24 19:59:32 -03:00
ultima-soul	43e8f76338	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:55:48 -07:00
ultima-soul	4c3ed52c2f	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:39:11 -07:00
ultima-soul	988320b89a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:25:13 -07:00
ultima-soul	840e2bc3f9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-08-16 16:33:34 -07:00
ultima-soul	76a7a2720d	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-08-16 16:10:59 -07:00
ultima-soul	b620349da0	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-16 15:43:27 -07:00
ghoulslash	c7c0fbc296	merge with be, make AI CanBeStatused functions separate from general util ones	2021-08-12 13:37:53 -06:00
ghoulslash	d218322b2c	merge with be	2021-08-12 01:26:13 -04:00
ultima-soul	64a48800c9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-08-11 17:10:57 -07:00
ultima-soul	3f75a58137	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-08-11 16:55:29 -07:00
ultima-soul	02c9e040df	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-11 16:33:10 -07:00
GriffinR	80348e7188	Merge branch 'master' into doc-itemmenu2	2021-08-11 19:01:47 -04:00
GriffinR	28a8fe191a	Document item menu	2021-08-10 22:13:02 -04:00
BuffelSaft	30c983d9ca	Define Burmy forms in battle engine Title. BE needs these to compile on its own.	2021-08-08 13:14:51 +12:00
LOuroboros	b4c4650186	Corrected inconsistent flag label spelling	2021-08-05 17:26:03 -03:00
ghoulslash	ab529b4e89	add stuff cheeks	2021-07-27 10:31:48 -06:00
ghoulslash	0a0687ae78	add smart wild AI	2021-07-27 09:49:39 -06:00
LOuroboros	f1195e1884	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-07-27 09:08:52 -03:00
LOuroboros	8012f4b25a	Re-ordered the hidden item flags list Instead of sorting them by location, it makes more sense to sort them by their value.	2021-07-26 20:18:11 -03:00
ghoulslash	4ca6d76160	add bug bite	2021-07-25 14:55:52 -06:00
ghoulslash	c914ed8572	fix sucker punch, surging strikes, obstruct, and snipe shot	2021-07-25 09:38:54 -06:00
ghoulslash	a37d4c3da9	merge with be, give life dew jungle healing effect	2021-07-25 08:22:05 -06:00
LOuroboros	bfa824f761	Removed unused status ailment constants	2021-07-23 13:18:24 -03:00
ghoulslash	45d4cee243	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball	2021-07-18 11:11:03 -06:00
GriffinR	72bb2bd160	Merge pull request #1474 from GriffinRichards/clean-miragetower Clean up Mirage Tower	2021-07-10 23:26:41 -04:00
ultima-soul	ad8cfda831	Add and rearrange Key Items.	2021-07-06 17:03:46 -07:00
ultima-soul	2d8d38f44c	Add TM51 through TM100.	2021-07-05 18:11:57 -07:00
GriffinR	0f538102d9	Add local id constants for C	2021-07-05 13:54:43 -04:00
ultima-soul	53e900a643	Rearranged rest of item ids except for Key Items.	2021-07-02 22:43:50 -07:00
ExpoSeed	fb69b65337	Fix redefinition error in battle_config.h	2021-07-02 14:36:55 -05:00
ExpoSeed	788b9f675f	Fix redefinition error in pokemon_config.h	2021-07-02 14:36:02 -05:00
ExpoSeed	ebe0d21c54	Fix redefinition error in item_config.h	2021-07-02 14:34:29 -05:00
GriffinR	64d06f4c8f	Condense battle AI scripts, minor clean up	2021-07-02 02:46:01 -04:00
GriffinR	8f43d1ebeb	Document smart shopper TV show	2021-07-02 01:45:23 -04:00
GriffinR	10886a586b	Clean up mirage tower	2021-07-01 23:46:15 -04:00
ghoulslash	c06029bc72	add last used ball	2021-06-25 13:37:59 -06:00
TheXaman	defd7d9e07	Added Sound menu for SE and MUS	2021-06-22 12:38:00 +02:00
GriffinR	810b51f96c	Clarify contest heart tiles	2021-06-21 13:48:03 -04:00
ultima-soul	9e0b866f09	Rearranged Poke Ball item ids.	2021-06-18 21:46:20 -07:00
BuffelSaft	4c18cb7fe7	Remove EFFECT_THAW_HIT	2021-06-19 11:49:00 +12:00
Xhyzi	c2bd046ea6	Shell Trap	2021-06-15 20:22:50 +02:00
Xhyzi	155e9b6332	Court Change	2021-06-15 20:14:10 +02:00
Xhyzi	271f19e6cb	Terrain Pulse	2021-06-15 20:01:57 +02:00
Xhyzi	0202b75822	Beak Blast	2021-06-15 19:57:21 +02:00
Xhyzi	7799e49e3a	Corrosive Gas	2021-06-15 19:45:24 +02:00
Xhyzi	e7ec4df70b	Rising Voltage	2021-06-15 17:51:59 +02:00
Xhyzi	ee3f3eb78f	Meteor Beam	2021-06-15 17:06:21 +02:00
Xhyzi	62525516a4	Scale Shot	2021-06-15 16:50:19 +02:00
Xhyzi	60ce39543e	Expanding Force	2021-06-15 16:29:06 +02:00
Xhyzi	5a094a3033	Snap Trap	2021-06-15 16:22:42 +02:00
MissingNoL	721dbe9178	Implemented all PLG effects	2021-06-12 18:01:35 -07:00
MissingNoL	610b18bfdb	Implemented Double Iron Bash's effect	2021-06-12 14:27:50 -07:00
MissingNoL	beb126b534	Implemented Zippy Zap's effect	2021-06-12 13:58:54 -07:00
ultima-soul	bca67ac683	Refactor Poke Ball code to not rely on Master Ball being the first item internally.	2021-06-11 18:22:50 -07:00
ultima-soul	b7706f1b99	Remove ball catch rate modifier effects.	2021-06-10 21:59:13 -07:00
ExpoSeed	c8fc141287	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-06-10 11:54:20 -05:00
BuffelSaft	e6a8faec1e	Fix thawing moves Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.	2021-06-10 23:48:18 +12:00
ultima-soul	425746763a	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 20:08:43 -07:00
ultima-soul	f3f4d8e608	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 19:52:20 -07:00
ultima-soul	0a87adad1a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 18:05:52 -07:00
ultima-soul	d30ab7760f	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-06-07 13:52:08 -07:00
ultima-soul	cf19635a80	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-06-07 13:15:46 -07:00
ultima-soul	092f02f119	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-06-07 12:00:23 -07:00
MissingNoL	bfc66a21cc	`gBattlescriptCurrInstr[3]` is not reading `species` parameter	2021-06-06 19:14:11 -07:00
MissingNoL	9cd522d254	Merge branch 'battle_engine' into Photon_Geyser	2021-06-05 16:46:28 -07:00
MissingNoL	921b80de7c	Update battle_script_commands.h Properly aligned the list of number IDs	2021-06-05 16:40:03 -07:00
ultima-soul	3448e19275	Merge pull request #1459 from ExpoSeed/BE/rename-flags Rename flags	2021-06-04 19:33:45 -07:00
ExpoSeed	4bb33367df	Newline	2021-06-04 19:35:16 -05:00
ExpoSeed	ec2c140ecb	Disambiguate Thousand Arrows flag from other flags	2021-06-04 19:34:37 -05:00
ExpoSeed	15914d7af8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags	2021-06-04 19:00:29 -05:00
ultima-soul	6edec5bc3d	Merge pull request #1437 from LOuroboros/oblivious Tweaked Oblivious	2021-06-04 16:51:38 -07:00
ExpoSeed	0e96b47584	Review comments	2021-06-04 18:50:11 -05:00
LOuroboros	b552db7193	Tweaked the Oblivious immunities Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.	2021-06-04 19:23:07 -03:00
LOuroboros	b215b44951	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales	2021-06-03 05:09:14 -03:00
ultima-soul	fc19023087	Merge pull request #1493 from LOuroboros/feathers Corrected the Wings/Feathers	2021-06-02 22:56:16 -07:00
LOuroboros	03647c7790	Adjusted the list of item hold effects	2021-06-02 17:27:45 -03:00
LOuroboros	6ccb493f12	Adjusted the list of item hold effects	2021-06-02 17:23:58 -03:00
BuffelSaft	2a6b989c92	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press	2021-06-02 12:41:28 +12:00
amiosi	b588e94395	more requested changes	2021-05-28 15:05:33 -04:00
MissingNoL	f30a9542ee	Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm	2021-05-27 22:21:55 -07:00
amiosi	f7651fd592	most fixes from requested changes	2021-05-27 15:55:19 -04:00
amiosi	fc81994579	Merge branch 'battle_engine' into old_findings	2021-05-27 15:28:02 -04:00
ultima-soul	1f859e340d	Merge pull request #1415 from ghoulslash/item_expansion Add Berry Hold Effects	2021-05-24 11:07:35 -07:00
ghoulslash	c356ffaed4	merge with be. fix null ptr check in GetBattleMoveSplit	2021-05-24 10:46:53 -06:00
ghoulslash	5840b1f0ed	utility umbrella effect	2021-05-24 09:52:45 -06:00
Scott	265cdcdc12	Handle GetAbilityBySpecies edge cases	2021-05-23 16:17:43 -04:00
ghoulslash	c3e28e9b1a	merge with be	2021-05-23 12:22:52 -06:00
ghoulslash	54b03a474d	fix SIDE_STATUS_SCREEN_ANY	2021-05-23 12:22:07 -06:00
Eduardo Quezada D'Ottone	04c6331a60	Merge pull request #1432 from BuffelSaft/thousand_arrows Fix Thousand Arrows	2021-05-21 11:40:13 -04:00
LOuroboros	0bc8ed59f5	Wings -> Feathers	2021-05-17 21:58:17 -03:00
ultima-soul	50c2514267	Merge pull request #1469 from ultima-soul/pokemon_expansion_sync Pokemon Expansion Upstream Sync	2021-05-13 20:56:29 -07:00
GriffinR	65fd334256	Name map groups	2021-05-11 10:16:04 -05:00
LOuroboros	95d41524a2	Implemented Clanging Scales' effect	2021-05-09 18:20:03 -03:00
Flametix	a8fab62c89	Fix Substitute typo	2021-05-06 20:49:04 -04:00
ultima-soul	e864c39a5d	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-05-04 10:04:35 -07:00
ultima-soul	cf0fd961b9	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-28 23:56:58 -07:00
ultima-soul	00c3f060b1	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-28 23:53:23 -07:00
ultima-soul	56fc420187	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-28 21:34:30 -07:00
GriffinR	f7a699c686	Merge pull request #1421 from GriffinRichards/doc-tvrecordmix Document TV	2021-04-29 00:25:01 -04:00
ultima-soul	75a9fdbafa	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-28 20:50:59 -07:00
ultima-soul	0da3f74a7e	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-28 18:58:38 -07:00
GriffinR	58cef0ae52	Merge pull request #1418 from GriffinRichards/sync-ereaderhelp Sync e-reader helpers, document trainer hill e-reader	2021-04-28 06:08:57 -04:00
ultima-soul	14a0303e2f	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-27 18:36:37 -07:00
GriffinR	aad090e154	Document TV	2021-04-26 12:35:35 -04:00
GriffinR	86475c5ded	Document trainer hill ereader	2021-04-24 18:04:27 -04:00
GriffinR	bc9fc38254	Misc contest cleanup	2021-04-22 15:51:04 -04:00
GriffinR	dbe24f0baa	Clean up contest_painting	2021-04-21 20:04:12 -04:00
ExpoSeed	f922d42988	Refactor hidden abilities	2021-04-16 23:38:35 -05:00
ExpoSeed	db2b995bc6	Introduce NUM_ABILITY_SLOTS	2021-04-16 23:37:55 -05:00
ExpoSeed	27c6964a05	Merge branch 'num_ability_slots' into BE/num_ability_slots	2021-04-16 20:45:34 -05:00
ExpoSeed	49bb345338	Introduce NUM_ABILITY_SLOTS	2021-04-16 20:36:45 -05:00
GriffinR	82f870091e	Merge pull request #1400 from GriffinRichards/doc-pokemonanim Document Pokémon animation	2021-04-13 01:36:15 -04:00
ghoulslash	98bccaa35d	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion	2021-04-10 14:28:07 -06:00
GriffinR	09a9efd5c5	Merge pull request #1398 from GriffinRichards/doc-field Document field	2021-04-10 13:05:51 -04:00
GriffinR	f6016838b1	Merge pull request #1397 from GriffinRichards/doc-moremisc Clean up battle scripts	2021-04-10 12:41:35 -04:00
GriffinR	72ba8cf58d	Document pokemon animation types	2021-04-10 00:50:28 -04:00
ExpoSeed	8494306d1d	Rename flags	2021-04-07 16:07:30 -05:00
LOuroboros	75b6d2837e	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller	2021-04-07 17:10:52 -03:00
ghoulslash	71b85031e0	update NUM_BATTLE_MOVE_EFFECTS	2021-04-06 15:42:21 -06:00
GriffinR	4a1cfbead2	Document remaining overworld	2021-04-06 16:55:43 -04:00
GriffinR	86a9d94ce1	Document fieldmap	2021-04-06 16:05:43 -04:00
GriffinR	756fad0e61	Document some event object movement	2021-04-06 14:34:36 -04:00
GriffinR	00c3044c96	Clarify Groudon/Kyogre/Rayquaza gfx names	2021-04-06 02:38:15 -04:00
ExpoSeed	cf9d5f8563	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table	2021-04-04 01:11:32 -05:00
ultima-soul	be7acc919a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-04-03 21:53:29 -07:00
GriffinR	f4d8a91ba4	Misc battle script cleanup	2021-04-03 14:07:31 -04:00
GriffinR	9ea9ffde09	Add remaining multistring chooser constants	2021-04-03 11:49:06 -04:00
LOuroboros	f04f35f5c3	Added a config for the amount of HP recovered by healing items	2021-04-02 20:34:57 -03:00
ultima-soul	4a81102a46	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-02 13:57:19 -07:00
ultima-soul	b8721034ef	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-02 13:42:05 -07:00
ultima-soul	939608f5b8	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-02 13:16:40 -07:00
GriffinR	1b8d405b5e	Add missing include guard suffixes	2021-04-02 12:54:40 -04:00
ghoulslash	42c7a5fea2	fix z move move IDs	2021-04-02 10:28:08 -06:00
ghoulslash	d89e2c1775	merge with be	2021-04-02 08:55:54 -06:00
GriffinR	c9d3b26ff7	Label miss string indexes	2021-04-02 02:12:46 -04:00
GriffinR	8be2c5d60b	Document Contest Lady TV Show	2021-04-02 01:49:38 -04:00
GriffinR	a0b3d4df12	Merge pull request #1390 from GriffinRichards/doc-introcred Document intro and credits sequences	2021-04-01 23:13:59 -04:00
GriffinR	771a434730	Label Trend Watcher TV show texts	2021-03-31 16:29:42 -04:00
GriffinR	86856098a3	Document Dewford Trend	2021-03-31 16:08:42 -04:00
BuffelSaft	35add44a90	Thousand Arrows hits airborne targets Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc. Also fixed its effect chance, which was 0 instead of 100.	2021-03-31 23:05:30 +13:00
GriffinR	50e9666e16	Merge branch 'master' into doc-introcred	2021-03-29 20:56:15 -04:00
GriffinR	c40fb9288c	Merge pull request #1378 from GriffinRichards/doc-berrycrush Document Berry Crush	2021-03-29 12:38:16 -04:00
GriffinR	62968895ca	Add MON_PIC_SIZE constant	2021-03-29 09:38:19 -04:00
ghoulslash	a595b213b4	merge with be	2021-03-28 17:29:22 -06:00
GriffinR	7a5c6d4d86	Standardize Friendship/Happiness	2021-03-27 17:27:20 -05:00
ultima-soul	7abfe7469a	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-03-23 18:41:53 -07:00
ultima-soul	56a1cab314	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-03-23 15:21:19 -07:00
ultima-soul	5bab9474dc	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-03-22 23:08:19 -07:00
GriffinR	6127c6f32e	Misc labels in battle facilities	2021-03-22 15:30:19 -05:00
GriffinR	22e2c0a47c	Document Berry Crush	2021-03-18 15:18:23 -04:00
BuffelSaft	7d237d8ff6	Implement Body Press' effect Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.	2021-03-16 22:56:44 +13:00
amiosi	b081a00891	Merge branch 'battle_engine' into old_findings	2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone	292993e360	Merge pull request #1338 from ghoulslash/ripen Add Ripen and Finish Gen4 Berries	2021-03-13 11:16:42 -03:00
LOuroboros	68980cf18c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-03-10 03:58:21 -03:00
ghoulslash	d5004638a9	Update include/constants/battle_config.h Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-03-09 16:35:47 -07:00
ExpoSeed	3655fe52f3	Prison Bottle and Reveal Glass don't exist yet	2021-03-09 11:54:56 -06:00
ghoulslash	3f9bf5acc0	merge with be	2021-03-09 10:33:48 -07:00
GriffinR	55a40b901f	Label battle tower link script	2021-03-04 19:30:19 -06:00
ExpoSeed	6f64c1b2b9	Implement GetFormChangeTargetSpecies	2021-03-03 13:07:50 -06:00
Evan	791fd5e709	finish berry hold effects	2021-03-03 09:25:25 -07:00
Evan	2ccdf1d89e	merge with be. magic guard checks	2021-03-03 09:21:06 -07:00
ghoulslash	3a30fe900a	Update include/constants/hold_effects.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 09:13:49 -07:00
ExpoSeed	ec1a09bcd5	Revamp table	2021-03-02 14:18:34 -06:00
ExpoSeed	7802264732	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table	2021-03-01 19:38:13 -06:00
Evan	b130396c0e	merge with be	2021-03-01 17:05:10 -07:00
ultima-soul	e5fa583a08	Merge pull request #1334 from ghoulslash/gen8_abilities More Gen 8 Abilities	2021-03-01 10:40:09 -08:00
Evan	6cb8c6309a	merge with be	2021-03-01 11:28:51 -07:00
Evan	55649a67cc	Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain	2021-03-01 11:23:05 -07:00
Evan	55b8538f68	merge with be	2021-03-01 11:22:37 -07:00
ultima-soul	f6147ee054	Merge pull request #1356 from ghoulslash/tailwind_turns Update tailwind timer To Gen5	2021-03-01 08:51:40 -08:00
GriffinR	c6141fea83	Document easy chat	2021-02-24 11:03:45 -05:00
GriffinR	1cac608dbe	Document mail	2021-02-24 11:03:39 -05:00
GriffinR	06ae5a37e2	Merge pull request #1336 from GriffinRichards/giftribbons Document some ribbon usage	2021-02-24 10:07:59 -05:00
GriffinR	fc3d6eb178	Merge pull request #1328 from GriffinRichards/doc-pokeuseitem Document PokemonUseItemEffects	2021-02-22 12:15:19 -05:00
SphericalIce	381116b3c4	Add labels for cracked floor metatiles	2021-02-22 15:29:14 +00:00
GriffinR	02c1fbd733	Document ribbon TV show, add new ribbon IDs/size	2021-02-18 09:59:24 -05:00
GriffinR	e059c4fdfa	Use new gift ribbons size, label unused ribbons	2021-02-17 14:11:45 -05:00
GriffinR	ee4af94a36	Merge pull request #1324 from GriffinRichards/doc-sb Document remainder of secret_base.c	2021-02-15 17:41:55 -05:00
Deokishisu	7b2bf8c7e2	Rename obedient/fatefulEncounter to eventLegal Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind. Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.	2021-02-15 14:54:35 -05:00
Deokishisu	b89c3e901e	Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi. The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.	2021-02-15 11:40:16 -05:00
GriffinR	5f58ea02c6	Merge pull request #1330 from sphericalice/hidden-to-buried Rename 'hidden' Trainers/obj events to 'buried'	2021-02-14 21:48:21 -05:00
SphericalIce	56e047f949	Fix Lilcove Motel typos	2021-02-14 21:38:39 +00:00
SphericalIce	70ff6c3b84	Rename 'hidden' Trainers/obj events to 'buried'	2021-02-14 19:25:23 +00:00
GriffinR	be0699bd64	Merge pull request #1326 from GriffinRichards/doc-layouts Label unused layouts	2021-02-14 14:22:28 -05:00
GriffinR	a85ac11b28	Merge pull request #1325 from GriffinRichards/constants-berrytree Add berry tree id constants	2021-02-14 14:15:51 -05:00
Evan	d65d5cb8fd	add AI_FLAG_SMART_SWITCHING, some burn checks	2021-02-14 09:37:04 -07:00
GriffinR	8634710996	Document PokemonUseItemEffects	2021-02-12 16:02:04 -05:00
Evan	f3d975e239	merge with be	2021-02-12 08:59:55 -07:00
LOuroboros	21ee6cb9fb	Added constant labels for EV manipulating item effects	2021-02-12 07:26:11 -03:00
amiosi	1df295a582	battle config and zippy zap plus fix mirror move mistakes	2021-02-11 17:11:07 -05:00
amiosi	c0ba7436af	water shuriken and howl	2021-02-11 16:20:13 -05:00
GriffinR	20b76c6071	Fix swapped route 102 berries	2021-02-10 16:26:09 -05:00
GriffinR	2237d0748f	Label unused layouts	2021-02-08 14:45:56 -05:00
GriffinR	0851c34bac	Add berry tree id constants	2021-02-05 15:25:12 -05:00
GriffinR	a240481d5f	Document secret_base.c	2021-02-05 12:08:25 -05:00
Deokishisu	ac43365d58	Fix "Compatibility" Misspelling Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.	2021-02-05 01:27:11 -05:00
ultima-soul	46e853c13b	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-02-03 16:23:23 -08:00
ultima-soul	daf5e0167e	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-02-03 16:06:48 -08:00
amiosi	663cc5b15c	oricorio...	2021-02-03 13:02:13 -05:00
Evan	0483114a05	merge and some fixes	2021-02-02 11:45:15 -07:00
amiosi	2d6b80455d	Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr	2021-02-02 13:25:53 -05:00
amiosi	47e1d6b790	MIMEJR -> MIME_JR	2021-02-02 12:36:05 -05:00
Evan	f4d4cf262e	fix screen cleaner, curious medicine, as one	2021-02-02 09:00:07 -07:00
ultima-soul	5fdb578747	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-02-01 15:58:18 -08:00
ultima-soul	2a20d50904	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-02-01 15:54:08 -08:00
ultima-soul	96232ea166	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-01-28 23:59:08 -08:00
Evan	9fcf7d2453	zero terrain timers for steel roll, remove unused move effectd	2021-01-28 13:51:39 -07:00
Evan	c009b51ae8	add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot	2021-01-28 13:27:00 -07:00
Evan	a37acb8345	coaching, lash out, burning jealousy	2021-01-28 12:21:11 -07:00
Evan	dd51edd881	add eerie spell, surging strikes, jungle healing	2021-01-28 10:51:00 -07:00
ExpoSeed	34c6771e94	Create form change table	2021-01-27 16:30:43 -06:00
Evan	c003f1c023	check move effectiveness with status effects	2021-01-26 15:41:59 -07:00
GriffinR	0064333e4a	Clean up scrcmd.c	2021-01-26 02:16:26 -05:00
Evan	5aff5333dc	fix B_MEMENTO_FAIL comment	2021-01-21 12:05:01 -07:00
Evan	bfb7333507	memento gen4 failing	2021-01-21 12:03:30 -07:00
GriffinR	8fe4d004e3	Merge pull request #1305 from GriffinRichards/doc-battletv Document battle tv data	2021-01-21 12:27:14 -05:00
Evan	4611c71bd1	merge with be	2021-01-21 08:55:14 -07:00
Evan	39139323f6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove	2021-01-20 17:36:37 -07:00
Evan	8ec12c665c	merge with be	2021-01-20 17:36:13 -07:00
Evan	e61309dce6	merge with be	2021-01-20 17:34:24 -07:00
Evan	16d54b6d32	merge with be, add form checks to CanBattlerGetOrLoseItem	2021-01-20 14:28:03 -07:00
ExpoSeed	61db82e64a	Revert "Included global.h into battle_config.h"	2021-01-19 22:55:08 -06:00
GriffinR	6999b237eb	Merge pull request #1309 from GriffinRichards/misc-macro Use constants for item data, misc other constants/fixes	2021-01-19 20:49:58 -05:00
ghoulslash	9d9da6a485	Update include/constants/battle_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-19 15:01:51 -07:00
Evan	b576eb5247	fix var_terrain default, wording	2021-01-19 13:26:36 -07:00
GriffinR	752982552e	Add FIRST_BALL, some FIRST_BERRY_INDEX usage	2021-01-19 13:39:18 -05:00
SphericalIce	2dfaba9472	Name color return values more accurately	2021-01-19 17:59:36 +00:00
SphericalIce	8de76ed533	Make broader use of RGB macros	2021-01-19 17:15:12 +00:00
GriffinR	cf9f8d01c5	Add misc item data constants	2021-01-19 05:49:20 -05:00
LOuroboros	77d714ead5	Included global.h into battle_config.h Fixes the dupplicated defines issue.	2021-01-16 20:37:34 -03:00
Evan	a49b5d1ad0	prankster updated to gen 7	2021-01-16 16:14:36 -07:00
Evan	10b1d33d13	handle battler being affected by terrain	2021-01-16 12:05:51 -07:00
Evan	544d598506	update tailwind timer	2021-01-15 18:34:47 -07:00
Evan	449c2bcc34	add config option	2021-01-15 18:28:10 -07:00
Evan	0d8f804194	update mental herb to gen 5	2021-01-15 18:11:55 -07:00
Evan	f1d89b2d79	merge with be	2021-01-15 11:17:45 -07:00
ExpoSeed	b166e9a5e3	Merge pull request #1276 from LOuroboros/x_items_BE Reworked the effects of the X Items #1	2021-01-15 12:05:07 -06:00
LOuroboros	c2f718d3d3	Implemented Cramorant's Gulp Missile form change	2021-01-14 17:23:09 -03:00
GriffinR	564278fd49	Document battle tv data	2021-01-14 06:29:59 -05:00
Evan	d571c8b028	B_TERRAIN_BG_CHANGE TRUE by default	2021-01-13 16:02:32 -07:00
Evan	d26605c9fe	fix bad bg fade if no permanent terrain	2021-01-13 16:01:47 -07:00
Evan	9902f6e603	merge with be	2021-01-13 14:32:14 -07:00
Evan	8ef6a2c80d	merge with be	2021-01-13 14:23:30 -07:00
GriffinR	b9e1b050e1	Label remaining battle types	2021-01-13 15:20:29 -05:00
Evan	56395a060f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-13 09:23:07 -07:00
ultima-soul	9c5ec33aa7	Sync Crown Tundra and renamed moves Battle Engine defines.	2021-01-12 14:22:33 -08:00
ghoulslash	fba17a96a4	Merge pull request #1253 from surskitty/battle_engine Increase readability of too-long names	2021-01-12 09:20:53 -07:00
Evan	4912bc1d25	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion	2021-01-11 17:15:41 -07:00
GriffinR	92de664f79	List battle animation indexes alongside tables	2021-01-11 16:07:16 -05:00
Philipp AUER	b5fa0129d5	[pokemon-expansion] Changes as requested by code review Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update src/data/pokemon/evolution.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update src/data/pokemon/evolution.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update src/data/pokemon/evolution.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-11 21:43:00 +01:00
surskitty	29343ce1ec	Remove synonyms Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-11 15:00:11 -05:00
opakedragon	cbaf9b38b2	rename string id to reflect usage	2021-01-11 08:48:00 -05:00
surskitty	f58539b602	Renaming the last two and fixing the merge conflict with PE.	2021-01-10 15:48:57 -05:00
surskitty	a0f1dcb9cf	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2021-01-10 15:40:21 -05:00
sbird	95665c24b4	[pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable	2021-01-10 18:30:15 +01:00
Evan	1e22ae4cf2	merge with be	2021-01-10 09:08:25 -07:00
Evan	d4e4405cf5	merge with be	2021-01-10 09:04:21 -07:00
Evan	c95bfae701	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects	2021-01-10 09:02:21 -07:00
Evan	e748db8ef4	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-10 08:58:16 -07:00
LOuroboros	3ffa7f993a	Renamed some X Defend labels to reflect its new name in the IE	2021-01-10 01:58:02 -03:00
ultima-soul	b5b4efdaa0	Merge pull request #1314 from LOuroboros/battle_debug_constant battle_config.h tweaks	2021-01-09 12:36:37 -08:00
Evan	b5128be68b	eject packer invisible before openpartymenu	2021-01-08 08:02:00 -07:00
Evan	6dabff1ee3	merge with be	2021-01-07 21:24:21 -07:00
Evan	0118723a9c	add eject button	2021-01-07 20:31:27 -07:00
Evan	5eb49722c0	add red card effect	2021-01-07 19:33:39 -07:00
SphericalIce	3c2a33b9b2	Use constants for max IVs & the random IV generation flag	2021-01-07 22:13:14 +00:00
ultima-soul	d2d961e447	Merge pull request #1262 from LOuroboros/gen8_abilities_BE Implemented various Gen. 8 abilities	2021-01-07 13:31:17 -08:00
LOuroboros	8511ed57e4	Tweaked Steam Engine's battle string	2021-01-07 18:13:16 -03:00
ghoulslash	c392a2011e	Merge pull request #1325 from ExpoSeed/BE/sync Sync battle engine	2021-01-07 12:13:26 -07:00
LOuroboros	3d124944b3	Review correction to B_X_ITEMS_BUFF's comment	2021-01-07 16:09:23 -03:00
LOuroboros	cb22cbd3f6	Tweaked preprocessor constant in include/constants/item_effects.h	2021-01-07 16:06:55 -03:00
Evan	7fffe23e63	add terrain seeds	2021-01-06 20:22:05 -07:00
Evan	d5d2cac60c	init branch	2021-01-06 14:42:45 -07:00
Evan	aac3f9c3db	kee, maranga, sitrus beries	2021-01-06 13:07:18 -07:00
Evan	7646855e79	jaboca, rowap berry effects	2021-01-06 11:15:56 -07:00
Evan	efa4fe89ad	micle berry	2021-01-06 10:47:07 -07:00
Evan	f2e486eb0d	custap berry effect, custap/quick claw activation message	2021-01-06 09:37:31 -07:00
Evan	4c1e8f2f2e	add curious medicine	2021-01-05 20:02:11 -07:00
Evan	0a3908ee92	add neigh and as one abilities	2021-01-05 19:37:23 -07:00
Evan	f21b0140b9	revert to CheckViability and stat change effect viabilities	2021-01-04 19:39:59 -07:00
Evan	5ae1e3c25b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-04 11:43:36 -07:00
LOuroboros	dbc3690282	Tweaked preprocessor directives Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION	2021-01-04 03:58:31 -03:00
LOuroboros	517c8ffdd0	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE	2021-01-03 22:05:14 -03:00
ExpoSeed	7dadcb94b8	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-03 17:14:43 -06:00
BuffelSaft	10cf5b3673	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only	2021-01-04 10:55:30 +13:00
ExpoSeed	10f4b48215	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-01 14:14:51 -08:00
Evan	f172245ad6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem	2021-01-01 08:49:43 -07:00
Evan	7f4e936e87	fix z move ordering	2021-01-01 08:49:29 -07:00
Evan	0c648c0071	merge with be	2021-01-01 08:34:09 -07:00
ExpoSeed	208e0abe04	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2020-12-31 18:44:43 -06:00
ExpoSeed	24362e8bed	Merge pull request #1250 from ghoulslash/infestation infestation between turn anim	2020-12-31 18:06:13 -06:00
surskitty	aa9796a6ae	Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.	2020-12-31 18:57:36 -05:00
GriffinR	769ddf22c2	Label remaining subs in battle_tower.c	2020-12-24 16:18:47 -05:00
Evan	59813c9ce7	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config	2020-12-23 10:27:54 -07:00
ghoulslash	450ac70ab2	Merge pull request #1288 from LOuroboros/comments Some more small battle_config.h tweaks	2020-12-23 10:27:09 -07:00
LOuroboros	320cc37ac9	USE_BATTLE_DEBUG -> B_ENABLE_DEBUG	2020-12-23 14:04:14 -03:00
LOuroboros	b3c5613ff7	battle_config.h tweaks -Moved the USE_BATTLE_DEBUG constant from include/battle_debug.h -Slight correction to a few comments in battle_config.h	2020-12-23 13:16:01 -03:00
Evan	a426092006	fix sticky barb theft in trainer battles	2020-12-22 08:35:11 -07:00
ghoulslash	0af8cab87e	Merge pull request #1283 from LOuroboros/ct_moves_data Added the data of SwSh's Crown Tundra's moves	2020-12-21 23:13:23 -07:00
Evan	5bdf266000	add additional item theft check	2020-12-20 19:06:50 -07:00
Evan	a0b9ece980	merge with BE	2020-12-20 16:39:50 -07:00
Evan	21e7d6d318	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2020-12-20 16:33:43 -07:00
Evan	7988a1f41d	Ai_TryOnAlly and reorganize files	2020-12-20 14:47:20 -07:00
Evan	31ec3e8479	non-partner good move checks	2020-12-19 21:58:23 -07:00
LOuroboros	a417a1b2b9	Corrected Punk Rock's checks	2020-12-19 16:18:39 -03:00
ultima-soul	ad67068f7e	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data	2020-12-16 13:28:42 -08:00
ultima-soul	c675c92a1d	Add Gen 8 Pokemon data.	2020-12-16 12:57:36 -08:00
Evan	916d0416e3	outline AI_CheckGoodMove	2020-12-15 21:57:33 -07:00
Evan	e70e2bcd65	merge with be	2020-12-14 09:09:51 -07:00
Evan	b85dacce9d	fix conflicts	2020-12-14 08:50:41 -07:00
Evan	67fefd0261	var terrain, surge fixes	2020-12-13 19:42:48 -07:00
Evan	97172fc5b5	merge with be	2020-12-13 17:21:22 -07:00
Evan	ead8637e4f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation	2020-12-13 17:09:04 -07:00
Evan	ac332d5e98	check bad move	2020-12-13 15:02:21 -07:00
Tim Gates	581306db7b	docs: fix simple typo, redunant -> redundant There is a small typo in include/constants/battle_frontier.h. Should read `redundant` rather than `redunant`.	2020-12-13 22:14:50 +11:00
Eduardo Quezada D'Ottone	47d96aed3c	Merge pull request #1285 from LOuroboros/spite Updated Spite	2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone	db9933ce67	Merge pull request #1244 from ghoulslash/popup toggleable manual ability popup destruction	2020-12-12 20:36:55 -03:00
LOuroboros	55bc2b4bb9	Corrected small inconsistency in move flag names	2020-12-12 12:18:56 -03:00
LOuroboros	31d483ef44	Some more battle_config.h tweaks	2020-12-12 11:35:05 -03:00
LOuroboros	c5e04cf243	Removed the unnecessary Dragon Energy effect The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up. I took the chance and fixed its target too.	2020-12-12 01:35:54 -03:00
LOuroboros	33d7f22494	Improved the comment of B_STANCE_CHANGE_FAIL	2020-12-11 21:54:17 -03:00
LOuroboros	17a9555715	Oopsie.	2020-12-11 21:43:18 -03:00
LOuroboros	9ec2e44f4c	Updated Spite	2020-12-11 21:36:59 -03:00
LOuroboros	0ac026e6ca	Added the data of SwSh's Crown Tundra's moves And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.	2020-12-11 20:49:23 -03:00
LOuroboros	c930a63c84	Implemented Punk Rock	2020-12-11 19:46:33 -03:00
LOuroboros	2b0702ec04	Implemented Perish Body Inspired by Raguzero's implementation.	2020-12-11 19:44:32 -03:00
LOuroboros	7d8b8083e8	Implemented Sand Spit	2020-12-11 16:47:23 -03:00
LOuroboros	322918e280	Implemented Steam Engine And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.	2020-12-10 18:27:35 -03:00
LOuroboros	8b5a5a1896	Reverted include/constants/abilities.h to vanilla With the new abilities introduced by the battle_engine in src/data/pokemon/base_stats.h behind locked behind that branch's defined label, we don't need to define them in this branch anymore.	2020-12-10 16:38:29 -03:00
Evan	34dd11448b	sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem	2020-12-09 10:28:18 -07:00
Evan	a93a8b2194	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-12-08 20:50:43 -07:00
LOuroboros	791d561f14	Reworked the effects of the X Items Thanks to Karathan's indications.	2020-12-08 18:24:42 -03:00
Evan	a0ae0ece53	add ultranecrozium-z and update z crystal data	2020-12-08 09:55:50 -07:00
GriffinR	f95192ed87	Define terminal species IDs relatively	2020-12-08 00:45:05 -05:00
BuffelSaft	72b769ec75	Add config options for Jump Kick Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged	2020-12-07 19:30:31 +13:00
Evan	d5ad14c349	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup	2020-12-05 21:03:20 -07:00
Evan	21cab1b7a7	better negative totem boost system, totems occur before switch in abilities	2020-12-05 21:00:51 -07:00
LOuroboros	ce8f794100	Updated abilities.h Straight up copied from the BE to avoid silly merge conflicts.	2020-12-05 14:57:13 -03:00
LOuroboros	6a0fee9c56	Fixed Intrepid Sword and Dauntless Shield And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn	2020-12-05 14:03:13 -03:00
ghoulslash	66ed10a826	Merge pull request #1251 from ExpoSeed/PE-mon-flags Add mon flags	2020-12-03 15:07:17 -05:00
Evan	39cbc21925	fix trainer theft, update config option	2020-12-03 08:42:12 -05:00
LOuroboros	9e1d7cc827	Implemented Ball Fetch	2020-12-02 23:09:35 -03:00
Evan	dcefaf2563	anim particle changes false by default	2020-12-01 18:01:02 -05:00
Evan	4ad5e368a9	fix merge conflicts	2020-12-01 17:57:57 -05:00
Evan	1e68c46890	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation	2020-12-01 17:51:38 -05:00
Evan	5478179464	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims	2020-12-01 17:46:26 -05:00
Evan	25abdeacc5	tidy up z move code	2020-12-01 16:36:44 -05:00
Evan	2bfc7ea9b1	merge upstream	2020-12-01 15:42:04 -05:00
Evan	ce19e33cc4	handle double and multi battles	2020-12-01 13:43:15 -05:00
Evan	fd8951d040	trainer z move ai	2020-12-01 08:24:33 -05:00
Evan	a0bde70493	z move effects	2020-11-30 10:55:46 -05:00
Evan	539a88207e	add z crystal and z ring	2020-11-29 10:00:03 -05:00
Evan	752aca7698	finish z move anims	2020-11-29 09:22:31 -05:00
ExpoSeed	aa7facf57b	Merge pull request #1243 from ghoulslash/abilities Finish Switch In Ability Activation Messages	2020-11-28 20:27:32 -06:00
Evan	f114534ae3	z move anim/effect, black hole eclipse anim	2020-11-28 13:09:43 -05:00
Evan	4060b09bd6	expand top left move window. add z move init anim	2020-11-27 17:06:36 -05:00
Evan	348d70b309	z move indicator and some data	2020-11-26 15:56:18 -05:00
ExpoSeed	f2259d7ce1	Remove IS_ULTRA_BEAST	2020-11-24 22:44:00 -06:00
ExpoSeed	3adf316574	Add mon flags	2020-11-24 22:42:42 -06:00
LOuroboros	c4c802162e	A few more evo related changes. -EVO_MAP -> EVO_MAPSEC -Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!) -Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.	2020-11-25 01:15:19 -03:00
LOuroboros	89f6036e77	Bumped EVOS_PER_MON from 8 to 10	2020-11-24 23:47:07 -03:00
Evan	7c6e74ab69	update terrain bg config option comment	2020-11-24 21:17:31 -05:00
Evan	6c0878b5fe	infestation between turn anim	2020-11-24 17:21:59 -05:00
GriffinR	513c7c5f45	Clarify Kecleon objects	2020-11-23 14:42:47 -05:00
Evan	ef43596a79	toggleable manual ability popup destruction	2020-11-19 15:16:27 -07:00
Evan	07a4400d50	finish switch in ability messages	2020-11-19 11:42:00 -07:00
Evan	99d9a36860	add totem boosts	2020-11-19 10:35:37 -07:00
Evan	5c658c6950	config option for terrain bg change	2020-11-17 20:26:09 -07:00
Evan	c026f705b3	permanent terrain move bgs	2020-11-17 19:45:27 -07:00
ultima-soul	63bd0ec836	Remove Cacophony and fix some Gen 8 ability descriptions to fit.	2020-11-16 15:42:09 -08:00
ultima-soul	e32659d4bb	Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.	2020-11-16 13:50:26 -08:00
Eduardo Quezada D'Ottone	4da357aef4	Fixed compatibility with Pokémon Expansion	2020-11-15 13:35:02 -03:00
LOuroboros	890144f153	Defined Isle of Armor moves Straight up copied from the battle_engine branch.	2020-11-15 13:05:49 -03:00
ghoulslash	686ff59b11	Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves LGPE & Isle of Armor move data.	2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone	f0154028ff	Review changes 2	2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone	54630ff5a9	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms # Conflicts: # src/data/pokemon/evolution.h	2020-11-13 16:40:31 -03:00
Evan	a05d8f7d43	fix conflicts	2020-11-13 11:21:15 -07:00
Evan	435f928aa4	opponent trainer theft config option. Clean up code a bit	2020-11-13 11:00:44 -07:00
Eduardo Quezada D'Ottone	e87f0f1ddb	Review changes	2020-11-13 14:51:50 -03:00
ultima-soul	236d7145ae	Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances Added config option for Steel type resistances.	2020-11-12 23:25:21 -08:00
Evan	64bcac4589	move pickpocket to back of moveend sequence	2020-11-12 23:30:00 -07:00
ultima-soul	c3423b4212	Merge pull request #1206 from ExpoSeed/type-changing-moves Refactor move effects for type changing moves	2020-11-12 19:10:48 -08:00
Eduardo Quezada D'Ottone	4b9d0d8e24	Added config option for Steel type resistances.	2020-11-11 17:48:02 -03:00
LOuroboros	6f122ac8f8	Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility	2020-11-11 15:18:39 -03:00
ExpoSeed	0912577ea1	Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo Implemented Wish Mega Evolution	2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone	d97932c009	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms # Conflicts: # src/pokemon.c	2020-11-10 19:29:50 -03:00
Eduardo Quezada D'Ottone	e021a4aa87	Critical Capture Config Option And Catching Charm #556 from ghoulslash Critical Capture Config Option And Catching Charm	2020-11-10 17:31:08 -03:00
Eduardo Quezada D'Ottone	e6f8d57f08	Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo # Conflicts: # include/constants/battle_string_ids.h	2020-11-10 17:28:17 -03:00
LOuroboros	bb4f00737e	B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE	2020-11-10 14:26:47 -03:00
Evan	de0518121e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-11-10 09:00:30 -07:00
LOuroboros	a25190f357	A few things. -Introduced a Gen. 8 styled text string for Intimidate -Added an ability popup to BattleScript_IntimidatePrevented	2020-11-10 10:34:51 -03:00
LOuroboros	e179b9b5fe	Updated Intimidate to Gen. 8 standard	2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone	6f29abbe0e	Plate type data and hold effect #1207 from ExpoSeed	2020-11-09 15:24:13 -03:00
Eduardo Quezada D'Ottone	df11b68acb	Moved POKEMON_EXPANSION define to global.h to fix reading from other branches	2020-11-09 12:58:03 -03:00
Eduardo Quezada D'Ottone	df4d927e31	Moved BATTLE_ENGINE define to global.h to fix reading from other branches	2020-11-09 12:45:31 -03:00
Eduardo Quezada D'Ottone	b4cf674fa1	Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine	2020-11-09 12:38:53 -03:00
Eduardo Quezada D'Ottone	ddb6142709	Review changes 3.	2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone	35d5324324	Review changes.	2020-11-08 21:02:34 -03:00
Evan	03f480fa17	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-11-08 15:21:48 -07:00
Evan	980f208b78	use NATIONAL_DEX_COUNT for critical capture odds	2020-11-08 14:07:43 -07:00
Eduardo Quezada D'Ottone	2e01654eb9	Plate type data and hold effect.	2020-11-08 01:47:05 -06:00
ExpoSeed	d2566c8988	Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect	2020-11-07 23:34:04 -06:00
ultima-soul	99fdc13e61	Merge branch 'master' into battle_engine_sync	2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone	68627882a5	Merge remote-tracking branch 'pret/master' into PE-pretSync	2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone	8d86169283	Merge remote-tracking branch 'pret/master' into IE-pretSync	2020-11-07 14:54:52 -03:00
Eduardo Quezada D'Ottone	09a5d6c722	Implemented Wish Mega Evolution	2020-11-07 10:13:32 -03:00
Eduardo Quezada D'Ottone	cb6802f01e	Standarized naming schemes.	2020-11-06 20:15:28 -03:00
Evan	b3d1e8b5b8	turn crit capture odds into a ratio	2020-11-03 08:57:11 -07:00
Eduardo Quezada D'Ottone	0c6dc6abab	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms # Conflicts: # graphics/pokemon/burmy/footprint.png # graphics/pokemon/gastrodon/footprint.png # graphics/pokemon/rotom/footprint.png # graphics/pokemon/shellos/footprint.png # graphics/pokemon/wormadam/footprint.png # include/constants/species.h # src/data/pokemon/base_stats.h	2020-11-03 00:13:51 -03:00
ultima-soul	104b48986c	Merge pull request #538 from AsparagusEduardo/PE-IsUltraBeast Created macro used to detect Ultra Beasts.	2020-11-02 09:53:28 -08:00
ExpoSeed	c2e8f51e35	Merge pull request #145 from AsparagusEduardo/IE-Config Item Expansion config file.	2020-11-02 11:31:51 -06:00
Evan	e7372e7c5b	add B_ prefix to critical capture configs	2020-11-01 21:50:34 -07:00
Evan	59692e8e7f	styling fix	2020-11-01 21:08:58 -07:00
Evan	a6c3d950f6	critical capture config option and catching charm	2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone	5a201f006f	More exp options in battle_config (#530 ) from MandL27	2020-11-01 19:41:29 -03:00
Eduardo Quezada D'Ottone	b372ab1c34	Fixed label for Egg Group config.	2020-11-01 14:50:29 -03:00
ExpoSeed	1b65e1a1f0	Merge pull request #520 from ghoulslash/battle_engine Add Toggle Healthbox Visibility Feature	2020-10-31 23:07:39 -05:00
Eduardo Quezada	ed6fd6c964	Fixed compile	2020-10-26 22:37:01 -03:00
Eduardo Quezada	2c098d8294	Merge branch 'pokemon_expansion' into PE-Ultima-Forms # Conflicts: # src/data/pokemon/base_stats.h	2020-10-26 20:06:37 -03:00
aaaaaa123456789	1c3d75f673	Merge branch 'master' into reverts	2020-10-26 12:16:36 -03:00
Eduardo Quezada	641daafb3f	Fixed identation for better readability.	2020-10-25 12:34:48 -03:00
Eduardo Quezada	4aa6442cd4	Fixed price mixed up.	2020-10-25 01:28:14 -03:00
LOuroboros	61b41f3599	Removed unused labels for expanded TMs	2020-10-24 09:57:11 -03:00
Eduardo Quezada	13a6b70e8c	Updating Egg Groups.	2020-10-24 08:04:30 -03:00
Eduardo Quezada	67817ff9b9	Updated abilities.	2020-10-24 07:58:58 -03:00
Eduardo Quezada	ae60ae8a2d	Review changes.	2020-10-24 03:07:45 -03:00
Eduardo Quezada	b5834b617d	Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves # Conflicts: # src/data/text/move_descriptions.h	2020-10-24 00:36:29 -03:00
Eduardo Quezada	ced1ccd659	Created macro to be used by Beast Balls	2020-10-23 23:16:37 -03:00
Kurausukun	44c2d15ca9	re-match sub_81C79BC (from #1177 ) also re-define RBG macros	2020-10-23 22:07:30 -04:00
Eduardo Quezada	e861abeff3	Initial review changes.	2020-10-23 22:19:37 -03:00
Eduardo Quezada	d596fa7e12	Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption # Conflicts: # include/battle_util.h # include/constants/battle_config.h # src/battle_util.c	2020-10-23 21:49:59 -03:00
Kurausukun	90211248af	re-match Cmd_unknown_24 (from #1140 ) changes to data structs are necessary. other things that look unnecessary, like the order of operands, are also necessary. fuck this function.	2020-10-23 20:47:10 -04:00
ExpoSeed	34729ce99c	Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs More Battle Config options	2020-10-23 10:59:12 -05:00
Eduardo Quezada D'Ottone	353f9eca42	Merge pull request #30 from AsparagusEduardo/PE-PokemonConfig Updated types and stats in configuration file.	2020-10-23 12:40:10 -03:00
Eduardo Quezada	92728a1875	Added Ultimasoul's Forms from his FromID system.	2020-10-23 11:44:47 -03:00
Eduardo Quezada D'Ottone	38573ab402	Merge pull request #16 from LOuroboros/deoxys Added the data of Deoxys' forms	2020-10-22 00:52:40 -03:00
MandL27	6d5547bdb4	fix indentation	2020-10-21 16:20:49 -04:00
MandL27	efdaa25640	Add B_SCALED_EXP and B_SPLIT_EXP	2020-10-21 16:19:07 -04:00
LOuroboros	503134167a	Review corrections	2020-10-21 15:01:53 -03:00
LOuroboros	4794c63066	Reincorporated badge based stat boosts	2020-10-21 12:57:57 -03:00
TheXaman	e6ab3122e8	Merge branch 'tx_debug_system_public' of https://github.com/TheXaman/pokeemerald_openworld into tx_debug_system	2020-10-20 21:59:43 +02:00
TheXaman	6456009a44	Implementation if Pyredrid and AsparagusEduardo debug menu plus huge rewrite and tons of additions V2: Fly, Warp, Flags, Vars, give items, give pkm 2 versions Improved cheats, reworked the vars system vars function now starts at VARS_START and end VARS_END Figured out how to display FieldMessages, reimplemented CheckSafeBlock, cleanup DebugAction_DestroyExtraWindow instead of multiple, renamed text variables cleanup + pokemon simple give pokemon complex nearly done Complex pkm works, items now with icons if statement cleanup alter build tools to include maps per map group Warp functionallity added hex value to flags and vars cleanup Credits	2020-10-20 20:37:02 +02:00
Evan	d64b926469	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion	2020-10-19 11:22:41 -06:00
Eduardo Quezada	8f9659f846	Fixed Pika Papow's name.	2020-10-19 11:45:54 -03:00
Eduardo Quezada	a23e9a8a37	Adapting move changes (part 2) + Hyperspace Fury type.	2020-10-18 12:07:11 -03:00
Eduardo Quezada	3342573881	Updated name of setting.	2020-10-18 11:19:39 -03:00
Eduardo Quezada	b1903af8c1	Adapting move changes (part 1)	2020-10-17 23:08:39 -03:00
Eduardo Quezada	12bc93dc78	Review changes	2020-10-17 17:07:54 -03:00
Eduardo Quezada	faca6c4867	Organized interface settings into their own category.	2020-10-17 14:31:58 -03:00
Eduardo Quezada	815b525855	Configurable double wild battle chance, surfing double battles and flag for forcing them.	2020-10-17 14:25:43 -03:00
Eduardo Quezada	6c9f864651	Tweaking battle_config to accomodate pokemon_config and item_config	2020-10-17 10:52:44 -03:00
Eduardo Quezada	ffe23b246b	Ordered config.	2020-10-17 02:54:13 -03:00
Eduardo Quezada	0717783651	Dream ball config.	2020-10-17 02:51:08 -03:00
Eduardo Quezada	e320e6f7ff	Quick Ball config.	2020-10-17 02:44:09 -03:00
Eduardo Quezada	6f246bb0c7	Dusk Ball config	2020-10-17 02:41:02 -03:00
Eduardo Quezada	ce3b877666	Dive Ball config.	2020-10-17 02:33:15 -03:00
Eduardo Quezada	14c243b273	Timer ball config.	2020-10-17 02:08:58 -03:00
Eduardo Quezada	32a2f91ecb	Repeat Ball modifier in config.	2020-10-17 02:04:39 -03:00
Eduardo Quezada	6af4425081	Nest Ball modifier in config.	2020-10-17 02:00:53 -03:00
Eduardo Quezada	6676451353	Net ball modifier in config	2020-10-17 01:52:14 -03:00
Eduardo Quezada	0dfbbde7ce	Heavy Ball modifier in config.	2020-10-17 01:47:04 -03:00
Eduardo Quezada	e65f22a76c	Lure Ball modifier in config.	2020-10-17 01:33:10 -03:00
Eduardo Quezada	7fbd64ec37	Moved Shiny Charm rerolls into config file	2020-10-17 01:26:51 -03:00
Eduardo Quezada	137d9801c0	Key Items configuration in file.	2020-10-17 01:25:54 -03:00
Eduardo Quezada	2b95f9fc43	Updated types and stats in config.	2020-10-16 21:04:11 -03:00
Evan	bd26919acc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-10-15 18:25:21 -06:00
Eduardo Alvaro Quezada D'Ottone	1df696c1fb	Merge pull request #17 from LOuroboros/move_updates Updated many moves' data to Gen. 8 standards	2020-10-15 20:56:58 -03:00
Eduardo Quezada	a6e88b82ee	Review changes and option to hide split icon.	2020-10-15 20:15:44 -03:00
LOuroboros	f00d50d7b7	Renamed the HOLD_EFFECT_EV_BOOST label	2020-10-15 05:25:07 -03:00
LOuroboros	e4635525e7	Renamed the HOLD_EFFECT_EV_BOOST label	2020-10-15 04:52:03 -03:00
LOuroboros	5257ef70df	Oopsie, the Gen. 8 effect should be the default one	2020-10-15 04:31:44 -03:00
LOuroboros	fcc3c6c6ba	Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8	2020-10-15 04:21:40 -03:00
Eduardo Quezada	0d39b29691	Option to use Gen 3 Physical/Special split.	2020-10-15 00:16:50 -03:00
Eduardo Quezada	47259092e3	LGPE & Isle of Armor move data.	2020-10-14 21:50:22 -03:00
Eduardo Quezada	34ce08db0b	Added Karrablast/Shelmet evolution method.	2020-10-14 20:16:18 -03:00
Evan	c9504ca749	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-10-13 11:34:41 -06:00
ExpoSeed	a539045dae	Relocate and redefine POKEMON_SLOTS_NUMBER	2020-10-13 12:05:42 -05:00
ExpoSeed	90d4359aeb	Fix constants	2020-10-12 19:11:41 -05:00
ExpoSeed	9e2c8a95c1	Sync bev2 with pret	2020-10-11 01:01:47 -05:00
ExpoSeed	bc4e992be2	Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion	2020-10-11 00:10:12 -05:00
ExpoSeed	8b83d88e75	Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion	2020-10-11 00:07:10 -05:00
Evan	5ab17cc713	Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald into battle_engine	2020-10-09 09:13:17 -06:00
GriffinR	65a4e06737	Add ITEM6_HEAL constants, change move flags to shifts	2020-10-05 18:48:51 -04:00
ExpoSeed	c3113b43bb	Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion	2020-10-04 02:36:07 -05:00
ExpoSeed	5794fc69e8	Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion	2020-10-04 02:35:23 -05:00
GriffinR	66bd1e6d3f	Use constants for item digits	2020-09-25 11:18:52 -04:00
aaaaaa123456789	7dc95a0103	Undo PokeCodec's PRs This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.	2020-09-13 06:30:55 -03:00
DizzyEggg	97d0643110	Merge with master	2020-09-08 12:48:28 +02:00
DizzyEggg	448599f53c	Merge with master	2020-09-08 12:01:20 +02:00
DizzyEggg	271219f962	Merge with master	2020-09-08 12:00:51 +02:00
PokeCodec	3d87a88067	Make battle pyramid defines into enums	2020-09-04 19:49:53 -04:00
PokeCodec	3a2a2b6ba9	Fix issues according to feedback	2020-09-04 19:49:53 -04:00
PokeCodec	d4158e490a	Match more functions	2020-09-04 19:49:53 -04:00
PikalaxALT	135ed6a162	Merge pull request #1163 from GriffinRichards/doc-animthrow Minor battle_anim_throw cleanup	2020-09-04 19:44:33 -04:00
GriffinR	f5495d1220	Give proper names to underwater maps	2020-09-01 03:03:14 -04:00
GriffinR	afb3472282	Minor battle_anim_throw cleanup	2020-08-30 15:11:44 -04:00
GriffinR	a9719c92bf	Merge pull request #1160 from kiliwily/master2 add MAX_LEVEL_UP_MOVES macro	2020-08-28 19:18:03 -04:00
kiliwily	c68c2b66e8	add more macros	2020-08-29 01:02:20 +02:00
GriffinR	09cfed64b5	Merge pull request #1146 from GriffinRichards/rename-songs Give songs meaningful english names	2020-08-28 16:14:21 -04:00
kiliwily	5e7b6a089c	add MAX_LEVEL_UP_MOVES macro	2020-08-28 20:36:07 +02:00
Thomas Winwood	58786a7ac0	Add MAX_PER_STAT_EVS macro	2020-08-28 02:25:02 +01:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
DizzyEggg	c2733236be	Merge with master	2020-08-27 11:36:35 +02:00
DizzyEggg	35559d6b71	Merge with master	2020-08-27 10:58:31 +02:00
GriffinR	fbb70b3727	Document contest AI scripts	2020-08-21 14:57:17 -04:00
GriffinR	ee72696b53	Sync encounter musics with encounter music types	2020-08-20 21:03:24 -04:00
GriffinR	d356e35b64	Fix incorrect pike curtain SE names	2020-08-20 20:23:08 -04:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
GriffinR	6c34effda9	Merge pull request #1138 from GriffinRichards/doc-contest Document contest	2020-08-20 16:03:47 -04:00
PokeCodec	e27975afaa	Match battle script commands by correcting a function and the pokemon struct	2020-08-18 22:05:01 -04:00
GriffinR	503dafd210	Fix wallys parents misnamed as uncle/aunt	2020-08-18 17:51:41 -04:00
GriffinR	65bd2faf94	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest	2020-08-16 05:59:10 -04:00
GriffinR	2749948eeb	Clean up contest doc	2020-08-16 05:52:17 -04:00
GriffinR	e98e4652fd	Document contest live updates	2020-08-16 05:18:09 -04:00
GriffinR	70851d9083	Add MAP_SCRIPT descriptions	2020-08-11 15:50:09 -04:00
GriffinR	8b95e1964b	Merge pull request #1121 from GriffinRichards/doc-roulette Document roulette	2020-08-10 17:18:09 -04:00
GriffinR	078c341b2b	Merge pull request #1122 from GriffinRichards/clean-battlemsg Add stat stage constants, clean up misc battle msg data	2020-08-10 14:29:27 -04:00
LOuroboros	d37896d51b	Merge branch 'pokemon_expansion' of https://github.com/dizzyeggg/pokeemerald into deoxys	2020-08-09 20:55:28 -03:00
GriffinR	5e8ffff62f	Add stat stage constants	2020-08-04 20:38:57 -04:00
PikalaxALT	03eba6a62c	Merge pull request #1116 from GriffinRichards/doc-slotmachine Document slot machine	2020-08-01 09:56:44 -04:00
GriffinR	22b5b6b074	Start documenting roulette	2020-07-30 19:37:16 -04:00
GriffinR	7ada56f039	Merge pull request #1085 from GriffinRichards/doc-overworld Document field effects / misc overworld	2020-07-28 17:54:25 -04:00
GriffinR	1f4813bfd2	Document slot machine funcs	2020-07-28 17:38:05 -04:00
DizzyEggg	43359f39c3	Merge with master	2020-07-27 15:28:03 +02:00
DizzyEggg	11c2207839	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-07-27 14:54:32 +02:00
DizzyEggg	0066640a1e	Merge with master	2020-07-27 14:51:39 +02:00
GriffinR	36a4764a78	Document some slot machine data	2020-07-26 02:15:59 -04:00
GriffinR	2439f42de4	Add warnings to generated files	2020-07-24 03:43:37 -04:00
GriffinR	aca50c87be	Continue new contest documentation	2020-07-24 00:14:53 -04:00
GriffinR	52a4428ba6	Begin new contest documentation	2020-07-23 17:55:40 -04:00
LOuroboros	1f1eebb104	Defined the species for Deoxys' forms	2020-07-23 12:53:45 -03:00
GriffinR	4a42e2a710	Merge branch 'master' into doc-overworld	2020-07-23 10:31:52 -04:00
GriffinR	813f0c724f	Sync flags with pokeruby	2020-07-22 18:00:41 -04:00
LOuroboros	383872ca92	Added the data of Zygarde's forms (#477 ) * Defined species for Zygarde's 10% and Complete forms * Defined the sprites for Zygarde's 10% and Complete forms * Added coordinates and entries for the forms of Zygarde in the sprite data tables * Set the InGame names of Zygarde's forms * Added the base stats of Zygarde's forms * Set the level up learnsets for the forms of Zygarde * Defined the paths for the sprites of Zygarde's forms * Linked the icons to the species of Zygarde's forms * Added the icons of Zygarde's forms * Fixed fuckups and inserted the icons of Zygarde's forms * Added the cries of Zygarde's forms * Tweaked the Y coordinate of Zygarde's 10% form's backsprite	2020-07-22 23:37:47 +02:00
GriffinR	af09e73d67	Merge branch 'master' into doc-overworld	2020-07-18 20:24:09 -04:00
GriffinR	1a27af8855	Merge pull request #1100 from GriffinRichards/clean-battlescrdata Misc battle and battle palace documentation	2020-07-18 20:22:44 -04:00
GriffinR	fb402725c6	Convert more battle constants to bit shifts	2020-07-18 18:39:38 -04:00
GriffinR	aba42513d3	Clean up some battle scr cmd data	2020-07-18 18:10:15 -04:00
GriffinR	96fd719a19	Merge pull request #1081 from GriffinRichards/add-localids Add local object event ids for referenced objects	2020-07-17 18:18:47 -04:00
DizzyEggg	14daa9f4a5	Inverse battles	2020-07-17 20:53:22 +02:00
Evan	f923f5198e	add oval charm	2020-07-16 09:48:25 -06:00

... 13 14 15 16 17 ...

2341 Commits