falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use flag enum in sittingPerson

This commit is contained in:
Tal Hayon 2022-07-11 01:55:51 +03:00
parent 021e77b203
commit c1fa780d2d
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/npc/sittingPerson.c
View File

@ -78,26 +78,16 @@ void sub_08063874(Entity* this) {
this->animationState = this->timer; this->animationState = this->timer;
} }
#if defined(EU) || defined(DEMO_JP) || defined(JP)
#define SUB_0806387C_FLAG 0xd7
#define SUB_0806387C_FLAG2 0xce
#define SUB_0806390C_FLAG 0xd6
#else
#define SUB_0806387C_FLAG 0xda
#define SUB_0806387C_FLAG2 0xd1
#define SUB_0806390C_FLAG 0xd9
#endif
void sub_0806387C(Entity* this) { void sub_0806387C(Entity* this) {
s32 r4 = 3; s32 r4 = 3;
s32 r5; s32 r5;
s32 val, val2; s32 val, val2;
u16* ptr; u16* ptr;
if (CheckLocalFlag(SUB_0806387C_FLAG) == 0) { if (CheckLocalFlag(MACHI_MES_50) == 0) {
r4 = 0; r4 = 0;
SetLocalFlag(SUB_0806387C_FLAG); SetLocalFlag(MACHI_MES_50);
} else { } else {
if (CheckLocalFlag(SUB_0806387C_FLAG2) == 0) { if (CheckLocalFlag(SHOP05_OPEN) == 0) {
r5 = 0; r5 = 0;
for (r4 = 1; r4 <= 0x82; r4++) { for (r4 = 1; r4 <= 0x82; r4++) {
if (ReadBit(gUnk_02002B0E, r4)) { if (ReadBit(gUnk_02002B0E, r4)) {
@ -108,7 +98,7 @@ void sub_0806387C(Entity* this) {
r4 = 1; r4 = 1;
if (r5 > 0x81) { if (r5 > 0x81) {
r4 = 2; r4 = 2;
SetLocalFlag(SUB_0806387C_FLAG2); SetLocalFlag(SHOP05_OPEN);
RestorePrevTileEntity(0xa17, 1); RestorePrevTileEntity(0xa17, 1);
RestorePrevTileEntity(0xa57, 1); RestorePrevTileEntity(0xa57, 1);
} }
@ -125,9 +115,9 @@ void sub_0806387C(Entity* this) {
void sub_0806390C(Entity* this) { void sub_0806390C(Entity* this) {
u32 r5 = 1; u32 r5 = 1;
if (CheckLocalFlag(SUB_0806390C_FLAG) == 0) { if (CheckLocalFlag(MACHI_MES_60) == 0) {
r5 = 0; r5 = 0;
SetLocalFlag(SUB_0806390C_FLAG); SetLocalFlag(MACHI_MES_60);
(*(u32**)&this->cutsceneBeh)[0x5] = 1; (*(u32**)&this->cutsceneBeh)[0x5] = 1;
} }