17588 Commits

Author SHA1 Message Date
Pawkkie
787a8a0d9d Merge remote-tracking branch 'upstream/upcoming' into move-prediction 2025-04-28 13:23:33 -04:00
Pawkkie
96a8035dec
Fix party data assignment (#6712) 2025-04-28 08:48:21 +02:00
Pawkkie
7a3cf5d3a3
Improve AI's defense against Focus Punch (#6713) 2025-04-28 08:34:09 +02:00
Pawkkie
38c90909eb WORKS, still needs work :D 2025-04-28 00:56:03 -04:00
Pawkkie
4970b3bd95 Merge remote-tracking branch 'upstream/upcoming' into move-prediction 2025-04-28 00:33:42 -04:00
Eduardo Quezada
c1b9ed5dcf
Fixed upcoming not compiling in gcc 11.4.0 (#6710) 2025-04-27 23:11:03 -04:00
hedara90
67f3405864
Fix pc mon pic (#6709)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-27 15:19:46 -04:00
hedara90
5dfbdf56da
27/04/25 Master to upcoming merge (#6701) 2025-04-27 18:01:50 +02:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) (#6500)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
AlexOn1ine
19fb962173 remove more unused 2025-04-27 14:56:03 +02:00
AlexOn1ine
1c5d9b4708 unused var 2025-04-27 10:03:31 +02:00
AlexOn1ine
e246b20e72 27/04/25 Master to upcoming merge 2025-04-27 09:50:25 +02:00
Alex
87bd59b6f4
Fixes Z and Max moves dmg reduction against side protection - upcoming (#6698) 2025-04-26 23:37:15 +02:00
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection (#6697) 2025-04-26 21:46:41 +02:00
Pawkkie
8f5b2fddf7
Fix bracket typo in AI_CheckBadMove conditional (#6695) 2025-04-26 09:46:10 +02:00
Pawkkie
9737850eea
Keep Steven Multi Debug Option at the Bottom Forever (#6694)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-04-25 19:57:22 +02:00
PCG
68598e232e
Disable P_TUTOR_MOVES_ARRAY config (#6693) 2025-04-25 12:33:03 +02:00
Bassoonian
d53c616e06
Adds a whole bunch of new tests (#6685) 2025-04-24 20:13:03 +02:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs (#6687) 2025-04-24 19:34:37 +02:00
hedara90
5cd7bd77b3
Fix various Toxic Spikes interactions (#6690)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-04-24 17:06:47 +02:00
PhallenTree
34e91dd96f
Fixes Unburden doubling speed when affected by Neutralizing Gas (#6691) 2025-04-24 15:26:23 +02:00
Ruby
2a762cbbed
Removes vestigial EWRAM variable from debug menu. (#6686) 2025-04-23 20:03:58 +02:00
Ruby
aba34015db
Time menu for RTC in debug menu. (#6634)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-23 19:34:37 +02:00
khbsd
971a595e4a
Evolution Refactor (#6556)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-04-23 16:01:33 +02:00
Alex
20799d5835
Remove misleading comment (#6684) 2025-04-23 14:24:25 +02:00
Alex
d3fe5c4640
Some Me First tests plus minor clean up (#6678) 2025-04-23 12:18:57 +02:00
hedara90
6fdb6a9e34
Fixed broken palette load for shiny followers in the sprite visualizer (#6683)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-23 12:17:54 +02:00
Alex
71cfab6477
Fixes Magician Life Orb interaction (#6676) 2025-04-22 21:01:00 +02:00
Alex
c6521e06ad
Fix party access in NoAliveMonsForBattlerSide (#6677) 2025-04-22 21:00:08 +02:00
PhallenTree
91fc406b0a
Fixes Mirror Armor stat drops not being stopped by Substitute (#6675) 2025-04-22 19:54:04 +02:00
Alex
72839fc002
Fixes Bug Bite eaten berry not ignoring Unnerve (#6666) 2025-04-22 00:38:39 +02:00
Alex
dfb1cd2ec0
Refactor hit escape moves to use moveend (#6671) 2025-04-21 22:52:55 +02:00
PhallenTree
007d7e712e
Fixes Neutralizing Gas activating again after switch-in (#6667) 2025-04-21 19:14:53 +02:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction (#6645)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-21 17:33:29 +02:00
Ruby
b7b1308d44
Remove vestigial AdvanceScript function used for testing (#6664) 2025-04-21 17:13:50 +02:00
Bassoonian
2a8915a8a6
21/04/25 master to upcoming merge (#6665) 2025-04-21 16:14:20 +02:00
AlexOn1ine
e2e012c3a9 conflicts 2025-04-21 15:50:57 +02:00
Eduardo Quezada
4e7fa359ef
Fixed LGPE move test fail with B_UPDATED_MOVE_DATA to GEN_7 (#6657) 2025-04-21 14:48:49 +02:00
Alex
c4edfd2988
Fix gBattlerTarget OOB for Gravity and Perish Song (#6662) 2025-04-21 13:53:04 +02:00
hedara90
7d4de15d9d
Change HasTwoFramesAnimation to take into account species with 1 frame (#6655)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-21 11:09:20 +02:00
cawtds
0069ec1f0c
Fix captivate-oblivious interaction and related test (#6653) 2025-04-21 11:01:01 +02:00
Alex
db7e45f1d6
Sky Drop clean up and tests (#6218)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 23:07:46 +02:00
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:52 +02:00
Alex
fedbce510b
Fixes commander activation on a fainted mon (#6632)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:18 +02:00
Alex
5c02abb101
Test for Freeze vs Scald thaw (#6658)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:36:50 +02:00
Eduardo Quezada
c650199909
Added missing gMovesInfo encapsulation (#6656) 2025-04-20 22:36:27 +02:00
khbsd
6b8e680139
Remove hardcoded values from wild_encounter.h generation (#6640)
Co-authored-by: Moos Toet <moostoet@hotmail.com>
2025-04-20 22:27:36 +02:00
PhallenTree
bd64ab599b
Fixes Ally Switch cancelling partner's moves targeting that side of the field (#6647) 2025-04-19 20:24:00 +02:00
Bivurnum
d342b373f0
Fix no eligible mons when only the partner wins in multi battle (#6626) 2025-04-19 14:15:13 +02:00