Commit Graph

125 Commits

Author SHA1 Message Date
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
Evan
b130396c0e merge with be 2021-03-01 17:05:10 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
Evan
0483114a05 merge and some fixes 2021-02-02 11:45:15 -07:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
LOuroboros
c2f718d3d3 Implemented Cramorant's Gulp Missile form change 2021-01-14 17:23:09 -03:00
Evan
d26605c9fe fix bad bg fade if no permanent terrain 2021-01-13 16:01:47 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
GriffinR
92de664f79 List battle animation indexes alongside tables 2021-01-11 16:07:16 -05:00
Evan
f172245ad6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem 2021-01-01 08:49:43 -07:00
Evan
0c648c0071 merge with be 2021-01-01 08:34:09 -07:00
Evan
e70e2bcd65 merge with be 2020-12-14 09:09:51 -07:00
Evan
ead8637e4f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation 2020-12-13 17:09:04 -07:00
Evan
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
Evan
752aca7698 finish z move anims 2020-11-29 09:22:31 -05:00
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -05:00
Evan
6c0878b5fe infestation between turn anim 2020-11-24 17:21:59 -05:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -07:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
GriffinR
afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
ghoulslash
8f669bb57d
Add critical capture (#402)
* add critical capture

* synax and format fixes
2020-07-14 17:47:15 +02:00
Evan
fdc6e80e1e fix anim defines 2020-05-28 12:19:07 -06:00
Evan
6c20a49dc6 animations for all moves 2020-05-25 00:37:32 -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
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
GriffinR
51cd0ac081 Rename battle anim type files, remove unneeded ARG_RET_IDs 2020-02-25 12:54:08 -06:00
GriffinR
e633b57593 Document remaining status/general/special anims 2020-02-25 12:54:08 -06:00
GriffinR
501d0d3c18 Document move anims C-H 2020-02-25 12:54:08 -06:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
Sewef
07b79c3fc3 battle_anim_effects_3 (5) 2019-11-24 18:00:51 +01:00
Sewef
1dfe34dee3 TriForce → TriAttack 2019-11-23 15:51:08 +01:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +02: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
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
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
b85a74afc5 Give names to battle anim backgrounds 2019-04-06 12:44:27 -05:00
DizzyEggg
19f151417e Rename sprite sheet to sprite gfx 2019-04-06 10:14:48 -05:00
DizzyEggg
b93581b519 Rename battle anim sprites 2019-04-06 10:14:48 -05:00
DizzyEggg
311c1b9cba Change anim tag names 2019-04-06 10:14:48 -05:00
DizzyEggg
5c44f44ad2 Organize new battle anim gfx 2019-04-02 12:26:24 +02:00
DizzyEggg
3d616dfffe Add Surge Abilities 2019-02-09 14:30:16 +01:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01: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
DizzyEggg
65036b9a09 Merge with master 2018-11-15 21:53:32 +01:00
garak
c6833c903c remove extra macro and shorten names 2018-11-13 16:19:52 -05:00
garak
269aebaca7 update createsprite macro and rename BANK to BATTLER 2018-11-13 15:35:46 -05:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
garak
3cb7a33f42 label back animations 2018-10-30 12:37:53 -04:00
garak
6cf39e8a6e clean up sprite tags 2018-10-22 10:51:40 -04:00
garak
d267fcbfb1 name remaining tags 2018-10-22 10:36:43 -04:00
garak
f2363f5982 more tag names 2018-10-21 19:30:27 -04:00
garak
7a9c7e5f06
Merge branch 'master' into sprite-tags 2018-10-21 15:12:18 -04:00
garak
2bb286ab4e begin ANIM_TAG port 2018-10-21 15:07:10 -04:00
garak
38fcc46abb Merge remote-tracking branch 'upstream/master' into pan-constants 2018-10-19 16:05:14 -04:00
garak
901f3ff557 use sound panning constants in battle_anim_scripts 2018-10-19 15:57:19 -04:00
DizzyEggg
7925000a54 merge with master 2018-10-06 16:05:58 +02:00
DizzyEggg
17c5b4089a Label most of the anim tags 2018-10-06 09:37:52 +02:00
Tetrable
61ab631dec
Fixed a small error 2018-10-05 23:02:04 +01:00
Tetrable
e80a53060b Start anim tags 2018-10-05 23:00:07 +01:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
DizzyEggg
8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
DizzyEggg
10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
DizzyEggg
5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
DizzyEggg
4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00