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
DizzyEggg
90d9334f0b
Fix Sap Sipper not blocking Bullet Seed ( #3516 )
...
* Fix Sap Sipper not blocking bullet seed
* add defiant sticky web test
2023-11-02 11:43:06 +01:00
Alex
53b7e4bf66
Remove powerfulMoveEffects array ( #3515 )
...
* Remove powerfulMoveEffects array
* Solar Beam test
2023-11-02 08:44:23 +01: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
Eduardo Quezada D'Ottone
6cce1b1873
Fixed Dynamax's indicator not disappearing after Dynamax ends ( #3510 )
2023-11-01 20:45:03 +01:00
DizzyEggg
47341f3f30
Fix Anger Shell activation ( #3508 )
2023-11-01 14:55:50 +01:00
DizzyEggg
7eb1b12224
Fix Knock Off healing berries ( #3509 )
2023-11-01 14:47:31 +01:00
Eduardo Quezada
24bde64ddb
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# include/config/battle.h
2023-10-31 14:43:19 -03: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
Eduardo Quezada
e281103575
Reverted PR3455
2023-10-31 07:33:53 -03:00
Eduardo Quezada D'Ottone
6dc534f807
Version 1.6.2 ( #3503 )
2023-10-31 07:28:47 -03:00
leo60228
392a65dec0
cry fixes
2023-10-30 23:20:24 -04:00
Eduardo Quezada D'Ottone
2dfae911aa
Added config for Weak Armor's Gen 5-6 effect ( #3498 )
2023-10-30 17:18:00 -03:00
Eduardo Quezada
e28d0c627a
Merge branch 'RHH/master' into RHH/upcoming
2023-10-30 16:51:04 -03: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
DizzyEggg
72dad4d7c6
Fix Weak Armor interrupting multi hit moves ( #3497 )
2023-10-30 16:44:42 -03:00
DizzyEggg
3788d84439
Additional Weak Armor tests ( #3493 )
2023-10-30 18:51:51 +01:00
Eduardo Quezada
242d68487a
Weak Armor tests
2023-10-30 14:31:28 -03:00
leo60228
a7e604e953
correct iron leaves dex entry
2023-10-30 12:31:18 -04:00
Eduardo Quezada D'Ottone
1a6acad3cf
Added Match Call to togglable options in debug menu ( #3489 )
...
* Added Match Call to togglable options in debug menu
* Added badge flags to Cheat Start
* Fixed potential Fly and badge flag mismatch using the debug options
* Added Fly flags to Cheat Start
2023-10-30 16:13:32 +01:00
Eduardo Quezada
908af87846
Merge branch 'RHH/master' into RHH/upcoming
2023-10-30 11:00:24 -03:00
Eduardo Quezada
71ba501b94
Fixed tests on modern
2023-10-30 10:58:30 -03:00
Bassoonian
15e038cd30
Decapitalise Alcremie file names ( #3488 )
2023-10-30 10:53:26 -03:00
AaghatIsLive
24de138eb5
Add dark mode for Hoenn dex mode (HGSS) ( #3479 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-30 09:21:17 -03:00
DizzyEggg
349e05daa8
Debug menu cleanup ( #3390 )
2023-10-30 12:29:44 +01:00
Eduardo Quezada
fe91f08b26
Restore comments for now
2023-10-30 08:10:23 -03:00
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
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