kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) ( #3473 )
2023-10-27 13:54:55 -03:00
kittenchilly
bd71946372
Remove all trailing whitespace (master) ( #3472 )
2023-10-27 13:52:44 -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
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
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move ( #3425 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-19 20:16:37 -03:00
Eduardo Quezada D'Ottone
d153947aa2
Merge branch 'upcoming' into dynamax
2023-10-18 19:37:09 -03:00
leo60228
ba0534386d
Address review
2023-10-18 14:37:29 -04:00
leo60228
4e8ae5965e
make sure Tauros-Paldea forms are defined properly without P_GEN_9_POKEMON
2023-10-18 14:37:01 -04:00
leo60228
e10acf8b2d
gen 9 form learnsets
2023-10-18 14:37:00 -04:00
leo60228
5e0ff4ab52
gen 9 form learnset pointers
2023-10-18 14:37:00 -04:00
leo60228
ca931d09e9
form species info
2023-10-18 14:37:00 -04:00
leo60228
b5be823e3b
gen 9 forms (learnsets still missing)
2023-10-18 14:36:59 -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