diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-09-05 22:50:19 +0200 |
|---|---|---|
| committer | anonymous <> | 2022-10-08 22:32:54 +0200 |
| commit | 67467fd831d2928715835f8a389b4f464a0f9a7a (patch) | |
| tree | 261864c07f334c35024033a908b4af8e808caebe /src/object/lightRay.c | |
| parent | 756a8a89da46dade06fad1723de88fa5a82cc2ec (diff) | |
Extract some data
And split up subtasks and world events.
Diffstat (limited to 'src/object/lightRay.c')
| -rw-r--r-- | src/object/lightRay.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/object/lightRay.c b/src/object/lightRay.c index c353a862..c1e58d1a 100644 --- a/src/object/lightRay.c +++ b/src/object/lightRay.c @@ -42,7 +42,7 @@ void LightRay_Type0(LightRayEntity* this) { super->timer = 60; super->subtimer = 0; gRoomControls.camera_target = super; - gRoomControls.unk5 = 1; + gRoomControls.scrollSpeed = 1; if (super->x.HALF.HI > gPlayerEntity.x.HALF.HI) { tmp = 2; } else { @@ -76,7 +76,7 @@ void LightRay_Type0(LightRayEntity* this) { case 2: if (--super->timer == 0) { gScreen.lcd.displayControl |= 0x4800; - gRoomControls.unk5 = 4; + gRoomControls.scrollSpeed = 4; (super->parent)->subAction = 1; DeleteThisEntity(); } @@ -116,7 +116,7 @@ void LightRay_Type1(LightRayEntity* this) { super->timer = 60; super->subtimer = 32; gRoomControls.camera_target = super; - gRoomControls.unk5 = 1; + gRoomControls.scrollSpeed = 1; if (super->x.HALF.HI > gPlayerEntity.x.HALF.HI) { tmp = 2; } else { @@ -148,7 +148,7 @@ void LightRay_Type1(LightRayEntity* this) { break; case 2: if (--super->timer == 0) { - gRoomControls.unk5 = 4; + gRoomControls.scrollSpeed = 4; gScreen.lcd.displayControl &= 0xd7ff; (super->parent)->subAction = 1; DeleteThisEntity(); @@ -167,7 +167,7 @@ void LightRay_Type2(LightRayEntity* this) { super->timer = 60; super->subtimer = 0; gRoomControls.camera_target = super; - gRoomControls.unk5 = 1; + gRoomControls.scrollSpeed = 1; if (super->x.HALF.HI > gPlayerEntity.x.HALF.HI) { tmp = 2; } else { @@ -214,12 +214,12 @@ void LightRay_Type2(LightRayEntity* this) { if (--super->timer == 0) { super->action = 4; gRoomControls.camera_target = &gPlayerEntity; - gRoomControls.unk5 = 2; + gRoomControls.scrollSpeed = 2; } break; case 4: if (sub_0809BE78(this)) { - gRoomControls.unk5 = 4; + gRoomControls.scrollSpeed = 4; (super->parent)->subAction = 1; SetRoomFlag(100); DeleteThisEntity(); @@ -237,7 +237,7 @@ void LightRay_Type3(LightRayEntity* this) { super->timer = 60; super->subtimer = 0; gRoomControls.camera_target = super; - gRoomControls.unk5 = 1; + gRoomControls.scrollSpeed = 1; if (super->x.HALF.HI > gPlayerEntity.x.HALF.HI) { tmp = 2; } else { @@ -293,7 +293,7 @@ void LightRay_Type4(LightRayEntity* this) { super->timer = 60; super->subtimer = 128; gRoomControls.camera_target = super; - gRoomControls.unk5 = 1; + gRoomControls.scrollSpeed = 1; if (super->x.HALF.HI > gPlayerEntity.x.HALF.HI) { tmp = 2; } else { @@ -319,7 +319,7 @@ void LightRay_Type4(LightRayEntity* this) { break; case 2: if (--super->timer == 0) { - gRoomControls.unk5 = 4; + gRoomControls.scrollSpeed = 4; (super->parent)->subAction = 1; DeleteThisEntity(); } |