BuffelSaft
9b076a9dcf
Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES
...
- Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally.
- Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().
2022-10-23 21:40:04 +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
3775c5d00c
Fix move effects
...
Restore unintentionally removed MOVEEND_DEFROST, fix move effect definitions.
2022-10-22 18:54:25 +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
8ea060044a
Battle text pauses config
2022-10-07 17:22:29 -03:00
Eduardo Quezada
5403cd036e
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
...
# Conflicts:
# include/battle.h
# include/battle_controllers.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2022-09-02 23:24:08 -04:00
GriffinR
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement
...
Standardize judgement vs judgment spelling
2022-09-01 11:51:04 -04:00
Eduardo Quezada
15d611ba65
Usage of BATTLE_PARTNER
2022-08-27 01:26:13 -04: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
1fc63c3431
More review corrections
2022-08-25 11:52:21 -03:00
DizzyEggg
e3ab439ec0
Fix multi wild battles
2022-08-24 21:56:24 +02: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
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -04:00
Eduardo Quezada
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -04:00
Eduardo Quezada
9caca17064
Cleanup by syncing src/battle_script_commands.c with pokefirered
2022-07-29 09:43:16 -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
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03:00
ghoulslash
b33a8b0cb4
move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use
2022-06-05 11:09:04 -04:00
BuffelSaft
16570e8c3f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-22 12:55:55 +12:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks
...
Primal Reversion Tweaks
2022-05-07 11:04:23 -04:00
BuffelSaft
8693db632b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-07 12:27:20 +12:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks
2022-02-12 23:08:12 -03: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
LOuroboros
b2965e5522
Added a pause to BattleScript_ProteanActivates
2022-01-11 20:15:47 -03:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine
...
Added Sky Drop to Battle Engine
2022-01-07 18:14:40 -03:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports
2021-12-19 20:42:15 -03:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
LOuroboros
f2dd7bce99
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks
2021-11-30 20:39:58 -03:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
ghoulslash
5c52abd856
gen3 sport move functionality behind config
2021-11-23 21:20:32 -05:00
BuffelSaft
50d0cd52e8
Clean up Corrosive Gas
...
Remove code and unused move effect.
2021-11-22 15:13:54 +13:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08: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
04867ac0d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-13 17:33:25 +13:00
BuffelSaft
6232b046b1
Fix Burn Up
...
Now works properly with and without Parental Bond. It wasn't broken before, but its interaction with Parental Bond was.
2021-11-13 12:40:45 +13: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
GriffinR
684f599a44
Label remaining battle_interface symbols
2021-11-08 16:03:44 -05:00
BuffelSaft
e407883b58
Rethink final strike effects
...
This is now checked in SetMoveEffect instead of in each move that should behave this way. Some effects will need to be redone to make them play nice with this change, but some just work as is.
2021-11-07 20:31:09 +13:00
BuffelSaft
9351df5ed8
Revert "Update move effect defines"
...
This reverts commit be518608e8749526643aefc4f96dc8f8206a8688.
2021-11-07 12:25:26 +13:00
BuffelSaft
be518608e8
Update move effect defines
...
Removing move effects above the ones that have stat change animations causes the wrong stat change to be shown, so I've reordered the list to fix that.
2021-11-07 12:16:06 +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
Eduardo Quezada D'Ottone
b220da1d2a
Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table
2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone
328976bf81
Secret Power effect config
2021-11-06 17:05:13 -03:00
LOuroboros
e0b53f87fc
Primal Reversion Tweaks
...
-Fixed the inconsistent Primal Reversion activation in double battles.
-Optimized the primal weather checks in attackcanceler a little.
-Fixed the issue with multi-target fire/water moves during primal rain/sun.
2021-11-04 12:04:14 -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
