Alex
|
6fe5f6530a
|
General MoveEnd clean up and Fell Stinger adjustments (#6674)
|
2025-05-07 00:30:43 +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 |
|
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 |
|
Hedara
|
0eeba00d1b
|
Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
|
2025-04-30 15:22:37 +02:00 |
|
Hedara
|
4873589c65
|
Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
|
2025-04-29 20:27:33 +02:00 |
|
hedara90
|
5dfbdf56da
|
27/04/25 Master to upcoming merge (#6701)
|
2025-04-27 18:01:50 +02:00 |
|
Bivurnum
|
47723c34e5
|
Follower NPCs (follow-me) (#6500)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-27 14:56:18 +02:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +02:00 |
|
Ruby
|
aba34015db
|
Time menu for RTC in debug menu. (#6634)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-23 19:34:37 +02:00 |
|
PhallenTree
|
91fc406b0a
|
Fixes Mirror Armor stat drops not being stopped by Substitute (#6675)
|
2025-04-22 19:54:04 +02:00 |
|
Alex
|
dfb1cd2ec0
|
Refactor hit escape moves to use moveend (#6671)
|
2025-04-21 22:52:55 +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 |
|
Alex
|
c4edfd2988
|
Fix gBattlerTarget OOB for Gravity and Perish Song (#6662)
|
2025-04-21 13:53:04 +02:00 |
|
cawtds
|
0069ec1f0c
|
Fix captivate-oblivious interaction and related test (#6653)
|
2025-04-21 11:01:01 +02:00 |
|
Alex
|
86969f9919
|
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:49:52 +02:00 |
|
hedara90
|
17b992bec5
|
Fixes some moves trying to load too much VRAM (#6633)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-18 17:16:46 -04:00 |
|
Alex
|
6b09480912
|
Fixes some restore issues (#6629)
|
2025-04-18 16:57:04 -04:00 |
|
hedara90
|
4528bbe01d
|
Fix VRAM load for Black Hole Eclipse (#6635)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-17 15:42:25 +02:00 |
|
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 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
|
2025-04-13 19:32:06 -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 |
|