Hedara
4dba49657a
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
data/battle_anim_scripts.s
src/battle_anim_water.c
src/event_object_movement.c
src/field_player_avatar.c
2026-02-26 15:33:26 +01:00
Frank DeBlasio
064ca5c243
Added macro for Surf/Muddy Water's animation ( #2232 )
2026-02-06 10:08:20 -05:00
Hedara
e758d55a03
Merge remote-tracking branch 'pret/master' into pret-merge
...
Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor
Conflicts:
asm/macros/battle_anim_script.inc
data/battle_anim_scripts.s
include/constants/battle_anim.h
src/battle_anim_bug.c
src/battle_anim_dragon.c
src/battle_anim_effects_1.c
src/battle_anim_normal.c
2026-01-31 19:20:54 +01:00
Eduardo Quezada
89da62b02d
Remove trailing whitespace - Master ( #9011 )
2026-01-25 10:12:41 +01:00
hedara90
f9c826ca57
Merge pull request #2228 from hedara90/fix-spaces
...
Fix spaces instead of tabs in battle_anim_scripts.s
2026-01-20 11:13:48 +00:00
Martin Griffin
22eed3f4bf
Partially document battle_anim_effects_1.c
2026-01-19 09:16:37 +00:00
Martin Griffin
0e415dde46
Document battle_anim_dragon.c
2026-01-19 09:16:37 +00:00
Martin Griffin
5d713ad9bb
Document battle_anim_dark.c
2026-01-19 09:16:37 +00:00
Martin Griffin
050a9415c7
Document battle_anim_bug.c
2026-01-19 09:16:37 +00:00
Martin Griffin
e09423fadf
Document battle_anim_normal.c
2026-01-19 09:16:37 +00:00
Bassoonian
eba17e6860
Remove credits from code ( #8748 )
2026-01-03 18:21:13 +01:00
FosterProgramming
142a5ef08c
Fix illusion not breaking properly when behind substitute ( #8423 )
...
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-04 00:35:38 +01:00
AlexOn1ine
aa20b2bc0f
master to upcoming merge
2025-11-22 10:39:52 +01:00
hedara90
cd6d293ad1
Fix some move animations leaking VRAM and freeing already freed tags ( #7977 )
...
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Hedara <hedara90@gmail.com>
2025-11-20 14:19:48 +01:00
AlexOn1ine
6a28506ee2
19/11/25 Master to upcoming merge
2025-11-19 18:20:30 +01:00
FosterProgramming
4a69268bd5
Make rainbow effect anim change based on side ( #8269 )
2025-11-18 23:31:47 +01:00
FosterProgramming
3f74d30a54
Make tailwind anim mirror based on side ( #8249 )
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2025-11-14 18:25:27 +01:00
AlexOn1ine
93cc143134
conflicts
2025-11-11 13:12:00 +01:00
FosterProgramming
3e583f8add
Fix tera tint not applying on activation ( #8135 )
2025-11-09 18:10:44 +01:00
AlexOn1ine
e365add4cf
15/10/25 Master to upcoming merge
2025-10-15 21:31:00 +02:00
hedara90
3939c19bb7
Add missing end signal for AnimTask_SetAttackerInvisibleWaitForSignal ( #7950 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-10-14 18:15:08 +02:00
ghoulslash
5b84cd14bc
Fix Battle Anim monbg calls Part 1 ( #7906 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-10-11 20:41:13 +02:00
DizzyEggg
d646b975ae
Fix SmartStrike crashing the game in double battles ( #7902 )
2025-10-09 18:41:32 +02:00
RavePossum
f5e3464e83
Fix Brine move anim and document Water Spout anim ( #7865 )
2025-10-07 22:50:16 +02:00
FosterProgramming
db7e062fe1
Add some missing move animations to the move animation tests ( #7507 )
2025-09-21 23:27:05 +02:00
grintoul
a2e1835993
Separates FRB and FRZ animations ( #7611 )
2025-08-28 19:07:08 +02:00
AlexOn1ine
ce52d83343
25/08/25 Master merge
2025-08-25 17:30:38 +02:00
RavePossum
0a3c281cdd
Fix terastallization anims flickering ( #7613 )
2025-08-25 11:48:52 +02:00
Frank DeBlasio
c9ec896312
Refactor battle environment ( #4891 )
2025-07-12 12:38:06 -04:00
Linathan
9228826ae1
New and polished battle animations ( #7074 )
2025-07-11 19:14:19 +02:00
Eduardo Quezada
7a0cbc12d2
Added CRY_MODE_DYNAMAX ( #6933 )
2025-06-30 09:45:09 -07:00
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
