ultima-soul
|
c74e19c062
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
|
2021-11-09 20:58:19 -08:00 |
|
ultima-soul
|
69e3719f75
|
Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar.
|
2021-11-09 19:19:48 -08:00 |
|
Blackforest92
|
76ba9d835a
|
pulled latest RHH battle_engine 08-11-2021
|
2021-11-08 16:38:42 +07:00 |
|
GriffinR
|
085f8adec6
|
Start remaining menu documentation
|
2021-11-03 17:38:08 -04:00 |
|
Blackforest92
|
b9c23f7c62
|
Update waterfall, trick room, & focus blast BG
|
2021-11-03 16:29:09 +07:00 |
|
Blackforest92
|
2d5ed4a1e2
|
Allow Giga Impact fadein background & upgrade its graphic
|
2021-11-02 12:53:11 +07:00 |
|
Eduardo Quezada D'Ottone
|
f3013d8ee9
|
Standarized Solarbeam into Solar Beam
|
2021-11-01 18:36:35 -03:00 |
|
Blackforest92
|
9b6cd383a4
|
Optimized Rock Wrecker and Hurricane
|
2021-11-01 01:06:39 +07:00 |
|
Blackforest92
|
e59d0dd5cf
|
clean Spacial Rend background
|
2021-10-31 22:58:43 +07:00 |
|
Blackforest92
|
799852ea77
|
Introduce alternate Steel Beam
|
2021-10-30 17:00:55 +07:00 |
|
GriffinR
|
41ecae91f8
|
Label remaining symbols in graphics.c
|
2021-10-27 13:47:18 -04:00 |
|
BuffelSaft
|
adcf563ba1
|
Add missing berry data
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
|
2021-10-26 14:42:06 +13:00 |
|
LOuroboros
|
d31700d2ac
|
Replaced the Red and Blue Orbs' sprites
|
2021-10-23 13:49:02 -03:00 |
|
LOuroboros
|
91a68cd5db
|
Implemented Primal Reversion
|
2021-10-09 00:36:41 -03:00 |
|
Eduardo Quezada D'Ottone
|
08d3c31abe
|
Merge pull request #1584 from Blackforest92/pokemon_expansion
Port missing Gen8 icons from DPE
|
2021-09-20 22:48:57 -03:00 |
|
BuffelSaft
|
db928a1329
|
Data entry for new sprites
Add sprite defines, entries to gender tables, etc.
|
2021-09-11 14:12:41 +12:00 |
|
LOuroboros
|
69b7910f47
|
Gave an entrance animation to Delta Stream
|
2021-08-31 00:15:17 -03:00 |
|
ultima-soul
|
5cb73a012c
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
|
2021-08-30 11:57:27 -07:00 |
|
LOuroboros
|
5c1d7e52dc
|
Added footprints for Gen. 6 species
|
2021-08-23 06:28:10 -03: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 |
|
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
|
3bd81d347d
|
Add missing Gen8 icons
|
2021-07-31 14:48:55 +07: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 |
|
ultima-soul
|
9e0b866f09
|
Rearranged Poke Ball item ids.
|
2021-06-18 21:46:20 -07: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 |
|
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 |
|
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
|
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
|
cd2a99b7c4
|
Doc storage - misc cleanup, some item/cursor
|
2021-04-17 13:33:29 -04:00 |
|
GriffinR
|
042a2ecc41
|
Document pokeblock feed scene
|
2021-04-12 18:44:37 -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
|
50e9666e16
|
Merge branch 'master' into doc-introcred
|
2021-03-29 20:56:15 -04:00 |
|
GriffinR
|
dea07dc865
|
Standardize intro gfx names
|
2021-03-29 20:48:48 -04:00 |
|
GriffinR
|
c86cc8b371
|
Document intro, start intro_credits/credits
|
2021-03-28 23:13:56 -04: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
|
22e2c0a47c
|
Document Berry Crush
|
2021-03-18 15:18:23 -04:00 |
|
Blackforest92
|
badf8945d8
|
Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie
|
2021-03-14 18:31:24 +07:00 |
|
GriffinR
|
031da44cab
|
Document mon markings
|
2021-02-28 17:11:46 -06:00 |
|
Marcus Huderle
|
a85fada314
|
Document more battle anim effects
|
2021-02-28 09:54:55 -06: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
|
64fc585cc3
|
Document pokenav ribbons summary screen
|
2021-02-18 11:33:55 -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
|
762dcb8a7c
|
cry fixes, type null
|
2021-02-03 14:10:39 -05:00 |
|
amiosi
|
f46f21bb38
|
tapus again
|
2021-02-02 14:40:04 -05:00 |
|
amiosi
|
9c2c337e6f
|
tapu case
|
2021-02-02 14:24:15 -05:00 |
|
amiosi
|
f700004188
|
proper CamelCase
|
2021-02-02 14:21:00 -05:00 |
|
ultima-soul
|
5fdb578747
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-02-01 15:58:18 -08:00 |
|
ultima-soul
|
2a20d50904
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-02-01 15:54:08 -08:00 |
|
ultima-soul
|
96232ea166
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-01-28 23:59:08 -08:00 |
|
Evan
|
4912bc1d25
|
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion
|
2021-01-11 17:15:41 -07:00 |
|
GriffinR
|
e0c0143f41
|
Fix substitute back sprite
|
2021-01-04 10:14:01 -05:00 |
|
ExpoSeed
|
7dadcb94b8
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-03 17:14:43 -06:00 |
|
ExpoSeed
|
10f4b48215
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-01 14:14:51 -08:00 |
|
ExpoSeed
|
208e0abe04
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2020-12-31 18:44:43 -06:00 |
|
GriffinR
|
ec85c01e7c
|
Merge branch 'master' into doc-factscreen
|
2020-12-31 00:40:45 -05:00 |
|
GriffinR
|
0bf49198f6
|
Resume factory screen doc
|
2020-12-30 13:28:15 -05:00 |
|
ultima-soul
|
c675c92a1d
|
Add Gen 8 Pokemon data.
|
2020-12-16 12:57:36 -08:00 |
|
Evan
|
a0ae0ece53
|
add ultranecrozium-z and update z crystal data
|
2020-12-08 09:55:50 -07:00 |
|
Evan
|
539a88207e
|
add z crystal and z ring
|
2020-11-29 10:00:03 -05:00 |
|
GriffinR
|
9d056e8656
|
Move object event pal declarations to graphics
|
2020-11-23 14:45:16 -05:00 |
|
Eduardo Quezada D'Ottone
|
29c33b908b
|
Apply suggestions from code review
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2020-11-13 21:34:37 -03:00 |
|
Eduardo Quezada D'Ottone
|
b2f078410f
|
Review changes 2
|
2020-11-13 16:13:13 -03:00 |
|
Eduardo Quezada D'Ottone
|
26db02e95a
|
Review changes 1
|
2020-11-13 15:36:36 -03:00 |
|
Eduardo Quezada D'Ottone
|
caf6253ba3
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
# src/pokemon_icon.c
|
2020-11-10 19:37:02 -03:00 |
|
Eduardo Quezada D'Ottone
|
3849f7dd5d
|
Female Eevee backsprite.
|
2020-11-06 16:45:25 -03:00 |
|
Eduardo Quezada D'Ottone
|
4d4b111327
|
Front pic gender differences for Eevee
|
2020-11-06 16:21:45 -03:00 |
|
Eduardo Quezada D'Ottone
|
0c6dc6abab
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
# graphics/pokemon/burmy/footprint.png
# graphics/pokemon/gastrodon/footprint.png
# graphics/pokemon/rotom/footprint.png
# graphics/pokemon/shellos/footprint.png
# graphics/pokemon/wormadam/footprint.png
# include/constants/species.h
# src/data/pokemon/base_stats.h
|
2020-11-03 00:13:51 -03:00 |
|
LOuroboros
|
7cf3c256cd
|
Added footprints for the Gen. 5 species, thanks to Blackforest
|
2020-11-01 09:44:05 -03:00 |
|
LOuroboros
|
6435158742
|
Added footprints for the Gen. 4 species
|
2020-10-27 09:38:04 -03:00 |
|
Eduardo Quezada
|
92728a1875
|
Added Ultimasoul's Forms from his FromID system.
|
2020-10-23 11:44:47 -03:00 |
|
Eduardo Quezada D'Ottone
|
38573ab402
|
Merge pull request #16 from LOuroboros/deoxys
Added the data of Deoxys' forms
|
2020-10-22 00:52:40 -03:00 |
|
Evan
|
d64b926469
|
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion
|
2020-10-19 11:22:41 -06:00 |
|
DizzyEggg
|
97d0643110
|
Merge with master
|
2020-09-08 12:48:28 +02:00 |
|
DizzyEggg
|
448599f53c
|
Merge with master
|
2020-09-08 12:01:20 +02:00 |
|
DizzyEggg
|
271219f962
|
Merge with master
|
2020-09-08 12:00:51 +02:00 |
|
PikalaxALT
|
c3f6c56e19
|
Merge pull request #1161 from GriffinRichards/doc-wallclock
Document wall clock data
|
2020-09-04 19:48:04 -04:00 |
|