Commit graph

15384 commits

Author SHA1 Message Date
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
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
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
Eduardo Quezada
0a8284ce9f
Added missing Move Effect TODO tests - Volume B (#4682)
* Added missing Move Effect TODO tests - Volume B

* Apply suggestions from code review

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Removed unused bulldoze effect file

* Removed individual tests for Baton Pass + Status1 in favor of the existing single test

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-01 15:07:51 +02:00
Eduardo Quezada
0be643a517
Set TYPE_NONE as type 0 + other type data tweaks (#4462)
* Set TYPE_MYSTERY as type 0

* Remove redundant TYPE_NONE

* Moved Gen 1-3 type damage categories to gTypesInfo

* Set TYPE_NONE as 0 instead

* Grouped type info to a single file

* Fixed sTypeEffectivenessTable static name

* Adjusted MON_DATA_TERA_TYPE to account for shift in type IDs

* oops, missed the extern

* Moved Tera Type RGB values to gTypesInfo

* Fixed Tera Type test

* Added option test feature to set IVs

* Hidden Power type test

* Tera Type safeguard in givemon

* Removed isHiddenPowerType for a future PR that refactors Hidden Power

* Review changes
2024-06-01 07:38:22 +02:00
Pawkkie
cb1b4bc9a0
Switch AI uses trapping abilities aggressively (#4669)
* Trapping switch AI

* Review feedback, mostly spacing cleanup

* Assume Mawile is Steel type

* Move switching tests into their own file
2024-06-01 07:30:43 +02:00
WillKolada
0ed8d09d47
Revert Dynamax HP on fainting (#4681)
* Revert Dynamax HP on fainting

Calls UndoDynamax whenever a mon faints to ensure that its HP is reverted and the relevant data is cleared. Updates UndoDynamax to CalculateMonStats after applying the HP reversion to prevent fainted mons from retaining their boosted Max HP until the end of the battle.

* Update src/battle_main.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-31 22:33:31 +02:00
WillKolada
5405e6532e
Clear Dynamax data when a battler faints (#4672)
* Update battle_main.c

Now clears dynamax data when a battler faints

* Update battle_main.c

Actually call the helper function instead of only doing half of what it does.

* Added new line before return

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-31 18:23:56 +02:00
Eduardo Quezada
c79188e3b3 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
2024-05-31 12:04:33 -04:00
Bassoonian
e3959a764b
Rename MgbaPrintf_ to Test_MgbaPrintf (#4642) 2024-05-31 17:54:25 +02:00
sneed
e869aaf70b
Add global constants for damage roll related code and make AverageRollDmg faster (#4663)
* faster AverageRollDmg, global dmg roll constants

* restore MAX_ROLL_PERCENTAGE & MIN_ROLL_PERCENTAGE

* rename AverageRollDmg
2024-05-31 16:56:17 +02:00
sneed
810caa7fd6
In battle move descriptions index fix (#4678) 2024-05-31 15:54:51 +02:00
Eduardo Quezada
de760e697f More review 2024-05-31 08:28:57 -04:00
Alex
d55e072747
Adds AI_IsFaster and AI_IsSlower functions (#4671) 2024-05-31 12:55:15 +02:00
Alex
bebc13b5a1
Adjust Ate-Ability code a bit to make it more readable (#4640)
* Adjust Ate-Ability code a bit to make it more readable

* stupid oversight

* fixed

* pull normal type move check out of function

* unused var

* switch and tests

* oversight

* Apply suggestions from code review

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-31 12:22:18 +02:00
sneed
13d4d29e1e
Move SOLAR_POWER_HP_DROP label (#4675) 2024-05-31 12:19:07 +02:00
Bassoonian
52d45674f0
Move Descriptions in battle (#4152)
* Port xaman move desc to modern expansion

* Fix modern compiler error

* Fix compliling + EFFECT_PLACEHOLDER support

* Change to L-button to avoid conflict with Mega Evolution

* Reorder and change priority to category

* add sprite for move category icon, declare category icon sprite data extern

* remove static category icon sprite data from hgss dex for global data

* Change to else if

---------

Co-authored-by: Pawkkie <moog272@gmail.com>
Co-authored-by: RavePossum <ravepossum@proton.me>
2024-05-31 12:10:03 +02:00
Alex
f6e00303b7
Fixes Neutralizing Gas / Intim interaction freezing the game (#4668) 2024-05-31 00:08:04 +02:00
AgustinGDLV
317cf2e933
updated Disguise to be a breakable ability (#4666) 2024-05-30 22:15:26 +02:00