Eduardo Quezada
661becc3b6
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2
...
# Conflicts:
# src/debug.c
2023-10-30 08:05:14 -03:00
DizzyEggg
f4be01f0ac
Fix strength sap on substitute ( #3486 )
...
* tests for strenth sap
* fix strength sap on substitute
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-10-30 11:58:15 +01:00
DizzyEggg
0c8fdce1a4
New tests + Sheer Force / Last Resort minor bug fixes ( #3378 )
...
* tests for intimidate defiant
* sheer force fix + tests
* white herb tests
* tests for stealth rock, weak armor and last resort fix
* style changes to weak armor test
2023-10-30 11:39:41 +01:00
Alex
f461bc3256
AI_CompareDamagingMoves changes to increase the score by 1 for best moves ( #3382 )
...
* Further optimizes AI_CompareDamagingMoves
* viableMove name change + 2 tests
* some issues
---------
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-10-30 10:04:59 +01:00
leo60228
7be2c62d98
add teal mask cries (but none tweaked yet)
2023-10-29 23:18:45 -04: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
Eduardo Quezada
9d9b43f4de
Merge branch 'RHH/master' into RHH/upcoming
2023-10-29 10:03:58 -03:00
Katy
efae521646
Gen7 Sprites/Animations For Species ( #3426 )
2023-10-28 23:47:58 -03:00
Bassoonian
ab25e6bfa5
Fixes Synchronize's OW effect and adds configs ( #3480 )
2023-10-28 23:24:20 -03:00
Bassoonian
0dd22305a4
Adds Illuminate's Gen9 effect ( #3482 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-28 23:22:41 -03:00
Eduardo Quezada
ae1266e077
Automatically change dex number digits based on NATIONAL_DEX_COUNT
2023-10-28 22:15:21 -03:00
Eduardo Quezada
c74ad8251d
Rearranged dex scrolling list UI to accomodate 4 digits and 12 character names
2023-10-28 17:01:15 -03:00
Eduardo Quezada
b484a215fb
Scrollbar moved to the left
2023-10-28 15:22:07 -03:00
Eduardo Quezada
659bff4c0b
Seen/Owned 4 digits in HGSS dex
2023-10-28 13:48:26 -03:00
Bassoonian
cd9ef3a566
Formatting fix
2023-10-28 16:34:11 +02:00
Bassoonian
f472d768dd
Rename Undiscovered to No Eggs Discovered
2023-10-28 16:32:55 +02:00
Eduardo Quezada
6d128a71b2
Fixed compile when Gen 9 is disabled
2023-10-28 10:54:20 -03:00
Eduardo Quezada
6108d092d1
Updated Save Menu, main menu, match call and trainer card to use 4 digits
2023-10-28 10:38:46 -03:00
Eduardo Quezada
c9619b03b1
Shows 4 digits on the main Pokédex page
2023-10-27 22:59:46 -03:00
kittenchilly
5087095aae
Obedience levels now increase per badge ( #3475 )
2023-10-27 19:17:17 -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
kittenchilly
bd71946372
Remove all trailing whitespace (master) ( #3472 )
2023-10-27 13:52:44 -03:00
Eduardo Quezada D'Ottone
db00839d64
Fixes Syrup bomb, new Octolock script, some Intim changes + Tests ( #3437 )
2023-10-27 12:25:55 -03:00
Eduardo Quezada D'Ottone
5e67625e05
It was a dark and spooky merge... 🎃 (pret merge 2023/10/27) ( #3471 )
2023-10-27 11:35:03 -03:00
Eduardo Quezada
8e0991475c
Incorporated upstream fixes
2023-10-27 11:04:10 -03:00
Eduardo Quezada
7ae37ab79c
Merge branch 'pret_master' into RHH/upcoming
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/event_scripts.s
2023-10-27 11:03:37 -03:00
Alex
57a99e9be6
Fixes dynamax move target and canceling in doubles ( #3470 )
2023-10-27 10:38:40 -03:00
Eduardo Quezada
b5607209f3
Fixed G-Max Finale test
2023-10-27 09:16:39 -03:00
Eduardo Quezada
59c0de0967
Merge branch 'RHH/master' into RHH/upcoming
2023-10-27 09:16:21 -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
fca19a03f1
downsample cries (like #3359 )
2023-10-26 21:45:21 -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
GriffinR
2304283c3e
Merge pull request #1935 from GriffinRichards/bugfixfix
...
Use BUGFIX in assembly files
2023-10-26 17:42:41 -04:00
leo60228
144ed150c0
update cry tables
2023-10-26 17:42:14 -04:00
kittenchilly
1acaf7f869
Fixed icons
2023-10-26 17:34:21 -04:00
kittenchilly
ad210c5170
Update icon.png
2023-10-26 17:34:21 -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
kittenchilly
86917f1453
Update species.h
2023-10-26 17:33:20 -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
GriffinR
c169b856d4
Merge pull request #1937 from kittenchilly/removewhitespace
...
Remove all trailing whitespace
2023-10-26 10:09:00 -04:00
GriffinR
3a8df46832
Merge pull request #1938 from AsparagusEduardo/pret/pr2/ndebugModern
...
Fix mini_printf encoded string -Werror=pointer-sign warning
2023-10-26 10:08:25 -04:00
