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

15522 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bassoonian
568ce39c5d
Adds forbidden status parameter to FORM_CHANGE_ITEM_USE (#4738) 2024-06-08 07:36:39 +02:00
sneed
f1911dae59
Fix mycelium might and ability shield (#4740) 
* Fix mycelium might and ability shield

* fix check
 2024-06-08 07:27:44 +02:00
sneed
2cc2dc01ca
Fix daycare move transferring between evolved mons and allow sharing moves between different forms of the same species (#4479) 
* Fix daycare move transferring between evolved mons

Also allow sharing moves between different forms

* Make sure Snorlax gets Snorlax's egg moves instead of Munchlax's

* Use GET_BASE_SPECIES_ID

* Actually fix Snorlax/Roselia/etc behavior

* remove preproc checks

* rename ambiguous GetEggMovesSpecies function

* remove extra indentation, add incense breeding check

* update comment

* Update src/daycare.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-06-07 21:54:58 +02:00
sneed
dc742b3077
Fix Berserk, Angel Shell, Wimp Out, Emergency Exit HP threshold (#4724) 
* Fix HadMoreThanHalfHpNowHasLess

* rename the functions

* formatting
 2024-06-07 21:54:25 +02:00
Bassoonian
d6422da284
Fix partner palette problem (#4736) 2024-06-07 21:05:16 +02:00
Bassoonian
0fda9d6cd6
Fix Hyper Potion price (#4737) 2024-06-07 21:04:03 +02:00
Bassoonian
0a049ea6f7
Add followers to readme & update migration script readme (#4719) 
* Add followers to readme & update migration script readme

* Apply suggestions from code review

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update README.md

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-06-07 13:38:25 -04:00
sneed
fa81861593
Add newer generation Heal Bell interactions with Soundproof (#4732) 
* newer generation soundproof heal bell interactions

* Fix bugs and rewrite AnyPartyMemberStatused

* add missing check, tests, clean up

* fix ai code and rename battler for clarity
 2024-06-07 18:51:21 +02:00
Eduardo Quezada
8b09ef09fa Merge branch '_RHH/master' into _RHH/upcoming 2024-06-07 12:25:08 -04:00
sneed
1241cbe79f
FIx mummy and lingering aroma abilities (#4731) 
* FIx mummy ability

..and lingering aroma.
Adds tests for both.

* merge the tests

* new line

* add 2 more tests

Mummy and Lingering Aroma don't replace each other
Mummy doesn't replace abilities that can't be suppressed
 2024-06-07 11:46:07 +02:00
sneed
d0a8e9fb31
Use AI_DATA->abilities in more places (#4729) 
* use AI_DATA->abilities in more places

* Missed one

* restore the hack
 2024-06-06 16:27:07 +02:00
Bassoonian
8e15603fbc
Fix center crash (#4725) 2024-06-05 11:52:42 +02:00
sneed
7fd0239370
Rampage moves always confuse on final turn (#4722) 
* rampage moves confuse on the final turn

* fix B_RAMPAGE_CANCELLING < GEN_5

* Remove pointless assumes
 2024-06-05 05:38:04 +02:00
Eduardo Quezada
dce10ab705 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	test/species.c
 2024-06-04 16:47:29 -04:00
kittenchilly
7f8f480ecb
Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types (#4438) 
* Add FORM_CHANGE_BATTLE_TERASTALLIZATION and allow species to force tera types

* Fix form change not changing tera type

* Update form_species_tables.h

* Address reviews

* Can't change the forced Tera Type anymore

* Revert "Can't change the forced Tera Type anymore"

This reverts commit 67157250ef.

* Fix a lot of things

* Oops

* Update pokemon.h

* Update pokemon.h

* Address reviews

* Update tera_starstorm.c

* Update test/battle/gimmick/terastal.c

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-06-04 13:38:49 +02:00
Bassoonian
daa6b7898e
PokeCommunity sprites batch (May) (#4714) 2024-06-04 11:50:47 +02:00
Alex
167cd7d0f7
Remove misleading preprocs (#4718) 2024-06-04 10:47:11 +02:00
sneed
87e2526665
Add switching message macros for tests (#4717) 
* Add switching message macros

* Add test
 2024-06-03 19:59:28 -04:00
leo60228
0c9fe70794
Ensure correct mdBook preprocessor ordering (#4716) 2024-06-03 17:41:59 -04:00
leo60228
91e80670c7
Use mdBook includes instead of symlinks (#4715) 2024-06-03 17:06:14 -04:00
sneed
e60e6b6008
Fix Mirror Armor and Sticky Web interaction (#4713) 
* fix Mirror Armor and Sticky Web interaction

* fix strings
 2024-06-03 21:19:54 +02:00
kittenchilly
a5b75746ea Pawmi 2024-06-03 14:17:34 -05:00
kittenchilly
ea617ccd7a Okidogi 2024-06-03 13:56:37 -05:00
kittenchilly
33972cedf3 Pawmo 2024-06-03 13:48:36 -05:00
leo60228
9fc2132293
Fix fix_links.py (#4711) 
Autolinks were getting discarded when lowercasing anchors, oops.
 2024-06-03 14:39:25 -04:00
hedara90
5bf7f08ad2 Added Normal and Terastal Terapagos sprites (#4691) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-06-03 13:33:42 -05:00
leo60228
e925c51391
Convert docs/ folder to mdBook (#4684) 
* Convert docs/ folder to mdBook

* INSTALL.md Markdown fixes (also affects GitHub web)

* Don't try to rewrite bare links in HTML attributes

* lowercase anchors in fix_links.py
 2024-06-03 13:34:39 -04:00
RavePossum
69b367e350 PR feedback - 32 bit params, multiline condition formatting 2024-06-03 00:10:10 -04:00
cawtds
7404d03ea9
fixed potential undefined behaviour when using escape rope (#4705) 2024-06-03 00:58:24 +02:00
cawtds
658b437777
fixed honey use altering tiles (#4703) 2024-06-02 22:38:52 +02:00
Pawkkie
6dc8b82e92
Gale Wings test (#4694) 
* Gale Wings test

* Condense conditional
 2024-06-02 19:16:00 +02:00
Pawkkie
22ee823bc1 Review feedback 2024-06-02 12:43:21 -04:00
sneed
ad8576d548
Fix some abilities preventing stat dropping move effects when used on self (#4696) 
* Move SOLAR_POWER_HP_DROP label

* Abilities don't prevent self stat dropping effects

Hyper cutter does not stop MOVE_EFFECT_ATK_MINUS_1 and MOVE_EFFECT_ATK_MINUS_2.
Big Pecks does not stop MOVE_EFFECT_DEF_MINUS_1 and MOVE_EFFECT_DEF_MINUS_2.
Keen Eye and Illuminate do not stop MOVE_EFFECT_ACC_MINUS_1 and MOVE_EFFECT_ACC_MINUS_2.
 2024-06-02 18:20:00 +02:00
Bassoonian
f11826b1ec
[Community PR] Integrate merrp's followers branch (#4022) 2024-06-02 17:23:52 +02:00
Salem
2d1ef1fcd7
Fix issues when building tests with agbcc (#4689) 
* fix build errors with agbcc

* make clean removes build/test and build/modern-test regardless of MODERN setting
 2024-06-02 11:12:08 -04:00
Eduardo Quezada
ee1d14755a Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-06-02 11:06:41 -04:00
Eduardo Quezada
da91e6a392 Remove unused callfunc 2024-06-02 10:53:45 -04:00
Eduardo Quezada
3202625ca5 Restored Gen 4-8 followers 
This reverts commit 24913f5339.

# Conflicts:
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h
 2024-06-02 10:31:01 -04:00
Alex
4eda5f61af
Use 9th roll instead of average in AI calcs (#4679) 
* Use 9th roll instead of average in AI calcs

* damage_roll

* duke suggestion
 2024-06-02 15:36:12 +02:00
Alex
86b76134e3
replace gCurrentMove with move in CalcCritChanceStageArgs (#4687) 
AI got the wrong calc when the global was used.
 2024-06-02 15:31:10 +02:00
cawtds
9b10e13336
Fixed regional variant inheritance and pokeball inheritance (#4695) 
* fixed regional variant inheritance  and pokeball inheritance

* species inheritance: consider cases with different evolutions but same base species e.g. Persian and Perrserker
ball inheritance: fix inheritance for regional forms
 2024-06-02 14:04:00 +02:00
PhallenTree
085c2f3d43
Moves activation of Guard Dog from HitEscape to HitSwitchTarget (#4690) 
* Removes incorrect activation of Guard Dog

* Adds Guard Dog check on Dragon Tail, Circle Throw
 2024-06-02 08:32:18 +02:00
hedara90
240b69d032
Added Normal and Terastal Terapagos sprites (#4691) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-06-02 08:26:43 +02:00
cawtds
97143e020f
Refactor move animations (#4683) 
* fix getboxmondata for evolutiontracker if compiled with agbcc

* refactored move animation scripts as part of gMovesInfo

* migration script for move anims

* default animation, migration for battle_anim_scripts.s

* added warning for missing animation

* add include to migration

* add struct member in migration script

* removed include and struct member from migration script

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-06-02 08:18:13 +02:00
Eduardo Quezada
1359966a14 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	src/event_object_movement.c
#	src/scrcmd.c
 2024-06-01 20:17:19 -04:00
Eduardo Quezada
941e32a14f Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_main.c
#	test/battle/move_effect/body_press.c
 2024-06-01 19:55:53 -04:00
Isaac Rivera
43e2a973fc
add check for held item before using poltergeist and a check that it is the first turn for moves that are first turn only (#4693) 2024-06-02 01:00:17 +02:00
Ariel A
e420f99fc3 Merge branch 'followers' into followers-expanded-id 2024-06-01 15:20:56 -04:00
Ariel A
3727be9511 fix: fixed a few oversights with follower message generation 2024-06-01 14:46:45 -04:00
Pawkkie
5fd3532e16 Fix assumptions 2024-06-01 12:39:10 -04:00