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
