Commit graph

271 commits

Author SHA1 Message Date
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
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 e2d70d440e, reversing
changes made to 0d2b400953.

# Conflicts:
#	gflib/text.c
#	include/config/decap.h
#	src/battle_message.c
#	src/item.c
2024-05-13 19:19:37 +02: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
Eduardo Quezada
2a605f2d84
Gen 1 type matchups + cleaned type matchup table (#4508) 2024-05-06 17:37:03 +02:00
Martin Griffin
664fe905f6 Enable GF type names by default 2024-04-25 18:40:38 +01:00
Martin Griffin
073f12be18 Expanded type names 2024-04-25 18:40:38 +01:00
Martin Griffin
d913792f43 Enable GF species names by default 2024-04-25 18:40:37 +01:00
Martin Griffin
aab9678b02 Enable GF item names by default
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.
2024-04-25 18:40:37 +01:00
Martin Griffin
484e288cad Expanded item names 2024-04-25 18:40:37 +01:00
Martin Griffin
a1d2460372 Enable GF move names by default
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.
2024-04-25 18:40:37 +01:00
AgustinGDLV
84a9d4ffcf
Terastallization (#4110)
* 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
2024-04-24 11:17:46 +02:00
Eduardo Quezada
a200fe1590 Read separate palettes and apply it to Gen 1-3 2024-04-21 10:20:23 -04:00
Eduardo Quezada
3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	include/event_object_movement.h
#	src/data.c
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Eduardo Quezada
c4c371824f Merge branch '_RHH/master' into _RHH/upcoming 2024-04-20 08:22:49 -04:00
LOuroboros
d08fb8e824
Turned B_RESTORE_HELD_BATTLE_ITEMS into a non-boolean config (#4402)
* Corrected the comment description of B_RESTORE_HELD_BATTLE_ITEMS

* Made B_RESTORE_HELD_BATTLE_ITEMS a non-boolean config
2024-04-18 09:03:39 +02:00
kittenchilly
e19b05a3a9
Add Fog weather (#4359)
* Add Fog weather

* Update battle_string_ids.h

* Update battle.h

* some tweaks

* Update battle_anim_scripts.s

* Address reviews

* Update battle_util.c

* Update battle_util.c

* Update include/config/battle.h

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

* Address reviews, changes, fix bugs

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-17 12:06:49 -04:00
psf
fcf90ab52d
Fishing Enhancements (#4343)
* 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>
2024-04-16 22:53:50 +02:00
Eduardo Quezada
5a276dcbbf Merge branch '_RHH/master' into _RHH/upcoming 2024-04-15 18:29:06 -04:00
Eduardo Quezada
fbff04d4e3
Fixed silent Klefki cry (#4392)
* Fixed Klefki's cry not being hearable

* Added warning to family toggle file
2024-04-14 21:06:17 +02:00
Eduardo Quezada
5bf379720f Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/data/moves_info.h
2024-04-12 21:30:52 -04:00
psf
24e3ca267b
Add OW_HIDE_REPEAT_MAP_POPUP config (#4370)
* 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>
2024-04-10 09:10:37 +02:00
psf
36cd976a03
Added OW_PC_MOVE_ORDER config (#4348)
* Added OW_PC_MOVE_ORDER config

* Implemented feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4348\#pullrequestreview-1981473856
2024-04-07 09:52:58 +02:00
Alex
c740c4ba19
Disguise fixes + gen8 hp loss config (#4360)
* Disguise fixes + gen8 hp loss config

* fix battler arg

* Update test/battle/ability/disguise.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-07 00:07:55 +02:00
psf
8f2f6811fb
Added B_FAST_EXP_GROW (#4335)
Updated the denominator in MoveBattlerBar to be faster for more HP sizes
2024-04-03 21:25:55 +02:00
kittenchilly
e8c05debce
Add unique icons for all of Arceus's forms (#4329) 2024-04-03 20:40:45 +02:00
AgustinGDLV
c340ae04d7
Updated Knock Off (#4333)
* added config for updated Knock Off behavior, added tests

* fixed unused var

* added item check in tests

* fixed item checks
2024-04-03 10:13:39 +02:00
Eduardo Quezada
b58ccac4bf
Master into upcoming merge (#4306) 2024-03-26 12:49:07 -03:00
Eduardo Quezada
e479fa1007 Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo 2024-03-25 16:03:56 -03:00
Eduardo Quezada
d662409cda
Disable Tera Type on summary screen by default (#4289) 2024-03-18 17:40:05 -03:00
Eduardo Quezada
f419de24d9
Removed Gen 9 settings for out-of-battle abilities (#4282)
* Removed Gen 9 settings for out-of-battle abilities

* Updated OW_SYNCHRONIZE_NATURE comment
2024-03-18 08:24:44 +01:00
Eduardo Quezada
39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	include/data.h
#	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_3_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_6_families.h
#	src/data/pokemon/species_info/gen_7_families.h
#	src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03:00
Eduardo Quezada
1568b0a424
Pre-1.8 tweaks (#4275)
* 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
2024-03-12 12:21:03 +01:00
MartyKen
ec73e28507
Gen 6 level up learnset update (#4267)
* 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 53462c4088, reversing
changes made to 051a93058c.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-03-11 07:46:16 -03:00
Eduardo Quezada
5acc770f00
Fixed config comment (#4237) 2024-03-03 09:07:47 +01:00
Eduardo Quezada D'Ottone
8671da436b
Add LGPE+ Premier Ball Bonus config (#4191)
* 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>
2024-02-25 10:13:26 +01:00
Eduardo Quezada
c4323a230f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	include/data.h
2024-02-22 11:24:19 -03:00
Eduardo Quezada D'Ottone
5e79fcd5b4
Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct (#4213)
* Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct

* Fixed SaveBlock1 comment (please squash)

* Separated FREE_EXTRA_SEEN_FLAGS for each SaveBlock
2024-02-19 18:42:56 +01:00
Eduardo Quezada
ead108d28e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	src/data/graphics/pokemon.h
2024-02-19 13:49:10 -03:00
Alex
7ab23cf426
Sets neutral nature and ability 0 as default in trainer control (#4172)
* 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
2024-02-18 15:02:58 +01:00