Alex
1f694ae7ed
missing pla sprites
2023-02-22 20:41:01 +01:00
Jaizu
9f7267e48d
Fix Giga Impact on contests.
2023-02-09 11:29:29 +01:00
GriffinR
5793a1a5e7
Correct some union room chat documentation
2023-02-02 11:41:02 -05:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
GriffinR
387ea563fc
Move FRLG trainer card gfx to own folder, fix tiles
2023-01-13 13:40:13 -05:00
Eduardo Quezada
55be15f690
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
...
# Conflicts:
# include/config/pokemon.h
2023-01-04 16:19:57 -03:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2
2022-12-18 17:50:39 -08:00
TheXaman
933ec5ee65
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss
2022-10-30 15:10:32 +01:00
AgustinGDLV
caaec99e77
added data and graphics for gigantamax mons
2022-10-27 16:18:37 -07:00
Eduardo Quezada
44754f8ca7
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
...
# Conflicts:
# include/constants/pokemon_config.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
2022-10-07 15:27:16 -03:00
Eduardo Quezada
ecad6ff0db
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2
2022-09-27 10:46:49 -03:00
Eduardo Quezada D'Ottone
681ad8c7a9
Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
...
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
# src/data/pokemon/form_species_table_pointers.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
2022-09-18 18:25:05 -03:00
Eduardo Quezada
ee628de82f
Config to turn off Hippopotas' and Hippowdon's female icons
2022-09-13 21:42:53 -03:00
Eduardo Quezada
0caf79f702
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
...
# Conflicts:
# graphics/pokemon/cherrim/anim_front.png
# graphics/pokemon/scyther/anim_front.png
# graphics/pokemon/scyther/front.png
# graphics/pokemon/shinx/anim_front.png
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
2022-09-13 20:44:49 -03:00
Blackforest92
29529a0c47
Remove primal_particle leftovers
2022-09-09 22:28:11 +07:00
Blackforest92
d870d71dbe
Remove windstorm_brew leftovers
2022-09-09 22:26:29 +07:00
Blackforest92
3acb32acb8
Tyding graphics - Acupressure
2022-09-09 00:25:43 +07:00
Eduardo Quezada
7fe1e706b7
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig
...
# Conflicts:
# include/constants/pokemon_config.h
2022-09-08 08:52:13 -04:00
Eduardo Quezada
5403cd036e
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
...
# Conflicts:
# include/battle.h
# include/battle_controllers.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2022-09-02 23:24:08 -04:00
Eduardo Quezada
925384eedc
Generations of Pokémon can now be disabled individually
2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6
Separated P_NEW_POKEMON into sections by generation.
...
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
2022-08-30 12:50:59 -04:00
Blackforest92
07a07ddc8d
Update to latest master branch + allow Reveal Glass to work with Enamorus
2022-08-24 15:00:48 +07:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
Eduardo Quezada
75ac960365
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
2022-08-22 17:27:21 -04:00
GriffinR
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -04:00
Blackforest92
00a827b3fb
Add PLA pokemon to Form Species Table, add Kleavor's graphics
2022-08-19 17:47:34 +07:00
GriffinR
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
Eduardo Quezada
231727d02b
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
...
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
2022-07-22 23:33:04 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
Blackforest92
ff861ff963
Add some of Legends Arceus battle sprites
2022-07-04 12:28:40 +07:00
Blackforest92
8c88e8a9b7
Legends Arceus Pokemon 95% Finished
2022-07-03 17:15:37 +07:00
hamish
307d5d93c4
add potlergeist animation
2022-05-23 08:53:08 -04:00
ghoulslash
574be40f26
Merge pull request #2099 from Greenphx9/calyrex_rider_icons
...
Calyrex Rider Icons
2022-04-27 08:43:53 -04:00
Greenphx9
b3294c60a2
Calyrex Rider Icons
2022-04-22 16:31:17 +10:00
TheXaman
8006b8dbcd
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss
2022-04-16 23:17:55 +02:00
LOuroboros
f82c946ff3
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:26:27 -03:00
LOuroboros
af2f70e000
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:21:40 -03:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
ultima-soul
2d3ba500c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2022-03-01 15:10:19 -08:00
ultima-soul
84a7f960c8
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2022-02-28 23:37:41 -08:00
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
TheXaman
111555132f
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss
2021-11-18 16:48:49 +01: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
TheXaman
c89df9d9d1
Changed graphics file structure, added DECAPPED version by NobodySociety, added constant to make custom dark palette switch easy
2021-02-12 11:16:23 +01:00
TheXaman
1b3b717248
Added Forms screen for PokemonExpansion (rhh)
2021-02-11 17:55:53 +01:00
TheXaman
fbbc604848
Added evolution screen! Improved BE compatibility
2021-02-04 13:48:32 +01: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
