Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
GriffinR
ceaff148f7
Shift to multiply
2022-06-09 10:52:19 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
GriffinR
a8437493c1
Document generic argument names in battle anim palettes
2022-06-01 12:25:01 -04:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -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
GriffinR
e3b6337c3a
Finish battle_anim_mons doc
2021-11-08 14:29:37 -05:00
GriffinR
ae2602b5a5
Add missing BATTLER_COORD usage
2021-11-08 11:54:29 -05:00
GriffinR
d20341646a
Start battle_anim_mons doc
2021-11-08 11:46:13 -05:00
Eduardo Quezada D'Ottone
f3013d8ee9
Standarized Solarbeam into Solar Beam
2021-11-01 18:36:35 -03:00
Blackforest92
799852ea77
Introduce alternate Steel Beam
2021-10-30 17:00:55 +07:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
56057d3c32
Label more unused battle anims
2021-04-13 02:50:37 -04:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
Marcus Huderle
a85fada314
Document more battle anim effects
2021-02-28 09:54:55 -06:00
GriffinR
3fd5e143a9
Misc battle anim documentation
2021-01-23 00:40:46 -05:00
Evan
99d9a36860
add totem boosts
2020-11-19 10:35:37 -07:00
ultima-soul
99fdc13e61
Merge branch 'master' into battle_engine_sync
2020-11-07 15:59:20 -08:00
aaaaaa123456789
7dc95a0103
Undo PokeCodec's PRs
...
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104 , #1108 , #1115 , #1118 , #1119 , #1124 , #1126 , #1127 , #1132 , #1136 ,
#1137 , #1139 , #1140 , #1144 , #1148 , #1149 , #1150 , #1153 , #1155 , #1177 , #1179 ,
#1180 , #1181 , #1182 and #1183 .
2020-09-13 06:30:55 -03:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
DizzyEggg
11178a49db
Fix undefined behaviour in protect animation
...
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]
The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
2020-07-27 13:17:18 -04:00
PokeCodec
ddd012f3ed
holding back on casts
2020-07-27 12:47:08 -04:00
DizzyEggg
0066640a1e
Merge with master
2020-07-27 14:51:39 +02:00
DizzyEggg
f007165c53
Fix undefined behaviour in protect animation
...
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]
The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
2020-07-27 12:27:35 +02:00
PokeCodec
c5aa91741b
Change signedness and add casts to avoid implicit conversion warnings
2020-07-24 22:18:57 -04: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
Philipp AUER
f1f4000914
anim: add some animation moves ( #383 )
...
- fell stinger
- draining kiss
- kings shield (==protect)
- scald
- fire pledge
- water pledge
- grass pledge
Co-authored-by: SBird <sbird@no.tld>
2020-05-24 18:14:59 +02:00
ghoulslash
13cf2cb217
Animation Particles, BGs, and gen 4 anims ( #384 )
...
* undo some revert(?)
* cfru particles and bgs
* remove commented out particles
2020-05-24 18:13:40 +02: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
68dc68907b
Label move anim data
2020-02-25 12:54:08 -06:00
GriffinR
efd53d080c
Clean up battle anim C for doc
2020-02-25 12:54:08 -06:00
GriffinR
afa1ae2209
Finish documenting move anim scripts
2020-02-25 12:54:08 -06:00
GriffinR
0d651c7c9e
Some battle anim review changes
2020-02-25 12:54:08 -06:00
GriffinR
1ba12dc050
Document move anims I-S
2020-02-25 12:54:08 -06:00
DizzyEggg
ac499bc896
Merge with master
2019-12-09 08:16:18 +01:00
GriffinR
2756771958
More usage of ST_OAM constants and SPRITE macros
2019-12-06 19:05:44 -06:00
DizzyEggg
1d8cc9b741
Fix merge conflicts
2019-11-03 19:55:19 +01:00
Sewef
e9675bdd24
battle_anims_effects_2
2019-10-20 12:29:08 -05:00
DizzyEggg
e736c369d6
Merge with master
2019-10-19 17:47:55 +02:00
Sewef
ed1f5a7455
Conflits 3/2
...
Nice one, git
2019-10-16 19:32:02 +02:00
Sewef
c280d0e00e
Another fix, Conflicts 2/2
2019-10-16 19:26:08 +02:00
Sewef
e7d36a76e1
Forgotten fix, conflits 1/2
2019-10-16 19:21:58 +02:00
Sewef
9dcfc5ba73
Fix labels
2019-10-16 19:10:39 +02:00
Sewef
8dacb53029
Update battle_anim_effects_1.c
2019-10-14 23:31:29 +02:00
