Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,963 Commits 1 Branch 0 Tags
Commit Graph

10963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GriffinR
c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -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
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05: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
GriffinR
4f825a6ee0 Give generic names to unknown direct sound wave data 2021-11-06 17:00:24 -04: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
GriffinR
737a5cba55
Merge pull request #1546 from AsparagusEduardo/pret_sandstorm 
Using WEATHER_SANDSTORM in battle_setup
 2021-11-06 14:21:11 -04:00
Eduardo Quezada D'Ottone
b282bbc270 Using WEATHER_SANDSTORM in battle_setup 2021-11-06 14:55:27 -03:00
GriffinR
93705bc257 Label phonemes 2021-11-06 12:30:40 -04:00
GriffinR
44295261b0 Give programmable wave samples generic names 2021-11-06 12:07:42 -04:00
GriffinR
abab6cef09 Label remaining m4a functions 2021-11-06 11:42:34 -04:00
ghoulslash
da6ec51fc2 merge w be 2021-11-06 10:43:35 -04: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
GriffinR
f9e8c88eb5
Merge pull request #1543 from cbt6/move-fastest 
Rename WalkFastest functions to WalkFaster
 2021-11-06 10:32:59 -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
GriffinR
27957b5c1f
Merge pull request #1545 from sphericalice/pal-constants 
Use relevant constants for BlendPalettes
 2021-11-05 18:05:41 -04:00
sphericalice
6e49b45eb6 Use relevant constants for BlendPalettes 2021-11-05 21:58:13 +00:00
Eduardo Quezada D'Ottone
75d9f1ccb5
Merge pull request #1866 from LOuroboros/orbs 
Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs
 2021-11-05 17:50:17 -03:00
LOuroboros
ab2dab9d05 Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs 2021-11-05 17:42:12 -03:00
Eduardo Quezada D'Ottone
18c84fc732
Merge pull request #1864 from LOuroboros/soulDewIE 
Added an item config for the Soul Dew
 2021-11-05 17:09:58 -03: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
Eduardo Quezada D'Ottone
262569845a
Comment capitalise 
Co-authored-by: BuffelSaft <buffalojuice@gmail.com>
 2021-11-05 17:01:15 -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
ghoulslash
0b2542e447 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai 2021-11-05 09:46:12 -04:00
LOuroboros
05c7f7ebfb Fixed the comment for I_SOUL_DEW_BOOST 2021-11-05 10:39:27 -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