Alex
|
c99b34fd89
|
Fix Magnet Rise animation (#3280)
|
2023-09-05 08:08:51 -03:00 |
|
ghoulslash
|
a929ae8b48
|
Replace launchtemplate and launchtask in battle anims (#2640)
* replace launchtemplate with createsprite using fix_launchtemplate.py
* tidy up script
* fix comment handing in fix_launchtemplate.py
* fix double comma after sprite template
* remove py script
* convert launchtask -> createvisualtask
* fix launchtask->createvisualtask issue
* fix ANIM_PAL ORs
* remove launchtemplate, launchtask macros
* fix pal macros in z moves
* fix bloom doom
* add F_PAL_ALL_BUT_DEF
* remove all ANIM_PAL_ usages
* devestating drake fix
* convert launchsoundtask and setblends
* Reworked CFRU macro PR
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
|
2023-05-27 17:32:53 -04:00 |
|
CallmeEchoo
|
c5a73f59a4
|
ad suggested changes
|
2023-05-02 21:17:14 +02:00 |
|
CallmeEchoo
|
76721b16f8
|
add snow weather
|
2023-05-02 16:25:26 +02:00 |
|
Ultimate_Bob
|
32e63d8cc7
|
Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-04-30 21:15:03 -04:00 |
|
ghoulslash
|
868838a87d
|
Add thunder cage case to trap anim IDs (#2941)
|
2023-04-24 14:35:42 -04:00 |
|
LOuroboros
|
f4e8389779
|
Added Psyblade and Hydro Steam
|
2023-03-17 09:25:39 -03:00 |
|
DizzyEggg
|
306c4565a0
|
merge
|
2023-03-06 15:32:28 +01:00 |
|
Eduardo Quezada
|
41bf9ea63c
|
Removed trailing whitespaces
|
2023-02-26 18:43:15 -03:00 |
|
DizzyEggg
|
8ccffa617a
|
fix createspriteontargets on electricy anim
|
2023-02-26 19:47:44 +01:00 |
|
DizzyEggg
|
4bdca43dbd
|
refactor mega evolution indicator sprite
|
2023-02-26 12:51:35 +01:00 |
|
DizzyEggg
|
e0b76e98ff
|
Add MOVE_SHELL_TRAP Effect (#2716)
* implemented Shell Trap
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
|
2023-02-22 13:55:34 +00:00 |
|
ghoulslash
|
4b64433816
|
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649)
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims
* add missing semicolon
* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting
* remove duplicate func
* improve origin pulse anim
* fix IsDoubleBattle call
* venom drench acid uses average battler positions
* add GetSubpriorityForMoveAnim
* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-02-19 11:48:12 +01:00 |
|
DizzyEggg
|
5d958e245a
|
Merge pull request #2669 from Jaizu/giga_impact_contests
Fix Giga Impact on contests.
|
2023-02-13 09:22:24 +01:00 |
|
DizzyEggg
|
513ecd50ba
|
Fix Spacial Rend animation
|
2023-02-09 13:24:23 +01:00 |
|
Jaizu
|
9f7267e48d
|
Fix Giga Impact on contests.
|
2023-02-09 11:29:29 +01:00 |
|
DizzyEggg
|
dcb63e1518
|
Merge pull request #2610 from ghoulslash/be/animsilktrap
Silk trap Animation
|
2023-02-07 16:13:53 +01:00 |
|
ghoulslash
|
a775f6f31a
|
Merge pull request #2642 from AlexOn1ine/strange_steam_v2
Fix Strange Steam anim
|
2023-02-07 09:25:04 -05:00 |
|
ghoulslash
|
0c4c3fbbb7
|
Fix Poison Gas Anim for MOVE_TARGET_BOTH (#2608)
* poison gas anim handles MOVE_TARGET_BOTH
* fix sprite position fields
* fix it again
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-02-07 12:14:36 +01:00 |
|
Alex
|
2f412b206a
|
Fix Strange Steam anim
|
2023-02-07 00:40:37 +01:00 |
|
ghoulslash
|
3f616215ea
|
add silk trap anim
|
2023-01-28 09:03:18 -05:00 |
|
Eduardo Quezada
|
749225ace1
|
Matching merge from upstream pret
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
|
2023-01-20 12:31:54 -03:00 |
|
GriffinR
|
b7d92e8537
|
Revert incorrect constant usage, add new correct ones
|
2023-01-18 12:11:09 -05:00 |
|
GriffinR
|
5a906c33ac
|
Merge branch 'master' into sync_battle_anim_args
|
2023-01-18 11:47:33 -05:00 |
|
ghoulslash
|
a425de77a6
|
Merge pull request #2446 from LOuroboros/primal
Updated AnimTask_PrimalReversion
|
2023-01-04 09:16:28 -05:00 |
|
SonikkuA-DatH
|
f0aee1f8d3
|
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2
|
2022-12-18 17:50:39 -08:00 |
|
ghoulslash
|
e3e0d60222
|
Merge pull request #2467 from Bassoonian/gen9moves
Generation IX Moves
|
2022-12-11 14:47:47 -05:00 |
|
Bassoonian
|
f7d1a12d2d
|
Data entry for gen9 moves
|
2022-11-18 12:15:44 +01:00 |
|
Eduardo Quezada
|
011ec16f1e
|
Organized conffig files into their own folder and cleaned up
|
2022-11-14 11:03:49 -03:00 |
|
LOuroboros
|
999a53028a
|
Updated AnimTask_PrimalReversion
|
2022-11-08 09:38:27 -03:00 |
|
ghoulslash
|
a585d56053
|
fix whitespace
|
2022-10-16 23:39:12 -04:00 |
|
ghoulslash
|
71023512fd
|
update psycho cut anim
|
2022-10-16 19:20:24 -04:00 |
|
LOuroboros
|
c64593cb9c
|
Fixed LTBTS's animation
|
2022-09-24 09:04:15 -03:00 |
|
Eduardo Quezada
|
6b79c7772c
|
Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909
# Conflicts:
# src/battle_interface.c
|
2022-09-16 11:56:50 -03:00 |
|
Eduardo Quezada
|
de32940fdf
|
Further removed trailing whitespaces
|
2022-09-13 16:26:36 -03:00 |
|
Blackforest92
|
431cb6fa7c
|
Tidying graphics - Trio Weather
|
2022-09-09 21:57:40 +07:00 |
|
Blackforest92
|
3acb32acb8
|
Tyding graphics - Acupressure
|
2022-09-09 00:25:43 +07:00 |
|
Eduardo Quezada D'Ottone
|
47a50b3dac
|
Merge branch 'master' into weather_forms_fixes
|
2022-09-07 23:07:25 -04:00 |
|
Eduardo Quezada
|
e253a87bc5
|
Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once.
|
2022-09-05 14:49:14 -04:00 |
|
Eduardo Quezada
|
7c7da8e176
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs
# Conflicts:
# src/battle_script_commands.c
|
2022-09-05 14:43:04 -04:00 |
|
LOuroboros
|
c167e2c6cc
|
Added Legends: Arceus' move data
|
2022-08-30 19:32:44 -03:00 |
|
Eduardo Quezada
|
69f4c226f0
|
Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs
# Conflicts:
# src/battle_ai_main.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_script_commands.c
# src/pokemon.c
# src/pokemon_summary_screen.c
|
2022-08-27 02:42:22 -04:00 |
|
Eduardo Quezada
|
7c86bd5d08
|
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
# Conflicts:
# include/battle_interface.h
# src/battle_anim_effects_1.c
# src/battle_script_commands.c
# src/field_specials.c
|
2022-08-26 22:23:37 -04:00 |
|
LOuroboros
|
410045028a
|
Optimized General_AffectionHangedOn
|
2022-08-25 20:01:14 -03:00 |
|
LOuroboros
|
2cf2c00b29
|
Updated friendship labels
|
2022-08-25 17:10:11 -03:00 |
|
LOuroboros
|
7539051942
|
Further tweaked the affection animation
|
2022-08-25 17:05:57 -03:00 |
|
LOuroboros
|
5dd143f19d
|
Applied Blackforest's changes to General_AffectionHangedOn
|
2022-08-25 13:07:52 -03:00 |
|
LOuroboros
|
1fc63c3431
|
More review corrections
|
2022-08-25 11:52:21 -03:00 |
|
Eduardo Quezada
|
1f5adf93c7
|
Cleaned up use of configs be almost exclusively preproc functions
|
2022-08-23 21:00:08 -04:00 |
|
GriffinR
|
c2d5dd2a1f
|
Additional battle anim sync
|
2022-08-19 11:51:13 -04:00 |
|