18051 Commits

Author SHA1 Message Date
Bassoonian
c34ec8956d
Master to upcoming merge, 20/06/25 (#7169) 2025-06-23 10:04:44 +02:00
Eduardo Quezada
1f8455c769
Fixed TM and Berries disappearing when sorting (#7168) 2025-06-22 20:39:13 +02:00
Eduardo Quezada
cf7f15faac
Untangle InitBtlControllers functions (#6748) 2025-06-22 16:21:37 +02:00
Eduardo Quezada
b094b70dc5
More battle controller function consolidation. (#6877) 2025-06-21 10:59:41 +02:00
Eduardo Quezada
bca28b40bb
Use argument.type for EFFECT_SOAK (#7141) 2025-06-21 00:04:52 +02:00
AlexOn1ine
3a42cd84af comment test 2025-06-20 17:31:16 +02:00
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
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
hedara90
390482d355
Fix debug text order (#7149)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-19 14:26:49 +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
Daniel Walls
cc33d6171b
Add config options for removing bard phoneme audio to save ROM space (#7155) 2025-06-18 20:16:25 -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
Bassoonian
6333702461
Converts more defines to enums and name unnamed enums (#7071)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-18 14:30:37 +02:00
PhallenTree
340d815c6d
Stat Change (Animation) Refactor (#7144) 2025-06-18 14:24:35 +02:00
Alex
ab1838ffd8
Repurposes IsMagicGuardProtected into a general function (#7114) 2025-06-18 12:56:03 +02:00
Eduardo Quezada
800829538c
Compound strings for hold effect names (#7140) 2025-06-18 11:38:42 +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
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) (#7018) 2025-06-18 10:59:24 +02:00
cawtds
97137aed2d
Improve music/se macros and fix names (#7030) 2025-06-18 10:58:37 +02:00
Nephrite
06cd3af3ea
Volatile status refactoring (#6983) 2025-06-18 07:22:41 +02:00
Zatsu
a765b8b45d
fixes #7129: 'add to full party' feature in the safari zone (#7147) 2025-06-17 21:29:52 +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
Eduardo Quezada
5966852f8d
Removed Mind Blown effect in favor of move flag (#7138) 2025-06-17 00:02:46 +02:00
Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change (#7139) 2025-06-17 00:02:25 +02:00
Eduardo Quezada
221ff8ed47
Removed redundant Damp check (#7134) 2025-06-16 22:11:00 +02:00
Alex
e2f0767be5
Decouple Status set by ability from SetMoveEffect (#7125) 2025-06-16 14:45:21 +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
522ccf06da
Use CanAbilityAbsorbMove in GetOverworldTypeEffectiveness (#7115) 2025-06-14 11:56:04 +02:00
Alex
c6b4118c3c
Added AI_FLAG_PP_STALL_PREVENTION to AI_FLAG_SMART_TRAINER (#7112) 2025-06-14 11:06:23 +02:00
Alex
d4146afcae
Add damage context to effectiveness multiplier (#7111) 2025-06-14 11:05:14 +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
Alex
e1b542944f
Refactor damage calculations aruguments by using a struct context (#7108) 2025-06-13 14:16:40 +02:00