16970 Commits

Author SHA1 Message Date
Eduardo Quezada
a756bb501c Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-19 22:31:33 -03:00
Eduardo Quezada
d1fc3d7009 Reverted orb effect shadow change 2025-01-19 22:13:08 -03:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
PhallenTree
b9acfdbb81
Fixes large battle messages being cut off instead of being prompted to advance (#6052) 2025-01-19 12:04:15 +01:00
Frank DeBlasio
6be3d337c0
Re-removed trainers.h trailing whitespace (#6048) 2025-01-19 11:33:39 +01:00
hedara90
ab9c48b2b3
Fixes HGSS dex not compiling currently (#6051)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-19 11:32:58 +01:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality (#5048) 2025-01-18 23:19:06 +01:00
AERDU
e4e4460636
fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 (#6032) 2025-01-18 19:54:20 +01:00
Alex
9ed3b176f0
Pret merge (17 of January) (#6045) 2025-01-18 19:53:29 +01:00
Bassoonian
243900cdbb
Rename DexNav flags and vars (#6044) 2025-01-18 14:44:40 +01:00
ghoulslash
37cbae5e54
Fix Symbiosis Needing battler Argument + Tests (#6039)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-18 14:44:07 +01:00
Bassoonian
db5dc85b70 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-18 13:07:05 +01:00
Bassoonian
cc9a4d34c6 Fix tests not building 2025-01-18 13:07:01 +01:00
Bassoonian
199760a6d3
Add known failing learnset cap test (#6046) 2025-01-17 21:04:46 -05:00
DizzyEggg
e83f7c79eb
Fix conflicting types for rotating gate functions (#2087) 2025-01-17 18:19:21 -05:00
DizzyEggg
0a436d580e
Extern gSprites and gOamMatrices with known array size (#2090) 2025-01-17 18:18:17 -05:00
Eduardo Quezada
070f9ce4e1 Made MSG_COND_TIME_OF_DAY clearer 2025-01-17 20:07:48 -03:00
Eduardo Quezada
937b3106b4 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-17 19:33:48 -03:00
Eduardo Quezada
6162628104 A bit more of addressing 2025-01-17 19:25:29 -03:00
hedara90
3bcfa355eb
Config for move slot rearrangement in battle (#6017)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-17 23:03:01 +01:00
Eduardo Quezada
ffc8903f93 More review addressing 2025-01-17 18:47:38 -03:00
Eduardo Quezada
c363c28b22 Addressing a bunch of small things 2025-01-17 18:21:48 -03:00
Eduardo Quezada
b00b2a9ded Fixed the rest of the conditions 2025-01-17 18:11:25 -03:00
Eduardo Quezada
4233f0e277 Test permission fix 2025-01-17 18:07:56 -03:00
Eduardo Quezada
17e224343f
Fixed whitespace issue with trainerproc (#6042) 2025-01-17 22:04:16 +01:00
Bassoonian
bcf9a1eff8 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01:00
GriffinR
2f67b17571
Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
2025-01-17 17:54:38 +00:00
Raymond Dodge
b5b0ffd511
Define field script opcode constants (#2005)
Replace the magic number opcodes in field script command macros with
these new constants
2025-01-17 17:04:00 +00:00
Eduardo Quezada
cacd07db9a Merge branch '_RHH/master' into _RHH/upcoming 2025-01-17 13:49:32 -03:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports (#6041) 2025-01-17 14:39:52 -03:00
Mercy
21d2e40f0a
Fix Match Call Behavior (#5931) (#6033) 2025-01-16 21:23:12 -08:00
Pawkkie
465d30fbd0
Add AI_FLAG_PREDICT_SWITCH (#6028) 2025-01-16 21:43:16 +01:00
cawtds
75d5edad08
Fix UB when accessing move result flags (#6030)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-01-15 21:30:25 +01:00
ghoulslash
fd26d3a406
Fix Redirection Abilities Not Drawing in Ally Moves (#6026)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-15 15:20:31 +01:00
Martin Griffin
ed0c9a4671
Restore lock/lockall/locktrainer/release/releaseall in triggers (#5976) 2025-01-15 10:22:26 -03:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep (#6019)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-15 14:07:12 +01:00
Martin Griffin
9952b676db
Merge pull request #2095 from DizzyEggg/transition
Fix CaveTransition pals
2025-01-15 09:21:22 +00:00
DizzyEggg
9385dfed67 Fix CaveTransition pals 2025-01-15 10:08:02 +01:00
Alex
c46f8541f9
Fixes self effect moves not procing for spread moves when battler 3 w… (#6020) 2025-01-14 15:18:00 -05:00
AZero13
7eb96ec615
Use SET8 and SET32 consistently (#5544)
Co-authored-by: Rose <83477269+AreaZR@users.noreply.github.com>
2025-01-14 20:42:55 +01:00
Pawkkie
e8dd8da5f7
Add AI_FLAG_PREFER_HIGHEST_DAMAGE_MOVE (#6025)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-01-14 14:13:48 -05:00
Alex
1c3ce75a60
Wrong undefs (#6024) 2025-01-14 14:01:10 -05:00
AZero13
5effd5a8b5
Remove redundant calls to GetMonData in pokemon.c (#5545)
Co-authored-by: Rose <83477269+AreaZR@users.noreply.github.com>
2025-01-14 20:00:48 +01:00
Pawkkie
7af6c4c09e
Workflow for Scope Discussion (#6022) 2025-01-13 17:03:18 -08:00
psf
c02b7ba828
Codify new expansion release schedule (#5916)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-01-13 16:52:49 -03:00
Eduardo Quezada
52201b1561
Improved Hidden Power test (#6014) 2025-01-13 10:16:43 +01:00
Alex
f1eebc978d
Fixes defrosting if frozon mon is not damaged by opponent (#6016)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-13 10:09:55 +01:00
RavePossum
536f386bed
Explicitly specify dependencies for teachable learnset helper (#6015) 2025-01-13 00:01:47 +01:00
Alex
96122d9342
Adds Liquid Ooze and Aromatic Mist test (#6012) 2025-01-12 09:08:04 -03:00
Eduardo Quezada
ce40c3356c Merge branch '_RHH/master' into _RHH/upcoming 2025-01-12 08:42:57 -03:00