Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

13536 Commits

Author SHA1 Message Date
sbird
12d4b43755 Merge remote-tracking branch 'pret/master' into feature/dynmulti 2023-04-24 18:30:30 +02:00
LOuroboros
a128192bfe Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-04-24 09:36:09 -03:00
LOuroboros
330e85ba64 Updates 
-Undeclared size for certain trainer slide-in variables at struct BattleStruct for reasons.
-Added a BattlerHPPercentage function to make HP threshold checks in ShouldDoTrainerSlide a bit more readable.
 2023-04-24 09:34:11 -03:00
ghoulslash
1f6e335a24 merge w upcoming 2023-04-23 18:11:57 -04:00
Ariel A
9da790b2da Merge branch 'lighting' into lighting-expanded-id 2023-04-23 17:52:17 -04:00
Ariel A
6a89e5b0d2 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-04-23 17:50:20 -04:00
Ariel A
159faf8ff4 Fixed tall grass field effect discoloration in fog. 
Improved/optimized fog blending during fades.
 2023-04-23 17:47:18 -04:00
Ariel A
095994dc96 Fixed gamma shift for special sprite palette tags (lights, emotes). 
Supersedes c82510e22bffb98fd9c63dc246c332dd1da602cd
 2023-04-23 17:40:54 -04:00
Ariel A
ad9a77fe2c Merge branch 'followers' into lighting 2023-04-23 17:40:33 -04:00
Ariel A
9e00e23b96 Added OW daycare pokemon. 2023-04-23 17:34:38 -04:00
Ariel A
921baa78c6 Merge branch 'followers' into followers-expanded-id 2023-04-23 17:31:34 -04:00
Ariel A
0d3061574c Made follower disappear when decorating. 
Decreased number of max sprite decorations to 13.
 2023-04-23 17:26:13 -04:00
Bassoonian
f13c39d784 Thawing out for frostbite 2023-04-23 21:20:23 +02:00
Bassoonian
0b8d148c26 Let AI take Frostbite into account 2023-04-23 20:53:51 +02:00
Bassoonian
6b2a873071 Add comment in Ice Beam 2023-04-23 20:41:19 +02:00
Bassoonian
a020001a78 Battle Pike functionality 2023-04-23 20:33:28 +02:00
Bassoonian
13f6acf9a1 General mechanics 2023-04-23 19:20:48 +02:00
ghoulslash
25327b9031
Adds GetMovesArray in CanTargetFaintAi (#2936) 2023-04-23 08:50:06 -04:00
ghoulslash
909a20c27a
Reset battle vars and flags after player whites out (#2875) 2023-04-23 08:42:52 -04:00
ghoulslash
cf17324040
Fixed duplicate item strings in Bag/Party menus with battle items (#2915) 2023-04-23 08:32:38 -04:00
ghoulslash
594bc831d6
Adds define B_RESTORE_HELD_BATTLE_ITEMS following Gen9 (#2932) 2023-04-23 08:26:51 -04:00
ghoulslash
2332c6d5a0
Fixes status z-moves overwrting damage dealing z-moves (#2937) 2023-04-23 08:23:58 -04:00
Bassoonian
a561c6da6a Add config to Frostbite & allow it to be inflicted 2023-04-22 23:14:49 +02:00
Bassoonian
9c9a1fb831 Allow for healing with items 2023-04-22 19:18:10 +02:00
Bassoonian
f50bfb3770 Frostbite hurts at the end of the turn and halves SpA 2023-04-22 18:47:36 +02:00
Bassoonian
623e7c5f25 Add Frostbite status 2023-04-22 18:23:08 +02:00
Alex
30204e9953 fix wrong z-move ususage 2023-04-21 20:59:54 +02:00
Alex
4a08ede2c4 Add GetMovesArray in GetMovesArray 2023-04-21 20:13:30 +02:00
CallmeEchoo
301a12fe98 fix battleUsage for heal powder 2023-04-21 10:51:43 +02:00
Martin Griffin
c81a985b5b Fix USE_ITEM explicit targets 2023-04-20 21:45:16 +01:00
DizzyEggg
ae80d545c5
Support for multi battles where Trainer has only one mon (#2670) 2023-04-20 10:12:11 -04:00
citrusbolt
6c7f5881e4
Add two EV-related configs (#2825) 2023-04-20 10:05:32 -04:00
Alex
3aec63b8cf new define to restore items after battle 2023-04-20 15:08:42 +02:00
Jaizu
115efe7ea5
fix dire hit and paralyze heal (#2931) 2023-04-20 10:00:59 +02:00
CallmeEchoo
216b7a4dfd fix dire hit and paralyze heal 2023-04-20 09:44:18 +02:00
psf
d3fed5639b
Added config to enable NEW_ROCKS_PARTICLE (#2929) 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-04-19 18:54:57 -04:00
Bassoonian
52ce399240
Fix TM reusability shortcomings (#2930) 2023-04-19 11:01:00 -04:00
LOuroboros
b09ab5a3ee Updated Triple Arrows' effect's code and tests yet again 
Also added a function to get a move's secondaryEffectChance, meant to handle abilities, side statuses and the like that modify it.
 2023-04-19 01:57:34 -03:00
Bassoonian
d5b36c7c60
Reusable TMs (#2903) 
* Reusable TMs
* Forgot about Gen9 making TMs expendable again
* Change importance check based on Alex's suggestion
* Prevent items with importance from being bought more than once
* Change importance check to ghoul's suggestion
* Update include/config/item.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-18 19:52:20 -04:00
Alex
76d0d8a94e
Fix battle message strings for stats (#2927) 
* Fix battle message strings for stats
 2023-04-18 22:02:51 +01:00
Frank DeBlasio
9d93af2261
Fixed Budew evolution method (#2928) 2023-04-18 16:28:02 -04:00
LOuroboros
28ce87f6d3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2 2023-04-18 07:35:59 -03:00
LOuroboros
43a5aa09ef Corrections 
-Optimized BattleScript_EffectTakeHeart
-Updated the checks for EFFECT_JUNGLE_HEALING and EFFECT_TAKE_HEART in AI_CheckBadMove
-Updated the code for MOVE_EFFECT_TRIPLE_ARROWS inside SetMoveEffect
 2023-04-18 07:34:05 -03:00
Eduardo Quezada D'Ottone
afdfe1503d
fix several issues in BS_ItemCureStatus (#2916) 2023-04-17 16:04:59 -04:00
CallmeEchoo
efd7465c12 fix gBattleMons using party indices instead of battle indices 2023-04-17 13:34:11 +02:00
Jaizu
73ba8264e0 Fix Rare Candies 2023-04-16 21:34:07 +02:00
CallmeEchoo
7d4807d956 fix nightmare status only being healed in doubles 
this came up in a conversation on discord. its not tested.
 2023-04-16 13:11:49 +02:00
ghoulslash
7d010529d6 merge w master 2023-04-15 22:06:08 -04:00
ghoulslash
6c8cf2c026 merge w master 2023-04-15 22:04:35 -04:00
AgustinGDLV
d3a090020b added code review 2023-04-15 15:30:07 -07:00