zeldaret · hytopoulos · Aug 1, 2023 · Jul 4, 2023 · Jul 4, 2023
diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc
@@ -15,14 +15,15 @@ script_0800B6D4:
 	WaitForSyncFlagAndClear 0x00000004
 	SetRoomFlag 0x0000
 	WaitForSyncFlagAndClear 0x00000004
+	//30
 	CheckLocalFlag 0x009f
 	JumpIf script_0800B7A2
 	MessageNoOverlap TEXT_ITEM_GET, 0x7b
 	WaitUntilTextboxCloses
 	CallWithArg CheckMessageEqual, TEXT_ITEM_GET << 8 | 0x7d
 	JumpIf script_0800B6A6
 	WaitUntilTextboxCloses
-	SetLocalFlag 0x009f
+	SetLocalFlag IZUMI_01_FAIRY
 	GivePlayerItem ITEM_WALLET
 	Jump script_0800B698
 	.2byte 0x0000
diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc
@@ -17,9 +17,9 @@ script_08014C4C:
 script_08014C56:
 	Call sub_0806CCB4
 	JumpIfNot script_08014C56
-	CheckLocalFlag 0x0066
+	CheckLocalFlag SORA_ELDER_TALK2ND
 	JumpIf script_08014C7C
-	SetLocalFlag 0x0066
+	SetLocalFlag SORA_ELDER_TALK2ND
 	MessageNoOverlap TEXT_WIND_TRIBE, 0x0d
 	WaitUntilTextboxCloses
 	GivePlayerItem ITEM_LIGHT_ARROW

diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_GregalSick
 	DoPostScriptAction 0x000a
 	SetAnimation 0x0000
 	EndBlock
-	CheckLocalFlag 0x0063
+	CheckLocalFlag SORA_ELDER_RECOVER
 	JumpIf script_08014BE8
 script_08014B48:
 	EndBlock
@@ -54,9 +54,9 @@ script_08014BF2:
 	CheckEntityInteractType
 	JumpIfNot script_08014BF2
 	SetPlayerIdle
-	CheckLocalFlag 0x0065
+	CheckLocalFlag SORA_ELDER_TALK1ST
 	JumpIf script_08014C1C
-	SetLocalFlag 0x0065
+	SetLocalFlag SORA_ELDER_TALK1ST
 	MessageNoOverlap TEXT_WIND_TRIBE, 0x07
 	WaitUntilTextboxCloses
 	SetIntVariable 100

diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc
@@ -3,9 +3,9 @@ SCRIPT_START script_KingDaltusStone
 	BeginBlock
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x000a
-	CheckLocalFlag 0x0071
+	CheckLocalFlag LV6_1d_KEYGET
 	JumpIf script_0800E3E8
-	CheckLocalFlag 0x0096
+	CheckLocalFlag LV6_39_KING
 	JumpIf script_0800E3BE
 	SetAnimation 0x000c
 	CallWithArg sub_0807F8E8, 0x00000000
@@ -28,7 +28,7 @@ script_0800E37A:
 	Wait 0x001e
 	DoPostScriptAction 0x0000
 	FacePlayer
-	SetLocalFlag 0x0096
+	SetLocalFlag LV6_39_KING
 script_0800E3BE:
 	DoPostScriptAction 0x0000
 	_0807E9D4
@@ -44,7 +44,7 @@ script_0800E3C8:
 	Wait 0x000f
 	GivePlayerItem ITEM_SMALL_KEY
 	WaitPlayerGetItem
-	SetLocalFlag 0x0071
+	SetLocalFlag LV6_1d_KEYGET
 	EnablePlayerControl
 script_0800E3E8:
 	_0807E9D4

diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc
@@ -31,7 +31,7 @@ script_0800B684:
 	Jump script_0800B6A6
 script_0800B68E:
 	WaitUntilTextboxCloses
