mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-04 01:03:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match FrozenOctorok_Action1SubAction5

Browse Source
This commit is contained in:
Tal Hayon
2022-04-23 23:02:05 +03:00
parent a1ed36ce3c
commit 101239347d
2 changed files with 5 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/frozenOctorok.c
+5 -7
View File
@@ -175,8 +175,7 @@ void FrozenOctorok_Action1SubAction4(FrozenOctorokEntity* this) {
}
}
NONMATCH("asm/non_matching/frozenOctorok/FrozenOctorok_Action1SubAction5.inc",
void FrozenOctorok_Action1SubAction5(FrozenOctorokEntity* this)) {
void FrozenOctorok_Action1SubAction5(FrozenOctorokEntity* this) {
Entity* child;
if ((gRoomTransition.frameCount & 2) != 0) {
@@ -203,21 +202,20 @@ NONMATCH("asm/non_matching/frozenOctorok/FrozenOctorok_Action1SubAction5.inc",
}
} else {
this->unk_79--;
switch ((gRoomTransition.frameCount & 3)) {
switch ((u32)(gRoomTransition.frameCount & 3)) {
case 0:
case 2:
(super->child)->spriteOffsetX = 0;
super->child->spriteOffsetX = 0;
break;
case 1:
(super->child)->spriteOffsetX = 0xfc;
super->child->spriteOffsetX = 0xfc;
break;
case 3:
(super->child)->spriteOffsetX = 4;
super->child->spriteOffsetX = 4;
break;
}
}
}
END_NONMATCH
void FrozenOctorok_Action1SubAction6(FrozenOctorokEntity* this) {
LinearMoveUpdate(super);