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,643 Commits 1 Branch 0 Tags 235 MiB
cbb6639f8d
Commit Graph

8643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
LOuroboros
2fe015e5ce Implemented Fling 2021-11-13 10:27:05 -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
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
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
ghoulslash
d9aa0e67a2
Merge pull request #1859 from BuffelSaft/gen_8_moves_batch1 
Gen 8 moves batch 1
 2021-11-10 20:45:35 -05:00
BuffelSaft
e606e54f9d Fix Big Pecks/Octolock animation 
Also removed MOVE_EFFECT_AFFECTS_USER because that shouldn't be part of playstatchangeanimation. The stat drops still bypass Mirror Armor without this.
 2021-11-11 14:32:38 +13: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
e47317aa73 Fix Big Pecks 
ChangeStatBuffs was missing a check for Big Pecks.
 2021-11-10 21:24:48 +13: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
BuffelSaft
e886076998
Merge pull request #1877 from kleeenexfeu/patch-1 
Fix heat crash/heavy slam calculation
 2021-11-10 14:18:57 +13:00
kleeenexfeu
d3abd20dfb
Fix heat crash/heavy slam calculation 2021-11-09 18:12:40 +01: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
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
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