cawtds
5dda4b846e
fishing chain only resets on failed attempt or when map warping, encountering different species does not break the chain, differentiate between max shiny streak and max chain length
2024-07-06 15:18:51 +02:00
sneed
60c7588532
IsFinalStrikeEffect uses effect instead of move ( #4917 )
...
* IsFinalStrikeEffect uses effect instead of move
* Update test/battle/ability/parental_bond.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-06 09:41:19 +02:00
cawtds
3babd7f130
shiny roll calc as separate function
2024-07-06 02:10:30 +02:00
Bassoonian
93f5ca2481
Pret Merge (5th of July) ( #4915 )
2024-07-05 23:55:33 +02:00
Bassoonian
31ee8fec80
Fix 2006 regression
2024-07-05 20:49:18 +02:00
Bassoonian
a7f786009e
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5july
2024-07-05 20:44:29 +02:00
Eduardo Quezada
fcdc9ed65a
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
kleeenexfeu
8168dd7be9
Shed tail rounds up, not down ( #4913 )
...
* Shed tail rounds up, not down
* Label
2024-07-05 19:21:30 +02:00
Pawkkie
3660a054a2
Forgot to update this when adding AI_FLAG_SEQUENCE_SWITCHING ( #4911 )
2024-07-05 18:41:29 +02:00
GriffinR
a0a02f9733
Merge pull request #2012 from DizzyEggg/patch-1
...
Berry blender's Task_HandleOpponent small fixes
2024-07-04 15:02:58 -04:00
DizzyEggg
47533e3a7e
Berry blender's Task_HandleOpponent small fixes
2024-07-04 20:56:22 +02:00
ghoulslash
3df7e770df
Remove SetBattlerData from AI_CalcDamage ( #4881 )
2024-07-04 10:05:20 -04: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
Alex
13b8daf36b
Supersweet Syrup wrong ability desc ( #4902 )
2024-07-03 22:53:41 +02:00
Alex
dd7b735211
Fixes Grassy Terrain heal turn duration ( #4903 )
2024-07-03 22:53:15 +02:00
cawtds
91550eb75f
chain fishing refactored
2024-07-03 17:02:12 +02:00
cawtds
26395fe600
fix fishing encounter rolls
2024-07-03 16:51:53 +02:00
Alex
594633aa15
Remove Duplicate ai code from battle_ai_util.c ( #4883 )
...
* Remove Duplicate ai code from battle_ai_util.c
* Add GetBattlerAbility in toxic self check
2024-07-03 10:48:31 +02:00
Pawkkie
47426406c3
Ai tests folder ( #4898 )
...
* AI folder for tests
* Move sequence switching tests
2024-07-02 17:49:04 +02:00
DizzyEggg
d81662daa2
Add parentheses to species egg macro ( #4899 )
2024-07-02 13:39:41 +01:00
Pawkkie
7e167f0b3c
Add AI_FLAG_SEQUENCE_SWITCHING ( #4878 )
...
* AI_FLAG_BAD_SWITCHING
* Cleanup and tests, U-Turn / Baton Pass / Parting Shot aren't working properly
* Fix U-Turn etc. tests
* Test overhaul with Egg's suggestions
* Add EFFECT_HIT_SWITCH_TARGET to tests
* Review feedback
* Re-review feedback
2024-07-01 08:53:07 +02:00
GriffinR
502eedaed8
Merge pull request #2009 from abcboy101/berry-blender
...
Decode unused JP text in berry_blender.c
2024-06-29 16:31:56 -04:00
Frank DeBlasio
6957fc70c9
Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled ( #4866 )
2024-06-29 22:12:26 +02:00
Frank DeBlasio
c3634db0ea
Fixed Mud Sport/Water Sport reduction value ( #4874 )
...
* Fixed Mud Sport/Water Sport reduction value
* Removed define
2024-06-29 22:11:49 +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
Cafei
3ec371de05
Fixes ( #4887 )
2024-06-29 20:46:00 +02:00
abcboy101
779855ee02
Decode unused JP text in berry_blender.c
2024-06-29 14:02:50 -04:00
sneed
75be596933
fix sticky hold softlock ( #4885 )
2024-06-29 18:54:58 +02:00
Alex
699c96afa3
Remove SetBattlerData from AI_CalcDamage
...
Since #4156 SetBattlerData and RestoreBattlerData were moved out of `AI_CalcDamage`. I assume this was a bad merge somewhere
2024-06-28 19:36:09 +02:00
Pawkkie
d1ca1f667f
Smarter Choice AI for Status Moves ( #4872 )
...
* Smarter choice item usage
* Clarify test name / line ending
* Review feedback
* Review feedback pt. 2
2024-06-28 09:04:24 +02:00
DizzyEggg
26ef19d6c0
Fix wrong palette in palyer backsprite in recorded battle ( #4875 )
2024-06-27 11:33:28 +02:00
DizzyEggg
cd5a862b95
Fix Megas gaining abilities after fainting ( #4873 )
2024-06-26 23:44:01 +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
Frank DeBlasio
f19948312e
Allowed double battles to occur with only one Pokemon by talking to the trainers ( #4848 )
2024-06-26 10:45:27 +02:00
ghoulslash
41583673a5
Zero Enemy Data at end of battles ( #4867 )
...
* zero enemy data in FreeResetData_ReturnToOvOrDoEvolutions
* only run through FreeBattleResources once at end of battle in FreeResetData_ReturnToOvOrDoEvolutions
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-06-26 10:41:14 +02:00
Bassoonian
81bd14818e
Add day limit for forms support ( #4778 )
...
* Add day limit for forms support
* Add missing newline
* Incorporate review suggestions
2024-06-26 10:36:44 +02:00
leo60228
566ad6d869
Don't try to deploy to GitHub Pages if it's not enabled ( #4809 )
2024-06-25 11:10:52 +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
DizzyEggg
f2e8482488
Fix how switch-in effects are played out after multiple faints in the same turn ( #4864 )
...
* Multiple switch-ins after fainting
* empty new lines
* Fix failing tests
2024-06-24 20:37:47 +02:00
cawtds
a8ae1a0342
added missing minior description + test for missing descriptions ( #4858 )
2024-06-24 12:19:12 +02:00
sneed
ec75a75498
Update plasma_fists.c ( #4865 )
2024-06-23 21:17:58 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor ( #4449 )
...
* consolidated gimmick checks, triggers, communication, and activation; updated test runner
* fixed improper use of .usableGimmick
* cleaning up battle_dynamax.c, changing function args to u32s
* fixed '#ifdef TESTING' causing errors
* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests
* added support for z-moves in tests, consolidated gimmick fields
* removed ShouldUseMaxMove and .usingMaxMove
* renamed TryChangeZIndicator, updated z move display
* added several z-move tests and fixed various z-move interactions; fixed z-move category calc
* fixed useless battler arg in GetTypeBasedZMove
* added basic test check for bad Z-Move or Mega usage
* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky
* fixed gimmick test logic; fixed damage category override
* fixed mega rayquaza test fail
* consolidated gimmick indicator logic; added graphics to gGimmicksInfo
* removed TeraData struct
* reimplemented AI logic for Z-Moves; no changes
* updated Z-Move and Ultra Burst trigger gfx
* added testrunner check for multiple gimmick use
* fixed duplicate z-move call in test
* reorganized data/graphics/gimmicks.h
* added signature Z-Move ability tests; implemented Guardian of Alola
* fixed bad test update
* fixed Thousand Arrows not affecting Tera Flying; clean-up
* fixed -ate tests
* fixed tera tests
* fixed tera tests really
* fixed last batch of tests
* fixed -ate mega test again
* code review
* code review pt.2
* tweaked CanTera again
* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
Alex
e74264f6de
Ported test changes from #4857 ( #4859 )
2024-06-22 19:39:01 +02:00
DizzyEggg
f73ad41fa1
Tests for post-ko switch scenarios ( #4856 )
2024-06-22 12:07:36 +02:00
Pawkkie
2640bcd053
Minor switch AI refactor ( #4849 )
2024-06-22 11:17:10 +02:00
Bassoonian
87b21c2ce5
Fix item duplication glitch ( #4844 )
...
* Fix Toxic Chain file acting up
* Fix item dupe glitch
2024-06-22 10:47:25 +02:00
Alex
8ac739ea1a
[Update moves_info.h] wrong move names ( #4854 )
2024-06-22 09:52:39 +02:00
sneed
6893d8dbef
ignoresTargetAbility doesnt ignore the attacker's ability ( #4855 )
2024-06-22 09:52:25 +02:00
Bassoonian
9f7a83fd6a
Pret merge (20th of June) ( #4845 )
...
* Don't assume bash is at /bin/bash
* Add NixOS install instructions
* Add support for LF line endings to gbagfx
---------
Co-authored-by: leo60228 <leo@60228.dev>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Alex Nash <contact@alexnash.dev>
2024-06-21 12:21:29 +02:00
DizzyEggg
438f478146
Fix comatose transform gastro acid interaction ( #4852 )
2024-06-21 12:19:43 +02:00
