atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16508 commits 2 branches 40 tags 617 MiB
Commit graph

16508 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pawkkie
2afc7f6138
ShouldPivot type cleanup (#5441) 
* Cleanup ShouldPivot type

* PIVOT to SHOULD_PIVOT
 2024-10-10 12:54:35 +02:00
AlexOn1ine
ab50009526 rename IsBattlerGround2 2024-10-10 10:04:44 +02:00
AlexOn1ine
d0a97970ba Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function 2024-10-10 09:55:25 +02:00
Bassoonian
806321f3c8
Update shed_tail.c (#5494) 2024-10-09 18:24:39 +02:00
Alex
3c3ce38378
Remove one redundant call of SetAiLogicDataForTurn in DoBattleIntro (#5491) 
This is already run at the end of `TryDoEventsBeforeFirstTurn` which makes the first calc redundant.

I've had this removed in my project for a while and didn't notice any problems
 2024-10-09 17:18:08 +02:00
Alex
1454644376
Removes duplicate code in AI functions (#5457) 
* Make functions CanAbilityAbsorbMove and CanAbilityBlockMove

* clean up

* Replace ai code with CanAbilityBlockMove / CanAbilityAbsorbMove

* Adds CanPartnerAbilityBlockMove

* Use switches instead of if-blocks

* solve potential bug in singles with spread attacks

* fix test

* revert other fix

* flash fire does not increase a stat

* left a comment for a future test and addition

* remove more checks

* comment was incorrect. it only applies to storm drain and lightning rod

* revert ndebug

* revert minor change

* Update src/battle_util.c
 2024-10-09 15:50:59 +02:00
Eduardo Quezada
607c247ee0 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-09 10:29:30 -03:00
SonikkuA-DatH
708f64247f
Heart Swap Move Animation (#5460) 2024-10-09 10:43:04 +02:00
Pawkkie
7fc5502afd
Don't clear move data on turn end (#5488) 2024-10-09 09:38:49 +02:00
ghoulslash
feeccb9198
Simplify BS_FAINTED_MULTIPLE_1 double battle logic in openpartyscreen (#5435) 
* simplify BS_FAINTED_MULTIPLE_1 doubles logic

* simplify openpartyscreen BS_FAINTED_MULTIPLE_2 checks, too

* Update src/battle_script_commands.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Update src/battle_script_commands.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Update src/battle_script_commands.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* more readable OpponentHandleChoosePokemon

* Update src/battle_controller_opponent.c

* Update src/battle_controller_opponent.c

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-10-09 09:38:21 +02:00
Eduardo Quezada
ee00c251ae Merge branch '_RHH/master' into _RHH/upcoming 2024-10-08 14:52:12 -03:00
Eduardo Quezada
541ca2619b Start 1.9.4 cycle 2024-10-08 14:47:32 -03:00
Eduardo Quezada
a76f7fe92e
Version 1.9.3 (#5485) 
* Version 1.9.3

* Updated to latest master
 2024-10-08 14:45:09 -03:00
Pawkkie
efad9a32a9
Fix AI tests using PASSES_RANDOMLY (#5486) 2024-10-08 13:04:35 -04:00
hedara90
f8f4fc9afd
Removed old checksum matching workaround (#5480) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-10-08 14:02:31 +02:00
psf
0dcb28ba0e
Add OW_UNION_DISABLE_CHECK and OW_FLAG_MOVE_UNION_ROOM_CHECK (#5448) 
* First addition of both checks

* Updated config file

* fixed spacing

* Updated spacing

* Fixed issues where feature was always on

* Update overworld.h

fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5448#discussion_r1789647611
 2024-10-07 17:07:23 +02:00
ghoulslash
06fefe3318
Various AI fixes (#5474) 
* fix AI mirror move check viability call

* fix EFFECT_ABSORB missing break in AI_CalcMoveEffectScore

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-10-06 21:05:29 +02:00
Eduardo Quezada
a7fca616b0 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-04 14:28:13 -03:00
wiz1989
6f59d26753
updated Conversion 2 mechanics to 5+ (#5453) 
* 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>
 2024-10-04 12:42:15 -04:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites (#5394) 2024-10-04 17:56:21 +02:00
Eduardo Quezada
0f8b2a1ba8 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909 2024-10-04 10:23:58 -03:00
PhallenTree
91325e83c1
Fixes to Protosynthesis, Quark Drive, Beast Boost, Orichalcum Pulse, Hadron Engine (#5447) 
* Protosynthesis & Quark Drive interactions; Fixes to Beast Boost/Protosynthesis/Quark Drive stat tie priority, Orichalcum Pulse and Hadron Engine stat boost

* Protosynthesis + Quark Drive tests

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-10-04 11:00:12 +02:00
Alex
077bbd3442
Adds padding in AiLogicData (#5468) 
* Adds padding in AiLogicData

* Update battle.h

* Update battle.h

* Update battle.h
 2024-10-03 22:11:54 -04:00
Eduardo Quezada
80af2af9ad Merge branch '_RHH/master' into _RHH/upcoming 2024-10-03 14:33:01 -03:00
ghoulslash
be5f2e095e
fix duplicating flute glitch (#5436) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-10-03 13:01:18 +02:00
kittenchilly
44bf14e6fd
Add functionality to Poké Flute and Town Map (#5405) 
* Add functionality to Poké Flute and Town Map

* Poke flute in-battle

* Address reviews

* Update item_use.c

* Update battle_message.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c
 2024-10-03 10:52:59 +02:00
Alex
f082fe7e42
Fixes Hidden Power dynamic type bug (#5463) 2024-10-03 10:36:35 +02:00
psf
9a24c031bb
Replaced copyright magic numbers in intro.c with constants (#2035) 2024-10-02 20:48:54 -04:00
psf
2597d8a35a
Updated species defines (#5075) 
* First version of new defines

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Removed old defines

* Removed old defines

* Removed old defines and cleaned up some macros

* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs

* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599

* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
 2024-10-02 18:24:57 -03:00
Bassoonian
7852dc3e47
Update commander.c (#5458) 2024-10-02 22:36:20 +02:00
GriffinR
2b73d10a2a
Merge pull request #2041 from Jaizu/patch-9 
Ignore mGBA screenshots
 2024-10-02 15:35:20 -04:00
GriffinR
44e9228a6e
Merge pull request #2038 from GriffinRichards/gflib-syms 
Remove explicit symbol sizes in sym_common.txt
 2024-10-02 15:34:42 -04:00
GriffinR
37d104f7a5
Merge pull request #2039 from Scyrous/patch-1 
Bugfix for cable car hikerGraphicsIds array
 2024-10-02 15:34:22 -04:00
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) (#5456) 2024-10-02 21:20:23 +02:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) (#5455) 2024-10-02 21:20:02 +02:00
Pawkkie
ded97e5296
Switch AI refactor + considers free switches (#5379) 
* Switch AI considers free switches from pivot move

* Fix Baton Pass refactor

* Some cleanup and comments

* Mon fainting to hazards is a 0HKO

* Revert "Mon fainting to hazards is a 0HKO"

This reverts commit 446f738226.

* Cleanup speed check / Eject Pack

* Move eject trackers to AiLogicData

* Review feedback and WhoStrikesFirst changes

* This linebreak will bug me lol

* Also this comment, heck

* Last bit of comment cleanup
 2024-10-01 23:10:02 +02:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible (#5449) 
* Fixes recoil moves not triggering berries if possible

* Update battle_script_commands.h
 2024-10-01 10:43:58 +02:00
Jaizu
c8cc0fa5a3
Ignore mGBA screenshots 
Everytime I make a new project I suffer, please merge.
 2024-10-01 10:07:45 +02:00
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands 2024-09-30 06:57:54 -07:00
Bassoonian
5a8a393dcd
Add Sideways Stairs (#4836) 2024-09-30 00:06:25 +02:00
kittenchilly
1c022f4d34
Fix Jubilife Muffin full heal effect + better full heal tests (#5444) 2024-09-29 17:05:54 -04:00
Alex
42c43a3f8f
Adds Commander and Order Up (#5246) 
* Adds Commander

* review points

* new line

* correction

* regression / double targeting still broken

* fix wrong target order

* transform fixes

* haze test

* fixes, tests

* bring back wrongly removed else if case

* Eject Pack / Button test + fix

* red card fix

* test fixes

* Fixes Tatsu being hit by multi hit move

* change transform check

* fix test + revert change

* Fix Tatsugiri attacking after freed up from Dozo in the same turn

* Dragon Darts tests

* fix test

* review comments

* assumtion in wrong file

* Order Up test fixes

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
 2024-09-29 22:45:50 +02:00
Pawkkie
8d33169100
Add Gen 1 Crit Chance (#5439) 
Adds GEN_1 config to B_CRIT_CHANGE, only affects the chance, not multiplier or other Gen 1 quirks.
 2024-09-29 21:54:03 +02:00
Eduardo Quezada
4183fa9d50
Fixed test assumption fail summary fields using more memory than needed (#5443) 2024-09-29 14:40:37 -03:00
ghoulslash
c8afe9bbde some formatting fixes 2024-09-29 13:34:11 -04:00
ghoulslash
be3ee1ba85 merge w upcoming 2024-09-29 13:33:20 -04:00
Pawkkie
5908fbef9c
Wake-Up Slap test typo (#5442) 
* Wake-Up Slap test typo

* Update test/battle/move_effect/wake_up_slap.c

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

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-09-29 12:34:34 -04:00
Pawkkie
5e027754c7
Add ShouldSwitch result to AiLogicData (#5440) 
* Add ShouldSwitch to AiLogicData

* Convert shouldSwitch to bitfield

* Update include/battle.h

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Update include/battle.h

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-29 12:16:33 -04:00
Scyrous
1dc85df1f0
Update cable_car.c 2024-09-29 14:38:08 +02:00
Scyrous
8e2c3ca3f2
Bugfix for cable car sprite array count 2024-09-29 14:13:50 +02:00