Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
Alex
|
d00563d830
|
Changed White Herb hold effect name (#6815)
|
2025-05-11 11:34:47 +02:00 |
|
PhallenTree
|
48c08c0368
|
Illusion struct cleanup and many Illusion fixes (#6798)
|
2025-05-09 20:41:20 +02:00 |
|
hedara90
|
b6b6e91959
|
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-07 16:50:12 +02:00 |
|
Alex
|
7c4fb512a1
|
Fixes Symbiosis not triggering when a weakness berry was consumed (#6782)
|
2025-05-07 11:04:11 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02:00 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +02:00 |
|
Eduardo Quezada
|
d2a4b5ef84
|
Changed Tackle for Scratch in tests (#6730)
|
2025-04-30 17:18:52 -04:00 |
|
Alex
|
4ff2f3de42
|
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-30 11:34:19 -04:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +02:00 |
|
Bassoonian
|
d53c616e06
|
Adds a whole bunch of new tests (#6685)
|
2025-04-24 20:13:03 +02:00 |
|
hedara90
|
5cd7bd77b3
|
Fix various Toxic Spikes interactions (#6690)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-24 17:06:47 +02:00 |
|
PhallenTree
|
34e91dd96f
|
Fixes Unburden doubling speed when affected by Neutralizing Gas (#6691)
|
2025-04-24 15:26:23 +02:00 |
|
Alex
|
71cfab6477
|
Fixes Magician Life Orb interaction (#6676)
|
2025-04-22 21:01:00 +02:00 |
|
PhallenTree
|
91fc406b0a
|
Fixes Mirror Armor stat drops not being stopped by Substitute (#6675)
|
2025-04-22 19:54:04 +02:00 |
|
PhallenTree
|
007d7e712e
|
Fixes Neutralizing Gas activating again after switch-in (#6667)
|
2025-04-21 19:14:53 +02:00 |
|
Alex
|
d220459a01
|
Fixes Intimidate / Eject Pack interaction (#6645)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-21 17:33:29 +02:00 |
|
AlexOn1ine
|
e2e012c3a9
|
conflicts
|
2025-04-21 15:50:57 +02:00 |
|
cawtds
|
0069ec1f0c
|
Fix captivate-oblivious interaction and related test (#6653)
|
2025-04-21 11:01:01 +02:00 |
|
Alex
|
fedbce510b
|
Fixes commander activation on a fainted mon (#6632)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:49:18 +02:00 |
|
Eduardo Quezada
|
c650199909
|
Added missing gMovesInfo encapsulation (#6656)
|
2025-04-20 22:36:27 +02:00 |
|
Alex
|
37f72bb237
|
Fix Mirror Armor and Obstruct interaction (#6630)a
|
2025-04-18 16:21:57 -04:00 |
|
hedara90
|
031fd4d363
|
Fixed Color Change test referring to the wrong mon (#6644)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-18 16:06:22 -04:00 |
|
AlexOn1ine
|
2d1b2f28c4
|
Fixes Gulp Missile freezing the game if when attacker fainted
|
2025-04-17 19:46:16 +02:00 |
|
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 |
|