AlexOn1ine
aabb632894
Master to upcoming merge, 20/06/25
2025-06-20 17:09:58 +02:00
ghoulslash
a154d7a7a4
Fix savage spin out spider web template ( #7137 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-06-18 11:04:24 +02:00
Eduardo Quezada
3decd3da0a
Animation documentation ( #7052 )
2025-06-04 11:19:57 +02:00
Eduardo Quezada
3565c7a8a6
Documented usage of delay X ( #6951 )
2025-06-01 17:11:42 +02:00
ShinyVolcarona
7f4f391e9b
New Attack Animations: 25w20a ( #6886 )
2025-05-31 11:34:24 +02:00
Eduardo Quezada
c50ebf17d0
Documented usage of createsprite gSlideMonToOffsetSpriteTemplate ( #6953 )
2025-05-23 14:41:25 +02:00
Eduardo Quezada
10b5c3f4da
Documented usage of createsprite gSparkElectricitySpriteTemplate ( #6955 )
2025-05-23 14:35:55 +02:00
Eduardo Quezada
35a7caa682
Documented usage of createsprite gBasicHitSplatSpriteTemplate ( #6950 )
2025-05-22 09:33:55 +02:00
Eduardo Quezada
d42d9012e4
Documented usage of createsprite gDirtPlumeSpriteTemplate ( #6954 )
2025-05-22 09:27:30 +02:00
Eduardo Quezada
b85a56b718
Documented usage of createsprite gSimplePaletteBlendSpriteTemplate ( #6956 )
2025-05-22 09:21:43 +02:00
Jonathan Lin
c133da2437
Fix to warnings pertaining to Mega Evolution and Ultra Burst RGB values ( #6883 )
2025-05-16 21:26:28 +02:00
Jonathan Lin
b5fbced691
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct ( #6834 )
2025-05-15 09:40:02 +02: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
AlexOn1ine
e2e012c3a9
conflicts
2025-04-21 15:50:57 +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
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
hedara90
40c5ad5043
Fix Magma Storm getting stuck ( #6605 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-14 17:07:59 +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
SundayMoonday
bbe8bbc45b
Replaced Blue Sky background for Rock Field ( #6516 )
2025-04-07 11:04:21 +02: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
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
Eduardo Quezada
3507862164
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-12 09:30:59 -03:00
PhallenTree
cf5b95cee8
Fixes Expanding Force and Spectral Thief move animations ( #6185 )
2025-02-09 22:34:48 +01:00
hedara90
cad1a37566
Tachyon Cutter and Salt Cure animations ( #6182 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-05 15:27:21 +01:00
hedara90
e1e3bcfa91
Tera starstorm ( #6073 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-26 11:08:46 +01:00
Eduardo Quezada
ce40c3356c
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-12 08:42:57 -03:00
hedara90
9c7c94d474
Fixed a bunch of move anims ( #5936 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-12 10:01:44 +01:00
Eduardo Quezada
004efd1e5a
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-31 18:38:03 -03:00
Alex
7e0c1f9323
New U-turn animation to fix visibility ( #5910 )
2024-12-31 00:36:07 +01:00
Alex
3f3f4cfe1c
New Volt Switch Animation ( #5729 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-07 15:52:13 +01:00
Eduardo Quezada
1a581c407c
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-01 08:11:32 -03:00
Alex
acdd447160
Changes Max Phantasm move anim script call ( #5737 )
2024-11-30 19:19:08 -05:00
Hedara
f6fdca615f
Merge branch 'master' into master-to-upcoming
2024-11-29 11:32:12 +01:00
Alex
c4fe97011e
Fix Floral Healing anim ( #5733 )
2024-11-28 22:51:34 +01:00
Sadfish the Sad
64887ee876
dark void, clangorous soulblaze, vortex animation fixes ( #5650 )
2024-11-25 19:57:22 +01:00
Eduardo Quezada
afa7ab9b2e
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-24 07:47:52 -03:00
ghoulslash
6de4222c22
Fix AnimTask_HorizontalShake uses for shaking screen in battle anims ( #5562 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-22 16:24:48 +02:00
Eduardo Quezada
3205f377d5
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-21 08:18:44 -03:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation ( #5490 )
...
* revival blessing fixes, add anim
* fix lunar blessing anim
* Added support for Revival Blessing in tests
* Added test to confirm absent flag fix
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-19 11:34:58 -03:00
kittenchilly
130d6042e0
Add Ion Deluge animation ( #5467 )
2024-10-10 22:37:57 +02:00
SonikkuA-DatH
708f64247f
Heart Swap Move Animation ( #5460 )
2024-10-09 10:43:04 +02:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
kleenxfeu
16e8be1233
Mega evolution animation is a little smoother ( #4816 )
...
* Smoother primal/mega animation
* Just to make the CI run. It needs to run
* Update src/battle_anim_effects_3.c
---------
Co-authored-by: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-21 23:47:19 +02:00
Sadfish the Sad
f6319d8446
new animations for many moves more details in description ( #5367 )
...
New: Me First, Zippy Zap, Splishy Splash, Floaty Fall, Pika Papow, Bouncy Bubble, Buzzy Buzz, Sizzly Slide, Glitzy Glow, Baddy Bad, Sappy Seed, Freezy Frost, Sparkly Swirl, Veevee Volley, Snap Trap, Astral Barrage, Burning Bulwark
Updated: Aura Sphere, Dark Void, Spirit Shackle
Fixed: Springtide Storm, Bleakwind Storm, Wildbolt Storm, Sandsear Storm, Clangorous Soul(Blaze)
2024-09-15 08:22:40 +02:00
SonikkuA-DatH
8c3531ffc7
Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak ( #5325 )
2024-09-07 18:04:47 +02:00
cawtds
6e3ce9db2f
Move battle anim arrays to C ( #5306 )
...
* move battle anim arrays to c
* use ARRAY_COUNT instead
* remove B_ANIM_STATUS_WRAPPED
* move anim rename
* rename battle anims status/general/special
2024-09-04 11:21:40 +02:00
kittenchilly
8d47db6160
Add Population Bomb animation ( #5194 )
...
* Population Bomb animation
* Update battle_anim_new.c
* Update battle_anim_new.c
2024-08-25 23:39:25 +02:00
