Commit Graph

1351 Commits

Author SHA1 Message Date
LOuroboros
f39f48fc51 Made MOVE_EFFECT_DIRE_CLAW a tiny bit prettier 2023-01-05 03:07:28 -03:00
LOuroboros
72566e6323 Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs 2023-01-05 03:02:56 -03:00
LOuroboros
0a00942a26 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-01-02 16:00:13 -03:00
LOuroboros
13d8c0d167 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2023-01-02 14:34:24 -03:00
LOuroboros
ca32d43433 Streamlined ability-on-weather changes
Also renamed activateweatherabilities and activateterrainabilities.
2023-01-02 14:32:56 -03:00
LOuroboros
d3443396e2 Made Clear Body and similar abilities be normally affected by their own stat stage reductions 2023-01-01 10:45:38 -03:00
Eduardo Quezada D'Ottone
2d222ad0a9
Merge pull request #2544 from LOuroboros/miscs
Applied minor tweaks
2022-12-30 17:51:55 -03:00
Eduardo Quezada D'Ottone
4dc72dcfc1
Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2
Implementing Teatime effect
2022-12-30 17:49:54 -03:00
LOuroboros
e8dfb66c30 Adding ability effect triggers for terrains and weather
A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change.

Misc. changes:
-EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN
 -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all.
 -The main reason for the rename was the inconsistency with the battle script's label.
-Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.
2022-12-30 03:25:16 -03:00
LOuroboros
9bad91b167 Applied minor tweaks
-Made setbeakblast affect a specified battler instead of the gBattlerAttacker to justify the macro's layout.
-Added Shell Trap to the list of moves unaffected by Encore.
-Renamed CheckFocusPunch_ClearVarsBeforeTurnStarts into CheckChosenMoveForEffectsBeforeTurnStarts because that function doesn't just check for Focus Punch anymore, and it doesn't clear any variables either.
2022-12-28 08:33:31 -03:00
LOuroboros
f5c165ff0c Updated Dire Claw's effect again
Thanks to MGriffin for providing a much nicer code for it.
2022-12-28 08:30:22 -03:00
LOuroboros
0159065dea Removed Shell Trap
It's time to let it go for my own mental sanity.
Besides, it's a Gen. 7 move. I shouldn't have added it here.
2022-12-28 07:51:11 -03:00
SphericalIce
200b71be02 Fix Beat Up's battle script to avoid an out-of-bounds array access 2022-12-27 10:49:57 +00:00
LOuroboros
9972cce0ec Updated MOVE_EFFECT_DIRE_CLAW 2022-12-21 20:05:10 -03:00
LOuroboros
2cb9400ef0 Implemented Dire Claw's effect 2022-12-21 19:48:48 -03:00
LOuroboros
3ce4869766 Implemented Shell Trap's effect 2022-12-21 19:48:10 -03:00
Eduardo Quezada D'Ottone
da535fc8f1
Merge pull request #2530 from mrgriffin/rhh-setroost-cleanup
Minor Roost fixes/cleanup
2022-12-21 17:04:14 -03:00
Eduardo Quezada D'Ottone
42d2bee519
Merge pull request #2527 from mrgriffin/rhh-cleanup-handle-terrain-move
Cleanup HandleTerrainMove
2022-12-21 12:21:46 -03:00
Martin Griffin
632ec92475 Minor Roost changes
- Fix 'mon with Flying in type3 but not type1 or type2 is set to
  uninitialized roostTypes.
- Remove unread third roostTypes element.
- Option for Gen IV pure-Flying behavior.
2022-12-21 14:52:01 +00:00
LOuroboros
d943f891c5 Applied Wind Power and Wind Rider correction
-Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop
-Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.
2022-12-21 10:08:16 -03:00
Martin Griffin
682c59869b Cleanup HandleTerrainMove 2022-12-20 21:28:54 +00:00
LOuroboros
6153b8e904 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-20 07:11:36 -03:00
LOuroboros
c8abf00cac Applied corrections
Anger Shell:
 -Made it print a string from the gStatDownStringIds table while lowering Def and Sp. Def
 -Made it use the shiny new modifybattlerstatstage macro.
 -Made it activate multiple times per battle, as it should.
