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
ghoulslash
f6f4227f49
better bug bite impl, fix item removal
2022-05-13 16:21:41 -04: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
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs
...
Once again, Battle Configs
2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone
dc25bc6145
Merge branch 'battle_engine' into BE_WhiteOutMoney
...
# Conflicts:
# include/constants/battle_string_ids.h
# src/battle_message.c
2022-05-07 11:16:34 -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
Eduardo Quezada D'Ottone
4e7ce0b663
Merge branch 'battle_engine' into BE_configs
...
# Conflicts:
# include/constants/battle_config.h
2022-05-07 10:25:34 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock
...
Add missing Heal Block functionalities
2022-05-07 09:13:18 -04:00
ghoulslash
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam
...
Steel Beam Move Effect Implementation
2022-05-07 08:40:34 -04:00
AgustinGDLV
2ffff788b4
fixed Fling
2022-05-06 22:29:40 -07:00
AgustinGDLV
542a0f07b4
fixed bug bite / bestow
2022-05-06 22:07:25 -07:00
BuffelSaft
3e1934ebe3
Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE
...
Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.
2022-05-07 14:20:37 +12: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
LOuroboros
43053d2e6c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-05-06 02:22:14 -03:00
sneed
6c23eb431d
Heal Pulse and Pollen Puff
2022-05-05 13:56:59 +03:00
sneed
60d7d8f97e
Initial Commit
2022-05-03 03:38:44 +03:00
sneed
b17d1f7816
Add generation specific interactions
2022-05-02 17:56:09 +03:00
