diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 09:33:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 09:33:58 -0600 |
| commit | 86a36767dba19e84297047addf1d1d776e2efdec (patch) | |
| tree | f2aaa9e93f8b8671491eda458963aee1027924c2 /src/field/field_control_avatar.c | |
| parent | e3078400bbdb3e8416806127290b9a2d68cfb3b8 (diff) | |
| parent | d34de50d34d18ee64c95232202751532534c2ed9 (diff) | |
Merge pull request #501 from huderlem/event_macros
New map event macros
Diffstat (limited to 'src/field/field_control_avatar.c')
| -rw-r--r-- | src/field/field_control_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index cd7d3a2e2..947dc3e56 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -355,7 +355,7 @@ static u8 *TryGetInvisibleMapObjectScript(struct MapPosition *position, u8 unuse case 5: case 6: case 7: - gSpecialVar_0x8004 = ((u32)bgEvent->bgUnion.script >> 16) + 0x258; + gSpecialVar_0x8004 = ((u32)bgEvent->bgUnion.script >> 16) + FLAG_HIDDEN_ITEMS_START; gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script; if (FlagGet(gSpecialVar_0x8004) == TRUE) return NULL; @@ -363,7 +363,7 @@ static u8 *TryGetInvisibleMapObjectScript(struct MapPosition *position, u8 unuse case 8: if (c == 2) { - gSpecialVar_0x8004 = (u32)bgEvent->bgUnion.script; + gSpecialVar_0x8004 = bgEvent->bgUnion.secretBaseId; if (sub_80BC050()) return gUnknown_081A2C51; } |