mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-09 23:01:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use enums across more scripts and files

Browse Source
This commit is contained in:
Tal Hayon
2022-05-14 20:51:30 +03:00
parent 422fb8ed14
commit 968e200c78
259 changed files with 876 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/beanstalkSubtask.c
+1 -1
View File
@@ -53,7 +53,7 @@ void sub_08019698(void) {
Entity* object;
const u16* ptr;
ptr = &gUnk_080B4410[gUI.field_0x3 * 7];
SetLocalFlagByBank(0x100, ptr[2]);
SetLocalFlagByBank(FLAG_BANK_1, ptr[2]);
LoadAuxiliaryRoom(ptr[0], ptr[1]);
gRoomControls.scroll_x += ptr[3];
gRoomControls.scroll_y += ptr[4];
src/enemy/armos.c
+2 -2
View File
@@ -72,9 +72,9 @@ void sub_080300E8(void) {
void sub_08030118(u32 param_1) {
if (((s32)(u32)gRoomTransition.armos_data.field_0xac >> (param_1)&1) != 0) {
SetLocalFlagByBank(0x300, param_1 + 0x67);
SetLocalFlagByBank(FLAG_BANK_3, param_1 + 0x67);
} else {
ClearLocalFlagByBank(0x300, param_1 + 0x67);
ClearLocalFlagByBank(FLAG_BANK_3, param_1 + 0x67);
}
}
src/enemy/gleerok.c
+1 -1
View File
@@ -250,7 +250,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE
u8* ptr;
u8* ptr2;
if (CheckGlobalFlag(3)) {
if (CheckGlobalFlag(LV2_CLEAR)) {
gScreen.lcd.displayControl &= 0xFDFF;
sub_0807AABC(&gPlayerEntity);
DeleteThisEntity();
src/flags.c
+2 -2
View File
@@ -88,7 +88,7 @@ void SetFlag(u32 flag) {
}
void SetGlobalFlag(u32 flag) {
SetLocalFlagByBank(0, flag);
SetLocalFlagByBank(FLAG_BANK_0, flag);
}
void SetRoomFlag(u32 flag) {
@@ -123,7 +123,7 @@ void ClearFlag(u32 flag) {
}
void ClearGlobalFlag(u32 flag) {
ClearLocalFlagByBank(0, flag);
ClearLocalFlagByBank(FLAG_BANK_0, flag);
}
void ClearRoomFlag(u32 flag) {
src/manager/manager27.c
+2 -2
View File
@@ -19,7 +19,7 @@ const u8 gUnk_08108D20[] = { 0x6F, 0x70, 0x71, 0x72, 0x71, 0x70 };
void Manager27_Main(Entity* this) {
gUnk_08108D10[this->action](this);
if (CheckLocalFlagByBank(0x300, this->type + 0x67)) {
if (CheckLocalFlagByBank(FLAG_BANK_3, this->type + 0x67)) {
gRoomTransition.armos_data.field_0xac |= (1 << this->type);
} else {
gRoomTransition.armos_data.field_0xac &= ~(1 << this->type);
@@ -76,5 +76,5 @@ void sub_0805C908(Entity* this) {
}
u32 sub_0805C920(Entity* this) {
return CheckLocalFlagByBank(0x300, this->type + 0x67);
return CheckLocalFlagByBank(FLAG_BANK_3, this->type + 0x67);
}
src/manager/managerF.c
+2 -2
View File
@@ -407,7 +407,7 @@ void sub_080594DC(ManagerF* this) {
case 1:
if (!GetInventoryValue(ITEM_FOURSWORD))
return;
if (CheckLocalFlagByBank(0x8c0, 0x85))
if (CheckLocalFlagByBank(FLAG_BANK_10, 0x85))
return;
this->manager.action = 2;
sub_080186C0(0xB0F);
@@ -417,7 +417,7 @@ void sub_080594DC(ManagerF* this) {
if (gArea.inventoryGfxIdx != 0xFF) {
DeleteThisEntity();
}
if (CheckLocalFlagByBank(0x8c0, 0x85)) {
if (CheckLocalFlagByBank(FLAG_BANK_10, 0x85)) {
sub_0801855C();
DeleteThisEntity();
}
src/npc/castorWildsStatue.c
+1 -5
View File
@@ -76,11 +76,7 @@ void sub_08067418(Entity* this) {
this->spriteOrientation.flipY = 1;
this->spriteRendering.b3 = 1;
this->spritePriority.b0 = 2;
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0x1e) == 0) {
#else
if (CheckLocalFlag(0x1d) == 0) {
#endif
if (CheckLocalFlag(HIKYOU_00_SEKIZOU) == 0) {
SetTile(0x4022, 0xe81, 1);
SetTile(0x4022, 0xe82, 1);
SetTile(0x4022, 0xe83, 1);
src/npc/forestMinish.c
+2 -1
View File
@@ -3,6 +3,7 @@
#include "functions.h"
#include "playeritem.h"
#include "item.h"
#include "kinstone.h"
extern SpriteLoadData gUnk_0810A348;
extern u8* gUnk_08109D18[];
@@ -134,7 +135,7 @@ void sub_080601D4(Entity* this) {
if (CheckGlobalFlag(LV3_CLEAR) == 0) {
uVar2 = 2;
} else if (CheckKinstoneFused(0x17)) {
} else if (CheckKinstoneFused(KINSTONE_17)) {
uVar2 = 1;
} else {
uVar2 = 0;
src/npc/guardWithSpear.c
+1 -1
View File
@@ -219,7 +219,7 @@ void sub_080643D8(GuardWithSpearEntity* this) {
u32 iVar1;
int iVar2;
if (CheckGlobalFlag(2) == 0) {
if (CheckGlobalFlag(LV1_CLEAR) == 0) {
iVar2 = 0;
} else {
if (GetInventoryValue(ITEM_GREEN_SWORD) == 0) {
src/npc/kingDaltus.c
+1 -1
View File
@@ -98,7 +98,7 @@ void sub_0806673C(Entity* this) {
TEXT_INDEX(TEXT_VAATI, 0x2e),
};
u32 index;
if (CheckGlobalFlag(2) == 0) {
if (CheckGlobalFlag(LV1_CLEAR) == 0) {
index = 0;
} else if (GetInventoryValue(ITEM_GREEN_SWORD) == 0) {
index = 1;
src/npc/librarians.c
+1 -1
View File
@@ -112,7 +112,7 @@ void sub_0806BBB0(Entity* this) {
u32 tmp;
if (GetInventoryValue(ITEM_FLIPPERS) == 0) {
if (CheckGlobalFlag(0x29)) {
if (CheckGlobalFlag(MIZUKAKI_START)) {
tmp = 1;
} else {
tmp = 0;
src/npc/ministerPotho.c
+1 -1
View File
@@ -93,7 +93,7 @@ void sub_08066904(Entity* this) {
TEXT_INDEX(TEXT_VAATI, 0x2f),
};
u32 index;
if (CheckGlobalFlag(2) == 0) {
if (CheckGlobalFlag(LV1_CLEAR) == 0) {
index = 0;
} else if (GetInventoryValue(ITEM_GREEN_SWORD) == 0) {
index = 1;
src/npc/npc5.c
+1 -1
View File
@@ -78,7 +78,7 @@ extern u16* gUnk_0810B660[8];
void CreateZeldaFollower(void) {
Entity* npc;
if (CheckGlobalFlag(0x1c) != 0) {
if (CheckGlobalFlag(ZELDA_CHASE) != 0) {
npc = CreateNPC(ZELDA_FOLLOWER, 0, 0);
if (npc != NULL) {
CopyPosition(&gPlayerEntity, npc);
src/npc/percy.c
+2 -1
View File
@@ -2,6 +2,7 @@
#include "entity.h"
#include "npc.h"
#include "functions.h"
#include "kinstone.h"
static const SpriteLoadData gUnk_08112E1C[] = {
{ 0x30f6, 0x47, 0x4 },
@@ -109,7 +110,7 @@ void sub_0806B504(Entity* this) {
int idx;
idx = 1;
if (CheckKinstoneFused(0x21)) {
if (CheckKinstoneFused(KINSTONE_21)) {
idx = 3;
} else if (!CheckLocalFlag(URO_POEMN_TALK)) {
idx = 0;
src/npc/phonograph.c
+2 -2
View File
@@ -62,7 +62,7 @@ void sub_0806E964(Entity* this, ScriptExecutionContext* context) {
}
val2 = 0x1c;
if (CheckGlobalFlag(0x55)) {
if (CheckGlobalFlag(GAMECLEAR)) {
val2 = 0x34;
}
@@ -116,7 +116,7 @@ void sub_0806E964(Entity* this, ScriptExecutionContext* context) {
}
val2 = 0x1c;
if (CheckGlobalFlag(0x55)) {
if (CheckGlobalFlag(GAMECLEAR)) {
val2 = 0x34;
}
val = (s16)this->field_0x68.HWORD;
src/npc/picolyteBottle.c
+2 -1
View File
@@ -7,6 +7,7 @@
#include "object.h"
#include "npc.h"
#include "hitbox.h"
#include "kinstone.h"
typedef struct {
Entity base;
@@ -215,7 +216,7 @@ void sub_0806E23C(void) {
void sub_0806E250(PicolyteBottleEntity* this, ScriptExecutionContext* context) {
context->condition = 0;
if (CheckKinstoneFused(0x31) != 0) {
if (CheckKinstoneFused(KINSTONE_31) != 0) {
context->condition = 1;
}
gActiveScriptInfo.flags |= 1;
src/npc/stamp.c
+2 -1
View File
@@ -4,6 +4,7 @@
#include "functions.h"
#include "effects.h"
#include "npc.h"
#include "kinstone.h"
void sub_08062CA4(Entity*);
void sub_08062BD4(Entity*);
@@ -84,7 +85,7 @@ void sub_08062CBC(Entity* ent) {
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_POST, 0x3), TEXT_INDEX(TEXT_POST, 0x2) } },
};
u32 uVar1;
if (CheckKinstoneFused(44)) {
if (CheckKinstoneFused(KINSTONE_2C)) {
uVar1 = 1;
} else {
uVar1 = 0;
src/npc/tingleSiblings.c
+5 -4
View File
@@ -3,6 +3,7 @@
#include "npc.h"
#include "functions.h"
#include "item.h"
#include "kinstone.h"
extern void sub_08064DE4(Entity*);
extern void sub_08064D78(Entity*);
@@ -86,12 +87,12 @@ void sub_08064EA4(Entity* this) {
this->field_0x68.HALF.LO = sub_0801E99C(this);
switch (this->type) {
case 0:
if ((CheckKinstoneFused(0x59) != 0) && (GetInventoryValue(ITEM_MAGIC_BOOMERANG) == 0)) {
if ((CheckKinstoneFused(KINSTONE_59) != 0) && (GetInventoryValue(ITEM_MAGIC_BOOMERANG) == 0)) {
this->field_0x68.HALF.LO = 0;
}
break;
case 3:
if ((CheckKinstoneFused(0x5a) != 0) && (GetInventoryValue(ITEM_MAGIC_BOOMERANG) == 0)) {
if ((CheckKinstoneFused(KINSTONE_5A) != 0) && (GetInventoryValue(ITEM_MAGIC_BOOMERANG) == 0)) {
this->field_0x68.HALF.LO = 0;
}
break;
@@ -145,12 +146,12 @@ void sub_08064F28(Entity* this, ScriptExecutionContext* context) {
}
iVar4 = 0xffffffff;
} else {
if (CheckGlobalFlag(0x3a) == 0) {
if (CheckGlobalFlag(KAKERA_COMPLETE) == 0) {
iVar4 = 100 - gSave.unk117;
if (iVar4 < 1) {
uVar5 = 8;
iVar4 = 0;
SetGlobalFlag(0x3a);
SetGlobalFlag(KAKERA_COMPLETE);
context->condition = 1;
} else {
uVar5 = 7;
src/object/bigBarrel.c
+1 -1
View File
@@ -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;
src/object/cuccoMinigame.c
+14 -14
View File
@@ -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;
src/object/macroBook.c
+1 -1
View File
@@ -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;
src/object/object9.c
+1 -1
View File
@@ -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;
}
src/roomInit.c
+59 -152
View File
@@ -281,7 +281,7 @@ void sub_StateChange_HouseInteriors1_PostOffice(void) {
u16* flagArr;
s32 j;
if (CheckKinstoneFused(0x2c)) {
if (CheckKinstoneFused(KINSTONE_2C)) {
LoadRoomEntityList(&gUnk_080D6340);
}
j = 0;
@@ -949,26 +949,26 @@ void sub_StateChange_GoronCave_Main(void) {
if (!CheckLocalFlag(GORON_DOUKUTU_APPEAR))
SetLocalFlag(GORON_DOUKUTU_APPEAR);
if (CheckKinstoneFused(0x2f))
if (CheckKinstoneFused(KINSTONE_2F))
LoadRoomEntityList(&gUnk_080D8B24);
else if (CheckKinstoneFused(0x2b))
else if (CheckKinstoneFused(KINSTONE_2B))
LoadRoomEntityList(&gUnk_080D8AC4);
else if (CheckKinstoneFused(0x26))
else if (CheckKinstoneFused(KINSTONE_26))
LoadRoomEntityList(&gUnk_080D8A74);
else if (CheckKinstoneFused(0x2a))
else if (CheckKinstoneFused(KINSTONE_2A))
LoadRoomEntityList(&gUnk_080D8A34);
else if (CheckKinstoneFused(0x25))
else if (CheckKinstoneFused(KINSTONE_25))
LoadRoomEntityList(&gUnk_080D8A04);
else
LoadRoomEntityList(&gUnk_080D89E4);
if (CheckKinstoneFused(0x25))
if (CheckKinstoneFused(KINSTONE_25))
sub_0807BB68(&gUnk_080D8BBC, 0x7c5, 1);
if (CheckKinstoneFused(0x26))
if (CheckKinstoneFused(KINSTONE_26))
sub_0807BB68(&gUnk_080D8BFA, 0x503, 1);
if (CheckKinstoneFused(0x2f))
if (CheckKinstoneFused(KINSTONE_2F))
sub_0807BB68(&gUnk_080D8C68, 0x281, 1);
}
@@ -1102,7 +1102,7 @@ static void sub_0804C128(void) {
if (gArea.unk_0c_1 == 6) {
sub_080AF250(1);
SetGlobalFlag(0x62);
SetGlobalFlag(MAZE_CLEAR);
sub_0804C290();
gArea.unk_0c_1 = 0;
return;
@@ -1110,15 +1110,11 @@ static void sub_0804C128(void) {
if (gArea.unk_0c_4 == 6) {
sub_080AF250(1);
#if defined(EU) || defined(JP) || defined(DEMO_JP)
if (CheckLocalFlag(0x5a) == 0) {
#else
if (CheckLocalFlag(0x5c) == 0) {
#endif
if (CheckLocalFlag(HAKA_01_T0) == 0) {
SetTileType(0x73, 0x107, 1);
}
LoadRoomTileEntities(gUnk_080D9328);
SetGlobalFlag(0x62);
SetGlobalFlag(MAZE_CLEAR);
sub_0804C290();
gArea.unk_0c_4 = 0;
return;
@@ -1222,7 +1218,7 @@ void sub_StateChange_CastorWilds_Main(void) {
SetGlobalFlag(DASHBOOTS);
if (CheckKinstoneFused(0x5b))
if (CheckKinstoneFused(KINSTONE_5B))
LoadRoomEntityList(&gUnk_080D9CC8);
if ((gSave.windcrests & 0x20000000) == 0)
@@ -1785,7 +1781,7 @@ extern EntityData gUnk_080DC4C0;
void sub_StateChange_MinishVillage_Main(void) {
if (!GetInventoryValue(ITEM_JABBERNUT)) {
LoadRoomEntityList(&gUnk_080DC390);
if (!CheckLocalFlagByBank(0x200, 0x80)) {
if (!CheckLocalFlagByBank(FLAG_BANK_2, 0x80)) {
LoadRoomEntityList(&gUnk_080DC3F0);
}
} else {
@@ -2039,20 +2035,12 @@ void sub_StateChange_CloudTops_Bottom(void) {
if (CheckGlobalFlag(KUMOTATSUMAKI)) {
sub_0809F814(0x6de);
}
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0xf0)) {
#else
if (CheckLocalFlag(0xf3)) {
#endif
if (CheckLocalFlag(KUMOUE_02_00)) {
sub_0809F814(0xe0);
} else {
LoadRoomEntityList(&gUnk_080DD7E0);
}
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0xf2)) {
#else
if (CheckLocalFlag(0xf5)) {
#endif
if (CheckLocalFlag(KUMOUE_02_02)) {
sub_0809F814(0xba3);
} else {
LoadRoomEntityList(&gUnk_080DD840);
@@ -2065,11 +2053,7 @@ u32 sub_unk3_Ruins_Entrance(void) {
void sub_StateChange_Ruins_Entrance(void) {
sub_080300E8();
#if defined(JP) || defined(EU) || defined(DEMO_JP)
SetLocalFlag(0x25);
#else
SetLocalFlag(0x24);
#endif
SetLocalFlag(LOST_00_ENTER);
}
u32 sub_unk3_Ruins_Beanstalk(void) {
@@ -2087,7 +2071,7 @@ extern EntityData gUnk_080DDE88;
void sub_StateChange_Ruins_TripleTektites(void) {
if (CheckKinstoneFused(0x41)) {
if (CheckKinstoneFused(KINSTONE_41)) {
LoadRoomEntityList(&gUnk_080DDE88);
}
}
@@ -2127,18 +2111,10 @@ extern EntityData gUnk_080DE200;
void sub_StateChange_Ruins_Armos(void) {
sub_080300E8();
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0x31)) {
#else
if (!CheckLocalFlag(0x30)) {
#endif
if (!CheckLocalFlag(LOST_05_00)) {
LoadRoomEntityList(&gUnk_080DE1E0);
}
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0x32)) {
#else
if (!CheckLocalFlag(0x31)) {
#endif
if (!CheckLocalFlag(LOST_05_01)) {
LoadRoomEntityList(&gUnk_080DE200);
}
}
@@ -3726,7 +3702,7 @@ void sub_StateChange_DarkHyruleCastleOutside_Garden(void) {
LoadRoomEntityList(&gUnk_080EAE60);
}
}
ClearGlobalFlag(0x5d);
ClearGlobalFlag(SEIIKI_BGM);
}
u32 sub_unk3_DarkHyruleCastleOutside_OutsideNorthwest(void) {
@@ -4316,15 +4292,15 @@ u32 sub_unk3_HyruleTown_0(void) {
int iVar3;
UpdateGlobalProgress();
iVar3 = CheckKinstoneFused(0xb);
iVar3 = CheckKinstoneFused(KINSTONE_B);
if (iVar3 != 0) {
iVar3 = CheckGlobalFlag(0x19);
iVar3 = CheckGlobalFlag(TATEKAKE_TOCHU);
if (iVar3 == 0) {
SetGlobalFlag(0x19);
SetGlobalFlag(TATEKAKE_TOCHU);
} else {
iVar3 = CheckGlobalFlag(0x18);
iVar3 = CheckGlobalFlag(TATEKAKE_HOUSE);
if (iVar3 == 0) {
SetGlobalFlag(0x18);
SetGlobalFlag(TATEKAKE_HOUSE);
}
}
}
@@ -4332,7 +4308,7 @@ u32 sub_unk3_HyruleTown_0(void) {
if (gSave.global_progress != 1) {
gCurrentRoomProperties = (void**)*Area_HyruleTown;
} else {
SetGlobalFlag(0x1c);
SetGlobalFlag(ZELDA_CHASE);
uVar1 = gArea.pCurrentRoomInfo->map_x;
uVar2 = gArea.pCurrentRoomInfo->map_y;
gRoomControls.area = 0x15;
@@ -4344,11 +4320,7 @@ u32 sub_unk3_HyruleTown_0(void) {
sub_08052EA0();
sub_0804AF90();
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlag(0xca) == 0) {
#else
if (CheckLocalFlag(0xcd) == 0) {
#endif
if (CheckLocalFlag(MACHI_01_DEMO) == 0) {
SetFade(FADE_IN_OUT | FADE_BLACK_WHITE | FADE_INSTANT, 0x100);
} else {
SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x10);
@@ -4398,10 +4370,10 @@ void sub_StateChange_HyruleTown_0(void) {
if ((!GetInventoryValue(ITEM_KINSTONE_BAG)) && CheckGlobalFlag(LV1_CLEAR)) {
LoadRoomEntityList(&gUnk_080EE88C);
}
if (!CheckKinstoneFused(0x28)) {
if (!CheckKinstoneFused(KINSTONE_28)) {
LoadRoomEntityList(&gUnk_080EE8FC);
}
if (CheckKinstoneFused(0x33)) {
if (CheckKinstoneFused(KINSTONE_33)) {
LoadRoomEntityList(&gUnk_080EE91C);
}
if (CheckGlobalFlag(MACHI_MACHIHOKORI)) {
@@ -4409,7 +4381,7 @@ void sub_StateChange_HyruleTown_0(void) {
} else {
LoadRoomEntityList(&gUnk_080EECBC);
}
if (CheckKinstoneFused(0x1b) && (gSave.global_progress > 3)) {
if (CheckKinstoneFused(KINSTONE_1B) && (gSave.global_progress > 3)) {
if (!(CheckGlobalFlag(NEW_HOUSE_DIN) || CheckGlobalFlag(NEW_HOUSE_NAYRU) ||
CheckGlobalFlag(NEW_HOUSE_FARORE))) {
if (!(CheckGlobalFlag(RENTED_HOUSE_DIN) || CheckGlobalFlag(RENTED_HOUSE_NAYRU) ||
@@ -4441,11 +4413,7 @@ void sub_StateChange_HyruleTown_0(void) {
LoadRoomEntityList(&gUnk_080EEA5C);
}
// rocs cape
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0xcd) && GetInventoryValue(ITEM_ROCS_CAPE)) {
#else
if (!CheckLocalFlag(0xd0) && GetInventoryValue(ITEM_ROCS_CAPE)) {
#endif
if (!CheckLocalFlag(MACHI_07_BELL) && GetInventoryValue(ITEM_ROCS_CAPE)) {
LoadRoomEntityList(&gUnk_080EEABC);
}
if ((gSave.global_progress > 3) && CheckGlobalFlag(INLOCK)) {
@@ -4482,11 +4450,7 @@ void sub_0804E150(void) {
SetTile(pTileData[2], pTileData[1], 1);
}
}
#if defined(JP) || defined(DEMO_JP) || defined(EU)
if (CheckLocalFlag(0xce) == 0) {
#else
if (CheckLocalFlag(0xd1) == 0) {
#endif
if (CheckLocalFlag(SHOP05_OPEN) == 0) {
pTileData = gUnk_080EED7A;
uVar3 = 1 << gSave.global_progress;
for (; pTileData[0] != 0; pTileData += 3) {
@@ -4495,7 +4459,7 @@ void sub_0804E150(void) {
}
}
}
if (CheckGlobalFlag(0x29) == 0) {
if (CheckGlobalFlag(MIZUKAKI_START) == 0) {
pTileData = gUnk_080EED8C;
uVar3 = 1 << gSave.global_progress;
for (; pTileData[0] != 0; pTileData += 3) {
@@ -4632,11 +4596,7 @@ void sub_StateChange_CastleGarden_Main(void) {
}
#endif
}
#if defined(JP) || defined(DEMO_JP) || defined(EU)
if (!CheckLocalFlag(0x9b)) {
#else
if (!CheckLocalFlag(0x9c)) {
#endif
if (!CheckLocalFlag(SOUGEN_08_TORITSUKI)) {
LoadRoomEntityList(&gUnk_080F0800);
SetTileType(0x4072, 600, 1);
SetTileType(0x4072, 0x298, 1);
@@ -4657,17 +4617,9 @@ void sub_StateChange_CastleGarden_Main(void) {
}
SetTileType(0x4072, 600, 1);
SetTileType(0x4072, 0x298, 1);
#if defined(JP) || defined(DEMO_JP) || defined(EU)
if (CheckLocalFlag(0x11)) {
#else
if (CheckLocalFlag(0x10)) {
#endif
if (CheckLocalFlag(MAENIWA_00_WARP)) {
LoadRoomEntityList(&gUnk_080F0920);
#if defined(JP) || defined(DEMO_JP) || defined(EU)
ClearLocalFlag(0x11);
#else
ClearLocalFlag(0x10);
#endif
ClearLocalFlag(MAENIWA_00_WARP);
}
}
sub_080AF284();
@@ -4850,7 +4802,7 @@ extern EntityData gUnk_080F27D8;
extern EntityData gUnk_080F2798;
void sub_StateChange_HouseInteriors2_Percy(void) {
if (CheckKinstoneFused(0x21)) {
if (CheckKinstoneFused(KINSTONE_21)) {
if (!CheckLocalFlag(0x42)) {
if (!CheckLocalFlag(0x43)) {
LoadRoomEntityList(&gUnk_additional_9_HouseInteriors2_Percy);
@@ -5089,7 +5041,7 @@ void sub_StateChange_LakeHylia_Main(void) {
if (CheckGlobalFlag(LV4_CLEAR) && !CheckLocalFlag(4)) {
LoadRoomEntityList(&gUnk_080F3C64);
}
if (CheckKinstoneFused(0x12)) {
if (CheckKinstoneFused(KINSTONE_12)) {
LoadRoomEntityList(&gUnk_080F3C94);
}
if ((gSave.global_progress > 3) && CheckGlobalFlag(TINGLE_TALK1ST)) {
@@ -5249,20 +5201,15 @@ void sub_StateChange_MinishWoods_Main(void) {
if (!CheckGlobalFlag(EZERO_1ST)) {
LoadRoomEntityList(&gUnk_080F4D50);
}
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0x3d)) {
if (!CheckLocalFlag(0x3a)) {
#else
if (!CheckLocalFlag(0x3e)) {
if (!CheckLocalFlag(0x3b)) {
#endif
if (!CheckLocalFlag(MORI_ENTRANCE_1ST)) {
if (!CheckLocalFlag(MORI_00_KOBITO)) {
LoadRoomEntityList(&gUnk_080F4DB0);
} else {
LoadRoomEntityList(&gUnk_080F4DD0);
}
LoadRoomEntityList(&gUnk_080F4DF0);
}
if (CheckKinstoneFused(0x4e)) {
if (CheckKinstoneFused(KINSTONE_4E)) {
LoadRoomEntityList(&gUnk_080F4F10);
}
if ((s32)gSave.windcrests > -1) {
@@ -5304,11 +5251,7 @@ extern EntityData gUnk_080F5308;
void sub_StateChange_SanctuaryEntrance_Main(void) {
if (GetInventoryValue(ITEM_GREEN_SWORD)) {
LoadRoomEntityList(&gUnk_080F5328);
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0x15)) {
#else
if (!CheckLocalFlag(0x14)) {
#endif
if (!CheckLocalFlag(NAKANIWA_00_EZERO)) {
LoadRoomEntityList(&gUnk_080F5308);
}
}
@@ -5498,11 +5441,7 @@ u32 sub_unk3_HouseInteriors3_FigurineHouse(void) {
extern EntityData gUnk_080F5E68;
void sub_StateChange_HouseInteriors3_FigurineHouse(void) {
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlagByBank(0x100, 0xce)) {
#else
if (!CheckLocalFlagByBank(0x100, 0xd1)) {
#endif
if (!CheckLocalFlagByBank(FLAG_BANK_1, SHOP05_OPEN)) {
LoadRoomEntityList(&gUnk_080F5E68);
}
}
@@ -5541,11 +5480,7 @@ void sub_StateChange_HouseInteriors3_Borlov(void) {
}
u32 sub_unk3_WindTribeTower_Entrance(void) {
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckGlobalFlag(KUMOTATSUMAKI) && CheckLocalFlagByBank(0x100, 0xd9)) {
#else
if (CheckGlobalFlag(KUMOTATSUMAKI) && CheckLocalFlagByBank(0x100, 0xdc)) {
#endif
if (CheckGlobalFlag(KUMOTATSUMAKI) && CheckLocalFlagByBank(FLAG_BANK_1, KUMOUE_00_CAP_0)) {
SetGlobalFlag(WARP_EVENT_END);
}
return 1;
@@ -5554,14 +5489,10 @@ u32 sub_unk3_WindTribeTower_Entrance(void) {
extern EntityData gUnk_080F61BC;
void sub_StateChange_WindTribeTower_Entrance(void) {
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckLocalFlagByBank(0x100, 0xd9)) {
#else
if (CheckLocalFlagByBank(0x100, 0xdc)) {
#endif
if (CheckLocalFlagByBank(FLAG_BANK_1, KUMOUE_00_CAP_0)) {
SetLocalFlag(0x90);
}
if (CheckKinstoneFused(0xf)) {
if (CheckKinstoneFused(KINSTONE_F)) {
LoadRoomEntityList(&gUnk_080F61BC);
}
if (!CheckGlobalFlag(WARP_EVENT_END)) {
@@ -5706,11 +5637,7 @@ void sub_StateChange_HyruleField_WesternWoodSouth(void) {
}
u32 sub_unk3_HyruleField_SouthHyruleField(void) {
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0x6b)) {
#else
if (!CheckLocalFlag(0x6d)) {
#endif
if (!CheckLocalFlag(SOUGEN_01_ZELDA)) {
SetFade(FADE_IN_OUT | FADE_BLACK_WHITE | FADE_INSTANT, 256);
}
SetGlobalFlag(OUTDOOR);
@@ -5723,11 +5650,7 @@ extern EntityData gUnk_080F7088;
void sub_StateChange_HyruleField_SouthHyruleField(void) {
Manager18_Main(NULL);
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0x6b)) {
#else
if (!CheckLocalFlag(0x6d)) {
#endif
if (!CheckLocalFlag(SOUGEN_01_ZELDA)) {
LoadRoomEntityList(&gUnk_080F70A8);
ClearGlobalFlag(ZELDA_CHASE);
}
@@ -5803,7 +5726,7 @@ extern EntityData gUnk_080F78A0;
void sub_StateChange_HyruleField_LonLonRanch(void) {
Manager18_Main(0);
if (CheckLocalFlagByBank(0x200, 0x8f)) {
if (CheckLocalFlagByBank(FLAG_BANK_2, 0x8f)) {
if (!CheckGlobalFlag(INLOCK)) {
LoadRoomEntityList(&gUnk_080F77C0);
}
@@ -5813,7 +5736,7 @@ void sub_StateChange_HyruleField_LonLonRanch(void) {
if (CheckGlobalFlag(TABIDACHI) && !GetInventoryValue(ITEM_EARTH_ELEMENT)) {
LoadRoomEntityList(&gUnk_080F7810);
}
if (!CheckKinstoneFused(0x29)) {
if (!CheckKinstoneFused(KINSTONE_29)) {
LoadRoomEntityList(&gUnk_080F7860);
SetTile(0x4072, 0xd88, 1);
SetTile(0x4096, 0xdc8, 1);
@@ -5833,11 +5756,7 @@ u32 sub_unk3_HyruleField_OutsideCastle(void) {
gRoomVars.field_0x6c[0] = &gUnk_080F7CD0;
gRoomVars.field_0x6c[7] = sub_0804F5E8;
}
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(ITEM_RED_SWORD) && !CheckLocalFlag(0x8a)) {
#else
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(ITEM_RED_SWORD) && !CheckLocalFlag(0x8c)) {
#endif
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(ITEM_RED_SWORD) && !CheckLocalFlag(SOUGEN_06_SAIKAI)) {
gRoomVars.field_0x6c[0] = &gUnk_080F7C80;
gRoomVars.field_0x6c[7] = sub_0804F4E4;
gRoomVars.field_0x6c[2] = NULL;
@@ -5859,11 +5778,7 @@ extern EntityData gUnk_080F7D70;
void sub_StateChange_HyruleField_OutsideCastle(void) {
sub_0804F4E4();
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0x89)) {
#else
if (!CheckLocalFlag(0x8b)) {
#endif
if (!CheckLocalFlag(SOUGEN_06_AKINDO)) {
LoadRoomEntityList(&gUnk_080F7D70);
SetTileType(0x174, 0x7a2, 1);
SetTileType(0x174, 0x7a3, 1);
@@ -5883,11 +5798,7 @@ void sub_StateChange_HyruleField_OutsideCastle(void) {
extern EntityData gUnk_080F7DC0;
static void sub_0804F578(void) {
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (!CheckLocalFlag(0x8c)) {
#else
if (!CheckLocalFlag(0x8e)) {
#endif
if (!CheckLocalFlag(SOUGEN_06_SLIDE)) {
LoadRoomEntityList(&gUnk_080F7DC0);
} else {
SetTileType(0x37, 0x94a, 1);
@@ -6053,11 +5964,7 @@ extern EntityData gUnk_080F82E0;
void sub_StateChange_HyruleField_WesternWoodsNorth(void) {
Manager18_Main(NULL);
#if defined(JP) || defined(EU) || defined(DEMO_JP)
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(ITEM_RED_SWORD) && !CheckLocalFlag(0x9b)) {
#else
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(ITEM_RED_SWORD) && !CheckLocalFlag(0x9c)) {
#endif
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(ITEM_RED_SWORD) && !CheckLocalFlag(SOUGEN_08_TORITSUKI)) {
LoadRoomEntityList(&gUnk_080F82E0);
}
}
@@ -6070,7 +5977,7 @@ extern EntityData gUnk_080F8430;
void sub_StateChange_HyruleField_WesternWoodsCenter(void) {
Manager18_Main(NULL);
if (CheckKinstoneFused(0x21) && !CheckLocalFlagByBank(0x200, 0x42)) {
if (CheckKinstoneFused(KINSTONE_21) && !CheckLocalFlagByBank(FLAG_BANK_2, 0x42)) {
LoadRoomEntityList(&gUnk_080F8430);
}
}
@@ -6352,7 +6259,7 @@ void sub_StateChange_VeilFallsCaves_HeartPiece(void) {
extern u32 gUnk_080F9BF8;
u32 sub_unk3_VeilFallsTop_Main(void) {
if (!CheckKinstoneFused(0xe)) {
if (!CheckKinstoneFused(KINSTONE_E)) {
gRoomVars.field_0x6c[0] = &gUnk_080F9BF8;
}
return 1;
@@ -6406,7 +6313,7 @@ extern EntityData gUnk_080F9FA8;
extern EntityData gUnk_080F9F88;
void sub_StateChange_TreeInteriors_WitchHut(void) {
if (CheckKinstoneFused(0x14)) {
if (CheckKinstoneFused(KINSTONE_14)) {
LoadRoomEntityList(&gUnk_080F9FA8);
}
if (!GetInventoryValue(ITEM_QST_MUSHROOM)) {
@@ -6533,7 +6440,7 @@ u32 sub_unk3_TreeInteriors_PercysTreehouse(void) {
extern EntityData gUnk_080FA5D0;
void sub_StateChange_TreeInteriors_PercysTreehouse(void) {
if (!CheckKinstoneFused(0x21)) {
if (!CheckKinstoneFused(KINSTONE_21)) {
LoadRoomEntityList(&gUnk_080FA5D0);
}
}
src/subtask.c
+1 -1
View File
@@ -280,7 +280,7 @@ void sub_08054FAC(void) {
gUpdateVisibleTiles = 1;
SetFade(FADE_INSTANT, 0x10);
gMenu.field_0xa = 0;
if (CheckLocalFlagByBank(0x400, 0x77) && (ptr[2] == 0x2f)) {
if (CheckLocalFlagByBank(FLAG_BANK_4, 0x77) && (ptr[2] == 0x2f)) {
gMenu.field_0xa = 1;
}
}
src/subtask2.c
+1 -1
View File
@@ -1230,7 +1230,7 @@ void sub_080A67C4(u32 param_1) {
}
break;
case 0xb:
if (CheckKinstoneFused(0xe)) {
if (CheckKinstoneFused(KINSTONE_E)) {
iVar4 = 0x71;
}
break;