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
Eduardo Quezada
aebbe448b8
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-28 12:58:14 -04: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
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
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
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
Eduardo Quezada
661ec0a9fd
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-14 17:10:20 -04:00
Eduardo Quezada
6f0004ec4e
Removed some hardcoding of move IDs + Gen4/5 Defog ( #5156 )
...
* Removed some hardcoding of move IDs
* Added Defog Gen6+ config (+ updated tests)
2024-08-14 15:51:34 +02:00
Alex
7119d60a67
Set new anim particles by default to off ( #5161 )
2024-08-14 06:31:26 -07:00
psf
d1183f4b8a
Add B_SHOW_TYPES and cleaned up IsDoubleBattle ( #5131 )
...
* 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>
2024-08-11 17:55:51 +02:00
Eduardo Quezada
113f8de9b1
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_controller_player.c
2024-08-08 13:22:49 -04:00
Galaxeeh
355739db63
Dynamic Move Types in Summary Screen/Battle ( #5084 )
...
* 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>
2024-08-08 11:08:50 +02:00
kittenchilly
e4f09c8103
Move Relearner now displays move category ( #5081 )
...
* Move relearner now displays move category
* Update move_relearner.c
* Update move_relearner.c
* Address reviews
2024-08-06 23:58:18 +02:00
cawtds
3af93bdfee
FRLG+ whiteout message ( #4967 )
...
* FRLG whiteout message + post whiteout event
2024-08-02 08:28:05 -07:00
psf
7b3b635c67
Add AUTO_LOWERCASE_KEYBOARD ( #4976 )
...
* Added SwapKeyboardToLowerAfterFirstCapitalLetter and AUTO_LOWERCASE_KEYBOARD
* Fixed tabs and spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4976/files\#r1677868397
* Removed semicolon found by https://github.com/rh-hideout/pokeemerald-expansion/pull/4976\#discussion_r1678105502
2024-07-15 19:06:01 +02:00
psf
5c38532281
Add B_ENEMY_THROW_BALLS, B_PLAYER_THROW_BALLS_SOUND, and B_ENEMY_THROW_BALLS_SOUND ( #4953 )
...
* First proof of concept works
* Added B_THROW_BALLS_SOUND
* Made generic MonSendOut
* Changed magic number to constant
* added acute e and changed to GEN_LATEST
* Removed tabs
* Undef'd HIBYTE and removed extra bool32
* Made functions inline per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1675397114
Split into B_THROW_BALLS_SOUND B_PLAYER_THROW_BALLS_SOUND and B_ENEMY_THROW_BALLS_SOUND per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1676143761
* Reset debug script
* Removed static assert per Discord conversation with Alex
2024-07-14 14:46:04 +02:00
psf
d410f56a8c
Add P_CAN_FORGET_HIDDEN_MOVE ( #4968 )
...
* Added P_CAN_FORGET_HMS
* Renamed to can forget hidden move
* Bypass IsLastMonThatKnowsSurf
* Fixed typo
* Moved P_CAN_FORGET_HIDDEN_MOVE
* Update src/party_menu.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/4968#discussion_r1677033837
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-14 11:23:49 +02:00
Bassoonian
385b7017f3
Fix fake RTC being on by default ( #4965 )
2024-07-13 21:20:55 +02:00
psf
3e03419bdb
Add OW_FLAG_PAUSE_TIME, pausefakertc, resumefakertc and togglefakertc ( #4954 )
...
* First concept
* Fixed config file and added static assert
* Reset debug scripts
* Cleaned up overworld config
* Renamed new Rtc pausing functions per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1675393121
* Added tabs instead of spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1676791279
* Update include/config/overworld.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 20:44:27 +02:00
Bassoonian
ef76a6b21b
Merge branch 'upcoming' into disablefollowersbydefault
2024-07-11 14:08:55 +02:00
psf
e953a809ff
Added OW_USE_FAKE_RTC and OW_ALTERED_TIME_RATIO ( #4910 )
...
* Added OW_USE_FAKE_RTC, OW_ALTERED_TIME_RATIO and src/fake_rtc.c
* Changed ALTERED_TIME_RATIO to GEN_LATEST
* Changed spaces to tabs per https://github.com/rh-hideout/pokeemerald-expansion/pull/4910/files\#r1667111624
2024-07-10 20:58:01 +02:00
Eduardo Quezada
fb708b7ed3
Merge branch '_RHH/master' into _RHH/upcoming
2024-07-10 10:05:10 -04:00
Eduardo Quezada
de609a2f5b
Added missing redirect abilities Gen 3-4 config ( #4920 )
...
* Added missing redirect abilities Gen 3-4 config
* Combined 3 Battle Script Natives into 1
* Cleaner FindMonThatAbsorbsOpponentsMove
2024-07-07 09:52:59 +02:00
psf
2a5e4343c8
Implemented OW_IGNORE_EGGS_ON_HEAL ( #4888 )
...
* Implemented OW_IGNORE_EGGS_ON_HEAL
* Removed videos and change nPokemon to u32
* Changed OW_IGNORE_EGGS_ON_HEAL to GEN_LATEST per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888\#issuecomment-2205271486
* Update include/config/overworld.h
Fixed spelling error per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888#discussion_r1664454436
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-04 16:03:42 +02:00
Frank DeBlasio
103ed85b83
Added config to prevent unobtainable Pokemon from being shiny ( #4735 )
...
* 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
2024-06-29 22:07:14 +02:00
Alex
55c13a80bc
Force species in tests ( #4810 )
...
* Force species in tests
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update include/config/test.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-06-26 18:38:14 +02:00
fakuzatsu
6c9dcd60bc
simple button config for the move description menu ( #4860 )
...
* simple button config for the move description menu
* change from preproc to normal if
2024-06-25 11:09:01 +02:00
Eduardo Quezada
4d6452e14e
Move general config file to the config folder ( #4805 )
2024-06-19 13:42:01 +02:00
sneed
609754f0f6
Add RandomChance macro and ability trigger chance config ( #4829 )
...
* RandomChance macro, contact ability chance config
* Unify config, add shed skin
2024-06-18 20:13:44 +02:00
Eduardo Quezada
1eb0b3261f
Added option to disable species cries ( #4791 )
...
* Added option to disable cries
* Update src/pokemon.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-06-15 22:07:13 +02:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality ( #4761 )
...
* 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.
2024-06-13 22:46:27 +02:00
Bassoonian
03cc0ae6b3
Add option to hide substitute followers ( #4765 )
...
* Add option to hide substitute followers
* Update event_object_movement.c
2024-06-12 13:53:01 -04:00
Bassoonian
5fe0aee063
Add config to turn off two-framed front sprites ( #4750 )
...
* Add config to turn off two-framed front sprites
* Two frames should be on by default
* Simplifies integration
2024-06-11 13:10:23 -04:00
Eduardo Quezada
7df0219003
BW2 Style Map Pop-Ups ( #4396 )
2024-06-09 16:03:41 -04:00
Bassoonian
bbc05234b9
Make Pokémon Sprite Visualizer name official ( #4745 )
...
* Rename files to PSV
* Rename functions and defines
* Add missing newlines
* Integrate feedback
2024-06-09 12:12:35 -04:00
sneed
fa81861593
Add newer generation Heal Bell interactions with Soundproof ( #4732 )
...
* 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
2024-06-07 18:51:21 +02:00
Bassoonian
f4c890df1e
Disable OW followers by default
2024-06-04 15:37:02 +02:00
Eduardo Quezada
ee1d14755a
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-06-02 11:06:41 -04:00
Eduardo Quezada
0be643a517
Set TYPE_NONE as type 0 + other type data tweaks ( #4462 )
...
* 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
2024-06-01 07:38:22 +02:00
Eduardo Quezada
021074cd2e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon/species_info/gen_1_families.h
# src/data/pokemon/species_info/gen_2_families.h
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-05-28 14:28:33 -04:00
Eduardo Quezada
80b193280d
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_main.c
# src/data/item_icon_table.h
# src/data/pokemon/species_info/gen_9_families.h
2024-05-27 10:13:42 -04:00
moostoet
85ca0645a9
Add configuration to prevent permanent item theft (Covet / Thief) from NPCs ( #4605 )
...
* feat: implement logic for gen5+ covet/thief
* refactor: add define, misc. changes
* fix: define parenthesises
* fix: revert to bool32
* fix: formatting
2024-05-20 22:52:12 +02:00
Pawkkie
35e90b896d
Adjust description of FREE_MATCH_CALL ( #4590 )
...
* Adjust description of FREE_MATCH_CALL
* Shorten comment
2024-05-19 10:13:14 +02:00
Bassoonian
d811cd1c4c
Add egg cycle length config ( #4596 )
2024-05-18 14:59:32 -04:00
Eduardo Quezada
6eba5bcb80
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-05-16 17:31:46 -04:00
Bassoonian
7d84cd62ef
Add on release item config ( #4577 )
2024-05-15 23:46:25 +02:00
Eduardo Quezada
ab682ce900
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/items.h
# src/pokemon_summary_screen.c
2024-05-15 09:58:21 -04:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything ( #3949 )" ( #4525 )
...
This reverts commit e2d70d440e6217ed8d16663010ea2678846c4e14, reversing
changes made to 0d2b40095377e51576dcc8931c1d87066b039c31.
# Conflicts:
# gflib/text.c
# include/config/decap.h
# src/battle_message.c
# src/item.c
2024-05-13 19:19:37 +02:00
RavePossum
afb66b4d2b
preproc assets, move config to overworld config, add some antialiasing to graphics, consistency in naming gens
2024-05-07 23:58:29 -04:00
Eduardo Quezada
35a76248d1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/pokemon/species_info/gen_4_families.h
2024-05-06 16:03:29 -04:00
