diff options
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index 7fae50a81..a684f3982 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -548,7 +548,7 @@ void sub_80E933C(void) gSpecialVar_0x8006 = roomDecorPos[decorIdx] >> 4; gSpecialVar_0x8007 = roomDecorPos[decorIdx] & 0xF; metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); - if (MetatileBehavior_IsMB_B5(metatile) == TRUE || MetatileBehavior_IsMB_C3(metatile) == TRUE) + if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + VAR_0x3F20; VarSet(gSpecialVar_Result, gDecorations[roomDecor[decorIdx]].tiles[0]); @@ -596,13 +596,13 @@ void sub_80E95D4(void) VarSet(VAR_OBJ_GFX_ID_F, gUnknown_0858D060[sub_80EA20C(VarGet(VAR_0x4054))]); } -void sub_80E9608(struct Coords16 *coords, struct MapEvents *events) +void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events) { s16 bgEventIdx; for (bgEventIdx = 0; bgEventIdx < events->bgEventCount; bgEventIdx ++) { - if (events->bgEvents[bgEventIdx].kind == BG_EVENT_SECRET_BASE && coords->x == events->bgEvents[bgEventIdx].x + 7 && coords->y == events->bgEvents[bgEventIdx].y + 7) + if (events->bgEvents[bgEventIdx].kind == BG_EVENT_SECRET_BASE && position->x == events->bgEvents[bgEventIdx].x + 7 && position->y == events->bgEvents[bgEventIdx].y + 7) { sCurSecretBaseId = events->bgEvents[bgEventIdx].bgUnion.secretBaseId; break; @@ -610,9 +610,9 @@ void sub_80E9608(struct Coords16 *coords, struct MapEvents *events) } } -void sub_80E9668(struct Coords16 *coords, struct MapEvents *events) +void sub_80E9668(const struct MapPosition *position, const struct MapEvents *events) { - sub_80E9608(coords, events); + sub_80E9608(position, events); sub_80E8B6C(); ScriptContext1_SetupScript(EventScript_275BB7); } @@ -1271,7 +1271,7 @@ void sub_80EA3E4(u8 taskId) } } } - else if (MetatileBehavior_IsMB_BE(behavior) == TRUE) + else if (MetatileBehavior_IsSecretBaseBreakableDoor(behavior) == TRUE) { if (gUnknown_0203A01D == TRUE) { |