ghoulslash
9164f03f96
Merge pull request #2141 from Sneed69/Triple-Kick-Fix
...
Triple kick power calc rework
2022-10-07 16:31:50 -04:00
LOuroboros
50ca188cb2
Replaced didMegaEvo with a shiny new species flag
2022-10-07 12:32:36 -03:00
LOuroboros
02c6bc64b2
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero
2022-10-07 12:20:52 -03:00
ghoulslash
923046c993
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
...
I don't have any Sunday memes (pret merge 2022-09-25)
2022-10-07 10:25:59 -04:00
Eduardo Quezada D'Ottone
d0895a7c32
Merge pull request #2370 from StephenLynx/master
...
Fixed berserk not activating if mon falls to exactly half HP.
2022-10-01 21:30:44 -03:00
Sérgio Augusto Vianna
764bed6580
Fixed berserk not activating if mon falls to exactly half HP.
2022-10-01 20:50:55 -03:00
ghoulslash
253234378c
trace records target ability
2022-09-26 23:46:41 -04:00
Eduardo Quezada
f969effd36
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
2022-09-25 12:51:39 -03:00
ghoulslash
c22671d2a2
add overwrittenAbilities field
2022-09-24 12:12:31 -04:00
LOuroboros
717d06bd17
Fixed the hero duo's abilities in doubles
2022-09-11 21:57:42 -03:00
LOuroboros
e624f205ba
Added CompareStat checks for the hero duo's abilities
2022-09-11 21:46:40 -03:00
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms
...
Introduced FORM_BATTLE form changes
2022-09-09 14:15:53 -04: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
3a6318f1d9
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor
...
# Conflicts:
# include/constants/battle_config.h
2022-09-06 15:20:54 -04:00
ghoulslash
971081b8fd
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902
...
Flat Merge Friday (Weekly merge)
2022-09-06 15:13:47 -04:00
LOuroboros
0b07f4a06e
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms
2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0
Updates
...
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)
Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
2022-09-06 10:45:07 -03:00
Eduardo Quezada
cb97f93ef6
Fixed B_SHADOW_TAG_ESCAPE use for Gen 3 config
2022-09-05 14:49:40 -04:00
Eduardo Quezada
7c7da8e176
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs
...
# Conflicts:
# src/battle_script_commands.c
2022-09-05 14:43:04 -04:00
Eduardo Quezada
dbd56efaef
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
...
# Conflicts:
# src/battle_util.c
2022-09-05 12:20:57 -04:00
LOuroboros
2deabc2f36
Quick update for GetBattleMonMoveSlot
2022-09-05 04:27:21 -03:00
Eduardo Quezada
790bdd69f8
Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2
2022-09-03 00:28:32 -04:00
Eduardo Quezada
03498d7240
Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER
2022-09-02 23:57:43 -04: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
LOuroboros
df88317a98
Introduced FORM_BATTLE form changes
...
For species such as Xerneas and Zacian.
2022-08-29 19:10:52 -03:00
Eduardo Quezada
1c8d3a4922
Removed unnecessary parenthesis
2022-08-27 11:19:50 -04:00
Eduardo Quezada
69f4c226f0
Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs
...
# Conflicts:
# src/battle_ai_main.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_script_commands.c
# src/pokemon.c
# src/pokemon_summary_screen.c
2022-08-27 02:42:22 -04:00
Eduardo Quezada
1f0a952546
Usage of BATTLE_OPPOSITE
2022-08-27 01:44:39 -04:00
Eduardo Quezada
15d611ba65
Usage of BATTLE_PARTNER
2022-08-27 01:26:13 -04:00
Eduardo Quezada
7c86bd5d08
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
...
# Conflicts:
# include/battle_interface.h
# src/battle_anim_effects_1.c
# src/battle_script_commands.c
# src/field_specials.c
2022-08-26 22:23:37 -04:00
LOuroboros
922bbacd71
Updated GetMonFriendshipScore
...
-Moved it to src/pokemon.c
-Made a battle specific variant called GetBattlerFriendshipScore.
-Made that variant return 0 for Mega Evolved 'mons and if called on link battles.
2022-08-26 21:33:43 -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
8bd7103b9d
Even more review corrections
2022-08-25 17:32:12 -03:00
LOuroboros
2cf2c00b29
Updated friendship labels
2022-08-25 17:10:11 -03:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves
...
Moves with EFFECT_PLACEHOLDER can't be used.
2022-08-25 15:34:23 -04:00
LOuroboros
1bfff42ad2
Fixed ENDTURN_STATUS_HEAL
2022-08-25 12:38:47 -03:00
LOuroboros
1fc63c3431
More review corrections
2022-08-25 11:52:21 -03:00
LOuroboros
5b74fa3fd3
Assigned boolean values to allowedToChangeFormInWeather
2022-08-25 11:10:43 -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
Eduardo Quezada
045dbcf81e
Fixed creation trio orbs not boosting power for non-base forms.
2022-08-25 00:48:35 -04:00
DizzyEggg
cc8dd92247
ENDTURN_WISH resets gBattleStruct->turnSideTracker
2022-08-24 20:48:47 +02: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
09fd393f97
Replaced instances of power == 0 with IS_MOVE_STATUS + fixed Wonder Skin
2022-08-23 22:38:35 -04:00
Eduardo Quezada
1f5adf93c7
Cleaned up use of configs be almost exclusively preproc functions
2022-08-23 21:00:08 -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
Eduardo Quezada
7b0c8ec972
Revert style changes
2022-08-15 20:41:12 -04:00
Eduardo Quezada
44b26cc8aa
From pokefirered
2022-08-15 18:27:37 -04:00
Eduardo Quezada
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -04:00
ExpoSeed
49da2ee53f
Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION
2022-08-02 00:15:55 -05:00
Eduardo Quezada
c6cdb2a281
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-31 22:57:46 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064
Cleanup by syncing src/battle_script_commands.c with pokefirered
2022-07-29 09:43:16 -04:00
ghoulslash
0c79d04dec
Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm
...
Prevent Transforming Pokémon from changing forms
2022-07-28 22:26:56 -04:00
Eduardo Quezada
e1c15a9cf6
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-27 08:16:10 -04:00
Eduardo Quezada D'Ottone
aebd667260
Merge remote-tracking branch 'RHH/battle_engine' into BE_fixTransformForm
...
# Conflicts:
# src/battle_ai_main.c
2022-07-26 17:00:53 -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
bfb86fdc86
Config for Gen 3 faint switch mechanics
2022-07-24 14:57:47 -04:00
Eduardo Quezada
e96c9c87fa
Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge
...
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 23:38:52 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
...
Battle Engine pret merge
2022-07-22 14:00:40 -04:00
Eduardo Quezada D'Ottone
af72fb0d32
Simplified pre-gen5 checks
2022-07-21 16:36:07 -04:00
Eduardo Quezada D'Ottone
56b9a50109
Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus
...
# Conflicts:
# include/constants/battle_config.h
2022-07-21 16:28:16 -04:00
ghoulslash
30a494f964
Merge pull request #2197 from AsparagusEduardo/BE_explosion
...
Config for Explosion halving defense
2022-07-21 16:11:32 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
ghoulslash
2b5bb9f6e4
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone
1cfb267b34
Config for Explosion halving defense
2022-07-18 13:10:27 -04:00
Eduardo Quezada D'Ottone
e55fea47f3
Added missing MOVE_UNAVAILABLE to Gorilla Tactics check
2022-07-18 09:24:08 -04:00
Eduardo Quezada D'Ottone
1dcbf59686
Config for Plus and Minus interaction
2022-07-18 08:11:02 -04:00
ghoulslash
f6b6ab56be
some style fixes
2022-07-17 19:16:13 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04: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
Eduardo Quezada D'Ottone
f78bb4fb84
Merge remote-tracking branch 'pret/master' into item_expansion
...
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-12 17:42:32 -04:00
sphericalice
186f2c0232
Introduce a MOVE_UNAVAILABLE constant
2022-07-11 15:18:13 +01:00
ghoulslash
e4bf99d777
merge w be
2022-07-03 16:20:05 -04:00
ghoulslash
1ddf3ca7e0
Merge pull request #2169 from Sneed69/inverse-flying
...
Make ungrounded flying mons weak to ground in inverse battles
2022-07-01 11:57:43 -04:00
ghoulslash
14c531cf75
Merge pull request #2161 from Sneed69/confusion-fix
...
Fix confusion and disobedience self damage benefiting from STAB
2022-07-01 08:53:30 -04:00
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03:00
sneed
407047ace7
ground x2 vs flying if inverse battle
2022-06-10 23:23:21 +03:00
sneed
1d19c0dc9f
Update battle_util.c
2022-06-05 16:38:37 +03:00
ghoulslash
c694e0cb90
merge w be
2022-06-05 08:22:24 -04:00
sneed
bf1025ac16
Update battle_util.c
2022-06-05 05:09:06 +03:00
sneed
e1c57e4071
move_none does not benefit from stab
2022-06-01 22:45:50 +03:00
BlackShark
75a44fdd79
use more true & false constants
2022-05-27 02:18:52 +02:00
BuffelSaft
16570e8c3f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-22 12:55:55 +12:00
sneed
cb1c6ffbd2
comment out placeholders
2022-05-22 03:46:39 +03:00
Sneed69
d0a2be9630
weather forms fixes and config
2022-05-22 03:20:48 +03:00
sneed
0330656868
Change triple kick power calculation
2022-05-14 17:09:42 +03: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
Eduardo Quezada D'Ottone
13f9919b9e
Merge pull request #2123 from Sneed69/wikiberry_battle
...
Update Confuse Berry Hold Effect (Battle Engine)
2022-05-08 09:02:33 -04:00
Eduardo Quezada D'Ottone
989ec641f4
Merge pull request #2120 from ghoulslash/be/healblock
...
Heal Block AI and Pollen Puff Selection Prevention
2022-05-07 19:29:24 -04:00
sneed
f83875cf0f
remove item expansion check
2022-05-07 23:34:38 +03:00
sneed
4c8770fdc2
Update battle_util.c
2022-05-07 21:57:50 +03:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs
...
Once again, Battle Configs
2022-05-07 11:31:25 -04:00
ghoulslash
5456a87b83
fix pollen puff heal blocked battler in CanTargetBattler
2022-05-07 11:27:32 -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
07579bd42b
prevent ally pollen puff selection under heal block. add some ai checks for heal block
2022-05-07 09:56:32 -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
f63a451517
Merge pull request #2110 from Sneed69/gen8rattled
...
Gen 8 Intimidate triggers Rattled
2022-05-07 08:20:39 -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
sneed
ef7cd3cdfe
BattleScript_DefiantActivates rename
2022-05-06 11:15:24 +03:00
AgustinGDLV
74cc8c5ecb
fixed bolt beak switch-in boost
2022-05-05 22:37:28 -07:00
sneed
6c23eb431d
Heal Pulse and Pollen Puff
2022-05-05 13:56:59 +03:00
sneed
865b771db7
initial commit
2022-05-05 00:57:19 +03:00
sneed
b17d1f7816
Add generation specific interactions
2022-05-02 17:56:09 +03:00
sneed
23870a40a8
Initial commit
2022-05-02 06:04:16 +03:00
sneed
be6148d876
Add missing Heal Block functionalities
2022-05-02 04:54:25 +03:00
BuffelSaft
af6242f2e0
Requested changes, Sticky Web edge case
...
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
2022-04-27 21:51:10 +12:00
BuffelSaft
5358cc0a00
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-04-25 13:38:13 +12:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
LOuroboros
a127cb32bb
Removed pointless use of preproc directives
2022-03-30 02:05:54 -03:00
LOuroboros
434f6cf5ad
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-03-26 08:43:55 -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
LOuroboros
0a65fd316c
Fixed Enigma Berry check in CanMegaEvolve
2022-03-20 12:21:15 -03:00
ghoulslash
f53de6ae87
fix toxic/flame orb. use CanBeX'ed functions
2022-03-08 15:16:17 -05:00
ghoulslash
92487db470
add config check for B_GLARE_GHOST
2022-02-25 08:20:56 -05:00
ghoulslash
e4ef3cc3b4
move glare effectiveness exception to code
2022-02-24 22:06:18 -05:00
Eduardo Quezada D'Ottone
748ce99de3
Config for Ingrain grounding the user
2022-02-13 00:17:37 -03:00
Eduardo Quezada D'Ottone
389a38b3cd
Config for Facade being affected by burns
2022-02-12 23:55:54 -03: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
b33f7aed8d
Oopsie
2022-01-25 23:31:23 -03:00
LOuroboros
7916ff5f47
Further updated CanFling
2022-01-25 21:02:26 -03:00
LOuroboros
8eaf0718ec
Review changes
...
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
b7df21b263
Optimized use of GetBattlerAbility
2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions
2022-01-22 19:01:45 -03:00
ghoulslash
7182f290c1
fix harvest activation msg
2022-01-16 12:39:08 -05:00
ghoulslash
f3b9e6bb63
Merge pull request #1976 from kleeenexfeu/patch-2
...
[battle_engine] Moxie interaction with spread move/follow me fix
2022-01-16 10:58:50 -05:00
ghoulslash
078874aa1e
move some WEATHER_HAS_EFFECT after bitfield checks to speed up damage calcs
2022-01-13 11:32:22 -05:00
ghoulslash
035b2332af
cache ai damage, effectiveness calcs
2022-01-13 11:28:27 -05:00
LOuroboros
24b5a5709a
Allow Galarian Darmanitan's Zen Mode to work
2022-01-10 23:01:18 -03:00
Eduardo Quezada D'Ottone
eba4c36189
Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS
...
Yawn now uses B_SLEEP_TURNS
2022-01-07 21:56:06 -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
TheXaman
328b501394
Update src/battle_util.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-01-05 18:54:42 +01:00
TheXaman
9733f92c7f
Yawn now uses B_SLEEP_TURNS, resolves #1873
2022-01-05 18:48:01 +01:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
W1serV1ser
58a5a9cbec
Simplified skyDropTargets storage and made other minor improvements
...
A lot of these changes are based on ghoulslash's version of Sky Drop.
2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports
2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
6d17156f74
Merge pull request #1934 from BuffelSaft/fix-burmy
...
Fix Burmy form change
2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone
4ca9f406f6
Merge pull request #1947 from LOuroboros/lightBall
...
Updated Light Ball's effect and improved readability
2021-12-18 15:03:18 -03:00
Eduardo Quezada D'Ottone
3a24bc8298
Merge branch 'battle_engine' into DizzyEggg-patch-1
2021-12-18 14:52:19 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy
2021-12-18 13:38:12 -03:00
ultima-soul
b0b8b9bf46
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
ExpoSeed
65186b8c3a
Fix some style issues
2021-12-16 21:57:30 -06: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
