ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 21:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,215 Commits 1 Branch 0 Tags 235 MiB
a22a456268
Commit Graph

642 Commits

Author SHA1 Message Date
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags 
Rename flags
 2021-06-04 19:33:45 -07:00
ExpoSeed
aefd5e26d1
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-04 21:26:15 -05:00
ExpoSeed
ec2c140ecb Disambiguate Thousand Arrows flag from other flags 2021-06-04 19:34:37 -05:00
ExpoSeed
15914d7af8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags 2021-06-04 19:00:29 -05:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious 
Tweaked Oblivious
 2021-06-04 16:51:38 -07:00
LOuroboros
b552db7193 Tweaked the Oblivious immunities 
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
 2021-06-04 19:23:07 -03:00
ultima-soul
72f23ff7ba
Merge pull request #1507 from ghoulslash/flower_gift 
Add Sunny Check to Flower Gift Ally Boosts
 2021-06-02 23:35:59 -07:00
BuffelSaft
2a6b989c92 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press 2021-06-02 12:41:28 +12:00
ghoulslash
c91240068c add sun check to flower gift ally boosts 2021-05-23 14:45:21 -06:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows 
Fix Thousand Arrows
 2021-05-21 11:40:13 -04:00
ultima-soul
e864c39a5d Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-05-04 10:04:35 -07:00
ghoulslash
1ccf43b5f7
Merge pull request #1451 from LOuroboros/stench 
Implemented Stench's battle effect
 2021-05-04 09:41:13 -06:00
ghoulslash
a3e6fe1ef4
Merge pull request #1442 from LOuroboros/patch-1 
Fixed Punk Rock
 2021-05-04 09:37:54 -06:00
ghoulslash
984f49747f
Merge pull request #1454 from LOuroboros/HandleAction_UseMove 
Minor syntax tweaks to HandleAction_UseMove
 2021-05-04 09:37:10 -06:00
ghoulslash
e343090a8b
Merge pull request #1479 from BuffelSaft/orb_fix 
Fix Toxic Orb and Flame Orb affecting Pokemon they shouldn't
 2021-05-04 09:31:58 -06:00
BuffelSaft
542201dd4f Add missing ability checks to orbs 
Flame Orb shouldn't burn mons with Water Bubble and neither orb should affect mons with Comatose.
 2021-05-04 23:08:48 +12:00
BuffelSaft
e8598076a8 Fix Toxic and Flame Orb 
Shouldn't inflict status conditions on a fainted mon.
 2021-05-04 22:55:19 +12:00
LOuroboros
5489ab97e4 MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK 2021-05-01 07:37:23 -03:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
ExpoSeed
8494306d1d Rename flags 2021-04-07 16:07:30 -05:00
ExpoSeed
45405e95b0
Merge pull request #1418 from BuffelSaft/rage_powder_fix_1 
Fix powder immunity for self-targeting moves
 2021-04-07 16:06:57 -05:00
ExpoSeed
8a49d66622
Revert "Made Thousand Arrows bypass type immunity" 2021-04-07 15:03:11 -05:00
ExpoSeed
f8d3029537
Merge pull request #1453 from LOuroboros/thousand_arrows 
Made Thousand Arrows bypass type immunity
 2021-04-07 14:58:48 -05:00
ExpoSeed
df900ca310
Merge pull request #1419 from LOuroboros/mega_bracelet 
Added a check for the Mega Bracelet in CanMegaEvolve
 2021-04-04 15:06:40 -05:00
Eduardo Quezada D'Ottone
8bc91f9d23
Merge pull request #1435 from LOuroboros/defeatist 
Fixed Defeatist's check
 2021-04-04 13:59:34 -04:00
LOuroboros
63edb34fe2 Minor syntax tweaks to HandleAction_UseMove 2021-04-04 08:47:38 -03:00
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
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
Evan
1c75483f51 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ripen 2021-01-31 23:31:38 -07:00
Evan
f428e5e2dc some quick claw/custap berry fixes 2021-01-31 23:31:27 -07: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
c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
Evan
a37acb8345 coaching, lash out, burning jealousy 2021-01-28 12:21:11 -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
Evan
60f3ad77fe fix prankster blocking self-targeting moves 2021-01-23 12:40:17 -07:00
GriffinR
4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
Evan
d8d00ba967 fix orb check 2021-01-21 21:28:19 -07:00
Evan
4611c71bd1 merge with be 2021-01-21 08:55:14 -07:00
Evan
8ec12c665c merge with be 2021-01-20 17:36:13 -07:00
Evan
e61309dce6 merge with be 2021-01-20 17:34:24 -07: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
Evan
16d54b6d32 merge with be, add form checks to CanBattlerGetOrLoseItem 2021-01-20 14:28:03 -07: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
Evan
a49b5d1ad0 prankster updated to gen 7 2021-01-16 16:14:36 -07:00
Evan
c2dfc571b2 misty terrain blocks confusion 2021-01-16 12:21:04 -07:00
Evan
10b1d33d13 handle battler being affected by terrain 2021-01-16 12:05:51 -07:00
Evan
4a5a3ea6af add safeguard checks 2021-01-16 11:47:29 -07:00
Evan
9e29d303ec electric and misty terrain preventions 2021-01-16 11:40:02 -07:00
Evan
449c2bcc34 add config option 2021-01-15 18:28:10 -07:00
Evan
0d8f804194 update mental herb to gen 5 2021-01-15 18:11:55 -07:00
sbird
5d02cc2059 [battle_engine] fix wrap style move damage 2021-01-15 16:04:09 +01:00
LOuroboros
c2f718d3d3 Implemented Cramorant's Gulp Missile form change 2021-01-14 17:23:09 -03:00
Evan
9902f6e603 merge with be 2021-01-13 14:32:14 -07: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
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00
Evan
c95bfae701 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects 2021-01-10 09:02:21 -07: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
Evan
6dabff1ee3 merge with be 2021-01-07 21:24:21 -07:00
Evan
2bd5167a6c eject pack 2021-01-07 21:11:56 -07:00
Evan
5eb49722c0 add red card effect 2021-01-07 19:33:39 -07: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
Evan
bf644f23a7 add heavy duty boots 2021-01-06 20:53:48 -07:00
Evan
7fffe23e63 add terrain seeds 2021-01-06 20:22:05 -07:00
Evan
c1dd3fca21 add room service 2021-01-06 18:00:14 -07:00
Evan
0cdab790dc add blunder policy 2021-01-06 15:40:20 -07:00
Evan
db6f9d05ec add throat spray 2021-01-06 15:28:58 -07:00
Evan
aac3f9c3db kee, maranga, sitrus beries 2021-01-06 13:07:18 -07:00
Evan
c3615485f3 merge in berry branch 2021-01-06 12:54:02 -07:00
Evan
7646855e79 jaboca, rowap berry effects 2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad micle berry 2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d custap berry effect, custap/quick claw activation message 2021-01-06 09:37:31 -07:00
Evan
d3ae05189d resist berry ripen boost 2021-01-05 22:21:38 -07:00
Evan
b3a6df8d57 stat raising berries 2021-01-05 22:13:32 -07:00
Evan
f046a25ce0 ripen & hp restoring berries 2021-01-05 21:15:21 -07:00
Evan
4c1e8f2f2e add curious medicine 2021-01-05 20:02:11 -07:00
Evan
0a3908ee92 add neigh and as one abilities 2021-01-05 19:37:23 -07:00
LOuroboros
3246c20be5 Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers 2021-01-05 19:51:52 -03:00
Evan
4923af960e steely spirit, screen cleaner, transistor, dragon's maw 2021-01-05 15:44:12 -07: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