18087 Commits

Author SHA1 Message Date
Pawkkie
e4d9298200
Fix move comparison scoring (#7301) 2025-07-10 09:51:46 +02:00
Pawkkie
d213b1fad7
Fix switch AI not seeing absorbing abilities (#7309) 2025-07-09 17:21:49 -04:00
hedara90
6367ce71be
Remove wrongly added binary files (#7307)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-07-09 09:55:07 +02:00
Martin Griffin
f4cc802656
Fix crashing tests looping (#7299) 2025-07-09 09:02:55 +02:00
pokesidv
94ddf6dea0
fix: added warning about dns tutorial and triple-layer metatiles tutorial compatibility to the dns tutorial. (#7256) 2025-07-07 13:26:44 -04:00
ghoulslash
4cb6afdec9
Ally Switch swap gLastX values (#7290)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-07-07 19:20:23 +02:00
ghoulslash
a24353d184
Add Overcoat Tests (#7287)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-06 15:11:04 +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
hedara90
56907bc26e
Merrp merge, 2025-06-25 (#7217) 2025-07-04 13:03:09 +02:00
hedara90
beb576f4c5
Set BP of Gyro Ball for attackers with 0 speed to 1 (#7270)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-07-04 11:11:21 +02:00
bassforte123
f74a23f44d
Typo fixes (#7280) 2025-07-04 11:04:29 +02:00
ghoulslash
31fc32ada8
Prevent AI Recursion (#7279)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-07-03 23:16:40 +02:00
ghoulslash
476e32cad9
Fix redirection abilities triggering on self (#7276)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-07-03 19:19:18 +02:00
hedara90
0a38be7dab
Clean up for moveend order (#7273) 2025-07-03 10:13:37 +02:00
AlexOn1ine
76bdd4da6d remove leftover 2025-07-02 17:25:34 +02:00
AlexOn1ine
734a15478c Clean up for Moveend 2025-07-02 17:25:03 +02:00
hedara90
bdb0989030
Remove remove_terrain.log (#7268)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-07-02 10:57:56 +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
hedara90
46d4b7c8c9
Bug Fix: Follower NPCs no longer have glitchy bobbing while underwater (#7232) 2025-06-30 21:39:51 +02:00
hedara90
66703ddf9d
1.12.1 release (#7254) 2025-06-30 12:34:24 +02:00
Hedara
947faa97d3 Start of 1.12.2 cycle 2025-06-30 11:01:46 +02:00
Hedara
1e281547ed 1.12.1 Release commit 2025-06-30 11:01:13 +02:00
ghoulslash
21ac62f781
Flush textbox for Truant Popup (#7252)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-06-29 21:38:52 +02:00
hedara90
ae123f0f37
Added tests for Toxic Thread (#7244)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-29 10:16:38 +02:00
PhallenTree
6ed4f73f6a
Fixes Emergency Exit sometimes causing an unrelated battler to become invisible (#7241) 2025-06-28 23:20:40 +02:00
hedara90
502c73dc9b
Fix 01_battle_engine_bugs.yaml (#7242) 2025-06-28 13:24:24 -07:00
Juanjo
8973006273
[FIX] Prevent caught Pokémon loss in NPC partner battles (#7177) 2025-06-28 10:36:37 +02:00
ghoulslash
0c4b0c582e
Add some tests (#7234) 2025-06-28 10:20:39 +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
Bivurnum
9416a783d4 removed unnecessary fnpc underwater update 2025-06-26 16:47:09 -05:00
Alex
565cf6f7ff
Adds missing healBlockTimer for Baton Pass (#7220) 2025-06-26 15:54:19 +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
Hedara
9ca6562874 Cleanup of merrp merge 2025-06-25 18:04:12 +02:00
Hedara
a3bec47a23 Merge commit '06c6fd02e0670e783a56756a1b08a98d213b27cb' into merrp-merge 2025-06-25 18:03:16 +02:00
Hedara
d989edfe98 Merge commit 'b7d0a7e203cc862ec6216433762c7529be2b9bb1' into merrp-merge
Conflicts:
	include/constants/event_objects.h
	src/event_object_movement.c
	src/follower_helper.c
2025-06-25 18:03:01 +02:00
Hedara
08914a8f2c Merge commit 'f6efe480fa4363eacf59538e6e68ec34fa6f6a1d' into merrp-merge
Conflicts:
	src/event_object_movement.c
2025-06-25 18:00:38 +02:00
Hedara
25e168a3f8 Merge commit '841d0cf25164e92d98970b0d057de3a698722970' into merrp-merge
Conflicts:
	include/event_object_movement.h
	include/field_player_avatar.h
	src/union_room_player_avatar.c
2025-06-25 17:59:49 +02:00
Hedara
abf8fa2457 Merge commit '1cc2c7f2a02c350c0d724ab661ea0b78d108df51' into merrp-merge 2025-06-25 17:56:37 +02:00
Hedara
1b2351ad68 Merge commit 'cab7f8b24b0dfaa26de8d63938cc3c9737d127a6' into merrp-merge
Conflicts:
	src/fldeff_sweetscent.c
2025-06-25 17:56:21 +02:00
Hedara
c0a50096f3 Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
Conflicts:
	include/constants/event_objects.h
	src/event_object_movement.c
	src/follower_helper.c
2025-06-25 17:54:59 +02:00
Hedara
1916703e5a Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
Conflicts:
	include/battle_script_commands.h
	include/constants/event_objects.h
	include/event_object_movement.h
	include/field_effect.h
	include/field_effect_helpers.h
	include/sprite.h
	src/battle_controller_player.c
	src/event_object_movement.c
	src/pokeball.c
2025-06-25 17:49:19 +02:00
Hedara
7db0d5c908 Merge commit '200ef41fce5071a2032ef34e4ba64b71368cfccd' into merrp-merge 2025-06-25 17:22:22 +02:00
Hedara
80ec5ff409 Merge commit '143500a1f95bf5951c001ec88db8b9d3f55d43e7' into merrp-merge 2025-06-25 17:22:11 +02:00
Hedara
3ce34c41b6 Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
Conflicts:
	include/follower_helper.h
	src/follower_helper.c
2025-06-25 17:20:38 +02:00
Hedara
150091990d Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge 2025-06-25 17:14:52 +02:00