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
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
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05: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
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
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
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
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
