AlexOn1ine
0fc3ef056a
27/02/26 Master to upcoming merge
2026-02-27 23:53:24 +01:00
Alex
893563a2d5
Pret merge, 26th of February ( #9362 )
...
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com>
Co-authored-by: Kildemal <206095739+izrofid@users.noreply.github.com>
Co-authored-by: Marky <143505183+HashtagMarky@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2026-02-26 20:25:28 +01:00
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
Linathan
609faea428
Fix Power Construct Z symbol color + Add Form Change Sounds ( #9326 )
...
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
2026-02-24 19:16:47 +01:00
AlexOn1ine
675de8cbea
21/02/26 Master to upcoming merge
2026-02-21 12:55:21 +01:00
Kildemal
07fa2e2751
fix(bttl-anim): remove unused battle selector to silence warning ( #9218 )
2026-02-17 18:59:02 +01:00
Frank DeBlasio
064ca5c243
Added macro for Surf/Muddy Water's animation ( #2232 )
2026-02-06 10:08:20 -05:00
hedara90
83be28dc37
Fix migration script output from move anim documentation ( #9140 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2026-02-06 11:53:41 +01:00
Hedara
7bbabdef43
Re-apply move animation migration
2026-02-04 12:51:09 +01:00
Frank DeBlasio
dafbe66df4
Converted break_screen_animation from a macro to a function ( #9115 )
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2026-02-04 09:54:14 +01: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
278739ee66
Form Change Improvements ( #8850 )
...
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-01-29 00:35:08 +01:00
Frank DeBlasio
db3e5cc1fd
Consolidated common steps for Brick Break, Psychic Fang, and Raging Bull's animations ( #9020 )
2026-01-28 17:47:00 +01:00
cawtds
97e83ebe6a
Add FRLG ( #7423 )
2026-01-28 17:41:12 +01:00
Alex
0c44cc1b27
Move Target failure follow up ( #8986 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2026-01-28 15:48:14 +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
Frank DeBlasio
a15d9a81f9
Adding move animation backgrounds to the Pokemon Sprite Visualizer ( #8764 )
2026-01-11 22:59:14 +01:00
Frank DeBlasio
f6be01e92c
More battle environment updates ( #8809 )
2026-01-06 22:10:08 +01:00
Frank DeBlasio
faa779ea2c
Added Secret Power animations to gBattleEnvironmentInfo ( #8807 )
2026-01-05 23:03:13 +01:00
Hedara
82c474bcd0
Merge branch 'master' into master-to-upcoming
...
Conflicts:
include/config/battle.h
2026-01-04 17:31:25 +01:00
Bassoonian
eba17e6860
Remove credits from code ( #8748 )
2026-01-03 18:21:13 +01:00
hedara90
f10d722af7
Fix Aqua Ring animation ( #8707 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-12-29 21:34:06 +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
