ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone
02da6cc627
Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb
...
# Conflicts:
# include/graphics.h
# src/data/graphics/items.h
# src/data/item_icon_table.h
# src/data/items.h
# src/data/text/item_descriptions.h
2022-01-16 18:44:03 -03:00
GriffinR
694aa3c65d
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
GriffinR
7103839a61
Move summary screen graphics out of interface, fix some names
2022-01-11 11:22:45 -05:00
GriffinR
fde18b4774
Fix berry crusher graphics name
2022-01-11 10:42:00 -05:00
GriffinR
0a78cb5c9e
Fix some battle dome graphics names
2022-01-11 10:04:47 -05:00
LOuroboros
74aa4f29df
Corrections and additions
...
-Fixed a handful of prices
-Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable.
-Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo.
-Fixed small syntax mistakes in src/data/text/item_descriptions.h
-Slightly changed some item descriptions based on AsparagusEduardo's suggestions.
-Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.
2022-01-01 17:17:21 -03:00
Eduardo Quezada D'Ottone
b25c89f8a1
Removed Redundant Key Stone item
2021-12-31 18:22:23 -03:00
Eduardo Quezada D'Ottone
313df31e7e
Removed Jade Orb, since it has no use besides being a key-lock item.
2021-12-31 17:44:03 -03:00
LOuroboros
5a8e51d858
Filled in missing items' sprite data
2021-12-31 16:27:06 -03:00
Eduardo Quezada D'Ottone
934ffd5a7e
Merge pull request #2002 from LOuroboros/gen78footprints
...
Added the footprints of all Gen. 7 and 8 species
2021-12-23 20:28:55 -03:00
Blackforest92
76b9459e42
fix .8bpp palette + revert hippo icons
2021-12-19 17:38:01 +07:00
Eduardo Quezada D'Ottone
39ef356be1
Merge pull request #1935 from LOuroboros/someGenderDiffs
...
Added gender differences for a couple of Gen. 4 Pokémon
2021-12-18 13:46:23 -03:00
ultima-soul
18afd06f6d
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-18 00:28:18 -08:00
ultima-soul
b0b8b9bf46
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
ultima-soul
356cf96654
Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.
2021-12-15 19:33:35 -08:00
LOuroboros
46977b52fa
Added the footprints of all Gen. 7 and 8 species
2021-12-13 13:39:12 -03:00
Blackforest92
a7c9e6e230
Reverse both Hippopotas and Hippowdon icons to use male only
2021-12-09 00:24:31 +07:00
Blackforest92
55477234ef
Palette conversion GEN5
2021-12-08 21:39:31 +07:00
Blackforest92
2ad3c3f6be
Palette Conversion GEN4
2021-12-01 19:57:50 +07:00
SonikkuA-DatH
c8fba3fa90
Update graphics.h
2021-11-28 19:36:17 -08:00
ultima-soul
01a90ca6c2
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-27 22:17:05 -08:00
ultima-soul
d0623d7b71
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-27 21:40:08 -08:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
Jaizu
b7f4658077
Added Kricketot line gender difference sprites
2021-11-22 16:30:05 -03:00
LOuroboros
8373312ed7
Add gender differences for some Gen. 4 Pokémon
...
Namely: Bidoof, Kricketot, Shinx, Starly, Staravia and Staraptor
Credits to CyanSMP64/Furret and Jaizu.
2021-11-22 16:25:25 -03:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
Wiz
927f9d27df
Designate gBattleAnimBgImage_Attract and related as arrays
2021-11-14 17:08:03 -05:00
Eduardo Quezada D'Ottone
34555b46e8
Oops
2021-11-12 14:47:35 -03:00
Eduardo Quezada D'Ottone
ae26a7529c
Restored FRLG items
2021-11-11 22:26:58 -03:00
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
