Eduardo Quezada D'Ottone
4aa14355d7
Merge branch 'upcoming' into gen9-species-nomigration
2023-11-06 13:49:02 -03:00
kittenchilly
90471741e9
Add Fairy Feather sprite ( #3520 )
2023-11-03 16:32:12 -03:00
Eduardo Quezada D'Ottone
820be61c9f
Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4
2023-11-02 21:32:23 -04:00
Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration
2023-11-02 21:28:53 -04:00
kittenchilly
244ca0be95
Add custom female icon sprites for Pikachu and Wobbuffet ( #3506 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-01 18:49:44 -03:00
Bassoonian
15e038cd30
Decapitalise Alcremie file names ( #3488 )
2023-10-30 10:53:26 -03:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms ( #3469 )
...
* Alcremie form sprites
Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>
# Conflicts:
# graphics/pokemon/alcremie/lemon_cream/front.png
# graphics/pokemon/alcremie/matcha_cream/back.png
# graphics/pokemon/alcremie/matcha_cream/front.png
# graphics/pokemon/alcremie/mint_cream/front.png
# graphics/pokemon/alcremie/ruby_cream/front.png
# graphics/pokemon/alcremie/salted_cream/front.png
# include/graphics.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/footprint_table.h
# src/data/pokemon_graphics/front_pic_anims.h
# src/data/pokemon_graphics/front_pic_coordinates.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.c
* Fixed cries
* Removed Todos
* Temp: all forms use the same icon
* Grouped form data + Fixed missing Level up and Teachable learnsets
* Added missing data for form changes and back animations
* Grouped defines together
* Fixed compile
---------
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-10-29 20:30:56 +01:00
Katy
efae521646
Gen7 Sprites/Animations For Species ( #3426 )
2023-10-28 23:47:58 -03:00
leo60228
a505afac1d
address review
2023-10-26 18:57:06 -04:00
kittenchilly
91b4659d5c
Ogerpon sprites
2023-10-26 17:34:21 -04:00
kittenchilly
d9ccc80b31
Sprites
2023-10-26 17:34:21 -04:00
kittenchilly
5cbcf60c7e
Begin some stuff
2023-10-26 17:34:18 -04:00
leo60228
f6e5076dc0
add new sprites
2023-10-24 23:20:59 -04:00
leo60228
95e0dabfa3
icon/palette fixes
2023-10-23 18:16:48 -04:00
leo60228
60d746729d
enable floragato icon and tinkatuff shiny palette
2023-10-23 16:18:56 -04: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
be921c57fc
SPECIES_TATSUGIRI_CURLY
2023-10-23 11:26:50 -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
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
Alex
db039ee4e2
Tera Shards Icons ( #3307 )
2023-09-14 07:38:45 -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
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use ( #1892 )
2023-08-09 12:49:21 -04: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
SonikkuA-DatH
6382640f8a
Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks ( #3127 )
...
* Casrform graphics. Palette changes, edited backs, and 2 Frame anims
* Castform Graphics
* Cherrim graphics, and Castform redefinitions
* Spheal and Spinda Graphic edits. Spheal mouth adjustment, Spinda 2 frame and palette
* Revised Spinda Spot drawing function, removed tabs
* Animations for Castform forms, Spinda, Cherrim Sun, and Spheal set
* Spacing
* Forgot shiny pal. Fixed
* Delete .vs directory
* remove vs ref
2023-07-14 11:45:40 -04:00
Eduardo Quezada D'Ottone
862602233d
Gender differences sprites, part 3 ( #3095 )
2023-07-04 11:36:24 -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
Eduardo Quezada D'Ottone
2100a760ad
A selection of animation frames (redone) ( #3090 )
...
* Applin Family
* Placeholder single frames to macro
* Stufful/Bewear
* Chewtle/Drednaw
* Rookidee/Corvisquire/Corviknight
* Rolycoly/Carkol/Coalossal
* Missing animations
* Grubbin/Charjabug/Vikavolt
* Turtonator and Wimpod/Golisopod
* Jangmo-O/Hakamo-O/Kommo-O
* Pyukumuku and Dewpider/Araquanid
* Fixed Charjabug/Vikavolt palettes
* Pincurchin and Sizzlipede/Centiscorch
* Alolan Exeggutor and Salandit/Salazzle
* Reverted PLACEHOLDER_ONE_FRAME_ANIMATION for a separate PR
* Forgot Pyukumuku's animation
2023-06-30 14:13:42 +02:00
SubzeroEclipse
0733e0908c
Added even more gender difference sprites, 1/2
2023-06-30 10:40:46 +02:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff ( #3063 )
...
* Removed gCastformFrontSpriteCoords
* Removed sCastformElevations and IsCastformForm
* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct
* Scrubbed unused BS commands
* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants
* Removed redundant function in Pokémon Debug menu
* Removed handling in animation scripts
* Removed gBattleMonForms
* Reduced MAX_MON_PIC_FRAMES to 2
* Removed Castform/Cherrim makefile stuff
* Fixed weather form change tests not checking species.
* Fixed Castform palettes after Lunos' PR
2023-06-30 09:58:07 +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
Eduardo Quezada
271bca6a3d
Fixed Staraptor using Staravia's footprint
2023-06-02 11:56:36 -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
