Commit graph

14392 commits

Author SHA1 Message Date
psf
bf8b09b1b6
Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)
* Emptied out item_ball_scripts
Added GetObjectEventTrainerRangeFromTemplate
Added Common_EventScript_FindItem

* Replaced trainer_sight_or_berry_tree_id with item constant
Replaced scripts with Common_EventScript_FindItem

* Renamed to GetItemBallIdAndAmountFromTemplate
Moved to item_ball.c

* Updated ObjectEventTemplate

* Updated inc files to support plural item names

* Refactored CopyItemNameHandlePlural to handle all items

* Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT

* Converted spaces to tabs
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130

* Added warning on object_event macro to prevent silent failure
Reverted global.fieldmap to original state, per feedback

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-14 21:35:45 +01:00
LOuroboros
80ffaa5e2c
Raised the limit of max items per stack to 999 (#3923)
* Expanded the amount of max items per stack from 99 to 999

* Set Battle Pyramid Bag stack limit back to 99
This commit exists for archival purposes.
People who may want to set the limit of item stacks in the Battle Pyramid's bag to 999 can refer to its code diff.

* Reintroduced the Battle Pyramid changes through a MAX_PYRAMID_BAG_ITEM_CAPACITY constant

* Gave 3 digit support to the Battle Pyramid's bag

* Rewrote the comment for MAX_PYRAMID_BAG_ITEM_CAPACITY

* Made DebugAction_Give_Item_SelectQuantity use MAX_ITEM_DIGITS

* Ditched BERRY_CAPACITY_DIGITS and BAG_ITEM_CAPACITY_DIGITS

* Removed MAX_BERRY_CAPACITY
No point in keeping it if we're making all item stacks cap at 999.

* Applied review corrections

* Removed pointless local var in DebugAction_Give_Item_SelectQuantity

* Defined a MAX_PYRAMID_ITEM_DIGITS

* Cleaned up some of the functions in which MAX_ITEM_DIGITS is used

Summary:
-Removed pointless local variables in CheckBagHasSpace, AddBagItem, PrintItemQuantity and PrintItemSoldAmount.
-Removed pointless brackets in an if statement of CheckBagHasSpace.
-Initialized the pocket local variable of CheckBagHasSpace from the get go to save a few lines too.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-14 16:32:38 -03:00
Ninjdai
0b149f6b6a
Fixed move, species and ability counts to u16s in RHH header (#3992) 2024-01-14 12:49:59 -03:00
Bassoonian
4846e2a884
Add updated EV configs (#3993)
* Add updated EV configs

* Fix Misdreavus ternary
2024-01-14 15:26:34 +01:00
Eduardo Quezada D'Ottone
9445953833
Moved Item Effects to gItems (#3991)
* Moved Item Effects to gItems

* Removed redundant item effects

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-14 10:03:48 +01:00
Eduardo Quezada D'Ottone
ed1dbbb866
Small whitespace fix 2024-01-13 12:38:52 -03:00
Eduardo Quezada D'Ottone
5817344f7c
Move data ternaries (#3987)
* Move data ternaries

* Updated Sky Attack with pre-gen 3 config
2024-01-13 15:33:53 +01:00
Zimmermann Gyula
e15eadda0b
Revert accidental move changes. (#3986)
Revert Sky Attack critboost.
Revert Crunch nerf.
Restore Burning Jealousy accuracy.
2024-01-13 10:23:00 -03:00
Eduardo Quezada D'Ottone
ff0aed31b3
Removed some hardcoded move IDs (#3982)
* Removed EFFECT_HURRICANE in favor of using EFFECT_THUNDER

* Added EFFECT_BLIZZARD

* Helping the IDE a little

* Added EFFECT_RAIN_ALWAYS_HIT for Forces of Nature moves

* Removed MOVE_SELF_DESTRUCT and MOVE_EXPLOSION hardcoding

* Removed EFFECT_FRUSTRATION hardcoding

MOVE_SELF_DESTRUCT

* Cleaned up sPoints_MoveEffect

* Removed MOVE_AURA_WHEEL and MOVE_PRESENT hardcoding

* Fixed compile
2024-01-12 22:41:46 +01:00
Eduardo Quezada D'Ottone
e5b58b04b6
Renamed healBlockBanned to healingMove (#3981)
* Renamed healBlockBanned to healingMove

* Fix fix
2024-01-12 18:41:45 +01:00
Eduardo Quezada
33f34e91e9 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
2024-01-12 12:24:19 -03:00
Biffalo XIII
a89f1eeb50 Revert "healBlockBanned -> healingMove (#3976)"
This reverts commit a947b20f31.
2024-01-12 12:10:59 -03:00
Ninjdai
04a29951c7
Fix RHH ROM header section (#3980)
RHH ROM header was not in the correct section
2024-01-12 14:40:35 +00:00
kittenchilly
cdaf3031cb
Update EXP Yield for Indigo Disk mons + other data fixes (#3974)
* Update EXP Yield for Indigo Disk mons

* Update gen_8.h

* Also update all body colors

* Revert "Also update all body colors"

This reverts commit 530bbe7bae.

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-12 12:25:08 +01:00
Nephrite
1ced2bf324
Converted EFFECT_x defines to enum (#3975)
follow up PR

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-12 07:30:58 -03:00
Alex
6220a8ced9
Adds Clanging Sclaes test, reverts fix and few Parental Bond tests (#3973)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-12 01:43:43 +01:00
kittenchilly
a947b20f31
healBlockBanned -> healingMove (#3976) 2024-01-12 01:05:26 +01:00
Biffalo XIII
2cc26d935a Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
#	include/config/pokemon.h
#	src/birch_pc.c
2024-01-11 19:51:11 -03:00
Eduardo Quezada D'Ottone
22b9337e97
Secondary/primary effects overhaul (#3577) 2024-01-11 19:37:29 -03:00
Nephrite
095decbd27 FINAL review changes 2024-01-12 07:25:51 +09:00
Nephrite
f6efc75c1a Move functions to battle_ai_util.c 2024-01-12 04:01:33 +09:00
Nephrite
baefa08bee Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2024-01-12 03:13:42 +09:00
Nephrite
a76e3c70ba Applied more review fixes 2024-01-12 03:02:48 +09:00
Eduardo Quezada D'Ottone
a1071aaf42
Added missing form dex entries. (#3972)
Co-authored-by: Biffalo XIII <--global>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-11 14:39:51 -03:00
Nephrite
3c93f97166 Apply suggestions from code review
Thanks, Edu

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-12 02:13:55 +09:00
Eduardo Quezada D'Ottone
4acaa0cab8
Expanded Paldean Tauros macro (#3971)
* Expanded Paldean Tauros macro

* Updated colors to December 2023 HOME changes

---------

Co-authored-by: Biffalo XIII <--global>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-11 17:54:19 +01:00
Bassoonian
a8a504ef25
Refactor dex completion (again) (#3937)
* Refactor dex completion

* Incorporate Alex's requests

* rename to dexForceRequired

* Revert GetPokedexRatingText argument type

* Apply suggestions from code review

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

* Revert "Revert GetPokedexRatingText argument type"

This reverts commit a9b0c28040.

* Fix HasAllMons

* Fix oops

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-11 13:35:31 -03:00
Alex
e0f672fbad
Tauros forms stat fixes + Electrode-H evo item fix (#3970)
* Tauros forms stat fixes + Electrode-H evo item fix

* fixes misc info placement
2024-01-11 10:56:19 +01:00
Alex
96f601f9f8
Replaces some older gen9 sprites with Pokemoncommunity ones (#3969) 2024-01-11 10:23:57 +01:00
Bassoonian
ce48616477
Add power item config (#3961) 2024-01-11 09:34:19 +01:00
Damon Murdoch
a1a79ce8db
Fix clangorous soulblaze boosting itself twice in doubles (#3965)
Fix clangorous soulblaze boosting itself twice in doubles
2024-01-11 09:30:07 +01:00
Alex
5b5b9e7e50
Revert "Organized pokemon graphics by generation (#3868)" (#3959)
This reverts commit b077d92731.
2024-01-10 15:49:58 -03:00
Nephrite
c4616739d8 Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2024-01-11 00:35:35 +09:00
Nephrite
67e76f2b59 Some more review fixes + Fling fix
Not the ideal solution but Fling now has a hardcoded check for Shield Dust and acts accordingly - a better long term solution inolves making a bunch of reusable MOVE_EFFECTS and rejigging attackcanceler but I didn't feel like doing that today...
2024-01-11 00:27:06 +09:00
Ninjdai
6c5cf38803
Fix typo in pokedex_plus_hgss.c (#3958) 2024-01-10 15:41:23 +01:00
Alex
4dc1b1dda3
Revert "Update catch curve for pokeballs (#3685)" (#3955)
This reverts commit 929ec54a39.
2024-01-09 21:20:51 -03:00
Alex
c56acb944b
New Feature: Level Caps (#3632)
* New Feature: Level Caps

* B_LEVEL_CAP_EXP_UP and fixes

* 1 exp fix for hard level caps

* remove 1 exp hack

* Reviews applied

* fix u8/u16

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-09 18:47:23 +01:00
Nephrite
25f0179628 Review changes
Numerous AI updates and test fixes; added a test for Aura Wheel
2024-01-10 00:55:43 +09:00
Alex
5498098438
Syrup Bomb / Sticky Syrup addition (#3948)
* Syrup Bomb / Sticky Syrup addition

* Update test/battle/move_effect/syrup_bomb.c

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

* Update src/battle_script_commands.c

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

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-09 13:37:07 +01:00
Biffalo XIII
4a3954ff34 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/birch_pc.c
#	src/main.c
2024-01-09 09:19:12 -03:00
Eduardo Quezada D'Ottone
0d75ccd2d2
Stuff Cheeks cleanup (#3950)
Co-authored-by: Biffalo XIII <--global>
2024-01-09 09:15:23 +01:00
Bassoonian
d73c9b0b9d
Fix some ball multiplier configs (#3939)
* Fix some ball multiplier configs

* Updated the comment of B_LURE_BALL_MODIFIER

* Specified the effects of B_LURE_BALL_MODIFIER in itsa state its effects in a more specific manner

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

* Corrected the comments of B_DREAM_BALL_MODIFIER, B_SPORT_BALL_MODIFIER and B_SAFARI_BALL_MODIFIER

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

* Turned the ternaries in the case for the Lure Ball's catch rate in Cmd_handleballthrow into a regular if/else if statement

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

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-08 18:26:05 -03:00
MartyKen
b077d92731
Organized pokemon graphics by generation (#3868)
* VSync BENCHMARKs and avoid AdvanceRandom in tests (#3867)

* Organized pokemon graphics per generation

title says it all

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-01-08 20:48:12 +01:00
ghoulslash
396f2c9565
some pledge combo fixes (#3934)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-06 16:52:48 +01:00
Bassoonian
34ceb930cc
Fix YIELD_RATE (#3931) 2024-01-05 20:07:51 +01:00
johannakullmann
338740e256
Fixed bug that prevents field moves from being displayed when adding more field moves (#3933)
When adding a new field move, no field moves will be displayed in the party menu screen at all. This fixes this issue.
2024-01-05 17:56:38 +01:00
LOuroboros
dbad66ee1b
Applied a number of changes to the debug menu (#3926)
* Renamed the Party/Boxes section of the debug menu to just Party

Misc:
-Relabeled the enums containing the constants for the different features in each main section of the menu.
 -The reason why is that "enum PartyMenu" was throwing a compiler error for whatever reason, so I renamed the other labels to keep them consistent with it.

* Renamed the debug menu's 'Fill PC/Pockets' to 'PC/Bag'

* Moved PC/Bar higher in the debug menu's list

* Added a debug feature to clear the bag

* Moved 'Access PC' and 'Clear Boxes' to PC/Bag

* Relocated the GivePCBagDebugMenu enum

* Packed the debug menu's 'Fill' options into a PC/Bag category of their own
And reupdated a lot of labels that I previously renamed. I shouldn't have removed the "Fill" in them when I renamed PC/Pockets to PC/Bag..

* Fixed alignment in sDebugMenu_Items_Utilities

* Shuffled the positions of the debug menu's 'Access PC' and 'Clear Bag'

* Made the B button take you back to PC/Bag from Fill, instead of taking you to the main debug menu

* Updated alignment in sDebugMenu_Items_Utilities again

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2024-01-05 16:09:39 +01:00
Gabriel Cowley
9c07718a05
Fix debug action SelectShiny tInput value toggle (#3930) 2024-01-05 15:30:25 +01:00
Bassoonian
48c26f7802
Update README.md (#3929)
Add Dynamic Multichoice to upcoming readme

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2024-01-05 13:36:28 +01:00
DizzyEggg
b5252c4afd
Berry Expansion (#3618) 2024-01-05 13:34:03 +01:00