Code

Added support for XY's Sky Battles#2950

Code

Merged

Bassoonian merged 49 commits intorh-hideout:upcomingrh-hideout/pokeemerald-expansion:upcomingfrom PokemonSanFran:SkyBattlePokemonSanFran/pokeemerald-expansion:SkyBattleCopy head branch name to clipboardNov 26, 2023

+222-6

Commits

Commits on Apr 24, 2023

• Original implementation from Phlayne

  pkmnsnfrn

  committed
  50754be

• Moved Sky Battle Flag / Var into a config

  pkmnsnfrn

  committed
  4deaf37

Commits on Apr 25, 2023

• Optimized existing code and fixed existing bugs

  Show description for 8cbfca8
  pkmnsnfrn

  committed
  8cbfca8

• Added compatibility for Gen7+

  pkmnsnfrn

  committed
  a10c1bd

• Commented out Volt Crash from banned moves

  pkmnsnfrn

  committed
  1c3e61b

• Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into SkyBattle

  pkmnsnfrn

  committed
  3f82f7a

• Cleaned up debug scripts from testing

  pkmnsnfrn

  committed
  35c9e94

• Fixed bug where player did not white out even if they had no healthy Pokémon and only an egg

  Show description for 146e8a0
  pkmnsnfrn

  committed
  146e8a0

• Removed extra include from src/field_specials.c

  Show description for db39306
  pkmnsnfrn

  committed
  db39306

Commits on Apr 27, 2023

• Merged in most recent changes from upcoming

  pkmnsnfrn

  committed
  7b44742

• Added FLAG_DISABLED_IN_SKY_BATTLE

  Show description for f7e8a52
  pkmnsnfrn

  committed
  f7e8a52

• Changed DoesSkyBattleCancelCurrentMove to look at move flags

  pkmnsnfrn

  committed
  8e2888c

• Fixed alignment and spacing in battle_moves.h

  pkmnsnfrn

  committed
  1da1765

• Added FLAG_DISABLED_IN_SKY_BATTLE to Sticky Web

  pkmnsnfrn

  committed
  60a6a57

• Added FLAG_DISABLED_IN_SKY_BATTLE to Steel Roller

  pkmnsnfrn

  committed
  4aa9156

• Disabled the ability to change Battle Terrain when Sky Battle is happening

  Show description for d2ada77
  pkmnsnfrn

  committed
  d2ada77

Commits on Apr 28, 2023

• Fixed bug with SKY_BATTLE_STRICT_MECHANICS where conditions were not consistently being applied

  pkmnsnfrn

  committed
  7a6abe2

Commits on Apr 29, 2023

• Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into SkyBattle

  pkmnsnfrn

  committed
  2afa9ca

• Add rulesVariants to the BattleStruct

  Show description for f3584a0
  pkmnsnfrn

  committed
  f3584a0

• Replaced B_FLAG_SKY_BATTLE checks with rulesVariants.skyBattle checks

  pkmnsnfrn

  committed
  aec9817

• Fixed debug script

  pkmnsnfrn

  committed
  3b0626a

• Reverted include/config/battle.h

  pkmnsnfrn

  committed
  95c4eaf

• Fixed spacing and placement of functions

  pkmnsnfrn

  committed
  2755fb5

• Fixed debug script omission

  Show description for 2dd238f
  pkmnsnfrn

  committed
  2dd238f

Commits on Apr 30, 2023

• Merge branch 'upcoming' into SkyBattle

  pkmnsnfrn

  authored
  1cb676f

Commits on May 3, 2023

• Added FLAG_DISABLED_IN_SKY_BATTLE to Psychic Terrain

  pkmnsnfrn

  committed
  cca1b41

• Merged in most recent expansion

  pkmnsnfrn

  committed
  be1d562

• Merge branch 'SkyBattle' of https://github.com/PokemonSanFran/pokeemerald-expansion into SkyBattle

  pkmnsnfrn

  committed
  2c88a92

Commits on Jun 30, 2023

• Merge branch 'upcoming' into SkyBattle

  pkmnsnfrn

  authored
  fe50f1e

• Addressed DizzyEgg PR feedback

  pkmnsnfrn

  committed
  e3814e1

• Forgot a file in last commit

  pkmnsnfrn

  committed
  d01ead1

Commits on Jul 5, 2023

• Merged in upcoming

  Show description for d002dab
  pkmnsnfrn

  committed
  d002dab

Commits on Jul 8, 2023

• Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into SkyBattle

  pkmnsnfrn

  committed
  260d171

• Addressed feedback from DizzyEggg

  pkmnsnfrn

  committed
  dc3a6bd

Commits on Jul 9, 2023

• Address Lunos' PR feedback

  pkmnsnfrn

  committed
  be205f8

• Update specials.inc

  Show description for f17e2d6
  pkmnsnfrn

  authored
  f17e2d6

Commits on Jul 11, 2023

• Fixed spacing

  pkmnsnfrn

  committed
  eb0a034

Commits on Jul 18, 2023

• Merge branch 'upcoming' into SkyBattle

  pkmnsnfrn

  authored
  1a2877b

Commits on Jul 19, 2023

• Apply suggestions from code review

  Show description for 9ef212f
  

  pkmnsnfrn

  and

  AsparagusEduardo

  authored
  9ef212f

• Updated skyBattleBanned and HandleBattleVariantEndParty to use correct names

  pkmnsnfrn

  committed
  dd2eb71

Commits on Sep 24, 2023

• Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into SkyBattle

  pkmnsnfrn

  committed
  c674eef

• Removed STRICT_MOVES and STRICT_MECHANICS

  pkmnsnfrn

  committed
  2d0aa40

• Fixed minor spacing issues with merge

  pkmnsnfrn

  committed
  e5e3746

Commits on Nov 23, 2023

• Merged with upcoming

  pkmnsnfrn

  committed
  9444255

• Merged in upcoming

  pkmnsnfrn

  committed
  5f6a1b0

• Merge branch 'upcoming' into SkyBattle

  pkmnsnfrn

  authored
  5da6117

Commits on Nov 24, 2023

• Implemented feedback from Jasper

  Show description for fca1d47
  pkmnsnfrn

  committed
  fca1d47

• Merge branch 'upcoming' into SkyBattle

  pkmnsnfrn

  authored
  ea0fc3f

Commits on Nov 26, 2023

• Merge branch 'upcoming' into SkyBattle

  pkmnsnfrn

  authored
  67e4921