Commit graph

14815 commits

Author SHA1 Message Date
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
Martin Griffin
738fade50a Fix expanded move names 2024-04-25 18:40:37 +01:00
Martin Griffin
e42a0a6dbe Narrower fonts 2024-04-25 18:40:37 +01:00
Martin Griffin
1fea6b83cc PARAMETRIZE_LABEL in test/species.c
PARAMETRIZE_LABEL is like PARAMETRIZE, except that it allows the user to
provide a label which will be displayed in the test name line. This is
useful for tracking _which_ PARAMETRIZE case failed in the situation
where the numbers are unwieldy.
2024-04-25 18:40:37 +01:00
Martin Griffin
62ce29d0e9 Debug Menu: Re-render 'Flags & Vars' rather than re-create 2024-04-25 18:40:37 +01:00
Martin Griffin
143d6fb289
Minor cleanup of Frisk test (#4441) 2024-04-25 10:11:01 +02:00
Martin Griffin
baaefb4d72
Add missing shouldDynamax (#4442) 2024-04-25 10:10:36 +02:00
Alex
6f538d840c
Combine weather set commands (#4434)
* Combine Weather set commands

* further tests

* minor error

* update test names
2024-04-24 14:10:25 -04:00
AgustinGDLV
536e4a8fb9
fixed psychic type tera icon (#4435) 2024-04-24 18:08:20 +02: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
Alex
aaaccbfe6c
Adds support for shouldDynamax and shouldTerastal in trainer parties (#4431) 2024-04-23 17:54:46 +01:00
Bassoonian
308475a163
Make trainerproc compatible with partners (#4421)
* Prepare stuff for MGriffin to fix

* Remove doubleBattle from migration script

* Support PARTNER_NONE in trainerproc

* Let script apply to battle_partners.h file

* TRAINER_BACK_PIC

* Let script fix issues

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-04-22 17:03:36 +02:00
Alex
49c86f86c8
Adds Ability Poison Puppeteer (#4416)
* Adds Ability Poison Puppeteer

* nothing happened

* parametrize poison powder and toxic

* leftover
2024-04-20 22:23:20 +02:00
Eduardo Quezada
c4c371824f Merge branch '_RHH/master' into _RHH/upcoming 2024-04-20 08:22:49 -04:00
Alex
4b048c327b
Pokemoncommunity sprites (new batch) (#4414) 2024-04-20 07:58:21 -04:00
kittenchilly
88ce33c864
Add further icon sprite changes and fixes (#4413) 2024-04-20 09:41:01 +02:00
Eduardo Quezada
6c2c66b110
Fixed data type for generated fishing species (#4412) 2024-04-19 18:06:08 +02:00
Eduardo Quezada
4f0d98ec52
Fixed datatypes for Ability inheriting (#4411) 2024-04-19 18:05:45 +02:00
Alex
be093e7414
Couple comment changes (#4409)
* comment_change

* fix comment

* an other correction

* fix fix comment

* Update include/constants/battle_ai.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-19 16:34:44 +02:00
Jared Schoeny
76f79215c7
Update macOS instructions in INSTALL.md (#4407) 2024-04-19 12:20:26 +02:00
sneed
5f4d565c86
Combine AI smart switching with smart mon choices automatically and disable smart mon choices in double battles. (#4405)
* AI_FLAG_SMART_SWITCHING  also sets AI_FLAG_SMART_MON_CHOICES

* Disable AI_FLAG_SMART_MON_CHOICES in doubles
2024-04-18 23:16:36 +02:00
Martin Griffin
4fa5ae24e1
Fix AI test error messages (#4404) 2024-04-18 12:49:54 +02:00
Alex
4d5a745e31
Fix bug involved infinite loop when player mon has only status moves (#4403) 2024-04-18 10:34:33 +02: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
LOuroboros
0d95354a82
Made competitive party syntax no longer print the contents of PATH (#4397) 2024-04-16 07:35:47 +01:00
Eduardo Quezada
5a276dcbbf Merge branch '_RHH/master' into _RHH/upcoming 2024-04-15 18:29:06 -04:00
Eduardo Quezada
159eb1aea9 Untag release 2024-04-15 17:51:27 -04:00
Eduardo Quezada
ab5c2d9161
Version 1.8.2 (#4394) 2024-04-15 17:47:50 -04:00
sneed
634dcf5e26
Actually disable forms when disabling forms (#4395)
* Remove form table data when forms are disabled

* Remove erroreous edit

* Add missing G-Max checks

* Update form_species_tables.h
2024-04-15 16:01:52 -04:00
Bassoonian
e8890bc8f3
Fix teachable learnsets crashing in some environments (#4389) 2024-04-15 15:57:42 -04:00
Damon Murdoch
ecf70d365c
[Rebase of #4286] Reordered Debug_EventScript_InflictStatus1 (#4372)
* Update debug.inc

Created new merge as per discussion in discord, previous pull request https://github.com/rh-hideout/pokeemerald-expansion/pull/4286

* Added new file 'config.inc' as per feedback

Added new file 'config.inc' as per feedback

* Restore order

* fixed, my bad

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-14 17:31:39 -04:00
sneed
fd87a79b27
Pokedex plus defaults to male icons and front pics (#4390)
* Pokedex defaults to male icons and front pics

* Choose palette from personality

* Unknown icon matches front pic
2024-04-14 17:23:14 -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
Alex
952183889a
Fixes Ability Shield, Neutralizing Gas interaction (#4391)
* Fixes Ability Shield, Neutralizing Gas interaction

* test was wrong
2024-04-14 18:43:55 +02:00
Alex
5bf6a252b5
Fixes Eject Pack softlocking the game (#4387) 2024-04-14 02:43:16 +02:00
PCG
a8a8344ba2
Include Memento effect in IsStatLoweringEffect (#4386) 2024-04-13 16:54:59 -04:00
Eduardo Quezada
65bee290ea
Fixed Gengar's missing cries (#4385) 2024-04-13 20:56:03 +02:00
sneed
2d42f72a8a
Rewrite GiveBoxMonInitialMoveset_Fast (#4373)
* GiveBoxMonInitialMoveset_Fast rewrite

Fix duplicate move bug and change behavior to match GiveBoxMonInitialMoveset results

* Fixed issue with learnsets smaller than 4
2024-04-13 14:55:17 -04:00
skolgrahd
3b17ce39f7
Fixed softlock w/ weather-triggered form changes & Cloud Nine (#4382)
* Fixed softlock when weather-triggered form changes are suppressed by Cloud Nine

* Removed KNOWN_FAILING; line from Castform Air Lock test
2024-04-13 13:19:14 -04:00
Alex
a0a5ba4af2
Adds Role Play tests (#4381)
* Adds Role Play tests

* gastro acid

* Update gastro_acid.c
2024-04-13 14:14:43 +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
Eduardo Quezada
91286123d1
Mid-April pret merge (#4380) 2024-04-12 09:13:57 -04:00
Bassoonian
8329d8368d Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergemidapril 2024-04-12 12:16:28 +02:00
Alex
35e04b84a8
Fixes Cud Chuw (#4379)
* Fixes Cud Chuw

* small correction
2024-04-12 12:15:49 +02:00
Alex
ee3a577240
Fixes givemon moves not defaulting to none (#4377) 2024-04-11 20:34:11 +01:00
GriffinR
af0165a35d
Merge pull request #1987 from PokemonSanFran/cancelGroundEffectsCamera
Added fix to Keep the Camera from Making Waves
2024-04-11 14:41:04 -04:00
GriffinR
a0637251f8
Merge pull request #1986 from LOuroboros/patch-1
Updated value of gMain.inBattle at OpponentHandleEndLinkBattle
2024-04-11 14:39:00 -04:00
GriffinR
0b73cd81d8
Merge pull request #1985 from PokemonSanFran/surfingDismountFix
BUGFIX for Surfing Dismount Ground Effects
2024-04-11 14:38:40 -04:00