diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-26 10:23:13 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-26 10:23:13 -0400 |
| commit | 93f0703fcdda810062071fde4febe111146c18cc (patch) | |
| tree | 241164c7e5fd5e71a9e3eca6eb8d6a918566d963 /data/specials.inc | |
| parent | fd78afa5a7d4441fe0d76693e301deb6bc2557dc (diff) | |
| parent | 1f569f0136952135a0e17fe22cf180c0e87dd007 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into script_menu
Diffstat (limited to 'data/specials.inc')
| -rw-r--r-- | data/specials.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/specials.inc b/data/specials.inc index 169ea0182..516b5f768 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -322,7 +322,7 @@ gSpecials:: @ 815FD60 def_special Special_StartGroudonKyogreBattle def_special Special_StartLegendaryBattle def_special Special_StartRegiBattle - def_special sub_8080398 + def_special SetUpTrainerMovement def_special nullsub_75 def_special nullsub_75 def_special sub_807B6C0 @@ -407,7 +407,7 @@ gSpecials:: @ 815FD60 def_special Special_CloseMuseumFossilPic def_special sub_812781C def_special sub_8127888 - def_special sub_80803FC + def_special SetBattledTrainerFlag def_special sub_812B35C def_special Special_SSAnneDepartureCutscene def_special sub_8149A18 |