LOuroboros
0bc8ed59f5
Wings -> Feathers
2021-05-17 21:58:17 -03:00
ultima-soul
50c2514267
Merge pull request #1469 from ultima-soul/pokemon_expansion_sync
...
Pokemon Expansion Upstream Sync
2021-05-13 20:56:29 -07:00
GriffinR
65fd334256
Name map groups
2021-05-11 10:16:04 -05:00
LOuroboros
95d41524a2
Implemented Clanging Scales' effect
2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89
Fix Substitute typo
2021-05-06 20:49:04 -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
ultima-soul
cf0fd961b9
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 23:56:58 -07:00
ultima-soul
00c3f060b1
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-28 23:53:23 -07:00
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
...
Document TV
2021-04-29 00:25:01 -04:00
ultima-soul
75a9fdbafa
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-28 20:50:59 -07:00
ultima-soul
0da3f74a7e
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 18:58:38 -07:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp
...
Sync e-reader helpers, document trainer hill e-reader
2021-04-28 06:08:57 -04:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
aad090e154
Document TV
2021-04-26 12:35:35 -04:00
GriffinR
86475c5ded
Document trainer hill ereader
2021-04-24 18:04:27 -04:00
GriffinR
bc9fc38254
Misc contest cleanup
2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
ExpoSeed
f922d42988
Refactor hidden abilities
2021-04-16 23:38:35 -05:00
ExpoSeed
db2b995bc6
Introduce NUM_ABILITY_SLOTS
2021-04-16 23:37:55 -05:00
ExpoSeed
27c6964a05
Merge branch 'num_ability_slots' into BE/num_ability_slots
2021-04-16 20:45:34 -05:00
ExpoSeed
49bb345338
Introduce NUM_ABILITY_SLOTS
2021-04-16 20:36:45 -05:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim
...
Document Pokémon animation
2021-04-13 01:36:15 -04:00
ghoulslash
98bccaa35d
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion
2021-04-10 14:28:07 -06:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field
...
Document field
2021-04-10 13:05:51 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc
...
Clean up battle scripts
2021-04-10 12:41:35 -04:00
GriffinR
72ba8cf58d
Document pokemon animation types
2021-04-10 00:50:28 -04:00
ExpoSeed
8494306d1d
Rename flags
2021-04-07 16:07:30 -05:00
LOuroboros
75b6d2837e
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller
2021-04-07 17:10:52 -03:00
GriffinR
4a1cfbead2
Document remaining overworld
2021-04-06 16:55:43 -04:00
GriffinR
86a9d94ce1
Document fieldmap
2021-04-06 16:05:43 -04:00
GriffinR
756fad0e61
Document some event object movement
2021-04-06 14:34:36 -04:00
GriffinR
00c3044c96
Clarify Groudon/Kyogre/Rayquaza gfx names
2021-04-06 02:38:15 -04:00
ultima-soul
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07: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
LOuroboros
f04f35f5c3
Added a config for the amount of HP recovered by healing items
2021-04-02 20:34:57 -03:00
ultima-soul
4a81102a46
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 13:16:40 -07:00
GriffinR
1b8d405b5e
Add missing include guard suffixes
2021-04-02 12:54:40 -04:00
GriffinR
c9d3b26ff7
Label miss string indexes
2021-04-02 02:12:46 -04:00
GriffinR
8be2c5d60b
Document Contest Lady TV Show
2021-04-02 01:49:38 -04:00
GriffinR
a0b3d4df12
Merge pull request #1390 from GriffinRichards/doc-introcred
...
Document intro and credits sequences
2021-04-01 23:13:59 -04:00
GriffinR
771a434730
Label Trend Watcher TV show texts
2021-03-31 16:29:42 -04:00
GriffinR
86856098a3
Document Dewford Trend
2021-03-31 16:08:42 -04: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
50e9666e16
Merge branch 'master' into doc-introcred
2021-03-29 20:56:15 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush
...
Document Berry Crush
2021-03-29 12:38:16 -04:00
GriffinR
62968895ca
Add MON_PIC_SIZE constant
2021-03-29 09:38:19 -04:00
ghoulslash
a595b213b4
merge with be
2021-03-28 17:29:22 -06:00
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
7abfe7469a
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-03-23 18:41:53 -07:00
ultima-soul
56a1cab314
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
GriffinR
6127c6f32e
Misc labels in battle facilities
2021-03-22 15:30:19 -05:00
GriffinR
22e2c0a47c
Document Berry Crush
2021-03-18 15:18:23 -04: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
amiosi
b081a00891
Merge branch 'battle_engine' into old_findings
2021-03-13 09:59:09 -05: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
ghoulslash
3f9bf5acc0
merge with be
2021-03-09 10:33:48 -07:00
GriffinR
55a40b901f
Label battle tower link script
2021-03-04 19:30:19 -06:00
Evan
791fd5e709
finish berry hold effects
2021-03-03 09:25:25 -07:00
Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
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
ultima-soul
46e853c13b
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:23:23 -08:00
ultima-soul
daf5e0167e
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:06:48 -08:00
amiosi
663cc5b15c
oricorio...
2021-02-03 13:02:13 -05:00
amiosi
2d6b80455d
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
2021-02-02 13:25:53 -05:00