DizzyEggg
0dc5e1e685
aftermath damp pop-ups and string
2023-02-07 13:01:56 +01: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
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
LOuroboros
72566e6323
Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs
2023-01-05 03:02:56 -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
LOuroboros
f2e63a2e41
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux
2022-12-31 03:33:42 -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
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
0d1f9d9613
Reimplemented Mimicry
2022-12-09 20:46:18 -03: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
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
88cae380d0
Implemented Wind Power's effect
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
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
9512b3a57a
Implement Double Shock functionality with temporary string
2022-11-18 22:12:26 +01: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
ghoulslash
7a0e541413
workaround for GetBattlerHoldEffectParam to handle bug bite different battler id
2022-11-04 10:29:05 -04: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
BuffelSaft
6035c5a280
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-10-22 14:31:13 +13:00
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis
2022-09-24 11:58:35 -03: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
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
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
LOuroboros
032b7b2ab9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection
2022-07-25 10:24:19 -03:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -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
BuffelSaft
bb25746e05
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-13 22:40:43 +12: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
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
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
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
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician
2022-01-15 13:06:13 -03: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
BuffelSaft
50d0cd52e8
Clean up Corrosive Gas
...
Remove code and unused move effect.
2021-11-22 15:13:54 +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
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
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
BuffelSaft
16a4fc9062
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-19 16:33:24 +13:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
BuffelSaft
04867ac0d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-13 17:33:25 +13:00
Eduardo Quezada D'Ottone
a7870dbef0
Merge branch 'battle_engine' into magician
2021-11-12 19:40:34 -03: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
BuffelSaft
72d12a575d
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-07 12:13:18 +13: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
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
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
6df3975fc6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-05 14:32:33 +13: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
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
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
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
LOuroboros
69b42de0d9
Implemented Mimicry
...
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-11-02 14:44:55 -03:00
ghoulslash
ffcba355b0
merge w be
2021-11-02 10:36:08 -04: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
ghoulslash
98b4b821dc
merge with be
2021-11-01 13:55:55 -04:00
BuffelSaft
fb25e1ac98
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-01 22:37:23 +13:00
ghoulslash
bc170f3a43
merge with be
2021-10-31 11:04:39 -04:00
BuffelSaft
47bfeaeecd
Implement Gorilla Tactics
...
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
28bc7dc14d
start ability
2021-10-29 22:32:19 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
LOuroboros
82101d3581
Optimizations
2021-10-28 14:02:43 -03:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw
...
Quick Draw
2021-10-22 22:39:03 -03:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
BuffelSaft
e59be67023
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-10-15 16:25:11 +13:00
ghoulslash
a3d2bdc9cf
merge with be
2021-10-13 18:30:53 -04:00
ghoulslash
3248bd796a
add quick draw
2021-10-12 21:49:18 -04:00
ghoulslash
996301d5d3
add mirror armor
2021-10-12 18:04:34 -04:00
ghoulslash
bbd09fdcf7
add wandering spirit
2021-10-12 10:32:51 -04:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
BuffelSaft
07bdd2ffe6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-10-09 15:18:51 +13:00
ghoulslash
ce455ac7e7
merge with be
2021-10-08 07:44:32 -04:00
ghoulslash
1031703309
magician base functionality
2021-10-06 16:00:02 -04:00
ghoulslash
391cfabcac
merge with be
2021-10-06 14:31:21 -04:00
LOuroboros
2b32581c14
Fixed infinite loop
2021-10-06 09:27:33 -03:00
LOuroboros
b85b3094c8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev
2021-10-03 07:05:56 -03:00
LOuroboros
f3ded43a88
Implemented Battle Bond
2021-10-01 22:49:17 -03:00
ghoulslash
761006a164
merge with be
2021-09-26 19:19:32 -04:00
LOuroboros
1b039062da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-09-25 22:20:34 -03:00
BuffelSaft
2f03ac31b9
Multihit refactor and Parental Bond
...
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
2021-09-23 14:31:21 +12:00
ghoulslash
3559a1b8e6
fix prankster + magic coat
2021-09-22 16:09:23 -04:00
ghoulslash
faa963fd04
merge with be
2021-09-17 09:07:38 -04:00
ghoulslash
b916d7991c
merge with be
2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc
merge with be
2021-09-16 21:41:29 -04:00
ghoulslash
845e333ba1
fix electric/misty terrain interactions with yawn/rest failures
2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300
merge with be
2021-09-15 16:42:23 -04:00
ghoulslash
b85586a33a
merge with be
2021-09-15 12:54:39 -04:00
ghoulslash
f3f26d1a6f
merge with be
2021-09-13 19:40:28 -04:00
ghoulslash
b8a71cabd1
merge with be
2021-09-09 09:44:18 -04:00
BuffelSaft
a4b630e6b5
Fix MOVE_EFFECT_REMOVE_STATUS
...
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.
Also, fix Ice Hammer's effect chance.
2021-09-07 16:34:32 +12:00
ghoulslash
933696b3cd
merge with be
2021-09-03 17:41:00 -04:00
ExpoSeed
5a5c257f68
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
LOuroboros
0a38054925
Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly
2021-08-30 21:21:07 -03:00
LOuroboros
216d8f0608
Solved game freezing issue
...
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -03:00
ghoulslash
0bbbd1e7a9
fix electric/misty yawn/rest interactions
2021-08-12 14:08:41 -06:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ghoulslash
ab529b4e89
add stuff cheeks
2021-07-27 10:31:48 -06:00
LOuroboros
f1195e1884
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-07-27 09:08:52 -03:00
Xhyzi
c2bd046ea6
Shell Trap
2021-06-15 20:22:50 +02:00
Xhyzi
0202b75822
Beak Blast
2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a
Corrosive Gas
2021-06-15 19:45:24 +02:00
ExpoSeed
c8fc141287
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-06-10 11:54:20 -05: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
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
LOuroboros
d48a6e00d4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious
2021-06-01 18:15:01 -03:00
ghoulslash
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -06:00
ghoulslash
d89e2c1775
merge with be
2021-04-02 08:55:54 -06:00
LOuroboros
ed74430d26
Added a variation of BattleScript_NotAffected
...
This one triggers the Ability PopUp.
2021-03-31 23:33:51 -03:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
LOuroboros
68980cf18c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-03-10 03:58:21 -03:00
Evan
41d47a867e
format fixes
2021-03-03 10:48:57 -07:00
Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
ghoulslash
0ee9425599
Update include/battle_scripts.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:07 -07:00
Evan
b130396c0e
merge with be
2021-03-01 17:05:10 -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
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -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
e61309dce6
merge with be
2021-01-20 17:34:24 -07:00
Evan
16d54b6d32
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 14:28:03 -07:00
Evan
a49b5d1ad0
prankster updated to gen 7
2021-01-16 16:14:36 -07:00
Evan
0d8f804194
update mental herb to gen 5
2021-01-15 18:11:55 -07:00
