Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

576 Commits

Author SHA1 Message Date
leo60228
f6e5076dc0
add new sprites 2023-10-24 23:20:59 -04:00
Eduardo Quezada
ed3e2f8e09 Gen 9 form order 2023-10-23 13:30:32 -03:00
Eduardo Quezada
174ad11535 SPECIES_GIMMIGHOUL_CHEST 2023-10-23 12:09:44 -03:00
Eduardo Quezada
2e9e157cf8 SPECIES_DUDUNSPARCE_TWO_SEGMENT 2023-10-23 11:45:15 -03:00
Eduardo Quezada
82bb758d19 SPECIES_PALAFIN_ZERO 2023-10-23 11:08:06 -03:00
Eduardo Quezada
792aee86ea SPECIES_SQUAWKABILLY_GREEN_PLUMAGE 2023-10-23 10:55:16 -03:00
Eduardo Quezada
ff60b7ff73 Maushold Family of Three define 2023-10-23 10:24:47 -03:00
Eduardo Quezada
e6c5077d7c Oinkologne Male define 2023-10-23 10:12:55 -03:00
Eduardo Quezada
a92a3256df Fixed Paldean Tauros Combat Breed order and data names 2023-10-23 09:33:37 -03:00
Eduardo Quezada
f570d14f2d Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration 
# Conflicts:
#	include/constants/species.h
#	sound/cry_tables.inc
#	src/data/pokemon_graphics/enemy_mon_elevation.h
#	src/data/pokemon_graphics/front_pic_anims.h
 2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248) 
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
 2023-10-23 12:59:15 +01:00
kittenchilly
d495e177b9
Add Snow weather animation (#3440) 
* Snow weather animation

* Update battle_anim_scripts.s

* Apply changes from review
 2023-10-22 21:15:07 +02:00
sbird
196038eaee [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
leo60228
ba0534386d
Address review 2023-10-18 14:37:29 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems 
(cherry picked from commit 6dc58dcc1797f8b72170c2c104c9cdf9b53c7b50)
 2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder 
(cherry picked from commit e081d2b7730d2a7554b88af3a39ba3a2c0f5ba01)
 2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder 
Add gen 9 Pokémon data

(cherry picked from commit cd3e65f5c92b22f1ce48f4f8275796d40f2ef1c6)
 2023-10-18 14:33:56 -04:00
Eduardo Quezada
c0540a3559 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-10-15 00:30:00 -03:00
kittenchilly
a795148068
Add Pikachu World Cap mini icon (#3401) 2023-10-11 11:02:28 +02:00
Eduardo Quezada
f830b0725a GMAX -> GIGANTAMAX 2023-10-10 18:07:12 -03:00
Eduardo Quezada
92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
 2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone
20e3b43f7c
HGSS Style Pokedex (#3288) 2023-10-02 17:28:37 -03:00
Alex
db039ee4e2
Tera Shards Icons (#3307) 2023-09-14 07:38:45 -03:00
Eduardo Quezada
b89722500f Fixed Mr. Mime capitalization 2023-09-12 13:09:56 -03:00
Aaghat
6ac16c8c2e More clean up 2023-09-09 10:16:14 +05:30
Aaghat
c4231ba860 Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss 2023-09-08 18:47:26 +05:30
kittenchilly
2fa4206bf1
Add new Substitute doll sprites (#3263) 2023-09-04 19:48:43 -03:00
Eduardo Quezada
0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.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_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
 2023-08-31 14:28:01 -04:00
GriffinR
4941e2602a
Merge pull request #1909 from GriffinRichards/stat-anim 
Document stat change animation
 2023-08-20 14:29:11 -04:00
GriffinR
60a6c9d160
Merge pull request #1903 from GriffinRichards/frontier-gfx 
Fix some frontier gfx, adjacent cleanup
 2023-08-10 14:49:44 -04:00
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
GriffinR
6598cb30bc Document stat change animation 2023-08-08 23:56:16 -04:00
GriffinR
16c0be7ed2 Fix some frontier gfx, adjacent cleanup 2023-08-03 11:15:15 -04:00
Eduardo Quezada
f94efa94e1 Merge branch 'RHH/master' into RHH/upcoming 2023-08-02 01:18:07 -04:00
Philipp AUER
44eb6260cc
[battle, anim] woodhammer animation overhaul (#3192) 
* [battle, anim] woodhammer animation overhaul

* squashme: timings

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-01 19:10:18 -04:00
Martin Griffin
0e5c78aeb6 Merge remote-tracking branch 'pret/master' into 'rhh/master' 2023-07-25 19:49:18 +01:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
Eclipse
ca792d43cc
Gender differences sprites, final part (#3122) 
* The last survivors

* Tweaked Numel, Milotic and Relicanth
Updated their sprites according to their current depictions.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-07-18 21:31:22 -04:00
SubzeroEclipse
23d51df7c0 Added Hisuian Sneasel 2023-07-01 11:16:31 +02:00
SubzeroEclipse
d202bdd09c Added even more gender difference sprites, 2/2 2023-07-01 10:25:17 +02:00
SubzeroEclipse
0733e0908c Added even more gender difference sprites, 1/2 2023-06-30 10:40:46 +02:00
Eclipse
fc52414383
Added many more gender differences sprites (#3082) 
Added sprites for the remaining Gen1 mons and a couple of evolutions.
 2023-06-27 21:11:01 -04:00
Eclipse
a44af6f06f
Gender differences sprites, part 1 (#3070) 
* Added some gender difference sprites
Added sprites for:
- Pikachu/Raichu
- Doduo/Dodrio
- Goldeen/Seaking
- Xatu
- Politoed
- Meditite/Medicham
- Gible/Gabite/Garchomp

NOTE: I had to tweak Doduo's palette file because it wasn't matching the normal one and a result Doduo's beak looked weird.

* Swapped Pikachu sprites
Replaced them with the ones provided by CyanSixFour because they looked better than the ones that I had.

* Added Gloom and Vileplume

* Fixed Pikachu forms
Edited the macros so that only base Pikachu would show different forms based on gender. Big thanks to AsparagusEduardo for helping with this.

* Swapped a few more sprites
Replaced Goldeen (female back), Politoad (female back), Medicham (female all) sprites with those provided by CyanSixFour because they looked better. Also tweaked my male Meditite back
 2023-06-26 19:04:19 -04:00
PacFire
4b3b9b5e0a
Added icon for Clear Amulet (#3078) 
* Update graphics.h

* Update item_icon_table.h

* Update items.h

* Add files via upload

added icon for clear amulet, shards still missing.

* Add files via upload

added clear amulet's palette

* Update graphics.h
 2023-06-26 18:19:33 -04:00
ghoulslash
7371a9e401
Add many gen 8 move animations (#2861) 
* port many gen8 and 9 move anims from cfru

* fix thunder cage, shell smash, shelter anims. update anim credits

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-06-21 13:19:54 -04:00
AgustinGDLV
aec51b5b04 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-11 20:02:06 -07:00
Salem
78c4d07b23
Add Berserk Gene Item (#2893) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-25 15:03:57 -04:00
aaghaht
bd54c70020 Add PLA evo items 2023-04-10 10:47:31 +05:30
AgustinGDLV
504ec36b2b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-27 16:22:11 -07:00
TheXaman
bc2c3e1d49 Moved all HGSS pokedex code into its own file 
- reordered all hgss code
- cleanup needed!
- restored the vanilla dex
 2023-03-27 11:28:28 +02:00