397 Commits

Author SHA1 Message Date
AlexOn1ine
fd0766c7fa 17-04-25-master-merge 2025-04-17 14:14:37 +02:00
Bassoonian
cca969b04d
Adds move effect type checking (#6618) 2025-04-16 00:08:57 +02:00
PhallenTree
3b05d7934f
Fixes wrong battler's Illusion wearing off when the Attacker faints and fixes Illusion tests (#6596) 2025-04-14 18:17:24 +02:00
ghoulslash
81ed774c00
EndTurnEffectOrder Refactor (#6224) 2025-04-14 10:57:34 -04:00
Alex
a4bfbea3cb
Revert wrongly done Embody Aspect fix (#6607) 2025-04-14 00:17:10 +02:00
Pawkkie
540744024d
"Aerilate"-esque Ability Tests and Config (#6313) 2025-04-12 14:48:58 -04:00
Bassoonian
d86aedfd32 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr 2025-04-12 14:59:06 +02:00
wiz1989
3d8b912087
Ability imposter (#6552) 2025-04-12 00:01:29 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
Alex
7bf156be0e
Refactors Move absorb / block function calls to remove redundancy (#6490)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-08 14:26:18 +02:00
PhallenTree
f24173974c
Fixes Thermal Exchange not curing existing burn (#6545) 2025-04-07 10:48:27 +02:00
AlexOn1ine
e8cc3c81f8 conflicts 2025-04-06 14:59:12 +02:00
hedara90
5fe58a1ed0
Thermal exchange tests (#6536)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-05 09:22:58 +02:00
Alex
ae62c80d0f
Refactors faint target abilities and adds Battle Bond config (#6519)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-02 16:00:23 +02:00
AlexOn1ine
0c35879e02 conflicts 2025-04-01 19:11:55 +02:00
AlexOn1ine
ccebebf64f 31-03-25 Master merge 2025-03-31 18:23:46 +02:00
Alex
c1364e14d4
Fixes Hospitality not being blocked by Heal Block (#6494) 2025-03-29 17:07:56 +01:00
Alex
79a2ec1ce2
Fixes Emergency Exit and Eject Pack (#6459) 2025-03-29 14:04:01 +01:00
Alex
7ead90aeff
Fixs Aftermath ability popup message (#6491) 2025-03-29 09:45:59 +01:00
Alex
ce3d6a924a
Fixes clear body type effect and clear amulet against protect effects (#6482) 2025-03-28 11:35:06 +01:00
AlexOn1ine
ae640f0714 25-03-25 master to upcoming merge 2025-03-25 21:39:58 +01:00
Alex
b93976c980
Fixes Cheek Pouch mutating damage (#6466) 2025-03-23 23:34:24 +01:00
Alex
c707df358e
Clean up AI code duplication and unify checks (#6348) 2025-03-20 22:50:01 +01:00
Alex
f237b5fa1b
Fixes negative priority being blocked by dazzling abilities (#6433) 2025-03-17 21:48:50 +01:00
PhallenTree
ddab689a07
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435) 2025-03-16 23:10:20 +01:00
hedara90
3ca4ce2444
Fixed Parental Bond with two-turn attacks (#6408)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-12 20:54:32 +01:00
AlexOn1ine
06315ff084 first review batch 2025-03-08 21:24:22 +01:00
PhallenTree
fe4046a900
Fix tests 2025-03-04 11:34:07 +00:00
PhallenTree
0cce4bad8c
Speeds were already correct 2025-03-04 11:21:14 +00:00
PhallenTree
5a8fbeeb47
Other Dancer tests cleanup 2025-03-04 11:13:45 +00:00
PhallenTree
e750dca08a
Reorder Dancer activation 2025-03-04 11:02:33 +00:00
ghoulslash
26c73dca32 move red card dancer tests to dancer.c 2025-03-03 17:01:15 -05:00
AlexOn1ine
0a333dbdc8 merge rhh/upcoming 2025-02-28 00:21:07 +01:00
Hedara
06d31bc8ea Merge branch 'master' into final-1.10-master-upcoming-merge 2025-02-26 22:07:10 +01:00
Alex
13acf18d74
Fixes effect paralyze not being absorbed by absorbing abilities (#6338) 2025-02-25 22:28:10 +01:00
PhallenTree
320c6cf11f
Fixes Coaching on semi-invulnerable ally, Air Balloon being stolen, Immunity abilities being ignored by Mold Breaker (#6327) 2025-02-23 20:50:52 +01:00
Alex
5b4de20455
Fixes intimidate missing timing during a mega evo / switch (#6322)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-22 21:56:48 +01:00
Alex
3dd0f95ddd
Fixes Tera Shell activating on moves that have no effect on target (#6271) 2025-02-21 23:11:07 +01:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03: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
AlexOn1ine
5ee5aa796a merge rhh/upcoming 2025-02-12 21:01:21 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
AlexOn1ine
b4f17c7506 review comments 2025-02-11 12:06:16 +01: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
Eduardo Quezada
d510a3957d
Fixed Future Sight not being affected by Electrify (#6213) 2025-02-09 21:57:29 +01:00
Eduardo Quezada
621d2ef83d
Fixed missing move encapsulation in upcoming (#6226) 2025-02-09 20:03:53 +01:00
AlexOn1ine
4babfd003e rhh merge/upcoming 2025-02-09 14:04:21 +01:00
AlexOn1ine
f2bd88a7f9 EndTurnEffectsOrder Refactor 2025-02-09 13:48:08 +01:00
ghoulslash
6f541bb449
Fix Liquid Ooze + Leech Seed Test (#6217)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-08 22:42:25 +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