AlexOn1ine
|
fd0766c7fa
|
17-04-25-master-merge
|
2025-04-17 14:14:37 +02:00 |
|
Alex
|
446521f200
|
Fix regression from EndTurnRefactor (#6616)
|
2025-04-15 14:06:35 +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 |
|
hedara90
|
40c5ad5043
|
Fix Magma Storm getting stuck (#6605)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-14 17:07:59 +02:00 |
|
ghoulslash
|
81ed774c00
|
EndTurnEffectOrder Refactor (#6224)
|
2025-04-14 10:57:34 -04:00 |
|
PhallenTree
|
353e4ae619
|
Fixes Dynamax reversion animation when fainting (#6597)
|
2025-04-13 17:41:00 +02:00 |
|
Hedara
|
9afd8800f3
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-12 16:33:02 +02:00 |
|
Bassoonian
|
d86aedfd32
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr
|
2025-04-12 14:59:06 +02:00 |
|
hedara90
|
a186ce1bff
|
Animation fixes from lucky adapted to expansion (#6452)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-11 13:15:13 +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
|
e419606a10
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 12:48:18 +02:00 |
|
Hedara
|
2210e2d410
|
Merge branch 'master' into upcoming-master
|
2025-04-09 11:06:38 +02:00 |
|
Hedara
|
08a2ad2c98
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 10:01:51 +02:00 |
|
psf
|
69f2f9f151
|
Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477)
|
2025-04-08 16:21:32 +02:00 |
|
SundayMoonday
|
bbe8bbc45b
|
Replaced Blue Sky background for Rock Field (#6516)
|
2025-04-07 11:04:21 +02:00 |
|
AlexOn1ine
|
b94e3298fc
|
dynamax fix
|
2025-04-06 15:25:12 +02:00 |
|
AlexOn1ine
|
e8cc3c81f8
|
conflicts
|
2025-04-06 14:59:12 +02:00 |
|
Alex
|
8dd2fee4a9
|
Fixes Will-O-Wisp not being blocked by Thermal Exchange (#6534)
|
2025-04-04 23:01:10 +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 |
|
Alex
|
edb196e851
|
Fixes Red Card against Dynamaxed mons (#6526)
|
2025-04-02 14:28:53 +02:00 |
|
PhallenTree
|
ea59e858fb
|
Fixes Hone Claws checking the wrong stats for its stat change animation and Stockpile drops being stopped by stat reduction prevention effects (#6522)
|
2025-04-01 21:03:04 +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
|
388389714b
|
Rename removelishtscreenreflect to removescreens (#6495)
|
2025-03-30 10:52:24 +02: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 |
|
AlexOn1ine
|
ae640f0714
|
25-03-25 master to upcoming merge
|
2025-03-25 21:39:58 +01:00 |
|
hedara90
|
bb73fb1971
|
Fix Jet Punch in isolated tests (#6461)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-21 21:46:03 +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
|
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 |
|
wiz1989
|
1e2aa18ffe
|
Added Dynamax/Gigantamax battle messages (#6440)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-03-17 19:16:43 +01:00 |
|
PhallenTree
|
ddab689a07
|
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435)
|
2025-03-16 23:10:20 +01:00 |
|
surskitty
|
7193909fa7
|
Configuration to make all Hail moves summon Snow or vis versa, to have only one ice weather (#6149)
|
2025-03-12 21:31:45 +01:00 |
|
Alex
|
3def0e751b
|
Fixes crash damage move against absorbing abilities (#6361)
|
2025-03-09 20:54:58 +01:00 |
|
ghoulslash
|
d44eff4e0c
|
fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly
|
2025-03-03 14:56:08 -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 |
|
hedara90
|
37abce1992
|
Made some move animations fit in VRAM (#6289)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-26 14:56:36 +01:00 |
|
Alex
|
13acf18d74
|
Fixes effect paralyze not being absorbed by absorbing abilities (#6338)
|
2025-02-25 22:28:10 +01:00 |
|
Alex
|
335233bab5
|
Update data/battle_scripts_1.s
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-02-23 22:56:46 +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 |
|
Eduardo Quezada
|
8c57172f2a
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:46:02 -03:00 |
|
Eduardo Quezada
|
fe7ed22f5b
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-20 19:44:00 -03:00 |
|
Alex
|
767ea38dbf
|
Fixes doesnt effect message for Thunder Wave (#6304)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-20 19:18:27 -03:00 |
|
Eduardo Quezada
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03:00 |
|
PhallenTree
|
f6ff64cdbe
|
Fixes Brick Break/Psychic Fangs/Raging Bull breaking screens if target is immune (#6308)
|
2025-02-20 12:55:10 -03:00 |
|