3562 Commits

Author	SHA1	Message	Date
ghoulslash	340278c83b	Merge pull request #2452 from LOuroboros/intimidate ... Optimized Intimidate's code	2022-12-11 22:04:16 -05:00
LOuroboros	8eff1a13c1	Updated BattleScript_IntimidateEffect to comply with BattleScript_TryAdrenalineOrb's demands	2022-12-11 23:17:59 -03:00
LOuroboros	e6a3396b0f	Added Adrenaline Orb check and removed silly comment	2022-12-11 19:24:36 -03:00
ghoulslash	0a9e3c8dc8	fix stattextbuffer in BattleScript_IntimidatePrevented_Item	2022-12-11 16:16:10 -05:00
ghoulslash	e3e0d60222	Merge pull request #2467 from Bassoonian/gen9moves ... Generation IX Moves	2022-12-11 14:47:47 -05:00
LOuroboros	0d1f9d9613	Reimplemented Mimicry	2022-12-09 20:46:18 -03:00
ghoulslash	6d28882e44	start gen9 hold effects	2022-12-06 09:48:36 -05:00
LOuroboros	d6b9f07681	Implemented Earth Eater's effect	2022-12-06 05:30:21 -03:00
LOuroboros	a961980e0f	Implemented Toxic Debris' effect	2022-12-06 05:23:30 -03:00
LOuroboros	aa051dab02	Implemented Costar's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7a52404fd3	Implemented Supreme Overlord's effect	2022-12-06 05:23:30 -03:00
LOuroboros	f96137eb5e	Implemented Cud Chew's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7c67f1ac27	Activated Switch In abilities during weather and terrain change ... Abilities such as Protosynthesis and Quark Drive demand it.	2022-12-06 05:23:30 -03:00
LOuroboros	24465858a7	Implemented the 4 Ruin Abilities	2022-12-06 05:23:29 -03:00
LOuroboros	de05c4dd56	Implemented Good as Gold's effect	2022-12-06 05:23:29 -03:00
LOuroboros	e25f843db3	Implemented Quark Drive's effect ... Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.	2022-12-06 05:23:29 -03:00
LOuroboros	a328088122	Implemented Protosynthesis' effect ... Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.	2022-12-06 05:23:29 -03:00
LOuroboros	34cafa746c	Implemented Electromorphosis' effect ... Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied. Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.) As a result, the game will trigger the ability multiple times if they're hit by a multihit move. This directive makes the code end the ability effect preemptively if the target does have the status flag applied.	2022-12-06 05:23:29 -03:00
LOuroboros	88cae380d0	Implemented Wind Power's effect	2022-12-06 05:23:29 -03:00
LOuroboros	c43060fbfd	Tweaked BattleScript_WellBakedBodyActivates and BattleScript_WindRiderActivatesMoveEnd	2022-12-06 05:23:29 -03:00
LOuroboros	4dc44150c5	Implemented Wind Rider's effect	2022-12-06 05:23:29 -03:00
LOuroboros	ca656b63b9	Added Well Baked Body's effect and misc. changes ... -Added a modifybattlerstatstage macro to handle stat stages in battle. -Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.	2022-12-06 05:21:24 -03:00
LOuroboros	eb082cd1a2	Implemented Purifying Salt's effect	2022-12-03 01:51:11 -03:00
LOuroboros	acb9c31bd4	Implemented Anger Shell's effect	2022-12-03 01:19:24 -03:00
LOuroboros	b0027cb78b	Implemented Seed Sower's effect	2022-12-02 23:31:41 -03:00
GriffinR	483c3d5c13	Document wonder news	2022-11-22 02:17:03 -05:00
Bassoonian	739680e425	Victory Dance effect	2022-11-18 22:23:34 +01:00
Bassoonian	29ae22183b	Mystical Power effect	2022-11-18 22:17:08 +01:00
Bassoonian	9512b3a57a	Implement Double Shock functionality with temporary string	2022-11-18 22:12:26 +01:00
Bassoonian	3ac3cb249e	Wicked Torque effect	2022-11-18 22:00:21 +01:00
Bassoonian	f7d1a12d2d	Data entry for gen9 moves	2022-11-18 12:15:44 +01:00
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
LOuroboros	11c99cac61	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-13 23:17:59 -03:00
LOuroboros	31a602f3b6	Optimized Intimidate's code	2022-11-12 18:03:46 -03:00
Eduardo Quezada	f2d0e547ac	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/rom_header_gf.c	2022-11-09 19:54:44 -03:00
LOuroboros	999a53028a	Updated AnimTask_PrimalReversion	2022-11-08 09:38:27 -03:00
Eduardo Quezada D'Ottone	e6ae0bd01e	Merge pull request #2434 from LOuroboros/badDreams ... Optimized Bad Dreams' code	2022-11-08 08:16:07 -03:00
Eduardo Quezada	2ef2134be1	Moved Hunger Switch to form change table.	2022-11-06 17:12:34 -03:00
BuffelSaft	1da4eb3b14	Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid ... Config for Dark Void being only usable by Darkrai	2022-11-05 22:42:51 +13:00
LOuroboros	f56df74576	Optimized Bad Dreams' code ... Misc: -Made the ability pop up stick around until the ability's effect ends just like in ORAS. -Updated sText_BadDreamsDmg accordingly while I was at it.	2022-11-04 14:58:58 -03:00
Eduardo Quezada	44bf4a15e3	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h # include/constants/battle_move_effects.h	2022-11-04 12:19:40 -03:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
ghoulslash	1e6903840a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite	2022-11-04 09:29:45 -04:00
ghoulslash	d13431b4ab	merge w rhh master	2022-11-04 09:29:39 -04:00
Eduardo Quezada	edf4e45c4d	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -03:00
BuffelSaft	c169a9523e	Merge branch 'upcoming' into fix-stat-boost-on-hit	2022-11-03 22:01:30 +13:00
BuffelSaft	736ca893b6	Fix abilities that raise target's stat after hit ... Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.	2022-11-03 21:54:56 +13:00
LOuroboros	86e322dcea	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-01 22:41:31 -03:00
Eduardo Quezada D'Ottone	b8371500d3	Merge pull request #1676 from BuffelSaft/multistrike ... Multi-hit refactor and Parental Bond	2022-11-01 21:16:04 -03:00
Eduardo Quezada	e4a439aa46	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h	2022-10-30 12:30:38 -03:00
Eduardo Quezada	3172273c73	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures ... # Conflicts: # src/pokemon.c	2022-10-30 12:16:09 -03:00
GriffinR	c76beed989	Merge pull request #1807 from pret/porymap-5 ... Update for Porymap 5.0.0	2022-10-30 11:01:37 -04:00
GriffinR	01c71b4ce1	Fix more text and movements labeled as scripts	2022-10-30 03:27:28 -04:00
GriffinR	f439a2dee7	Fix EventScript_WroteSecretCodeLockOpened typo	2022-10-30 03:14:47 -04:00
BuffelSaft	224ca256ce	Requested clean up ... Rename constants, remove white space, improve B_BEAT_UP description. * Rename B_BEAT_UP_DMG to B_BEAT_UP * Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG * Remove trailing whitespace * Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE	2022-10-27 22:25:33 +13:00
GriffinR	cc182bf05e	Use Porymap's new order for connection fields	2022-10-24 10:05:59 -04:00
BuffelSaft	1b056f9044	Fix various Parental Bond issues ... - Dragon Tail and Circle Throw strike twice and then switch the target - Z moves are unaffected by Parental Bond - Renamed parentalBondOn to parentalBondState - Added constants for possible values of parentalBondState - Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP	2022-10-23 17:37:23 +13:00
BuffelSaft	6035c5a280	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-10-22 14:31:13 +13:00
GriffinR	a418f8d976	Merge pull request #1755 from GriffinRichards/map-dynamic ... Rename special map constants, treat warp ids as strings	2022-10-18 22:45:56 -04:00
tustin2121	4730870646	VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY ... Getting rid of the VAR_ prefix, to avoid the porymap problem.	2022-10-18 21:12:31 -04:00
ghoulslash	a585d56053	fix whitespace	2022-10-16 23:39:12 -04:00
tustin2121	327c648e87	Document seldom-used trigger functionality ... Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.	2022-10-16 20:46:50 -04:00
ghoulslash	71023512fd	update psycho cut anim	2022-10-16 19:20:24 -04:00
Eduardo Quezada	77f24d42e4	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-10-07 15:39:02 -03:00
GriffinR	4f407a1066	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
Eduardo Quezada D'Ottone	17c8842ad4	Merge branch 'dev' into teleport	2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone	a483899043	Merge branch 'dev' into symbiosis	2022-09-24 11:58:35 -03:00
LOuroboros	c64593cb9c	Fixed LTBTS's animation	2022-09-24 09:04:15 -03:00
Eduardo Quezada	720cb249d6	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-09-16 12:06:06 -03:00
Eduardo Quezada	6b79c7772c	Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_interface.c	2022-09-16 11:56:50 -03:00
Eduardo Quezada	77696ca686	Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2022-09-16 10:31:02 -03:00
ghoulslash	6616c89451	Merge pull request #2303 from Blackforest92/RHH-PR-Branch ... Tidying graphics - Trio Weather	2022-09-15 18:01:43 -04:00
Eduardo Quezada	dc423ef7ff	Handling repel/lure menu	2022-09-14 00:18:01 -03:00
Eduardo Quezada	de32940fdf	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
Eduardo Quezada	1d7e8bd730	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c	2022-09-13 16:22:42 -03:00
GriffinR	91c040b081	Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace ... Cleaned trailing whitespace	2022-09-13 14:00:11 -04:00
LOuroboros	222362e804	Fixed Raquaza typo	2022-09-12 21:26:22 -03:00
Eduardo Quezada	e3005e5275	Item config for repel prompt	2022-09-12 10:21:52 -03:00
Eduardo Quezada	2d78ac0192	Implemented Lures using the same vars as repels	2022-09-12 10:21:49 -03:00
Deokishisu	e3c19f5df5	Implement B2W2 Repel System ... The game now asks if the player would like to use another Repel when the one they used runs out. # Conflicts: # include/constants/vars.h	2022-09-12 10:21:38 -03:00
Eduardo Quezada	65108c3192	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
Eduardo Quezada	69f01d73cd	Added missing uses of Fairy type for Union Room and Battle Factory	2022-09-11 12:41:56 -04:00
Blackforest92	431cb6fa7c	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
Blackforest92	3acb32acb8	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
Eduardo Quezada D'Ottone	066a5bee85	Merge pull request #2277 from TheXaman/tx_debug_system_rhh ... Inclusion of the tx_debug_system	2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone	47a50b3dac	Merge branch 'master' into weather_forms_fixes	2022-09-07 23:07:25 -04:00
LOuroboros	c8f4a44380	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-09-06 20:40:34 -03:00
LOuroboros	8705d1656b	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-09-06 20:38:28 -03:00
TheXaman	6062cf45fa	Merge branch 'master' into tx_debug_system_rhh	2022-09-07 00:03:58 +02:00
Eduardo Quezada	3a6318f1d9	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor ... # Conflicts: # include/constants/battle_config.h	2022-09-06 15:20:54 -04:00
Eduardo Quezada	e253a87bc5	Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once.	2022-09-05 14:49:14 -04:00
Eduardo Quezada	7c7da8e176	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs ... # Conflicts: # src/battle_script_commands.c	2022-09-05 14:43:04 -04:00
Eduardo Quezada D'Ottone	4017fc3e20	Apply style suggestions from code review	2022-09-03 21:22:15 -04:00
GriffinR	36551dff2f	Treat warp ids as strings to allow constants	2022-09-03 15:43:43 -04:00
Eduardo Quezada	5403cd036e	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ... # Conflicts: # include/battle.h # include/battle_controllers.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controllers.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c	2022-09-02 23:24:08 -04:00
Eduardo Quezada	c7fc2e13f7	Renamed TM flags to keep consistency with the rest of the repo	2022-09-02 16:54:58 -04:00
TheXaman	b4b3e84cbd	removed default flags and added ingame warning if a function that requires them is used	2022-09-02 18:39:38 +02:00
TheXaman	ad57551db1	removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation	2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone	59f1f10dec	Merge pull request #2260 from DizzyEggg/magic_bounce ... Fix Magic Bounce targets	2022-09-01 19:56:15 -04:00
Eduardo Quezada D'Ottone	cc174b622c	Merge pull request #2278 from rh-hideout/DizzyEggg-dragontailweakarmor ... Dragon Tail Weak Armor fix	2022-09-01 19:54:33 -04:00
LOuroboros	c167e2c6cc	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
DizzyEggg	d167b4ea0a	Dragon Tail Weak Armor fix	2022-08-30 20:08:50 +02:00
DizzyEggg	7cb010d71e	fix magic bounce conflicts and fix magic coat	2022-08-30 19:36:06 +02:00
TheXaman	8c9a59ec1c	Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh	2022-08-29 19:13:11 +02:00
Eduardo Quezada D'Ottone	8ca2f949e3	Merge pull request #2233 from gruxor/tmhm_rework ... Reworked TMHM into expandable list format	2022-08-29 04:20:45 -04:00
crater-git	9f16d1dd12	Fixed battle frontier tutors (for real this time)	2022-08-27 22:45:10 -04:00
Eduardo Quezada	69f4c226f0	Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs ... # Conflicts: # src/battle_ai_main.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_script_commands.c # src/pokemon.c # src/pokemon_summary_screen.c	2022-08-27 02:42:22 -04:00
GriffinR	8aead3b4c8	Merge pull request #1747 from GriffinRichards/contest-ai-bug ... Incorporate commented bug fixes in contest AI scripts	2022-08-26 23:53:44 -04:00
Eduardo Quezada	7c86bd5d08	Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 ... # Conflicts: # include/battle_interface.h # src/battle_anim_effects_1.c # src/battle_script_commands.c # src/field_specials.c	2022-08-26 22:23:37 -04:00
Eduardo Quezada D'Ottone	bee36edd9c	Merge pull request #2173 from LOuroboros/yourAffection ... Implement affection-now-friendship mechanics	2022-08-26 14:54:32 -04:00
GriffinR	0516f94837	Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore ... Added constants for GetLeadMonFriendshipScore	2022-08-26 14:52:10 -04:00
GriffinR	c5e873aa2b	Merge pull request #1742 from GriffinRichards/sound-pan ... Add missing usage of SOUND_PAN_*	2022-08-26 14:47:24 -04:00
crater-git	54ee960970	Fixed Battle Frontier tutor move IDs	2022-08-26 10:12:11 -04:00
DizzyEggg	6331931ba3	Fix Magic Coat targets	2022-08-26 15:01:51 +02:00
Eduardo Quezada	6fb4da68f3	Corrected Oldale Town Sign labels	2022-08-25 22:00:24 -04:00
GriffinR	ce4a6e9067	MAP_NONE -> MAP_DYNAMIC	2022-08-25 21:34:05 -04:00
crater-git	ed02c4b425	Removed tutor move distinction, combined llists	2022-08-25 19:56:47 -04:00
LOuroboros	410045028a	Optimized General_AffectionHangedOn	2022-08-25 20:01:14 -03:00
LOuroboros	8bd7103b9d	Even more review corrections	2022-08-25 17:32:12 -03:00
LOuroboros	2cf2c00b29	Updated friendship labels	2022-08-25 17:10:11 -03:00
LOuroboros	7539051942	Further tweaked the affection animation	2022-08-25 17:05:57 -03:00
LOuroboros	5dd143f19d	Applied Blackforest's changes to General_AffectionHangedOn	2022-08-25 13:07:52 -03:00
LOuroboros	1fc63c3431	More review corrections	2022-08-25 11:52:21 -03:00
LOuroboros	11d6ae4820	Renamed the GetLeadMonFriendshipScore constants	2022-08-25 11:34:37 -03:00
LOuroboros	e792fae415	Review corrections ... -Simplified the affection mechanics' battle scripts. -Corrected the value seting inside CalcCritChanceStage. -Simplified the checks inside Cmd_adjustdamage -Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added. -Added constants for the values returned by GetMonFriendshipScore.	2022-08-25 10:45:57 -03:00
LOuroboros	1f4ef2a0fb	Added constants for GetLeadMonFriendshipScore	2022-08-25 10:40:56 -03:00
LOuroboros	b7ca63d151	Implemented Ice Face ... Thanks to Benício Gonçalves#3454 who provided a base to work with.	2022-08-24 13:45:34 -03:00
Eduardo Quezada	eea718cfc6	Placeholder moves can't be used in battle.	2022-08-24 00:30:49 -04:00
Eduardo Quezada	56a2e91518	Updated move limitations	2022-08-23 22:40:04 -04:00
Eduardo Quezada	1f5adf93c7	Cleaned up use of configs be almost exclusively preproc functions	2022-08-23 21:00:08 -04:00
Eduardo Quezada	afcc1178b2	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate ... # Conflicts: # data/battle_ai_scripts.s # data/battle_scripts_1.s # include/battle_controllers.h # include/battle_script_commands.h # include/battle_util.h # include/constants/battle_script_commands.h # include/constants/global.h # include/decompress.h # src/battle_anim_effects_1.c # src/battle_anim_normal.c # src/battle_anim_poison.c # src/battle_anim_water.c # src/battle_arena.c # src/battle_controller_link_opponent.c # src/battle_controller_link_partner.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_controller_recorded_opponent.c # src/battle_controller_recorded_player.c # src/battle_controller_safari.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/berry.c # src/data/trainers.h # src/decompress.c # src/field_effect.c # src/hall_of_fame.c # src/overworld.c # src/pokeball.c # src/pokemon.c # src/pokemon_icon.c # src/pokemon_storage_system.c # src/scrcmd.c	2022-08-22 20:30:45 -04:00
Eduardo Quezada	2b7a2c4d09	Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate	2022-08-22 17:30:48 -04:00
Eduardo Quezada	75ac960365	Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms	2022-08-22 17:27:21 -04:00
GriffinR	898ec580ae	Merge pull request #1737 from GriffinRichards/lock-unlock ... Clean up lock/unlock anim movement	2022-08-22 01:30:33 -04:00
GriffinR	30906762ed	Merge pull request #1740 from AsparagusEduardo/pret_stringTabs ... Fixed inconsistent use of white space for scripts, .c files and .h files.	2022-08-20 23:03:59 -04:00
GriffinR	9e175a1037	Merge pull request #1735 from GriffinRichards/arena-const ... Add some missing battle arena constants	2022-08-20 22:54:32 -04:00
GriffinR	11b4958f23	Incorporate commented bug fixes in contest AI scripts	2022-08-19 19:45:15 -04:00
GriffinR	c2d5dd2a1f	Additional battle anim sync	2022-08-19 11:51:13 -04:00
Eduardo Quezada	e43f65cc69	using BATTLE_RUN constants in BattleScript_EffectTeleport	2022-08-15 21:06:26 -04:00
Eduardo Quezada	e8a05e92e4	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
Eduardo Quezada	63e4a8adcd	Fixed instances of .string being used with spaces instead of tabs	2022-08-15 14:32:01 -04:00
GriffinR	5515e328b2	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
GriffinR	cf4d05e9e7	Fix typo	2022-08-11 12:09:38 -04:00
GriffinR	63468f9fcb	Add some missing battle arena constants	2022-08-11 12:02:56 -04:00
Eduardo Quezada D'Ottone	54097951f7	Using B_WAIT_TIME_LONG	2022-08-03 16:51:02 -04:00
Eduardo Quezada	09af7422d5	Further cleaning after comparing with pokefirered ... STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs	2022-07-28 01:27:05 -04:00
LOuroboros	032b7b2ab9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection	2022-07-25 10:24:19 -03:00
Eduardo Quezada	231727d02b	Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge ... # Conflicts: # asm/macros/event.inc # data/specials.inc # include/constants/species.h # src/data/pokemon/base_stats.h	2022-07-22 23:33:04 -04:00
Eduardo Quezada	f3bebcd12c	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge ... # Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 22:57:02 -04:00
ghoulslash	3a77b52bad	Merge pull request #2194 from AsparagusEduardo/BE_pretmerge ... Battle Engine pret merge	2022-07-22 14:00:40 -04:00
Eduardo Quezada D'Ottone	e14afd8957	Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.	2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone	cb34119711	Config for Charge raising Sp. Def.	2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone	fe63dafcc1	Merge branch 'battle_engine' into BE_pretmerge ... # Conflicts: # src/battle_anim_fire.c # src/battle_controller_player.c	2022-07-20 08:50:30 -04:00
ghoulslash	2b5bb9f6e4	move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check	2022-07-19 18:24:53 -04:00
ghoulslash	5d91bdeafc	add B_ANIM_RESTORE_BG to BattleScript_EffectTerrainHit	2022-07-17 19:13:45 -04:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04:00
ghoulslash	9b5aee3b93	fix z stat-boosts	2022-07-17 12:17:54 -04:00
Eduardo Quezada D'Ottone	e791cf90ad	Merge tag 'pretmaster' into BE_pretmerge2 ... # Conflicts: # data/battle_anim_scripts.s # include/battle_anim.h # include/battle_controllers.h # include/battle_interface.h # include/battle_main.h # include/battle_setup.h # include/constants/battle_anim.h # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_anim_fire.c # src/battle_anim_normal.c # src/battle_controllers.c # src/battle_dome.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/pokemon.c	2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone	c69275f373	Merge remote-tracking branch 'pret/master' into PE_pretmerge ... # Conflicts: # include/battle_anim.h # include/pokemon.h # src/data/pokemon/base_stats.h	2022-07-12 17:20:49 -04:00
GriffinR	e6a374f2b6	Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall	2022-07-06 14:49:08 -04:00
LOuroboros	8f728dcd79	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-07-03 13:49:18 -03:00
ghoulslash	02a62e245b	Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney ... Config for lost money after losing a battle	2022-07-01 11:58:36 -04:00
ghoulslash	b9be123716	Merge pull request #2163 from Sneed69/terrain-softlock-fix ... Fix terrain move softlock	2022-07-01 11:58:00 -04:00
ghoulslash	a349462b78	Merge pull request #2134 from LOuroboros/bePretMerge ... Pret merge for the battle_engine	2022-07-01 09:21:51 -04:00
LOuroboros	aa5c6a3f01	Implemented affection-now-friendship mechanics	2022-06-22 00:18:01 -03:00
Colton G. Rushton	3de23b332a	Supplant https://github.com/pret/pokeemerald/pull/1579	2022-06-18 21:51:05 -03:00
GriffinR	21ed288f50	Merge pull request #1687 from SimplyBLGDev/patch-1 ... Format newlines in surf.inc	2022-06-18 11:04:39 -04:00
Colton G. Rushton	c8e6d69fdc	Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc ... One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.	2022-06-18 11:49:13 -03:00
GriffinR	57222323c1	Merge pull request #1678 from GriffinRichards/const-frontier ... Add some battle frontier constant usage	2022-06-18 10:22:58 -04:00
Simply BLG	324a157b34	Format newlines in surf.inc ... One of the strings declared in surf.inc was poorly formatted. ## Description Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.	2022-06-17 15:21:12 -03:00
Simply BLG	380cc8615b	Format newlines in pc_transfer.inc	2022-06-17 14:22:31 -03:00
Simply BLG	1860b61fe3	Corrected two missing newlines	2022-06-17 12:05:32 -03:00
Simply BLG	e48341f7fc	Format newlines in contest_string.inc ... Some of the strings declared in contest_string.inc were poorly formatted, containing newline characters in the middle of the string, opposing the format used by every string in data/text, I just updated them to match the format, making it more readable.	2022-06-17 11:52:54 -03:00
GriffinR	4660f8c88b	Document battle tower TV show	2022-06-14 09:37:39 -04:00
GriffinR	dec54e6e92	Additional constant usage	2022-06-13 03:21:20 -04:00
sneed	f419fc3ae7	fix terrain move softlock	2022-06-04 18:36:18 +03:00
GriffinR	1ca1bff81c	Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg	2022-06-03 15:43:21 -04:00
GriffinR	34438e6bc4	Continue documenting generic arguments	2022-06-03 15:38:03 -04:00
GriffinR	a8437493c1	Document generic argument names in battle anim palettes	2022-06-01 12:25:01 -04:00
hamish	307d5d93c4	add potlergeist animation	2022-05-23 08:53:08 -04:00
sneed	5b0afffd91	popup and flower gift description fixes	2022-05-22 13:10:51 +03:00
sneed	fe42eacdf0	tabs over spaces	2022-05-22 05:23:06 +03:00
BuffelSaft	16570e8c3f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-22 12:55:55 +12:00
Sneed69	d0a2be9630	weather forms fixes and config	2022-05-22 03:20:48 +03:00
TheXaman	cbe8f30001	added FLAG_ADVENTURE_STARTED to cheat start	2022-05-21 12:54:02 +02:00
sneed	928d3c5a28	change form on weather fade	2022-05-19 15:08:03 +03:00
GriffinR	5fa8ca55b0	Clean up some additional unknowns	2022-05-17 17:12:45 -04:00
GriffinR	593e2c9be0	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
ghoulslash	ebb711b6e5	fix bug bite not activating if faints target. also save original move target through the effect	2022-05-13 18:24:52 -04:00
ghoulslash	b09dad68d5	minor edits to consumeberry calls	2022-05-13 16:29:37 -04:00
ghoulslash	cdd37ad1bb	fix stuff cheeks w new consumeberry impl	2022-05-13 16:28:23 -04:00
ghoulslash	f6f4227f49	better bug bite impl, fix item removal	2022-05-13 16:21:41 -04:00
BuffelSaft	bb25746e05	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-13 22:40:43 +12:00
LOuroboros	52d6c96e69	Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge	2022-05-13 03:20:42 -03:00
LOuroboros	2263caef7a	Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine	2022-05-13 03:17:31 -03:00
AgustinGDLV	54163240d8	implemented toggelable cancellation / multi-evo	2022-05-08 20:55:29 -07:00
ghoulslash	07b0ce9737	add inner focus ability popup msg	2022-05-08 17:57:30 -04:00
AgustinGDLV	7b0154336d	Merge branch 'battle_engine' into symbiosis	2022-05-07 13:26:21 -07:00
ghoulslash	9fa4d916d3	Merge pull request #2055 from AsparagusEduardo/BE_configs ... Once again, Battle Configs	2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone	dc25bc6145	Merge branch 'battle_engine' into BE_WhiteOutMoney ... # Conflicts: # include/constants/battle_string_ids.h # src/battle_message.c	2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone	cbe73de8c8	Merge pull request #1861 from LOuroboros/primalReversionTweaks ... Primal Reversion Tweaks	2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone	4e7ce0b663	Merge branch 'battle_engine' into BE_configs ... # Conflicts: # include/constants/battle_config.h	2022-05-07 10:25:34 -04:00
ghoulslash	adfb336a3f	Merge pull request #2105 from Sneed69/healblock ... Add missing Heal Block functionalities	2022-05-07 09:13:18 -04:00
ghoulslash	e5b777695c	Merge pull request #2107 from Sneed69/steelbeam ... Steel Beam Move Effect Implementation	2022-05-07 08:40:34 -04:00
AgustinGDLV	2ffff788b4	fixed Fling	2022-05-06 22:29:40 -07:00
AgustinGDLV	542a0f07b4	fixed bug bite / bestow	2022-05-06 22:07:25 -07:00
BuffelSaft	3e1934ebe3	Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE ... Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.	2022-05-07 14:20:37 +12:00
BuffelSaft	8693db632b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-07 12:27:20 +12:00
AgustinGDLV	0cb6529ae2	functional but not perfect implementation	2022-05-06 14:53:16 -07:00
sneed	ef7cd3cdfe	BattleScript_DefiantActivates rename	2022-05-06 11:15:24 +03:00
LOuroboros	43053d2e6c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-05-06 02:22:14 -03:00
sneed	6c23eb431d	Heal Pulse and Pollen Puff	2022-05-05 13:56:59 +03:00
sneed	60d7d8f97e	Initial Commit	2022-05-03 03:38:44 +03:00
sneed	b17d1f7816	Add generation specific interactions	2022-05-02 17:56:09 +03:00
PikalaxALT	ff936c15e1	Sync arg descriptions from FireRed ... https://github.com/pret/pokefirered/pull/501	2022-04-28 13:46:23 -04:00
PikalaxALT	3f7b6ca357	Remove spurious space in battle_anim_scripts.s	2022-04-28 09:04:16 -04:00
BuffelSaft	af6242f2e0	Requested changes, Sticky Web edge case ... Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.	2022-04-27 21:51:10 +12:00
BuffelSaft	5358cc0a00	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-04-25 13:38:13 +12:00
LOuroboros	055c72a384	Improved the special animation of Shell Side Arm	2022-04-23 04:29:15 -03:00
GriffinR	fc5747f0f7	Merge pull request #1649 from GriffinRichards/clean-trainer ... Trainer hill clean up	2022-04-20 00:20:44 -04:00
TheXaman	c54bf21b01	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2022-04-16 23:18:35 +02:00
ghoulslash	959f3cca77	merge w pret	2022-04-07 12:11:45 -04:00
LOuroboros	fa39dc76dc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
GriffinR	62f3f144ab	Clean up some trainer hill	2022-03-31 12:54:07 -04:00
LOuroboros	434f6cf5ad	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2022-03-26 08:43:55 -03:00
ExpoSeed	5fd468f507	Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns	2022-03-22 13:10:24 -05:00
ExpoSeed	f50a406b18	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2022-03-22 12:56:23 -05:00
LOuroboros	387bf07e3c	Update battle_scripts_1.s	2022-03-20 19:00:21 -03:00
LOuroboros	aca51e843e	Update battle_scripts_1.s	2022-03-14 16:14:32 -03:00
ultima-soul	86089ce935	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone	ed464a9e8d	Merge pull request #2068 from ghoulslash/be/strugglebug ... Fix struggle bug anim	2022-02-25 12:50:55 -03:00
ghoulslash	7c2bbf1df3	fix struggle bug anim	2022-02-25 08:54:35 -05:00
ghoulslash	e4ef3cc3b4	move glare effectiveness exception to code	2022-02-24 22:06:18 -05:00
cbt6	f826a5a82d	Use constants for PC locations	2022-02-23 15:07:22 +08:00
GriffinR	0710a5467b	Add some missing RGB constant usage	2022-02-15 21:55:51 -05:00
BuffelSaft	6a119c5a30	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-02-13 21:06:15 +13:00
Eduardo Quezada D'Ottone	c849197a88	Config for Minimize raising 2 stages	2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone	d73e6faab8	Config for Growth being affected by sunlight	2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone	0dd2de988a	Merge branch 'battle_engine' into primalReversionTweaks	2022-02-12 23:08:12 -03:00
ghoulslash	209279c207	fix psycho shift string printing	2022-02-09 14:30:30 -05:00
BuffelSaft	0a27b575dc	Fix merge error in battle scripts	2022-01-27 17:24:11 +13:00
BuffelSaft	9d1800f53e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-01-27 17:18:51 +13:00
GriffinR	2495d18132	Add missing :req, remove old macros	2022-01-23 18:52:04 -05:00
LOuroboros	8eaf0718ec	Review changes ... Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.	2022-01-23 19:13:04 -03:00
LOuroboros	a8a8c7e2fa	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2022-01-23 02:37:07 -03:00
GriffinR	a7e6045d71	Merge pull request #1597 from GriffinRichards/misc-cleanup ... Miscellaneous fixes	2022-01-19 22:17:37 -05:00
GriffinR	69759b2d12	Merge pull request #1601 from GriffinRichards/fix-decor-flag ... Fix FLAG_DECORATION_0 name	2022-01-16 17:44:58 -05:00
Eduardo Quezada D'Ottone	6aabe58649	Merge branch 'battle_engine' into magician	2022-01-15 13:06:13 -03:00
GriffinR	fd7457b05a	Remove berry fix	2022-01-13 15:26:20 -05:00
GriffinR	f899a02ac6	Use MON_GIVEN_TO_ constants for givemon	2022-01-12 18:34:26 -05:00
LOuroboros	69f678b3fc	Put the new B_WAIT_TIME_SHORTEST to use	2022-01-11 20:21:12 -03:00
LOuroboros	b2965e5522	Added a pause to BattleScript_ProteanActivates	2022-01-11 20:15:47 -03:00
GriffinR	49418f8c01	Add missing commas	2022-01-11 09:55:11 -05:00
GriffinR	3a6c633905	Add seteventmon	2022-01-11 02:16:25 -05:00
GriffinR	110fbc559c	Make item optional for givemon and setwildbattle	2022-01-11 02:08:14 -05:00
GriffinR	8b920691e6	Fix FLAG_DECORATION_0 name	2022-01-09 01:31:42 -05:00
Eduardo Quezada D'Ottone	97baedbd5e	Merge pull request #1923 from WiserVisor/battle_engine ... Added Sky Drop to Battle Engine	2022-01-07 18:14:40 -03:00
GriffinR	ce55e58ad8	Misc cleanup	2022-01-04 10:09:42 -05:00
GriffinR	23f5c9fd5c	Clean up pokedex_area_screen	2021-12-31 00:16:56 -05:00
Eduardo Quezada D'Ottone	5b54986e6b	Merge pull request #1980 from LOuroboros/multiBattles ... Multi battle updates	2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone	4d6f54e8d6	Merge pull request #2007 from ghoulslash/be/roleplay ... Update Role Play	2021-12-25 11:37:57 -03:00
ghoulslash	93a7e139ec	merge w be	2021-12-24 09:40:12 -05:00
WiserVisor	8923ffb3af	Merge branch 'battle_engine' into battle_engine	2021-12-23 15:29:10 -08:00
ghoulslash	b6b5d862f4	update role play mechanics	2021-12-23 08:37:11 -05:00
LOuroboros	e28fa7f91c	Update event_scripts.s	2021-12-21 22:10:54 -03:00
ghoulslash	7a70fc0d73	Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs	2021-12-20 11:25:14 -05:00
LOuroboros	ffe35fbb06	Updated defeat condition on multi battles	2021-12-19 08:30:43 -03:00
ultima-soul	b0b8b9bf46	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 23:51:29 -08:00
ultima-soul	4f2e3bf214	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 21:23:54 -08:00
ghoulslash	31bbc4ddde	prevent stat-raising damage effects if battle will end	2021-12-17 10:24:07 -05:00
ExpoSeed	65186b8c3a	Fix some style issues	2021-12-16 21:57:30 -06:00
ExpoSeed	d6747527da	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-12-16 21:44:01 -06:00
Eduardo Quezada D'Ottone	bbf7b62ceb	Config for lost money after losing a battle	2021-12-11 23:03:50 -03:00
LOuroboros	f317b542e2	Updated Teleport	2021-12-11 21:20:04 -03:00
ultima-soul	26f29a04fd	Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" ... This reverts commit ac2bcece75, reversing changes made to 349262ebc3.	2021-12-10 09:41:54 -08:00
ultima-soul	ac2bcece75	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync	2021-12-09 14:16:05 -08:00
ultima-soul	a5afdac0ae	Resolved review suggestions for upstream Battle Engine sync.	2021-12-08 12:08:16 -08:00
GriffinR	cc05b08227	Fix incorrect ever grande flower animation palettes	2021-12-06 11:17:42 -05:00
ghoulslash	1e644c9d4c	fix spacing	2021-12-05 14:45:48 -05:00
ghoulslash	c0e408bfab	fix aqua ring heal anim	2021-12-05 14:44:22 -05:00
ultima-soul	7369f60c06	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-12-03 17:30:45 -08:00
GriffinR	d501636730	Fix incorrect flag animation palettes	2021-12-03 16:36:18 -05:00
ultima-soul	d408b56549	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-12-01 20:18:57 -08:00
ultima-soul	23bf41713c	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-12-01 20:17:08 -08:00
LOuroboros	2e67153982	Renamed the Enigma Berries' constants	2021-12-01 22:16:38 -03:00
LOuroboros	f2dd7bce99	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks	2021-11-30 20:39:58 -03:00
SonikkuA-DatH	adecc77fe8	Update battle_anim_scripts.s	2021-11-28 19:47:09 -08:00
SonikkuA-DatH	10a870a568	Update battle_scripts_1.s	2021-11-28 19:45:47 -08:00
ghoulslash	384bdaee18	merge w pret	2021-11-28 19:09:43 -05:00
ultima-soul	d0623d7b71	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-27 21:40:08 -08:00
ultima-soul	0312c5be8b	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-27 21:38:26 -08:00
BuffelSaft	fd4414fe62	Spaces instead of tabs	2021-11-23 23:01:43 +13:00
BuffelSaft	a89ce0c38a	Swapped webs don't trigger Defiant ... Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect? Also, fix Sticky Web not activating Defiant.	2021-11-23 22:54:30 +13:00
GriffinR	e0fae879da	Merge pull request #1558 from GriffinRichards/update-macros ... Update event macro comments	2021-11-22 19:10:49 -05:00
BuffelSaft	6b8f86c276	Snap Trap placeholder anims ... Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.	2021-11-23 11:05:36 +13:00
BuffelSaft	d2eb5f0e61	Remove shell trap effect code ... Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.	2021-11-22 14:46:47 +13:00
BuffelSaft	42b8f18cb1	Remove Corrosive Gas code ... This was not working at all in testing, so it can be done by a separate PR later.	2021-11-22 14:35:01 +13:00
BuffelSaft	70f0018c08	Partially implement Shell Trap ... Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.	2021-11-22 14:14:41 +13:00
ultima-soul	a8f9a54787	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-21 10:41:32 -08:00
ultima-soul	3ed51d6d91	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
GriffinR	23dd1dad7f	Fix incorrect palettes in Mauville flower tileset anims	2021-11-21 11:23:03 -05:00
W1serV1ser	c2f81cd5f5	Added Sky Drop	2021-11-20 11:44:48 -08:00
BuffelSaft	14a2e86313	Fix Scale Shot ... Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.	2021-11-19 21:57:32 +13:00
BuffelSaft	86efd69370	Finish/fix Beak Blast ... This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.	2021-11-19 20:19:10 +13:00
BuffelSaft	98712e576e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2021-11-19 17:48:11 +13:00
GriffinR	42a83ee50e	Use STR_VAR names for apprentice_buff and frontier_gettrainername	2021-11-18 23:20:05 -05:00
GriffinR	e66ea0cb99	Reformat compare + goto_if/call_if to single statements	2021-11-18 23:06:51 -05:00
BuffelSaft	16a4fc9062	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-19 16:33:24 +13:00
GriffinR	6c6487dd7a	Missing spaces to tabs in scripts files	2021-11-18 21:02:22 -05:00
TheXaman	2f8896f2f0	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2021-11-18 15:13:04 +01:00
GriffinR	c89dfd9f56	Finish updating macro comments	2021-11-18 01:47:58 -05:00
GriffinR	b5b5d95de6	Distinguish 'virtual object' names from object events	2021-11-17 23:40:53 -05:00
GriffinR	c4f8f4d11a	Add STR_VAR_# ids to string buffer macros	2021-11-17 22:00:44 -05:00
GriffinR	c940b67716	Continue macro comment updating	2021-11-17 17:45:59 -05:00
GriffinR	61aa9c3ba9	More updating event macro comments	2021-11-16 17:46:34 -05:00
GriffinR	d414787932	Some TV clean-up	2021-11-16 16:22:17 -05:00
GriffinR	5d9c31a610	Label slot machine ids, fix GetPriceReduction	2021-11-16 15:43:52 -05:00
GriffinR	63c5905914	Continue updating event macro comments	2021-11-16 13:10:23 -05:00
GriffinR	04cc923d6c	Handle optional arguments for warp commands, add WARP_ID_NONE	2021-11-16 10:53:00 -05:00
LOuroboros	5c485d9769	Fixed Fling when gLastUsedItem is 0 ... Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.	2021-11-15 14:02:33 -03:00
GriffinR	65d3b58374	Add PARTY_NOTHING_CHOSEN	2021-11-15 10:57:06 -05:00
GriffinR	f85de6eca5	Start event macro comment updates	2021-11-15 10:54:57 -05:00
LOuroboros	a01fd2eb7a	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2021-11-15 12:47:26 -03:00
LOuroboros	cbb6639f8d	Fling tweaks ... -Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER) -Updated BattleScript_EffectFling following Smogon's description of Fling's effect. -Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect -No need to define flingPower when its value is 0 -Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes. -Added a preproc config for Klutz.	2021-11-15 12:40:10 -03:00
GriffinR	b14fe9dce3	Merge pull request #1547 from GriffinRichards/doc-sounddata ... Clean up sound, add CRY_MODE constants	2021-11-13 15:54:40 -05:00
ghoulslash	940a165be7	merge w be	2021-11-13 09:09:15 -05:00
ghoulslash	9df66f4ac1	Merge pull request #1843 from Blackforest92/battle_engine ... Update Giga Impact's graphic and use fade-in battle animation.	2021-11-13 08:54:37 -05:00
LOuroboros	2fe015e5ce	Implemented Fling	2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone	704957efb9	Fixed Relic Song's SE	2021-11-13 07:30:12 -03:00
BuffelSaft	04867ac0d3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-13 17:33:25 +13:00
BuffelSaft	55b279ba0a	Fix several move effects ... Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.	2021-11-13 16:29:12 +13:00
BuffelSaft	6232b046b1	Fix Burn Up ... Now works properly with and without Parental Bond. It wasn't broken before, but its interaction with Parental Bond was.	2021-11-13 12:40:45 +13:00
Eduardo Quezada D'Ottone	a7870dbef0	Merge branch 'battle_engine' into magician	2021-11-12 19:40:34 -03:00
LOuroboros	ad5bcd06cf	Fixed a small buffer overflow in AI_CV_Recycle_ItemsToEncourage	2021-11-11 22:27:17 -03:00
BuffelSaft	e606e54f9d	Fix Big Pecks/Octolock animation ... Also removed MOVE_EFFECT_AFFECTS_USER because that shouldn't be part of playstatchangeanimation. The stat drops still bypass Mirror Armor without this.	2021-11-11 14:32:38 +13:00
BuffelSaft	e637714e1b	Requested changes ... Various bug fixes, syntax corrections etc.	2021-11-10 21:11:15 +13:00
BuffelSaft	e2599c2469	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-10 14:31:32 +13:00
Blackforest92	76ba9d835a	pulled latest RHH battle_engine 08-11-2021	2021-11-08 16:38:42 +07:00
GriffinR	c4169cfd29	Disambiguate cry functions	2021-11-07 14:26:09 -05:00
GriffinR	54b254a829	Add CRY_MODE constants	2021-11-07 13:33:05 -05:00
Eduardo Quezada D'Ottone	c2a17510a9	Terrain Pulse animations	2021-11-07 11:25:08 -03:00
BuffelSaft	e407883b58	Rethink final strike effects ... This is now checked in SetMoveEffect instead of in each move that should behave this way. Some effects will need to be redone to make them play nice with this change, but some just work as is.	2021-11-07 20:31:09 +13:00
BuffelSaft	72d12a575d	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-07 12:13:18 +13:00
Eduardo Quezada D'Ottone	e9804a5023	Secret Power animation config	2021-11-06 17:32:34 -03:00
ghoulslash	da6ec51fc2	merge w be	2021-11-06 10:43:35 -04:00
ghoulslash	41bf1dc2f4	merge w be	2021-11-06 10:40:57 -04:00
Eduardo Quezada D'Ottone	ae8de0f07a	Merge branch 'BattleEngine' into BE_TerrainMoves ... # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_util.c	2021-11-06 10:44:05 -03:00
BuffelSaft	5acebe32aa	Merge pull request #1817 from LOuroboros/photonGeyser ... Implemented Photon Geyser and Shell Side Arm	2021-11-06 16:04:53 +13:00
BuffelSaft	14ebba04af	Align comment with others ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-06 12:43:57 +13:00
BuffelSaft	4007a8d1f8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song	2021-11-06 11:52:51 +13:00
LOuroboros	5f458c9cd3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-05 10:58:53 -03:00
BuffelSaft	ee83d1142c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-05 21:40:05 +13:00
BuffelSaft	bf786c6c9a	Fix Magma Storm ... Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.	2021-11-05 18:22:52 +13:00
BuffelSaft	a8d44f84a1	Merge pull request #1852 from Blackforest92/battle_engine_2 ... Update waterfall, trick room, & focus blast BG	2021-11-05 15:27:52 +13:00
BuffelSaft	6df3975fc6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-05 14:32:33 +13:00
cbt6	32aaf6912f	Rename movement scripts to use Faster over Fastest	2021-11-05 02:22:28 +08:00
LOuroboros	22f7e81bef	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-04 12:25:26 -03:00
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	c9ae140bd1	Fix Clangourous Soul ... I broke this while trying to tidy up the code, it worked perfectly before. Also, make sure the "recoil' doesn't break Disguise.	2021-11-04 21:50:42 +13:00
BuffelSaft	ecbe048f96	Fix Octolock ... Fixed two issues: - Octolock doesn't have an end of turn animation in gen 8 - The def drop anim wasn't played if Sp. Def was at -6 and def could still drop	2021-11-04 21:26:04 +13: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	3baf2aa331	Remove trynextdart, update waitmessage 0x40 ... Not dealing with Dragon Darts in this PR. Updated waitmessage 0x40 to waitmessage B_WAIT_TIME_LONG.	2021-11-04 20:19:18 +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	e930dae278	Remove ability pop up for Hunger Switch ... Morpeko should change form each turn without showing its ability.	2021-11-04 15:40:26 +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
LOuroboros	f0d7c75ec8	Syntax corrections	2021-11-03 17:48:04 -03:00
ghoulslash	48c29a9cd8	proper mirror armor sticky web targeting	2021-11-03 15:05:52 -04:00
GriffinR	e14210ce1f	Merge pull request #1536 from GriffinRichards/clean-braille ... Add font id constants, better braille support	2021-11-03 13:17:29 -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
Blackforest92	b9c23f7c62	Update waterfall, trick room, & focus blast BG	2021-11-03 16:29:09 +07: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	18b87416d5	Fixes ... - Fix Sheer Force interaction (needed after adding | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN) - Fix "X Transformed!" target - Allow switching between both forms - Allow form change if target is KO'ed	2021-11-03 17:56:16 +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
BuffelSaft	d99fd30e4d	Looping battle script, correct message ... Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"	2021-11-03 11:51:20 +13:00
LOuroboros	69b42de0d9	Implemented Mimicry ... Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.	2021-11-02 14:44:55 -03:00
Blackforest92	0f5c9f5cb0	Adjust Giga Impact background to fade in before impact	2021-11-03 00:37:22 +07:00
ghoulslash	592a1dab63	fix mirror armor setstatchanger, handle reflected stat blockage	2021-11-02 12:02:58 -04:00
ghoulslash	ffcba355b0	merge w be	2021-11-02 10:36:08 -04:00
BuffelSaft	4668e11765	Looping battlescript version 1 ... Would be better if it simply updated the target, cured the status and returned I think, needs testing.	2021-11-03 00:45:24 +13: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
Blackforest92	2d5ed4a1e2	Allow Giga Impact fadein background & upgrade its graphic	2021-11-02 12:53:11 +07: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	f3013d8ee9	Standarized Solarbeam into Solar Beam	2021-11-01 18:36:35 -03:00
ghoulslash	e4242d04ab	remove battler skipping in neutralizing gas exit bs	2021-11-01 14:28:41 -04:00
ghoulslash	48bea554a3	fix tryendneutralizinggas placement	2021-11-01 14:21:28 -04: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
BuffelSaft	fbce8b2ff0	Merge pull request #1749 from ghoulslash/wandering_spirit ... Wandering Spirit	2021-11-01 11:26:53 +13:00
Blackforest92	9b6cd383a4	Optimized Rock Wrecker and Hurricane	2021-11-01 01:06:39 +07:00