Alex
|
522ccf06da
|
Use CanAbilityAbsorbMove in GetOverworldTypeEffectiveness (#7115)
|
2025-06-14 11:56:04 +02:00 |
|
Alex
|
d4146afcae
|
Add damage context to effectiveness multiplier (#7111)
|
2025-06-14 11:05:14 +02:00 |
|
Alex
|
e1b542944f
|
Refactor damage calculations aruguments by using a struct context (#7108)
|
2025-06-13 14:16:40 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +02:00 |
|
Alex
|
aa78420b9e
|
Deprecate absent member from battlerState (#7091)
|
2025-06-12 10:41:46 +02:00 |
|
Hedara
|
bdd7c5bfa8
|
Merge branch 'master' into master-merge
Conflicts:
src/contest_painting.c
|
2025-06-09 23:27:18 +02:00 |
|
Alex
|
fd856e5068
|
Removes duplicate AI ability func (#7045)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-06-09 11:30:16 +02:00 |
|
PhallenTree
|
28d185be95
|
Fixes Pursuit potentially causing both battlers to switch into the same mon (#7084)
|
2025-06-07 23:59:44 +02:00 |
|
PhallenTree
|
b3752e13d8
|
Fixes Aura Wheel + Normalize and Hunger Switch while Transformed/Terastallized (#7061)
|
2025-06-04 21:58:10 +02:00 |
|
Eduardo Quezada
|
d795de9e9d
|
Remove more instances of hard-coded Move IDs (#7056)
|
2025-06-03 23:26:48 +02:00 |
|
Bassoonian
|
1a6ed20713
|
Add dedicated getter functions for Pokémon types and abilities (#7043)
|
2025-06-03 22:05:22 +02:00 |
|
Alex
|
177fa2f096
|
Combines Super Fang and Guardian of Alola effects (#7048)
|
2025-06-03 10:26:25 +02:00 |
|
Alex
|
52b1b877ec
|
Change GetZMaxMoveAgainstProtectionModifier to prevent regressions (#7047)
|
2025-06-03 09:11:42 +02:00 |
|
Alex
|
d33651bfd0
|
Battle controller pret documentation (#7029)
|
2025-06-02 14:22:11 +02:00 |
|
Eduardo Quezada
|
5502fe2c5e
|
GetBattlerMon cleanup (#6967)
|
2025-06-01 21:10:24 +02:00 |
|
Alex
|
ede15918cf
|
Refactors Final Gambit + Tests (#7005)
|
2025-05-31 15:52:53 +02:00 |
|
Alex
|
eb81820ae3
|
Clean up battlescript calls with func BattleScriptCall (#6873)
|
2025-05-31 09:09:35 +02:00 |
|
PhallenTree
|
fa342b2909
|
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004)
|
2025-05-31 08:45:46 +02:00 |
|
Alex
|
c489d36fc6
|
Fixes Gen3 berry activation timing (#6993)
|
2025-05-27 23:36:00 +02:00 |
|
AlexOn1ine
|
5648792cbf
|
Add missing IsBattleMoveStatus
|
2025-05-26 12:17:43 +02:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Hedara
|
2e4833240f
|
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
Conflicts:
include/item.h
src/battle_ai_script_commands.c
src/battle_main.c
src/battle_pyramid_bag.c
src/battle_script_commands.c
src/battle_util.c
src/item.c
src/item_menu.c
src/item_use.c
src/pokemon.c
src/pokemon_summary_screen.c
src/shop.c
|
2025-05-24 21:24:56 +02:00 |
|
Alex
|
48100e9593
|
Fixes Unnerve activation not limited to 1 per switch-in (#6960)
|
2025-05-22 19:15:01 +02:00 |
|
Hedara
|
90aed43c27
|
Merge branch 'master' into master-upcoming
Conflicts:
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
.github/ISSUE_TEMPLATE/03_feature_requests.yaml
.github/ISSUE_TEMPLATE/04_other_errors.yaml
.github/pull_request_template.md
src/battle_controller_player.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/data/graphics/pokemon.h
src/data/pokemon/species_info/gen_9_families.h
test/battle/ability/flower_veil.c
test/battle/ability/sweet_veil.c
test/battle/ability/synchronize.c
test/battle/ability/water_bubble.c
test/battle/move_effect/fell_stinger.c
test/battle/move_effect/level_damage.c
test/battle/move_effect/magic_room.c
test/battle/move_effect/me_first.c
test/battle/move_effect/sky_drop.c
test/battle/move_effect/smack_down.c
test/battle/move_effect/wish.c
test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
|
2025-05-22 15:41:08 +02:00 |
|
Alex
|
b31a73f990
|
Rename ItemId_GetX to GetItemX (#2116)
|
2025-05-22 13:27:52 +01:00 |
|
Alex
|
8ad1f329c9
|
Fixes Dazzling abilities activating on all multi hit move hits (#6943)
|
2025-05-22 10:37:00 +02:00 |
|
Eduardo Quezada
|
be4b8ca3d0
|
Fix KNOWN_FAILING Bestow tests (#6947)
|
2025-05-22 10:23:15 +02:00 |
|
Alex
|
95036e3b9f
|
Fixes global usage in super fang effect. (#6941)
|
2025-05-21 20:33:52 +02:00 |
|
Alex
|
ce079cfcc8
|
Fixes Life Orb damage still happening after attacker was unable to attack (#6940)
|
2025-05-21 16:16:33 +02:00 |
|
PhallenTree
|
a639460c27
|
Fixes Ice Body healing HP regardless of weather (#6939)
|
2025-05-21 14:25:12 +02:00 |
|
AlexOn1ine
|
33607529cd
|
conflicts
|
2025-05-16 10:46:32 +02:00 |
|
AlexOn1ine
|
35dff24c9b
|
Master to upcoming merge
|
2025-05-15 20:37:27 +02:00 |
|
Hedara
|
49906a81f7
|
Merge commit 'c39ef1a03002a7af94' into pret-merge
Conflicts:
src/battle_ai_switch_items.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_controllers.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/battle_util2.c
src/pokemon.c
|
2025-05-15 17:31:50 +02:00 |
|
Alex
|
44d9b9c9e6
|
Further moveend changes (move blocks) (#6820)
|
2025-05-15 12:43:50 +02:00 |
|
Alex
|
34918f5f0d
|
Fixes wrongly usage of arguments without checking effect (#6859)
|
2025-05-15 10:39:31 +02:00 |
|
Jonathan Lin
|
b5fbced691
|
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
|
2025-05-15 09:40:02 +02:00 |
|
AlexOn1ine
|
1a773a5916
|
conflicts
|
2025-05-14 23:21:33 +02:00 |
|
Eduardo Quezada
|
12bc5a10b7
|
Removed multiple instances of hardcoded move IDs (#6856)
|
2025-05-14 22:40:10 +02:00 |
|
Eduardo Quezada
|
3ef61e6451
|
Combined type-enhancing hold effects (#6846)
|
2025-05-14 13:45:08 +02:00 |
|
ghoulslash
|
d4c64d3b67
|
rename berrystatraise script to consumablestatraise
|
2025-05-12 21:11:25 -04:00 |
|
ghoulslash
|
14a66d612f
|
combine BattleScript_BerryStatRaiseRet and BattleScript_BerryStatRaiseEnd2, check ripen popup doesn't trigger except on berries
|
2025-05-12 21:06:12 -04:00 |
|
Eduardo Quezada
|
5f0a853e74
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/isOnPlayerSide
|
2025-05-12 20:58:27 -04:00 |
|
Alex
|
7f894ef5fb
|
Fixes a mistake made by me (#6828)
|
2025-05-12 20:08:00 +02:00 |
|
Eduardo Quezada
|
13071f7019
|
Added IsOnPlayerSide
|
2025-05-12 13:53:15 -04:00 |
|
Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
Eduardo Quezada
|
eadf89e6f9
|
Allow different flags for Badge boost (#6805)
|
2025-05-11 11:36:52 +02:00 |
|
Alex
|
d00563d830
|
Changed White Herb hold effect name (#6815)
|
2025-05-11 11:34:47 +02:00 |
|
Alex
|
0ad3f929ab
|
Fixes Berserk Gene infinite loop (#6813)
|
2025-05-11 11:34:16 +02:00 |
|
spindrift64
|
3b91a964c9
|
Fix Iron Ball type effectiveness check (#6794)
|
2025-05-09 22:23:44 +02:00 |
|
AlexOn1ine
|
4959187d97
|
fix conflicts
|
2025-05-09 21:47:53 +02:00 |
|