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

600 Commits

Author SHA1 Message Date
ghoulslash
a01690cd57
Merge pull request #1665 from BuffelSaft/download 
Fix Download
 2021-09-22 09:40:48 -06:00
ghoulslash
fb17176a26
Merge pull request #1667 from AsparagusEduardo/fix_IllusionEgg 
Adds missing check for Egg in Illusion
 2021-09-22 09:01:31 -06:00
BuffelSaft
35af7a9cc1 Fix Foul Play 
if != else if. Pretty sure I broke this when adding Body Press.
 2021-09-22 15:44:13 +12:00
Eduardo Quezada D'Ottone
b65b27c0dd Adds missing check for Egg in Illusion 2021-09-22 00:20:34 -03:00
Eduardo Quezada D'Ottone
9a72178fa2
Merge pull request #1548 from StubbornOne/battle_engine 
Add Telepathy's damage prevention effect
 2021-09-21 23:02:41 -03:00
Eduardo Quezada D'Ottone
7571d56140
Applied Egg's implementation of telepathy 2021-09-21 22:57:05 -03:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change 2021-09-21 22:34:37 -03:00
BuffelSaft
6eced3f7a4 Fix Download 
Raises user's stat instead of a random target's, and determines stat boosts using the opposing Pokemon's stats.
 2021-09-22 11:53:44 +12:00
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc merge with be 2021-09-16 21:41:29 -04:00
ghoulslash
40fcd257a0 fixes 2021-09-16 19:36:06 -04:00
ghoulslash
806be64935 format fixes 2021-09-16 17:10:41 -04:00
ghoulslash
f61d516aad some syntax/format fixes 2021-09-15 17:15:50 -04:00
ghoulslash
aa475ab300 merge with be 2021-09-15 16:42:23 -04:00
ghoulslash
705b765067 update multistring chooser labels in GetMentalHerbEffect 2021-09-15 14:51:24 -04:00
ghoulslash
0bca01cb74 mental herb fixes 2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a merge with be 2021-09-15 12:54:39 -04:00
ghoulslash
c4ce4c150d fix eject pack 2021-09-14 15:38:16 -04:00
ghoulslash
55c3e152cf replace some BufferStatChange, fix room service and terrain seeds 2021-09-14 15:07:15 -04:00
ghoulslash
60713a8f2d fix room service activation msg, stat target 2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b fix some comment styling. fix throat spray for multi-target moves 2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f merge with be 2021-09-13 19:40:28 -04:00
StubbornOne
b21740b757
Merge branch 'rh-hideout:battle_engine' into battle_engine 2021-09-10 10:09:09 +08:00
ghoulslash
f9cc09dc48 tweak formula 2021-09-09 13:54:16 -04:00
ghoulslash
92429c7649 better echoed voice power boost 2021-09-09 13:38:46 -04:00
ghoulslash
6915b029bd fix echoed voice power boost 2021-09-09 11:15:58 -04:00
ghoulslash
e93ad2e255 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble 2021-09-06 09:24:28 -04:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost 
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
 2021-09-06 11:32:53 +02:00
BuffelSaft
734e0aa74d Add brackets 
Oops!
 2021-09-06 20:56:02 +12:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2 
Fix many Disguise bugs
 2021-09-06 10:32:37 +02:00
BuffelSaft
bdbb4b5f7e Fix many Disguise bugs 
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
 2021-09-06 18:27:42 +12:00
ghoulslash
a9cbaa5966 fix mental herb encore, heal block 2021-09-04 08:40:43 -04:00
ghoulslash
d66f3910d9 Merge branch 'mental_herb' of github.com:ghoulslash/pokeemerald into mental_herb 2021-09-03 17:41:09 -04:00
ghoulslash
933696b3cd merge with be 2021-09-03 17:41:00 -04:00
ghoulslash
c7a587913b replace statStages checks with CompareStat 2021-09-03 13:13:02 -04:00
ghoulslash
93e2e09148 fix terrain seeds. create generic CompareStat function 2021-09-03 12:17:38 -04:00
ghoulslash
7f4accdae4 fix room service switching in effect 2021-09-03 11:16:16 -04:00
ghoulslash
6ce1227447 fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case 2021-09-03 11:05:11 -04:00
ghoulslash
7c53214dad merge with be 2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine 
Implement Pickpocket
 2021-09-02 11:33:34 -07:00
BuffelSaft
13636f8691 Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE 
moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
 2021-09-02 16:15:58 +12:00
ExpoSeed
1f75f6e201
Merge pull request #1605 from LOuroboros/canEvolve 
Corrected `CanEvolve` function
 2021-08-26 19:32:22 -05:00
BuffelSaft
bb89d03a1d Fix Venoshock 
Damage should double if target is poisoned, not attacker.
 2021-08-25 22:57:10 +12:00
LOuroboros
e42d329fc6 Small tweak 2021-08-25 02:16:38 -03:00
LOuroboros
d270892a6b Corrected CanEvolve function 2021-08-25 01:56:25 -03:00
ghoulslash
0bbbd1e7a9 fix electric/misty yawn/rest interactions 2021-08-12 14:08:41 -06:00
ghoulslash
c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash
7b0e60c705 some tweaks 2021-08-12 12:44:53 -06:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
BuffelSaft
e1ca2af8b3
Update src/battle_util.c 
Fix copy/paste typo

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-08-08 00:52:27 +12:00