diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-07 19:46:44 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-07 20:54:44 -0500 |
| commit | 0a2c709535bd79d8b62f3e8aafda9171670c1ecf (patch) | |
| tree | f5a49a53a3813152e41ee8db4f250a3d61b0d660 /src/secret_base.c | |
| parent | f73ea3d931cad4d4e99bbeb664aca6a0344ea1c7 (diff) | |
Label all metatile behaviors and functions
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index deee1ade0..1a4b765a0 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -510,7 +510,7 @@ void sub_80BBDD0(void) gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4; gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF; metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); - if (sub_80572D8(metatile) == TRUE || sub_80572EC(metatile) == TRUE) + if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { gSpecialVar_Result = gMapHeader.events->eventObjects[objid].graphicsId + VAR_0x3F20; VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]); @@ -1309,7 +1309,7 @@ void sub_80BCE90() void sub_80BCF1C(u8 taskId) { s16 x, y; - u32 behavior; + u32 metatileBehavior; s16 *taskData = gTasks[taskId].data; switch (taskData[1]) @@ -1325,15 +1325,15 @@ void sub_80BCF1C(u8 taskId) taskData[2] = x; taskData[3] = y; - behavior = MapGridGetMetatileBehaviorAt(x, y); - if (sub_8057350(behavior) == TRUE) - DoYellowCave4Sparkle(); - else if (sub_8057314(behavior) == TRUE) - sub_80C68A4(MapGridGetMetatileIdAt(x, y), x, y); - else if (sub_8057328(behavior) == TRUE) - sub_80C6A54(x, y); - else if (sub_805733C(behavior) == TRUE) - DoDecorationSoundEffect(MapGridGetMetatileIdAt(x, y)); + metatileBehavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE) + DoSecretBaseGlitterMatSparkle(); + else if (MetatileBehavior_IsSecretBaseBalloon(metatileBehavior) == TRUE) + PopSecretBaseBalloon(MapGridGetMetatileIdAt(x, y), x, y); + else if (MetatileBehavior_IsSecretBaseBreakableDoor(metatileBehavior) == TRUE) + ShatterSecretBaseBreakableDoor(x, y); + else if (MetatileBehavior_IsSecretBaseMusicNoteMat(metatileBehavior) == TRUE) + PlaySecretBaseMusicNoteMatSound(MapGridGetMetatileIdAt(x, y)); } break; case 2: |