From 5c5437f69fe2f9f6a4697dae74fe5ec5538c0a44 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 3 Mar 2023 18:39:33 -0600 Subject: [PATCH] address review comments --- src/friend_area.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/friend_area.c b/src/friend_area.c index 4f0f76246..2e6c52808 100644 --- a/src/friend_area.c +++ b/src/friend_area.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/dungeon.h" #include "constants/friend_area.h" #include "friend_area.h" #include "pokemon.h" @@ -361,7 +362,7 @@ void sub_8092404(u8 r0, u16 *r1, bool8 r2, bool8 r3) { if((pokemon->isTeamLeader == 0) || r2) { - flag = pokemon->dungeonLocation.id == 65; + flag = pokemon->dungeonLocation.id == DUNGEON_JOIN_LOCATION_PARTNER; if(!flag || r3) { if(sub_80923D4(counter) == r0) @@ -479,7 +480,7 @@ void sub_809249C(u8 friendArea, u8 clear) { if(sub_80923D4(index) == friendArea) { - dungeonCheck = pokemon->dungeonLocation.id == 65; + dungeonCheck = pokemon->dungeonLocation.id == DUNGEON_JOIN_LOCATION_PARTNER; if(dungeonCheck || (isTeamLeader = pokemon->isTeamLeader != FALSE, isTeamLeader)) clear = FALSE; else