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
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
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 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
Eduardo Quezada
56a2e91518
Updated move limitations
2022-08-23 22:40:04 -04:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const
...
Add some missing battle arena constants
2022-08-20 22:54:32 -04:00
Eduardo Quezada
e43f65cc69
using BATTLE_RUN constants in BattleScript_EffectTeleport
2022-08-15 21:06:26 -04:00
GriffinR
cf4d05e9e7
Fix typo
2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
Eduardo Quezada D'Ottone
54097951f7
Using B_WAIT_TIME_LONG
2022-08-03 16:51:02 -04:00
Eduardo Quezada
09af7422d5
Further cleaning after comparing with pokefirered
...
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
2022-07-28 01:27:05 -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
Eduardo Quezada D'Ottone
e14afd8957
Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.
2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone
cb34119711
Config for Charge raising Sp. Def.
2022-07-20 10:13:18 -04:00
ghoulslash
2b5bb9f6e4
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
2022-07-19 18:24:53 -04:00
ghoulslash
5d91bdeafc
add B_ANIM_RESTORE_BG to BattleScript_EffectTerrainHit
2022-07-17 19:13:45 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
ghoulslash
9b5aee3b93
fix z stat-boosts
2022-07-17 12:17:54 -04:00
GriffinR
e6a374f2b6
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
2022-07-06 14:49:08 -04:00
LOuroboros
8f728dcd79
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-07-03 13:49:18 -03:00
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
...
Config for lost money after losing a battle
2022-07-01 11:58:36 -04:00
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03:00
sneed
f419fc3ae7
fix terrain move softlock
2022-06-04 18:36:18 +03:00
sneed
5b0afffd91
popup and flower gift description fixes
2022-05-22 13:10:51 +03:00
sneed
fe42eacdf0
tabs over spaces
2022-05-22 05:23:06 +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
sneed
928d3c5a28
change form on weather fade
2022-05-19 15:08:03 +03:00
ghoulslash
ebb711b6e5
fix bug bite not activating if faints target. also save original move target through the effect
2022-05-13 18:24:52 -04:00
ghoulslash
b09dad68d5
minor edits to consumeberry calls
2022-05-13 16:29:37 -04:00
ghoulslash
cdd37ad1bb
fix stuff cheeks w new consumeberry impl
2022-05-13 16:28:23 -04:00
