Commit Graph

9161 Commits

Author SHA1 Message Date
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
W1serV1ser
178c4c66ba Fixed gSideTimers typo 2022-01-04 12:38:50 -08:00
W1serV1ser
66faa6aa15 Follow Me/Rage Powder effect on target goes away once affected by Sky Drop 2022-01-04 12:33:31 -08:00
Eduardo Quezada D'Ottone
d433d67558 Extrapolated Assist forbidden flags to Gen 8 moves 2022-01-01 20:21:29 -03:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup
Ability Popup Fixes + Longer Ability Names config
2022-01-01 19:39:55 -03:00
Eduardo Quezada D'Ottone
6fcbc4c074
Merge pull request #2012 from LOuroboros/patch-2
Update battle_ai_util.c
2021-12-30 07:32:30 -03:00
LOuroboros
34c6e6ca31
Update battle_ai_util.c 2021-12-30 01:48:56 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles
Multi battle updates
2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
ba43280a7c Refactored Instruct to use the regular forbidden move lookup table 2021-12-29 21:04:15 -03:00
Eduardo Quezada D'Ottone
16398d4dc6
Merge pull request #2009 from LOuroboros/patch-2
Update pokemon.h
2021-12-28 22:49:10 -03:00
LOuroboros
ce7815ebcc
Update pokemon.h 2021-12-28 15:11:52 -03:00
LOuroboros
cc1a243145
Update src/battle_script_commands.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-28 12:18:44 -03:00
W1serV1ser
e0f7e7a2d9 Updated variable name in MOVEEND_SKY_DROP_CONFUSE 2021-12-27 12:10:38 -08:00
Eduardo Quezada D'Ottone
4d6f54e8d6
Merge pull request #2007 from ghoulslash/be/roleplay
Update Role Play
2021-12-25 11:37:57 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports
Add sport effects back
2021-12-24 18:59:50 -03:00
Eduardo Quezada D'Ottone
75fbc5c0ab
Merge pull request #1981 from ghoulslash/be/aquaring
Fix aqua ring heal anim
2021-12-24 15:11:28 -03:00
ghoulslash
93a7e139ec merge w be 2021-12-24 09:40:12 -05:00
Eduardo Quezada D'Ottone
2ebe427a42 Merge branch 'BattleEngine' into BE_wildNaturalEnemies
# Conflicts:
#	src/battle_controller_opponent.c
2021-12-23 21:19:59 -03:00
ghoulslash
770224d341 increase TEXT_BUFF_ARRAY_COUNT for expanded ability names 2021-12-23 18:58:15 -05: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
a725592a6b
Merge pull request #1999 from ghoulslash/be/moveeffect
More battle-will-end checks on stat-changing damaging effects
2021-12-23 20:23:16 -03:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai
Smart Wild AI Option
2021-12-23 20:18:18 -03:00
ghoulslash
0a95a31ee9 fix formatting 2021-12-23 08:44:54 -05:00
ghoulslash
b6b5d862f4 update role play mechanics 2021-12-23 08:37:11 -05:00
LOuroboros
713d97891f
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-22 21:32:10 -03:00
ghoulslash
4b5c5d14fc
Merge pull request #1989 from AsparagusEduardo/BE_debugHoldEffects
Updated AI debug hold effect name display.
2021-12-20 14:07:29 -05:00
ghoulslash
78b42fabef
Merge pull request #2001 from AsparagusEduardo/BE_debugDoc
Using TAG_NONE in battle debug
2021-12-20 14:06:59 -05:00
ghoulslash
05f91bc243
Update include/constants/battle_config.h
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-20 14:06:32 -05:00
ghoulslash
02fe96cc08 fix config settings 2021-12-20 13:06:23 -05:00
LOuroboros
cb44de13b3 B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT 2021-12-19 20:53:57 -03: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
a57043b589
Merge pull request #1983 from sphericalice/last_ball_refactor
Refactor CanThrowLastUsedBall and related functions
2021-12-19 20:21:50 -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
LOuroboros
ffe35fbb06 Updated defeat condition on multi battles 2021-12-19 08:30:43 -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
66e6b140ac
Merge pull request #1987 from rh-hideout/DizzyEggg-patch-1
Fix Intimidate affecting fainted mons
2021-12-18 15:01:19 -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
1772997082
Merge pull request #1994 from AsparagusEduardo/BE_HPDrain
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
2021-12-18 13:50:05 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03:00
Eduardo Quezada D'Ottone
bd75ee9688 Using TAG_NONE in battle debug 2021-12-18 10:55:04 -03:00
ultima-soul
84ce9745d5
Merge pull request #1990 from AsparagusEduardo/BE_debugArrows
Improved battle debug number value changing
2021-12-17 09:21:04 -08:00
ghoulslash
31bbc4ddde prevent stat-raising damage effects if battle will end 2021-12-17 10:24:07 -05:00
Eduardo Quezada D'Ottone
837641f304
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-12-17 06:47:46 -03:00
Eduardo Quezada D'Ottone
8005db5040
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-12-17 06:47:35 -03:00
Eduardo Quezada D'Ottone
3a12cdb8cb
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-12-17 06:47:02 -03:00
ultima-soul
961710ddd9
Merge pull request #1986 from AsparagusEduardo/BE_steamEngine
Added Steam Engine's overworld effect
2021-12-16 16:15:58 -08:00