ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-11 06:05:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,339 Commits 1 Branch 0 Tags 235 MiB
df2223a5bc
Commit Graph

710 Commits

Author SHA1 Message Date
BuffelSaft
df2223a5bc
Merge pull request #1745 from LOuroboros/retaliate 
Implemented Retaliate's effect
 2021-10-16 22:49:32 +13:00
LOuroboros
3b6ceb1dfa Turned Retaliate into a side timer 2021-10-16 06:04:04 -03:00
Eduardo Quezada D'Ottone
16f97f4b48
Merge pull request #1746 from ghoulslash/sand_spit 
Fix sand spit + primal weather
 2021-10-15 12:11:53 -03:00
LOuroboros
2bf8022673 Changed how SIDE_STATUS_RETALIATE is cleared 2021-10-15 07:30:05 -03:00
LOuroboros
3a25bce185 Turned Retaliate's effect into a side status 2021-10-15 06:03:48 -03:00
LOuroboros
1f97198267 Oops, I forgot to take the opponent's side into account 2021-10-15 05:02:14 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
BuffelSaft
fc6e8f598c Merge branch 'battle_engine' into battle_bond 2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b Fix Battle Bond 
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
 2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone
d689842689
Merge pull request #1657 from ghoulslash/rototiller 
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
 2021-10-13 22:45:50 -03:00
ghoulslash
7f2efb6619 format fixes, fix healing berries from printing message at full hp 2021-10-13 18:40:45 -04:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
ghoulslash
b447d582cd fix terrain timer decrementing and bg changing with anims disabled 2021-10-13 09:04:03 -04:00
ghoulslash
791a899eed fix sand spit + primal weather 2021-10-11 21:29:08 -04:00
ghoulslash
e66820e646
Merge pull request #1744 from AsparagusEduardo/BE_configHiddenPow 
Setting for pre-Gen6 Hidden Power Damage.
 2021-10-11 15:13:16 -04:00
LOuroboros
6c550cd749 Implemented Retaliate's effect 2021-10-11 03:19:21 -03:00
ghoulslash
6212a3c431
Merge pull request #1703 from AsparagusEduardo/fix_ConfuseBerries 
Fixed confuse berries affecting the wrong battler.
 2021-10-10 20:21:03 -04:00
ghoulslash
06bcfea3b8 merge with be 2021-10-10 19:56:33 -04:00
ghoulslash
fcada4fcad handle rototiller + prankster 2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82 Setting for pre-Gen6 Hidden Power Damage. 2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
3f51132af2
Merge pull request #1733 from ghoulslash/substitute_fix 
Fix DoesSubstituteBlockMove calls
 2021-10-10 18:53:44 -03:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles 
Fix Safety Googles
 2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
01f563cb5e Fix infinite loop 2021-10-10 08:46:31 -03:00
BuffelSaft
8a7e6379b6
Merge pull request #1732 from ghoulslash/perish_song 
Fix Soundproof cancelling out user's Perish Song
 2021-10-10 22:55:20 +13:00
Eduardo Quezada D'Ottone
004f705607
Merge pull request #1549 from ghoulslash/last_ball 
add last used ball
 2021-10-09 17:27:28 -03:00
BuffelSaft
274e964d91 Fix Safety Googles 
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
 2021-10-09 15:05:01 +13:00
ghoulslash
db0d9f6235 sound moves targeting user not blocked by own soundproof 2021-10-08 08:22:49 -04:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities 
Implement Desolate Land, Primordial Sea and Delta Stream
 2021-10-08 20:01:09 +13:00
ghoulslash
1afc43a0e8 fix DoesSubstituteBlockMove calls 2021-10-06 15:30:44 -04:00
ghoulslash
5f5df066d6 fix perish song + soundproof 2021-10-06 15:18:42 -04:00
ghoulslash
391cfabcac merge with be 2021-10-06 14:31:21 -04:00
ghoulslash
ee3a2c97ee Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-10-06 13:54:40 -04:00
ghoulslash
5959eac924
Merge pull request #1705 from AsparagusEduardo/fix_UnnerveResist 
Fix Unnerve not canceling out type resist berries.
 2021-10-06 09:22:34 -04:00
ghoulslash
245ef1ad2d
Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag 
Config for Shadow Tag vs Shadow Tag
 2021-10-06 09:02:58 -04:00
ghoulslash
5bf236fc0d
Merge pull request #1712 from AsparagusEduardo/fix_stickyHold 
Fix instances where Gastro Acid is not affecting the ability
 2021-10-06 08:55:46 -04:00
LOuroboros
2b32581c14 Fixed infinite loop 2021-10-06 09:27:33 -03:00
LOuroboros
a646c3311b Another set of fixes 
The ability pop up is supposed to show as weather changing abilities try but fail to activate.
 2021-10-06 08:20:50 -03:00
LOuroboros
0f2cc99f45 WEATHER_STRONG_WINDS modifier fix 
MulByTypeEffectiveness was the right answer all along.
I also added a short pause to BattleScript_AttackWeakenedByStrongWinds before STRINGID_ATTACKWEAKENEDBSTRONGWINDS is printed.
 2021-10-06 07:33:54 -03:00
LOuroboros
b93c746a49 Reverted comment after the previous commit 2021-10-06 06:04:56 -03:00
LOuroboros
dc451167d1 More fixes 
-Removed ability popup when Strong Winds weakens a SE Flying-type move
-Went back to the way I handled the dmg calculation for that originally
-Made sure to try to clear the primal weathers in a couple of other battle scripts
-Allowed Drought, Drizzle, Sand Stream and Snow Warning to activate but fail if WEATHER_STRONG_WINDS is in effect.
 2021-10-06 05:54:28 -03:00
BuffelSaft
a48dec2e31
Merge pull request #1721 from AsparagusEduardo/fix_TrumpCard 
Fixed Trump Card's damage check
 2021-10-06 15:55:21 +13:00
Eduardo Quezada D'Ottone
4ab8c95207 Fixed Heat Crash's power table name 2021-10-04 20:17:43 -03:00
Eduardo Quezada D'Ottone
b3167b7d53 Fixed Trump Card's damage check 2021-10-04 19:40:36 -03:00
LOuroboros
dcefb523f8 Tweaks and fixes 
-Fixed the Flying-type checks of WEATHER_STRONG_WINDS.
-Fixed the order of actions involving the printing of STRINGID_ATTACKWEAKENEDBSTRONGWINDS.
 2021-10-04 08:12:41 -03:00
BuffelSaft
142a83ca96
Merge pull request #1708 from AsparagusEduardo/fix_SleepTalk 
Fixed Sleep talk being canceled by the user being asleep..
 2021-10-04 00:35:00 +13:00
LOuroboros
b85b3094c8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev 2021-10-03 07:05:56 -03:00
Eduardo Quezada D'Ottone
978f73475b Config for Shadow Tag vs Shadow Tag 2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone
2d5da7852c Fixed Yawn + Vital Spirit + Gastro Acid 2021-10-02 18:44:04 -03:00
Eduardo Quezada D'Ottone
9d64a26625 Fix preasure + Gastro Acid 2021-10-02 18:31:09 -03:00
Eduardo Quezada D'Ottone
b29f5c801f Fixed Gastro Acid's effect on Early Bird 2021-10-02 18:16:14 -03:00