diff options
| author | theo3 <arisstephenson2@gmail.com> | 2020-08-04 17:10:55 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2020-08-04 17:10:55 -0700 |
| commit | 261ec334a0bedbeb3f4340d22173bcb4dec78e6f (patch) | |
| tree | 59fb19a86218d79012d96fdc1e7ef07bb3df0ac0 /src/object | |
| parent | 519c3b37d747026fc97ba8135b30b19b81819254 (diff) | |
def ScreenTransition
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/cloud.c | 8 | ||||
| -rw-r--r-- | src/object/mask.c | 4 | ||||
| -rw-r--r-- | src/object/minecart.c | 2 | ||||
| -rw-r--r-- | src/object/treeHidingPortal.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/object/cloud.c b/src/object/cloud.c index c55e0d57..5314d9a4 100644 --- a/src/object/cloud.c +++ b/src/object/cloud.c @@ -23,7 +23,7 @@ extern void PositionEntityOnTop(Entity*, Entity*); extern void sub_0807BB68(u32*, u32, u32); extern u8 gUnk_02034490; -extern u32 gUnk_030010A0; +extern u32 gScreenTransition; extern void* gUnk_080DD750; extern Entity gLinkEntity; extern LinkState gLinkState; @@ -62,7 +62,7 @@ void sub_0809F548(Entity* this) { sub_0809F814((((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 63) | (((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 63) << 6); } else { - if ((gUnk_030010A0 & 7) == 0) { + if ((gScreenTransition & 7) == 0) { sub_0809F7BC(this); } sub_0809F7F4(this); @@ -110,7 +110,7 @@ void sub_0809F61C(Entity* this) { sub_0809F814((((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 63) | (((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 63) << 6); } else { - if ((gUnk_030010A0 & 7) == 0) { + if ((gScreenTransition & 7) == 0) { sub_0809F7BC(this); } sub_0809F7F4(this); @@ -145,7 +145,7 @@ void sub_0809F700(Entity* this) { this->actionDelay = (Random() & 30) + 8; this->flags = this->flags | 12; } - if ((gUnk_030010A0 & 3) == 0) { + if ((gScreenTransition & 3) == 0) { uVar2 = Random(); this->spriteOffsetX = gUnk_081247C0[uVar2 & 7]; this->spriteOffsetY = gUnk_081247C0[uVar2 >> 4 & 7]; diff --git a/src/object/mask.c b/src/object/mask.c index 6dd866c9..033039e4 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -4,7 +4,7 @@ #include "random.h" extern Entity gLinkEntity; -extern u16 gUnk_030010A0[]; +extern u16 gScreenTransition[]; extern void (*MaskActionFuncs[])(Entity *); @@ -36,7 +36,7 @@ void sub_080929A4(Entity *this) { switch (this->entityType.parameter & 0xC0) { case 0x40: - field_0x0a = gUnk_030010A0[0x5]; + field_0x0a = gScreenTransition[0x5]; switch (field_0x0a) { case 0x44D ... 0x44F: diff --git a/src/object/minecart.c b/src/object/minecart.c index eff15d3a..5bf59c5d 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -155,7 +155,7 @@ void sub_080919AC(Entity *this) CopyPosition(this,&gLinkEntity); gLinkEntity.spritePriority.b0 = this->spritePriority.b0 - 1; if (!sub_08091DDC(this)) { - if ((gUnk_030010A0.field_0x0 & 0xf) == 0) { + if ((gScreenTransition.field_0x0 & 0xf) == 0) { PlaySFX(0x138); } diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index 8bab5747..5b8522b3 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -15,7 +15,7 @@ extern void CreateMinishEntrance(u32 tile); extern void (*const gUnk_08124354[])(Entity*); -extern u32 gUnk_030010A0; +extern u32 gScreenTransition; extern s16 gUnk_08124364[]; void TreeHidingPortal(Entity* this) { @@ -36,7 +36,7 @@ void sub_0809E86C(Entity* this) { if (sub_0800419C(this, &gLinkEntity, 0x30, 0x30)) { if (CheckGlobalFlag(EZERO_1ST)) { - if (((gUnk_030010A0 & 3) == 0)) { + if (((gScreenTransition & 3) == 0)) { sub_080A2B80(this); } } |
