2007 Commits

Author SHA1 Message Date
leo60228
b4b4e3cf2b
import oct 31 pokecommunity sprites 2023-11-04 11:04:02 -04:00
leo60228
4863fb8a6b
wrap ogerpon dex entry to 4 lines 2023-11-03 22:18:55 -04: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
kittenchilly
5ccef18a6f friendship = 50 -> friendship = STANDARD_FRIENDSHIP 2023-11-02 21:30:11 -04:00
Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration 2023-11-02 21:28:53 -04:00
Alex
64ba52d214
Remove redundant AI score increases (#3504)
* Remove redundant AI score increases

* review applied

* fix score
2023-10-31 13:41:22 +01:00
kittenchilly
c0c100d90d
Base friendship Gen 8+ config (#3491)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-30 16:45:52 -03:00
leo60228
a7e604e953
correct iron leaves dex entry 2023-10-30 12:31:18 -04: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
Eduardo Quezada
6d128a71b2 Fixed compile when Gen 9 is disabled 2023-10-28 10:54:20 -03:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474) 2023-10-27 19:14:45 -03:00
kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) (#3473) 2023-10-27 13:54:55 -03:00
leo60228
7e3f11709d
kitakami dex entries 2023-10-27 01:33:31 -04:00
leo60228
5a70555915
Try to better abbreviate >10 character names 2023-10-26 21:52:39 -04:00
leo60228
a505afac1d
address review 2023-10-26 18:57:06 -04:00
leo60228
1762b28696
Ursaluna-Bloodmoon fixes 2023-10-26 17:48:01 -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
8fefdbe914
Evo and form changes 2023-10-26 17:34:20 -04:00
kittenchilly
3a9172de06
It can build now 2023-10-26 17:34:20 -04:00
kittenchilly
bb855f965c
Almost done with data 2023-10-26 17:34:20 -04:00
kittenchilly
5cbcf60c7e
Begin some stuff 2023-10-26 17:34:18 -04:00
leo60228
5f2b6f57f7
Merge branch 'upcoming' into gen9-species-nomigration 2023-10-26 17:31:31 -04:00
kittenchilly
a8632f0fc5
Update PLA Pokemon data to correct values (#3458)
* Fix PLA Pokemon data to use correct values

* oops, cant forget basculin white stripe

* Update level_up_learnsets.h

* Update species_info.h
2023-10-26 22:45:33 +02:00
leo60228
f6e5076dc0
add new sprites 2023-10-24 23:20:59 -04:00
leo60228
176dec6e6f
new tinkaton sprite 2023-10-23 18:19:37 -04:00
leo60228
95e0dabfa3
icon/palette fixes 2023-10-23 18:16:48 -04:00
leo60228
1359df7f86
new iron bundle and tinkatink sprites 2023-10-23 17:53:25 -04:00
Eduardo Quezada
1137d54b61 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	asm/macros/battle_script.inc
#	src/battle_script_commands.c
2023-10-23 17:36:42 -03:00
leo60228
2edd20c5f7
correct quaxwell and palafin-hero back sprite coordinates 2023-10-23 16:26:00 -04:00
leo60228
60d746729d
enable floragato icon and tinkatuff shiny palette 2023-10-23 16:18:56 -04:00
Alex
0756dc1d4a
coords and roaring moon 2023-10-23 16:16:11 -04:00
Frank DeBlasio
bac135c6e8
Gave Razor Fang EVO_HELD_ITEM type/fieldUseFunc properties (#3456) 2023-10-23 17:03:31 -03:00
Eduardo Quezada
5660ac9495 Added new mon to pokedex orders 2023-10-23 14:19:40 -03: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
7b089a3aa1 Fixed Palafin Hero's Sp. Defense 2023-10-23 12:04:49 -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
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup (#3435)
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
2023-10-23 11:39:22 +01:00
leo60228
fcc18c2ef0
correct paldean wooper type 2023-10-22 19:15:55 -04:00