ghoulslash
3a30fe900a
Update include/constants/hold_effects.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:49 -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
55649a67cc
Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain
2021-03-01 11:23:05 -07:00
Evan
55b8538f68
merge with be
2021-03-01 11:22:37 -07:00
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns
...
Update tailwind timer To Gen5
2021-03-01 08:51:40 -08:00
GriffinR
c6141fea83
Document easy chat
2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe
Document mail
2021-02-24 11:03:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons
...
Document some ribbon usage
2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
...
Document PokemonUseItemEffects
2021-02-22 12:15:19 -05:00
SphericalIce
381116b3c4
Add labels for cracked floor metatiles
2021-02-22 15:29:14 +00:00
GriffinR
02c1fbd733
Document ribbon TV show, add new ribbon IDs/size
2021-02-18 09:59:24 -05:00
GriffinR
e059c4fdfa
Use new gift ribbons size, label unused ribbons
2021-02-17 14:11:45 -05:00
GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb
...
Document remainder of secret_base.c
2021-02-15 17:41:55 -05: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
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried
...
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 21:48:21 -05:00
SphericalIce
56e047f949
Fix Lilcove Motel typos
2021-02-14 21:38:39 +00:00
SphericalIce
70ff6c3b84
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts
...
Label unused layouts
2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree
...
Add berry tree id constants
2021-02-14 14:15:51 -05:00
Evan
d65d5cb8fd
add AI_FLAG_SMART_SWITCHING, some burn checks
2021-02-14 09:37:04 -07:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -07:00
LOuroboros
21ee6cb9fb
Added constant labels for EV manipulating item effects
2021-02-12 07:26:11 -03:00
amiosi
1df295a582
battle config and zippy zap
...
plus fix mirror move mistakes
2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af
water shuriken and howl
2021-02-11 16:20:13 -05:00
GriffinR
20b76c6071
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
GriffinR
2237d0748f
Label unused layouts
2021-02-08 14:45:56 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
GriffinR
a240481d5f
Document secret_base.c
2021-02-05 12:08:25 -05:00
Deokishisu
ac43365d58
Fix "Compatibility" Misspelling
...
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
2021-02-05 01:27:11 -05: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
c003f1c023
check move effectiveness with status effects
2021-01-26 15:41:59 -07:00
GriffinR
0064333e4a
Clean up scrcmd.c
2021-01-26 02:16:26 -05:00
Evan
5aff5333dc
fix B_MEMENTO_FAIL comment
2021-01-21 12:05:01 -07:00
Evan
bfb7333507
memento gen4 failing
2021-01-21 12:03:30 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv
...
Document battle tv data
2021-01-21 12:27:14 -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
Evan
e61309dce6
merge with be
2021-01-20 17:34:24 -07:00
Evan
16d54b6d32
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 14:28:03 -07:00
ExpoSeed
61db82e64a
Revert "Included global.h into battle_config.h"
2021-01-19 22:55:08 -06:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro
...
Use constants for item data, misc other constants/fixes
2021-01-19 20:49:58 -05:00
ghoulslash
9d9da6a485
Update include/constants/battle_config.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-19 15:01:51 -07:00
Evan
b576eb5247
fix var_terrain default, wording
2021-01-19 13:26:36 -07:00
GriffinR
752982552e
Add FIRST_BALL, some FIRST_BERRY_INDEX usage
2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472
Name color return values more accurately
2021-01-19 17:59:36 +00:00
SphericalIce
8de76ed533
Make broader use of RGB macros
2021-01-19 17:15:12 +00:00
