mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-29 19:42:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into demo-jp

Browse Source
This commit is contained in:
octorock
2021-10-28 23:27:37 +02:00
parent 947f686906 3f5449c1a1
commit 78646feecf
49 changed files with 980 additions and 1914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/acroBandits.c
+6 -6
View File
@@ -52,7 +52,7 @@ void sub_080318DC(Entity* this) {
if (this->bitfield != 0x80 && this->bitfield != 0x81) {
if (this->type == 1) {
if (this->action < 7 && this->field_0x42) {
if (this->action < 7 && this->knockbackDuration != 0) {
brother = this->attachedEntity;
if (brother) {
brother->parent = this->parent;
@@ -72,7 +72,7 @@ void sub_080318DC(Entity* this) {
this->action = 9;
this->spritePriority.b1 = 1;
if (this->field_0x3e < 0x10) {
if (this->knockbackDirection < 0x10) {
this->spriteSettings.b.flipX = 0;
} else {
this->spriteSettings.b.flipX = 1;
@@ -81,19 +81,19 @@ void sub_080318DC(Entity* this) {
}
if (this->currentHealth == 0) {
this->field_0x3e = ((this->field_0x3e + (7 & Random())) - 4) & 0x1f;
this->field_0x42 += this->type2 * 3;
this->knockbackDirection = ((this->knockbackDirection + (7 & Random())) - 4) & 0x1f;
this->knockbackDuration += this->type2 * 3;
sub_08032338(this);
}
}
if (this->field_0x42 && this->frames.all & 0x10) {
if (this->knockbackDuration != 0 && this->frames.all & 0x10) {
if (this->type == 0) {
this->action = 8;
} else {
this->action = 9;
}
if (this->field_0x3e < 0x10) {
if (this->knockbackDirection < 0x10) {
this->spriteSettings.b.flipX = 0;
} else {
this->spriteSettings.b.flipX = 1;
src/enemy/beetle.c
+1 -1
View File
@@ -48,7 +48,7 @@ void sub_08021780(Entity* this) {
}
if (this->currentHealth == 0)
this->field_0x42 = 0;
this->knockbackDuration = 0;
sub_0804AA30(this, gUnk_080CB590);
}
src/enemy/bobomb.c
+3 -3
View File
@@ -30,8 +30,8 @@ void sub_0802C688(Entity* this) {
case 0:
case 1:
if (this->field_0x82.HALF.LO) {
this->field_0x42 = 0;
gPlayerEntity.field_0x42 = 4;
this->knockbackDuration = 0;
gPlayerEntity.knockbackDuration = 4;
}
return;
case 0xe:
@@ -39,7 +39,7 @@ void sub_0802C688(Entity* this) {
case 0x15:
case 0x16:
this->action = 3;
this->field_0x42 = 0;
this->knockbackDuration = 0;
sub_0802CBC4(this);
return;
}
src/enemy/darkNut.c
+2 -2
View File
@@ -64,7 +64,7 @@ void sub_08020BB8(Entity* this) {
this->action = 11;
this->actionDelay = gUnk_080CAB0C[this->type];
this->damageType = 81;
sub_08021218(this, 8, DirectionToAnimationState(this->field_0x3e ^ 0x10));
sub_08021218(this, 8, DirectionToAnimationState(this->knockbackDirection ^ 0x10));
sub_08021588(this);
sub_0804A9FC(this, 0x1c);
break;
@@ -72,7 +72,7 @@ void sub_08020BB8(Entity* this) {
this->action = 11;
this->actionDelay = gUnk_080CAB10[this->type];
this->damageType = 81;
sub_08021218(this, 8, DirectionToAnimationState(this->field_0x3e ^ 0x10));
sub_08021218(this, 8, DirectionToAnimationState(this->knockbackDirection ^ 0x10));
sub_08021588(this);
sub_0804A9FC(this, 0x1c);
break;
src/enemy/gibdo.c
+5 -5
View File
@@ -58,7 +58,7 @@ NONMATCH("asm/non_matching/gibdo/sub_080374A4.inc", void sub_080374A4(Entity* th
} else {
if ((u8)(this->action - 1) < 2) {
this->action = 1;
x = DirectionTurnAround(this->field_0x3e);
x = DirectionTurnAround(this->knockbackDirection);
this->direction = x;
this->animationState = x >> 3;
InitAnimationForceUpdate(this, this->animationState);
@@ -342,8 +342,8 @@ void sub_08037A58(Entity* this) {
this->damageType = 0x26;
this->flags2 |= 1;
this->iframes = 0xf4;
this->field_0x3e = (this->animationState << 3) ^ 0x10;
this->field_0x42 = 8;
this->knockbackDirection = DirectionFromAnimationState(this->animationState) ^ 0x10;
this->knockbackDuration = 8;
this->field_0x46 = 0x180;
this->field_0x76.HALF.LO = 0x3c;
InitAnimationForceUpdate(this, this->animationState + 0x10);
@@ -353,8 +353,8 @@ void sub_08037ACC(Entity* this) {
gPlayerState.flags.all &= 0xFFFFFEFF;
gPlayerEntity.flags |= 0x80;
gPlayerEntity.iframes = 0x1e;
gPlayerEntity.field_0x3e = DirectionFromAnimationState(this->animationState);
gPlayerEntity.field_0x42 = 4;
gPlayerEntity.knockbackDirection = DirectionFromAnimationState(this->animationState);
gPlayerEntity.knockbackDuration = 4;
gPlayerEntity.field_0x46 = 0x180;
}
// Damage player maybe?
src/enemy/helmasaur.c
+1 -1
View File
@@ -48,7 +48,7 @@ void sub_0802BBC4(Entity* this) {
case 2:
case 3:
if (this->action == 4) {
this->field_0x42 = 0;
this->knockbackDuration = 0;
sub_0802C218(this);
}
break;
src/enemy/keaton.c
+1 -1
View File
@@ -39,7 +39,7 @@ void sub_080323F4(Entity* this) {
if (this->action != 3 && this->action != 4) {
this->action = 3;
this->actionDelay = 0xC;
this->direction = DirectionTurnAround(this->field_0x3e);
this->direction = DirectionTurnAround(this->knockbackDirection);
InitAnimationForceUpdate(this, this->direction >> 3);
} else if (this->bitfield == 0xCC) {
if (this->field_0x43 == 0) {
src/enemy/lakitu.c
+1 -1
View File
@@ -64,7 +64,7 @@ void sub_0803C784(Entity* this) {
Entity* fx = CreateFx(this, 2, 0);
if (fx != NULL) {
u32 angle = (this->field_0x3e ^ 0x10) << 3;
u32 angle = (this->knockbackDirection ^ 0x10) << 3;
s32 sine;
sine = gSineTable[angle];
src/enemy/lakituCloud.c
+1 -1
View File
@@ -24,7 +24,7 @@ void sub_0803CCD4(Entity* this) {
}
void sub_0803CCEC(Entity* this) {
this->field_0x42 = 0;
this->knockbackDuration = 0;
sub_0803CCD4(this);
}
src/enemy/moldorm.c
+1 -1
View File
@@ -36,7 +36,7 @@ void sub_08022BEC(Entity* this) {
this->field_0x7a.HALF.LO = this->currentHealth;
this->actionDelay = 1;
this->direction = this->field_0x3e;
this->direction = this->knockbackDirection;
this->animationState = ((this->direction + 2) & 0x1c) >> 2;
this->frameIndex = this->animationState;
src/enemy/peahat.c
+1 -1
View File
@@ -234,7 +234,7 @@ void Peahat_Stunned(Entity* this) {
}
if (this->direction == 0xff)
this->direction = this->field_0x3e;
this->direction = this->knockbackDirection;
ProcessMovement(this);
GetNextFrame(this);
src/enemy/puffstool.c
+1 -1
View File
@@ -75,7 +75,7 @@ void sub_08025020(Entity* this) {
this->field_0x20 = 0;
}
this->iframes = -0xc;
this->field_0x42 = 0;
this->knockbackDuration = 0;
if (this->field_0x80.HALF.LO == 0) {
this->animationState = (*(Entity**)&this->field_0x4c)->direction >> 3;
InitializeAnimation(this, this->animationState + 4);
src/enemy/rockChuchu.c
+3 -3
View File
@@ -51,7 +51,7 @@ void sub_08022254(Entity* this) {
this->action = 2;
this->flags &= ~0x80;
this->spriteSettings.b.draw = 0;
this->direction = this->field_0x3e;
this->direction = this->knockbackDirection;
this->attachedEntity = ent;
}
}
@@ -101,8 +101,8 @@ void sub_080223E4(Entity* this) {
ent->bitfield = 0x94;
ent->iframes = 0x10;
#ifndef EU
ent->field_0x42 = 0xc;
ent->field_0x3e = this->direction;
ent->knockbackDuration = 0xc;
ent->knockbackDirection = this->direction;
#endif
}
src/enemy/rollobite.c
+4 -4
View File
@@ -54,11 +54,11 @@ void sub_08020668(Entity* this) {
void sub_080206E0(Entity* this) {
if (Rollobite_TryToHoleUp(this)) {
this->field_0x42 = 0;
this->knockbackDuration = 0;
} else if (Rollobite_IsRolledUp(this)) {
this->field_0x42--;
sub_080AE58C(this, this->field_0x3e, 10);
sub_080AE7E8(this, this->field_0x46, this->field_0x3e, 10);
this->knockbackDuration--;
sub_080AE58C(this, this->knockbackDirection, 10);
sub_080AE7E8(this, this->field_0x46, this->knockbackDirection, 10);
} else {
sub_08001324(this);
}
src/enemy/spearMoblin.c
+3 -3
View File
@@ -379,11 +379,11 @@ bool32 sub_080288A4(Entity* this) {
void sub_080288C0(Entity* this) {
Entity* ent = this->attachedEntity;
if (ent && (ent->bitfield & 0x80)) {
this->field_0x3e = ent->field_0x3e;
this->knockbackDirection = ent->knockbackDirection;
this->iframes = -ent->iframes;
this->field_0x46 = ent->field_0x46;
this->field_0x42 = ent->field_0x42;
ent->field_0x42 = 0;
this->knockbackDuration = ent->knockbackDuration;
ent->knockbackDuration = 0;
}
}
src/enemy/spikedBeetle.c
+2 -2
View File
@@ -51,8 +51,8 @@ void sub_0802B628(Entity* this) {
this->action = 6;
this->field_0x20 = 0x18000;
this->speed = 0xc0;
this->direction = this->field_0x3e;
this->field_0x42 = 0;
this->direction = this->knockbackDirection;
this->knockbackDuration = 0;
this->iframes = -8;
this->damageType = 100;
InitializeAnimation(this, 9);
src/enemy/vaatiTransfigured.c
+1 -1
View File
@@ -1068,7 +1068,7 @@ void sub_080409B0(Entity* this) {
}
if (this->field_0x80.HALF.HI < 3) {
if (this->field_0x42 != 0) {
if (this->knockbackDuration != 0) {
sub_080AF18C(this);
}
} else {
src/enemy/vaatiWrath.c
+1 -1
View File
@@ -996,7 +996,7 @@ void sub_0804235C(Entity* this) {
InitializeAnimation(((VaatiWrathHeapStruct*)this->myHeap)->type3, 0x1b);
}
#if defined USA || defined DEMO
#if defined USA || defined DEMO_USA || defined DEMO_JP
void VaatiWrathType0PreAction(Entity* this) {
int temp;
if ((gScreenTransition.field_0x38 & 2) == 0) {
src/enemy/wallMaster.c
+3 -3
View File
@@ -37,9 +37,9 @@ void sub_0802A454(Entity* this) {
}
}
if (this->field_0x42)
if (this->field_0x42 > 4)
this->field_0x42 -= 4;
if (this->knockbackDuration != 0)
if (this->knockbackDuration > 4)
this->knockbackDuration -= 4;
if (this->field_0x43 != 0) {
sub_0804A9FC(this, 0x1c);
src/entity.c
+1 -1
View File
@@ -102,7 +102,7 @@ void DeleteEntity(Entity* ent) {
ent->spriteSettings.b.draw = 0;
ent->field_0x3c = 0;
ent->bitfield = 0;
ent->field_0x42 = 0;
ent->knockbackDuration = 0;
ent->currentHealth = 0;
UnlinkEntity(ent);
ent->next = NULL;
src/itemMenuTable.c
+53
View File
@@ -0,0 +1,53 @@
#include "global.h"
typedef enum {
SWORD,
GUST_JAR,
CANE,
BOOMERANG,
SHIELD,
MOLE_MITTS,
LANTERN,
BOMBS,
PEGASUS_BOOTS,
ROCS_CAPE,
OCARINA,
BOW,
BOTTLE0,
BOTTLE1,
BOTTLE2,
BOTTLE3,
SAVE_BUTTON,
} ItemMenuTableSlot;
typedef struct {
u8 up;
u8 down;
u8 left;
u8 right;
u8 type;
u8 unk0;
u8 x;
u8 y;
} ItemMenuTableEntry;
const ItemMenuTableEntry gItemMenuTable[] = {
[SWORD] = { BOTTLE0, SHIELD, BOOMERANG, GUST_JAR, 0x01, 0x0c, 0x42, 0x33 },
[GUST_JAR] = { BOTTLE1, MOLE_MITTS, SWORD, CANE, 0x01, 0x10, 0x66, 0x33 },
[CANE] = { BOTTLE3, LANTERN, GUST_JAR, BOOMERANG, 0x01, 0x14, 0x8a, 0x33 },
[BOOMERANG] = { SAVE_BUTTON, BOMBS, CANE, SWORD, 0x01, 0x15, 0xae, 0x33 },
[SHIELD] = { SWORD, PEGASUS_BOOTS, BOMBS, MOLE_MITTS, 0x01, 0x16, 0x42, 0x4b },
[MOLE_MITTS] = { GUST_JAR, ROCS_CAPE, SHIELD, LANTERN, 0x01, 0x17, 0x66, 0x4b },
[LANTERN] = { CANE, OCARINA, MOLE_MITTS, BOMBS, 0x01, 0x00, 0x8a, 0x4b },
[BOMBS] = { BOOMERANG, BOW, LANTERN, SHIELD, 0x01, 0x00, 0xae, 0x4b },
[PEGASUS_BOOTS] = { SHIELD, BOTTLE0, BOW, ROCS_CAPE, 0x01, 0x00, 0x42, 0x63 },
[ROCS_CAPE] = { MOLE_MITTS, BOTTLE1, PEGASUS_BOOTS, OCARINA, 0x01, 0x00, 0x66, 0x63 },
[OCARINA] = { LANTERN, BOTTLE3, ROCS_CAPE, BOW, 0x01, 0x00, 0x8a, 0x63 },
[BOW] = { BOMBS, SAVE_BUTTON, OCARINA, PEGASUS_BOOTS, 0x01, 0x00, 0xae, 0x63 },
[BOTTLE0] = { PEGASUS_BOOTS, SWORD, SAVE_BUTTON, BOTTLE1, 0x01, 0x00, 0x42, 0x7b },
[BOTTLE1] = { ROCS_CAPE, GUST_JAR, BOTTLE0, BOTTLE2, 0x01, 0x00, 0x5a, 0x7b },
[BOTTLE2] = { ROCS_CAPE, GUST_JAR, BOTTLE1, BOTTLE3, 0x01, 0x00, 0x72, 0x7b },
[BOTTLE3] = { OCARINA, CANE, BOTTLE2, SAVE_BUTTON, 0x01, 0x00, 0x8a, 0x7b },
[SAVE_BUTTON] = { BOW, BOOMERANG, BOTTLE3, BOTTLE0, 0x03, 0x00, 0xb5, 0x75 },
{ BOW, BOOMERANG, BOTTLE3, BOTTLE0, 0x05, 0x00, 0xb5, 0x75 },
};
src/npc/din.c
-2
View File
@@ -5,8 +5,6 @@
#include "functions.h"
#include "save.h"
extern u32 sub_08002632(Entity*);
void Din(Entity* this) {
switch (this->action) {
case 0:
src/npc/guard.c
+2 -2
View File
@@ -85,8 +85,8 @@ void sub_08063DC8(Entity* this) {
InitAnimationForceUpdate(this, this->animationState + 4);
} else {
sub_0806EE20(this);
if (this->field_0x3e != this->animationState) {
this->animationState = this->field_0x3e;
if (this->knockbackDirection != this->animationState) {
this->animationState = this->knockbackDirection;
InitializeAnimation(this, this->animationState + 4);
} else {
GetNextFrame(this);
src/npc/postman.c
+1 -1
View File
@@ -67,7 +67,7 @@ void sub_0806045C(Entity* this) {
TextboxNoOverlapFollow(0);
break;
default:
bVar1 = this->field_0x3e;
bVar1 = this->knockbackDirection;
if (bVar1 != this->animationState) {
this->animationState = bVar1;
InitAnimationForceUpdate(this, 4 + bVar1);
src/object/bakerOven.c
+2 -2
View File
@@ -66,8 +66,8 @@ void sub_0809CD0C(Entity* this) {
ModHealth(-2);
sub_0800449C(&gPlayerEntity, 0x7a);
gPlayerEntity.iframes = 16;
gPlayerEntity.field_0x3e = 16;
gPlayerEntity.field_0x42 = 12;
gPlayerEntity.knockbackDirection = 16;
gPlayerEntity.knockbackDuration = 12;
gPlayerEntity.field_0x46 = 16;
}
}
src/player.c
+17 -17
View File
@@ -199,7 +199,7 @@ void sub_08070D38(Entity* this) {
this->flags &= ~0x80;
this->direction = ((this->animationState & 0xe) << 2) ^ 0x10;
this->speed = 0x100;
this->field_0x42 = 0;
this->knockbackDuration = 0;
this->subAction++;
this->actionDelay = gPlayerState.field_0x38;
this->spriteIndex = 1;
@@ -366,7 +366,7 @@ void sub_08071038(Entity* this) {
if (this->frames.all & 0x80) {
this->attachedEntity = 0;
this->field_0x42 = 0;
this->knockbackDuration = 0;
this->iframes = 248;
gPlayerState.jumpStatus = 0;
sub_080791D0();
@@ -465,7 +465,7 @@ void sub_08071130(Entity* this) {
this->subAction++;
sub_08078F60();
this->field_0x42 = 0;
this->knockbackDuration = 0;
SoundReq(SFX_PLY_LAND);
}
@@ -531,7 +531,7 @@ void sub_080712F0(Entity* this) {
if (temp == FALSE)
return;
this->field_0x42 = 0;
this->knockbackDuration = 0;
this->iframes = 32;
this->spritePriority.b1 = 1;
this->spriteSettings.b.draw = FALSE;
@@ -568,7 +568,7 @@ void PortalJumpOnUpdate(Entity* this) {
u16 y;
this->flags &= ~0x80;
this->field_0x42 = 0;
this->knockbackDuration = 0;
x = gArea.curPortalX;
y = gArea.curPortalY;
@@ -887,7 +887,7 @@ void sub_08071B60(Entity* this) {
gPlayerState.pushedObject = 2;
gPlayerState.flags.all &= ~0x1;
this->type = 0;
this->field_0x42 = 0;
this->knockbackDuration = 0;
sub_080728AC(this);
this->field_0xf = 6;
if ((gPlayerState.flags.all & 0x80) == 0) {
@@ -1139,7 +1139,7 @@ void sub_08071F80(Entity* this) {
void sub_08072008(Entity* this) {
this->iframes = 160;
this->field_0x42 = 0;
this->knockbackDuration = 0;
this->flags |= 0x80;
this->spriteOffsetX = 0;
gPlayerState.flags.all &= ~(0x800 | 0x1);
@@ -1216,7 +1216,7 @@ void sub_08072168(Entity* this) {
gPlayerState.field_0xd = this->direction;
sub_08019840();
if (--this->actionDelay == 0xff) {
this->field_0x42 = 0;
this->knockbackDuration = 0;
this->flags |= 0x80;
UpdateSpriteForCollisionLayer(this);
sub_080791BC();
@@ -1256,7 +1256,7 @@ void sub_08072260(Entity* this) {
} else {
gPlayerState.field_0x8 = 0x944;
}
this->field_0x42 = 0;
this->knockbackDuration = 0;
sub_080791BC();
}
}
@@ -1283,7 +1283,7 @@ void sub_080722DC(Entity* this) {
} else {
this->spriteSettings.b.draw = 0;
this->subAction = 3;
this->field_0x42 = 10;
this->knockbackDuration = 10;
}
gPlayerState.flags.all |= (0x400 | 0x1);
ResetPlayer();
@@ -1299,7 +1299,7 @@ void sub_08072354(Entity* this) {
return;
this->spritePriority.b1 = 0;
this->field_0x42 = 0;
this->knockbackDuration = 0;
this->subAction = 2;
this->actionDelay = 0x3c;
gPlayerState.field_0x8 = 0x2c1;
@@ -1320,7 +1320,7 @@ void sub_080723D0(Entity* this) {
}
void sub_0807240C(Entity* this) {
if (--this->field_0x42 == 0xff) {
if (--this->knockbackDuration == 0xff) {
this->spriteSettings.b.draw = 3;
this->iframes = 0x14;
gPlayerState.flags.all &= ~0x400;
@@ -1360,7 +1360,7 @@ void PlayerRoomTransition(Entity* this) {
}
void sub_080724DC(Entity* this) {
this->field_0x42 = 0;
this->knockbackDuration = 0;
sub_0807A108();
if (sub_080002B8(this) != 0x29) {
if ((gPlayerState.field_0x82[7] == 0) && (gPlayerState.swimState != 0)) {
@@ -1794,7 +1794,7 @@ NONMATCH("asm/non_matching/player/sub_08072D54.inc", void sub_08072D54(Entity* t
}
this->actionDelay = 6;
this->subAction = 3;
this->field_0x42 = 0;
this->knockbackDuration = 0;
SoundReq(0x7d);
}
}
@@ -1816,9 +1816,9 @@ void sub_08072F34(Entity* this) {
gPlayerState.field_0xa8 = 0x18;
gPlayerState.field_0x10[2] = sub_0807A1E8(this, 0, 0);
gUnk_0811BBE4[this->subAction](this);
if (this->field_0x42 != 0) {
if (this->knockbackDuration != 0) {
sub_080792D8();
if (this->field_0x42 == 0) {
if (this->knockbackDuration == 0) {
this->action = 0x1d;
this->subAction = 0;
this->y.HALF.LO = 0;
@@ -1897,7 +1897,7 @@ void sub_08073094(Entity* this) {
switch (gPlayerState.field_0x10[2]) {
case 0x2a:
case 0x2c:
this->field_0x42 = 0;
this->knockbackDuration = 0;
gPlayerState.flags.all |= 0x20000000;
UpdateAnimationSingleFrame(this);
if ((this->frames.all & 0x40) != 0) {
src/projectile/arrowProjectile.c
+2 -2
View File
@@ -34,7 +34,7 @@ void sub_080A9334(Entity* this) {
if ((this->bitfield & 0x3f) != 0) {
ModHealth(-2);
sub_080A9488(this);
this->field_0x42 = 0;
this->knockbackDuration = 0;
this->iframes = 0;
} else {
DeleteThisEntity();
@@ -107,7 +107,7 @@ void sub_080A9488(Entity* this) {
this->flags &= 0x7f;
this->actionDelay = 2;
this->field_0x20 = 0x18000;
this->animationState = (this->field_0x3e & 0x18) >> 3;
this->animationState = (this->knockbackDirection & 0x18) >> 3;
EnqueueSFX(SFX_METAL_CLINK);
sub_080A94C0(this, this->animationState);
}
src/projectile/cannonballProjectile.c
+1 -1
View File
@@ -27,7 +27,7 @@ void sub_080AB544(Entity* this) {
if (this->iframes < -4) {
this->action = 2;
this->direction = this->field_0x3e;
this->direction = this->knockbackDirection;
tmp = (this->type ^ 2) << 3;
if (this->direction - tmp + 1 < 3) {
this->direction = tmp;
src/projectile/dekuSeedProjectile.c
+5 -5
View File
@@ -30,7 +30,7 @@ void sub_080A8470(Entity* this) {
}
DeleteEntity(this);
} else {
this->direction = (this->field_0x3e + 4) & 0x18;
this->direction = DirectionRoundUp(this->knockbackDirection);
if ((u8)(this->bitfield + 0x7e) < 2) {
sub_080A8680(this);
} else {
@@ -74,14 +74,14 @@ void DekuSeedProjectile_Action1(Entity* this) {
parent = this->parent;
if ((parent->next != NULL) && (sub_080177A0(this, parent) != 0)) {
this->iframes = 0x10;
this->field_0x3e = -this->direction;
this->knockbackDirection = -this->direction;
this->bitfield = -0x80;
this->field_0x42 = 0xc;
this->knockbackDuration = 0xc;
this->field_0x46 = 0;
parent->iframes = 0x10;
parent->field_0x3e = this->direction;
parent->knockbackDirection = this->direction;
parent->bitfield = -0x3e;
parent->field_0x42 = 0xc;
parent->knockbackDuration = 0xc;
parent->field_0x46 = 0;
}
}
src/projectile/guardLineOfSight.c
+1 -1
View File
@@ -35,7 +35,7 @@ void GuardLineOfSight(Entity* this) {
entity = CreateProjectile(0xc);
if (entity != NULL) {
entity->type = 1;
tmp = this->parent->field_0x3e;
tmp = this->parent->knockbackDirection;
entity->direction = (gUnk_081299C8[(this->actionDelay >> 2 & 7)] + (tmp << 3)) & 0x1f;
entity->parent = this->parent;
CopyPosition(this, entity);
src/projectile/mandiblesProjectile.c
+3 -3
View File
@@ -66,14 +66,14 @@ void sub_080A9EBC(Entity* this) {
default:
parent = this->parent;
parent->iframes = this->iframes;
parent->field_0x3e = this->field_0x3e;
parent->field_0x42 = this->field_0x42;
parent->knockbackDirection = this->knockbackDirection;
parent->knockbackDuration = this->knockbackDuration;
if (this->action == 1) {
sub_080AA320(this);
}
break;
}
this->field_0x42 = 0;
this->knockbackDuration = 0;
}
}
src/projectile/moblinSpear.c
+4 -4
View File
@@ -27,7 +27,7 @@ void sub_080A832C(Entity* this) {
if (this->bitfield == 0x80) {
this->iframes = 0x10;
this->field_0x42 = 0xc;
this->knockbackDuration = 0xc;
this->field_0x46 = 0x180;
this->parent->bitfield = this->bitfield;
}
@@ -37,10 +37,10 @@ void sub_080A832C(Entity* this) {
} else {
this->parent->iframes = -tmp;
}
this->parent->field_0x42 = this->field_0x42;
this->parent->knockbackDuration = this->knockbackDuration;
this->parent->field_0x46 = this->field_0x46;
this->parent->field_0x3e = this->field_0x3e;
this->field_0x42 = 0;
this->parent->knockbackDirection = this->knockbackDirection;
this->knockbackDuration = 0;
}
void MoblinSpear_Init(Entity* this) {
src/projectile/octorokBossProjectile.c
+3 -3
View File
@@ -84,7 +84,7 @@ void OctorokBossProjectile_Action1(Entity* this) {
if ((this->bitfield & 0x7f) == 0) {
OctorokBossProjectile_Action2(this);
}
this->direction = this->field_0x3e << 3;
this->direction = this->knockbackDirection << 3;
this->speed = 0x400;
this->type2 = 1;
this->actionDelay = 0;
@@ -98,9 +98,9 @@ void OctorokBossProjectile_Action1(Entity* this) {
this->parent->currentHealth -= 1;
this->parent->iframes = 0x1e;
if (this->parent->field_0x7c.BYTES.byte0 != 0) {
this->parent->field_0x42 = 0x18;
this->parent->knockbackDuration = 0x18;
this->parent->field_0x46 = 0x200;
this->parent->field_0x3e = this->direction >> 3;
this->parent->knockbackDirection = this->direction >> 3;
}
SoundReq(SFX_BOSS_HIT);
OctorokBossProjectile_Action2(this);
src/projectile/rockProjectile.c
+1 -1
View File
@@ -23,7 +23,7 @@ void sub_080A8064(Entity* this) {
if (this->bitfield == 0x80) {
DeleteEntity(this);
} else {
this->direction = this->field_0x3e;
this->direction = this->knockbackDirection;
sub_080A8178(this);
}
}
src/projectile/v1DarkMagicProjectile.c
+2 -2
View File
@@ -49,8 +49,8 @@ void sub_080AAC44(Entity* this) {
CopyPosition(this->parent, this);
}
}
if (this->field_0x42 != 0) {
this->field_0x42 = 0;
if (this->knockbackDuration != 0) {
this->knockbackDuration = 0;
}
}
src/script.c
+628
View File
@@ -11,6 +11,7 @@
#include "random.h"
#include "audio.h"
#include "functions.h"
#include "main.h"
void InitScriptForEntity(Entity*, ScriptExecutionContext*, u16*);
void InitScriptExecutionContext(ScriptExecutionContext* context, u16* script);
@@ -301,6 +302,9 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
ScriptCommand_0807F0B4,
ScriptCommand_0807F0C8 };
extern u16* gUnk_08001A7C[];
extern u8 gUnk_08114F30[];
extern u8 gUnk_08114F34[];
extern const u16 gUnk_08016984;
extern u8 gUnk_0811E514[];
extern u8 gUnk_0811E510[];
@@ -1524,3 +1528,627 @@ void ScriptCommand_0807F0B4(Entity* entity, ScriptExecutionContext* context) {
void ScriptCommand_0807F0C8(Entity* entity, ScriptExecutionContext* context) {
sub_08080964(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]);
}
extern u8 gUnk_0811E750[];
extern u8 gUnk_0811E758[];
extern u8 gUnk_0811E760[];
void sub_0807F0D8(Entity* entity, ScriptExecutionContext* context) {
context->condition = (-(u32)gInput.newKeys | ((u32)gInput.newKeys)) >> 0x1f;
}
void sub_0807F0EC(Entity* entity, ScriptExecutionContext* context) {
context->intVariable = (s32)Random() % (s32)context->intVariable;
}
void sub_0807F100(Entity* entity, ScriptExecutionContext* context) {
u32 rand;
rand = Random();
entity->animationState = rand & 6;
context->unk_1A = gUnk_0811E750[(rand >> 8) & 7];
}
void sub_0807F128(Entity* entity, ScriptExecutionContext* context) {
u32 rand;
rand = Random();
entity->animationState = gUnk_0811E758[rand & 7];
context->unk_1A = gUnk_0811E760[(rand >> 8) & 7];
}
void sub_0807F158(Entity* entity, ScriptExecutionContext* context) {
entity->collisionLayer = 1;
UpdateSpriteForCollisionLayer(entity);
}
void sub_0807F168(Entity* entity, ScriptExecutionContext* context) {
gPlayerEntity.collisionLayer = 1;
UpdateSpriteForCollisionLayer(&gPlayerEntity);
}
void sub_0807F180(Entity* entity, ScriptExecutionContext* context) {
entity->collisionLayer = 2;
UpdateSpriteForCollisionLayer(entity);
}
void sub_0807F190(Entity* entity, ScriptExecutionContext* context) {
DoFade(4, 256);
}
void sub_0807F1A0(Entity* entity, ScriptExecutionContext* context) {
sub_0807DEDC(entity, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI);
gActiveScriptInfo.flags |= 1;
}
void sub_0807F1C4(Entity* entity, ScriptExecutionContext* context) {
if ((gPlayerState.flags.all & 8) != 0) {
gPlayerState.field_0x8 = 0x459;
} else {
gPlayerState.field_0x8 = 0x1bc;
}
}
void sub_0807F1E8(Entity* entity, ScriptExecutionContext* context) {
if ((gPlayerState.flags.all & 8) != 0) {
gPlayerState.field_0x8 = 0x45a;
} else {
gPlayerState.field_0x8 = 0x2bd;
}
}
void sub_0807F210(Entity* entity, ScriptExecutionContext* context) {
if ((gPlayerState.flags.all & 8) != 0) {
gPlayerState.field_0x8 = 0x41c;
} else {
gPlayerState.field_0x8 = 0x80c;
}
}
void sub_0807F238(Entity* entity, ScriptExecutionContext* context) {
gPlayerState.field_0x8 = context->intVariable;
}
void sub_0807F244(Entity* entity, ScriptExecutionContext* context) {
u32 slot;
u32 item;
item = context->intVariable & 0xFFFF;
slot = context->intVariable >> 0x10;
item &= 0xFFFF;
switch (item) {
case 1:
case 2:
case 3:
case 4:
case 6:
// Pick greatest sword unlocked
item = 1;
if (GetInventoryValue(2))
item = 2;
if (GetInventoryValue(3))
item = 3;
if (GetInventoryValue(4))
item = 4;
if (GetInventoryValue(6))
item = 6;
break;
}
ForceEquipItem(item, slot);
}
void sub_0807F29C(Entity* entity, ScriptExecutionContext* context) {
sub_0805ED14((void*)context->intVariable);
}
void sub_0807F2A8(Entity* entity, ScriptExecutionContext* context) {
if (gPlayerState.field_0x9c == 0) {
gActiveScriptInfo.flags |= 1;
} else {
gActiveScriptInfo.commandSize = 0;
}
}
void sub_0807F2D4(Entity* entity, ScriptExecutionContext* context) {
if ((entity->frames.all & 0x80) != 0) {
gActiveScriptInfo.flags |= 1;
} else {
gActiveScriptInfo.commandSize = 0;
}
}
void sub_0807F304(Entity* entity, ScriptExecutionContext* context) {
if ((gPlayerEntity.frames.all & 0x80) != 0) {
gActiveScriptInfo.flags |= 1;
} else {
gActiveScriptInfo.commandSize = 0;
}
}
void sub_0807F338(Entity* entity, ScriptExecutionContext* context) {
entity->hitbox = NULL;
entity->field_0x17 &= ~1;
}
void sub_0807F348(Entity* entity, ScriptExecutionContext* context) {
sub_0805E3A0(entity, 2);
}
void sub_0807F354(Entity* entity, ScriptExecutionContext* context) {
sub_0805E3A0(entity, 6);
}
void sub_0807F360(Entity* entity, ScriptExecutionContext* context) {
sub_0805E3A0(entity, 3);
}
void sub_0807F36C(Entity* entity, ScriptExecutionContext* context) {
Entity* fx;
fx = CreateFx(entity, 0x41, 0);
if (fx != NULL) {
fx->spritePriority.b0 = 1;
PositionRelative(entity, fx, 0, -524288);
if (Random() & 1)
fx->spriteSettings.b.flipX = 1;
if (Random() & 1)
fx->spriteSettings.b.flipY = 1;
}
}
void sub_0807F3C8(Entity* entity, ScriptExecutionContext* context) {
sub_0807F36C(entity, context);
SoundReq(SFX_BUTTON_DEPRESS);
}
void sub_0807F3D8(Entity* entity, ScriptExecutionContext* context) {
InitAnimationForceUpdate(entity, context->intVariable + (entity->animationState >> 1));
entity->field_0x80.HWORD = entity->animIndex;
}
void sub_0807F3F8(Entity* entity, ScriptExecutionContext* context) {
CreateSpeechBubbleExclamationMark(&gPlayerEntity, 8, -24);
}
void sub_0807F40C(Entity* entity, ScriptExecutionContext* context) {
CreateSpeechBubbleQuestionMark(&gPlayerEntity, 8, -24);
}
void sub_0807F420(Entity* entity, ScriptExecutionContext* context) {
MenuFadeIn(context->intVariable & 0xff, (u8)(context->intVariable >> 8));
}
void sub_0807F434(Entity* entity, ScriptExecutionContext* context) {
switch (entity->interactType) {
case 1:
entity->interactType = 0;
context->intVariable = 1;
break;
case 2:
entity->interactType = 0;
context->intVariable = 2;
break;
default:
context->intVariable = 0;
break;
}
gActiveScriptInfo.flags |= 1;
}
void sub_0807F464(Entity* entity, ScriptExecutionContext* context) {
s32 s32Var;
if (!context->unk_18) {
context->unk_18++;
context->postScriptActions |= 2;
s32Var = context->intVariable;
context->x.HALF.HI = gRoomControls.roomOriginX + s32Var;
context->y.HALF.HI = entity->y.HALF.HI;
if (s32Var > entity->x.HALF.HI - gRoomControls.roomOriginX) {
entity->direction = 64;
entity->animationState = (entity->animationState & 0x80) | 2;
} else {
entity->direction = -64;
entity->animationState = (entity->animationState & 0x80) | 6;
}
}
sub_0806F62C(entity, entity->speed, entity->direction);
if (((context->x.HALF.HI - entity->x.HALF.HI) ^ ((entity->direction & 0x80) << 24)) < 0)
entity->x.HALF.HI = context->x.HALF.HI;
else
gActiveScriptInfo.commandSize = 0;
}
void sub_0807F4F8(Entity* entity, ScriptExecutionContext* context) {
s32 s32Var;
if (!context->unk_18) {
context->unk_18++;
context->postScriptActions |= 2;
s32Var = context->intVariable;
context->x.HALF.HI = entity->x.HALF.HI;
context->y.HALF.HI = gRoomControls.roomOriginY + s32Var;
if (s32Var > entity->y.HALF.HI - gRoomControls.roomOriginY) {
entity->direction = 128;
entity->animationState = (entity->animationState & 0x80) | 4;
} else {
entity->direction = 0;
entity->animationState = (entity->animationState & 0x80);
}
}
sub_0806F62C(entity, entity->speed, entity->direction);
if (((context->y.HALF.HI - entity->y.HALF.HI) ^ ((entity->direction & 0x80) << 24)) >= 0)
entity->y.HALF.HI = context->y.HALF.HI;
else
gActiveScriptInfo.commandSize = 0;
}
void sub_0807F584(Entity* entity, ScriptExecutionContext* context) {
context->intVariable = gPlayerEntity.animationState >> 1;
}
void sub_0807F594(Entity* entity, ScriptExecutionContext* context) {
if (gPlayerState.field_0xa8)
gActiveScriptInfo.commandSize = 0;
}
void sub_0807F5B0(Entity* entity, ScriptExecutionContext* context) {
gPlayerState.field_0x27[0] = context->intVariable;
}
void sub_0807F5C0(Entity* entity, ScriptExecutionContext* context) {
s32 left;
s32 bottom;
if (gRoomControls.cameraTarget != NULL) {
left = gRoomControls.cameraTarget->x.HALF.HI - DISPLAY_WIDTH / 2;
bottom = gRoomControls.cameraTarget->y.HALF.HI - DISPLAY_HEIGHT / 2;
if (left < gRoomControls.roomOriginX)
left = gRoomControls.roomOriginX;
if (left > gRoomControls.roomOriginX + gRoomControls.width - DISPLAY_WIDTH)
left = gRoomControls.roomOriginX + gRoomControls.width - DISPLAY_WIDTH;
if (bottom < gRoomControls.roomOriginY)
bottom = gRoomControls.roomOriginY;
if (bottom > gRoomControls.roomOriginY + gRoomControls.height - DISPLAY_HEIGHT)
bottom = gRoomControls.roomOriginY + gRoomControls.height - DISPLAY_HEIGHT;
if (left == gRoomControls.roomScrollX && bottom == gRoomControls.roomScrollY)
gActiveScriptInfo.flags |= 1u;
else
gActiveScriptInfo.commandSize = 0;
}
}
void sub_0807F634(Entity* entity, ScriptExecutionContext* context) {
u16* p = (u16*)context->intVariable;
sub_0801DFB4(entity, p[0], p[1], p[2]);
gPlayerState.field_0x8b = 3;
}
void sub_0807F650(Entity* entity, ScriptExecutionContext* context) {
u32 p = sub_08002632(entity);
sub_0801DFB4(entity, gUnk_08001A7C[p][0], gUnk_08001A7C[p][1], gUnk_08001A7C[p][2]);
gPlayerState.field_0x8b = 3;
}
void sub_0807F680(Entity* entity, ScriptExecutionContext* context) {
context->condition = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX > (s32)(context->intVariable & 0xffff);
gActiveScriptInfo.flags |= 1;
}
void sub_0807F6B4(Entity* entity, ScriptExecutionContext* context) {
context->condition = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY > (s32)(context->intVariable & 0xffff);
gActiveScriptInfo.flags |= 1;
}
void sub_0807F6E8(Entity* entity, ScriptExecutionContext* context) {
gPlayerState.flags.all |= context->intVariable;
}
void sub_0807F6F8(Entity* entity, ScriptExecutionContext* context) {
gPlayerState.flags.all &= ~context->intVariable;
}
void sub_0807F708(Entity* entity, ScriptExecutionContext* context) {
ShowNPCDialogue(entity, (Dialog*)context->intVariable);
}
void sub_0807F714(Entity* entity, ScriptExecutionContext* context) {
entity->spriteRendering.b3 = gUnk_08114F30[entity->spriteRendering.b3];
ResolveEntityOnTop(entity, entity);
}
void sub_0807F738(Entity* entity, ScriptExecutionContext* context) {
entity->spriteRendering.b3 = gUnk_08114F34[entity->spriteRendering.b3];
sub_0806FAD8(entity, entity);
}
void sub_0807F75C(Entity* entity, ScriptExecutionContext* context) {
s32 s32Var = context->intVariable;
gPlayerEntity.x.HALF.HI = (s32Var >> 16) + gRoomControls.roomOriginX;
gPlayerEntity.y.HALF.HI = (s32Var & 0xffff) + gRoomControls.roomOriginY;
}
void sub_0807F77C(Entity* entity, ScriptExecutionContext* context) {
if (context->condition)
context->intVariable = 1;
else
context->intVariable = 0;
}
void sub_0807F78C(Entity* entity, ScriptExecutionContext* context) {
u32 item = context->intVariable;
u32 msg;
u32 price;
if (context->intVariable == 0)
item = gRoomVars.itemForSaleIndex;
msg = GetSaleItemConfirmMessageID(item);
price = GetItemPrice(item);
TextboxNoOverlap(msg, entity);
gTextBox.field_0x10 = (u16)price;
}
void sub_0807F7C4(Entity* entity, ScriptExecutionContext* context) {
u32 item = context->intVariable;
u32 msg;
u32 price;
if (context->intVariable == 0)
item = gRoomVars.itemForSaleIndex;
context->condition = GetItemPrice(item) <= gSave.stats.rupees;
gActiveScriptInfo.flags |= 1;
}
void sub_0807F800(Entity* entity, ScriptExecutionContext* context) {
u32 item = context->intVariable;
u32 msg;
u32 price;
if (context->intVariable == 0)
item = gRoomVars.itemForSaleIndex;
price = GetItemPrice(item);
ModRupees(-price);
sub_080A7C18(item, 0, 0);
gRoomVars.itemForSaleIndex = 0;
gActiveScriptInfo.flags |= 1;
}
void sub_0807F83C(Entity* entity, ScriptExecutionContext* context) {
sub_08079184();
}
void sub_0807F844(Entity* entity, ScriptExecutionContext* context) {
gRoomControls.cameraTarget = entity;
sub_080809D4();
}
void sub_0807F854(Entity* entity, ScriptExecutionContext* context) {
u32 value;
u32 idx;
idx = (context->intVariable >> 0x10) & 3;
value = context->intVariable & 0xffff;
switch (idx) {
case 0:
case 1:
gTextBox.field_0x10 = value;
break;
case 2:
gTextBox.field_0x14 = value;
break;
case 3:
gTextBox.field_0x18 = value;
break;
case 4:
gTextBox.field_0x1c = value;
break;
}
}
void sub_0807F8BC(Entity* entity, ScriptExecutionContext* context) {
if (sub_080040A8(entity))
context->condition = 1;
else
context->condition = 0;
}
void sub_0807F8D0(Entity* entity, ScriptExecutionContext* context) {
sub_08003FC4(entity, context->intVariable);
gActiveScriptInfo.flags |= 1;
}
void sub_0807F8E8(Entity* entity, ScriptExecutionContext* context) {
Entity* c = CreateObjectWithParent(entity, 0xA6, 0, 0);
if (c != NULL) {
c->parent = entity;
c->field_0x86.HWORD = (context->intVariable & 0x3ff) | 0x8000;
}
}
void sub_0807F918(Entity* entity, ScriptExecutionContext* context) {
PutItemOnSlot(context->intVariable);
}
void sub_0807F924(Entity* entity, ScriptExecutionContext* context) {
sub_0807879C(entity);
}
void sub_0807F92C(Entity* entity, ScriptExecutionContext* context) {
sub_080787C0(entity);
}
void sub_0807F934(Entity* entity, ScriptExecutionContext* context) {
sub_080787B4(entity);
}
void sub_0807F93C(Entity* entity, ScriptExecutionContext* context) {
CreateSpeechBubbleSleep(entity, (context->intVariable >> 8) & 0xff, context->intVariable & 0xff);
}
void sub_0807F950(Entity* entity, ScriptExecutionContext* context) {
Entity* c = FindEntity(6, 0x56, 6, 0, 2);
if (c != NULL)
DeleteEntity(c);
}
void sub_0807F970(Entity* entity, ScriptExecutionContext* context) {
context->condition = context->intVariable == gCurrentTextBox._28;
}
void sub_0807F98C(Entity* entity, ScriptExecutionContext* context) {
entity->height.WORD = context->intVariable;
}
void sub_0807F994(Entity* entity, ScriptExecutionContext* context) {
entity->spriteOffsetX = (s32)context->intVariable >> 0x10;
entity->spriteOffsetY = context->intVariable & 0xffff;
}
void sub_0807F9A4(Entity* entity, ScriptExecutionContext* context) {
switch (gPlayerState.field_0xa8) {
case 5:
case 7:
case 8:
case 10:
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:
case 17:
case 18:
case 19:
case 20:
case 21:
case 22:
case 23:
case 24:
case 27:
case 28:
gActiveScriptInfo.commandSize = 0;
break;
default:
gActiveScriptInfo.flags |= 1u;
break;
}
}
void sub_0807FA40(Entity* entity, ScriptExecutionContext* context) {
switch (gPlayerState.field_0xa8) {
case 5:
case 7:
case 8:
case 10:
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:
case 17:
case 18:
case 20:
case 21:
case 22:
case 23:
case 24:
case 27:
case 28:
gActiveScriptInfo.commandSize = 0;
break;
default:
gActiveScriptInfo.flags |= 1u;
break;
}
}
void sub_0807FADC(Entity* entity, ScriptExecutionContext* context) {
switch (context->unk_18) {
case 0:
context->unk_18++;
sub_0808C650(entity, context->intVariable);
break;
case 1:
if (sub_0808C67C())
context->unk_18++;
break;
case 2:
sub_0808C688();
return;
}
gActiveScriptInfo.commandSize = 0;
}
void sub_0807FB28(Entity* entity, ScriptExecutionContext* context) {
if (!context->unk_18)
sub_0801D7BC(0x7fff, 1);
context->unk_18++;
if (context->unk_18 >= context->intVariable)
sub_0801D7BC(0, 0);
else
gActiveScriptInfo.commandSize = 0;
}
void sub_0807FB64(Entity* entity, ScriptExecutionContext* context) {
gPlayerEntity.iframes = context->intVariable;
}
void sub_0807FB74(Entity* entity, ScriptExecutionContext* context) {
gPlayerState.swimState = 0;
gPlayerEntity.field_0x3c &= ~4;
}
void sub_0807FB94(Entity* entity, ScriptExecutionContext* context) {
InitScreen(SCREEN_CREDITS);
}
void sub_0807FBA0(Entity* entity, ScriptExecutionContext* context) {
entity->x.HALF.HI = gRoomControls.roomScrollX + 120;
entity->y.HALF.HI = gRoomControls.roomScrollY + 80;
}
void sub_0807FBB4(Entity* entity, ScriptExecutionContext* context) {
gPlayerState.field_0x1a[0] |= 0x80;
}
void sub_0807FBC4(Entity* entity, ScriptExecutionContext* context) {
sub_0805E4A0(entity);
}
void sub_0807FBCC(Entity* entity, ScriptExecutionContext* context) {
sub_0805E4CC(entity);
}
void sub_0807FBD4(Entity* entity, ScriptExecutionContext* context) {
sub_0806F62C(entity, entity->speed, entity->direction);
if (sub_080040A8(entity))
gActiveScriptInfo.commandSize = 0;
}
#ifndef EU
void sub_0807FBFC(Entity* entity, ScriptExecutionContext* context) {
gSave.stats.charm = 0;
gSave.stats.charmTimer = 0;
gSave.stats.unkB = 0;
gSave.stats.unkTimer = 0;
gSave.stats.effect = 0;
gSave.stats.effectTimer = 0;
}
#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP)
void sub_0807FC24(Entity* entity, ScriptExecutionContext* context) {
#if defined(DEMO_JP)
u32 idx = gRoomControls.roomID == 1 ? 0xcf : 0xd0;
#else
u32 idx = gRoomControls.roomID == 1 ? 0xcf : 0xd1;
#endif
SetLocalFlag(idx);
}
#endif
#endif