ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 21:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,233 Commits 1 Branch 0 Tags 235 MiB
d65d5cb8fd
Commit Graph

416 Commits

Author SHA1 Message Date
Evan
0664daf384 fix some post-merge errors 2021-02-12 11:02:10 -07:00
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
ghoulslash
a00db597ba
Merge pull request #1383 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-02-02 10:02:31 -07:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
Lukien
9704049818 Merge remote-tracking branch 'upstream/battle_engine' into battle_engine 2021-01-31 22:46:27 -05:00
Lukien
f69bff6605 Update battle_util.c 
Added weather check for the ability Sand Force.
 2021-01-31 22:43:16 -05:00
Evan
be0326301d erge branch 'thaw' of https://github.com/ghoulslash/pokeemerald into thaw 2021-01-31 14:55:56 -07:00
Evan
552f548700 fix IsThawingMove 2021-01-31 14:55:44 -07:00
ghoulslash
9499469337
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-31 14:43:24 -07:00
Evan
a104c156cc thaw move list function 2021-01-28 09:00:46 -07:00
Evan
c003f1c023 check move effectiveness with status effects 2021-01-26 15:41:59 -07:00
LOuroboros
c4a7205b6f Added As One to the untraceable abilities list 2021-01-25 15:37:11 -03:00
LOuroboros
7c9ddd23c1 Updated the list of untraceable abilities 2021-01-25 14:55:51 -03:00
ultima-soul
833218cc5b
Merge pull request #1354 from SBird1337/fix/wrap 
Fix wrap-style move damage
 2021-01-25 09:50:12 -08:00
LOuroboros
2a888a7b3e
Corrected base species check for Thick Club's effect 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-20 19:30:48 -03:00
LOuroboros
a6b03d45a8 Made the Thick Club's effect use the new GET_BASE_SPECIES_ID macro 2021-01-20 18:16:02 -03:00
LOuroboros
c90cbc0021 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into thick_club 2021-01-20 18:15:37 -03:00
sbird
5d02cc2059 [battle_engine] fix wrap style move damage 2021-01-15 16:04:09 +01:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
Evan
56395a060f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-13 09:23:07 -07:00
surskitty
a0f1dcb9cf Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2021-01-10 15:40:21 -05:00
Evan
e748db8ef4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-10 08:58:16 -07:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant 
battle_config.h tweaks
 2021-01-09 12:36:37 -08:00
ultima-soul
1caed479de
Merge pull request #1298 from ghoulslash/mummy 
Fix Early Mummy Activation
 2021-01-09 12:33:04 -08:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE 
Implemented various Gen. 8 abilities
 2021-01-07 13:31:17 -08:00
LOuroboros
de9b0328ec Corrections to Steam Engine 2021-01-07 16:33:52 -03:00
LOuroboros
339aa95c1d Review corrections 
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
 2021-01-07 04:31:26 -03:00
LOuroboros
3246c20be5 Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers 2021-01-05 19:51:52 -03:00
Evan
5ae1e3c25b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-04 11:43:36 -07:00
LOuroboros
517c8ffdd0 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE 2021-01-03 22:05:14 -03:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
LOuroboros
da1f525d45 Made Alolan Marowak be affected by Thick Club 2021-01-03 09:58:19 -03:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
LOuroboros
320cc37ac9 USE_BATTLE_DEBUG -> B_ENABLE_DEBUG 2020-12-23 14:04:14 -03:00
Evan
7988a1f41d Ai_TryOnAlly and reorganize files 2020-12-20 14:47:20 -07:00
LOuroboros
819001c102 Removed redundant check in Punk Rock's effect 2020-12-19 19:15:12 -03:00
LOuroboros
a417a1b2b9 Corrected Punk Rock's checks 2020-12-19 16:18:39 -03:00
Evan
916d0416e3 outline AI_CheckGoodMove 2020-12-15 21:57:33 -07:00
Evan
259e59bae0 fix early mummy activation on two-turn moves 2020-12-14 12:27:48 -07:00
Evan
ac332d5e98 check bad move 2020-12-13 15:02:21 -07:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
LOuroboros
1f10b94a11 Implemented Power Spot 2020-12-12 21:22:42 -03:00
LOuroboros
305bea32df Added missing check to Flower Gift (offensive) 2020-12-12 20:32:52 -03:00
LOuroboros
8e187d1d5b Implemented Ice Scales 2020-12-12 19:39:35 -03:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
c930a63c84 Implemented Punk Rock 2020-12-11 19:46:33 -03:00
LOuroboros
2b0702ec04 Implemented Perish Body 
Inspired by Raguzero's implementation.
 2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8 Implemented Sand Spit 2020-12-11 16:47:23 -03:00
LOuroboros
322918e280 Implemented Steam Engine 
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
 2020-12-10 18:27:35 -03:00
LOuroboros
c9824a8dd9 Fixed Cotton Down 
It was tough, but the nightmare is finally over.
Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
 2020-12-07 20:08:36 -03:00