-	SetLocalFlag 0x009e
+	SetLocalFlag IZUMI_00_FAIRY
 	GivePlayerItem ITEM_LARGE_QUIVER
 script_0800B698:
 	WaitPlayerGetItem

diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc
@@ -1,4 +1,4 @@
-@ Hyrule Town Carlov
+@ Hyrule Town ~~Carlov~~ Burlov
 SCRIPT_START script_Carlov
 	BeginBlock
 	_0807E9D4

diff --git a/data/scripts/hyruleTown/script_Librari.inc b/data/scripts/hyruleTown/script_Librari.inc
@@ -28,12 +28,12 @@ script_0800E974:
 	SetAnimation 0x0000
 	StartPlayerScript script_PlayerActivatedTrapCard
 	WaitForSyncFlagAndClear 0x00000001
-	SetLocalFlag 0x0074
+	SetLocalFlag MIZUKAKI_STAIR
 	PlaySound SFX_SECRET
 	Wait 0x00f0
 	MessageFromTarget TEXT_TOWN_MINISH1, 0x26
 	WaitUntilTextboxCloses
-	SetLocalFlag 0x0075
+	SetLocalFlag MIZUKAKI_STAIR_WARP_OK
 script_0800E9E4:
 	WaitUntilTextboxCloses
 	Wait 0x000f

diff --git a/data/scripts/hyruleTown/script_LibrariLater.inc b/data/scripts/hyruleTown/script_LibrariLater.inc
@@ -1,4 +1,4 @@
-@ Library if you talk to him later?
+@ Librari at the lake
 SCRIPT_START script_LibrariLater
 	BeginBlock
 	DoPostScriptAction 0x000a
@@ -14,9 +14,9 @@ script_08012440:
 	SetAnimation 0x0009
 	Call sub_0806B2B4
 	WaitUntilTextboxCloses
-	CheckLocalFlag 0x00b3
+	CheckLocalFlag KHOUSE23_TALK1ST
 	JumpIf script_08012474
-	SetLocalFlag 0x00b3
+	SetLocalFlag KHOUSE23_TALK1ST
 	GivePlayerItem ITEM_HEART_CONTAINER
 	WaitPlayerGetItem
 .ifdef USA

diff --git a/data/scripts/hyruleTown/script_Rem.inc b/data/scripts/hyruleTown/script_Rem.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_Rem
 	SetAnimation 0x0002
 	CheckInventory1 ITEM_PEGASUS_BOOTS
 	JumpIf script_080130B6
-	CheckLocalFlag 0x0060
+	CheckLocalFlag SHOP02_KUTSU_00
 	JumpIf script_08012FD2
 	CheckGlobalFlag DASHBOOTS
 	JumpIf script_RemFallingAsleep

diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc
@@ -84,7 +84,7 @@ script_0801309E:
 	SetAction 0x0001
 	Jump script_0801308A
 script_080130B6:
-	CheckLocalFlag 0x0062
+	CheckLocalFlag NPC37_REM_SLEEP
 	JumpIfNot script_080130C4
 	Call sub_0806A9B0
 script_080130C4:

diff --git a/data/scripts/minishWoods/script_BombMinish.inc b/data/scripts/minishWoods/script_BombMinish.inc
@@ -55,7 +55,7 @@ script_08009FB6:
 	Jump script_08009F86
 script_08009FD2:
 	EndBlock
-	CheckLocalFlag 0x00b0
+	CheckLocalFlag KHOUSE26_REMOCON
 	JumpIf script_0800A024
 script_08009FDC:
 	EndBlock

diff --git a/data/scripts/mtCrenel/script_CutsceneMiscObjectBrokenSword.inc b/data/scripts/mtCrenel/script_CutsceneMiscObjectBrokenSword.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_CutsceneMiscObjectBrokenSword
 	BeginBlock
 	CheckInventory1 ITEM_FIRE_ELEMENT
 	JumpIf script_0800D24C
