diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-12 13:05:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-12 13:05:57 -0500 |
| commit | 956090b05f678db9f43d567131d6d43ce11806ec (patch) | |
| tree | 0f8318bf22c1e6f049772fd0846af6db14e86349 /src/match_call.c | |
| parent | 9c934c966400813e8ed6c8a5c0f93fb8cdc12546 (diff) | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'src/match_call.c')
| -rw-r--r-- | src/match_call.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/match_call.c b/src/match_call.c index 0647e96dc..9d8523576 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1287,7 +1287,7 @@ static bool32 sub_81963F0(u8 taskId) ChangeBgY(0, 0, 0); if (!gMatchCallState.triggeredFromScript) { - sub_81973A4(); + LoadMessageBoxAndBorderGfx(); playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ScriptMovement_UnfreezeObjectEvents(); @@ -1746,7 +1746,7 @@ static void PopulateBattleFrontierStreak(int matchCallId, u8 *destStr) ConvertIntToDecimalStringN(destStr, gBattleFrontierStreakInfo.streak, STR_CONV_MODE_LEFT_ALIGN, i); } -static const u16 sBadgeFlags[] = +static const u16 sBadgeFlags[NUM_BADGES] = { FLAG_BADGE01_GET, FLAG_BADGE02_GET, @@ -1762,7 +1762,7 @@ static int GetNumOwnedBadges(void) { u32 i; - for (i = 0; i < 8; i++) + for (i = 0; i < NUM_BADGES; i++) { if (!FlagGet(sBadgeFlags[i])) break; |