Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alex on1ine item activation #5

Closed

Conversation

Pawkkie
Copy link

@Pawkkie Pawkkie commented Dec 3, 2024

Should fix conflicts for the expansion PR to get merged, PRing to you for a sanity check if you don't mind :)

(Clearly I did this wrong lmao)

Pawkkie and others added 30 commits August 26, 2024 23:46
Re-targets Shed Tail PR to upcoming
* More missing AI logic

* Update battle_ai_switch_items.c

* Update battle_ai_main.c
* 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
* Convert 8 various to callnatives

* Address review comments
* 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 <[email protected]>

---------

Co-authored-by: Alex <[email protected]>
* Adds config to show chosen move and target of ingame partner, `#define B_SHOW_PARTNER_TARGET`, default `FALSE`
---------

Co-authored-by: Hedara <[email protected]>
* 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 <[email protected]>

* Update src/overworld.c

* Update include/overworld.h

* ScriptShowItemDescription remove unused var

* fix ScriptShowItemDescription warning

---------

Co-authored-by: ghoulslash <[email protected]>
Co-authored-by: Alex <[email protected]>
* 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.
* Rename AI_FLAG_SETUP_FIRST_TURN

* Update all AI flags with comments
* move battle anim arrays to c

* use ARRAY_COUNT instead

* remove B_ANIM_STATUS_WRAPPED

* move anim rename

* rename battle anims status/general/special
* Converted PC strings to COMPOUND_STRINGs

* Update src/pokemon_storage_system.c

Co-authored-by: Eduardo Quezada <[email protected]>

---------

Co-authored-by: Eduardo Quezada <[email protected]>
Toggled by B_NEW_TERRAIN_BACKGROUNDS
During my review of rh-hideout#5313 I overlooked that the function vars used a u8 instead of u32. This follow up fixes it
* Revert "RTC-based wild encounters follow up (rh-hideout#5328)"

This reverts commit 9a95c9b.

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

This reverts commit 7c7fd90.
AlexOn1ine and others added 28 commits November 30, 2024 18:06
Co-authored-by: Bassoonian <[email protected]>
@Pawkkie Pawkkie closed this Dec 3, 2024
@Pawkkie Pawkkie deleted the AlexOn1ine-item_activation branch December 3, 2024 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.