Commit graph

15862 commits

Author SHA1 Message Date
Eduardo Quezada
8533b0c045 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-03 14:39:50 -04:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers (#4767)
* add item descption headers and (default-off) config

* revert test script

* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling

* add ow item header config value labels

* Update include/config/overworld.h

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

* Update src/overworld.c

* Update include/overworld.h

* ScriptShowItemDescription remove unused var

* fix ScriptShowItemDescription warning

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-03 20:22:01 +02:00
Alex
04b5c013a9
Adds config to show target of ingame partner (#5307)
* Adds config to show chosen move and target of ingame partner, `#define B_SHOW_PARTNER_TARGET`, default `FALSE`
---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-03 19:28:59 +02:00
Pawkkie
9bd5601b5c
Wonder Guard AI Fix (#5317)
* Fix Wonder Guard looping

* Review + Sheer Cold
2024-09-02 17:43:41 -04:00
SarnPoke
a422db09c6
Fix Slateport Battle Tent/Battle Factory (#5281)
* Fix Slateport Battle Tent/Battle Factory

Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon.

* Fix player rental party being junk data after rest

Fixes #5280

* Consolidate checks into single method

Consolidates every gSpecialVar_0x8005 check into a singular method.
2024-09-02 16:53:03 -04:00
hedara90
fb1f12aa1b
Fixed Max Attacks into Max Guards message printing (#5312)
* Fixed Max Attacks into Max Guards message printing

* Updated the solution

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-02 13:58:10 +02:00
Erickson Russell
de242c8a29
EV Caps and EV Items (#5269)
* EV Caps and EV Items

Introduces EV caps, inspired by level caps, with configurable options for various cap implementations. Additionally, modifies EV items to interact with these caps based on a configurable setting.

* EV Caps fixes

Changed the EV caps to be less redundant and work better overall.

* EV Caps Fix part 2

Set the items back to ItemUseOutOfBattle_Medicine, got rid of ItemUseOutOfBattle_EVItem and ItemUseCB_EVItem, and reverted CB2_ReturnToPartyMenuUsingItem to CB2_ReturnToPartyMenuUsingRareCandy

* EV Caps Fixes Part 3

Fixed being able to use EV items to go over 252 limit on single stats.

* Update src/ev_caps.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-01 23:15:39 +02:00
Eduardo Quezada
33d5cbd7a2
Moved ASSUMEs to inside GIVEN blocks (#5308) 2024-09-01 23:13:58 +02:00
Alex
6648498e2e
Fixes dmax move base power not seen by ai (#5299) 2024-09-01 18:07:18 +02:00
Eduardo Quezada
484acdc138
Convert 8 various to callnatives (#5172)
* Convert 8 various to callnatives

* Address review comments
2024-09-01 15:12:43 +02:00
Alex
bbcb1cd5a2
Adds basic trainer and smart trainer flags (#5298) 2024-08-31 17:50:37 -04:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons (#5302)
* Fixes Tar Shot on Tera mon

* new line
2024-08-31 12:24:28 -04:00
AgustinGDLV
cfa56962e1
fixed dupe gimmick use in doubles (#5235)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2024-08-31 13:15:56 +02:00
hedara90
073d599fc5
Fixed Cinderace GMax back sprite (#5295)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-31 12:39:56 +02:00
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names (#5296)
* Fix Max and G-Max Moves bypassing absorbing abilities

* Fix G-Max Corviknight and Centiskorch speciesName

* Remove some outdated comments

* Missing Dynamax check

* Add Max Quake and Max Overgrowth to test
2024-08-31 12:39:37 +02:00
Alex
addaf40971
Fixes Scale Shot not activating + Known Failing Round test (#5292)
* Fixes Scale Shot not activating + Known Failing Round test

* Update test/battle/move_effect/multi_hit.c
2024-08-30 19:36:14 -04:00
psf
4f39354185
Deprecate MMBN Names (#5240)
* Removed HANDLE_EXPANDED_MOVE_NAME

* Removed HANDLE_EXPANDED_TYPE_NAME

* Removed HANDLE_EXPANDED_ITEM_NAME

* Removed HANDLE_EXPANDED_SPECIES_NAME

* Removed I_EXPANDED_ITEM_NAMES

* Removed B_EXPANDED_MOVE_NAMES

* Removed B_EXPANDED_TYPE_NAMES

* Removed B_EXPANDED_ABILITY_NAMES

* Removed B_EXPANDED_ABILITY_NAMES

* Added documentation of names

* Github markdown spacing is silly

* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339

* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339
2024-08-29 16:33:25 -04:00
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees (#5285)
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
2024-08-29 18:14:46 +02:00
Hedara
2ab0dd77de Added performance counter 2024-08-29 16:20:52 +02:00
cawtds
8af35a7e0d
add Sirfetch'd alias for competitive format (#5283) 2024-08-29 08:11:21 -04:00
kittenchilly
f07189b1be
More missing AI logic (#5279)
* More missing AI logic

* Update battle_ai_switch_items.c

* Update battle_ai_main.c
2024-08-28 22:15:09 +02:00
Eduardo Quezada
aebbe448b8 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-28 12:58:14 -04:00
SarnPoke
622dead80c
Shed Tail Retarget (#5275)
Re-targets Shed Tail PR to upcoming
2024-08-28 13:40:35 +02:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers (#5277) 2024-08-28 11:47:08 +02:00
Alex
98dbf3a575
Fixes Charged up status (#5274)
Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`
2024-08-27 20:01:51 +02:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted (#5262)
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves

* Fix Entry Hazards targeting the wrong side of the field if opponent fainted

* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS

* Alternative fix + Fix gBattlerTarget initially set to 2

* Fix Instruct animation

* Alternative anim fix
2024-08-27 14:46:56 +02:00
laserXdolphin
c406c4cc76
Fixed Ice Fang frostbite and freeze text. The frostbite and freeze texts were swapped. (#5273) 2024-08-27 14:33:58 +02:00
Pawkkie
0bb43626af
Chilly Reception AI (#5271) 2024-08-26 23:46:42 -04:00
kittenchilly
74a790f09c Chilly Reception AI 2024-08-26 19:11:33 -05:00
Pawkkie
e9c8bd0548
Revert "Chilly Reception AI" (#5270) 2024-08-26 16:58:15 -07:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces (#5261)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Pawkkie
a9f31dcc4f
Chilly Reception AI (#5265) 2024-08-26 18:57:17 -04:00
kittenchilly
03b0d066ce Update battle_ai_main.c 2024-08-26 16:50:58 -05:00
hedara90
2e43ffd5f7
Fixed Snore not hitting twice with Parental Bond (#5264)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 21:59:39 +02:00
Eduardo Quezada
c075d8e6b1
Fixed test system documentation (#5266) 2024-08-26 21:59:01 +02:00
psf
b6299ac4ce
Fix a display issue with B_SHOW_TYPES (#5201)
* Moved HandleInputChooseTarget and ShowEntireFieldTargets to non-static and added them as cases to ShouldHideTypeIcon

* Made ShouldHideTypeIcon easier to parse

* Made ShouldHideTypeIcon a for loop

* Fixed identation

* Made showTypesControllerFuncs a static const array per https://github.com/rh-hideout/pokeemerald-expansion/pull/5201\#discussion_r1730336265
2024-08-26 15:16:56 -04:00
kittenchilly
80ad7f15cc Chilly Reception AI 2024-08-26 13:09:50 -05:00
kittenchilly
03e0472cbe
Add I_REPEL_INCLUDE_FAINTED config and behavior (#5239)
* Add I_REPEL_INCLUDE_FAINTED config

* Update src/wild_encounter.c

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

* Update wild_encounter.c

* Update wild_encounter.c

* Update src/wild_encounter.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-26 15:58:12 +02:00
kittenchilly
8d47db6160
Add Population Bomb animation (#5194)
* Population Bomb animation

* Update battle_anim_new.c

* Update battle_anim_new.c
2024-08-25 23:39:25 +02:00
SarnPoke
5de0f3cb4a
Add Anger Point/Crit Moves Doubles AI Interaction (#5244)
* Add Anger Point/Crit Moves AI Interaction

Encourages the AI to use an "always crit" move on its partner, if that partner has the Anger Point ability.

* Add OHKO check

Makes sure that the crit move does not OHKO the partner with Anger Point.

* Fix mistake

Fixes small mistake

* Add Speed Check

Checks if mon is faster than its Anger Point partner when scoring.
2024-08-25 23:38:40 +02:00
kittenchilly
afd18f06b4
Fix switch out move message (#5258) 2024-08-25 23:29:33 +02:00
Salem
ceec17ec7b
remove unused bs signature (#5257) 2024-08-25 23:13:40 +02:00
Alex
92038129e2
Fixes Purifying Salt being poisoned by Toxic Spikes (#5252) 2024-08-25 09:06:03 -04:00
hedara90
51a127fcb5
Better implementation of the obedience fix (#5245)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-25 11:20:26 +02:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix (#5256)
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
2024-08-25 10:03:33 +02:00
Eduardo Quezada
abf60e9c64 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-24 19:44:35 -04:00
Galaxeeh
68e470f84a
Dynamic Move Display fixes (#5251)
* Weatherball fire type check changed to WEATHER_DROUGHT, added overworld check for field terrain set by weather dependent on configs

* Update src/pokemon.c

FRICKIN INDENTS LMAO

Co-authored-by: Eduardo Quezada <93919226+equezada-jej@users.noreply.github.com>

---------

Co-authored-by: Eduardo Quezada <93919226+equezada-jej@users.noreply.github.com>
2024-08-24 14:51:18 -04:00
hedara90
572972235e
Disguise tests (#5249)
* Start new Disguise tests

* Finished disguise tests

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-24 20:22:50 +02:00
tertu
17f68563eb
Remove support for the original LCG random number generator (#5078) 2024-08-24 10:07:00 -07:00
kittenchilly
2fed75f7c5
Adaptability, Aerilate, Aftermath tests (#5242)
* Adaptability, Aerilate, Aftermath tests

* Update test/battle/ability/aerilate.c

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

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-24 10:53:19 -04:00