diff --git a/asm/main_02051504.s b/asm/main_02051504.s index dbf2cdf8..fd88c3ab 100644 --- a/asm/main_02051504.s +++ b/asm/main_02051504.s @@ -191,15 +191,3 @@ IsExpEnabledInDungeon: ; 0x0205171C .align 2, 0 _02051740: .word DUNGEON_RESTRICTIONS arm_func_end IsExpEnabledInDungeon - - arm_func_start IsSkyExclusiveDungeon -IsSkyExclusiveDungeon: ; 0x02051744 - cmp r0, #0x67 - blo _02051758 - cmp r0, #0xb0 - movls r0, #1 - bxls lr -_02051758: - mov r0, #0 - bx lr - arm_func_end IsSkyExclusiveDungeon diff --git a/include/main_02051760.h b/include/main_02051760.h index 56b725d4..5ce60732 100644 --- a/include/main_02051760.h +++ b/include/main_02051760.h @@ -1,8 +1,10 @@ #ifndef PMDSKY_MAIN_02051760_H #define PMDSKY_MAIN_02051760_H +#include "enums.h" #include "util.h" +bool8 IsSkyExclusiveDungeon(enum dungeon_id dungeon_id); bool32 JoinedAtRangeCheck2(u8 joined_at); #endif //PMDSKY_MAIN_02051760_H diff --git a/src/main_02051760.c b/src/main_02051760.c index 194c8cd7..f471707b 100644 --- a/src/main_02051760.c +++ b/src/main_02051760.c @@ -2,6 +2,14 @@ #include "enums.h" #include "util.h" +bool8 IsSkyExclusiveDungeon(enum dungeon_id dungeon_id) +{ + if (dungeon_id >= DUNGEON_ZERO_ISLE_CENTER && dungeon_id <= DUNGEON_ARMALDOS_SHELTER) { + return TRUE; + } + return FALSE; +} + bool32 JoinedAtRangeCheck2(u8 joined_at) { return joined_at == DUNGEON_BEACH || (joined_at >= DUNGEON_DUMMY_0xEC && DUNGEON_DUMMY_0xF0 >= joined_at); }