Commit graph

6451 commits

Author SHA1 Message Date
pkmnsnfrn
a0e914b749 Merge branch 'upcoming' into scriptCommands 2024-09-12 05:39:24 -07:00
Pawkkie
047289a639
Improve AI's Skill Swap handling in double battles (#5360)
* Improve AI contrary

* Update src/battle_ai_util.c

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

* Fix additionalEffects loop

* moves[i] to aiMove

* Update src/battle_ai_util.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-11 00:00:29 +02:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers (#5178)
* Add data to SpeciesInfo entries for in-battle shadows

* Implement sized shadows in the sprite visualizer

* Implement sized shadows in game code

* Show shadows for the lead battler for opponents during their battle anim

* Feedback on shadows, round 1

* Revert removal of Goomy and Sliggoo shadows

* Fixed GEN_3 setting

* Code cleanup + remove pre-processor branches

* Fix bugs with gen-3 configuration branch

* Style corrections, final shadow coordinate adjustments

* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +02:00
psf
2477f1d5ca
Made BuildColorMaps redundant by using static tables (#5289)
* Added config for ColorMaps

* Fixed delclartion of static maps

* First commit complete

* Removed config

* Removed config

* fixed overworld config per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#discussion_r1747583812

* Fixed pointer alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#pullrequestreview-2286973040

* Update overworld.h

Removed new lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289/files#r1749325673
2024-09-10 14:44:08 +02:00
Alex
3cfc0004b6
Removes redundant moveTargetType ai function (#5354)
* Removes redundant moveTargetType ai function

* Beautify GetBattlerMoveTargetType for better readability
2024-09-09 11:30:39 -04:00
Eduardo Quezada
6d020eb366
Cleaned up duplicate dynamic type functions (#5338)
* Cleaned up duplicated dynamic type functions

* Small cleanup

* Oops, last cleanup broke stuff

* Alignment

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-08 19:14:05 +02:00
SonikkuA-DatH
8c3531ffc7
Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak (#5325) 2024-09-07 18:04:47 +02:00
Alex
5c86aa126f
Revert rtc based encounters (#5331)
* Revert "RTC-based wild encounters follow up (#5328)"

This reverts commit 9a95c9b07a.

* Revert "RTC-based wild encounters (#5313)"

This reverts commit 7c7fd905ba.
2024-09-06 21:09:04 +02:00
Frank DeBlasio
d3a3565fef
Converted PC strings to COMPOUND_STRINGs (#5314)
* Converted PC strings to COMPOUND_STRINGs

* Update src/pokemon_storage_system.c

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

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-09-04 16:43:34 -04:00
Frank DeBlasio
3aa24f527e
Converted Mechadoll text to COMPOUND_STRINGs (#5276) 2024-09-04 14:56:19 -04:00
cawtds
6e3ce9db2f
Move battle anim arrays to C (#5306)
* move battle anim arrays to c

* use ARRAY_COUNT instead

* remove B_ANIM_STATUS_WRAPPED

* move anim rename

* rename battle anims status/general/special
2024-09-04 11:21:40 +02:00
Pawkkie
720bc6464d
AI_FLAG_SETUP_FIRST_TURN Rename and Clarifications (#5310)
* Rename AI_FLAG_SETUP_FIRST_TURN

* Update all AI flags with comments
2024-09-04 11:12:55 +02:00
Hiram Anderson
7c7fd905ba
RTC-based wild encounters (#5313)
* Some jsonproc string utility functions

Adds stringContains, stringStartsWith and stringEndsWith for use in jsonproc.

* Time-based wild encounters

This adds some configs that allows users to define wild encounter groups on a map that are automatically cycled through depending on the time of day.
2024-09-03 21:54:03 +02:00
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
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
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
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
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
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
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
psf
e7023088ed
Merge branch 'upcoming' into scriptCommands 2024-08-27 21:31:14 -07: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
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
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
Salem
ceec17ec7b
remove unused bs signature (#5257) 2024-08-25 23:13:40 +02: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
tertu
17f68563eb
Remove support for the original LCG random number generator (#5078) 2024-08-24 10:07:00 -07:00
Eduardo Quezada
77148f83a6
DoBattleIntro state documentation (#5231)
* DoBattleIntro state documentation

* Removed unused state

* Update src/battle_main.c

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

* Fixed state jumps

* BattleStruct state uses enum

* Renamed state enums

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-21 15:57:28 +02:00
Eduardo Quezada
6ac18a6fe5 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-20 08:00:05 -04:00
psf
af12697845
Adds OW_BERRY_IMMORTAL (#5187)
* Added OW_BERRY_IMMORTAL
Added cases for OW_BERRY_IMMORTAL

* removed one preproc

* removed other preproc

* Fixed identation

* Set config to FALSE

* Update include/config/overworld.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187#discussion_r1720747388

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Reordered condition per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187\#discussion_r1720747652

* Update include/config/overworld.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-08-20 07:23:33 -04:00
Eduardo Quezada
becb2fcac8 Start 1.9.2 cycle 2024-08-19 18:29:48 -04:00
Eduardo Quezada
a11f03ed9d
Version 1.9.1 (#5199)
* Version 1.9.1

* Added 5195

* Apply suggestions from code review

Co-authored-by: hedara90 <90hedara@gmail.com>

* Added 5196 and 5207

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-19 18:25:39 -04:00
hedara90
e4c81ba6e0
Removed all instances of gBitTable[x] (#5123)
* Replaced all the gBitTable[X] usages with 1 << X, and cleaned up script output

* Fixed failed merge in online viewer

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-17 10:28:09 -05:00
Frank DeBlasio
15348eae84
Consolidated the values of Rotom's moves and added Gen9 base form effect (#5186)
* Consolidated Rotom move values

* Updated changing Rotom into its base form to its Gen9 effect

* Fixed order of if statement
2024-08-16 23:31:19 +02:00
Frank DeBlasio
bced2c97a1
Created PokeNav COMPOUND_STRINGS (#4983)
* Converted Match Call names and descriptions to COMPOUND_STRINGs

* Moved May/Brendan and Elite Four descriptions into pokenav_match_call_data.c

* Moved Steven, Brendan, and May's Match Call text to pokenav_match_call_data.c

* Cleaned up Steven's Match Call text

* Added PokeNav option text to match_call_gfx

* Moved PokeNav page descriptions to menu_handler_gfx

* Moved help bar texts to pokenav_main_menu.c

* Moved various PokeNav strings out of strings.c and into their relevant files

* Removed unused PokeNav strings
2024-08-16 22:41:26 +02:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests (#5170)
* Adds Harvest tests

* Adds Pickup in-battle effect + tests

* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)

* Change canPickupItem to bit field

* Make RandomUniformExcept inclusive (higher end) + convert bitfield

* Use CantPickupItem in PickupHasValidTargetc check

* Review
2024-08-16 15:37:23 +02:00
hedara90
47356d181a
Fixed followers breaking for species IDs above 1535 (#5179)
* Fixed followers breaking for species Ids above 1535

* Added reminder to increase follower species bits if needed in the future

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-15 10:27:35 -07:00
hedara90
45f10d734f
Fixed Ice Face, implemented tests (#5171)
* Fixed Ice Face, implemented tests

* Fixed agbcc and bad battle mon looping

* Fixed the ShouldChangeFormInWeather function again

* Cleaned up End of Turn weather form changes, simplified Ice Face

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-15 13:51:39 +02:00
pkmnsnfrn
287f6baaa9 spaces over tabs please don't eat my ass 2024-08-14 22:14:48 -07:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07:00
pkmnsnfrn
67f8a61eef Moved current and template positions to headers 2024-08-14 19:44:18 -07:00
pkmnsnfrn
dc06321054 Moved pokedex flags to constants files andadded constants to header of event_scripts 2024-08-14 19:24:55 -07:00
pkmnsnfrn
458340e043 Moved pokedex special constants to header 2024-08-14 19:09:56 -07:00