Commit Graph

48 Commits

Author SHA1 Message Date
Eduardo Quezada
965e2c3394 Newline fix 2023-01-01 10:31:09 -03:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08: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
Blackforest92
7e9d243677 Tidying graphics/battle_anims 2022-09-04 23:24:37 +07:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
hamish
307d5d93c4 add potlergeist animation 2022-05-23 08:53:08 -04:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
SonikkuA-DatH
9d14cb3309
Add files via upload
Teapot sprited by me. Based on this: https://cdn.discordapp.com/attachments/425852970689626123/914062336476708874/unknown.png
2021-11-28 19:59:38 -08:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
Blackforest92
799852ea77 Introduce alternate Steel Beam 2021-10-30 17:00:55 +07:00
GriffinR
41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
GriffinR
e0c0143f41 Fix substitute back sprite 2021-01-04 10:14:01 -05:00
Evan
638d585fc0 update apple sprites 2020-05-26 10:16:24 -06:00
Evan
181bfbf5fd cfru particles and bgs 2020-05-22 10:10:10 -06:00
Evan
c18b5966bf undo some revert(?) 2020-05-03 22:09:03 -06:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
Sewef
1dfe34dee3 TriForce → TriAttack 2019-11-23 15:51:08 +01:00
Xhyzi
d66b9022a6 Added 46 move animations
- Magnet Bomb.
- Mirror Shot.
- Aqua Ring.
- Aqua Tail.
- Aqua Jet.
- Attack Order.
- Defend Order.
- Heal Order.
- Dragon Rush.
- Dragon Pulse.
- Discharge.
- Magnet Rise.
- Charge Beam.
- Shadow Claw.
- Shadow Force.
- Ominous Wind.
- Lava Plume.
- Magma Storm.
- Avalanche.
- Vacuum Wave.
- Force Palm.
- Lucky Chant.
- Double Hit.
- Giga Impact.
- Captivate.
- Rock Climb.
- Last Resort.
- Grass Knot.
- Wood Hammer.
- Zen Headbutt.
- Lunar Dance.
- Trick Room.
- Psycho Cut.
- Power Gem.
- Stone Edge.
- Rock Wrecker.
- Head Smash.
- Sealth Rock.
- Punishment.
- Sucker Punch.
- Nasty Plot.
- Switcheroo.
- Earth Power.
- Gunk Shot.
- Defog.

Fix Pyscho Shift

Hollow Orb graphics were not being loaded before creating the sprite

Fix Gastro Acid anim

Fix gastro acid palette asignation.

.
2019-07-13 01:02:09 +02:00
Karathan
bcffc2655e fix style issues 2019-07-06 05:25:56 +02:00
Karathan
d9b54c3c1c add power swap, guard swap, worry seed 2019-07-06 05:22:18 +02:00
Karathan
e9884154a9 added acupressure and wring out 2019-07-03 03:45:11 +02:00
Karathan
f1c82abc7e fix change requests 2019-07-02 18:34:53 +02:00
Karathan
501ae27390 add trump card, fix a few issues with pluck 2019-07-02 18:26:59 +02:00
Karathan
5f7b5ba453 add feint and pluck animation sprites and implementations 2019-07-02 06:22:05 +02:00
DizzyEggg
900c15c20c Mega evo animation 2019-05-03 17:27:49 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
DizzyEggg
59797e4801 Use constants in battle_anim_special.c 2019-04-14 10:19:50 -05:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
DizzyEggg
b93581b519 Rename battle anim sprites 2019-04-06 10:14:48 -05:00
DizzyEggg
5c44f44ad2 Organize new battle anim gfx 2019-04-02 12:26:24 +02:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Marcus Huderle
ecda59a406 Add Poison Jab animation 2018-12-20 11:58:21 -06:00
Marcus Huderle
0369780db9 Add Rock Polish animation 2018-12-20 10:18:17 -06:00
camthesaxman
89e6170748 remove some redundant .pal files 2018-02-06 11:46:34 -06:00
Devin
c408110319 Fix file permissions. 2018-01-19 15:06:49 -05:00
ProjectRevoTPP
addfdfbcba eighth wave of graphics.s dumps 2017-12-24 02:54:08 -05:00
ProjectRevoTPP
d0659a3ec6 seventh wave of graphics.s dumps 2017-12-24 01:00:53 -05:00
ProjectRevoTPP
e56f04ae2e sixth wave of graphics.s dumps 2017-12-24 00:08:28 -05:00
ProjectRevoTPP
ac74d6f100 fifth wave of graphics.s dumps 2017-12-23 22:06:01 -05:00
ProjectRevoTPP
4ad2c5c941 fourth wave of graphics.s dumps 2017-12-23 18:30:48 -05:00
ProjectRevoTPP
d137b7f0a8 third wave of graphics.s dumps (battle_anim part 2) 2017-12-23 15:50:58 -05:00
ProjectRevoTPP
3499ff51b5 second wave of graphics.s dumps (battle_anim part 1) 2017-12-23 01:45:04 -05:00
ProjectRevoTPP
d10c645353 first wave of graphics.s dump 2017-12-22 19:18:09 -05:00