ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-23 03:40:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,432 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

913 Commits

Author SHA1 Message Date
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
LOuroboros
e0b53f87fc Primal Reversion Tweaks 
-Fixed the inconsistent Primal Reversion activation in double battles.
-Optimized the primal weather checks in attackcanceler a little.
-Fixed the issue with multi-target fire/water moves during primal rain/sun.
 2021-11-04 12:04:14 -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
BuffelSaft
f323e2c047 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil 2021-11-03 14:18:28 +13:00
BuffelSaft
d99fd30e4d Looping battle script, correct message 
Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"
 2021-11-03 11:51:20 +13:00
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04:00
BuffelSaft
95435b5f7f Pastel Veil switchin effect attempt 
Battle script isn't working for partner for some reason.
 2021-11-02 23:06:10 +13:00
BuffelSaft
b97a250acc
Merge pull request #1512 from ghoulslash/utility_umbrella 
Utility Umbrella
 2021-11-02 16:28:52 +13:00
ghoulslash
802ba88621 fix ABILITYEFFECT_NEUTRALIZINGGAS 2021-11-01 15:10:51 -04:00
ghoulslash
98b4b821dc merge with be 2021-11-01 13:55:55 -04:00
ghoulslash
a1e64fce4f handle simple beam, gastro acid 2021-11-01 13:50:57 -04:00
ghoulslash
b5d20da927 merge with be 2021-11-01 11:36:18 -04:00
LOuroboros
30a8281d32
Fixed battlerId in Poison Touch's confusionSeldDmg check 2021-11-01 11:56:25 -03:00
ghoulslash
a2b8f3f169 replace gBattleMons[x].ability w GetBattlerAbility 2021-10-31 17:19:30 -04:00
ghoulslash
52d4d1cd34 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-31 11:40:00 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00
ghoulslash
ae0260fa62 fix run away check in TryRunFromBattle 2021-10-30 12:06:02 -04:00
ghoulslash
1925874d35 hunger switch unaffected by wandering spirit 2021-10-30 11:18:50 -04:00
ghoulslash
f4537b1213 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit 2021-10-30 09:14:32 -04:00
BuffelSaft
52054e4bfe Fix Corrosion, Poison Touch 
- CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
 2021-10-30 21:12:18 +13:00
BuffelSaft
47bfeaeecd Implement Gorilla Tactics 
It's Choice Band but as an ability.
 2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed merge w be 2021-10-29 22:33:50 -04:00
ghoulslash
28bc7dc14d start ability 2021-10-29 22:32:19 -04:00