sovereignx/data
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
..
layouts
maps Merge branch '_RHH/master' into _RHH/upcoming 2024-01-28 18:11:44 -03:00
scripts Merge branch '_RHH/master' into _RHH/upcoming 2024-01-28 18:11:44 -03:00
text Clean up contest strings (#3876) 2024-02-02 10:55:39 +01:00
tilesets Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
battle_anim_scripts.s Adds Dragon Cheer (#4122) 2024-02-03 08:00:41 -07:00
battle_scripts_1.s Secondary effects overhaul minor follow-up (#4062) 2024-02-04 23:02:59 +01:00
battle_scripts_2.s Adds Dragon Cheer (#4122) 2024-02-03 08:00:41 -07:00
contest_ai_scripts.s Incorporated upstream fixes 2023-10-27 11:04:10 -03:00
event_scripts.s Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
field_effect_scripts.s Port pokefirered's Vs. Seeker to pokeemerald (#3256) 2023-11-26 18:58:43 +01:00
map_events.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
maps.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_berry_fix.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_colosseum.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_ereader.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_berry_glitch_fix.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_ereader.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_pokemon_colosseum.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mystery_event_script_cmd_table.s
mystery_gift.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
script_cmd_table.inc Merge remote-tracking branch 'pret/master' into feature/dynmulti 2023-04-24 18:30:30 +02:00
sound_data.s Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
specials.inc Add missing check to prevents water grinding 2023-12-08 01:05:54 +01:00