6740 Commits

Author SHA1 Message Date
Pawkkie
48fc44df31
Fix AI hold effect considerations (#6310) 2025-02-21 18:11:47 +01:00
PhallenTree
b1c597495b
Fixes Called moves ignoring redirection (#6267) 2025-02-14 13:47:02 +01:00
Alex
53727aa23d
Fixes ability Embody Aspect triggering multiple times (#6259)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-14 12:26:49 +01:00
Bassoonian
5aeeb3365f
Merrp merge (12th of February) (#6244) 2025-02-13 16:19:40 +01:00
Hedara
0da3e49889 Review comments 2025-02-13 10:36:52 +01:00
hedara90
9aea7c8e3a
Changed bit order for follower graphicsId creation (#6249)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-12 23:36:37 +01:00
Hedara
a859f40e37 Review comments 2025-02-12 14:31:42 +01:00
Hedara
7426a98dc5 Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge 2025-02-12 13:34:28 +01:00
Alex
72de12609c
Fixes BATTLER_TURN_DAMAGED battler id (#6236) 2025-02-11 16:18:00 -03:00
Ariel A
c8fb56d73b Merge branch 'followers' into followers-expanded-id 2025-02-10 00:24:50 -05:00
Ariel A
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
Eduardo Quezada
99cb40d896
Added test support for 5 battle configs (#5914)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-09 22:29:23 +01:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time (#6197)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-02-07 16:24:05 -05:00
hedara90
f9d1fdcf4c
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-06 21:12:42 +01:00
Eduardo Quezada
fe41f9eaf5
Fixed non-regional forms breeding incorrectly (#4985) 2025-02-03 17:03:29 +01:00
Eduardo Quezada
7c6eda21b1
Added missing in-battle "Move Info" button prompt (#6155) 2025-02-01 18:47:36 +01:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01:00
Eduardo Quezada
1c3cabb52a Fix typo 2025-01-30 18:46:06 -03:00
Eduardo Quezada
370cfd5bb4 Begin 1.10.3 cycle 2025-01-30 18:40:03 -03:00
Eduardo Quezada
397e98b954
Version 1.10.2 (#6144) 2025-01-30 18:38:28 -03:00
bassforte123
72edeeffad
Update pokemon.h with nature comments (#6133) 2025-01-28 21:37:02 +01:00
Alex
49cbebd212
Remove formToChangeInto (Unused) (#6137) 2025-01-28 17:11:11 -03:00
hedara90
e8d3b4163f
Trainerslide animation fix (#6040)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 14:50:23 +01:00
Alex
f2840cb047
Fixes Eject Pack triggering twice on Intimidate (#6072) 2025-01-21 17:58:52 -05:00
Alex
b2f2a8c9fb
Fixes Rapid Spin / Toxic Debris interaction (#6023)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-21 21:43:54 +01:00
Alex
b1831daa98
Adds static assert for DamageCalculationData (#6063) 2025-01-21 21:15:25 +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
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
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
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
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues (#6005) 2025-01-12 09:49:19 +01:00
Alex
75a2d419e1
Follo up for Innards Out / Future Sight interaction (#5967) 2025-01-10 16:59:37 +01:00
Alex
e264fa6fc0
Removed OW_AUTO_SIGNPOST (#5978) 2025-01-08 16:14:38 -08:00
Pawkkie
b5f539ed21
Rename AI_FLAG_PREFER_STRONGEST_MOVE (#5972) 2025-01-08 14:00:20 +01:00
PhallenTree
c10287b4c1
Fixes various Dynamax HP conversions/calculations (#5933) 2025-01-07 20:08:31 +01:00
wiz1989
5bfc25a4ff changed data according to suggestions from the PR 2025-01-07 15:33:22 +01:00
wiz1989
04da838d88 Innards Out and Future Sight interaction 2025-01-07 14:00:09 +01:00
shachar700
a0e8753083
Update vars.h (cleanup)
Removed an extra are
2025-01-06 22:17:24 +02:00
shachar700
cbd0b3ef0c
Field effect for cutting grass is missing setfieldeffectargument. Issue #5766 (#5952) 2025-01-05 16:45:21 +01:00
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix (#5928) 2025-01-01 21:41:42 +01:00
Eduardo Quezada
e040dcb0b4 Begin 1.10.2 cycle 2025-01-01 16:20:40 -03:00
Eduardo Quezada
89699939de Version 1.10.1 2025-01-01 16:17:49 -03:00
Eduardo Quezada
6b8665d08f
Speed up tests in headless mode (#5889) 2025-01-01 10:24:23 +01:00
Ariel A
a6ef9c7577 Merge branch 'followers' into followers-expanded-id 2025-01-01 00:39:14 -05:00