mirror of
https://github.com/pret/pokeemerald.git
synced 2026-04-22 23:57:09 -05:00
493478e94b
* 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
|
||
|---|---|---|
| .. | ||
| abnormal_weather.inc | ||
| apprentice.inc | ||
| battle_pike.inc | ||
| berry_blender.inc | ||
| berry_tree.inc | ||
| cable_club.inc | ||
| cave_hole.inc | ||
| cave_of_origin.inc | ||
| check_furniture.inc | ||
| contest_hall.inc | ||
| day_care.inc | ||
| debug.inc | ||
| elite_four.inc | ||
| field_move_scripts.inc | ||
| field_poison.inc | ||
| flash.inc | ||
| gabby_and_ty.inc | ||
| gift_altering_cave.inc | ||
| gift_aurora_ticket.inc | ||
| gift_battle_card.inc | ||
| gift_mystic_ticket.inc | ||
| gift_old_sea_map.inc | ||
| gift_pichu.inc | ||
| gift_stamp_card.inc | ||
| gift_trainer.inc | ||
| hall_of_fame.inc | ||
| interview.inc | ||
| item_ball_scripts.inc | ||
| kecleon.inc | ||
| lilycove_lady.inc | ||
| mauville_man.inc | ||
| move_tutors.inc | ||
| movement.inc | ||
| new_game.inc | ||
| obtain_item.inc | ||
| pc_transfer.inc | ||
| pc.inc | ||
| pkmn_center_nurse.inc | ||
| players_house.inc | ||
| prof_birch.inc | ||
| profile_man.inc | ||
| questionnaire.inc | ||
| record_mix.inc | ||
| repel.inc | ||
| rival_graphics.inc | ||
| roulette.inc | ||
| safari_zone.inc | ||
| secret_base.inc | ||
| secret_power_tm.inc | ||
| set_gym_trainers.inc | ||
| shared_secret_base.inc | ||
| std_msgbox.inc | ||
| surf.inc | ||
| test_signpost.inc | ||
| trainer_battle.inc | ||
| trainer_hill.inc | ||
| trainer_script.inc | ||
| tv.inc | ||