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

8740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash
6f6e0d6baf add recycle hp berry logic 2021-11-08 21:27:40 -05:00
ghoulslash
4566b5234f magic guard user doesnt care about rocky helmet 2021-11-08 11:56:51 -05:00
ghoulslash
01cf8e6452 add AI_MoveMakesContact, dissuade multi-hit attacks against rocky helmet 2021-11-08 11:55:06 -05:00
ghoulslash
e5a0630596 add ai flag checks alongside CanFaintTarget 2021-11-08 11:42:32 -05:00
ghoulslash
8f320a8d33 some ai updates, recycle + ripen logic 2021-11-08 11:37:41 -05:00
ghoulslash
4f56d0a2b5
Merge pull request #1875 from BuffelSaft/fix_ai_status_logic2 
Fix AI status logic and CanAttackerFaintTarget
 2021-11-08 10:34:10 -05:00
BuffelSaft
03cab2058a Fix goof, make AI check PP in move limitations 
Was skipping valid moves instead of invalid ones in CanAIFaintTarget. Also, remove all instances of ~MOVE_LIMITATION_PP from the AI as it seemed detrimental.
 2021-11-08 23:57:16 +13:00
Blackforest92
76ba9d835a pulled latest RHH battle_engine 08-11-2021 2021-11-08 16:38:42 +07:00
BuffelSaft
d3a845d511 Fix CanAIFaintTarget 
Rename CanAIFaintTarget to CanIndexMoveFaintTarget and create a new function, CanAIFaintTarget, that checks if any known move can KO the target.
 2021-11-08 20:37:28 +13:00
BuffelSaft
3a113e33b2 Uncomment AI Full Metal Body checks 
This ability is Clear Body with a different name, so it should be working and doesn't need to be commented out.
 2021-11-08 19:28:09 +13:00
BuffelSaft
5ac465bc2f
Merge pull request #1862 from ghoulslash/be/speeduphit 
Dont have XX_UP_HIT effects trigger at end of battle
 2021-11-08 19:16:54 +13: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
Eduardo Quezada D'Ottone
fd46beb3dd
Merge pull request #1869 from LOuroboros/patch-2 
Fixed the offensive boost (Gen. 3-6 specifically) of the Soul Dew
 2021-11-07 15:42:24 -03:00
LOuroboros
b358f774dd
Fixed the offensive boost of the Soul Dew 2021-11-07 14:40:18 -03:00
Eduardo Quezada D'Ottone
c2a17510a9 Terrain Pulse animations 2021-11-07 11:25:08 -03:00
Eduardo Quezada D'Ottone
4e6a459b14 Optimized terrain timers 2021-11-06 19:46:52 -03:00
Eduardo Quezada D'Ottone
8773e552ac Organized config and added failsafe to AnimTask_SetCamouflageBlend 2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone
1c4a0c205a Camouflage types config + extra terrains 2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone
b220da1d2a Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table 2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone
e9804a5023 Secret Power animation config 2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone
328976bf81 Secret Power effect config 2021-11-06 17:05:13 -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
62b6accbcc Using IsBattlerTerrainAffected 2021-11-06 11:07:40 -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
ghoulslash
01d9d4c7d7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/speeduphit 2021-11-06 08:53:09 -04:00
ghoulslash
03f290d937 add check for plus_2 effects 2021-11-06 08:53:00 -04: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
LOuroboros
c2e8c1058f Force set gSwapDamageCategory's initial value in Photon Geyser's and Shell Side Arm's calculations 2021-11-05 23:07:26 -03:00
LOuroboros
4bdbef9a9d Use the right defensive target stats during Shell Side Arm calculation 2021-11-05 22:21:50 -03:00
Eduardo Quezada D'Ottone
202827068c
a 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone
63a7618f07
Merge pull request #1850 from BuffelSaft/relic_song 
Finish Relic Song's effect
 2021-11-05 21:17:00 -03:00
Eduardo Quezada D'Ottone
8e49e3e653 Config for Synchronize's interaction with toxic poisoning 2021-11-05 21:16:13 -03:00
BuffelSaft
14ebba04af
Align comment with others 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-06 12:43:57 +13: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
b23d5db598 Oops 2021-11-05 13:02:16 -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
LOuroboros
13029cd3b3 Tweaked VARIOUS_PHOTON_GEYSER_CHECK and VARIOUS_SHELL_SIDE_ARM_CHECK 2021-11-05 10:55:57 -03:00
LOuroboros
d15eeeb8eb Fixed the comment for B_SOUL_DEW_BOOST 2021-11-05 10:37:41 -03:00
ghoulslash
6070c70b36
Merge pull request #1865 from BuffelSaft/magma_storm 
Fix Magma Storm
 2021-11-05 09:26:02 -04: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
d91d6c9162
Merge pull request #1856 from ghoulslash/be/ai_magicguard 
Fix AI discouraging own magic guard
 2021-11-05 18:52:34 +13:00
BuffelSaft
3f1ce399e6 Account for terminator in sTrappingMoves 2021-11-05 18:37:45 +13: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
BuffelSaft
a8d44f84a1
Merge pull request #1852 from Blackforest92/battle_engine_2 
Update waterfall, trick room, & focus blast BG
 2021-11-05 15:27:52 +13:00
ghoulslash
dd91cbd08f
Merge pull request #1851 from BuffelSaft/hunger_switch2 
Hunger Switch and Aura Wheel
 2021-11-04 21:40:59 -04: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
Eduardo Quezada D'Ottone
5eb8f1c158
Merge pull request #1855 from ghoulslash/be/abilityonside 
AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide
 2021-11-04 21:49:31 -03:00
LOuroboros
9a3739d2bd Review changes 2021-11-04 21:01:48 -03:00