atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13825 commits 2 branches 40 tags 617 MiB
Commit graph

13825 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
GriffinR
2304283c3e
Merge pull request #1935 from GriffinRichards/bugfixfix 
Use BUGFIX in assembly files
 2023-10-26 17:42:41 -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
Bassoonian
bb9d3208b0
Frontier ban refactor (#3465) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-26 10:52:43 -03:00
Eduardo Quezada
25d6f8ba74 Fix mini_printf encoded string -Werror=pointer-sign warning 2023-10-26 09:25:50 -03:00
Alex
cb38f3bee6
Fixes legendary backgrounds (#3464) 
* Fixes legendary backgrounds

* missed one

* forgot break
 2023-10-25 17:06:25 +02:00
Bassoonian
7a9221e7b9
Rename output roms (#3462) 
* Rename output roms

* Update build.yml
 2023-10-25 07:51:12 -03:00
Alex
25a57d48d9 fixes tests 2023-10-25 10:18:59 +02:00
Alex
f6781a77d4 merge rhh/upcoming 2023-10-25 09:42:19 +02:00
Alex
591ef71e3b
Fixes form change when using switch moves (#3463) 
* Fixes form change with switch moves
 2023-10-25 08:33:43 +01:00
Eduardo Quezada D'Ottone
81cbbdb185
Setting Modern as default (#3305) 2023-10-24 13:31:03 +01:00
Eduardo Quezada D'Ottone
4b1d774373
Merge master (#3460) 2023-10-24 06:42:56 -03:00