Commit Graph

8716 Commits

Author SHA1 Message Date
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
BuffelSaft
ff60882b29 Requested changes 2021-11-23 11:04:39 +13:00
BuffelSaft
50d0cd52e8 Clean up Corrosive Gas
Remove code and unused move effect.
2021-11-22 15:13:54 +13:00
BuffelSaft
d2eb5f0e61 Remove shell trap effect code
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
2021-11-22 14:46:47 +13:00
BuffelSaft
42b8f18cb1 Remove Corrosive Gas code
This was not working at all in testing, so it can be done by a separate PR later.
2021-11-22 14:35:01 +13:00
BuffelSaft
70f0018c08 Partially implement Shell Trap
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
2021-11-22 14:14:41 +13:00
BuffelSaft
abb67e96e8 Finish Expanding Force
Hits both foes if the user is affected by Psychic Terrain. Modified targeting is also shown in the move selection screen.
2021-11-21 21:49:47 +13:00
BuffelSaft
bcaa17ffb3 Finish/tidy up Court Change
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
2021-11-21 17:20:45 +13:00
BuffelSaft
14a2e86313 Fix Scale Shot
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
2021-11-19 21:57:32 +13:00
BuffelSaft
48c91d03cd Fix terrain checks on DLC moves
Expanding Force and Rising Voltage now boost damage correctly. Expanding Force doesn't hit both targets yet however.
2021-11-19 20:20:16 +13:00
BuffelSaft
86efd69370 Finish/fix Beak Blast
This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.
2021-11-19 20:19:10 +13: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
b2411dbbc4
Merge pull request #1909 from AsparagusEduardo/BE_Leek
Updated Leek's effect with config
2021-11-16 08:50:31 -05:00
Eduardo Quezada D'Ottone
7dbc94deef Fixed undef 2021-11-15 23:36:52 -03:00
Eduardo Quezada D'Ottone
0af63c04eb Removed redundant uses of STATUS3_GASTRO_ACID check. 2021-11-15 23:29:54 -03:00
Eduardo Quezada D'Ottone
cc833ebb59 Created macro + config for always critting when using high-crit moves 2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone
a1bd6bd52f Updated species that benefit from Leek 2021-11-15 22:30:20 -03:00
Eduardo Quezada D'Ottone
bef896c65a
Merge pull request #1908 from kleeenexfeu/kleeenexfeu-PartyBattlerShouldAvoidHazardsfix
PartyBattlerShouldAvoidHazards fix
2021-11-15 19:54:46 -03:00
kleeenexfeu
ea34d4694d
PartyBattlerShouldAvoidHazards fix
AI was loading and modifying wrong data in the RAM
2021-11-15 16:48:44 +01:00
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks
Adjusted elements to simplify the conflicts between BE and IE
2021-11-15 08:27:28 -05:00
Eduardo Quezada D'Ottone
2a5fed3c65
Merge pull request #1905 from BuffelSaft/aura
Fix Dark Aura and Fairy Aura
2021-11-15 08:40:11 -03:00
BuffelSaft
d4fa346540 Fix Dark Aura and Fairy Aura
Damage boost should be 33%, not 25%.
2021-11-15 21:40:20 +13:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off
Fix Knock Off, add config
2021-11-14 08:27:51 -05:00
Eduardo Quezada D'Ottone
5b63f53262
Merge pull request #1834 from ghoulslash/be/neutralizing_gas
Add Neutralizing Gas
2021-11-14 00:27:16 -03:00
Eduardo Quezada D'Ottone
80f531e03b
Merge pull request #1899 from BuffelSaft/softlock
Fix Cherrim softlock
2021-11-13 23:03:27 -03:00
BuffelSaft
cedc2e07bd Fix Cherrim softlock
Fix typo that caused infinite loop.
2021-11-14 13:31:06 +13:00
Eduardo Quezada D'Ottone
bcbdb353f5 Adjusted elements to simplify the conflicts between BE and IE 2021-11-13 12:10:20 -03:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00
ghoulslash
23104a02e7
Merge pull request #1891 from AsparagusEduardo/BE_assaultVestText
Fix Assault Vest's battle message and effect on Me First
2021-11-13 09:06:12 -05:00
Eduardo Quezada D'Ottone
8f52996144
Merge pull request #1892 from ghoulslash/be/wish
wish update
2021-11-13 11:01:04 -03:00
Eduardo Quezada D'Ottone
ad393385ac Oops 2021-11-13 10:58:18 -03: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
ghoulslash
b68c596ce5
Update src/battle_script_commands.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:30 -05:00
ghoulslash
a4204e5491
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:24 -05:00
ghoulslash
c779d7f0b0
Merge pull request #1894 from AsparagusEduardo/BE_fixRelicSong
Fixed Relic Song's SE
2021-11-13 08:50:01 -05:00
Eduardo Quezada D'Ottone
bcb0f1b915
Merge pull request #1890 from kleeenexfeu/battle_engine
Bypassing screens and protections correctly
2021-11-13 10:11:02 -03:00
kleeenexfeu
b3b3cd2c67
IsBattlerProtected 2021-11-13 13:48:08 +01:00
kleeenexfeu
89e9b989c9
Moving isBattlerProtected 2021-11-13 13:40:19 +01:00
kleeenexfeu
f808710932
Moving IsBattlerProtected 2021-11-13 13:38:07 +01:00
kleeenexfeu
90b6c7d56c
Remove unwanted check
According to bulbapedia this check shouldn't exist. It was just preventing effectiveness from being calculated when a move bypassing protection would go through king's shield
2021-11-13 13:24:30 +01:00
kleeenexfeu
10c390b9ec
Effectiveness is calculated for moves bypassing king's shield
I'm curious what this is for. Before the change it just prevented moves that bypass protections from dealing super effective/not very effective damage to an aegislash using king's shield. So I just added a check with IsBattlerProtected, but in my opinion this line should be entirely removed. Unless I'm missing something.
2021-11-13 11:53:49 +01:00
Eduardo Quezada D'Ottone
704957efb9 Fixed Relic Song's SE 2021-11-13 07:30:12 -03:00
ghoulslash
c4efe06f38 wish update 2021-11-12 17:55:05 -05:00
kleeenexfeu
fdff1ae1b6
Update src/battle_util.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-12 23:34:44 +01:00
Eduardo Quezada D'Ottone
2489023332 Fixed assault Vest restricting Me First 2021-11-12 19:24:50 -03:00
Eduardo Quezada D'Ottone
45fcb50e09
Merge pull request #1889 from ghoulslash/be/brickbreak
Update Brick Break with config
2021-11-12 19:03:43 -03:00
Eduardo Quezada D'Ottone
2e3aafe81b Fix Assault Vest's battle message 2021-11-12 18:53:46 -03:00
kleeenexfeu
05699884d5
Crits and Confusion bypass screens 2021-11-12 21:19:06 +01:00
ghoulslash
96fd8e696b brick break gen 4 and 5 config. clears aurora veil 2021-11-12 15:00:21 -05:00
ultima-soul
294fecd57c
Merge pull request #1888 from ghoulslash/be/contrary
Fix Contrary Animation
2021-11-12 10:19:37 -08:00