MissingNoL
beb126b534
Implemented Zippy Zap's effect
2021-06-12 13:58:54 -07:00
LOuroboros
588b3638d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus
2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42
Removed BattleScript_FlinchPrevention
...
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
2021-06-07 19:18:15 -03:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious
...
Tweaked Oblivious
2021-06-04 16:51:38 -07:00
LOuroboros
b552db7193
Tweaked the Oblivious immunities
...
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-04 19:23:07 -03:00
ultima-soul
2813b4f9bf
Merge pull request #1519 from DizzyEggg/flameburst
...
Fix FlameBurst
2021-06-03 09:30:50 -07:00
LOuroboros
b215b44951
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales
2021-06-03 05:09:14 -03:00
DizzyEggg
85ff866998
Fix FlameBurst
2021-06-03 09:50:43 +02:00
LOuroboros
a60fd31b9f
Added the MOVE_EFFECT_CERTAIN arg to BattleScript_EffectAttackerDefenseDownHit
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 16:42:02 -03:00
BuffelSaft
2a6b989c92
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press
2021-06-02 12:41:28 +12:00
LOuroboros
c21a00a5d1
Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp
2021-06-01 18:20:33 -03:00
LOuroboros
d48a6e00d4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious
2021-06-01 18:15:01 -03:00
LOuroboros
9b46b6fb45
pause 0x40 -> pause B_WAIT_TIME_LONG
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-22 16:34:39 -03:00
LOuroboros
8cbdde3fba
waitmessage 0x40 -> waitmessage B_WAIT_TIME_LONG
2021-05-21 20:22:04 -03:00
LOuroboros
1bd451e232
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 2turn_move_tweaks
2021-05-21 20:21:51 -03:00
LOuroboros
95d41524a2
Implemented Clanging Scales' effect
2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89
Fix Substitute typo
2021-05-06 20:49:04 -04:00
ultima-soul
e864c39a5d
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-05-04 10:04:35 -07:00
ghoulslash
22fc9733e5
Merge pull request #1480 from BuffelSaft/big_root_fix
...
Make Big Root affect absorb moves
2021-05-04 09:32:18 -06:00
BuffelSaft
5d177f0a15
Make Big Root affect absorb moves
...
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
2021-05-04 23:20:22 +12:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09
Add remaining multistring chooser constants
2021-04-03 11:49:06 -04:00
LOuroboros
480e6a1ffc
Tweaked Ability PopUp for Inner Focus
2021-04-02 21:04:04 -03:00
GriffinR
a836bd1085
Add missing trainer constant use
2021-04-02 02:17:36 -04:00
GriffinR
87430a1ebc
Add WAIT_TIME battle script constants
2021-04-02 02:16:01 -04:00
GriffinR
c9d3b26ff7
Label miss string indexes
2021-04-02 02:12:46 -04:00
LOuroboros
ed74430d26
Added a variation of BattleScript_NotAffected
...
This one triggers the Ability PopUp.
2021-03-31 23:33:51 -03:00
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
BuffelSaft
7d237d8ff6
Implement Body Press' effect
...
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 22:56:44 +13:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen
...
Add Ripen and Finish Gen4 Berries
2021-03-13 11:16:42 -03:00
ExpoSeed
685c8283ed
Merge pull request #1411 from BuffelSaft/Batte_Engine_Only
...
Fix Spiky Shield/Jump Kick freeze
2021-03-08 17:24:36 -06:00
Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities
...
More Gen 8 Abilities
2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a
merge with be
2021-03-01 11:28:51 -07:00
Evan
55b8538f68
merge with be
2021-03-01 11:22:37 -07:00
BuffelSaft
2b90c0b945
Fix Spiky Shield/Jump Kick bug
...
Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield.
2021-02-19 13:57:29 +13:00
LOuroboros
43d6340b92
Corrected the order of actions in BattleScript_FirstChargingTurn
2021-02-08 17:51:46 -03:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
Evan
f428e5e2dc
some quick claw/custap berry fixes
2021-01-31 23:31:27 -07:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
Evan
8ec12c665c
merge with be
2021-01-20 17:36:13 -07:00
LOuroboros
c21c0f8c37
Fixed incorrect preprocessor directive in ASM file
2021-01-13 22:42:56 -03:00
Evan
d26605c9fe
fix bad bg fade if no permanent terrain
2021-01-13 16:01:47 -07:00
Evan
9902f6e603
merge with be
2021-01-13 14:32:14 -07:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
