ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,558 Commits 1 Branch 0 Tags 235 MiB
master
Commit Graph

412 Commits

Author SHA1 Message Date
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
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
Evan
c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
Evan
a37acb8345 coaching, lash out, burning jealousy 2021-01-28 12:21:11 -07:00
Evan
dd51edd881 add eerie spell, surging strikes, jungle healing 2021-01-28 10:51:00 -07:00
Evan
39139323f6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove 2021-01-20 17:36:37 -07:00
LOuroboros
af3dcf7543 Fixed Focus Blast animation 
Its gSuperpowerOrbSpriteTemplate was overlapping the battle textbox.
 2021-01-16 03:57:47 -03: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
9902f6e603 merge with be 2021-01-13 14:32:14 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine 
Increase readability of too-long names
 2021-01-12 09:20:53 -07:00
GriffinR
92de664f79 List battle animation indexes alongside tables 2021-01-11 16:07:16 -05:00
surskitty
a0f1dcb9cf Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2021-01-10 15:40:21 -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
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation 
infestation between turn anim
 2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data 
Added the data of SwSh's Crown Tundra's moves
 2020-12-21 23:13:23 -07:00
LOuroboros
89989943b3 Added placeholders for the anims of CT's moves 2020-12-19 19:11:17 -03:00
ultima-soul
aefa35a04f
Merge pull request #1275 from ghoulslash/battle_anims 
Fix Shadow Sneak Animation
 2020-12-18 23:15:07 -08:00
Evan
e70e2bcd65 merge with be 2020-12-14 09:09:51 -07:00
Evan
b85dacce9d fix conflicts 2020-12-14 08:50:41 -07:00
Evan
67fefd0261 var terrain, surge fixes 2020-12-13 19:42:48 -07:00
LOuroboros
785e23222b Review correction 2020-12-13 21:20:27 -03: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
36b0e6dedc fix shake duration 2020-12-13 17:08:35 -07:00
Evan
964ec53a65 port cfru shadow sneak anim 2020-12-08 11:36:19 -07:00
Evan
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
LOuroboros
42a06c6003 Fixed softlock caused by the majority of Techno Blast's animations 
And made the checks that sets its animation use the Type constants instead of their internal IDs.
 2020-12-05 21:23:59 -03:00
ultima-soul
e05b5fc8a3
Merge pull request #1260 from ghoulslash/BE_test 
Fix Babydoll eyes animation
 2020-12-04 15:46:17 -08:00
Evan
3102e499da fix babydoll eyes anim priority 2020-12-02 14:23:03 -05:00
Evan
58a79a4f37 shorten between-turn infestation anim length 2020-12-01 17:52:44 -05:00
Evan
9755923cc3 light that burns the sky split, fix electric z move anims 2020-12-01 14:44:45 -05:00
Evan
752aca7698 finish z move anims 2020-11-29 09:22:31 -05:00
Evan
f114534ae3 z move anim/effect, black hole eclipse anim 2020-11-28 13:09:43 -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
1c398c3d4b totem format fixes 2020-11-19 10:37:15 -07: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
Evan
479f6be51a redo power trick anim 2020-11-17 15:31:18 -07:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves 
LGPE & Isle of Armor move data.
 2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone
f0154028ff Review changes 2 2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone
e87f0f1ddb Review changes 2020-11-13 14:51:50 -03:00
LOuroboros
c66b77fbf8 Changed Hurricane's animation 2020-11-06 21:06:04 -03:00
Eduardo Quezada
b5834b617d Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves 
# Conflicts:
#	src/data/text/move_descriptions.h
 2020-10-24 00:36:29 -03:00
Eduardo Quezada D'Ottone
c783f789ed
Merge pull request #523 from LOuroboros/eerie_impulse 
Fixed Eerie Impulse's animation again
 2020-10-20 18:52:36 -03:00
LOuroboros
22093e75fc Fixed Electrify's animation again 
For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634
 2020-10-20 10:30:32 -03:00
LOuroboros
ea54afbdc7 Fixed Eerie Impulse's animation again 
For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634
 2020-10-20 10:15:49 -03:00
Eduardo Quezada
d0feac8fe4 Fix comment identation. 2020-10-19 17:48:27 -03:00
Eduardo Quezada
5f7c01bd41 Replaced spaces to tabs. 2020-10-19 11:58:19 -03:00
Eduardo Quezada
8f9659f846 Fixed Pika Papow's name. 2020-10-19 11:45:54 -03:00
Eduardo Quezada
47259092e3 LGPE & Isle of Armor move data. 2020-10-14 21:50:22 -03: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
hondew
e46b35455d Merge branch 'master' into pokeball-doc 2020-08-30 14:14:38 -04:00
hondew
328aecc96e Document throwing pokeball 
continue

