flags.c OK

asm/code_0801C85C.s

@@ -1831,8 +1831,8 @@ WriteBit: @ 0x0801D5BC
 	ands r0, r2
 	bx lr
 
-	thumb_func_start sub_0801D5D4
-sub_0801D5D4: @ 0x0801D5D4
+	thumb_func_start ClearBit
+ClearBit: @ 0x0801D5D4
 	lsrs r2, r1, #3
 	adds r3, r0, r2
 	movs r2, #7

asm/code_08056418.s

@@ -9312,7 +9312,7 @@ _0805AC00:
 	bne _0805AC1A
 	adds r0, r7, #0
 	adds r1, r5, #0
-	bl sub_0801D5D4
+	bl ClearBit
 	b _0805ACA6
 _0805AC1A:
 	ldrh r0, [r4, #0xe]

asm/code_0807CAA0.s

@@ -151,55 +151,3 @@ _0807CBCA:
 	adds r0, r1, #0
 	pop {pc}
 	.align 2, 0
-
-	thumb_func_start CheckLocalFlag
-CheckLocalFlag: @ 0x0807CBD0
-	push {lr}
-	adds r1, r0, #0
-	ldr r0, _0807CBE0 @ =gArea
-	ldrh r0, [r0, #4]
-	bl CheckLocalFlagByOffset
-	pop {pc}
-	.align 2, 0
-_0807CBE0: .4byte gArea
-
-	thumb_func_start CheckFlags
-CheckFlags: @ 0x0807CBE4
-	push {lr}
-	ldr r3, _0807CC14 @ =0x000003FF
-	ands r3, r0
-	movs r1, #0xf0
-	lsls r1, r1, #6
-	ands r1, r0
-	lsrs r1, r1, #0xa
-	adds r2, r1, #1
-	movs r1, #0xc0
-	lsls r1, r1, #8
-	ands r1, r0
-	lsrs r1, r1, #0xe
-	cmp r1, #1
-	beq _0807CC22
-	cmp r1, #1
-	blo _0807CC18
-	cmp r1, #2
-	bne _0807CC2C
-	adds r0, r3, #0
-	adds r1, r2, #0
-	bl CheckRoomFlags
-	b _0807CC2E
-	.align 2, 0
-_0807CC14: .4byte 0x000003FF
-_0807CC18:
-	adds r0, r3, #0
-	adds r1, r2, #0
-	bl CheckLocalFlags
-	b _0807CC2E
-_0807CC22:
-	adds r0, r3, #0
-	adds r1, r2, #0
-	bl CheckGlobalFlags
-	b _0807CC2E
-_0807CC2C:
-	movs r0, #0
-_0807CC2E:
-	pop {pc}

asm/code_0807CC3C.s

@@ -5,128 +5,6 @@
 
 	.text
 
-	thumb_func_start SetFlag
-SetFlag: @ 0x0807CCC8
-	push {lr}
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _0807CD02
-	ldr r2, _0807CCF0 @ =0x000003FF
-	ands r2, r1
-	movs r0, #0xc0
-	lsls r0, r0, #8
-	ands r0, r1
-	lsrs r0, r0, #0xe
-	cmp r0, #1
-	beq _0807CCFC
-	cmp r0, #1
-	blo _0807CCF4
-	cmp r0, #2
-	bne _0807CD02
-	adds r0, r2, #0
-	bl SetRoomFlag
-	b _0807CD02
-	.align 2, 0
-_0807CCF0: .4byte 0x000003FF
-_0807CCF4:
-	adds r0, r2, #0
-	bl SetLocalFlag
-	b _0807CD02
-_0807CCFC:
-	adds r0, r2, #0
-	bl SetGlobalFlag
-_0807CD02:
-	pop {pc}
-
-	thumb_func_start SetGlobalFlag
-SetGlobalFlag: @ 0x0807CD04
-	push {lr}
-	adds r1, r0, #0
-	movs r0, #0
-	bl SetLocalFlagByOffset
-	pop {pc}
-
-	thumb_func_start SetRoomFlag
-SetRoomFlag: @ 0x0807CD10
-	push {lr}
-	adds r1, r0, #0
-	ldr r0, _0807CD1C @ =gUnk_02034364
-	bl WriteBit
-	pop {pc}
-	.align 2, 0
-_0807CD1C: .4byte gUnk_02034364
-
-	thumb_func_start ClearLocalFlagByOffset
-ClearLocalFlagByOffset: @ 0x0807CD20
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, _0807CD30 @ =gGlobalFlags
-	adds r2, r2, r1
-	adds r1, r2, #0
-	bl sub_0801D5D4
-	pop {pc}
-	.align 2, 0
-_0807CD30: .4byte gGlobalFlags
-
-	thumb_func_start ClearLocalFlag
-ClearLocalFlag: @ 0x0807CD34
-	push {lr}
-	adds r1, r0, #0
-	ldr r0, _0807CD44 @ =gArea
-	ldrh r0, [r0, #4]
-	bl ClearLocalFlagByOffset
-	pop {pc}
-	.align 2, 0
-_0807CD44: .4byte gArea
-
-	thumb_func_start ClearFlag
-ClearFlag: @ 0x0807CD48
-	push {lr}
-	ldr r2, _0807CD6C @ =0x000003FF
-	ands r2, r0
-	movs r1, #0xc0
-	lsls r1, r1, #8
-	ands r1, r0
-	lsrs r1, r1, #0xe
-	cmp r1, #1
-	beq _0807CD78
-	cmp r1, #1
-	blo _0807CD70
-	cmp r1, #2
-	bne _0807CD7E
-	adds r0, r2, #0
-	bl ClearRoomFlag
-	b _0807CD7E
-	.align 2, 0
-_0807CD6C: .4byte 0x000003FF
-_0807CD70:
-	adds r0, r2, #0
-	bl ClearLocalFlag
-	b _0807CD7E
-_0807CD78:
-	adds r0, r2, #0
-	bl ClearGlobalFlag
-_0807CD7E:
-	pop {pc}
-
-	thumb_func_start ClearGlobalFlag
-ClearGlobalFlag: @ 0x0807CD80
-	push {lr}
-	adds r1, r0, #0
-	movs r0, #0
-	bl ClearLocalFlagByOffset
-	pop {pc}
-
-	thumb_func_start ClearRoomFlag
-ClearRoomFlag: @ 0x0807CD8C
-	push {lr}
-	adds r1, r0, #0
-	ldr r0, _0807CD98 @ =gUnk_02034364
-	bl sub_0801D5D4
-	pop {pc}
-	.align 2, 0
-_0807CD98: .4byte gUnk_02034364
-
 	thumb_func_start sub_0807CD9C
 sub_0807CD9C: @ 0x0807CD9C
 	push {lr}