Eduardo Quezada D'Ottone
1ba70a46f2
Fixed Jump Kick's recoil not happening after Spiky Shield's damage ( #3208 )
...
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-08-11 17:26:43 -04:00
Eduardo Quezada
33b16cb82d
2nd pass
2023-08-11 16:55:27 -04:00
kittenchilly
c3e31af5f3
Ultra burst trigger
2023-08-09 22:12:26 -05:00
Eduardo Quezada
8a3eaadf7b
Renamed "ButItFailed" script name to align with names below it
2023-08-08 08:58:57 -04:00
Alex
42992ca5ce
Fix Teleport ending trainer battles ( #3166 )
2023-08-07 11:23:12 -04:00
Alex
8ee3a3c5bb
solve conflics
2023-08-07 14:25:30 +02:00
ghoulslash
4ae6ae4de3
Reset all battler IDs at battle start ( #3111 )
...
* reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids
* replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-08-04 08:57:06 +02:00
Eduardo Quezada
f94efa94e1
Merge branch 'RHH/master' into RHH/upcoming
2023-08-02 01:18:07 -04:00
ghoulslash
7a814999e5
MOVE_CORROSIVE_GAS Effect ( #3152 )
...
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
2023-08-02 01:05:54 -04:00
Eduardo Quezada
87050d8c08
Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets ( #3143 )
2023-08-01 23:54:04 -04:00
DizzyEggg
5eec3b2fc3
fix various issues with primal weather blocking water/fire type moves ( #3138 )
...
* fix various issues with primal weather blocking water/fire type moves
* forgot to change return to effect=1
* fix bugs
2023-07-30 10:50:51 -04:00
Alex
bca29d8586
Adds Mortal Spin and Population Bomb
2023-07-26 17:37:56 +02:00
Eduardo Quezada
47cea526ec
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_util.c
2023-07-19 23:22:07 -04:00
Alex
6b5d1e7577
Adds some gen9 moves ( #3147 )
...
* Adds some gen9 moves
* Fix Test + Tabs
* Collision Course boost changed to 1.3333
2023-07-19 13:25:20 +02:00
DizzyEggg
c0f10623d6
Merge branch 'be/staminafix' of https://github.com/ghoulslash/pokeemerald into stamina_fix
2023-07-17 15:35:40 +02:00
DizzyEggg
1f1d24b3e4
Fix Primal Reversion not activating when switching in after fainting ( #3141 )
...
* Fixed Primal Reversion not activating when switching in after a fainting
* add tests for primal reversion
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2023-07-16 12:26:54 +01:00
Martin Griffin
17f8f50a59
Merge remote-tracking branch 'rhh/master' into upcoming
2023-07-16 07:46:34 +01:00
DizzyEggg
381aa58587
Fix Bad Dreams ability pop-up + tests ( #3131 )
...
* Fix all bad dreams issues and add tests
Co-authored-by: ShaeTsuPog <shaetsu@protonmail.com>
2023-07-16 06:38:00 +01:00
Eduardo Quezada D'Ottone
1fa9a05470
Convert move flags and bans into GCC bitfields ( #2952 )
...
* Slicing moves to new bitfield
* Wind moves to new bitfield
* Two-strike moves to new bitfield
* Forgot to add flagTwoStrikes to battle_moves.h
* Removed "flag" from field names
* FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER
* Airborne moves
* FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE
* FLAG_BALLISTIC and FLAG_PROTECTION_MOVE
* Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c
* FLAG_SOUND
* FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER
* FLAG_DMG_MINIMIZE
* Cleanup
* FLAG_STAT_STAGES_IGNORED
* Updated Pollen Puff's ballistic flag
* FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST
* thaw
* FLAG_THREE_STRIKES
* FLAG_IRON_FIST_BOOST
* FLAG_RECKLESS_BOOST
* FLAG_HIGH_CRIT
* Removed empty flags
* Moves that fail when called by Me First + added missing Shell Trap
* Moves that fail when Gravity is active
* Better names for banned fields
* Moves that fail when called by Instruct
* Cleanup
* Contact Moves + Fixed Wandering Spirit skipping contact checks
* Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect.
* Simplified B_MOVE_FLAGS configs
* FORBIDDEN_METRONOME
* Renamed hitsPastSubstitute to ignoresSubstitute
* FORBIDDEN_PARENTAL_BOND
* Struggle uncallable by Metronome
* FORBIDDEN_MIMIC
* FLAG_KINGS_ROCK_AFFECTED
* Made a single config for move flags
* Macro for checking move flags
* FLAG_MAGIC_COAT_AFFECTED
* Fixed HasMagicCoatAffectedMove
* FLAG_SNATCH_AFFECTED
* Removed unused EFFECT_FLINCH_MINIMIZE_HIT
* Fixed Stench/King's Rock interaction
* Removed sMovesNotAffectedByStench in favor of checking move effects
* Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT
* Changed Gen2 configs to less than Gen 3
* FORBIDDEN_SLEEP_TALK
* Cleanup
* Inverted FLAG_MIRROR_MOVE_AFFECTED
* FLAG_SHEER_FORCE_BOOST
* Ordered
* FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT
* Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field
* Fixed Triple Arrows test
2023-07-03 10:01:59 +02:00
hetoord
40a5995ead
Teatime tests and fixes ( #3096 )
2023-07-03 09:54:43 +02:00
Eduardo Quezada
2c4a9b754d
Merge branch 'RHH/master' into RHH/upcoming
2023-06-30 16:14:57 -04:00
ghoulslash
304fc4c5b5
Fix disobedience wrong move effect issue ( #3089 )
2023-06-30 09:03:18 -04:00
Alex
20099274d8
Fix Clear Amulet visual bug + Tests ( #3074 )
...
* Fix Clear Amulet visual bug + Tests
TODO Tests, additional tests + Triple Kick pp bug
* Wonder Guard message, switch instead of if, misalignments
2023-06-28 12:26:03 -04:00
DizzyEggg
f9058a8544
Fix disobedience wrong move effect issue
2023-06-28 12:47:20 +02:00
LOuroboros
2bf88502a7
More corrections
2023-06-19 04:18:53 -03:00
LOuroboros
9896f20eb8
Applied fixes and corrections (Jun 2023)
2023-06-15 09:22:26 -03:00
LOuroboros
81bb299e7f
Updated Axe Kick's battle script
...
I have no idea why is this working now when I'm pretty sure it didn't work before, but I consider this a win all the same.
2023-06-13 06:50:48 -03:00
LOuroboros
313f522622
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2
2023-06-13 05:44:37 -03:00
AgustinGDLV
3d4789c492
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-28 11:10:50 -07:00
Alex
112636b8f3
Fix Speed Boost animation
2023-05-28 11:54:43 +02:00
AgustinGDLV
5a8715e608
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix
2023-05-23 16:10:44 -07:00
Alex
109b4c4f6c
Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals ( #3018 )
...
remove leftover
2023-05-20 15:58:55 -04:00
ghoulslash
487415e56b
Move direct statStage boosts to use statbuffchange ( #3000 )
...
* fix double counting stat boosts for download, moxie beast boost etc
* speed boost use statbuffchange
* BattleScript_MoveStatDrain use statbuffchange
* statbuffchange for rage
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-05-17 11:22:23 -04:00
AgustinGDLV
d133564e21
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-16 21:57:06 -07:00
AgustinGDLV
785b100693
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix
2023-05-16 16:29:38 -07:00
AgustinGDLV
0c182345bf
reworked weather form reversion + added more tests
2023-05-16 16:24:25 -07:00
AgustinGDLV
37874fe5c1
fixed revival blessing failure still showing anim ( #3010 )
2023-05-16 19:21:05 -04:00
Eduardo Quezada D'Ottone
2aca82300c
Merge branch 'upcoming' into mega_evo_issues
2023-05-14 22:33:01 -04:00
AgustinGDLV
dceefacb95
moved tryfaintmon back, no bugs?
2023-05-11 22:35:08 -07:00
AgustinGDLV
3b6389ec21
updated tests
2023-05-11 22:13:43 -07:00
AgustinGDLV
aec51b5b04
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-11 20:02:06 -07:00
Ultimate Bob
f985eefaa1
Show Imposter abilty in popup instead of opponent's ability.
2023-05-09 01:40:28 +10:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb ( #2873 )
2023-05-06 21:20:37 -04:00
AgustinGDLV
a5f28afe42
fixed Forecast and Flower Gift
2023-05-04 17:04:54 -07:00
CallmeEchoo
eb5b81684c
refactored snow into damaging weather
...
this is necessary for ice body to properly work.
doesnt actually do any damage
2023-05-05 01:38:12 +02:00
Alex
957ee36c75
Fix for Ceaseless Edge/Axe Kick visual glitch ( #2969 )
2023-05-02 17:25:44 -04:00
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
2023-05-02 21:19:01 +02:00
CallmeEchoo
c5a73f59a4
ad suggested changes
2023-05-02 21:17:14 +02:00
Shae
ae2d5f7d1e
Weather related Ability tests, fix for Leaf Guard not preventing Rest. ( #2957 )
2023-05-02 14:08:05 -04:00
CallmeEchoo
c32d5f455b
fix rebase issues
2023-05-02 16:44:42 +02:00
CallmeEchoo
f6e80b0ca7
Merge branch 'RHH/content/gen9SnowWeather' of https://github.com/CallmeEchoo/pokeemerald into RHH/content/gen9SnowWeather
2023-05-02 16:29:11 +02:00
CallmeEchoo
76721b16f8
add snow weather
2023-05-02 16:25:26 +02:00
ghoulslash
445e9c4b8b
merge w upcoming
2023-05-01 12:05:07 -04:00
ghoulslash
8cce130643
Add Frostbite status ( #2942 )
2023-05-01 09:45:47 -04:00
Alex
2d6282fece
Fix for Burn Up/Double Shock ( #2962 )
2023-04-30 10:46:21 -04:00
ghoulslash
62ca66bc6b
Refactoring Battle Form changes into the form change tables ( #2411 )
2023-04-30 08:41:54 -04:00
CallmeEchoo
99cbd2af37
add snow weather
2023-04-29 20:35:58 +02:00
Alex
0cbb80dda7
Fix grassy terrain freezing the game ( #2959 )
2023-04-28 08:58:43 -04:00
Bassoonian
c279830892
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution
2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix
2023-04-26 14:25:36 -04:00
Salem
78c4d07b23
Add Berserk Gene Item ( #2893 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-25 15:03:57 -04:00
Bassoonian
b1f75569a1
Merge branch 'upcoming' into rhhupcomingdev
2023-04-25 19:50:26 +02:00
LOuroboros
a128192bfe
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-04-24 09:36:09 -03:00
ghoulslash
1f6e335a24
merge w upcoming
2023-04-23 18:11:57 -04:00
Bassoonian
f13c39d784
Thawing out for frostbite
2023-04-23 21:20:23 +02:00
Bassoonian
13f6acf9a1
General mechanics
2023-04-23 19:20:48 +02:00
Bassoonian
a561c6da6a
Add config to Frostbite & allow it to be inflicted
2023-04-22 23:14:49 +02:00
Bassoonian
f50bfb3770
Frostbite hurts at the end of the turn and halves SpA
2023-04-22 18:47:36 +02:00
LOuroboros
b09ab5a3ee
Updated Triple Arrows' effect's code and tests yet again
...
Also added a function to get a move's secondaryEffectChance, meant to handle abilities, side statuses and the like that modify it.
2023-04-19 01:57:34 -03:00
LOuroboros
28ce87f6d3
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2
2023-04-18 07:35:59 -03:00
LOuroboros
43a5aa09ef
Corrections
...
-Optimized BattleScript_EffectTakeHeart
-Updated the checks for EFFECT_JUNGLE_HEALING and EFFECT_TAKE_HEART in AI_CheckBadMove
-Updated the code for MOVE_EFFECT_TRIPLE_ARROWS inside SetMoveEffect
2023-04-18 07:34:05 -03:00
Alex
60c88d8fcc
Update data/battle_scripts_1.s
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-17 19:12:39 +02:00
Alex
0531ab5d87
Fix Ability PopUp freeze
2023-04-17 18:47:54 +02:00
Eduardo Quezada
dacd0785db
Fixed Mega Evolution script name
2023-04-14 15:17:19 -04:00
Eduardo Quezada
11beec62ee
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/data/pokemon/evolution.h
# src/field_poison.c
2023-04-14 11:31:02 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect ( #2883 )
...
* implemented Revival Blessing
2023-04-12 01:14:25 +01:00
AgustinGDLV
d9ab2d1976
combined TerrainSeed and TerrainAbility loops + added terrain tests
2023-04-03 18:53:34 -07:00
AgustinGDLV
f292fefca3
fixed bad switchinabilities call in TerrainSeedLoop
2023-04-03 09:18:47 -07:00
LOuroboros
5bde98741a
Completed Take Heart's effect
...
It was missing its "heals any status condition" effect because I'm dumb and I forgot to actually go and do it.
2023-03-29 00:23:46 -03:00
ghoulslash
afc4b4cdee
add mirror herb
2023-03-28 15:07:37 -04:00
LOuroboros
ed9e860400
Post cherrypick corrections and improvements
...
-Made BattleScript_EffectTakeHeart use modifybattlerstatstage
-Optimized usage of BattleScript_EffectInfernalParade
-Tweaked the way in which Triple Arrows' increased crit. hit chance is handled
-Optimized syntax for case MOVE_EFFECT_TRIPLE_ARROWS in SetMoveEffect
-Optimized case EFFECT_INFERNAL_PARADE in CalcMoveBasePower
-Infernal Parade is not known to interact with Comatose, so Eduardo and I will extrapolate that here
-Added AI conditionals for some of the effects
-Made Triage notice Jungle Healing and moves that use its effect
2023-03-28 10:08:52 -03:00
AgustinGDLV
504ec36b2b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-27 16:22:11 -07:00
AgustinGDLV
2017bee3f8
fixed Castform + Cherrim
2023-03-27 11:35:23 -07:00
AgustinGDLV
8a963ca38a
changed Dynamax animation
2023-03-27 09:50:58 -07:00
Eduardo Quezada
3888b10769
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
2023-03-27 10:55:38 -03:00
AgustinGDLV
aa80e3fd4e
fixed G-Max Wildfire, Max Guard interactions, and reworked changedSpecies
2023-03-26 19:14:33 -07:00
LOuroboros
000077f671
Implemented Axe Kick's effect
2023-03-26 20:05:30 -03:00
LOuroboros
8ae57dc912
Implemented Take Heart's effect
2023-03-26 20:05:13 -03:00
LOuroboros
05a34edb7d
Implemented Infernal Parade's effect
2023-03-26 20:04:55 -03:00
LOuroboros
1595a66559
Implemented Triple Arrows' effect
2023-03-26 20:04:36 -03:00
ghoulslash
6574e01e73
Gen. 9 Move Effects, 1st batch ( #2534 )
2023-03-26 16:20:47 -04:00
AgustinGDLV
aac4ef4d2a
fixed terrain effects
2023-03-25 20:02:48 -07:00
AgustinGDLV
5d508f7963
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-24 22:40:51 -07:00
LOuroboros
7ce5c5fc66
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-03-23 06:27:09 -03:00
AgustinGDLV
038649594a
finished G-Max Move tests
2023-03-22 22:31:08 -07:00
AgustinGDLV
a3c8b97a6c
added tests for status1/status2 effects + bug fixes for them
2023-03-22 20:18:25 -07:00
AgustinGDLV
6233627a57
more tests + fixed hp reversion issues
2023-03-22 17:04:05 -07:00
tennis
358180946d
Fix Intimidate targetting dead sides and false postpones
2023-03-22 11:46:50 +00:00
Eduardo Quezada
ef914a2fac
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
2023-03-21 16:13:27 -03:00
May8th1995
9ec31c61bf
Fixes weirdly set value for eject buttons etc ( #2846 )
...
* Fixes weirdly set value for eject buttons etc
* Remove known fialing from fixed test
---------
Co-authored-by: tennis <May8th1995@users.noreply.github.com>
2023-03-21 20:12:46 +01:00
AgustinGDLV
69fd63a922
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-21 09:56:58 -07:00
AgustinGDLV
5a9e1de836
Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax
2023-03-20 21:14:33 -07:00
AgustinGDLV
7d70222770
added most Dynamax immunities/interactions + tests + fixed some move selection bugs
2023-03-20 16:40:05 -07:00
LOuroboros
f4e8389779
Added Psyblade and Hydro Steam
2023-03-17 09:25:39 -03:00
LOuroboros
aefd318945
Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect
2023-03-14 11:43:52 -03:00
Eduardo Quezada
7ce68994ec
Made Mega Evolution properly use TryBattleFormChange
2023-03-12 02:32:09 -03:00
AgustinGDLV
b708da3998
Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax
2023-03-11 00:17:30 -08:00
AgustinGDLV
4293dc8a24
not entirely confident implementation of Dynamax indicator
2023-03-10 23:03:51 -08:00
AgustinGDLV
ec4b330b9b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-10 21:00:41 -08:00
AgustinGDLV
06bf934b02
Dynamaxed pokemon now have increased HP
2023-03-10 20:38:17 -08:00
LOuroboros
6dbe772e27
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-03-10 18:23:33 -03:00
AgustinGDLV
76073fab52
added basic Dynamax-in-battle
2023-03-10 10:20:27 -08:00
DizzyEggg
f6089a0057
Mega Evolution after switching and based on speed
2023-03-07 22:34:57 +01:00
AgustinGDLV
7de7599a7b
reworked scripts to remove jumpifnotally / jumpiftargetabsent
2023-03-07 12:07:11 -08:00
Eduardo Quezada
4625a46748
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
2023-03-07 11:26:33 -03:00
Eduardo Quezada D'Ottone
81a80e566c
Refactor Mega Evolution indicator sprite ( #2805 )
2023-03-07 08:06:28 -03:00
DizzyEggg
a04046dbb6
Add tests for Defog and fix Defog battle strings ( #2737 )
...
* start working on defog tests
* defog tests + improve terrain end battlescripts
* newline
2023-03-06 20:35:08 +01:00
DizzyEggg
306c4565a0
merge
2023-03-06 15:32:28 +01:00
ghoulslash
dec1b16138
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile ( #2790 )
2023-03-05 09:50:47 -05:00
ghoulslash
4e138fa4b7
Fix wrong Contrary message when affected by Intimidate ( #2723 )
2023-03-02 09:38:00 -05:00
LOuroboros
fe735f9700
Applied review suggestions
...
-Merged EFFECT_CEASELESS_EDGE and EFFECT_STONE_AXE into EFFECT_HIT_SET_ENTRY_HAZARD
-Updated gDmgHazardsStringIds and relevant battle scripts. Can't say that I like it at all. String tables are stupid imo.
-Coupled Barb Barrage's effect in CalcMoveBasePower with Venoshock's
2023-03-02 01:39:44 -03:00
LOuroboros
fe74dd938b
Small corrections
2023-03-01 04:00:19 -03:00
LOuroboros
23673c2e9d
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-03-01 03:57:00 -03:00
AgustinGDLV
7c853ef45e
implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Finale
2023-02-28 16:37:48 -08:00
AgustinGDLV
3cdcf2a356
implemented G-Max Chi Strike, finished G-Max Gold Rush
2023-02-27 22:01:19 -08:00
AgustinGDLV
da24b717e4
implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite
2023-02-27 21:26:03 -08:00
ghoulslash
5a740c7461
dont overwrite gbattlerAttacker in TryChangeBattleTerrain, update BattleScript_ActivateTerrainAbilities loop iterator
2023-02-27 22:18:42 -05:00
AgustinGDLV
0908129c84
implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite works on Max Moves
2023-02-27 18:43:06 -08:00
AgustinGDLV
93d8efd51f
implemented G-Max Resonance
2023-02-27 14:34:08 -08:00
DizzyEggg
c92a65dc40
Add config for stockpile raising def stats
2023-02-27 21:09:02 +01:00
AgustinGDLV
92c8503869
reorganized max move functionality to remove redundant move effects
2023-02-27 11:54:49 -08:00
DizzyEggg
3338a6b786
add messages for stockpile effects wear off
2023-02-27 12:31:29 +01:00
LOuroboros
a54a8d9b2a
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-02-27 07:43:19 -03:00
AgustinGDLV
e537be76ea
Z-moves bypass protection ( #2730 )
2023-02-27 09:17:07 +01:00
AgustinGDLV
a36c35aea1
implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max Volcalith
2023-02-26 23:35:36 -08:00
AgustinGDLV
4d19659b0b
implemented G-Max Stonesurge, G-Max Steelsurge
2023-02-26 22:02:06 -08:00
LOuroboros
fe09f3e0d3
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-02-26 23:42:01 -03:00
Eduardo Quezada
41bf9ea63c
Removed trailing whitespaces
2023-02-26 18:43:15 -03:00
DizzyEggg
4bdca43dbd
refactor mega evolution indicator sprite
2023-02-26 12:51:35 +01:00
AgustinGDLV
503aad9137
fixed tests
2023-02-25 15:57:57 -08:00
AgustinGDLV
b4ec273353
Merge branch 'upcoming' into dynamax
2023-02-25 14:04:55 -08:00
ghoulslash
827bf11307
Merge pull request #2660 from DizzyEggg/ace_voltswitch
...
Fix Volt Switch / Roar with ace pokemon
2023-02-23 09:20:18 -05:00
AgustinGDLV
38f462551f
pulled rhh master, i hate merge conflicts
2023-02-22 18:50:54 -08:00
DizzyEggg
dc83708443
Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd
2023-02-22 22:51:59 +01:00
DizzyEggg
877e3fd6af
merge with upcoming
2023-02-22 19:27:42 +01:00
DizzyEggg
460dceb48b
fix intimidate derp
2023-02-22 19:20:18 +01:00
DizzyEggg
83281944fa
Add tests for Contrary
2023-02-22 16:24:27 +01:00
DizzyEggg
e0b76e98ff
Add MOVE_SHELL_TRAP Effect ( #2716 )
...
* implemented Shell Trap
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
2023-02-22 13:55:34 +00:00
DizzyEggg
64e26f5c86
Fix Contrary String on Intimidate
2023-02-22 13:11:16 +01:00
Jaizu
403a6f4544
Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field
...
Fix switch-in abilities activating on an empty field
2023-02-22 09:49:13 +01:00
DizzyEggg
31138455de
remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS
2023-02-22 09:28:12 +01:00
AgustinGDLV
87a9150134
added base functionality for max moves
2023-02-21 20:16:25 -08:00
DizzyEggg
d73ab0246f
Fix Explosion + Galvanize + Volt Absorb and Mind Blown ( #2688 )
...
* Fix Explosion and Mind Blown
* Use battler ability in jumpifabilitypresent
2023-02-21 22:50:29 +00:00
Eduardo Quezada
5ca9213d07
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_script_commands.c
2023-02-21 17:47:02 -03:00
Martin Griffin
29c64c82f3
Test Red Card
...
Dragon Tail activates Red Card if the target does not switch.
2023-02-21 10:44:58 +00:00
Martin Griffin
afe09e9653
Test Dragon Tail
...
Remove the "But it failed!" message if the foe cannot be switched.
2023-02-21 10:43:57 +00:00
LOuroboros
24581426a1
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-02-21 04:46:28 -03:00
LOuroboros
3a91a5c930
Added new trainer slide-in msg conditions
...
Now they can say something:
-When their last Pokémon's HP is between 25% and 50%.
-When a critical hit is dealt to their first Pokémon for the first time.
-When a super effective hit is dealt to their first Pokémon for the first time.
-When a STAB move is used against (but doesn't faint) the opponent's Pokémon.
-When the Player's Pokémon's move doesn't affect the opponent's Pokémon.
-When they're about to trigger a Mega Evolution.
-When they're about to trigger a Z-Move.
Misc. changes:
-Split GetEnemyMonCount for readability's sake.
-Optimized the size allocated to trainerSlideLowHpMsgDone.
2023-02-21 04:40:02 -03:00
DizzyEggg
53180ebf87
Update Healing wish to gen5 / gen8 mechanics ( #2708 )
...
* Updated Healing Wish and added config
* Fixed Lunar Dance message
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2023-02-20 11:25:43 +00:00
DizzyEggg
66d2f253a1
merge with master
2023-02-17 15:43:15 +01:00
DizzyEggg
0c523f9518
Fix Magic bounce powder moves against grass types ( #2633 )
...
* Fix Magic bounce powder moves against grass types
2023-02-17 13:55:51 +00:00
DizzyEggg
56c9564e7a
8th gen Howl's effect ( #2700 )
...
* Howl gen8 effect
2023-02-17 10:28:46 +00:00
Eduardo Quezada
f4f8ab6ee9
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
2023-02-16 17:06:49 -03:00
ghoulslash
6b0b427d93
Merge pull request #2680 from DizzyEggg/mirror_armor
...
Fix Mirror Armor against Clear Body
2023-02-16 09:29:04 -05:00
ghoulslash
60a3da5811
Merge pull request #2691 from DizzyEggg/clang_scales
...
Fix Clanging Scales target and effect
2023-02-16 09:13:33 -05:00
DizzyEggg
4c18ed2bd4
remove comment
2023-02-16 15:11:48 +01:00
ghoulslash
8c81cf1e66
Merge pull request #2692 from DizzyEggg/shields_down
...
Fix Shield Down Ability pop-up
2023-02-16 09:11:24 -05:00
DizzyEggg
1c970afd6a
fix follow me working in singles ( #2644 )
...
* fix follow me working in singles
2023-02-16 10:53:29 +01:00
DizzyEggg
f6a0c882d1
Fix Shield Down Ability pop-up
2023-02-15 23:44:00 +01:00
DizzyEggg
94651e77a5
Fix Clang Scales target and effect
2023-02-15 22:18:18 +01:00
ghoulslash
908b509401
Fix Round's Base Power calc, Add Turn order effects ( #2602 )
...
* fix round base power calc, add turn order change
* remove unused callnative cmd
* fix round turn order update
* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-02-14 16:49:50 +01:00
DizzyEggg
0577d8d04d
Fix Mirror Armor against Clear Body
2023-02-13 14:44:34 +01:00
ghoulslash
d508f12ac9
merge with upcoming
2023-02-13 08:38:32 -05:00
DizzyEggg
896b575c07
Fix volt switch breaking ace pokemon
2023-02-08 12:42:38 +01:00
DizzyEggg
ff088752e7
Insomnia ability pop-up ( #2643 )
...
* Insomnia ability pop-up
* remove B_MSG_STAYED_AWAKE_USING constant
2023-02-07 18:47:23 +01:00
DizzyEggg
0dc5e1e685
aftermath damp pop-ups and string
2023-02-07 13:01:56 +01:00
DizzyEggg
04ce8ec213
Fix Volt Absorb not activating on Thunderwave
2023-02-06 20:55:56 +01:00
ghoulslash
f060d0185f
fix wind power, electromorphosis stomping on gbattlerattacker
2023-02-02 21:59:40 -05:00
ghoulslash
c5c0e91215
fix BattleScript_TargetAbilityStatRaiseRet overwriting gBattlerAttacker
2023-02-02 21:39:01 -05:00
Eduardo Quezada
101ea6522d
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_util.c
2023-02-02 17:56:13 -03:00
LOuroboros
4b5a6e2328
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-02-01 20:18:56 -03:00
Martin Griffin
a13ffdbfba
U-turn does not switch the user out if Emergency Exit activates
2023-01-27 00:57:22 +00:00
Eduardo Quezada
3288309c43
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_script_commands.c
2023-01-25 19:57:19 -03:00
Eduardo Quezada D'Ottone
1bfc922c72
Merge pull request #2471 from ghoulslash/be/gen9items
...
Start Gen9 Hold Effects
2023-01-23 14:58:08 -03:00
ghoulslash
f97ec1975a
merge w upcoming
2023-01-23 09:24:03 -05:00
LOuroboros
773e7f0de2
Fixed Explosion & Intimidate's 'interaction'
2023-01-17 22:16:42 -03:00
Eduardo Quezada
ac4825ad28
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_util.c
2023-01-13 11:50:47 -03:00
LOuroboros
bdcc84f019
Updated the implementation
2023-01-09 15:18:22 -03:00
LOuroboros
dccceb9689
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux
2023-01-09 14:59:41 -03:00
ghoulslash
cc7c546011
Merge pull request #2473 from LOuroboros/mimicry
...
Reimplemented Mimicry
2023-01-09 12:54:44 -05:00
LOuroboros
620a6a5e90
Extra review changes
...
-Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN
-Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities.
-Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN.
-Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop.
-Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.
2023-01-09 14:22:14 -03:00
LOuroboros
91b2e1bb50
More review changes and added lackings
...
-Removed unnecessary special handling of terrain-inducing overworld weather states from ChangeTypeBasedOnTerrain.
-Mimicry now activates normally for terrain-inducing overworld weather states.
-Weather abilities now activate normally when switchineffects is called, and at the beginning of a battle.
-Terrain abilities now activate normally at the beginning of a battle.
2023-01-09 07:55:55 -03:00
Eduardo Quezada
d72a3731d4
Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald
...
# Conflicts:
# include/constants/battle_move_effects.h
2023-01-06 15:25:49 -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
2414283bb7
Removed BattleScript_EffectHit_Ret
2023-01-04 12:32:55 -03:00
LOuroboros
f1ca254c28
Updated the Mimicry reimplementation
...
Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN.
Misc. changes:
-Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN.
-Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains.
-Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs.
-Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about.
-Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes.
-There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it.
-Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.
2023-01-03 02:27:41 -03:00
LOuroboros
d0f5653f5e
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry
2023-01-02 19:00:41 -03:00
Eduardo Quezada
a23501a4a3
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_script_commands.c
2023-01-02 18:54:57 -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
Eduardo Quezada
16e8a5dd7f
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# include/battle_util.h
2023-01-01 16:02:40 -03:00
LOuroboros
f2e63a2e41
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux
2022-12-31 03:33:42 -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
0ef148dfbb
Applied more corrections
...
-Removed BattleScript_WindRiderActivatesEnd2
-Tweaked the condition of Wind Power in AbilityBattleEffects
-Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier
2022-12-28 08:50:15 -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
17410fa9c5
Fixed some issues of the Intimidate's rework
2022-12-26 00:50:44 -03:00
SonikkuA-DatH
3e807e5b1e
Update battle_scripts_1.s
...
fix ORs
2022-12-21 15:12:06 -08:00
LOuroboros
4bb86c5d96
Implemented Barb Barrage's effect
2022-12-21 19:48:50 -03:00
LOuroboros
1229fa752a
Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's
2022-12-21 19:48:49 -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
LOuroboros
ae482ed1f4
Implemented Ceaseless Edge's effect
2022-12-21 19:47:00 -03:00
SonikkuA-DatH
0a5154499e
Update battle_scripts_1.s
...
Compensating Substitute, removing item
2022-12-21 14:27:39 -08:00
Eduardo Quezada
c0d4e14a61
Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald
...
# Conflicts:
# include/config/battle.h
# include/constants/battle_move_effects.h
2022-12-21 12:46:09 -03:00
LOuroboros
31cd076f9d
Oopsie. Wind Power doesn't boost Attack lol
2022-12-21 11:21:42 -03: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
SonikkuA-DatH
5eaf0e15fc
Update data/battle_scripts_1.s
...
-_-
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-12-20 18:08:01 -08: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
f6fab92ac8
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2
2022-12-19 15:52:20 -08:00
Eduardo Quezada
1580f892a5
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# include/constants/pokemon.h
# src/battle_script_commands.c
2022-12-19 18:53:26 -03:00
SonikkuA-DatH
562736a5e6
Update battle_scripts_1.s
...
Changed STAT_BUFF_ALLOW_PTR to STAT_CHANGE_ALLOW_PTR
2022-12-18 22:50:41 -08:00
SonikkuA-DatH
2dbfc1c8f5
Update data/battle_scripts_1.s
...
Fixes spacing. Thanks Lunos!
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-12-18 22:28:33 -08:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2
2022-12-18 17:50:39 -08:00
SonikkuA-DatH
9cd8d81412
Update battle_scripts_1.s
...
Fixed spacing
2022-12-18 15:37:44 -08:00
LOuroboros
4c9446ed0a
Fixed Speed Swap's effect
2022-12-14 12:00:45 -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
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
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
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 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
AgustinGDLV
056048daf9
added data for max moves
2022-10-27 13:17:15 -07: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
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
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
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
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
77696ca686
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
2022-09-16 10:31:02 -03:00
Eduardo Quezada
de32940fdf
Further removed trailing whitespaces
2022-09-13 16:26:36 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -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
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 D'Ottone
59f1f10dec
Merge pull request #2260 from DizzyEggg/magic_bounce
...
Fix Magic Bounce targets
2022-09-01 19:56:15 -04: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
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
DizzyEggg
6331931ba3
Fix Magic Coat targets
2022-08-26 15:01:51 +02:00
LOuroboros
8bd7103b9d
Even more review corrections
2022-08-25 17:32:12 -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
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