diff options
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/bigBarrel.c | 2 | ||||
| -rw-r--r-- | src/object/cuccoMinigame.c | 28 | ||||
| -rw-r--r-- | src/object/macroBook.c | 2 | ||||
| -rw-r--r-- | src/object/object9.c | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/object/bigBarrel.c b/src/object/bigBarrel.c index 3bb56c73..1f9f698a 100644 --- a/src/object/bigBarrel.c +++ b/src/object/bigBarrel.c @@ -46,7 +46,7 @@ void sub_08088A68(BigBarrelEntity* this) { super->action = 1; super->spriteSettings.draw = 3; super->updatePriority = 3; - if (CheckGlobalFlag(0x17)) { + if (CheckGlobalFlag(LV1TARU_OPEN)) { super->frameIndex = gSave.unk7 + 1; } else { super->frameIndex = gSave.unk7; diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c index 98ac7aff..dbf623dd 100644 --- a/src/object/cuccoMinigame.c +++ b/src/object/cuccoMinigame.c @@ -194,8 +194,8 @@ void sub_080A13E8(ObjectB9Entity* this) { } break; case 0x63: - if (!CheckGlobalFlag(0x4f)) { - SetGlobalFlag(0x4f); + if (!CheckGlobalFlag(ANJU_HEART)) { + SetGlobalFlag(ANJU_HEART); break; } bVar2 = 1; @@ -243,46 +243,46 @@ void sub_080A14A8(void) { } if (iVar1 & 1) { - SetGlobalFlag(0x4b); + SetGlobalFlag(ANJU_LV_BIT0); } else { - ClearGlobalFlag(0x4b); + ClearGlobalFlag(ANJU_LV_BIT0); } if (iVar1 & 2) { - SetGlobalFlag(0x4c); + SetGlobalFlag(ANJU_LV_BIT1); } else { - ClearGlobalFlag(0x4c); + ClearGlobalFlag(ANJU_LV_BIT1); } if (iVar1 & 4) { - SetGlobalFlag(0x4d); + SetGlobalFlag(ANJU_LV_BIT2); } else { - ClearGlobalFlag(0x4d); + ClearGlobalFlag(ANJU_LV_BIT2); } if (iVar1 & 8) { - SetGlobalFlag(0x4e); + SetGlobalFlag(ANJU_LV_BIT3); } else { - ClearGlobalFlag(0x4e); + ClearGlobalFlag(ANJU_LV_BIT3); } } u32 sub_080A1514(void) { u32 rv = 0; - if (CheckGlobalFlag(0x4b)) { + if (CheckGlobalFlag(ANJU_LV_BIT0)) { rv = 1; } - if (CheckGlobalFlag(0x4c)) { + if (CheckGlobalFlag(ANJU_LV_BIT1)) { rv |= 2; } - if (CheckGlobalFlag(0x4d)) { + if (CheckGlobalFlag(ANJU_LV_BIT2)) { rv |= 4; } - if (CheckGlobalFlag(0x4e)) { + if (CheckGlobalFlag(ANJU_LV_BIT3)) { rv |= 8; } return rv; diff --git a/src/object/macroBook.c b/src/object/macroBook.c index 675ac74c..f981eca7 100644 --- a/src/object/macroBook.c +++ b/src/object/macroBook.c @@ -108,7 +108,7 @@ void MacroBook_Action3(MacroBookEntity* this) { super->timer++; super->frame &= 0xdf; SetPlayerControl(0xff); - SetGlobalFlag(0x2a); + SetGlobalFlag(MIZUKAKI_HARIFALL); default: UpdateAnimationSingleFrame(super); break; diff --git a/src/object/object9.c b/src/object/object9.c index b73f2b8c..b6f7a0a2 100644 --- a/src/object/object9.c +++ b/src/object/object9.c @@ -50,7 +50,7 @@ void Object9(Entity* this) { if ((gMessage.doTextBox & 0x7f) != 0) { default: if (gUnk_03003DF0.unk_4[3] == 50) { - if (CheckKinstoneFused(0x32) == 0) { + if (CheckKinstoneFused(KINSTONE_32) == 0) { uVar2 = 0; break; } |
