ultima-soul
425746763a
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 20:08:43 -07:00
ultima-soul
f3f4d8e608
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 19:52:20 -07:00
ultima-soul
0a87adad1a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 18:05:52 -07:00
ultima-soul
d30ab7760f
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-06-07 13:52:08 -07:00
ultima-soul
cf19635a80
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-06-07 13:15:46 -07:00
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
2563bc5c83
Merge pull request #1521 from DizzyEggg/largeexp
...
Allow larger exp gains
2021-06-06 13:33:33 -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
4bb33367df
Newline
2021-06-04 19:35:16 -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
ExpoSeed
0e96b47584
Review comments
2021-06-04 18:50:11 -05: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
DizzyEggg
4b744374c8
Allow larger exp gains
2021-06-03 23:17:44 +02:00
LOuroboros
b215b44951
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales
2021-06-03 05:09:14 -03:00
ultima-soul
fc19023087
Merge pull request #1493 from LOuroboros/feathers
...
Corrected the Wings/Feathers
2021-06-02 22:56:16 -07:00
LOuroboros
03647c7790
Adjusted the list of item hold effects
2021-06-02 17:27:45 -03:00
LOuroboros
6ccb493f12
Adjusted the list of item hold effects
2021-06-02 17:23:58 -03: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
LOuroboros
d48a6e00d4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious
2021-06-01 18:15:01 -03:00
Kurausukun
2bbaf71998
[LEAK-INFORMED] fix CreateShedinja fakematch
...
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
2021-05-31 08:20:46 -05:00
amiosi
b588e94395
more requested changes
2021-05-28 15:05:33 -04:00
amiosi
f7651fd592
most fixes from requested changes
2021-05-27 15:55:19 -04:00
amiosi
fc81994579
Merge branch 'battle_engine' into old_findings
2021-05-27 15:28:02 -04:00
ultima-soul
eedd374a5f
Merge pull request #1420 from Blackforest92/pokemon_expansion
...
Added missing gen8 battle sprites and available icons and various fixes
2021-05-24 21:13:12 -07:00
Blackforest92
d74492b591
Returning Alcremie back to monkey
2021-05-25 10:57:06 +07:00
ultima-soul
1f859e340d
Merge pull request #1415 from ghoulslash/item_expansion
...
Add Berry Hold Effects
2021-05-24 11:07:35 -07:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
ghoulslash
54b03a474d
fix SIDE_STATUS_SCREEN_ANY
2021-05-23 12:22:07 -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
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
gAlfonso-bit
2be29cdb77
Update IsPokemonCryPlaying
2021-05-13 11:23:11 -05: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
GriffinR
6ce27c0ff0
Restore EReaderTrainerHillSet dummy
2021-05-04 15:43:24 -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
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims
...
Document battler affine anims, default pokeball throw
2021-04-28 13:56:42 -04: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
c6300b5325
Merge pull request #1417 from GriffinRichards/doc-pyramidbag
...
Document Battle Pyramid Bag
2021-04-27 14:48:09 -04:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil
...
Some Contest clean up
2021-04-27 02:29:41 -04:00
