ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,690 Commits 1 Branch 0 Tags 235 MiB
a01fd2eb7a
Commit Graph

8690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros
a01fd2eb7a Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d Fling tweaks 
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
 2021-11-15 12:40:10 -03: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
LOuroboros
2fe015e5ce Implemented Fling 2021-11-13 10:27:05 -03: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
ghoulslash
cdb20e89fc
Update src/battle_script_commands.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-11-12 13:12:05 -05:00
ghoulslash
876813a418 revert old attempts 2021-11-12 13:08:23 -05:00
ghoulslash
0634d3e541
Update src/battle_script_commands.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-12 13:07:53 -05:00
ghoulslash
d5db329318
Update src/battle_script_commands.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-11-12 13:07:41 -05:00
ghoulslash
395cffa702 remove ReverseStatAnimId 2021-11-12 13:04:33 -05:00
ghoulslash
2ff9c2f834 remove test code 2021-11-12 13:00:28 -05:00
ultima-soul
cab8a676a2
Merge pull request #1883 from ghoulslash/be/kingsrock 
add kings rock serene grace boost config
 2021-11-12 09:44:57 -08:00
ghoulslash
a26da51e9d fix contrary animations for MOVE_EFFECT_statchange 2021-11-12 12:44:45 -05:00
ultima-soul
c5dabf34b8
Improve Serene Grace boost config comment. 2021-11-12 09:39:18 -08:00
ghoulslash
6214d8b625 rename config 2021-11-12 07:47:24 -05:00
BuffelSaft
bdbdd0564f Fix Knock Off, add config 
Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
 2021-11-12 21:05:42 +13:00
ghoulslash
adc1413d98 add kings rock serene grace boost config 2021-11-11 17:48:15 -05:00
ghoulslash
e2e43444ad
Merge pull request #1882 from kleeenexfeu/battle_engine 
Serene Grace affects King's rock
 2021-11-11 16:43:08 -05:00
ghoulslash
3336ba811f
Merge pull request #1878 from BuffelSaft/big-pecks 
Fix Big Pecks
 2021-11-11 16:36:28 -05:00
Eduardo Quezada D'Ottone
1311ee9d60
Merge pull request #1731 from ultima-soul/ball_effects 
Ported New Ball Catch Rate Modifier Effects from Item Expansion
 2021-11-11 06:23:36 -03:00
ultima-soul
fd4d0db912 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects 2021-11-10 18:02:00 -08:00