ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-14 23:53:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,305 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

810 Commits

Author SHA1 Message Date
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
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
LOuroboros
0bc8ed59f5 Wings -> Feathers 2021-05-17 21:58:17 -03: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
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR
a2a9f22612 Clean up contest_util 2021-04-20 21:16:47 -04:00
GriffinR
04af378904 Document trade sequence animation, some trade cleanup 2021-04-20 05:50:39 -04:00
GriffinR
52495e889f Doc storage - cleanup 2021-04-18 01:44:25 -04:00
GriffinR
c921994ce1 Doc storage - tilemap util, place change 2021-04-17 19:02:30 -04:00
GriffinR
cd2a99b7c4 Doc storage - misc cleanup, some item/cursor 2021-04-17 13:33:29 -04:00
GriffinR
84e1cbaaa6 Doc storage - misc gfx, item icons 2021-04-15 22:07:12 -04:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR
7645be27eb Label unused move anims in anim_effects_3 2021-04-13 03:28:03 -04:00
ExpoSeed
d24ee25c94
Merge pull request #1431 from LOuroboros/misaligned_icons 
Corrected the position of some icon sprites
 2021-04-07 16:06:19 -05:00
GriffinR
0dc7ff8994 Minor misc field doc 2021-04-06 17:17:41 -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
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
a0b3d4df12
Merge pull request #1390 from GriffinRichards/doc-introcred 
Document intro and credits sequences
 2021-04-01 23:13:59 -04:00
GriffinR
691c680908 Delete unreferenced palette 2021-04-01 14:32:23 -04:00
GriffinR
f58465a274 Document match_call.c 2021-04-01 03:29:15 -04:00
GriffinR
5ba858d19c Label missing easy chat symbols 2021-03-31 16:56:10 -04:00
LOuroboros
c81b8bdfa8 Corrected the position of some icon sprites 2021-03-31 00:50:27 -03:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred 2021-03-29 20:56:15 -04:00