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
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
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
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
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
