ghoulslash
|
03fa4939ff
|
merge with pret
|
2021-08-18 20:22:03 -06:00 |
|
ghoulslash
|
019a582c47
|
replace level bonus with current chain
|
2021-08-18 20:02:44 -06:00 |
|
ultima-soul
|
4c3ed52c2f
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:39:11 -07:00 |
|
ultima-soul
|
988320b89a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:25:13 -07:00 |
|
ultima-soul
|
840e2bc3f9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-08-16 16:33:34 -07:00 |
|
ultima-soul
|
76a7a2720d
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-16 16:10:59 -07:00 |
|
ultima-soul
|
b620349da0
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-16 15:43:27 -07:00 |
|
ultima-soul
|
64a48800c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-08-11 17:10:57 -07:00 |
|
ultima-soul
|
3f75a58137
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-11 16:55:29 -07:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
BuffelSaft
|
017a0fb693
|
Fix Mienshao's front sprite
|
2021-08-09 21:48:12 +12:00 |
|
cynderquil
|
757207ff84
|
Fix Bastiodon's second icon frame
|
2021-08-07 21:39:06 +01:00 |
|
GriffinR
|
3e60a78406
|
Merge branch 'master' into doc-frontierpass2
|
2021-07-31 13:30:40 -04:00 |
|
GriffinR
|
602855ea99
|
Document frontier pass
|
2021-07-31 13:28:08 -04:00 |
|
Blackforest92
|
72dfb281e9
|
Fix DUSTOX's backsprite
|
2021-07-31 15:01:05 +07:00 |
|
Blackforest92
|
3bd81d347d
|
Add missing Gen8 icons
|
2021-07-31 14:48:55 +07:00 |
|
Blackforest92
|
365b578a66
|
Fix Arctozolt, Heliolisk, and Chespin
|
2021-07-24 13:46:02 +07:00 |
|
GriffinR
|
72bb2bd160
|
Merge pull request #1474 from GriffinRichards/clean-miragetower
Clean up Mirage Tower
|
2021-07-10 23:26:41 -04:00 |
|
ultima-soul
|
ad8cfda831
|
Add and rearrange Key Items.
|
2021-07-06 17:03:46 -07:00 |
|
ultima-soul
|
53e900a643
|
Rearranged rest of item ids except for Key Items.
|
2021-07-02 22:43:50 -07:00 |
|
GriffinR
|
10886a586b
|
Clean up mirage tower
|
2021-07-01 23:46:15 -04:00 |
|
ghoulslash
|
c06029bc72
|
add last used ball
|
2021-06-25 13:37:59 -06:00 |
|
TheXaman
|
3c22d55130
|
form screen new navigation buttons and special case for Unown
|
2021-06-14 19:18:06 +02:00 |
|
TheXaman
|
6b8f40b3b1
|
new layout for evo screen and new buttons for the PE version
|
2021-06-14 17:29:42 +02:00 |
|
TheXaman
|
d0012305c0
|
stats page new navigation button prompts
|
2021-06-14 14:55:55 +02:00 |
|
TheXaman
|
982647d36c
|
Evolution screen now shows caught ball, new options for hiding unseen evolution names
|
2021-06-14 12:28:56 +02:00 |
|
TheXaman
|
3896ce3abe
|
changed info per stats toggle page to an equal 5
|
2021-06-13 00:09:27 +02:00 |
|
TheXaman
|
73cc40fd03
|
Egg cycles now with icons insteat of numbers
|
2021-06-12 19:52:43 +02:00 |
|
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 |
|
Blackforest92
|
d1261165b8
|
Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor
|
2021-05-25 11:44:47 +07: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 |
|
ghoulslash
|
c356ffaed4
|
merge with be. fix null ptr check in GetBattleMoveSplit
|
2021-05-24 10:46:53 -06:00 |
|
ghoulslash
|
3c4bf808f1
|
merge with pret
|
2021-05-18 09:31:34 -06:00 |
|
LOuroboros
|
0bc8ed59f5
|
Wings -> Feathers
|
2021-05-17 21:58:17 -03:00 |
|
Ariel Antonitis
|
bfe0c58326
|
Merge branch 'romhack' into lighting
|
2021-05-05 20:01:15 -04:00 |
|
Ariel Antonitis
|
7d420b22e8
|
Added affine animations for followers entering/exiting pokeball.
|
2021-05-05 19:58:44 -04:00 |
|
Ariel Antonitis
|
3201422bbb
|
Merge branch 'master' into romhack
|
2021-05-04 22:14:50 -04:00 |
|
Ariel Antonitis
|
7b59eabbcf
|
Changed fog to be compatible with transparent shadows.
|
2021-05-02 02:54:55 -04: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 |
|
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 |
|
ultima-soul
|
14a0303e2f
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-27 18:36:37 -07:00 |
|
GriffinR
|
18f85b5cf0
|
Merge pull request #1415 from GriffinRichards/doc-contestutil
Some Contest clean up
|
2021-04-27 02:29:41 -04:00 |
|
GriffinR
|
c0aedf8df4
|
Merge pull request #1410 from GriffinRichards/doc-tradedata
Document trade sequence animation, some trade cleanup
|
2021-04-26 13:26:12 -04:00 |
|
Ariel Antonitis
|
73d060b3b6
|
Added glowing colors for some follower pokemon (Ampharos).
|
2021-04-25 16:26:23 -04:00 |
|