* 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>
* 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>
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
