diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 15:43:22 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 15:43:29 -0600 |
| commit | 4767f21f2e72ae89ab542d61a86d5fbbe85df1a2 (patch) | |
| tree | 985706af891626bcf4335ad26758dbdcef617cf5 /include | |
| parent | 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (diff) | |
Port updated battle_script macros from pokeemerald
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/field_fadetransition.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index febb5807a..dd44e0172 100644 --- a/include/battle.h +++ b/include/battle.h @@ -312,7 +312,7 @@ struct BattleStruct /* 0x2000000 */ /*0x1600C*/ u8 cmd49StateTracker; /*0x1600D*/ u8 unk1600D; /*0x1600E*/ u8 turncountersTracker; - /*0x1600F*/ u8 atk23StateTracker; + /*0x1600F*/ u8 getexpStateTracker; /*0x16010*/ u8 moveTarget[4]; /*0x16014*/ u8 unk16014; /*0x16015*/ u8 unk16015; diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index 111dc92a6..4377367f7 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -13,7 +13,7 @@ void sub_8080A3C(void); void sub_8080AC4(void); void mapldr_default(); void sub_8080B60(void); -void atk17_seteffectuser(void); +void atk17_seteffectsecondary(void); void sub_8080E28(void); void sub_8080E44(void); bool32 sub_8080E70(void); |