Alex
|
53e7699649
|
Fixes Explosion behavior when 3 mons can endure hit (#7594)
|
2025-08-25 11:41:36 +02:00 |
|
ghoulslash
|
9b5b69ae49
|
switchinabilities also runs ON_WEATHER and ON_TERRAIN (#7612)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-08-25 11:40:52 +02:00 |
|
Alex
|
504d3bc31f
|
Fixes moveend_absorb hitmarker (#7591)
|
2025-08-21 16:49:13 +02:00 |
|
Alex
|
f24b919a11
|
Pret merge (21 of August, 2025) (#7590)
|
2025-08-21 16:05:50 +02:00 |
|
Alex
|
c0231c9bb1
|
Fixes Rage Fist counter increment (#7582)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-08-21 15:46:31 +02:00 |
|
Hedara
|
da77dba59f
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
data/battle_scripts_1.s
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-08-21 15:40:38 +02:00 |
|
hedara90
|
95eb3ba1a7
|
Fix B_ANIMATE_MON_AFTER_KO with a new counter (#7531)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-08-21 14:43:41 +02:00 |
|
Alex
|
208f97e1e3
|
Rename passive damage hitmarker (#2174)
|
2025-08-21 13:43:19 +01:00 |
|
Alex
|
554c909983
|
Fixes Counter / Mirror Coat / Metal Burst damage assignment (#7538)
|
2025-08-19 08:56:21 +02:00 |
|
GriffinR
|
92f7727a60
|
Merge pull request #2107 from AsparagusEduardo/pret/pr/simpleMultiBattleFix
Simplified Multi Battle bugfix, removing duplicate code
|
2025-08-14 15:09:42 -04:00 |
|
Alex
|
65b316625f
|
Fixes Knock Off still activating when there is no Item (#7496)
|
2025-08-13 15:00:04 +02:00 |
|
ghoulslash
|
18363207d9
|
Fix Mimicry Only Activating Once per Turn (#7537)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-08-12 15:40:10 +02:00 |
|
Alex
|
7de3663f38
|
Fixes Life Orb still activating if move was absorbed (#7521)
|
2025-08-10 16:58:36 +02:00 |
|
Eduardo Quezada
|
0b299b3ffd
|
Fixed most failed tests with GEN_LATEST GEN_8 (#7498)
|
2025-08-08 09:44:12 +02:00 |
|
PhallenTree
|
014f289ea9
|
Fixes Round and Fusion moves doubling power from previous turn's move (#7476)
|
2025-08-04 12:41:43 +02:00 |
|
Alex
|
cb4450efaf
|
Fixes Effect Spore and Baneful Bunker/Burning Bulwark (#7412)
|
2025-07-30 19:54:12 +02:00 |
|
Eduardo Quezada
|
d801556a97
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
|
2025-07-27 11:59:07 -04:00 |
|
Alex
|
845838bbc0
|
Fixes bug for affectionScore in doubles for spread moves (#7395)
|
2025-07-25 09:32:45 -04:00 |
|
Alex
|
705f194d98
|
Fixes various battler corruption during switch in ability activation (#7352)
|
2025-07-18 12:28:00 +02:00 |
|
AlexOn1ine
|
674d46bb0f
|
Fixes incorrect recoil damage after a berry was eaten
|
2025-07-15 15:37:23 +02:00 |
|
Alex
|
73a2e5104e
|
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe (#7326)
|
2025-07-14 21:34:21 +02:00 |
|
Alex
|
f808201945
|
Fixes Natural Gift moveend execution (#7274)
|
2025-07-05 15:05:35 -04:00 |
|
Alex
|
5cfab59209
|
Fix OOB in Cmd_selectfirstvalidtarget (#7269)
|
2025-07-04 12:11:32 -04:00 |
|
AlexOn1ine
|
734a15478c
|
Clean up for Moveend
|
2025-07-02 17:25:03 +02:00 |
|
Alex
|
f8fc86275c
|
Fixes protective pads not protecting from secondary protect effects (#7229)
|
2025-07-01 17:48:57 +02:00 |
|
Alex
|
89b1a45536
|
Fixes Ice Spinner and Steel Roller (#7259)
|
2025-07-01 15:39:22 +01:00 |
|
Alex
|
5451e40830
|
Fixes Toxic Thread animation not being played at the right time (#7247)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-06-30 21:41:29 +02:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04:00 |
|
Juanjo
|
8973006273
|
[FIX] Prevent caught Pokémon loss in NPC partner battles (#7177)
|
2025-06-28 10:36:37 +02:00 |
|
Alex
|
a96591dd43
|
Fixes Scald defrosting target while asleep (#7233)
|
2025-06-28 10:14:55 +02:00 |
|
ghoulslash
|
3dda407bb0
|
Jaboca berry triggers instead of being stolen by bug bite (#7237)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-28 08:43:50 +02:00 |
|
Alex
|
4def635e1f
|
Fixes wrong assignment in TrySymbiosis (#7221)
|
2025-06-26 15:53:50 +02:00 |
|
Alex
|
773ecd4c24
|
Fixes OOB for Teatime and Flower Shield (#7214)
|
2025-06-25 21:00:49 +02:00 |
|
PhallenTree
|
98670ca30e
|
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)
|
2025-06-21 00:04:01 +02:00 |
|
Alex
|
c120fa71dc
|
Fixes Ally Switch in multi battles (#7109)
|
2025-06-13 15:18:27 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +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 |
|
Alex
|
9f1eb78737
|
Fixes freeze during a 1v2 double battle (#7075)
|
2025-06-07 11:49:15 +02:00 |
|
Linathan
|
dc279f14ba
|
Chloroblast fix (#7008)
|
2025-06-06 21:33:56 +02:00 |
|
Hedara
|
9d80ad530d
|
Merge branch 'master' into master-to-upcoming
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
|
2025-05-28 14:26:15 +02:00 |
|
Vex
|
ecb20b2a25
|
Fix Eiscue not resetting back to Ice Face form after battle. (#6997)
|
2025-05-28 12:43:38 +02:00 |
|
Alex
|
c489d36fc6
|
Fixes Gen3 berry activation timing (#6993)
|
2025-05-27 23:36:00 +02:00 |
|
malad1211
|
d27a3575f2
|
Cleanup identical if blocks (#6988)
|
2025-05-27 10:12:12 +02:00 |
|
Alex
|
983f8e34a1
|
Fixes repeated learning of level up moves (#6981)
|
2025-05-26 14:15:16 -07:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Bassoonian
|
812bde8a48
|
Pret merge (24th of May, 2025) (#6978)
|
2025-05-25 23:08:37 +02:00 |
|
Vex
|
7b686b6749
|
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-25 23:01: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 |
|
Hedara
|
950dbe7897
|
Merge commit '16357c7' into pret-merge
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
|
2025-05-24 19:22:31 +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 |
|