pokeemerald/include
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
..
config Renamed VAR_TERRAIN to B_VAR_TERRAIN and added a var-based field terrain timer (#4132) 2024-02-04 13:04:55 +01:00
constants Secondary effects overhaul minor follow-up (#4062) 2024-02-04 23:02:59 +01:00
gba Merge branch '_RHH/master' into _RHH/upcoming 2024-01-09 09:19:12 -03:00
test Move data unification (#3999) 2024-01-29 08:51:32 -03:00
agb_flash.h
AgbRfu_LinkManager.h
apprentice.h Renaming Script Contexts 2022-08-15 15:18:12 -04:00
bard_music.h Review changes 2022-10-27 11:26:09 -03:00
battle_ai_main.h Adds move score defines + minor score clean up (#4075) 2024-01-29 12:28:16 +01:00
battle_ai_switch_items.h add emitResult argument to ShouldSwitch AI functions (#3784) 2023-12-21 11:40:04 +01:00
battle_ai_util.h Secondary effects overhaul minor follow-up (#4062) 2024-02-04 23:02:59 +01:00
battle_anim.h A few new gen 9 move animations (#3989) 2024-01-16 19:33:49 -07:00
battle_arena.h Add some missing battle arena constants 2022-08-11 12:02:56 -04:00
battle_bg.h Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
battle_controllers.h Adds Raging Bull and various fixes (#3552) 2023-11-19 17:45:58 +01:00
battle_debug.h
battle_dome.h health bar update 2023-08-07 10:29:02 +02:00
battle_dynamax.h Move data unification (#3999) 2024-01-29 08:51:32 -03:00
battle_factory_screen.h
battle_factory.h Add bugfix for Battle Factory trainer IVs 2022-03-30 09:37:03 -04:00
battle_gfx_sfx_util.h remove almost all usage of active battler 2023-08-30 11:21:10 +02:00
battle_interface.h Ally Switch (#3533) 2023-12-20 15:26:28 +01:00
battle_main.h Refactor trainer classes (#3875) 2024-01-04 13:30:42 +01:00
battle_message.h Dynamax messages (#3581) 2023-11-21 19:18:18 +01:00
battle_pike.h
battle_pyramid_bag.h
battle_pyramid.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
battle_records.h
battle_script_commands.h Renamed seteffectwithchance to setadditionaleffects 2023-12-30 20:29:09 +09:00
battle_scripts.h Secondary effects overhaul minor follow-up (#4062) 2024-02-04 23:02:59 +01:00
battle_setup.h Port pokefirered's Vs. Seeker to pokeemerald (#3256) 2023-11-26 18:58:43 +01:00
battle_tent.h
battle_tower.h
battle_transition_frontier.h
battle_transition.h Refactor mugshots (#4000) 2024-01-16 00:45:13 +01:00
battle_tv.h
battle_util.h Secondary effects overhaul minor follow-up (#4062) 2024-02-04 23:02:59 +01:00
battle_util2.h
battle_z_move.h Move data unification (#3999) 2024-01-29 08:51:32 -03:00
battle.h Secondary effects overhaul minor follow-up (#4062) 2024-02-04 23:02:59 +01:00
berry_blender.h
berry_crush.h
berry_fix_program.h
berry_powder.h
berry_tag_screen.h
berry.h Remove unused function 2024-01-04 16:04:00 +00:00
bike.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
birch_pc.h Refactor dex completion (again) (#3937) 2024-01-11 13:35:31 -03:00
braille_puzzles.h
cable_club.h
clear_save_data_menu.h
clock.h Fixed Cheat Start not initiating time-based events (#3446) 2023-10-22 21:03:54 +02:00
coins.h
confetti_util.h
config.h Fix leftover (#4074) 2024-01-26 18:58:07 +01:00
contest_ai.h
contest_effect.h Move data unification (#3999) 2024-01-29 08:51:32 -03:00
contest_link.h
contest_painting.h
contest_util.h
contest.h Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears 2023-12-30 20:49:05 +01:00
coord_event_weather.h
credits.h Remove ewram in headers 2023-08-10 20:11:07 -04:00
crt0.h Allocate initialized sections for EWRAM and IWRAM (#3892) 2024-01-02 14:24:52 +00:00
data.h Move data unification (#3999) 2024-01-29 08:51:32 -03:00
daycare.h HGSS Style Pokedex (#3288) 2023-10-02 17:28:37 -03:00
debug.h Added support for XY's Sky Battles (#2950) 2023-11-26 16:59:44 +01:00
decompress.h Species Simplifier™ - Part 3 (#3562) 2023-12-08 15:05:10 +01:00
decoration_inventory.h
decoration.h Remove ewram in headers 2023-08-10 20:11:07 -04:00
dewford_trend.h
digit_obj_util.h Document some generic argument names 2022-05-31 14:34:25 -04:00
diploma.h
dodrio_berry_picking.h
dynamic_placeholder_text_util.h
easy_chat.h Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413 2023-04-13 17:05:48 -04:00
egg_hatch.h
ereader_helpers.h Clean up some trainer hill 2022-03-31 12:54:07 -04:00
ereader_screen.h
event_data.h Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2021-11-18 15:13:04 +01:00
event_object_lock.h
event_object_movement.h Remove redundant table 2024-01-04 16:07:12 +00:00
event_scripts.h Implement Pokemon Box Link functionality (#3837) 2023-12-28 11:47:00 +01:00
evolution_graphics.h Document some generic argument names 2022-05-31 14:34:25 -04:00
evolution_scene.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
expansion_intro.h [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00
faraway_island.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
field_camera.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
field_control_avatar.h Treat map data as const 2023-03-08 12:00:30 -05:00
field_door.h
field_effect_helpers.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
field_effect.h Added missing labels in headers 2022-09-12 21:14:15 -03:00
field_message_box.h
field_player_avatar.h Added missing labels in headers 2022-09-12 21:14:15 -03:00
field_poison.h
field_screen_effect.h Finish updating macro comments 2021-11-18 01:47:58 -05:00
field_special_scene.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
field_specials.h Merge branch 'feature/dynmulti' into feature/dynmulti-expansion 2023-12-26 14:22:49 +01:00
field_tasks.h
field_weather.h Fix Wall Werrors on modern (#3412) 2023-10-13 18:39:35 +02:00
fieldmap.h Move battle tests off the heap (#3414) 2023-10-13 16:31:10 -03:00
fldeff_misc.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
fldeff.h Implemented Honey's Sweet Scent functionality 2022-10-16 20:20:13 -03:00
fonts.h
fpmath.h Refactor damage formula to match Gen5+ (#3196) 2023-08-11 16:28:38 -04:00
frontier_pass.h
frontier_util.h
global.berry.h Remove leftover code for myself 2024-01-04 16:12:39 +00:00
global.fieldmap.h Port pokefirered's Vs. Seeker to pokeemerald (#3256) 2023-11-26 18:58:43 +01:00
global.h Secondary effects overhaul minor follow-up (#4062) 2024-02-04 23:02:59 +01:00
global.tv.h Fix Bravo Trainer Tower member names 2023-08-08 14:38:00 -04:00
graphics.h PLA Items (#3825) 2024-01-23 18:24:58 +01:00
gym_leader_rematch.h
hall_of_fame.h
heal_location.h
image_processing_effects.h
international_string_util.h Species Simplifier™ - Part 3 (#3562) 2023-12-08 15:05:10 +01:00
intro_credits_graphics.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
intro.h [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00
item_ball.h Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
item_icon.h
item_menu_icons.h
item_menu.h Add Mulch effects 2023-12-03 13:17:34 +01:00
item_use.h Merge branch 'upcoming' into berryexpansion 2023-12-29 14:32:10 +01:00
item.h Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068) 2024-01-26 15:25:52 -03:00
landmark.h
level_caps.h New Feature: Level Caps (#3632) 2024-01-09 18:47:23 +01:00
libgcnmultiboot.h
librfu.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
lilycove_lady.h
link_rfu.h Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 2023-02-15 14:11:03 -03:00
link.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
list_menu.h [script-command, dynmultichoice] add shouldSort, initialSelected arguments. read pushed arguments front to back 2023-01-17 21:49:06 +01:00
load_save.h [doc] fix misnamed dma <--> aslr 2022-09-07 14:37:03 +02:00
lottery_corner.h
m4a.h
mail.h Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
main_menu.h removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation 2022-09-02 12:10:11 +02:00
main.h Test moves, items, and abilities in battle 2023-02-01 13:53:57 +00:00
map_name_popup.h
match_call.h
math_util.h
mauville_old_man.h Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
menu_helpers.h Document some generic argument names 2022-05-31 14:34:25 -04:00
menu_specialized.h Use window constants for move relearner 2022-09-29 12:10:10 -04:00
menu.h Added missing labels in headers 2022-09-12 21:14:15 -03:00
metaprogram.h Metaprogram (#3968) 2024-02-04 16:28:27 -03:00
metatile_behavior.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mini_printf.h [debug] add support for mgba printf 2022-09-06 13:40:31 +02:00
minigame_countdown.h
mirage_tower.h
mon_markings.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
money.h Changed 999999 in MaxMoney to MAX_MONEY constant (#3015) 2023-05-20 08:25:59 -04:00
move_relearner.h
multiboot_pokemon_colosseum.h
multiboot.h
mystery_event_menu.h
mystery_event_msg.h
mystery_event_script.h Finish updating macro comments 2021-11-18 01:47:58 -05:00
mystery_gift_client.h
mystery_gift_link.h
mystery_gift_menu.h Use window constants in mystery_gift_menu 2022-09-29 15:48:19 -04:00
mystery_gift_server.h
mystery_gift_view.h
mystery_gift.h
naming_screen.h
new_game.h
option_menu.h
overworld.h Fixed outstanding UB with -fanalyzer on modern 2023-07-21 15:51:03 -04:00
palette_util.h
palette.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
party_menu.h Moved Item Effects to gItems (#3991) 2024-01-14 10:03:48 +01:00
pc_screen_effect.h
play_time.h
player_pc.h
pokeball.h start removing gActiveBattler in controller emitters 2023-08-29 15:21:31 +02:00
pokeblock.h Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
pokedex_area_region_map.h
pokedex_area_screen.h Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
pokedex_cry_screen.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
pokedex_plus_hgss.h [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
pokedex.h Removed footprint field when P_FOOTPRINTS is FALSE (#3925) 2024-01-04 21:54:03 +01:00
pokemon_animation.h
pokemon_debug.h added option to view changes for front/back sprite picCoords and elevation live 2021-12-13 22:31:37 +01:00
pokemon_icon.h Species Simplifier™ - Part 3 (#3562) 2023-12-08 15:05:10 +01:00
pokemon_jump.h
pokemon_size_record.h
pokemon_storage_system.h Add support for legendary fusion (#3274) 2023-11-23 22:59:51 +01:00
pokemon_summary_screen.h Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears 2023-12-30 20:49:05 +01:00
pokemon.h Adds missing evolution methods (#4087) 2024-02-01 18:35:38 -03:00
pokenav.h Add PokéNav too 2023-12-12 23:20:22 +01:00
random.h Seed the RNG with the time in seconds in HQ mode (#3812) 2024-01-19 10:27:42 +00:00
rayquaza_scene.h
record_mixing.h
recorded_battle.h Optional high-quality RNG (#3780) 2023-12-22 17:39:15 +00:00
region_map.h Use window constants in region_map 2022-09-29 13:11:38 -04:00
reload_save.h
reset_rtc_screen.h added the ability to directly open evolutions from the EVO page 2022-01-03 16:48:50 +01:00
reshow_battle_screen.h Ally Switch (#3533) 2023-12-20 15:26:28 +01:00
roamer.h
rotating_gate.h
rotating_tile_puzzle.h
roulette.h
rtc.h Add config for times of day (#3579) 2023-11-24 15:57:08 +01:00
safari_zone.h
save_location.h
save.h Sector security -> signature 2022-08-05 10:42:31 -04:00
scanline_effect.h Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
script_menu.h Merge branch 'feature/dynmulti' into feature/dynmulti-expansion 2023-12-26 14:22:49 +01:00
script_movement.h
script_pokemon_util.h
script.h [script-command] add dynmultichoice 2023-01-17 21:49:06 +01:00
secret_base.h Renaming Script Contexts 2022-08-15 15:18:12 -04:00
shop.h Remove ewram in headers 2023-08-10 20:11:07 -04:00
siirtc.h Renamed time amounts 2023-09-20 19:04:50 -03:00
slot_machine.h
sound.h Review changes 2022-07-29 15:38:23 -04:00
start_menu.h Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
starter_choose.h Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
strings.h Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2024-01-05 00:32:21 +01:00
task.h
test_runner.h Tests do not allow to use SEND_OUT if the chosen mon is fainted (#3752) 2023-12-23 00:27:40 +01:00
text_window.h
tileset_anims.h Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
tilesets.h Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
time_events.h
title_screen.h
trade.h Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
trader.h
trainer_card.h Fix names and constant usage for union room classes 2022-08-23 12:44:07 -04:00
trainer_hill.h Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00
trainer_pokemon_sprites.h Backwards-compatible BoxPokémon Refactor (#3438) 2023-12-27 17:48:17 +01:00
trainer_see.h Port pokefirered's Vs. Seeker to pokeemerald (#3256) 2023-11-26 18:58:43 +01:00
trig.h
tv.h Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
union_room_battle.h
union_room_chat.h Easy Chat always shows words in uppercase 2023-06-06 10:55:42 -04:00
union_room_player_avatar.h
union_room.h Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
util.h fix -Warray-parameter, -Waddress, -Warray-bounds warnings 2023-10-16 09:36:36 +01:00
vs_seeker.h Port pokefirered's Vs. Seeker to pokeemerald (#3256) 2023-11-26 18:58:43 +01:00
walda_phrase.h
wallclock.h
wild_encounter.h Fixes Synchronize's OW effect and adds configs (#3480) 2023-10-28 23:24:20 -03:00
wonder_news.h Document wonder news 2022-11-22 02:17:03 -05:00