* implement move relearner in summary screen
* implement renaming in summary screen
* Enable summary screen rename and relearn by default
* Store original callback when opening screen to invoke later, hide rename/relearn for mons being moved in PC
* add a config to not restore full PP when relearning from summary screen
* hide summary relearner option if mon has no relearnable moves
* add note not to decap RELEARN string
* re-static function that now no longer needs to be accessible elsewhere
* Fix move relearner not showing up if you first select a mon with no moves
* The great curly brace massacre of 2024 (PR feedback)
* sprinkling in some parentheses
* PR feedback 2 (curly braces & whitespace)
* Add back older sprites
* Graphics config
* Added GBA most graphical data to gSpeciesInfo
* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files
* GBA mon icons
* Split GBA footprints into separate config
* Separated GBA icons into their own config
* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS
* Moved GBA sprites to regular folder with prefix
* Renamed configs
* Temporarely disabled shadows when GBA sprites are enabled
* Removed remaining files from pokemon_old folder
* Add No Running Battle Flag
Adds a flag that if set prevents the player from being able to run from wild battles.
* Formatting battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Adjust for pre-Gen 8 Teleport
Addresses the edge case with Teleport when used with under Gen 8 mechanics.
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2
* fixes and added new test cases
* bugfixing and added EWRAM u16 gLastUsedMoveType
* update after Pawkkie review
---------
Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>
* Simplified fix from #4638
* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge
* Powder Tests
* Remove duplicate
* Assume Powder is a powder move
* Add config for Powder Rain interaction
* Only primal rain
* Z-Moves fix handled in Canceller_Z_Moves
* Fix BattleScript name
* Make sure Z-Move + Powder still damages user
* 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
* 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>
* 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.
* 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>
* 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>
* First attempt at a port
* Slightly broken but working
* Got images working and opponent palettes
* half finished compressed spritesheet approach instead
* fix the palettes (smh)
* fix hflip, and a lot of clean-up
* Add B_SHOW_TYPES
* Got Illusion working
* Add num type enum
* Updated function to get type
* Fixed type icon position and cleaned up functions
* Updated illusions and Tera handling
* Added BATTLE_TYPE_IS_SINGLE and DOUBLE
* Removed IS_BATTLE_TYPE_SINGLE
* Implemented BATTLE_TYPE_IS_DOUBLE across repo
* Removed SIDE macro
* Updated config
* Deprecated battler alive macro
* Reindented file
* Added exceptions for 2v1
* Replaced Fainted check with Null check
* Added functionality for only types of caught mons
* UseDoubleBattleCoords updated
* Added ShouldFlipTypeIcon
* Renamed TryLoadTypeIcon
* Refactored functions
* Refactored functions
* Refactored functions
* Refactored functions
* Renamed SEEN to CAUGHT
* Reset config
* Added useSecondPalette and isOrdinary to gTypesInfo
* Further simplified secondPalette and isOrdinary
* Changed isordinary to isSpecialCase
* Renamed to useSecondTypeIconPalette
* Fixed Stellar type interactions
* fixed spacing
* fixed include/config/battle.h
* fixed
* fixed include/config/general.h
* changed type1 and type2
* Moved IsDoubleBattle to include.battle.h
Removed BATTLE_TYPE_IS_DOUBLE
Removed IS_DOUBLE_BATTLE
* Changed IsBattlerFainted to IsBattlerAlive
* Removed IsBattlerNull
* Moved GetBattlerData to be inline
* Renamed GetMonDefensiveTeraType
* Removed IsIllusionActive
* Fixed identation
* found one last isDoubleBattle hold out
* fixed redundant brackets
* Fixed spacing for B_SHOW_TYPES
* Update src/battle_script_commands.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Fixed padding
* Reindent file and refactored GetTypeIconHideMovement
* Update include/data.h
---------
Co-authored-by: RavePossum <ravepossum@proton.me>
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Dynamic Hidden Power Types
* Dynamic Ivy Cudgel is summary screens
* Dynamic Move types
* missed unnecessary comment that got left in
* format cleanup, return cleanup, added Tera Blast and Tera Starstorm, Revelation dance fix-> now displays live type update when tera is selected during battle before move selection
* forgot to revert config defaults
* Update src/pokemon.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* if block spaces/ raging bull fix/ more condensing on checks/ reallocating config check/ tera blast fix (was displaying tera blast type on non tera'd mons in party when battler was tera'd)
* revert configs
* added Hail check to Weather Ball
* Fixed agbcc compile/brackets/u32 changes
* Quick fix to ensure Judgment/Techno Blast/Natural Gift are not affected by -ate abilities
* Update src/pokemon_summary_screen.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Added config to prevent unobtainable Pokemon from being shiny
* Added config for disabling shinies if the player has no Poke Balls
* Removed check for adventure started flag
* Split Pokémon Object Events from Following Pokémon functionality
* Renamed follower pngs and palettes
* Define renames
* Reorder configs
* Renaming: SpeciesInfo fields, macros and palettes.
* newer generation soundproof heal bell interactions
* Fix bugs and rewrite AnyPartyMemberStatused
* add missing check, tests, clean up
* fix ai code and rename battler for clarity
* 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
In the Pokémon Storage System, even FONT_SMALL_NARROWER isn't sufficient
to prevent clipping in all cases. e.g. Unremarkable Teacup clips. We
have decided to accept that cost to make the rest of the user experience
better, but downstream projects that don't like that trade-off can
either a) alter the Pokémon Storage System UI, or b) set
I_EXPANDED_ITEM_NAMES to FALSE.
In contests, even FONT_NARROWER isn't sufficient to prevent clipping in
all cases. e.g. Stomping Tantrum clips. We have decided to accept that
cost to make the rest of the user experience better, but downstream
projects that don't like that trade-off can either a) alter the contest
UI, or b) set B_EXPANDED_MOVE_NAMES to FALSE.
* wrote foundational terastal tests
* implemented baseline test-only Tera functionality; modified GetBattlerType + STAB calculations, misc. changes to some moves
* added tests and func. for Stellar type, more tests for Tera Blast
* more tests for Stellar type, Conversion fixes, Color Change + Conversion2 future proof
* implemented tera blast, expanded stellar type func., fixed tests
* last set of Tera/Tera Blast tests for checklist, protean fix
* implemented in-battle Terastallization, WIP stellar indicator and tera animation
* fixed bad merge
* expanded NUMBER_OF_MON_TYPES, cut down on TYPE_STELLAR hackiness, added Stellar type to summary
* fixed type indicators
* added tera logic to AI
* implemented code review changes, added B_TERA_ORB_NO_COST
* updated AI to calc damage with Tera when applicable; minor rework to AI gimmick handling
* fixed Tera Blast split choice occuring when not Terastallized
* fixed Tera Blast using Last Respects BP calcs
* added tera type to TrainerMon, code review tweaks
* Implemented chain fishing
* Added configs
* I_FISHING_MINIGAME implemented
* Refactored Check For Bite
* CLeaned up version of metatile checks
* Removed debug script
* Added helper functinons
* Cleaned up CalculateFishingProximityOdds
* Added new constatnts for cardinal direction and axis
* Updated with constants
* Reordered functions
* Cleaned up some functions
* Moved constants
* Created UpdateChainFishingSpeciesAndStreak
When 3 sides are blocked, every cast will get a mon
* Created DoesFishingMinigameAllowCancel
* Removed fishing chain check
* Fixed bug where streak was not incremented correctly
Fixed bug where Land was not properly counted
Fixed bug where streak was always being read as maxed
* Updated variable and function names
* Updated variable and function names
* Moved UpdateChainFishingSpeciesAndStreak to happen before shiny rolls occur
* Removed debug statements
* Applied feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4343\#discussion_r1551278416
* Fixed default item config and changed gChainFishingDexNavStreak and sLastFishingSpecies to only use EWRAM when features are enabled
* Update include/config/item.h
Include feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4343#discussion_r1567145660
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Changed Dexnav to DexNav per https://github.com/rh-hideout/pokeemerald-expansion/pull/4343\#discussion_r1567145660
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Added first working version
* Fixed spacing and set config to false
* Update src/overworld.c
Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4370#discussion_r1555917636
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Moved BERRY_MUTATION_CHANCE to include/config/overworld.h and renamed it to OW_BERRY_MUTATION_CHANCE
* Move level_caps.h to config folder
* Multiple EV/IV refered as EVs/IVs
* Disabled decap by default
* Level up learnsetst comments
* Lvl up learnsets by generation
I think the title sums it up pretty nicely
* Update level_up_learnsets.h
forgot some newer pokemon
* divided the learnset file into generations
* Separated learnsets by generation
Separated the learnsets by generation, added a bit more documentation in the config file
* Update src/pokemon.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update include/config/pokemon.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* PLA aux item sprites
* Gen 6 lvl up Learnset update
Updates gen 6's level up learnsets to ORAS (previously XY)
* Revert "Merge branch 'upcoming' of https://github.com/MartyKen/pokeemerald-expansion into upcoming"
This reverts commit 53462c4088926a813f216a7917b1dfeb5ef2ca25, reversing
changes made to 051a93058c83c691f8476fbb97035e64fcee38aa.
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Add LGPE+ Premier Ball Bonus config
* Capitalization
* Premier Ball count in message + only give the amount of Premier Balls possible
* Review changes
* Updated B_TELEPORT_BEHAVIOR to match Premier Ball config
* Update src/shop.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Sets neutral nature and ability 0 as default in trainer control
* add config to generate a random ability
* minor correction
* move config to battle.h
* fixed compiling
* Teachable learnset helper mechanics
* Rename folder and python script
* Some teachable learnset work
* Update PoryMoves file labels
* Add header and make custom json
* Include found moves in output file
* Update SV file to latest version
* Don't run if there are no jsons to be found
* Add Basculin duplication in json
* Add universal move support to
* Ignore and skip Mew
* Integrate tool in Makefile
* Condense Basculin learnsets
* Split Oinkologne for easier generation
* Add Deoxys' XD move tutor data
* Add missing Darumaka/Yamask Galarian SwSh TMs
* Add TID species to sv.json
* Update sv.json to The Indigo Disk data
* Add Python install instructions
* Fix Makefile
* Expand header with more information
* Add config to allow disabling the learnset helper
* Update include/config/pokemon.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Don't crash if the config is missing
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Lvl up learnsets by generation
I think the title sums it up pretty nicely
* Update level_up_learnsets.h
forgot some newer pokemon
* divided the learnset file into generations
* Separated learnsets by generation
Separated the learnsets by generation, added a bit more documentation in the config file
* Update src/pokemon.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update include/config/pokemon.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Renamed VAR_TERRAIN and introduced a var-based field terrains timer
* Fixed sky battle configs alignment and syntax
* Added B_VAR_TERRAIN_TIMER handling to Overworld_ResetBattleFlagsAndVars
* Removed pointless edits to EndTurnTerrain
* Updated B_VAR_TERRAIN_TIMER's comment
* Updated the syntax of ABILITYEFFECT_SWITCH_IN_TERRAIN to comply with Agbcc
* Nuked pointless VarGet calls in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects
* Reverted changes made to BS_SetRemoveTerrain
I shouldn't have touched it at all since it's not involved with B_VAR_TERRAIN functionality.
* Removed trailing spaces in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects
* Made gBattleMoves handle the InGame name and description of battle moves
No more multiple arrays in separate, individual files.
Note:
-Keep an eye on Task_LearnedMove.
* Reintroduced move names
Misc:
-Fixed Trick-or-Treat and Light of Ruin's expanded names.
-Introduced a new field for Z-Move names, and a constant for their name length.
-Added a few TODOs to GetBattleMoveName.
-Updated GetMaxMoveName and GetZMoveName. There's no reason not to let GetBattleMoveName handle everything on its own.
* Updated GetBattleMoveName to handle Z-Move Names
Misc:
-Removed pointless TODO about MOVE_NAME_LENGTH.
-The compiler doesn't allow to have a move name with a value higher than MOVE_NAME_LENGTH, therefore it's pointless to worry about it.
* Fixed a couple of expanded move names
* Removed zMoveName variable of struct BattleMove and extended the name variable's size
* Ditched no longer used MOVE_NAME_LENGTH constant
* Corrected the names of the max moves
I should have done this after updating the size of the name variable of the struct BattleMove, but I didn't think about it at all until Cancer Fairy indirectly gave me the idea.
* Fixed U-turn's name
* Brought back MOVE_NAME_LENGTH
I think it doesn't make sense to have a Z_MOVE_NAME_LENGTH because the length in question is used for all battle moves, not just the Z-Moves.
* Introduced a union for Move/Z-Move names in the struct BattleMove
* Fixed the union for gBattleMoves move names
Also updated GetBattleMoveName to properly handle Max Move names.
Also also renamed the "zMoveName" variable to "bigMoveName" which better reflects its purpose. Z-Move names weren't the only thing it covered, since it also handles Max Move names.
* Removed deprecated GetZMoveName and GetMaxMoveName
* Reintroduced mention to gMoveNames in sGFRomHeader
* Fixed move names and ported move descriptions
* Fused the struct ContestMove into the struct BattleMove
* Removed no longer used Z_MOVE_NAME_LENGTH constant
* Renamed the struct BattleMove's bigMoveName variable and introduced macros to prettify move names
* Reintroduced the contest parameters for Pokémon moves
* Renamed gBattleMoves to gMovesInfo
This is consistent with gSpeciesInfo, the array that contains most of the species data.
* Renamed the BattleMove struct to MovesInfo
This is consistent with the struct SpeciesInfo, which contains the variables used by the gSpeciesInfo array.
* Removed empty lines separating battle params from contest params in gMovesInfo
* Renamed MovesInfo to MoveInfo
* Added Cancer Fairy's HANDLE_EXPANDED_MOVE_NAME macro
Used to handle moves with expanded names in a more comfortable manner.
Also fixed Trick-or-Treat's expanded name.
* Renamed GetBattleMoveName to GetMoveName
* Added a comment pointing out that the shared move descriptions are shared move descriptions
* Re-aligned one of the escape characters of CHECK_MOVE_FLAG
* Renamed the battle_moves.h file to moves_info.h instead for consistency's sake
* Applied Eduardo's adjustments
* Using compound string for regular move names as well, saving 1180 bytes and making their use consistent
* Move description formatting
* Updated Pursuit test after merge
* Renamed the BATTLE_CATEGORY constants to DAMAGE_CATEGORY
---------
Co-authored-by: Nephrite <thechurchofcage@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Gen 1 exp yield config
* I'm a dumdum
* Gen 2 configs
* Exp yield configs up to gen3
* Gen 4 configs
* Gen 5 configs
* Configs up to gen6
* Gen7 configs
* Final form exp adjustments
* 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>
* Added five ability flags
Omitted duplicate flags that are basically "can't copy" (Role Play, Receiver, Entrainment, Skill Swap), didn't bother adding Neutralizing Gas flag,
* Mold Breaker and Trace
* Gastro Acid, Simple Beam, Worry Seed
Decided to keep the Simple Beam/Worry Seed functions
* Entrainment done
* Skill Swap
* Doodle/Role Play + flag descriptions
Also adjusted Doodle test
* Wandering Spirit, Mummy, Neutralizing Gas
Neutralizing Gas really only needs to check for other mons with Neutralizing Gas, otherwise unsuppressable abilities are handled separately.
* Renamed flags
* Archaludon?
* more archuladon stuff
* Hydrapple and Gouging Fire
* Raging Bolt
* Iron Boulder and Iron Crown
* Terapagos
* Pecharunt
* Update gen_9.h
* Pokedex orders
