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
LOuroboros
032b7b2ab9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection
2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
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
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03: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
hamish
307d5d93c4
add potlergeist animation
2022-05-23 08:53:08 -04:00
Sneed69
d0a2be9630
weather forms fixes and config
2022-05-22 03:20:48 +03:00
PikalaxALT
ff936c15e1
Sync arg descriptions from FireRed
...
https://github.com/pret/pokefirered/pull/501
2022-04-28 13:46:23 -04:00
PikalaxALT
3f7b6ca357
Remove spurious space in battle_anim_scripts.s
2022-04-28 09:04:16 -04:00
BuffelSaft
5358cc0a00
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-04-25 13:38:13 +12:00
LOuroboros
055c72a384
Improved the special animation of Shell Side Arm
2022-04-23 04:29:15 -03:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
ghoulslash
7c2bbf1df3
fix struggle bug anim
2022-02-25 08:54:35 -05:00
GriffinR
0710a5467b
Add some missing RGB constant usage
2022-02-15 21:55:51 -05:00
BuffelSaft
9d1800f53e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-01-27 17:18:51 +13:00
ghoulslash
93a7e139ec
merge w be
2021-12-24 09:40:12 -05:00
ExpoSeed
65186b8c3a
Fix some style issues
2021-12-16 21:57:30 -06:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
ghoulslash
1e644c9d4c
fix spacing
2021-12-05 14:45:48 -05:00
ghoulslash
c0e408bfab
fix aqua ring heal anim
2021-12-05 14:44:22 -05:00
SonikkuA-DatH
adecc77fe8
Update battle_anim_scripts.s
2021-11-28 19:47:09 -08:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
BuffelSaft
fd4414fe62
Spaces instead of tabs
2021-11-23 23:01:43 +13:00
BuffelSaft
6b8f86c276
Snap Trap placeholder anims
...
Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.
2021-11-23 11:05:36 +13:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
BuffelSaft
98712e576e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-19 17:48:11 +13:00
ghoulslash
9df66f4ac1
Merge pull request #1843 from Blackforest92/battle_engine
...
Update Giga Impact's graphic and use fade-in battle animation.
2021-11-13 08:54:37 -05:00
Eduardo Quezada D'Ottone
704957efb9
Fixed Relic Song's SE
2021-11-13 07:30:12 -03:00
Blackforest92
76ba9d835a
pulled latest RHH battle_engine 08-11-2021
2021-11-08 16:38:42 +07:00
GriffinR
c4169cfd29
Disambiguate cry functions
2021-11-07 14:26:09 -05:00
GriffinR
54b254a829
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
Eduardo Quezada D'Ottone
c2a17510a9
Terrain Pulse animations
2021-11-07 11:25:08 -03:00
Eduardo Quezada D'Ottone
e9804a5023
Secret Power animation config
2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone
ae8de0f07a
Merge branch 'BattleEngine' into BE_TerrainMoves
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_util.c
2021-11-06 10:44:05 -03:00
LOuroboros
5f458c9cd3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-05 10:58:53 -03:00
BuffelSaft
bf786c6c9a
Fix Magma Storm
...
Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.
2021-11-05 18:22:52 +13:00
LOuroboros
af6e72ecfe
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-03 08:56:01 -03:00
Blackforest92
b9c23f7c62
Update waterfall, trick room, & focus blast BG
2021-11-03 16:29:09 +07:00
Blackforest92
0f5c9f5cb0
Adjust Giga Impact background to fade in before impact
2021-11-03 00:37:22 +07:00
Blackforest92
2d5ed4a1e2
Allow Giga Impact fadein background & upgrade its graphic
2021-11-02 12:53:11 +07:00
Eduardo Quezada D'Ottone
f3013d8ee9
Standarized Solarbeam into Solar Beam
2021-11-01 18:36:35 -03:00
Blackforest92
9b6cd383a4
Optimized Rock Wrecker and Hurricane
2021-11-01 01:06:39 +07:00
Blackforest92
c87e2433a7
Minor fix to Steel Beam
2021-10-31 21:41:39 +07:00
LOuroboros
0ddcb69c65
Fixed Move_SPECIAL_REND typo
2021-10-30 12:14:28 -03:00
Blackforest92
799852ea77
Introduce alternate Steel Beam
2021-10-30 17:00:55 +07:00
LOuroboros
de157919b0
Added animations for Shell Side Arm
2021-10-27 11:14:17 -03:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
ghoulslash
85ce72a4d0
add shell smash anim
2021-10-14 10:47:39 -04:00
GriffinR
f23e0beeba
Rename battle anim cmds, move its data, name remaining symbols
2021-10-11 13:18:21 -04:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
LOuroboros
b520fe5d89
Tweaked Strong Winds' animation
2021-10-06 08:38:19 -03:00
Eduardo Quezada D'Ottone
43d42c95cf
Terrain Pulse effect implemented
2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone
e2bf660c97
Secret Power field terrain animations
2021-10-04 21:51:51 -03:00
LOuroboros
b85b3094c8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev
2021-10-03 07:05:56 -03:00
LOuroboros
a49ea33dd0
A lot of fixes
...
-Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle.
-Fixed Gulp Missile activating if the only/last target has already fainted.
-Fixed Gulp Missile's Gorging animation, though it still uses Tackle's.
-Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard.
-Fixed Gulp Missile changing Cramorant's form if Surf failed.
2021-09-27 08:57:09 -03:00
LOuroboros
1b039062da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-09-25 22:20:34 -03:00
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
Syreldar
4c05520bf3
Fixed Retaliate's naming.
2021-09-24 16:02:26 +02:00
ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
LOuroboros
69b7910f47
Gave an entrance animation to Delta Stream
2021-08-31 00:15:17 -03:00
ExpoSeed
0f99d9d4c6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-08-30 13:26:40 -05:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
LOuroboros
f1195e1884
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-07-27 09:08:52 -03:00
ghoulslash
a37d4c3da9
merge with be, give life dew jungle healing effect
2021-07-25 08:22:05 -06:00
Xhyzi
c2bd046ea6
Shell Trap
2021-06-15 20:22:50 +02:00
Xhyzi
0202b75822
Beak Blast
2021-06-15 19:57:21 +02:00
ExpoSeed
c8fc141287
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-06-10 11:54:20 -05:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
DizzyEggg
e2f14d43db
Fix Gravity's animation
2021-06-08 12:13:40 +02:00
DizzyEggg
dd88be659c
Get rid of SOUND_PAN_ATTACKER in launchtemplate
2021-06-01 13:44:02 +02:00
ghoulslash
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -06:00
LOuroboros
64a86d0285
Swapped launchtemplate calls with createsprite calls
2021-05-04 15:36:00 -03:00
LOuroboros
fa0d3a351e
Fixed Overdrive's animation
2021-05-02 20:10:48 -03:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
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
Marcus Huderle
a85fada314
Document more battle anim effects
2021-02-28 09:54:55 -06:00
Marcus Huderle
c323e7f061
Document some battle anim funcs and data
2021-02-27 11:04:45 -06:00