Well-Baked Body:
 -Turned it into an absorbing ability.
Wind Rider:
 -Turned it into an absorbing ability.
 -For its Tailwind interaction, I made it activate only when Tailwind kicks in successfully, instead of whenever it's active at the end of a turn.
Guard Dog:
 -Updated its check inside BattleScript_EffectHitEscape.
 -Moved it from Cmd_forcerandomswitch to BattleScript_EffectRoar.
Wind Power:
 -Split off its move end effect from Electromorphosis'.
Electromorphosis:
 -Split off its move end effect from Wind Power's.
Hadron Engine:
 -Merged its Switch In effect with Electric Surge's.
Protosynthesis:
 -Fixed its stat boost.
Quark Drive:
 -Fixed its stat boost.
Cud Chew:
 -Updated its ENDTURN effect's berry check.
Supreme Overlord:
 -Tweaked the looping i variable's data type, the order of the variables and the checks inside ApplySupremeOverlordModifier.
Earth Eater:
 -Turned it into an absorbing ability.

Misc changes:
-Added a variable to set the amount of stat stages raised inside AbilityMoveEffects' case ABILITYEFFECT_ABSORBING.
-Added a preproc config to update the text string that they print.
-Limited the scope of atkHighestStat and defHighestStat in CalcMoveBasePowerAfterModifiers to Protosynthesis's and Quark Drive's effects.
2022-12-20 07:08:29 -03:00
SonikkuA-DatH
07a91b9e9b
Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-12-19 17:18:43 -08:00
SonikkuA-DatH
459631eb96
Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-12-19 17:18:23 -08:00
SonikkuA-DatH
6215d4b1b4
Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-12-19 17:18:05 -08:00
SonikkuA-DatH
f6fab92ac8
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-19 15:52:20 -08:00
ghoulslash
79fa2c79e2
Merge pull request #2517 from LOuroboros/speed_swap
Fixed Speed Swap's effect
2022-12-19 08:56:36 -05:00
SonikkuA-DatH
bf1a205661
Update src/battle_script_commands.c
Bracket fixing

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-12-18 22:27:12 -08:00
SonikkuA-DatH
c81b702a86
Update src/battle_script_commands.c
Spacing refix

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-12-18 22:26:51 -08:00
SonikkuA-DatH
03b5d36249
Update src/battle_script_commands.c
removes various description

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-12-18 22:26:06 -08:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08:00
SonikkuA-DatH
44b522fd1c
Update battle_script_commands.c
Spacing
2022-12-18 15:53:07 -08:00
LOuroboros
089104cd9c
Update battle_script_commands.c 2022-12-18 10:35:58 -03:00
LOuroboros
7c447a1f62 Small corrections 2022-12-14 12:09:16 -03:00
LOuroboros
4c9446ed0a Fixed Speed Swap's effect 2022-12-14 12:00:45 -03:00
LOuroboros
af6ea91e72 Applied Eduardo's suggestion 2022-12-14 10:48:12 -03:00
LOuroboros
37151e4a2d Updated SetMoveEffect 2022-12-14 10:46:11 -03:00
LOuroboros
a3e58b05c1 Implemented Guard Dog's effect 2022-12-12 20:33:37 -03:00
LOuroboros
a56cfd1aa7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-12 19:55:48 -03:00
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate
Optimized Intimidate's code
2022-12-11 22:04:16 -05:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves
Generation IX Moves
2022-12-11 14:47:47 -05: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
Bassoonian
5bcb6b8afd Update B_METRONOME_MOVES 2022-12-04 18:16:15 +01:00
ghoulslash
6140cacbef set BS_SCRIPING before BattleScript_TrainerSlideMsgRet 2022-11-29 18:28:33 -05:00
Eduardo Quezada
9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	src/pokemon.c
2022-11-29 17:40:09 -03:00
ghoulslash
b869b836cc add callnative bs func, convert metal burst dmg calc 2022-11-28 10:34:27 -05:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2022-11-24 15:36:00 -03:00
Bassoonian
9512b3a57a Implement Double Shock functionality with temporary string 2022-11-18 22:12:26 +01:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00