AgustinGDLV
2017bee3f8
fixed Castform + Cherrim
2023-03-27 11:35:23 -07:00
LOuroboros
7ce5c5fc66
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-03-23 06:27:09 -03:00
LOuroboros
23673c2e9d
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-03-01 03:57:00 -03:00
DizzyEggg
3338a6b786
add messages for stockpile effects wear off
2023-02-27 12:31:29 +01:00
ghoulslash
908b509401
Fix Round's Base Power calc, Add Turn order effects ( #2602 )
...
* fix round base power calc, add turn order change
* remove unused callnative cmd
* fix round turn order update
* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-02-14 16:49:50 +01:00
LOuroboros
72566e6323
Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs
2023-01-05 03:02:56 -03:00
LOuroboros
2cb9400ef0
Implemented Dire Claw's effect
2022-12-21 19:48:48 -03:00
LOuroboros
6ef30da492
Update battle.h
2022-12-13 02:44:49 -03:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves
...
Generation IX Moves
2022-12-11 14:47:47 -05:00
Eduardo Quezada
e858b4e709
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
2022-11-24 15:36:00 -03:00
Bassoonian
9512b3a57a
Implement Double Shock functionality with temporary string
2022-11-18 22:12:26 +01:00
Eduardo Quezada
f2d0e547ac
Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/rom_header_gf.c
2022-11-09 19:54:44 -03:00
Eduardo Quezada
e4a439aa46
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
2022-10-30 12:30:38 -03:00
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 D'Ottone
18e7fc5efc
Introduce NUM_BATTLE_SIDES
2022-10-20 08:41:18 -03:00
Eduardo Quezada
8ea060044a
Battle text pauses config
2022-10-07 17:22:29 -03:00
Eduardo Quezada
453da8aa8c
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
2022-10-07 15:49:00 -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
