2251 Commits

Author SHA1 Message Date
hedara90
21e8e0d44f
Fix declaration after label for Psywave switch (#6595)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 17:04:03 +02:00
Alex
caa878002a
Remove redundant bit for Throat Spray (#6593) 2025-04-13 16:22:04 +02:00
Bassoonian
6a70f4f390
Turn battle string ids into enums (#6594) 2025-04-13 16:12:30 +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
Alex
4aca2fdcd3
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 15:01:02 +02:00
psf
17d851e1f9
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles (#6456)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 14:59:58 +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
Alex
c1f18d0765
Refactor protect to allow at least 126 different types of protect eff… (#6506) 2025-04-02 17:26:05 +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
Bassoonian
9a23f19575
19-03-25 master to upcoming merge (#6450) 2025-03-20 09:57:05 +01:00
Alex
adc2c61fe8
Unifies dynamic move category checks (#6443) 2025-03-19 23:06:08 +01:00
AlexOn1ine
3c632b8b44 19-03-25 master to upcoming merge 2025-03-19 17:12:47 +01:00
Alex
4c4d043c13
Refactor the function IsAbilityPreventingEscape (#6439)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-03-19 16:09:36 +01:00
Alex
21f1b3bf9d
Refactor HasWeatherEffect and IsUnnerveAbilityOnOpposingSide (#6441) 2025-03-19 13:56:58 +01:00
Alex
4193963096
Fixes Cotton Spore failing if one of the targets blocks it (#6418)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2025-03-18 15:41:37 +01:00
Alex
0db9043c52
Rename absentBattlerFlags to absent (#6432) 2025-03-17 21:51:04 +01:00
Alex
f237b5fa1b
Fixes negative priority being blocked by dazzling abilities (#6433) 2025-03-17 21:48:50 +01:00
Alex
99a3d01877
Fixes dynamax reversion when ejected out + anim fix (#6416)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-17 19:57:38 +01:00
Alex
bd2d9f63ea
Fixes hazards not respecting tera types (#6431) 2025-03-16 22:05:21 -04:00
PhallenTree
ddab689a07
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435) 2025-03-16 23:10:20 +01:00
Alex
5965c08326
Create move end Sheer Force (#6411) 2025-03-14 20:11:42 +01:00
cawtds
7eaaa1f8d4 remove/replace IsAlly leftovers 2025-03-09 15:05:05 +01:00
Alex
46b821c196
Fix damage roll order for AI calcs (#6356) 2025-03-07 12:40:40 -05:00
AlexOn1ine
ba3ebc70d5 Merge remote-tracking branch 'rhh/master' into 06-03-25-Merge 2025-03-06 18:08:55 +01:00
PhallenTree
e750dca08a
Reorder Dancer activation 2025-03-04 11:02:33 +00:00
Alex
8041f6978b
Small Code clean up in GetBattlerAbility (removes duplication) (#6362) 2025-03-03 09:00:27 +01:00
AlexOn1ine
134d1e79c7 review comments addressed 2025-02-28 22:42:53 +01: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
hedara90
cf43787d72
Added MOVE_TARGET_OPPONENT and added it to Me First, (#6336)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-25 22:28:22 +01:00
Bivurnum
2a6fd24954
fix for multi 2vs1 opponent sends out too many mons bug (#6324) 2025-02-25 22:15:09 +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
PhallenTree
9479b67964
Remove pursuitSwitchByMove and additional if statement (#6326) 2025-02-23 11:49:00 +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
Pawkkie
48fc44df31
Fix AI hold effect considerations (#6310) 2025-02-21 18:11:47 +01:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03:00
Alex
750098d5c9
Fixes Shell Bell for Spread Moves (#6303) 2025-02-20 10:14:54 +01:00
Alex
d695c74e39
Fixes inconsistency for Kings rock. (#6302) 2025-02-19 21:50:03 +01:00
PhallenTree
5340dc8687
Fixes non-Ghost type Curse animation (#6299) 2025-02-19 18:09:06 +01:00