ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-23 20:00:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,434 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

914 Commits

Author SHA1 Message Date
LOuroboros
228f711bf6 Made Thousand Arrows bypass type immunity 2021-04-04 07:38:38 -03:00
LOuroboros
9f83c9b574 Implemented Stench's battle effect 
And updated its description.
 2021-04-03 23:47:10 -03:00
GriffinR
b6711441f5 Fix AI Guard Spec use, and Specs->Spec 2021-04-03 15:18:17 -04:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
LOuroboros
5106867116
Update battle_util.c 2021-04-02 04:10:20 +00:00
BuffelSaft
20a7dec070 Fix Thousand Arrows vs. Flying Type 
Should ignore type modifiers against flying types that aren't grounded. Previous code just negated the targets' flying typing.
 2021-04-01 17:23:47 +13:00
LOuroboros
60b566f8b6 Fixed Defeatist's check 2021-03-31 20:17:05 -03:00
BuffelSaft
35add44a90 Thousand Arrows hits airborne targets 
Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc.
Also fixed its effect chance, which was 0 instead of 100.
 2021-03-31 23:05:30 +13:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
ghoulslash
856781ce56
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:03:05 -06:00
ghoulslash
a8c40a8d6f
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:03:00 -06:00
ghoulslash
332286ce03
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:56 -06:00
ghoulslash
d7c7f808b8
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:51 -06:00
ghoulslash
97428b6e10
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:46 -06:00
ghoulslash
31cdf043cc
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:41 -06:00
ghoulslash
d0f5528abb
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:34 -06:00
ghoulslash
492b5718e7
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:21 -06:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
Scott
5cb8ec4247 Rename IsNotEventLegalMewOrDeoxys 2021-03-27 17:27:32 -05:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
BuffelSaft
937c24ca51 Remove special Body Press effect 
Only include the official effect for Body Press to stay faithful to the gen 8 games.
 2021-03-16 23:37:02 +13:00
BuffelSaft
7d237d8ff6 Implement Body Press' effect 
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
 2021-03-16 22:56:44 +13:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen 
Add Ripen and Finish Gen4 Berries
 2021-03-13 11:16:42 -03:00
LOuroboros
aa4c28dcf3 Added a check for the Mega Bracelet in CanMegaEvolve 2021-03-10 09:10:58 -03:00
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
ghoulslash
208b964a56
Update src/battle_util.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-03-09 16:35:56 -07:00
ExpoSeed
9ec04fcce8
Merge pull request #1397 from ghoulslash/escape 
Fix Ghost Types Unable to Escape
 2021-03-08 17:24:00 -06:00
BuffelSaft
1f54233953 Fix powder immunity for self-targeting moves 
Example: Because Rage Powder targets the user, this check is needed to allow grass types to use it.
 2021-03-07 11:00:52 +13:00
ghoulslash
5207d48b21
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 10:48:11 -07:00
ghoulslash
6739433e9e
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 10:48:05 -07:00
ghoulslash
64e3f7dc24
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 10:47:59 -07:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
99c8bd19ca
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:25 -07:00
ghoulslash
3edb7ede29
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:20 -07:00
ghoulslash
43ec4e1041
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:14 -07:00
ghoulslash
63b1a02c28
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:13:56 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities 
More Gen 8 Abilities
 2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
Deokishisu
7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal 
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
 2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h 
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
 2021-02-15 11:40:16 -05:00
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
Evan
5e8c8a6aaf fix ghost types unable to escape from mean look/trap 2021-02-07 12:05:55 -07:00
GriffinR
0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05: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
Evan
00cbe61e13 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities 2021-02-02 09:00:12 -07:00
Evan
f4d4cf262e fix screen cleaner, curious medicine, as one 2021-02-02 09:00:07 -07:00