* Renamed VAR_TERRAIN and introduced a var-based field terrains timer
* Fixed sky battle configs alignment and syntax
* Added B_VAR_TERRAIN_TIMER handling to Overworld_ResetBattleFlagsAndVars
* Removed pointless edits to EndTurnTerrain
* Updated B_VAR_TERRAIN_TIMER's comment
* Updated the syntax of ABILITYEFFECT_SWITCH_IN_TERRAIN to comply with Agbcc
* Nuked pointless VarGet calls in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects
* Reverted changes made to BS_SetRemoveTerrain
I shouldn't have touched it at all since it's not involved with B_VAR_TERRAIN functionality.
* Removed trailing spaces in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects
* rebase to upcoming
* merge rhh/upcoming and remove known failing
* remove known failing
---------
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
* 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>
* 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>