Document more

Doc more funcs

Remove workspace

Document shiny stars

Document PokeBlock

Clean up

Clean more
 2020-08-30 14:08:06 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
DizzyEggg
356216d15e Mirror Shot improve animation 2020-07-27 22:11:52 +02: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
DizzyEggg
3cf091d635 Improve animations of moves hitting all foes 2020-06-26 23:28:46 +02:00
DizzyEggg
db715335c3 Fix Gastro Acid animation 2020-06-26 22:20:00 +02:00
DizzyEggg
219a43304a Improve Electro Ball animation 2020-06-26 13:58:34 +02:00
DizzyEggg
f252cd8003 Fix Terrain moves animations 2020-06-25 11:44:05 +02:00
DizzyEggg
56bd08e7fe
Merge pull request #436 from LOuroboros/techno_blast 
Fixed Techno Blast's animation
 2020-06-22 10:08:50 +02:00
DizzyEggg
e449018b83
Merge pull request #425 from LOuroboros/eerie_impulse 
Fixed Eerie Impulse's animation
 2020-06-22 10:08:20 +02:00
DizzyEggg
7821bd00e3
Merge pull request #429 from LOuroboros/revelation_dance 
Fixed Revelation Dance's animation
 2020-06-22 10:07:54 +02:00
DizzyEggg
9741e026f5
Merge pull request #432 from LOuroboros/freeze_dry 
Fixed Freeze Dry's animation
 2020-06-22 10:07:34 +02:00
DizzyEggg
d5213ad9ec
Merge pull request #435 from LOuroboros/blue_flare 
Fixed Blue Flare's animation
 2020-06-22 10:07:11 +02:00
DizzyEggg
a78deb85e2
Merge pull request #430 from LOuroboros/trop_kick 
Fixed Trop Kick's animation
 2020-06-22 10:06:49 +02:00
DizzyEggg
8a22d9180c
Merge pull request #437 from LOuroboros/night_daze 
Fixed Night Daze's animation
 2020-06-22 10:06:16 +02:00
DizzyEggg
fde2c25b3f
Merge pull request #434 from LOuroboros/freeze_shock 
Fixed Freeze Shock
 2020-06-22 10:04:43 +02:00
DizzyEggg
ba61970edb
Merge pull request #431 from LOuroboros/electrify 
Fixed Electrify
 2020-06-22 10:03:49 +02:00
DizzyEggg
d0617e0270
Merge pull request #426 from LOuroboros/dragon_hammer 
Fixed Dragon Hammer's animation
 2020-06-22 10:01:19 +02:00
LOuroboros
8d6a602970 Fixed Night Daze's animation 2020-06-16 04:30:53 -03:00
LOuroboros
dca5016d8e Fixed Techno Blast's animation 2020-06-16 04:28:04 -03:00
LOuroboros
3cf073b614 Fixed Blue Flare's animation 2020-06-16 04:22:31 -03:00
LOuroboros
575c5a5882 Fixed Freeze Shock's 2nd turn animation 2020-06-16 04:11:09 -03:00
LOuroboros
bef8a701fc Fixed Freeze Dry's animation 2020-06-16 03:32:41 -03:00
LOuroboros
abd1288268 Fixed Electrify's animation 2020-06-16 03:06:32 -03:00
LOuroboros
6abfac2c65 Fixed Trop Kick's animation 2020-06-16 00:17:40 -03:00
LOuroboros
da4fba6d41 Fixed Revelation Dance's animation 2020-06-16 00:01:06 -03:00
LOuroboros
5013a04ba3 Fixed Diamond Storm's animation 2020-06-15 23:25:35 -03:00
LOuroboros
f7c6729b75 Fixed Dragon Hammer's animation 2020-06-15 22:46:22 -03:00
LOuroboros
ed7675b11b Fixed Eerie Impulse's animation 2020-06-15 21:41:43 -03:00
Evan
5d232c34fe fix a bunch of anims 2020-05-29 11:15:00 -06:00
DizzyEggg
19699bee23
Merge pull request #390 from ghoulslash/battle_engine 
add animations for all moves
 2020-05-29 12:53:17 +02:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
Evan
fdc6e80e1e fix anim defines 2020-05-28 12:19:07 -06:00
Jaizu
a90b624c23
Fix Nasty Plot move animation (#392) 
Fixes #391
 2020-05-26 17:28:55 +02:00