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

8704 Commits

Author SHA1 Message Date
ghoulslash
c283eacd08 Fixed instances of gSideTimers not using side constants (#2867) 2023-04-24 12:44:47 -04:00
ghoulslash
69f58adbb2 add check for Gorilla Tactics when resetting choicedMove from knock off (#2854) 2023-04-24 12:43:13 -04:00
Eduardo Quezada D'Ottone
e176fd285e Fixed erroneous uses of non e-reader Enigma Berries (#2839) 2023-04-24 12:40:52 -04:00
AgustinGDLV
d922ac43e9 changed CanBeConfused to actually check its argument (#2855) 2023-04-24 12:40:22 -04:00
Eduardo Quezada D'Ottone
47b013fc22 Debug menu to give items based on max quantity and map number 3digits display (#2807) 2023-04-23 10:21:06 -04:00
Eduardo Quezada D'Ottone
bdb5cfe8b2
Version 1.4.2 (#2847) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Fix wrong Contrary message when affected by Intimidate (#2723)
Fixes certain moves preventing Z status moves. (#2791)
Fixes the check for speed on electrify (#2819)
Fixed score for Work up and Growth (#2813)
Fixed Wring Out's power (#2824)
Fixes #2823
 2023-03-27 16:47:15 -03:00
LOuroboros
c33cc834bc
Updated Psyshield Bash's accuracy 2023-02-19 19:04:36 -03:00
DizzyEggg
380af442c3
Fix buggy pokemon anims with Illusion (#2639) 
* try illusion fix

* fix
 2023-02-19 12:05:56 +01:00
ghoulslash
4b64433816
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649) 
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims

* add missing semicolon

* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting

* remove duplicate func

* improve origin pulse anim

* fix IsDoubleBattle call

* venom drench acid uses average battler positions

* add GetSubpriorityForMoveAnim

* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-19 11:48:12 +01:00
Eduardo Quezada D'Ottone
ec343cef02
Config to have Shuckle make Berry Juice from Oran Berries (#2331) 
* Removed unused ifdefs and made actually check for Z Power Ring

* Config to have Shuckle make Berry Juice from Oran Berries

* Ordered species-specific configs
 2023-02-19 10:45:59 +01:00
Eduardo Quezada D'Ottone
fcf13aab2b
Fixed evolutions that use held items to evolve not working when using Rare Candies. (#2565) 2023-02-19 10:40:55 +01:00
ghoulslash
79ea2e8074
add howl AI check for new effect (#2703) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-18 11:37:29 +01:00
Jaizu
31316dbfd2
Merge pull request #2529 from mrgriffin/rhh-battlescript-cmd-args 
Readable BattleScript command arguments
 2023-02-17 15:35:03 +01:00
DizzyEggg
0c523f9518
Fix Magic bounce powder moves against grass types (#2633) 
* Fix Magic bounce powder moves against grass types
 2023-02-17 13:55:51 +00:00
DizzyEggg
56c9564e7a
8th gen Howl's effect (#2700) 
* Howl gen8 effect
 2023-02-17 10:28:46 +00:00
Martin Griffin
0573aa455a Introduce macros to parse battle script arguments 
CMD_ARGS for regular commands, VARIOUS_ARGS for various commands, and
NATIVE_ARGS for callnative commands.
 2023-02-17 10:05:57 +00:00
Eduardo Quezada D'Ottone
625a7622e2
Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 
It's ya boi, pret merge! (pret merge 2023/02/16)
 2023-02-16 21:57:41 -03:00
Eduardo Quezada
a60b179bcb Incorporated fixes from upstream 2023-02-16 18:20:54 -03:00
DizzyEggg
d637ee3b13
Fix After You for gen8 (#2646) 
Fix After You
 2023-02-16 20:59:36 +00:00
ghoulslash
f4ef67d897
Merge pull request #2689 from DizzyEggg/grenja 
Fix Battle Bond activating multiple times in battle
 2023-02-16 09:36:02 -05:00
ghoulslash
6b0b427d93
Merge pull request #2680 from DizzyEggg/mirror_armor 
Fix Mirror Armor against Clear Body
 2023-02-16 09:29:04 -05:00
ghoulslash
05bef50a1f
Merge pull request #2658 from DizzyEggg/one_vs_two_egg 
Fix 1 vs 2 battles with eggs
 2023-02-16 09:20:18 -05:00
ghoulslash
60a3da5811
Merge pull request #2691 from DizzyEggg/clang_scales 
Fix Clanging Scales target and effect
 2023-02-16 09:13:33 -05:00
ghoulslash
8c81cf1e66
Merge pull request #2692 from DizzyEggg/shields_down 
Fix Shield Down Ability pop-up
 2023-02-16 09:11:24 -05:00
sbird
fea54c9277 [intro] add fading, refactor abort, align intro gfx 2023-02-16 10:43:50 +01:00
DizzyEggg
97f9c0a4d9 oof 2023-02-15 23:45:53 +01:00
DizzyEggg
f6a0c882d1 Fix Shield Down Ability pop-up 2023-02-15 23:44:00 +01:00
DizzyEggg
94651e77a5 Fix Clang Scales target and effect 2023-02-15 22:18:18 +01:00
Eduardo Quezada
7ddebb6671 Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	data/battle_ai_scripts.s
#	src/menu_specialized.c
#	src/mystery_gift_menu.c
 2023-02-15 14:18:00 -03:00
Eduardo Quezada
b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c
 2023-02-15 14:11:03 -03:00
GriffinR
69fdf0faa4
Merge pull request #1853 from GriffinRichards/doc-contest-bar 
Clarify AI_CV_AttackDown_UnknownTypeList
 2023-02-15 11:29:57 -05:00
Alex
e4045a7a5f
z move pp color (#2690) 2023-02-15 16:19:09 +01:00
GriffinR
a322379feb
Merge branch 'master' into doc-windows 2023-02-15 10:04:48 -05:00
GriffinR
9c1c598160 GROUPTYPE_NONE to unsigned 2023-02-15 09:49:33 -05:00
DizzyEggg
3f0f7c6b7f Fix Battle Bond activating multiple times in battle 2023-02-15 15:30:29 +01:00
LOuroboros
7885941d3c Tweaked Task_HandleExpansionIntro to fix the water drops glitch 
Thanks to Tustin2121.
 2023-02-14 14:03:18 -03:00
ghoulslash
908b509401
Fix Round's Base Power calc, Add Turn order effects (#2602) 
* fix round base power calc, add turn order change

* remove unused callnative cmd

* fix round turn order update

* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-14 16:49:50 +01:00
ghoulslash
094554b3a3
Merge pull request #2681 from DizzyEggg/jaw_lock 
Fix Jaw Lock locking player pokemon
 2023-02-13 10:40:47 -05:00
DizzyEggg
2b4d2a7695 Fix Jaw Lock locking player pokemon 2023-02-13 16:27:21 +01:00
ghoulslash
d1ef53f93a
Merge pull request #2678 from AlexOn1ine/z_indicator_in_doubles 
Z-Move Indicator was wrongly displayed in double battles
 2023-02-13 08:52:06 -05:00
DizzyEggg
0577d8d04d Fix Mirror Armor against Clear Body 2023-02-13 14:44:34 +01:00
ghoulslash
c399391891
Merge pull request #2677 from AlexOn1ine/z_moves_switch_order 
Fix switching Z-Moves when pressing SELECT in battle
 2023-02-13 08:41:58 -05:00
DizzyEggg
5d958e245a
Merge pull request #2669 from Jaizu/giga_impact_contests 
Fix Giga Impact on contests.
 2023-02-13 09:22:24 +01:00
Alex
2b32bfcdc1 add battlerId arg to ShowZMoveTriggerSprite 2023-02-12 19:39:14 +01:00
Alex
d363ed8152 z indicator in double battles 2023-02-11 19:55:08 +01:00
Alex
ce416be297 z_move switch move bug 2023-02-11 18:32:07 +01:00
sbird
4bcbb7c9e1 [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00
ghoulslash
deb23fc7c6
Merge pull request #2648 from AlexOn1ine/pollen_puff 
Fixes Pollen Puff issue #2611
 2023-02-09 08:21:33 -05:00
ghoulslash
27933836b5
Merge pull request #2662 from AlexOn1ine/heal_pulse_v2 
Add Logic for Heal Pulse effects in double battles
 2023-02-09 08:18:00 -05:00
Jaizu
9f7267e48d Fix Giga Impact on contests. 2023-02-09 11:29:29 +01:00