Commit Graph

11886 Commits

Author SHA1 Message Date
ghoulslash
8b28d4329b
Merge pull request #2525 from AsparagusEduardo/RHH/pr/fix/FixFrontierTutor2
Fixed right Frontier move tutor not loading their move list correctly.
2023-01-02 13:55:00 -05:00
ghoulslash
f5687de182
Merge pull request #2552 from LOuroboros/patch-1
Updated B_DOUBLE_WILD_CHANCE
2023-01-02 13:49:44 -05:00
LOuroboros
cdfec0fc05
Updated B_DOUBLE_WILD_CHANCE 2023-01-02 15:42:30 -03:00
ghoulslash
759ee8854a
Merge pull request #2470 from LOuroboros/dev_gen9_abilities
Implemented the majority of the Gen. 9 Abilities
2023-01-02 13:39:38 -05:00
ghoulslash
a06135b2f4
Merge pull request #2539 from AsparagusEduardo/RHH/pr/fix/FixEgg
Fixed Eggs sometimes reading garbage graphic data.
2023-01-02 13:27:28 -05: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 D'Ottone
682bcd4554
Merge pull request #2548 from LOuroboros/clearBody
Made Clear Body and similar abilities be normally affected by their own stat stage reductions
2023-01-01 11:37:11 -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
965e2c3394 Newline fix 2023-01-01 10:31:09 -03:00
Eduardo Quezada D'Ottone
a3411d0771
Merge pull request #2545 from Bassoonian/gen9moves
Fix faulty gBaseStats reference
2022-12-30 22:58:50 -03:00
Bassoonian
453aa2ffe7 Fix faulty gBaseStats reference 2022-12-31 02:01:56 +01:00
Eduardo Quezada D'Ottone
0e1836d42b
Merge pull request #2106 from Sneed69/PartyBattlerShouldAvoidHazards
PartyBattlerShouldAvoidHazards rewrite
2022-12-30 17:55:53 -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
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
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
Eduardo Quezada D'Ottone
d120f2f183
Merge pull request #2541 from sphericalice/beat-up
Fix Beat Up's battle script to avoid an out-of-bounds array access
2022-12-27 13:32:05 -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
Eduardo Quezada D'Ottone
263ed33755 Fixed Eggs sometimes reading garbage graphic data. 2022-12-26 11:56:27 -03:00
Eduardo Quezada D'Ottone
b74997f82e
Merge pull request #2538 from LOuroboros/intimidate
Fixed some issues of the Intimidate's rework
2022-12-26 08:10:25 -03: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
SonikkuA-DatH
c4db74460a
Update battle_util.c
Noted Protection Bypassing
2022-12-21 14:50:06 -08:00
LOuroboros
c40e15f8c5 Added Sheer Force check to Anger Shell 2022-12-21 19:43:41 -03:00
SonikkuA-DatH
0a5154499e
Update battle_scripts_1.s
Compensating Substitute, removing item
2022-12-21 14:27:39 -08: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
341d2abdd6
Merge pull request #2533 from ghoulslash/be/aifix
Fix Helping Hand AI
2022-12-21 16:17:52 -03:00
ghoulslash
dba1aa4f0b fix ai helping hand 2022-12-21 12:05:38 -05: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
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
405a42b246
Update battle_anim_effects_1.c
spacing
2022-12-20 18:17:49 -08:00
SonikkuA-DatH
8d28d23e74
Update src/battle_util.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-12-20 18:09:15 -08:00
SonikkuA-DatH
2c28076696
Update include/constants/battle_script_commands.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-12-20 18:08:38 -08: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
Philipp AUER
766c0140ee
Refactor sInverseTypeEffectivenessTable to implicit lookup (#2528)
* [refactor, battle_util] replace sInverseTypeEffectivenessTable LUT by implicit lookup

* [review, style, squashme] update switch/case codestyle

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

* [review, squashme] merge code branches

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-12-20 22:48:41 -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
ghoulslash
386a62fe81
Merge pull request #2526 from AsparagusEduardo/RHH/pr/fix/doubleWildChance
Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set
2022-12-19 08:55:32 -05: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
ffda816507
Update battle_script_commands.h
Whoops, forgot the to copy paste various
2022-12-18 22:41:15 -08:00