-	CheckLocalFlag 0x007e
+	CheckLocalFlag OYAKATA_DEMO
 	JumpIf script_0800D242
 	DoPostScriptAction 0x0008
 	EndBlock

diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc
@@ -24,7 +24,7 @@ script_0800B734:
 	Jump script_0800B6A6
 script_0800B794:
 	WaitUntilTextboxCloses
-	SetLocalFlag 0x00a0
+	SetLocalFlag IZUMI_02_FAIRY
 	GivePlayerItem ITEM_BOMBBAG
 	Jump script_0800B698
 script_0800B7A2:

diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_Melari
 	EndBlock
 	CheckInventory1 ITEM_FIRE_ELEMENT
 	JumpIf script_0800CFD2
-	CheckLocalFlag 0x007e
+	CheckLocalFlag OYAKATA_DEMO
 	JumpIfNot script_0800CFD2
 	SetAnimation 0x0008
 script_0800CFD2:
@@ -19,7 +19,7 @@ script_0800CFD2:
 	SetSyncFlag 0x00000020
 	Jump script_0800CFFA
 script_0800CFEC:
-	CheckLocalFlag 0x007e
+	CheckLocalFlag OYAKATA_DEMO
 	JumpIfNot script_0800CFFA
 	SetSyncFlag 0x00000010
 script_0800CFFA:
@@ -60,7 +60,7 @@ script_0800D032:
 	MessageFromTargetPos TEXT_MINISH2, 0x5d, 0x0002
 	Jump script_0800D17C
 script_0800D098:
-	CheckLocalFlag 0x007e
+	CheckLocalFlag OYAKATA_DEMO
 	JumpIfNot script_0800D0A8
 	MessageFromTarget TEXT_MINISH2, 0x3e
 	Jump script_0800D17C
@@ -88,7 +88,7 @@ script_0800D108:
 	JumpIf script_0800D108
 	PlaySound SFX_F8
 	SetSyncFlag 0x00000010
-	SetLocalFlag 0x007e
+	SetLocalFlag OYAKATA_DEMO
 	MessageFromTargetPos TEXT_MINISH2, 0x3e, 0x0002
 	WaitUntilTextboxCloses
 	Wait 0x000f

diff --git a/data/scripts/mtCrenel/script_MountainMinish3.inc b/data/scripts/mtCrenel/script_MountainMinish3.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_MountainMinish3
 script_0800D282:
 	CheckInventory1 ITEM_FIRE_ELEMENT
 	JumpIf script_0800D292
-	CheckLocalFlag 0x007e
+	CheckLocalFlag OYAKATA_DEMO
 	JumpIf script_0800D2EA
 script_0800D292:
 	BeginBlock

diff --git a/data/scripts/westernWood/script_MoblinLady.inc b/data/scripts/westernWood/script_MoblinLady.inc
@@ -12,9 +12,9 @@ script_08012338:
 	SetPlayerIdle
 	MessageFromTarget TEXT_PERCY, 0x04
 	WaitUntilTextboxCloses
-	CheckLocalFlag 0x0042
+	CheckLocalFlag MHOUSE08_03
 	JumpIf script_0801235A
-	SetLocalFlag 0x0042
+	SetLocalFlag MHOUSE08_03
 	GivePlayerItem ITEM_RUPEE50
 	WaitPlayerGetItem
 script_0801235A:

diff --git a/include/room.h b/include/room.h
@@ -237,7 +237,7 @@ void* GetRoomProperty(u32 area, u32 room, u32 property);
 
 bool32 LoadFixedGFX(Entity*, u32);
 void UnloadGFXSlots(Entity*);
-void sub_0804B3C4(TileEntity*);
+void LoadSmallChestTile2(TileEntity*);
 void sub_0804B0B0(u32 arg0, u32 arg1);
 
 void DoExitTransition(const ScreenTransitionData* data);