diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-16 23:35:14 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-16 23:35:14 +0100 |
| commit | 05ab3f96218b58001aa2d90cef951f7e4087c4ae (patch) | |
| tree | 642a3ceb3f83690fb90d5c535592e1339c66664a /src/rom3.c | |
| parent | 35f04db27cd4d5689c6498ba80eaeb695f973ebc (diff) | |
| parent | e1fd501e16deefe643c4572efaa07a59372616e4 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/rom3.c')
| -rw-r--r-- | src/rom3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rom3.c b/src/rom3.c index 11239a681..713713162 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -749,9 +749,9 @@ void EmitPrintString(u8 a, u16 stringID) stringInfo->lastMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; - stringInfo->scrActive = BATTLE_STRUCT->scriptingActive; - stringInfo->unk1605E = BATTLE_STRUCT->unk1605E; - stringInfo->hpScale = BATTLE_STRUCT->hpScale; + stringInfo->scrActive = gBattleStruct->scriptingActive; + stringInfo->unk1605E = gBattleStruct->unk1605E; + stringInfo->hpScale = gBattleStruct->hpScale; stringInfo->StringBank = gStringBank; stringInfo->moveType = gBattleMoves[gCurrentMove].type; @@ -781,8 +781,8 @@ void EmitPrintStringPlayerOnly(u8 a, u16 stringID) stringInfo->lastMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; - stringInfo->scrActive = BATTLE_STRUCT->scriptingActive; - stringInfo->unk1605E = BATTLE_STRUCT->unk1605E; + stringInfo->scrActive = gBattleStruct->scriptingActive; + stringInfo->unk1605E = gBattleStruct->unk1605E; for (i = 0; i < 4; i++) stringInfo->abilities[i] = gBattleMons[i].ability; |