Commit Graph
100 Commits
Author SHA1 Message Date
DizzyEggg 8cf357a37b tests for dire claw ceaseless edge barb barrage 2023-03-23 12:29:04 +01:00
DizzyEggg eead8e8e61 Tests work with new pokemon disabled 2023-03-09 09:49:50 +01:00
DizzyEggg d695c76881 test for assist and removed assist array from battle struct 2023-03-08 22:11:28 +01:00
DizzyEggg 318666e21d debug minor touches to give item max quantity and map number display 2023-03-07 12:20:36 +01:00
DizzyEggg e055456b7e Fix Protean / Libero when AI calculates Damage (#2714)
* Fix Protean / Libero when AI calculates Damage

* fix ai changing types when calculating dmg
2023-03-07 09:34:26 +01:00
DizzyEggg a04046dbb6 Add tests for Defog and fix Defog battle strings (#2737)
* start working on defog tests

* defog tests + improve terrain end battlescripts

* newline
2023-03-06 20:35:08 +01:00
DizzyEggg 306c4565a0 merge 2023-03-06 15:32:28 +01:00
DizzyEggg d3d99c3f8c alpha omega indicator sprites use the same palete 2023-03-06 15:22:28 +01:00
DizzyEggg 12db276a71 fix endif 2023-02-28 10:36:11 +01:00
DizzyEggg 1fb2560f7b newline 2023-02-28 10:14:16 +01:00
DizzyEggg 9d1e31ab39 accidentally removed ifs 2023-02-28 10:12:50 +01:00
DizzyEggg cc2778b8bb some touches 2023-02-28 10:08:31 +01:00
DizzyEggg 3159508603 fix dex size inaccuraccies 2023-02-27 23:08:54 +01:00
DizzyEggg c92a65dc40 Add config for stockpile raising def stats 2023-02-27 21:09:02 +01:00
DizzyEggg 5a745020ee add tests for stockpile swallow spit up 2023-02-27 16:27:58 +01:00
DizzyEggg 3338a6b786 add messages for stockpile effects wear off 2023-02-27 12:31:29 +01:00
DizzyEggg 468625ed1d fit long z-moves names on battle textbox 2023-02-27 10:32:45 +01:00
DizzyEggg 919fb184fe AI knows how to handle Illusion (#2726)
* AI knows how to handle Illusion
2023-02-27 09:12:52 +01:00
DizzyEggg 44d2cc7232 Fix bugs related to Trainer Slide messages (#2699)
* start working on trainer slides

* use cmd->nextInstr
2023-02-27 09:11:25 +01:00
DizzyEggg b2a50b88fb Removed trailing whitespaces (#2787) 2023-02-26 23:14:44 +01:00
DizzyEggg b41ba839a2 fix createspriteontargets on electricy anim (#2785) 2023-02-26 21:14:01 +01:00
DizzyEggg 8ccffa617a fix createspriteontargets on electricy anim 2023-02-26 19:47:44 +01:00
DizzyEggg 4bdca43dbd refactor mega evolution indicator sprite 2023-02-26 12:51:35 +01:00
DizzyEggg 3ff8c95c4e add meltan melmetal teachable moves 2023-02-23 10:53:55 +01:00
DizzyEggg 23272074bf fix uninitialized ai modifier variable in ai calc damage 2023-02-23 10:25:53 +01:00
DizzyEggg dc83708443 Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd 2023-02-22 22:51:59 +01:00
DizzyEggg 877e3fd6af merge with upcoming 2023-02-22 19:27:42 +01:00
DizzyEggg 460dceb48b fix intimidate derp 2023-02-22 19:20:18 +01:00
DizzyEggg 83281944fa Add tests for Contrary 2023-02-22 16:24:27 +01:00
DizzyEgggandAgustinGDLV e0b76e98ff Add MOVE_SHELL_TRAP Effect (#2716)
* implemented Shell Trap

Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
2023-02-22 13:55:34 +00:00
DizzyEggg 64e26f5c86 Fix Contrary String on Intimidate 2023-02-22 13:11:16 +01:00
DizzyEggg 31138455de remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS 2023-02-22 09:28:12 +01:00
DizzyEgggandLOuroboros bca47a0891 Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-02-22 09:17:23 +01:00
DizzyEggg d73ab0246f Fix Explosion + Galvanize + Volt Absorb and Mind Blown (#2688)
* Fix Explosion and Mind Blown
* Use battler ability in jumpifabilitypresent
2023-02-21 22:50:29 +00:00
DizzyEggg 1e2eeb4d79 fix wrong assumption 2023-02-21 16:26:49 +01:00
DizzyEggg 61064ab07e Merge branch 'upcoming' into fix_abilities_empty_field 2023-02-21 16:22:26 +01:00
DizzyEggg 41e0278127 Merge pull request #2707 from mrgriffin/rhh-battle-tests-02-19
Battle Tests (Feb 19)
2023-02-21 12:21:21 +01:00
DizzyEggg 7d23d5433b try fix tests failing 2023-02-20 16:38:37 +01:00
DizzyEggg a6f6c205c9 add tests for download 2023-02-20 15:41:22 +01:00
DizzyEggg a8c0e1ebeb fix intimidate 2023-02-20 13:15:08 +01:00
DizzyEggg 03915524c5 Fix switch-in abilities activating on empty field 2023-02-20 12:42:06 +01:00
53180ebf87 Update Healing wish to gen5 / gen8 mechanics (#2708)
* Updated Healing Wish and added config
* Fixed Lunar Dance message

Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2023-02-20 11:25:43 +00:00
DizzyEggg 380af442c3 Fix buggy pokemon anims with Illusion (#2639)
* try illusion fix

* fix
2023-02-19 12:05:56 +01:00
DizzyEggg dcb1117470 a 2023-02-19 12:01:47 +01:00
DizzyEggg c82f35d6bf correct Cmd_pickup 2023-02-19 12:01:13 +01:00
DizzyEggg 66d2f253a1 merge with master 2023-02-17 15:43:15 +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
DizzyEggg d637ee3b13 Fix After You for gen8 (#2646)
Fix After You
2023-02-16 20:59:36 +00:00
DizzyEggg 6cdca24c31 use forced switch battler bit 2023-02-16 21:58:00 +01:00
DizzyEggg d7f68a3893 IsAceMon - not isAceMon 2023-02-16 15:57:15 +01:00
DizzyEggg 978d342953 use NUM_BATTLE_SIDES 2023-02-16 15:26:26 +01:00
DizzyEggg 4c18ed2bd4 remove comment 2023-02-16 15:11:48 +01:00
DizzyEggg 1c970afd6a fix follow me working in singles (#2644)
* fix follow me working in singles
2023-02-16 10:53:29 +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
DizzyEggg 3f0f7c6b7f Fix Battle Bond activating multiple times in battle 2023-02-15 15:30:29 +01:00
DizzyEggg 2b4d2a7695 Fix Jaw Lock locking player pokemon 2023-02-13 16:27:21 +01:00
DizzyEggg 0577d8d04d Fix Mirror Armor against Clear Body 2023-02-13 14:44:34 +01: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
DizzyEggg 513ecd50ba Fix Spacial Rend animation 2023-02-09 13:24:23 +01:00
DizzyEggg 0048e59e05 Fix SpeciesInfo struct offsets 2023-02-08 22:08:12 +01:00
DizzyEggg 84d7024add cleanup 2023-02-08 12:48:48 +01:00
DizzyEggg 896b575c07 Fix volt switch breaking ace pokemon 2023-02-08 12:42:38 +01:00
DizzyEggg 8c257bde99 Fix 1 vs 2 battles with eggs 2023-02-08 10:24:19 +01:00
DizzyEggg ff088752e7 Insomnia ability pop-up (#2643)
* Insomnia ability pop-up

* remove B_MSG_STAYED_AWAKE_USING constant
2023-02-07 18:47:23 +01:00
DizzyEggg 0d6b640876 Merge pull request #2439 from AsparagusEduardo/RHH/pr/cleanup/DragonTailEffect
Cleaned up move effect checks for Dragon Tail/Circle Throw
2023-02-07 16:17:12 +01:00
DizzyEggg dcb63e1518 Merge pull request #2610 from ghoulslash/be/animsilktrap
Silk trap Animation
2023-02-07 16:13:53 +01:00
DizzyEggg f762ed728d remove pointless timers from disable struct 2023-02-07 15:10:20 +01:00
DizzyEggg 47ebf2e167 hmm 2023-02-07 13:33:43 +01:00
DizzyEggg 0dc5e1e685 aftermath damp pop-ups and string 2023-02-07 13:01:56 +01:00
DizzyEggg 04ce8ec213 Fix Volt Absorb not activating on Thunderwave 2023-02-06 20:55:56 +01:00
DizzyEggg 51d8b57dcc restore deleted line 2022-10-31 13:19:10 +01:00
DizzyEggg ea43b7732c Fix battle tent again 2022-10-31 13:16:48 +01:00
DizzyEggg 215604f5f7 fix battle palace bug 2022-10-27 20:44:43 +02:00
DizzyEggg d167b4ea0a Dragon Tail Weak Armor fix 2022-08-30 20:08:50 +02:00
DizzyEggg 7cb010d71e fix magic bounce conflicts and fix magic coat 2022-08-30 19:36:06 +02:00
DizzyEggg 2d4ac679a6 tabs 2022-08-29 10:26:55 +02:00
DizzyEggg 27010e9ee6 quash faintclearsetdata 2022-08-29 10:23:26 +02:00
DizzyEggg 57c929275f Merge pull request #2269 from AsparagusEduardo/RHH/pr/fairyicon
Update Fairy icon
2022-08-29 09:20:18 +02:00
DizzyEggg b9babd9ff1 Merge pull request #2264 from AsparagusEduardo/RHH_pretMerge20220826
Friday Night Mergin' (weekly merge)
2022-08-29 09:17:40 +02:00
DizzyEggg 6331931ba3 Fix Magic Coat targets 2022-08-26 15:01:51 +02:00
DizzyEggg 3facc4875a Merge pull request #2259 from AsparagusEduardo/RHH_fixNetBall
Fixed Net Ball Gen 7+ multiplier
2022-08-26 09:11:04 +02:00
DizzyEggg 622a7f8141 merge with master 2022-08-25 22:10:59 +02:00
DizzyEggg 1b9c2816c2 fix updatehptextinhealthbox arguments 2022-08-25 17:37:47 +02:00
DizzyEggg 63370b065d Party menu supports 4digit hp 2022-08-25 17:31:14 +02:00
DizzyEggg a0ec8a5a80 4 digit hp in battle 2022-08-25 16:40:56 +02:00
DizzyEggg c17db6d2d5 Merge pull request #2245 from AsparagusEduardo/RHH_criticalCaptureBool
Fixed critical capture fields not using TRUE or FALSE
2022-08-25 08:56:57 +02:00
DizzyEggg 4f790a6ec0 spaces 2022-08-24 23:47:42 +02:00
DizzyEggg 91b76e2e4f quash pr clean up 2022-08-24 23:39:34 +02:00
DizzyEggg 06b4548603 Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash 2022-08-24 23:35:42 +02:00
DizzyEggg 7aa55f2753 better interface 1 player mon in double 2022-08-24 23:00:21 +02:00
DizzyEggg e3ab439ec0 Fix multi wild battles 2022-08-24 21:56:24 +02:00
DizzyEggg cc8dd92247 ENDTURN_WISH resets gBattleStruct->turnSideTracker 2022-08-24 20:48:47 +02:00
DizzyEggg 0bf2b26491 Get rid of garbage bytes in graphics.c 2022-08-24 20:36:49 +02:00
DizzyEggg 17b47de90d Ability pop-up displays properly long abilities 2022-08-24 20:20:44 +02:00
DizzyEggg 18203a0402 Fix makefile 2022-08-23 14:50:16 +02:00
DizzyEggg 05ec8fb182 AI knows Party mons 2022-08-23 11:58:17 +02:00
DizzyEggg 327782646b Save party mons ai 2022-08-23 01:07:25 +02:00