17986 Commits

Author SHA1 Message Date
Bassoonian
192bc1ec20
Master merge (#7093) 2025-06-10 22:52:43 +02:00
Alex
cb4ef705f7
Remove redundancy for ShouldLowerStat functions (#6577) 2025-06-09 21:47:16 -04:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge
Conflicts:
	src/contest_painting.c
2025-06-09 23:27:18 +02:00
hedara90
0834d9d80b
Added loop iterator style (#7092)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-09 13:52:37 -07:00
hedara90
260813fc3f
Improve smol compressor (#7073)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-09 18:28:00 +02:00
hedara90
bc864c2519
Fix .smol compression in debug builds (#7090)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2025-06-09 13:17:05 +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
Emilia Daelman
f4ff5e6d26
Feature/ai/wide guard quick guard singles (#7086)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-08 21:50:34 +02:00
kittenchilly
872bb8785b
Simplify white out messages (#6961) 2025-06-08 08:52:37 -07:00
Bassoonian
b372c272f4
Update FRLG whiteouts to new pret system (#7040)
Co-authored-by: cawtds <38510667+cawtds@users.noreply.github.com>
2025-06-08 14:45:14 +02:00
Emilia Daelman
05023b82ea
chore: remove unused section from credits (#7085) 2025-06-07 19:02:03 -07:00
allcontributors[bot]
5586b0c216
add ravepossum as a contributor for code (#7083)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-06-08 00:00:14 +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
allcontributors[bot]
29adca79a5
add pkmnsnfrn as a contributor for projectManagement (#7081)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-06-07 07:06:20 -07:00
Alex
9f1eb78737
Fixes freeze during a 1v2 double battle (#7075) 2025-06-07 11:49:15 +02:00
明雅
1692d641c4
Fix Contest Painting load palette error (#7077) 2025-06-07 10:05:24 +02:00
wiz1989
e63ac48de2
added Ash Greninja overworld sprites (#6976) 2025-06-07 09:57:43 +02:00
Bivurnum
ea75a09dac
Clear saved follower NPC door warp when doing dive warp (#7065) 2025-06-07 09:54:07 +02:00
psf
fd90802a37
Fixed CI issue introduced 7046 (#7072) 2025-06-07 09:51:47 +02:00
hedara90
8489b7a622
Added naive line break (#7076)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-06 20:13:07 -07:00
i0brendan0
67f7ad6b1e
[DRAFT] Fix Normalize not boosting Normal type moves if they were already Normal type (#7060)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-06 22:00:33 +02:00
Linathan
dc279f14ba
Chloroblast fix (#7008) 2025-06-06 21:33:56 +02:00
allcontributors[bot]
451cb91d5d
add Bivurnum as a contributor for code (#7067)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-06-06 11:14:17 -07:00
Alex
f374291f69
Fixes Wandering Spirit copied ability activation on fainted mon (#7066) 2025-06-05 22:47:32 +02:00
Linathan
25736c5628
Bug fix for Grassy Terrain incorrectly healing non-grounded Pokemon (#7058) 2025-06-05 14:35:30 +02:00
Alex
020be9d5b0
Deprecate sStatusFlagsForMoveEffects (#7063) 2025-06-05 14:32:28 +02:00
Alex
99997c49fc
Fixes speed calculation order (#7064) 2025-06-04 23:26:19 +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
3decd3da0a
Animation documentation (#7052) 2025-06-04 11:19:57 +02:00
allcontributors[bot]
2358f9a871
add iriv24 as a contributor for code (#7059)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-06-04 07:50:34 +02:00
Eduardo Quezada
d795de9e9d
Remove more instances of hard-coded Move IDs (#7056) 2025-06-03 23:26:48 +02:00
Philipp AUER
21f0eb1583
Debug parties and battles (#6884)
Co-authored-by: sbird <sbird@no.tld>
2025-06-03 23:21:17 +02:00
allcontributors[bot]
48b88899d1
add bassforte123 as a contributor for code (#7003)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-06-03 23:12:38 +02:00
TLM-PsIQ
8b52e100b9
Fix ScaryFace anim for Bitter Malice (#6476) 2025-06-03 22:25:29 +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
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums (#7041) 2025-06-02 15:54:37 +02:00
psf
7263bb1886
Update CI to ignore allcontributors commits (#7046) 2025-06-02 15:41:05 +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
hedara90
46e09a9e46
Changed trainer tutorial to take into account removed palette compression (#7044)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-01 21:02:52 +02:00
hedara90
ec15948ea8
Put the gen 1 compression tests behind a config (#7033)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-01 20:59:00 +02:00
Eduardo Quezada
3565c7a8a6
Documented usage of delay X (#6951) 2025-06-01 17:11:42 +02:00
cawtds
d3af14b2bb
Adds FRLG asserts to Alloc/Free (#7025) 2025-06-01 14:22:00 +01:00
Alex
661a418960
Fixes multi battle party re-order (#7042) 2025-06-01 13:08:37 +02:00
Eduardo Quezada
8697bef20c
BtlController_EmitTwoReturnValues cleanup (#6855) 2025-06-01 11:29:02 +02:00
hedara90
392d4db319
Fix follower compression (#7038)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-01 10:06:12 +02:00
Eduardo Quezada
a93a17d490
Fixed text width for a lot of forms in HGSS Dex (#7035) 2025-05-31 20:28:24 +02:00
PhallenTree
585793131f
Fixes large battle messages being cut off instead of being prompted to advance 2 (#7036) 2025-05-31 20:25:25 +02:00