17987 Commits

Author SHA1 Message Date
Eduardo Quezada
8edb736429
Spruce up FEATURES.md (#7159)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-06-20 05:44:55 -07:00
hedara90
009a47a5dc
Fixed Battle Pyramid mon generation (#7146)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-20 13:19:24 +02:00
hedara90
c7e744d713
Pret merge (19th of June, 2025) (#7163) 2025-06-20 10:07:14 +02:00
Bassoonian
24fdac662e Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196 2025-06-19 14:32:23 +02:00
Alex
57feee3743
Add missing flag for Berserk Gene (#7151) 2025-06-19 14:26:28 +02:00
allcontributors[bot]
4a80caf8cd
add poetahto as a contributor for code (#7162)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-06-18 21:23:27 -07:00
allcontributors[bot]
a996525bdd
add lordraindance2 as a contributor for code (#7161)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-06-18 21:06:45 -07:00
Bivurnum
12b2a29607
Bug fix: clear follower npc surf blob on white out (#7153) 2025-06-18 22:50:55 +02:00
Eduardo Quezada
8a0bc495d5
Fixed description of FORM_CHANGE_WITHDRAW (#7152) 2025-06-18 22:09:59 +02:00
ghoulslash
a154d7a7a4
Fix savage spin out spider web template (#7137)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-06-18 11:04:24 +02:00
Eduardo Quezada
9adb84b2d0
Fixed KNOWN_FAILING Tera test (#6949) 2025-06-18 11:00:42 +02:00
Eduardo Quezada
0dc01f244e
Fixed Aura Wheel KNOWN_FAILING test (#7135) 2025-06-17 20:48:03 +02:00
psf
75fe3e7da6
Fixed typo in sMoveRelearnerMenuState (#2155) 2025-06-17 15:38:33 +01:00
allcontributors[bot]
e7b9372662
add fakuzatsu as a contributor for code (#7136)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-06-17 13:47:57 +01:00
hedara90
2e50314fb2
Applied Kasen's documentation improvements (#7104)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-16 13:38:49 +02:00
hedara90
981aa3ee7c
Use RGB values for DEFAULT_LIGHT_COLOR (#7133)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-16 13:38:07 +02:00
Pawkkie
283bf68ff9
Fix incorrect function parameters used in AI damage calc (#7130) 2025-06-16 07:59:30 +02:00
hedara90
b2a0107a68
Test runner fixes (#7100)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-15 12:02:29 +02:00
cawtds
3491cd95e8
Fix sell price display (#7123) 2025-06-15 11:52:51 +02:00
Bivurnum
459946ac9a
Bug fix: Follower NPC no longer retains bike sprite after white out (#7120) 2025-06-15 11:10:32 +02:00
GriffinR
bfa3e4a07b
Merge pull request #2145 from abaresk/remove-berryfix
Remove berry yield bug fix
2025-06-15 00:41:33 -04:00
hedara90
cb331aa133
Fix typo in INSTALL.md (#7116)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-14 14:29:09 +02:00
Alex
c6b4118c3c
Added AI_FLAG_PP_STALL_PREVENTION to AI_FLAG_SMART_TRAINER (#7112) 2025-06-14 11:06:23 +02:00
GriffinR
5a3fc2a61b
Merge pull request #2154 from DizzyEggg/patch-1
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches
2025-06-13 11:28:26 -04:00
DizzyEggg
1cc4321a42
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches 2025-06-13 16:45:24 +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
Eduardo Quezada
6cb5016113
Fixed potential mismatch between players and battlers in tests (#7101) 2025-06-12 19:46:03 +02:00
Eduardo Quezada
393bed069a
Wrote some missing tests (#7094) 2025-06-11 09:13:37 +02:00
psf
7ef781e9e0
Update CREDITS.md with correct line placement (#7096) 2025-06-10 19:38:55 +02:00
allcontributors[bot]
7514ed5efb
add Emiliasky as a contributor for test (#7082)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-06-10 05:52:48 -07:00
hedara90
0834d9d80b
Added loop iterator style (#7092)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-09 13:52:37 -07:00
GriffinR
ec6e85d4b4
Merge pull request #2151 from ghoulslash/pret/repeatparticlefix
Fix Repeat Ball Particle Animation Sprite Count
2025-06-09 16:43:57 -04:00
ghoulslash
96844bd3bb fix sprite count in RepeatBallOpenParticleAnimation 2025-06-09 16:19:25 -04: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
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
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
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
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
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