ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,599 Commits 1 Branch 0 Tags 235 MiB
32dcea0cdb
Commit Graph

12599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
grunt-lucas
32dcea0cdb
Fix issue with Enamorus Therian cry define order (#2956) 2023-04-26 15:08:15 -04:00
ghoulslash
5afe3f5e20
GetSideParty/GetBattlerParty (#2910) 2023-04-26 11:38:52 -04:00
Martin Griffin
4a0abc5129
Merge branch 'upcoming' into rhh-get-party 2023-04-26 12:12:03 +01:00
Salem
78c4d07b23
Add Berserk Gene Item (#2893) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-25 15:03:57 -04:00
Frank DeBlasio
9562c7a37a
Added forbidden Metronome moves from PLA and SV (#2949) 2023-04-24 18:49:53 -04:00
ghoulslash
868838a87d
Add thunder cage case to trap anim IDs (#2941) 2023-04-24 14:35:42 -04:00
ghoulslash
19ec7e2a1a
Added new conditions for the trainer slide-in system (#2713) 2023-04-24 08:53:08 -04: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
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
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
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
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
Jaizu
e6505bda4b
Fix some sprites (#2926) 
* Fix hisuian typlosion
* Fix mega metagross backsprite
* Fix shiny Reuniclus
* Fix Duosion mouth
* Fix front mega metagross
* Fix front Yanmega
* Fix Electivire front sprite
* Fix shiny duskull
* Fix Hariyama sprite
* Fix Shiny masquerain
 2023-04-18 19:49:42 -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
Eduardo Quezada D'Ottone
afdfe1503d
fix several issues in BS_ItemCureStatus (#2916) 2023-04-17 16:04:59 -04:00
Eduardo Quezada D'Ottone
61f99b4cb9
Fix Ability PopUp freeze (#2920) 2023-04-17 13:43:26 -04:00
Alex
60c88d8fcc
Update data/battle_scripts_1.s 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-17 19:12:39 +02:00
Alex
0531ab5d87 Fix Ability PopUp freeze 2023-04-17 18:47:54 +02:00
CallmeEchoo
efd7465c12 fix gBattleMons using party indices instead of battle indices 2023-04-17 13:34:11 +02:00
Eduardo Quezada D'Ottone
037fd2ac0e
Fix Rare Candies (#2918) 2023-04-16 18:35:34 -04: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
AgustinGDLV
d3a090020b added code review 2023-04-15 15:30:07 -07:00
Martin Griffin
aefe582596 GetSideParty/GetBattlerParty 
Inline GetBattlerPartyData into its callers because its name is
confusing and we couldn't think of a better one.

This seems to fix a bug in one place where GetBattlerPartyData was being
used as if it had GetBattlerParty semantics.
 2023-04-15 23:04:13 +01:00
AgustinGDLV
82dc1e3e93 fixed dupe strings in battle item use 2023-04-15 09:27:28 -07:00
AgustinGDLV
2eabcea86e
Battle Item Refactor (#2902) 
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
 2023-04-14 19:25:50 +01:00
Martin Griffin
48fba7a35c
Fixed AI not considering Hidden Abilities in its team during switching logic (#2908) 2023-04-14 14:56:46 +01:00
Eduardo Quezada
958bc34cdf Fixed AI not considering Hidden Abilities in its team during switching logic 2023-04-14 09:42:48 -04:00
Eduardo Quezada D'Ottone
0397a1d8d6
pret merge 2023/04/13 (#2907) 2023-04-13 17:19:39 -04:00
Eduardo Quezada
7c29a24110 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413 2023-04-13 17:05:48 -04:00
Martin Griffin
513ebcb0dd
Improved PR Template (#2905) 2023-04-13 19:02:20 +01:00
Eduardo Quezada
eaddeabe16 Improve PR Template 2023-04-13 13:17:25 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect (#2883) 
* implemented Revival Blessing
 2023-04-12 01:14:25 +01:00
Eduardo Quezada D'Ottone
e4656f3ab8
Add AI_FLAG_OMNISCIENT (#2872) 2023-04-10 13:25:40 -04:00
ghoulslash
e3ca217d64 rename IsBattlerAIControlled 2023-04-10 11:36:17 -04:00
ghoulslash
5f4bfd9bb4 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/aiflag 2023-04-10 09:48:49 -04:00
ghoulslash
e49bb21ee4 some IsBattlerAIControlled replacements w BattlerHasAi 2023-04-10 09:48:44 -04:00