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

4099 commits

Author SHA1 Message Date
Eduardo Quezada
f89efad082 Merge branch '_RHH/master' into _RHH/upcoming 2024-02-05 17:52:34 -03:00
DizzyEggg
065c0ec588
Fairy Lock animation fix (#4111) 
* Fairy Lock animation fix

* remove comment

* fairy lock anim hopefully works

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-02-04 23:23:03 +01:00
Nephrite
65c508d193
Secondary effects overhaul minor follow-up (#4062) 
* settwoturnstring command

* Unified two-turn attacks and Meteor Beam

To do: Solar Beam

* Solar Beam

Also fixed various function, removed EFFECT_GUST (who knows why that exists?)

* Updated Solar Beam + tests

* Redid two turn move + animations logic

Removed pointless various function; to do: remove Skull Bash, fix AI test

* Removed now-pointless flag

* Removed Skull Bash

And temporarily commented out failing AI tests

* Removed Sky Uppercut effect

Not sure when or why this was ever necessary

* Removed BattleScript_EffectSemiInvulnerable

Now uses BattleScript_EffectTwoTurnsAttack. Kept the effect; used the argument field to determine which STATUS3 such moves should apply but added a function to jump over weather checks in BattleScript_EffectTwoTurnsAttack if the current move is semi-invulnerable (since the instant-fire weather check and STATUS3 use the same field)

* Applied review changes

* Replaced VARIOUS with callnative

Tried to fix test but couldn't :/ wtf is going on

* Fixed one AI test

Cant fix the other...

* Added KNOWN_FAILING to failing AI tests

Separated them out into their own test

* Optimised script, overhauled charge turn string setting

Condensed multiple confusing macros into one, jumpifweathercheckchargeeffects. Script now tweaked and trimmed, string ids for charge turns now added to argument along with status3 (thanks to compression macro) and instant-fire-weather for semi-invulnerable and two-turn moves respectively. Also introduced a savedStringId in gBattleScripting to make string selection work.

* Unified two turn move tests + minor corrections

* Added semi-invulnerable move tests

Set the Razor Wind test to known failing - something to do with its animation?

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-02-04 23:02:59 +01:00
Alex
46d9adb326
Fixes Eerie Spell double pp and message drop (#4127) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-02-03 19:34:52 +01:00
Alex
ab2774f8c7
Adds Dragon Cheer (#4122) 
* Adds Dragon Cheer

* fix assumptions

---------

Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
 2024-02-03 08:00:41 -07:00
ghoulslash
83b9b95662
add supersweet syrup, unify single-use entry abilities to single field (#4115) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-02-02 15:44:14 +01:00
Bassoonian
2f2d7c281f
Clean up contest strings (#3876) 
* Move contest move descriptions out of inc file

* Clean up unused contest strings

* More contest cleanup

* sRoundResultTexts cleanup

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2024-02-02 10:55:39 +01:00
Eduardo Quezada D'Ottone
b898a65891
Fixed Gigantamax Factor not changing form (#4108) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-02-01 19:26:30 -03:00
Bassoonian
ccfebe5e05
Adds missing evolution methods (#4087) 
* Add evolution tracker to BoxMon struct

* Add "use move 20 times, then lv up" evolution method

* Add recoil tracker

* Reduce to 9 bits

* Fix agbcc complaint

* Put MOVEEND_CLEAR_BITS at the end

* Remove battle argument from tryupdaterecoiltrackker

* Add null checks

* Fix upcoming merge

* Add requested formatting changes

* Condense evolution check into a single function for easier customisation later

* Incorporate review requests

* Update src/pokedex_plus_hgss.c

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

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-02-01 18:35:38 -03:00
ZnogyroP
71b49a114f
Adds move Upper Hand (#4085) 
* Remove non-existent tilesets from label comments and alphabetize

* Fixed braces style

* gbagfx bit depth upconversion fix

* jsonproc: filter out every non-alphanumeric character

* fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld

* Adds move Upper Hand

* Requested changes

- Tabs / spaces where proper
- HitFromAtkString -> HitFromAccCheck
- Actually compiles now lol
- Moved assumes into relevant tests
- Cleaned up the check for TryUpperHand

* Fixed || positioning

* Update upper_hand.c

* Revert "Merge remote-tracking branch 'upstream/master' into upper-hand"

This reverts commit b21275dfe9, reversing
changes made to 89b1ad1ea1.

* AI logic and conflicts solved

* Test fix

* Fix Sheer Force test

* Requested changes

* Requested changes

* Update battle_script_commands.c

---------

Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
Co-authored-by: Sierraffinity <sierra@domoreaweso.me>
Co-authored-by: sbird <sbird@no.tld>
 2024-02-01 12:23:58 +01:00
Alex
6d3fa525d5
Rename EFFECT_FAKE_OUT to EFFECT_FIRST_TURN_ONLY (#4081) 
* Splits First Impression effect from Fake Out

* Fix test failing

* rename EFFECT_FAKE_OUT

* use moveeffect chance for fake out and priority field for first impression

* rename rest of fake out

* messed up merge

* remove useful comment

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-31 09:32:58 -03:00
Eduardo Quezada
afb1efe0d3 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_controller_player_partner.c
 2024-01-28 18:11:44 -03:00
Alex
9bcd46bce8
Fixes Pursuit, Tangling Hair interaction (#4086) 2024-01-28 19:15:53 +01:00
Bassoonian
e995927d13
Add extra key item bag space checks (#4066) 
* Fix 4019

* I am exceedingly brilliant in my failure to build before pushing
 2024-01-26 21:11:04 +01:00
Eduardo Quezada D'Ottone
c8d73c0827
Merge branch 'upcoming' into guillotine-expansion 2024-01-26 10:10:27 -03:00
Eduardo Quezada
ebbcb7d025 Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
Eduardo Quezada
00e2ca6030 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_ai_util.c
#	src/battle_script_commands.c
#	src/battle_tv.c
#	src/data/battle_moves.h
#	src/data/pokemon/species_info/gen_9.h
 2024-01-22 15:56:10 -03:00
Alex
0ec777dd24
Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect (#4043) 
* Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect

* review fixes

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-21 23:42:01 +01:00
Nephrite
89a632cfa4
Moved scripts array to src/data/battle_move_effects.h (#3994) 
* Created gMoveBattleEffects array

* Renamed array to gBattleMoveEffects

Applied array in battle_util.c and battle_script_commands.c; doesn't build yet...

* Got it building...

* Added missing battle_tv effects

* Fixed and got it building

I'm an idiot sometimes

* Added battle_tv scores, encourage Encore flag

All works and builds just fine

* Merge fixes

* Reformatted battle_move_effects

Also tweaked struct, added macro

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-19 16:44:09 +01:00
Eduardo Quezada
7e8ea89ded Merge branch '_RHH/master' into _RHH/upcoming 2024-01-19 09:34:05 -03:00
Alex
9efdd9e0cd
Adds Move Shed Tail (#4016) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-18 00:14:18 +01:00
fakuzatsu
cae58ca93e
fixed oversight causing chosen fossil to be lost if bag is full (#3978) 
* fixed oversight causing chosen fossil to be lost

* fixed an error with my condition

* - conditional check and + underpass fossil check
 2024-01-18 00:03:55 +01:00
Eduardo Quezada
ddc752eb14 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	asm/macros/event.inc
#	data/field_effect_scripts.s
#	data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
#	data/script_cmd_table.inc
#	graphics/pokemon/castform/sunny/anim_front.png
#	graphics/pokemon/castform/sunny/normal.pal
#	include/battle_util.h
#	include/constants/event_object_movement.h
#	include/constants/field_effects.h
#	src/battle_controller_player.c
#	src/battle_util.c
#	src/data/object_events/movement_action_func_tables.h
#	src/data/object_events/object_event_pic_tables.h
#	src/data/trainer_graphics/back_pic_anims.h
#	src/daycare.c
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/load_save.c
#	src/scrcmd.c
#	src/trainer_see.c
 2024-01-17 18:11:35 -03:00
Eduardo Quezada
71fe6b34dc Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	include/battle_scripts.h
#	src/battle_script_commands.c
 2024-01-17 12:29:33 -03:00
Alex
87472d4a6c
A few new gen 9 move animations (#3989) 
* A few new gen 9 move animations

* draco meteor anim

tmp

* applied suggestions

* fix compile

* add more crystals to ice spinner

* further fixes

---------

Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
 2024-01-16 19:33:49 -07:00
Alex
8f99ef16be
Adds Move Psychic Noise (#4005) 
* Adds Move Psychic Noise

* changes psychic noise from effect to move_effect

* remove leftover

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-16 22:52:56 +01:00
Alex
f6c08c08b6
Fix item usage in double battles (#3977) 
* Fix item usage in double battles

* fix failing tests

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-15 21:55:35 +01:00
psf
bf8b09b1b6
Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 
* Emptied out item_ball_scripts
Added GetObjectEventTrainerRangeFromTemplate
Added Common_EventScript_FindItem

* Replaced trainer_sight_or_berry_tree_id with item constant
Replaced scripts with Common_EventScript_FindItem

* Renamed to GetItemBallIdAndAmountFromTemplate
Moved to item_ball.c

* Updated ObjectEventTemplate

* Updated inc files to support plural item names

* Refactored CopyItemNameHandlePlural to handle all items

* Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT

* Converted spaces to tabs
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130

* Added warning on object_event macro to prevent silent failure
Reverted global.fieldmap to original state, per feedback

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-14 21:35:45 +01:00
Eduardo Quezada D'Ottone
ff0aed31b3
Removed some hardcoded move IDs (#3982) 
* Removed EFFECT_HURRICANE in favor of using EFFECT_THUNDER

* Added EFFECT_BLIZZARD

* Helping the IDE a little

* Added EFFECT_RAIN_ALWAYS_HIT for Forces of Nature moves

* Removed MOVE_SELF_DESTRUCT and MOVE_EXPLOSION hardcoding

* Removed EFFECT_FRUSTRATION hardcoding

MOVE_SELF_DESTRUCT

* Cleaned up sPoints_MoveEffect

* Removed MOVE_AURA_WHEEL and MOVE_PRESENT hardcoding

* Fixed compile
 2024-01-12 22:41:46 +01:00
Alex
6220a8ced9
Adds Clanging Sclaes test, reverts fix and few Parental Bond tests (#3973) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-12 01:43:43 +01:00
Nephrite
a76e3c70ba Applied more review fixes 2024-01-12 03:02:48 +09:00
Damon Murdoch
a1a79ce8db
Fix clangorous soulblaze boosting itself twice in doubles (#3965) 
Fix clangorous soulblaze boosting itself twice in doubles
 2024-01-11 09:30:07 +01:00
Nephrite
c4616739d8 Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2024-01-11 00:35:35 +09:00
Nephrite
67e76f2b59 Some more review fixes + Fling fix 
Not the ideal solution but Fling now has a hardcoded check for Shield Dust and acts accordingly - a better long term solution inolves making a bunch of reusable MOVE_EFFECTS and rejigging attackcanceler but I didn't feel like doing that today...
 2024-01-11 00:27:06 +09:00
Biffalo XIII
4a3954ff34 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/birch_pc.c
#	src/main.c
 2024-01-09 09:19:12 -03:00
Ariel A
85aab338a9 Merge branch 'guillotine' into guillotine-expansion 2024-01-08 19:43:06 -05:00
Ariel A
1ce961768e Added automatic runtime decapitalization. 2024-01-07 20:21:14 -05:00
Bassoonian
418e551960 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2024-01-05 00:32:21 +01:00
ghoulslash
91dfa93d3b
fix genie storm move anims for both targets, add AnimEllipticalGustCentered, AnimParticleInVortex handles multiple targets, add dynamic pals based on move target in UnpackSelectedBattlePalettes (#3895) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-01-02 23:46:07 +01:00
Nephrite
59d76c9321 A few fixes, added effects for Meteor Beam/Electro Shot 2024-01-02 20:27:50 +09:00
Nephrite
daeba066e0 Fixed SetMoveEffect + Sheer Force 2024-01-02 05:51:40 +09:00
Nephrite
923d22b42b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into secondary_effects_overhaul_merge 2024-01-01 03:50:36 +09:00
Ariel A
398a9ee8fa Merge branch 'followers' into followers-expanded-id 2023-12-31 01:49:56 -05:00
Ariel A
7d7531f2fa Merge branch 'master' into followers 2023-12-31 01:28:27 -05:00
DizzyEggg
b83b1f7e88
Merge branch 'upcoming' into feature/dynmulti-expansion 2023-12-30 22:41:59 +01:00
Alex
cc32e378d6
Adds some Indigo Disk moves (#3853) 
* Burning Bulwark

* Fickle Beam

* Alluring Voice

* Electro Shot

* forgot sheer force flag for alluring voice

* review changes

* additional alluring voice test

* Simple Allruing Voice animation

* Update battle.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 20:20:12 +01:00
Nephrite
9dfa0d264f Merge branch 'upcoming' into secondary_effects_overhaul 2023-12-30 23:54:01 +09:00
Nephrite
ff51eb2b6c Removed unused move effects, various ids, and one script command 2023-12-30 20:35:48 +09:00
Nephrite
e34373effc Renamed seteffectwithchance to setadditionaleffects 
Function no longer has ability to apply effects from moveEffect - for that, seteffectprimary or secondary is now recommended. Removed EFFECT_RAMPAGE, updated a few tests
 2023-12-30 20:29:09 +09:00
Nephrite
be2e3cf056 Updated primary/secondary macros 
Makes things just a little easier to keep track of where move effects are being set and run
 2023-12-30 19:41:03 +09:00
kittenchilly
66a638f7b4
Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865) 
* Change Ivy Cudgel to be based on Ogerpon form rather than held item

* Update ivy_cudgel.c

* Address reviews

* Update test/battle/move_effect/ivy_cudgel.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 11:40:58 +01:00
Nephrite
f5ae8e0686 Rapid Spin uses additional effects + test 2023-12-30 17:02:59 +09:00
Nephrite
e7de08eca2 Unified Sonic Boom & Dragon Rage 
Not really in scope, but what the hell
 2023-12-30 15:40:50 +09:00
Martin Griffin
ab900e38df Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-29 19:48:21 +00:00
Bassoonian
245026353d
Remove leftover TID placeholder move defines (#3864) 2023-12-29 18:59:14 +00:00
Bassoonian
1662dc3478
Merge branch 'upcoming' into berryexpansion 2023-12-29 14:32:10 +01:00
DizzyEggg
604b823ffd
Missing Strength sap tests (#3860) 
* add missing strength sap tests

* a

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-29 13:39:54 +01:00
Nephrite
39773c0659 Burn Up and Double Shock 
Both working by applying an additional effect; added a generic "jumpifnotcurrentmoveargtype" type command to make it possible, relpacing secret power's function
 2023-12-29 12:44:38 +09:00
kittenchilly
94a650a203
Add Fillet Away + Belly Drum tweaks (#3616) 
* Add Fillet Away

* Fillet Away and Belly Drum tests

* More tests

* Update fillet_away.c

* Update fillet_away.c

* Newlines

* Update battle_scripts_1.s

* Update belly_drum.c

* Address reviews

* Fix order

* Swords Dance assume

* Update belly_drum.c

* Try some stuff

* Fix hp not being halved in certain cases

* Update battle_scripts_1.s

* AI stuff
 2023-12-28 23:27:09 +01:00
Nephrite
417a02c95e Fixed Make it Rain 
To do: misc fixes here and there, maybe do Burn Up/Double Shock, Dragon Rage/SonicBoom...
 2023-12-29 01:40:43 +09:00
Bassoonian
fde3fc0a52
Metronome move fix (#3852) 
* Draft Indigo Disk move data

* Add basic defines (flags, targets and priority missing)

* Update move flags

* Temper Flare is Stomping Tantrum

* Fix failing tests

* Disable Burning Bulwark for now
 2023-12-28 16:57:29 +01:00
Bassoonian
872ddf32c6
The Indigo Disk Moves (#3704) 
* Draft Indigo Disk move data

* Add basic defines (flags, targets and priority missing)

* Update move flags

* Temper Flare is Stomping Tantrum

* Forgot to push, please squash :D

* Fix failing tests
 2023-12-28 12:21:52 +01:00
kittenchilly
28f17772ec
Implement Pokemon Box Link functionality (#3837) 
* Implement Pokemon Box Link functionality

* Update item_use.c

* Update item_use.c

* Can only use box link if the map allows escape

* Revert "Can only use box link if the map allows escape"

This reverts commit be5b46b6c4.

* Overworld_IsEscapingAllowed

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-28 11:47:00 +01:00
Bassoonian
a4b819ac41
Merge branch 'upcoming' into berryexpansion 2023-12-27 14:00:12 +01:00
Nephrite
77c722ea09 Obsoleted 22 more effects 
Also added a better way of calculating battle_tv score properly; to do: Make it Rain
 2023-12-27 17:43:20 +09:00
sbird
c27ea10eb1 Merge branch 'feature/dynmulti' into feature/dynmulti-expansion 2023-12-26 14:22:49 +01:00
Nephrite
cd5c59ae5a Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2023-12-26 13:19:10 +09:00
Nephrite
c5061f0161 Updated remaining moves which use secondaryEffectChance 
secondaryEffectChance is no longer considered anywhere in the code; tidied up scripts and more
 2023-12-26 13:12:11 +09:00
Nephrite
76b4e08e5e Trapping moves, Secret Power, rampage moves 
Also tidied up a lot of #ifs and commas in battle_moves.h
 2023-12-26 10:46:11 +09:00
Alex
166a1a4e63
Adds ability Embody Aspect + minor fix to Hospitality (#3821) 
* Adds ability Embody Aspect + minor fix to Hospitality

* comment out failing tests related to neutralizing gas

* fixes neutralizing gas bug

* leftover
 2023-12-25 18:28:16 +01:00
Nephrite
f3e67cf543 Removed all unused effects 
Some util updates
 2023-12-25 12:32:13 +09:00
Nephrite
cda445c2f5 Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul_rebase 2023-12-25 12:19:38 +09:00
Alex
1339256d5d
Adds Ability Hospitality (#3818) 
* Adds Ability Hospitality

* fix agbcc
 2023-12-25 01:43:57 +01:00
ghoulslash
5cc54f5c96
fix cotton down overwriting gBattlerAttacker (#3783) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-24 23:19:59 +01:00
Bassoonian
9be8fed52c Fix string with duplicate berry berry 2023-12-24 22:59:43 +01:00
Nephrite
e87fe533c3 Superpower, CC, Hammer Arm 2023-12-24 23:43:12 +09:00
Nephrite
a8967da1c5 Overheat (and clones) 
Also, Syrup Bomb (really weird script)
 2023-12-24 23:27:21 +09:00
Nephrite
a244d7b8b6 Updated moves that raise the target's own stats 
To do: moves like CC, Overheat that LOWER stats; did NOT remove the effect for raising all stats due to an AI function
 2023-12-24 22:55:53 +09:00
Alex
61e6365470
Fixes Photon Geyeser category + minor AI calc fixes (#3807) 2023-12-23 12:31:40 +01:00
Bassoonian
db0a9484ae Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2023-12-23 00:39:10 +01:00
kittenchilly
505b8b63eb
Add Doodle + update ability banlists (#3609) 
* Add Doodle

* Doodle test

* Oops

* Update battle_util.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-22 16:45:55 +01:00
DizzyEggg
fcdc515be2
Fix rain dance/sunny day not blending opponent sprite (#3785) 2023-12-21 13:17:05 +01:00
DizzyEggg
6137db102e
Ally Switch (#3533) 
* ally switch move animation

* Ally Switch anim done

* ally switch test and improve animation

* derp

* add ally switch known failing test for ally targeting moves

* moves which targetted ally fail after ally switch

* ally switch works like protect

---------

Co-authored-by: root <root@LAPTOP-3SNV7DEQ>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-20 15:26:28 +01:00
Martin Griffin
50cbcebc81 Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-20 12:56:35 +00:00
Alex
1e25b53433
Partner Battle refactor (#3592) 
* Partner Battle refactor

* fix for steven id

* clean up

* Use trainer partner names for id

* removed testing leftover

* comment change

* more review changes

* fix compiling

* remove partener count

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-20 12:38:28 +01:00
Martin Griffin
13a4bf5838 Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-19 18:08:13 +00:00
Zimmermann Gyula
df447c48d3 Realign battleanim array with battlemove array. 2023-12-19 19:03:23 +01:00
Nephrite
4a1a6c5625
Battlemove refactored (recoil, crit and Z moves) (#3575) 
* Unified EFFECT_RECOIL

Combined EFFECT_RECOIL_25/33/50/33_STATUS into a single EFFECT; added an extra field to BattleMove 'secondaryData' that contains the franction of HP recoil; argument still holds status effect for Flare Blitz/Volt Tackle

* BattleMove struct change

Added critrate, recoil, multihit fields, made zMove into a union of effect/powerOverride for status/non-status moves respectively. Added new recoil field and zMove field to all moves. To-do: crit rate, multihit

* Critrate field added

Moves use a critRate field instead of a flag - obsoletes EFFECT_ALWAYS_CRIT

* Just a little define

Makes clear that critBoost = 3 means ALWAYS CRIT

* Added a proper recoil field

Just to make it unambiguous and flexible - can finally have a move with 69% recoil.

* Fixed AI damage calculation for multi-strike moves

* Fixes + removed unused effects

* Tests fixes

Two to fix: pass when run in isolation but not when the whole group is run, which is annoying...

* Minor fixes

* Minor tweaks

* Fixed move effects

* recoil tests

---------

Co-authored-by: Alex <alexthenotes@gmail.com>
 2023-12-19 16:10:07 +01:00
DizzyEggg
59a159c338
Fix Ice Face ignoring move effects (#3755) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-18 16:02:07 +01:00
DizzyEggg
64f8635496
fix telekinesis not working (#3763) 
* fix telekinesis not working

* typo

* remove one roost known failing

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-18 15:50:03 +01:00
Eduardo Quezada
c505abd53d Merge branch 'RHH/master' into RHH/upcoming 2023-12-17 18:13:26 -03:00
DizzyEggg
e22ac51617
Fix Innards Out doing dmg after Gastro Acid / vs Magic Guard (#3758) 
* gastro acid stays for fainted mons

* Innards Out does not damage Magic Guard Pokemon
 2023-12-17 21:47:12 +01:00
DizzyEggg
acec68fdb8
fix neutralising gas visual glitch (#3746) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-17 00:41:50 +01:00
Eduardo Quezada
537f1c9235 Merge branch 'RHH/master' into RHH/upcoming 2023-12-16 20:13:15 -03:00
Alex
e339bc4f29
Fix Fiery Wrath anim (#3739) 2023-12-15 20:27:04 +01:00
Bassoonian
0fd08a32ac Add status form change 2023-12-15 11:17:35 +01:00
Alex
38c61854e6
Changed Ivy Gudgel effect (#3721) 
* Change Ivy Gudgel effect

* test assumptions

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-14 18:09:06 +01:00
Eduardo Quezada
b2917fac5d Merge remote-tracking branch '_RHH_origin/master' into RHH/upcoming 
# Conflicts:
#	include/constants/battle_script_commands.h
#	src/battle_script_commands.c
 2023-12-10 14:29:42 -03:00
Eduardo Quezada
ce7fe75ac1 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/pret_20231210 
# Conflicts:
#	src/data/pokemon/species_info.h
 2023-12-10 13:49:55 -03:00
Eduardo Quezada
1fc712f153 Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210 
# Conflicts:
#	Makefile
#	data/battle_scripts_1.s
#	gflib/malloc.c
#	gflib/malloc.h
#	include/battle.h
#	ld_script.ld
#	ld_script_modern.ld
#	src/battle_ai_script_commands.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2023-12-10 13:27:09 -03:00
Alex
628eb95925
Adds Rage Fist (#3573) 
* Adds Rage Fist

* Fix initial implementation

* fix merge

* review changes

* endure test

* add field enduredDamage

* rage fist: transform, disguise  and field change

* merge fix
 2023-12-10 12:33:25 +01:00
Alex
403843cecf
Fixes Fling damage calcs (#3670) 2023-12-10 00:27:05 +01:00
Alex
d5f3df6f08
Fix Defog and Prevent Escape effects (#3668) 
* Fix Defog and Prevent Escape effects

* pain split / mirror coat interaction

* remove unused various define

* use pain split effect

* remove test
 2023-12-10 00:26:03 +01:00
Alex
d86a2136a7
Fixes Cutton Down / Defiant interaction (#3657) 2023-12-08 17:29:29 +01:00
Bassoonian
1e0b895ecb Add missing check to prevents water grinding 2023-12-08 01:05:54 +01:00
Bassoonian
9d09b367a0 Refactor growth time and add six stage toggle 2023-12-07 13:22:01 +01:00
Bassoonian
c8d356a3f1 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2023-12-07 12:18:50 +01:00
Bassoonian
8e43b7d696 Debug Berry functions 2023-12-06 21:08:09 +01:00
Patrick Curran
f7ca839f23
EFFECT_CHILLY_RECEPTION (#3379) 
* Chilly Reception Effect

* Wrap Chilling Reception Message Better

* Animation & Some Testing

* Remove Wimp Out cases from Chilly Reception tests

* Animation tweaks

* Battle Script Updates
* Created CheckPrimalWeather macro for Weather Effects
* Updated Chilly Reception logic to switch even if weather doesn't change

Testing Updates

* Fixed test: Move does not animate if weather fails to change

* Remove snow animation check during failure path test

* * Fix indentation
* Move Chilly Reception animation to always play (even when weather change fails)

* Updates to MoveSwitch and PartingShot to get closer to original logic

* Update BattleScript_EffectChillyReception logic

* * Move CHILLY_RECEPTION animation
* Test updates

* Fix Chilly Reception MESSAGE  checks

---------

Co-authored-by: Patrick Curran <rapidnutcracker@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-06 17:11:13 +01:00
Bassoonian
3e1c04cc26 Allow pests and weeds interaction 2023-12-05 22:13:21 +01:00
Bassoonian
36befdcdf8 Add moisture clock, weeds and pest generation 2023-12-05 21:54:17 +01:00
Bassoonian
ddcd0dbb78 Weeds and Pests strings 2023-12-05 20:02:11 +01:00
Bassoonian
6da03e6cf0 Add Berry color and drain rate 2023-12-05 02:16:22 +01:00
Bassoonian
0d70d9951d Put Mulch behind config 2023-12-04 00:33:25 +01:00
Eduardo Quezada
d076193b9f Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle.h
#	include/constants/battle_script_commands.h
#	src/battle_script_commands.c
#	src/data/battle_moves.h
 2023-12-03 16:39:32 -03:00
Bassoonian
45e19d22fa Remove lost comment 2023-12-03 13:22:58 +01:00
Bassoonian
b02b3d074f Add Mulch effects 2023-12-03 13:17:34 +01:00
Alex
d1a69d7e04
fix new line (#3621) 2023-11-30 20:01:21 -03:00
psf
2b1d36db46
Fix issue where Sky Battles cause upcoming not to compile when debug menu is turned off (#3617) 
* Moved Sky Battle error message outside of debug.inc
https://github.com/rh-hideout/pokeemerald-expansion/issues/3615\#issue-2015546179

* Update data/scripts/debug.inc

Made changes from Jasper's review

625f007741

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-29 23:08:36 +01:00
Alex
4bde378c0d
Fixes Floral Healing + Tests (#3604) 2023-11-29 13:57:29 +01:00
Bassoonian
a517e14c06 Berry Mutations 2023-11-29 13:26:43 +01:00
sbird
ecab5cc106 Merge remote-tracking branch 'pret/master' into feature/dynmulti 2023-11-29 13:06:18 +01:00
ghoulslash
8c4058c7a8
add HITMARKER_DISABLE_ANIMATION for bug bite consumeberry (#3607) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-28 18:57:11 +01:00
Nephrite
460eeff3e5 All moves (I think) that hit and lower a stat 
Includes Grav Apple - test that checks the AI can see its power bump needs fixing
 2023-11-28 16:17:11 +09:00
Nephrite
a1a62f431d More moves 
Poison Fang, Knock Off, Thunder, Hurricane, Snore; also Thief, hit_and_escape moves, recharge moves, (but didn't remove effect)
 2023-11-28 00:03:42 +09:00
psf
fe16a2cdee
Port pokefirered's Vs. Seeker to pokeemerald (#3256) 
* First version of Vs. Seeker

* Update movement.inc

98f7e9978d (r1306721924)

* Update field_effect_scripts.s

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004

* Update field_effect_scripts.s

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024

* Update item_use.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401

* Update movement_action_func_tables.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828

* Update event_object_movement.c

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887

* Update overworld.c

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396

* Update vs_seeker.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158

* Update vs_seeker.c

Addressed some cleanup comments from SBird

* Update UpdateRandomTrainerRematches
Fixed typo in ClearAllTrainerRematchStates
Fixed types in GetRematchableTrainerLocalId

* Updated UseVsSeekerEffect_2

* Updated UseVsSeekerEffect_3

* Updated UseVsSeekerEffect_4

* Fixed bug that allowed Vs Seeker to be used indoors in correct places
Moved VsSeeker function declarations into header

* Refactored FieldUseFunc_VsSeeker

* Added curly braces to else case in FieldUseFunc_VsSeeker

* renamed data[x] in Task_ResetObjectsRematchWantedState

* Refactored Task_ResetObjectsRematchWantedState

* Refactored VsSeekerResetObjectMovementAfterChargeComplete

* Refactored ResetMovementOfRematchableTrainers

* Refactored GatherNearbyTrainerInfo

* Refactored Task_VsSeeker_3

* CanUseVsSeeker

* Refactored GetVsSeekerResponseInArea

* GetCurVsSeekerResponse refactored

* Cleaned up GetTrainerFlagFromScript

* Gave sensible names to Task_VsSeeker

* Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater

* Renamed UseVsSeeker Functions

* Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned
Removed extra VsSeeker animation code

* Addressed PR feedback

* Fixed issue with building non-modern

* Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId

* Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850
Removed the check to see if a map was not indoors to improve readability
Made IsValidLocationForVsSeeker into a static function

* Added changes in response to Jasper's feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522

* Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392

* Removed ifdef tags around the repo unless needed
b5dc744ced
 2023-11-26 18:58:43 +01:00
psf
493478e94b
Added support for XY's Sky Battles (#2950) 
* Original implementation from Phlayne

* Moved Sky Battle Flag / Var into a config

* Optimized existing code and fixed existing bugs

Added error message for when sky battle var and flag are not set
Merged CanDoSkyBattle and PrepareSkyBattle into one special

* Added compatibility for Gen7+

* Commented out Volt Crash from banned moves

* Cleaned up debug scripts from testing

* Fixed bug where player did not white out even if they had no healthy Pokémon and only an egg
Zeroed out both Sky Battle configs

* Removed extra include from src/field_specials.c
Removed extra line break in src/battle_script_commands.c

* Added FLAG_DISABLED_IN_SKY_BATTLE
Added FLAG_DISABLED_IN_SKY_BATTLE to appropriate moves

* Changed DoesSkyBattleCancelCurrentMove to look at move flags

* Fixed alignment and spacing in battle_moves.h

* Added FLAG_DISABLED_IN_SKY_BATTLE to Sticky Web

* Added FLAG_DISABLED_IN_SKY_BATTLE to Steel Roller

* Disabled the ability to change Battle Terrain when Sky Battle is happening
Stopped Ceaseless Edge from spawning Spikes when Sky Battle is happening
Added B_SKY_BATTLE_STRICT_MECHANICS config

* Fixed bug with SKY_BATTLE_STRICT_MECHANICS where conditions were not consistently being applied

* Add rulesVariants to the BattleStruct
Added skyBattle check in AllocateBattleResources

* Replaced B_FLAG_SKY_BATTLE checks with rulesVariants.skyBattle checks

* Fixed debug script

* Reverted include/config/battle.h

* Fixed spacing and placement of functions

* Fixed debug script omission
Fixed bug where Spikes did not set from Ceaseless Edge and Stone Axe

* Added FLAG_DISABLED_IN_SKY_BATTLE to Psychic Terrain

* Addressed DizzyEgg PR feedback

* Forgot a file in last commit

* Addressed feedback from DizzyEggg

* Address Lunos' PR feedback

* Update specials.inc

Added an empty line at the end of data/specials.inc

* Fixed spacing

* Apply suggestions from code review

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

* Updated skyBattleBanned and HandleBattleVariantEndParty to use correct names

* Removed STRICT_MOVES and STRICT_MECHANICS

* Fixed minor spacing issues with merge

* Merged in upcoming

* Implemented feedback from Jasper
5da6117d1b

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-11-26 16:59:44 +01:00
Nephrite
2d0ec53cb6 Misc moves + cmd_seteffectwithchance fix 
Added check to prevent loops in cmd_seteffectwithchance. Updated Pay Day, Tri Attack, Spectral Thief, Clear Smog, V Create, Core Enforcer
 2023-11-27 00:32:40 +09:00
Nephrite
4058d16f2f 2-Turn moves + unique moves with secondary effects 
Two turn moves (Bounce, Freeze Shock, Sky Attack, Shadow/Phantom Force), Dire Claw, Stone Axe, Ceaseless Edge, Wicked Torque, Relic Song, Fake Out,
 2023-11-25 23:56:17 +09:00
Nephrite
98b2c93b3f Freeze/frostbite causing moves 
Added move effect FREEZE_OR_FROSTBITE macro so that we only need that if statement once...
 2023-11-25 19:22:28 +09:00
Eduardo Quezada
c8b0545d20 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	include/battle.h
 2023-11-25 00:51:33 -03:00
psf
8d6cb9692a
Improved Repel / Lure Menu (#3594) 
* First draft of repel lure

* Updated all lure and repel scripts

* Optimized inc file

* Updated y coord

* optimized sprays.c

* Removed spray.inc

* Updated cosnt use

* Removed dead repel and lure code

* Updated debug for testing

* testing new inc file

* turn on debug and options

* playground generated inc file without ifs

* pory generated inc with ifdef complete

* Updated spray.c with new inc

* reverted item config

* Reverted event scripts

* Reverted event scripts

* Revert config

* Added testing scripts for debug

* Added back specials

* reverted debug scripts

* Updated use of constants

* Addressed tabs > spaces feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3594\#discussion_r1402917676

* Updated constant names to avoid confusion
Made inc file changes
https://github.com/rh-hideout/pokeemerald-expansion/pull/3594\#pullrequestreview-1746418044

* Updated constant name of NUM_SPRAY_TYPES to NUM_SPRAY_STRENGTH to be more accurate
 2023-11-23 21:31:33 +01:00
Nephrite
5eae07e4b9 Jaw Lock, Axe Kick, Spin Out 
Jaw Lock needs a test but I'm too lazy to write it
 2023-11-23 23:43:11 +09:00
Nephrite
b7d77ad59e Confusion moves 2023-11-23 23:33:55 +09:00
Nephrite
d81bf6afde EFFECT_POISON_HIT 
Also tidied up paralysis/burn scripts; updated Barb Barrage
 2023-11-23 22:29:11 +09:00
Alex
ca39889587 Fixes Howl 2023-11-22 21:55:08 +01:00
Nephrite
ffe89c7248 Redid Fang Moves 
Pass tests too
 2023-11-23 00:21:57 +09:00
Alex
7fb811d33d burn_hit -> move_effect_burn 2023-11-22 19:24:32 +09:00
Alex
ba6d223f17 matcha gotcha 2023-11-22 19:20:30 +09:00
Bassoonian
a7beed5b25
Dynamax messages (#3581) 
* Dynamax messages

* Convert various to callnative

* Remove battler argument from callnatives

* Rename i variable

* Fix missing else
 2023-11-21 19:18:18 +01:00
Alex
b9edbb429b
Adds combined pledge move effects (#3336) 
* Adds combined pledge move effects

* added pledge status and various other fixes

* leftover

* fix triple arrow test tag

* pledge moves can not be redirected by absorbing abilities

* more pledge changes

* remove duplicate test

* Stab boost, Rainbow anim and new SeaOfFire anim

* leftover

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-21 16:23:22 +01:00
Alex
be42d4eafb
Increase score of secondary effects only at 100% chance (#3583) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-21 11:30:20 +01:00
Nephrite
1dadc79b8b Triple Arrows redo 
Sorry, Lunos
 2023-11-20 19:39:13 +09:00
Alex
4cb03d4add
Adds Raging Bull and various fixes (#3552) 
* Adds Raging Bull and various fixes

* fix compiling on abgcc

* syrup bomb anim fix

* sticky syrup anim in link battles

* fix sticky syrup in link battles

* fix battler index

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-19 17:45:58 +01:00
Alex
5fa1bffa8d
Adds Glaive Rush, fixes for Plasma Fists and Relic Song (#3476) 
* Adds Glaive Rush

* Fixes: Glaive Rush status is removed until users next turn

* Glaive Rush no affect

* simplify glaive rush script

* simlify script further

* leftover

* Fix Plasma Fists and Relic Song + tests

* Callnative for Plasma Fists

* Use Status Field Ion Deludge for Plasma Fists

* add assumes for flinch_status

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-18 15:19:38 +01:00
kittenchilly
85e75a72c6
Update affection mechanics to gen 8+ (#3495) 
* Update affection mechanics to gen 8+

* Update battle.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-14 21:29:38 +01:00
Martin Griffin
3fc47d137a
Defines for Expansion version number (#3454) 2023-11-10 08:08:36 -03:00
Alex
4b3c96a89b
Adds ability Zero to Hero (#3542) 2023-11-09 08:25:46 -03:00
GriffinR
12a64fecb4
Merge pull request #1936 from GriffinRichards/doc-datahpupdate 
Document datahpupdate
 2023-11-07 12:25:26 -05:00
Alex
954f67a29f
Fixes Dragon Tail and Pumpkaboo spelling (#3541) 2023-11-07 18:19:46 +01:00
Alex
2b9f6b350e
Move animations. Credits to Captain-Ford (#3529) 
Co-authored-by: DizzyEggg <16259973+DizzyEggg@users.noreply.github.com>
 2023-11-06 12:31:43 +01:00
Alex
64ba52d214
Remove redundant AI score increases (#3504) 
* Remove redundant AI score increases

* review applied

* fix score
 2023-10-31 13:41:22 +01:00
Eduardo Quezada D'Ottone
2dfae911aa
Added config for Weak Armor's Gen 5-6 effect (#3498) 2023-10-30 17:18:00 -03:00
Eduardo Quezada
e28d0c627a Merge branch 'RHH/master' into RHH/upcoming 2023-10-30 16:51:04 -03:00
DizzyEggg
72dad4d7c6
Fix Weak Armor interrupting multi hit moves (#3497) 2023-10-30 16:44:42 -03:00
Eduardo Quezada D'Ottone
1a6acad3cf
Added Match Call to togglable options in debug menu (#3489) 
* Added Match Call to togglable options in debug menu

* Added badge flags to Cheat Start

* Fixed potential Fly and badge flag mismatch using the debug options

* Added Fly flags to Cheat Start
 2023-10-30 16:13:32 +01:00
Eduardo Quezada
908af87846 Merge branch 'RHH/master' into RHH/upcoming 2023-10-30 11:00:24 -03:00
Eduardo Quezada
661becc3b6 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2 
# Conflicts:
#	src/debug.c
 2023-10-30 08:05:14 -03:00
DizzyEggg
f4be01f0ac
Fix strength sap on substitute (#3486) 
* tests for strenth sap

* fix strength sap on substitute

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-10-30 11:58:15 +01:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474) 2023-10-27 19:14:45 -03:00
kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) (#3473) 2023-10-27 13:54:55 -03:00
kittenchilly
bd71946372
Remove all trailing whitespace (master) (#3472) 2023-10-27 13:52:44 -03:00
Eduardo Quezada D'Ottone
db00839d64
Fixes Syrup bomb, new Octolock script, some Intim changes + Tests (#3437) 2023-10-27 12:25:55 -03:00
Eduardo Quezada
8e0991475c Incorporated upstream fixes 2023-10-27 11:04:10 -03:00
Eduardo Quezada
7ae37ab79c Merge branch 'pret_master' into RHH/upcoming 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/event_scripts.s
 2023-10-27 11:03:37 -03:00
Alex
cb38f3bee6
Fixes legendary backgrounds (#3464) 
* Fixes legendary backgrounds

* missed one

* forgot break
 2023-10-25 17:06:25 +02:00
Alex
f6781a77d4 merge rhh/upcoming 2023-10-25 09:42:19 +02:00
Martin Griffin
1110d0aeb9
ROM space on debug menu (#3453) 2023-10-23 17:12:17 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248) 
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
 2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup (#3435) 
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
 2023-10-23 11:39:22 +01:00
kittenchilly
d495e177b9
Add Snow weather animation (#3440) 
* Snow weather animation

* Update battle_anim_scripts.s

* Apply changes from review
 2023-10-22 21:15:07 +02:00
Alex
bf56ea8a8b apply suggestions 2023-10-22 19:46:31 +02:00
Martin Griffin
551dc62085
Added a macro to flush the text box in battles (#3442) 2023-10-22 08:26:36 +01:00
Eduardo Quezada
a34c260169 Merge branch 'RHH/master' into RHH/upcoming 2023-10-21 23:59:33 -03:00
Alex
0a6c0261fe
Fixes Make it Rain in double battles (#3441) 2023-10-21 23:42:19 +02:00
LOuroboros
620998e68d Added a macro to flush the text box in battles 2023-10-21 17:28:43 -03:00
GriffinR
ffdc2456cb Document datahpupdate 2023-10-20 12:50:32 -04:00
GriffinR
a5c2ac5e49 Use BUGFIX in assembly files 2023-10-20 09:10:49 -04:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move (#3425) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-19 20:16:37 -03:00
Alex
f3580aa3f5 tabs 2023-10-19 21:31:04 +02:00
Alex
ceb6beb254 merge upcoming 2023-10-19 12:30:55 +02:00
Alex
354f84be21 intim changes 2023-10-18 22:14:49 +02:00
Alex
91b6722322 Octolock, more tests 2023-10-18 20:25:34 +02:00
Eduardo Quezada
6e1d4b4409 Fixed compile on modern + tests 2023-10-15 08:32:25 -03:00
Eduardo Quezada
c0540a3559 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-10-15 00:30:00 -03:00
Eduardo Quezada
4f0802f96e Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2 
# Conflicts:
#	src/debug.c
 2023-10-14 22:14:39 -03:00
Eduardo Quezada
3409869f9c Merge branch 'RHH/master' into RHH/upcoming 2023-10-13 17:44:43 -03:00
Bassoonian
231ebea3f0
Tests for 6 more abilities (#3399) 
* Tests for 6 more abilities

* Fix most of Egg's comments

* Update Purifying Salt and Leaf Guard

* Parenthesis fixes
 2023-10-13 20:50:48 +02:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Alex
6ed8ab771b Fix Syrup Bomb and change Octolock 2023-10-13 14:08:44 +02:00
Eduardo Quezada
186884120c Merge branch 'RHH/master' into RHH/upcoming 2023-10-11 13:02:12 -03:00
Eduardo Quezada D'Ottone
eedc61709d
Various tests + Poison Heal fix + Transistor update (#3385) 2023-10-11 11:34:20 -03:00
Alex
0b9126ff53
Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel (#3402) 
* initial commit

* done

* clean up
 2023-10-11 11:09:50 +02:00
ghoulslash
70fbf9e9df
Opportunist Ability (#2994) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-10-09 22:35:00 -03:00
Eduardo Quezada
2fac60055f Merge branch 'RHH/master' into RHH/upcoming 2023-10-09 22:08:32 -03:00
Alex
36174f12ae
Fixes Salt Cure visual bug if mon fainted by direct attack (#3388) 
* Fixes Salt Cure visual bug if mon fainted by direct attack

* Removes duplicate give all tm/hms in the debug menu

* test

* Revert "Removes duplicate give all tm/hms in the debug menu"

This reverts commit 4e80451d6f.
 2023-10-09 23:40:38 +02:00
Eduardo Quezada
92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
 2023-10-09 16:51:41 -03:00
kittenchilly
b5f7a51351
Add Teal Mask item, move, and ability data (#3349) 2023-10-08 15:56:09 -03:00
Eduardo Quezada
a34e0f6f6f Debug menu cleanup 2023-10-07 23:04:36 -03:00
Bassoonian
9735c5d68e Defeatist, Gale Wings, Poison Heal, Sap Sipper tests 2023-10-05 23:12:30 +02:00
Eduardo Quezada
ca81aba3b6 Merge branch 'RHH/master' into RHH/upcoming 2023-10-02 14:11:24 -03:00
DizzyEggg
dc119b27c2 Fix Intimidate Contrary in double battles 2023-10-01 19:06:43 +02:00
DizzyEggg
f840f7eb56
Fix Red Card not getting consumed after Sticky Web activation (#3364) 2023-10-01 10:35:12 -03:00
DizzyEggg
093c653801
Fixed Berserk gene issue in double battles (#3363) 
* fix berserk gene issue + tests

* Update test/battle/hold_effect/berserk_gene.c

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

* Update test/battle/hold_effect/berserk_gene.c

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

* berserk gene review changes

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-01 10:25:04 -03:00
DizzyEggg
2fcb9bbc9b
Wild battle tests + tests for exp points (#3342) 
* Add WIld Battles to test runner + exp tests
 2023-09-27 08:35:05 +01:00
Eduardo Quezada
f3a65c0315 Merge branch 'RHH/master' into RHH/upcoming 2023-09-26 09:12:28 -03:00
DizzyEggg
e0e49a9933
Fix protect recoil issue and add tests for protect (#3321) 
* fix protect recoil issue and add tests for protect

* test for #3312 and baneful bunker fix

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* more recoil moves for protect test

* Update test/battle/move_effect/protect.c

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

* rename spiky shield test

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-26 07:26:23 -03:00
ghoulslash
a2640838c9
Fix Seed Sower changing move targets when triggered in double battles (#3341) 
Fix Seed Sower changing move targets when triggered in double battles
 2023-09-24 21:33:29 -04:00
Eduardo Quezada
566ec93492 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	include/constants/battle_script_commands.h
#	include/constants/battle_string_ids.h
#	src/battle_script_commands.c
#	src/data/battle_moves.h
 2023-09-24 20:32:45 -03:00
DizzyEggg
1f1308f2f5 merge ghoul fix and correct test 2023-09-24 14:42:27 +02:00
LOuroboros
35e76e9868
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247) 
Co-authored-by: Alex <alexthenotes@gmail.com>
 2023-09-24 00:01:18 -03:00
DizzyEggg
662dd7d2c6
Fix give daycare egg option giving buggy eggs (#3335) 2023-09-22 12:20:00 -03:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure (#3297) 2023-09-15 11:18:47 -03:00
Alex
80ec67482e
Bitter Blade and Double Shock animations (#3310) 2023-09-14 15:31:18 -03:00
Eduardo Quezada
f3217c18dc Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_util.c
 2023-09-14 09:12:12 -03:00
DizzyEggg
7936910f90
Bug Bite - Tests and small fix (#3282) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-14 08:57:30 -03:00
Eduardo Quezada
c9b2a8ae24 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_ai_util.c
 2023-09-14 08:34:47 -03:00
Alex
ca9e784102
Fixes Toxic Debris + CanTargetFaintAi index issue (#3306) 
* Fixes Toxic Debris + CanTargetFaintAi index issue

* swap macro
 2023-09-13 10:31:20 +02:00
Eduardo Quezada
755e260da4 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	include/constants/battle_move_effects.h
#	test/battle/move_effect/multi_hit.c
 2023-09-10 18:38:46 -03:00
Alex
18577ce598
Fix Scale Shot bug and use Canceller Multihit Moves (#3290) 2023-09-10 11:57:19 -03:00
Eduardo Quezada
820113d883 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle_scripts.h
#	include/battle_util.h
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-09-07 15:13:06 -03:00
Alex
c99b34fd89
Fix Magnet Rise animation (#3280) 2023-09-05 08:08:51 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests (#3191) 
* begin fling tests

* fling fixes and tests

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* scripts names change

* fix fling's test file

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-05 06:56:36 -03:00
DizzyEggg
7c2ad314d4 merge with upcoming 2023-09-04 09:40:48 +02:00
Ariel A
bf80e5cf4f Merge branch 'followers' into followers-expanded-id 
# TODOs changed:
# -: Define action flags:
 2023-09-03 17:42:31 -04:00
Ariel A
8df538479a Merge branch 'master' into followers 2023-09-03 17:39:35 -04:00
Eduardo Quezada
35d7201935 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	include/battle_scripts.h
 2023-08-31 20:46:53 -04:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) (#3268) 2023-08-31 14:52:18 -04:00
Eduardo Quezada
0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
 2023-08-31 14:28:01 -04:00
LOuroboros
d78d63e537
Fixed redundant calls in Teleport's battle script (#3212) 
The battle script was originally making an extra call to attackcanceler and attackstring pointlessly whenever there was a jump to BattleScript_EffectBatonPass.
This commit addresses that by relocating BattleScript_EffectTeleport's own calls to attackcanceler and attackstring.
 2023-08-31 09:07:06 +02:00
DizzyEggg
493c330cbd merge with upcoming 2023-08-30 13:23:55 +02:00
DizzyEggg
c29f8259f6 remove gActiveBattler entirely 2023-08-30 12:46:22 +02:00
kittenchilly
c427d96f3f Better Ultra Burst animation 2023-08-29 19:13:21 -05:00
kittenchilly
f95b4fdb4c Merge branch 'upcoming' into ultraburst 2023-08-17 13:25:00 -05:00
Eduardo Quezada
a6dbb68bac Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	src/battle_util.c
#	src/battle_z_move.c
 2023-08-17 13:42:09 -04:00
LOuroboros
2d45b9b8fe
Corrected conditionals used for B_SPEED_BUFFING_RAPID_SPIN and I_GEM_BOOST_POWER (#3232) 2023-08-14 16:14:12 -04:00
sbird
6a622eb006 Merge remote-tracking branch 'pret/master' into feature/dynmulti 2023-08-14 13:20:03 +02:00
GriffinR
c5fb5fbb5f
Merge pull request #1906 from AsparagusEduardo/pret/pr2/butItFailed 
Renamed "ButItFailed" script names
 2023-08-12 23:00:57 -04:00
kittenchilly
5e8caa8d45 Merge branch 'upcoming' into ultraburst 2023-08-12 12:36:11 -05:00
Eduardo Quezada
952bacd858 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
#	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
#	.github/ISSUE_TEMPLATE/04_other_errors.yaml
 2023-08-11 17:50:28 -04:00
Eduardo Quezada D'Ottone
1ba70a46f2
Fixed Jump Kick's recoil not happening after Spiky Shield's damage (#3208) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-08-11 17:26:43 -04:00
Eduardo Quezada
33b16cb82d 2nd pass 2023-08-11 16:55:27 -04:00
GriffinR
b248791f47
Merge pull request #1904 from GriffinRichards/temp-alias 
Add temp flag and var aliases
 2023-08-11 15:45:00 -04:00
kittenchilly
c3e31af5f3 Ultra burst trigger 2023-08-09 22:12:26 -05:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
Eduardo Quezada
8a3eaadf7b Renamed "ButItFailed" script name to align with names below it 2023-08-08 08:58:57 -04:00
Alex
42992ca5ce
Fix Teleport ending trainer battles (#3166) 2023-08-07 11:23:12 -04:00
Alex
8ee3a3c5bb solve conflics 2023-08-07 14:25:30 +02:00
GriffinR
866c32a735 Add temp var aliases 2023-08-04 14:17:28 -04:00
ghoulslash
4ae6ae4de3
Reset all battler IDs at battle start (#3111) 
* reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids

* replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-08-04 08:57:06 +02:00
GriffinR
6d4dadd7b5 Add temp flag aliases 2023-08-03 15:55:06 -04:00
Martin Griffin
17555feb20
Animation script cleanup and fixes - Part 2 (#3193) 2023-08-02 12:28:29 +01:00
Eduardo Quezada
f94efa94e1 Merge branch 'RHH/master' into RHH/upcoming 2023-08-02 01:18:07 -04:00
ghoulslash
7a814999e5 MOVE_CORROSIVE_GAS Effect (#3152) 
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
 2023-08-02 01:05:54 -04:00
Eduardo Quezada
87050d8c08 Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets (#3143) 2023-08-01 23:54:04 -04:00
Philipp AUER
44eb6260cc
[battle, anim] woodhammer animation overhaul (#3192) 
* [battle, anim] woodhammer animation overhaul

* squashme: timings

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-01 19:10:18 -04:00
Eduardo Quezada
e21346dd67 Fixed Rage Powder's animation not turning the user red 2023-08-01 19:05:39 -04:00
Eduardo Quezada
d0277fc04f Cleaned: createvisualtask AnimTask_BlendColorCycle 2023-08-01 19:05:18 -04:00
Eduardo Quezada
2cf7f54a6b Cleaned: 3 more createvisualtask 
- AnimTask_CanBattlerSwitch
- AnimTask_BlendMonInAndOut
- AnimTask_CentredFrozenIceCube
 2023-08-01 19:05:11 -04:00
Eduardo Quezada
ac519bd5d3 Cleaned: createvisualtask AnimTask_FlailMovement & AnimTask_ElectricChargingParticles 2023-08-01 19:05:04 -04:00
Eduardo Quezada
eef07a9f9f Cleaned: createvisualtask AnimTask_HorizontalShake 2023-08-01 19:04:56 -04:00
Eduardo Quezada
5fc5e5703c Cleaned: createvisualtask AnimTask_RockMonBackAndForth & AnimTask_PositionFissureBgOnBattler 2023-08-01 19:04:47 -04:00
Eduardo Quezada
323b771630 Cleaned: createvisualtask AnimTask_ScaleMonAndRestore & AnimTask_RotateMonSpriteToSide 2023-08-01 19:03:52 -04:00
Eduardo Quezada
b4ad3be0cb Cleaned: createvisualtask AnimTask_ShakeMon 2023-08-01 19:02:59 -04:00
Eduardo Quezada
1d25dd0c93 Cleaned: createvisualtask AnimTask_ShakeMon2 2023-08-01 19:02:57 -04:00
Eduardo Quezada
d3f170ef0f Cleaned: createvisualtask AnimTask_ShakeMonInPlace 2023-08-01 19:02:14 -04:00
Eduardo Quezada D'Ottone
15c0ea253a
Animation script cleanup and fixes - Part 1 (#3185) 
* Cleaned: visible, monbg & invisible

* Cleaned: createvisualtaskontargets AnimTask_ShakeMon

* Cleaned: createvisualtask SoundTask_PlayDoubleCry

* Fixed: createvisualtask SoundTask_PlayCryWithEcho

Checksum changed from
7a05d0b5b2cd65346597a9a598c7f7cde1570475
to
35eae7f4357391b1ce38f0d79715f47f92c82087

* Cleaned: createvisualtask SoundTask_PlayCryHighPitch

* Cleaned: createvisualtask AnimTask_WindUpLunge

* Cleaned: createvisualtask AnimTask_TranslateMonEllipticalRespectSide

* Cleaned: createvisualtask AnimTask_SwayMon

* Cleaned: createvisualtask AnimTask_Splash

* Removed bad use of: createvisualtask AnimTask_Splash in Move_ROCK_CLIMB

It wasn't breaking the animation because ANIM_ATTACKER (0) was being passed for the hop count, essentially skipping the animation.

* Cleaned: createvisualtask AnimTask_ShockWaveProgressingBolt & AnimTask_ShakeMonInPlace

* Fixed Move_PLASMA_FISTS's use of AnimTask_ShockWaveProgressingBolt
 2023-07-31 23:17:50 +02:00
DizzyEggg
5eec3b2fc3
fix various issues with primal weather blocking water/fire type moves (#3138) 
* fix various issues with primal weather blocking water/fire type moves

* forgot to change return to effect=1

* fix bugs
 2023-07-30 10:50:51 -04:00
Alex
bca29d8586 Adds Mortal Spin and Population Bomb 2023-07-26 17:37:56 +02:00
LOuroboros
cd5f997ee3
Added a debug feature to hatch eggs (#3155) 2023-07-21 12:06:05 +02:00
Eduardo Quezada
47cea526ec Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_util.c
 2023-07-19 23:22:07 -04:00
Alex
6b5d1e7577
Adds some gen9 moves (#3147) 
* Adds some gen9 moves

* Fix Test + Tabs

* Collision Course boost changed to 1.3333
 2023-07-19 13:25:20 +02:00
Eduardo Quezada D'Ottone
6fec0e4dd1
Ported TheXaman's latest changes to the Debug Menu (#2815) 
* Added option for generating incrementing pokemon in pc boxes

# Conflicts:
#	src/debug.c

* added submenu arrows, increased menu high to full screen

# Conflicts:
#	src/debug.c

* combined flags and vars into one submenu

# Conflicts:
#	src/debug.c

* added new window to flags/vars showing the current state and added submenu indicator

# Conflicts:
#	src/debug.c

* added alligned arrows for debug submenus

# Conflicts:
#	src/debug.c

* used {CLEAR_TO X} instead of manual spaces

# Conflicts:
#	src/debug.c

* renamed gDebugText to proper sDebugText

# Conflicts:
#	src/debug.c

* added Fill submenu, added fill function for PC items and all bag pockets  @LOuroboros

# Conflicts:
#	src/debug.c

* put cheat start into utility

# Conflicts:
#	src/debug.c

* put fill submenu into main menu

# Conflicts:
#	src/debug.c

* tiny fix

* renaming and reordering

# Conflicts:
#	src/debug.c

* Added reset pokedex flags for @AsparagusEduardo

* made flag toggle list dynamic

# Conflicts:
#	src/debug.c

* initial battle debug menu WIP

# Conflicts:
#	src/debug.c
#	src/wild_encounter.c

* fix visual bug

* added battle start

# Conflicts:
#	include/debug.h
#	src/battle_ai_script_commands.c

* Added faster way to add initial movesets to mon

* Added waiting music for the slow box filling

* Simplified the call to scripts

* Simplified debug scripts

* Disabled Battle Test for now

* Fixed personality on fast PC fill being always 0

* Removed BATTLE_ENGINE instances + added AI_FLAG_COUNT

* Added missing return TRUE

* Sets nickname

* Changed how GetSpeciesName to how it's used upstream

---------

Co-authored-by: TheXaman <48356183+TheXaman@users.noreply.github.com>
 2023-07-18 09:17:03 +02:00
DizzyEggg
c0f10623d6 Merge branch 'be/staminafix' of https://github.com/ghoulslash/pokeemerald into stamina_fix 2023-07-17 15:35:40 +02:00
DizzyEggg
1f1d24b3e4
Fix Primal Reversion not activating when switching in after fainting (#3141) 
* Fixed Primal Reversion not activating when switching in after a fainting
* add tests for primal reversion

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2023-07-16 12:26:54 +01:00
Martin Griffin
17f8f50a59 Merge remote-tracking branch 'rhh/master' into upcoming 2023-07-16 07:46:34 +01:00
DizzyEggg
381aa58587
Fix Bad Dreams ability pop-up + tests (#3131) 
* Fix all bad dreams issues and add tests

Co-authored-by: ShaeTsuPog <shaetsu@protonmail.com>
 2023-07-16 06:38:00 +01:00
Eduardo Quezada
4405f79d24 Merge branch 'RHH/master' into RHH/upcoming 2023-07-06 13:15:06 -04:00
Eduardo Quezada
1980a115b4 Integrated GAME_STAT_ENTERED_BATTLE_TOWER bugfix from upstream 2023-07-06 13:07:03 -04:00
Eduardo Quezada
f21953f254 Merge remote-tracking branch 'pret/master' into RHH/master 2023-07-06 13:06:31 -04:00
Eduardo Quezada D'Ottone
1fa9a05470
Convert move flags and bans into GCC bitfields (#2952) 
* Slicing moves to new bitfield

* Wind moves to new bitfield

* Two-strike moves to new bitfield

* Forgot to add flagTwoStrikes to battle_moves.h

* Removed "flag" from field names

* FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER

* Airborne moves

* FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE

* FLAG_BALLISTIC and FLAG_PROTECTION_MOVE

* Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c

* FLAG_SOUND

* FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER

* FLAG_DMG_MINIMIZE

* Cleanup

* FLAG_STAT_STAGES_IGNORED

* Updated Pollen Puff's ballistic flag

* FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST

* thaw

* FLAG_THREE_STRIKES

* FLAG_IRON_FIST_BOOST

* FLAG_RECKLESS_BOOST

* FLAG_HIGH_CRIT

* Removed empty flags

* Moves that fail when called by Me First + added missing Shell Trap

* Moves that fail when Gravity is active

* Better names for banned fields

* Moves that fail when called by Instruct

* Cleanup

* Contact Moves + Fixed Wandering Spirit skipping contact checks

* Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect.

* Simplified B_MOVE_FLAGS configs

* FORBIDDEN_METRONOME

* Renamed hitsPastSubstitute to ignoresSubstitute

* FORBIDDEN_PARENTAL_BOND

* Struggle uncallable by Metronome

* FORBIDDEN_MIMIC

* FLAG_KINGS_ROCK_AFFECTED

* Made a single config for move flags

* Macro for checking move flags

* FLAG_MAGIC_COAT_AFFECTED

* Fixed HasMagicCoatAffectedMove

* FLAG_SNATCH_AFFECTED

* Removed unused EFFECT_FLINCH_MINIMIZE_HIT

* Fixed Stench/King's Rock interaction

* Removed sMovesNotAffectedByStench in favor of checking move effects

* Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT

* Changed Gen2 configs to less than Gen 3

* FORBIDDEN_SLEEP_TALK

* Cleanup

* Inverted FLAG_MIRROR_MOVE_AFFECTED

* FLAG_SHEER_FORCE_BOOST

* Ordered

* FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT

* Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field

* Fixed Triple Arrows test
 2023-07-03 10:01:59 +02:00
hetoord
40a5995ead
Teatime tests and fixes (#3096) 2023-07-03 09:54:43 +02:00
Eduardo Quezada
2c4a9b754d Merge branch 'RHH/master' into RHH/upcoming 2023-06-30 16:14:57 -04:00
ghoulslash
304fc4c5b5
Fix disobedience wrong move effect issue (#3089) 2023-06-30 09:03:18 -04:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff (#3063) 
* Removed gCastformFrontSpriteCoords

* Removed sCastformElevations and IsCastformForm

* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct

* Scrubbed unused BS commands

* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants

* Removed redundant function in Pokémon Debug menu

* Removed handling in animation scripts

* Removed gBattleMonForms

* Reduced MAX_MON_PIC_FRAMES to 2

* Removed Castform/Cherrim makefile stuff

* Fixed weather form change tests not checking species.

* Fixed Castform palettes after Lunos' PR
 2023-06-30 09:58:07 +02:00
Alex
ea7e6265dd
Small Grassy Glide anim bug (#3092) 2023-06-29 14:07:46 -04:00
Alex
20099274d8
Fix Clear Amulet visual bug + Tests (#3074) 
* Fix Clear Amulet visual bug + Tests

TODO Tests, additional tests + Triple Kick pp bug

* Wonder Guard message, switch instead of if, misalignments
 2023-06-28 12:26:03 -04:00
DizzyEggg
f9058a8544 Fix disobedience wrong move effect issue 2023-06-28 12:47:20 +02:00
PSF
b2901c51b0 Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat 2023-06-27 15:34:31 -07:00
ghoulslash
7371a9e401
Add many gen 8 move animations (#2861) 
* port many gen8 and 9 move anims from cfru

* fix thunder cage, shell smash, shelter anims. update anim credits

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-06-21 13:19:54 -04:00
LOuroboros
2bf88502a7 More corrections 2023-06-19 04:18:53 -03:00
Eduardo Quezada
bf814e11cd Cleanup 
- Proper whitespace
- Bracket pret style
- Simplified RemoveObjectEventInternal
- SImplified GetMonInfo
- Made IsFollowerVisible easier to read
 2023-06-18 01:19:46 -04:00
Eduardo Quezada
4bbe3278d6 Cleanup pt1 
- Moved Tracks to the end of field effect scripts
- Restored whitespace in scripts to minimize conflicts
- Restored data/maps/map_groups.json
- Proper tab uses in scripts
- Allow SHADOW_SIZE_XL to be used
 2023-06-17 23:34:01 -04:00
Eduardo Quezada
33012d841a Cleaning up follower Object Event IDs + Reverted OW Regis 
TODO: allow OW mon to have their frames play more than once
 2023-06-17 23:05:29 -04:00
Eduardo Quezada
116f61f055 Removed unneeded calls to bufferspeciesname 2023-06-17 19:27:33 -04:00
Eduardo Quezada
341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 
# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	gflib/sprite.c
#	graphics/pokemon/banette/anim_front.png
#	graphics/pokemon/banette/normal.pal
#	graphics/pokemon/sentret/normal.pal
#	graphics/pokemon/togetic/anim_front.png
#	graphics/pokemon/togetic/normal.pal
#	include/battle_script_commands.h
#	include/data.h
#	ld_script.txt
#	src/battle_controller_player.c
#	src/bike.c
#	src/event_object_movement.c
 2023-06-16 21:25:16 -04:00
LOuroboros
9896f20eb8 Applied fixes and corrections (Jun 2023) 2023-06-15 09:22:26 -03:00
LOuroboros
81bb299e7f Updated Axe Kick's battle script 
I have no idea why is this working now when I'm pretty sure it didn't work before, but I consider this a win all the same.
 2023-06-13 06:50:48 -03:00
LOuroboros
313f522622 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2 2023-06-13 05:44:37 -03:00
AgustinGDLV
f91cbe9a36 updated anim macros 2023-05-29 10:23:58 -07:00