12952 Commits

Author SHA1 Message Date
Pawkkie
c5f788444a
Fix choice AI not seeing Gorilla Tactics (#7316) 2025-07-10 22:49:16 +02:00
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
ghoulslash
4cb6afdec9
Ally Switch swap gLastX values (#7290)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-07-07 19:20:23 +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
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
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
hedara90
46d4b7c8c9
Bug Fix: Follower NPCs no longer have glitchy bobbing while underwater (#7232) 2025-06-30 21:39:51 +02: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
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
abf8fa2457 Merge commit '1cc2c7f2a02c350c0d724ab661ea0b78d108df51' into merrp-merge 2025-06-25 17:56:37 +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
1686797a5e Merge commit '7612e386419ef913bda5a62a5c8f234190542bb0' into merrp-merge
Conflicts:
	src/palette.c
2025-06-25 17:07:13 +02:00
DizzyEggg
675fb8f60e
Pret merge (24th of June, 2025) (#7206) 2025-06-25 13:58:28 +02:00
Ariel A
1cc2c7f2a0 fix: destroy shadows during battle transition intro 2025-06-24 20:46:22 -04:00
Ariel A
cab7f8b24b fix: removed sweet scent field effect dependence on gPaletteDecompressionBuffer 2025-06-24 20:45:52 -04:00
Ariel A
7564262543 Merge branch 'followers' into lighting 2025-06-24 20:44:44 -04:00
Ariel A
685a8a9118 Merge remote-tracking branch 'upstream/master' into followers 2025-06-24 20:39:12 -04:00
Ariel A
143500a1f9 fix: capitalization in follower splash message 2025-06-24 20:20:01 -04:00
Ariel A
1f2fe7396b feat: added abnormal weather follower message
Includes support for follower matching != species
2025-06-24 20:19:23 -04:00
Eduardo Quezada
b372fa30b6
Fix AI party count calc being maintained between tests (#7200) 2025-06-24 21:03:54 +02:00
Hedara
726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	asm/macros/event.inc
	data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
	data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
	data/scripts/trainer_hill.inc
	include/graphics.h
2025-06-24 10:42:24 +02:00
hedara90
74326023da
Backported Safari catch and add to party fix (#7192)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-24 09:29:20 +02:00
DizzyEggg
93511ceb05
Fix BtlController_EmitChosenMonReturnValue UB (#7197) 2025-06-24 09:28:26 +02:00
Alex
bc95824e8c
Fixes wrong Future Sight indexing (#7198) 2025-06-24 09:04:19 +02:00
DizzyEggg
e1b83d6056
Match graphics declarations with externs (#2089) 2025-06-23 20:31:18 +01:00
Pablo Pena
e449a612f5
fix: use BackPickId to calculate player intro ball throw animation palette (#7193) 2025-06-23 19:45:12 +02:00
Eduardo Quezada
a75a49710f
Fixed debug flag menu sound (#7190) 2025-06-23 15:46:49 +02:00
i0brendan0
0ccf797cce
Fixes Roamers not saving shininess (#7185) 2025-06-23 15:05:01 +02:00
Alex
753eb9f8d8
Fixes Enigma, Kee and Maranga Berry activation timing (#7171) 2025-06-23 13:47:26 +02:00
DizzyEggg
7fdc5a45b6
force RHH Rom Header to always be present (#7187) 2025-06-23 10:38:03 +02:00
DizzyEggg
0dae2cea28
force sGFRomHeader to always be present (#7186) 2025-06-23 10:37:49 +02:00
grintoul
6c6daa8b9c
Fixes Rapid Spin description (#7178) (#7181) 2025-06-23 10:02:51 +02:00
GriffinR
4ce83c7d96
Merge pull request #2104 from GriffinRichards/fix-collision-comparison
Fix collision comparison in PlayerNotOnBikeMoving
2025-06-22 20:05:30 -04:00
DizzyEggg
53f8ae11ff
Move gTradePlatform_Tilemap to header (#2088) 2025-06-22 19:48:37 -04:00
PhallenTree
98670ca30e
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170) 2025-06-21 00:04:01 +02:00
hedara90
009a47a5dc
Fixed Battle Pyramid mon generation (#7146)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-20 13:19:24 +02:00