ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 21:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,683 Commits 1 Branch 0 Tags 235 MiB
8b296b97a8
Commit Graph

822 Commits

Author SHA1 Message Date
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
BuffelSaft
cedc2e07bd Fix Cherrim softlock 
Fix typo that caused infinite loop.
 2021-11-14 13:31:06 +13: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
ad393385ac Oops 2021-11-13 10:58:18 -03:00
kleeenexfeu
b3b3cd2c67
IsBattlerProtected 2021-11-13 13:48:08 +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
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
kleeenexfeu
05699884d5
Crits and Confusion bypass screens 2021-11-12 21:19:06 +01: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
kleeenexfeu
59abb0ff4e
Serene Grace affects King's rock 
according to https://bulbapedia.bulbagarden.net/wiki/King%27s_Rock
 2021-11-10 20:45:39 +01:00
BuffelSaft
e637714e1b Requested changes 
Various bug fixes, syntax corrections etc.
 2021-11-10 21:11:15 +13:00
BuffelSaft
e2599c2469 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-10 14:31:32 +13:00
kleeenexfeu
d3abd20dfb
Fix heat crash/heavy slam calculation 2021-11-09 18:12:40 +01:00
ghoulslash
a90cf4a501
Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves 
Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse
 2021-11-07 17:39:03 -05:00
LOuroboros
b358f774dd
Fixed the offensive boost of the Soul Dew 2021-11-07 14:40:18 -03:00
Eduardo Quezada D'Ottone
4e6a459b14 Optimized terrain timers 2021-11-06 19:46:52 -03:00
ghoulslash
41bf1dc2f4 merge w be 2021-11-06 10:40:57 -04:00
ghoulslash
f7d11527aa
Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic 
Config for Synchronize's interaction with toxic poisoning
 2021-11-06 10:36:50 -04: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
BuffelSaft
5acebe32aa
Merge pull request #1817 from LOuroboros/photonGeyser 
Implemented Photon Geyser and Shell Side Arm
 2021-11-06 16:04:53 +13:00
Eduardo Quezada D'Ottone
8e49e3e653 Config for Synchronize's interaction with toxic poisoning 2021-11-05 21:16:13 -03:00
BuffelSaft
4007a8d1f8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song 2021-11-06 11:52:51 +13:00
Eduardo Quezada D'Ottone
6c70a6b872
Merge pull request #1863 from LOuroboros/soulDewBE 
Added a battle config for the Soul Dew
 2021-11-05 17:09:44 -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
ee83d1142c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-05 21:40:05 +13:00
BuffelSaft
6df3975fc6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-05 14:32:33 +13:00
LOuroboros
9a3739d2bd Review changes 2021-11-04 21:01:48 -03:00
LOuroboros
671cbabc3d Added a battle config for the Soul Dew 2021-11-04 17:25:31 -03:00
LOuroboros
22f7e81bef Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-04 12:25:26 -03:00
LOuroboros
b64d506809 Made a function to lift Mimicry's effect 2021-11-04 12:20:31 -03:00
BuffelSaft
28e78cb6c4 Gen 8 moves initial commit 
Full credit to Nunuchu42 and cfmnephrite for this code.
 2021-11-04 19:50:54 +13:00
BuffelSaft
b615bc6dcd
Merge pull request #1854 from AsparagusEduardo/BE_UndoForm 
Refactored UndoFormChange to make it more user friendly
 2021-11-04 17:30:55 +13:00
BuffelSaft
e930dae278 Remove ability pop up for Hunger Switch 
Morpeko should change form each turn without showing its ability.
 2021-11-04 15:40:26 +13:00
BuffelSaft
616be576fc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-04 15:29:38 +13:00
Eduardo Quezada D'Ottone
05850f0f65 Refactored UndoFormChange to make it more user friendly 2021-11-03 22:05:02 -03:00
BuffelSaft
eeb40daede Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2 2021-11-04 13:52:58 +13:00
Eduardo Quezada D'Ottone
6ee2a3aba1 Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	src/battle_main.c
 2021-11-03 20:44:25 -03:00
LOuroboros
f6628e301f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-03 20:43:33 -03:00
LOuroboros
f0d7c75ec8 Syntax corrections 2021-11-03 17:48:04 -03: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
BuffelSaft
6ce1f01b8c Hunger Switch and Aura Wheel 
Implement the ability Hunger Switch and the move Aura Wheel.
 2021-11-03 19:45:03 +13:00
BuffelSaft
74c85b5818 Implement Relic Song's form change 
Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.
 2021-11-03 17:23:33 +13:00
BuffelSaft
d33bcc335b Revert Poison Touch target check 
This would prevent Poison Touch activating if the target hurt itself.
 2021-11-03 14:49:14 +13:00