From 99bfd8c80fcfcafa55166ff65f5264c727b16ed0 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 28 Feb 2019 00:10:44 -0500 Subject: VAR_0x3F20 is not a var --- include/constants/vars.h | 2 +- src/decoration.c | 2 +- src/secret_base.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/constants/vars.h b/include/constants/vars.h index 3bd5d8efe..72b02ee8f 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_VARS_H #define GUARD_CONSTANTS_VARS_H -#define VAR_0x3F20 0x3F20 +#define UNKNOWN_VAR_OFFSET_3F20 0x3F20 #define VARS_START 0x4000 diff --git a/src/decoration.c b/src/decoration.c index 2ac49b98c..1635528d9 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1254,7 +1254,7 @@ void sub_8127E18(void) break; } } - VarSet(VAR_0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); + VarSet(UNKNOWN_VAR_OFFSET_3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; gSpecialVar_0x8006 = sCurDecorMapX; gSpecialVar_0x8007 = sCurDecorMapY; diff --git a/src/secret_base.c b/src/secret_base.c index 02d627722..cf35deb07 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -552,7 +552,7 @@ void sub_80E933C(void) metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + VAR_0x3F20; + gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + UNKNOWN_VAR_OFFSET_3F20; VarSet(gSpecialVar_Result, gDecorations[roomDecor[decorIdx]].tiles[0]); gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].localId; FlagClear(gSpecialVar_0x8004 + 0xAE); -- cgit v1.2.3