From 790df7159ec26194a71ed57216de27358999a061 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 3 Dec 2017 00:47:21 +0100 Subject: more battlescript labels --- src/battle_message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index 77f7cc722..cf5a55140 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1632,9 +1632,9 @@ void BufferStringBattle(u16 stringID) stringPtr = gText_AttackerUsedX; break; case STRINGID_BATTLEEND: // battle end - if (gBattleTextBuff1[0] & BATTLE_OUTCOME_BIT_x80) + if (gBattleTextBuff1[0] & OUTCOME_LINK_BATTLE_RUN) { - gBattleTextBuff1[0] &= ~(BATTLE_OUTCOME_BIT_x80); + gBattleTextBuff1[0] &= ~(OUTCOME_LINK_BATTLE_RUN); if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != BATTLE_DREW) gBattleTextBuff1[0] ^= (BATTLE_LOST | BATTLE_WON); -- cgit v1.2.3 From caa13f877797edbb7a1e13bf00b537bafbd4315a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 5 Dec 2017 11:55:48 -0600 Subject: convert some constants to C headers --- src/battle_message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index 77f7cc722..f3df05949 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -5,7 +5,7 @@ #include "moves.h" #include "text.h" #include "string_util.h" -#include "items.h" +#include "constants/items.h" #include "event_data.h" #include "link.h" #include "item.h" -- cgit v1.2.3 From c681b482c2ab0a4281cb6ad5927ce8ca565a3692 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 11 Dec 2017 12:27:51 -0600 Subject: convert more constants --- src/battle_message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index ecfcc1228..ec1cfd626 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2,7 +2,7 @@ #include "battle.h" #include "battle_message.h" #include "battle_string_ids.h" -#include "moves.h" +#include "constants/moves.h" #include "text.h" #include "string_util.h" #include "constants/items.h" -- cgit v1.2.3