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

flag routine identification

This commit is contained in:
theo 2020-06-11 17:58:56 -07:00
parent 6f91fbbdb9
commit 1d305716d5
155 changed files with 1205 additions and 1170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/beanstalk.s
View File

@ -56,7 +56,7 @@ _08089D54:
ldrb r0, [r5, #0xe]
cmp r0, #0
beq _08089D74
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08089D6A
b _08089F06

20
asm/bigBarrel.s
View File

@ -40,7 +40,7 @@ sub_08088A68: @ 0x08088A68
orrs r0, r2
strb r0, [r4, #0x11]
movs r0, #0x17
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _08088AA0
ldr r0, _08088A9C @ =gUnk_02002A40
@ -211,7 +211,7 @@ sub_08088BE0: @ 0x08088BE0
push {r4, lr}
adds r4, r0, #0
movs r0, #0x15
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08088C1C
movs r3, #0x78
@ -237,7 +237,7 @@ sub_08088BE0: @ 0x08088BE0
strh r0, [r2, #0x32]
_08088C1C:
movs r0, #0x16
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08088C58
adds r0, r4, #0
@ -376,7 +376,7 @@ _08088CFA:
_08088D28:
strb r0, [r4, #0xf]
ldrb r0, [r4, #0xf]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08088DB0
ldr r1, _08088D48 @ =gUnk_08120C50
@ -393,7 +393,7 @@ _08088D28:
_08088D48: .4byte gUnk_08120C50
_08088D4C:
ldrb r0, [r4, #0xf]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08088DB0
movs r0, #2
@ -513,7 +513,7 @@ _08088E1E:
b _08088E6E
_08088E28:
ldrb r0, [r4, #0xb]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08088E6E
ldrb r0, [r4, #0xc]
@ -666,7 +666,7 @@ _08088F3E:
orrs r0, r1
strb r0, [r4, #0x11]
ldrb r0, [r4, #0xb]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08088F5A
b _0808908E
@ -676,7 +676,7 @@ _08088F5A:
b _0808908E
_08088F62:
ldrb r0, [r4, #0xb]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08088F6E
b _0808908E
@ -777,7 +777,7 @@ _08089020:
bne _0808905C
movs r0, #0x15
movs r1, #2
bl sub_0807CC60
bl CheckLocalFlags
cmp r0, #0
beq _08089048
ldr r0, _08089044 @ =gRoomVars
@ -810,7 +810,7 @@ _0808905C:
str r0, [r2, #0x68]
movs r0, #0x15
movs r1, #2
bl sub_0807CC60
bl CheckLocalFlags
cmp r0, #0
beq _08089088
adds r0, r4, #0

4
asm/bigIceBlock.s
View File

@ -36,7 +36,7 @@ sub_0809975C: @ 0x0809975C
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08099770
bl sub_0805E780
@ -155,7 +155,7 @@ _08099828:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
b _0809986C
.align 2, 0
_08099858: .4byte gUnk_081237B0

6
asm/bigPushableLever.s
View File

@ -112,13 +112,13 @@ sub_08098F90: @ 0x08098F90
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
b _08098FC2
_08098FB8:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CD48
bl ClearFlag
_08098FC2:
adds r0, r4, #0
bl sub_08098FCC
@ -144,7 +144,7 @@ sub_08098FE0: @ 0x08098FE0
adds r6, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _0809906C
strb r0, [r6, #0xb]

6
asm/bigVortex.s
View File

@ -43,7 +43,7 @@ sub_08098D1C: @ 0x08098D1C
ldrh r0, [r0]
cmp r0, #0
beq _08098D44
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _08098D44
strb r5, [r4, #0xc]
@ -76,7 +76,7 @@ sub_08098D6C: @ 0x08098D6C
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08098D9A
movs r0, #2
@ -160,7 +160,7 @@ sub_08098DC4: @ 0x08098DC4
cmp r0, #1
bne _08098E20
movs r0, #0x23
bl sub_0807CD04
bl SetGlobalFlag
_08098E20:
bl sub_08077B20
_08098E24:

6
asm/bird.s
View File

@ -225,7 +225,7 @@ sub_0809D0AC: @ 0x0809D0AC
adds r0, #0x38
strb r1, [r0]
movs r0, #0x45
bl sub_0807CCB4
bl SetLocalFlag
movs r0, #0x72
bl PlaySFX
adds r0, r4, #0
@ -868,7 +868,7 @@ _0809D5E6:
movs r0, #0
strb r0, [r1]
movs r0, #0x52
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _0809D62E
movs r0, #0x69
@ -884,7 +884,7 @@ _0809D5E6:
adds r1, #0x84
str r0, [r1]
movs r0, #0x52
bl sub_0807CD04
bl SetGlobalFlag
_0809D62E:
adds r0, r5, #0
bl sub_0806F69C

2
asm/bladeBrothers.s
View File

@ -492,7 +492,7 @@ _08068D4C:
b _08068DAA
_08068D50:
movs r0, #3
bl sub_0807CBD0
bl CheckLocalFlag
b _08068DAE
_08068D58:
ldr r0, _08068D64 @ =gUnk_02002A40

8
asm/bollard.s
View File

@ -48,7 +48,7 @@ sub_0808B2CC: @ 0x0808B2CC
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808B31C
b _0808B2F4
@ -56,7 +56,7 @@ _0808B2E6:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _0808B31C
_0808B2F4:
@ -110,7 +110,7 @@ sub_0808B344: @ 0x0808B344
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _0808B384
b _0808B36C
@ -118,7 +118,7 @@ _0808B35E:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808B384
_0808B36C:

6
asm/book.s
View File

@ -37,7 +37,7 @@ sub_0809B3C4: @ 0x0809B3C4
b _0809B3FE
_0809B3E2:
movs r0, #0x73
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0809B3F0
bl sub_0805E780
@ -57,7 +57,7 @@ _0809B3FE:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809B424
ldrb r0, [r4, #0xb]
@ -265,7 +265,7 @@ sub_0809B56C: @ 0x0809B56C
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
adds r0, r4, #0
movs r1, #2
movs r2, #0

8
asm/bossDoor.s
View File

@ -31,7 +31,7 @@ sub_0808C1FC: @ 0x0808C1FC
cmp r1, r0
beq _0808C21A
adds r0, r1, #0
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808C21A
bl sub_0805E780
@ -41,7 +41,7 @@ _0808C21A:
ldrh r0, [r1]
cmp r0, #0
beq _0808C230
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808C230
bl sub_0805E780
@ -181,7 +181,7 @@ sub_0808C320: @ 0x0808C320
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
_0808C344:
pop {r4, pc}
.align 2, 0
@ -371,7 +371,7 @@ sub_0808C4A4: @ 0x0808C4A4
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808C4B8
movs r0, #2

18
asm/businessScrub.s
View File

@ -110,7 +110,7 @@ sub_08028994: @ 0x08028994
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080289FC
_080289D4:
@ -446,7 +446,7 @@ _08028C66:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
adds r0, r4, #0
bl sub_0802925C
_08028C76:
@ -585,7 +585,7 @@ _08028D70:
movs r1, #3
bl sub_080290E0
movs r0, #0x87
bl sub_0807CCB4
bl SetLocalFlag
b _08028DE2
.align 2, 0
_08028D98: .4byte gUnk_080CC9C0
@ -687,11 +687,11 @@ sub_08028E40: @ 0x08028E40
movs r0, #1
strb r0, [r4, #0xe]
ldrh r0, [r5, #0xa]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08028E6C
ldrh r0, [r5, #0xa]
bl sub_0807CCB4
bl SetLocalFlag
_08028E6C:
movs r0, #0
bl sub_08078A90
@ -1118,7 +1118,7 @@ _0802917E:
b _0802918C
_08029186:
movs r0, #0x5a
bl GetProgressFlag
bl CheckGlobalFlag
_0802918C:
cmp r0, #0
bne _08029194
@ -1153,14 +1153,14 @@ _080291B6:
b _080291D8
_080291BC:
movs r0, #0x5a
bl GetProgressFlag
bl CheckGlobalFlag
b _080291D0
_080291C4:
bl GetInventoryValue
b _080291D0
_080291CA:
ldrh r0, [r2, #0xa]
bl sub_0807CBD0
bl CheckLocalFlag
_080291D0:
cmp r0, #0
beq _080291D8
@ -1235,7 +1235,7 @@ sub_0802922C: @ 0x0802922C
cmp r0, #0x1c
bne _08029252
movs r0, #0x5a
bl sub_0807CD04
bl SetGlobalFlag
_08029252:
adds r0, r4, #0
movs r1, #3

6
asm/button.s
View File

@ -79,7 +79,7 @@ _08081B0E:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08081B70
movs r0, #5
@ -239,7 +239,7 @@ _08081C70:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CD48
bl ClearFlag
adds r0, r4, #0
adds r0, #0x74
ldrh r1, [r0]
@ -672,7 +672,7 @@ _08081FA4:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
adds r6, r4, #0
adds r6, #0x74
ldrh r1, [r6]

2
asm/carpenter.s
View File

@ -193,7 +193,7 @@ sub_080672C8: @ 0x080672C8
cmp r0, #0
bne _080672E4
movs r0, #0x15
bl GetProgressFlag
bl CheckGlobalFlag
rsbs r1, r0, #0
orrs r1, r0
lsrs r4, r1, #0x1f

6
asm/castleMaid.s
View File

@ -182,19 +182,19 @@ sub_0806464C: @ 0x0806464C
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0x15
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0806465E
movs r4, #2
b _08064674
_0806465E:
movs r0, #0xa0
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08064672
movs r4, #0
movs r0, #0xa0
bl sub_0807CCB4
bl SetLocalFlag
b _08064674
_08064672:
movs r4, #1

2
asm/castorWildsStatue.s
View File

@ -179,7 +179,7 @@ _08067494:
orrs r0, r1
strb r0, [r2]
movs r0, #0x1d
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _080674F8
ldr r4, _08067500 @ =0x00004022

14
asm/chestSpawner.s
View File

@ -76,7 +76,7 @@ sub_08083E4C: @ 0x08083E4C
ldr r0, _08083E80 @ =gUnk_0811F8B0
str r0, [r4, #0x48]
ldrb r0, [r4, #0xb]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08083E84
ldrb r1, [r4, #0x18]
@ -100,7 +100,7 @@ _08083E84:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _08083E98
ldrb r0, [r4, #0xa]
@ -127,7 +127,7 @@ sub_08083EB0: @ 0x08083EB0
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08083F0A
ldr r1, _08083F0C @ =gScreen
@ -344,7 +344,7 @@ _08084060:
bl sub_08084074
_0808406A:
ldrb r0, [r4, #0xb]
bl sub_0807CCB4
bl SetLocalFlag
_08084070:
pop {r4, pc}
.align 2, 0
@ -533,7 +533,7 @@ _080841D2:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08084200
movs r0, #3
@ -562,7 +562,7 @@ sub_0808420C: @ 0x0808420C
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08084220
movs r0, #2
@ -637,7 +637,7 @@ _0808429C:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _080842D4
adds r1, r4, #0

6
asm/clothesRack.s
View File

@ -31,18 +31,18 @@ sub_0806DD90: @ 0x0806DD90
movs r0, #1
strb r0, [r7, #0xc]
movs r0, #0x3b
bl GetProgressFlag
bl CheckGlobalFlag
rsbs r1, r0, #0
orrs r1, r0
lsrs r4, r1, #0x1f
movs r0, #0x3c
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0806DDB8
movs r4, #2
_0806DDB8:
movs r0, #0x3d
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0806DDC4
movs r4, #3

6
asm/cloud.s
View File

@ -141,7 +141,7 @@ sub_0809F5B0: @ 0x0809F5B0
movs r0, #0x73
bl PlaySFX
movs r0, #0x24
bl sub_0807CD04
bl SetGlobalFlag
ldr r0, _0809F5D8 @ =gUnk_080DD750
bl LoadRoomEntityList
bl sub_0805E780
@ -168,7 +168,7 @@ sub_0809F5F0: @ 0x0809F5F0
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xe]
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _0809F614
movs r0, #2
@ -199,7 +199,7 @@ sub_0809F61C: @ 0x0809F61C
cmp r0, #0x1e
bne _0809F638
ldrb r0, [r4, #0xb]
bl sub_0807CCB4
bl SetLocalFlag
_0809F638:
ldrb r0, [r4, #0xe]
subs r0, #1

8
asm/code_08018500.s
View File

@ -124,7 +124,7 @@ _080185D4:
adds r0, r0, r1
ldrh r0, [r0]
ldrb r1, [r2, #1]
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
b _080185F6
.align 2, 0
_080185EC: .4byte gUnk_0811E454
@ -419,7 +419,7 @@ _08018838:
b _080189E4
_0801883E:
ldrh r0, [r5, #0x12]
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0801884A
b _080189E4
@ -628,7 +628,7 @@ _080189D0:
movs r0, #0x80
lsls r0, r0, #1
movs r1, #0x79
bl sub_0807CC9C
bl SetLocalFlagByOffset
ldr r0, _080189E8 @ =gUnk_080FEE38
bl LoadRoomEntityList
_080189E4:
@ -903,7 +903,7 @@ sub_08018BB4: @ 0x08018BB4
mov r0, sp
bl sub_0804B3C4
ldrb r0, [r5, #1]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08018C10
ldrh r3, [r5, #4]

2
asm/code_08019444.s
View File

@ -319,7 +319,7 @@ sub_08019698: @ 0x08019698
movs r0, #0x80
lsls r0, r0, #1
ldrh r1, [r4, #4]
bl sub_0807CC9C
bl SetLocalFlagByOffset
ldrh r0, [r4]
ldrh r1, [r4, #2]
bl sub_08052FD8

6
asm/code_0801D79C.s
View File

@ -623,7 +623,7 @@ _0801DC26:
ldrb r1, [r4, #1]
mov r0, r8
str r3, [sp]
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
ldr r3, [sp]
cmp r0, #0
bne _0801DCA6
@ -695,7 +695,7 @@ _0801DCAE:
ldr r0, _0801DD4C @ =gUnk_02033A90
ldrb r0, [r0, #3]
adds r0, #1
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _0801DD16
ldr r0, _0801DD50 @ =gUnk_0811E214
@ -1077,7 +1077,7 @@ sub_0801DF90: @ 0x0801DF90
_0801DF9A:
ldrb r1, [r0, #1]
adds r0, r2, #0
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
b _0801DFB2
_0801DFA4:
cmp r1, #1

4
asm/code_0804AA84.s
View File

@ -296,7 +296,7 @@ sub_0804ACC8: @ 0x0804ACC8
ldr r0, _0804ACF0 @ =gUnk_02033A90
ldrb r0, [r0, #0x17]
adds r0, #0x5e
bl sub_0807CD04
bl SetGlobalFlag
ldr r0, _0804ACF4 @ =gUnk_02032EDC
bl sub_0804AD6C
movs r0, #0
@ -351,7 +351,7 @@ _0804AD38: @ jump table
_0804AD54:
ldrb r0, [r2, #0x17]
adds r0, #0x5e
bl GetProgressFlag
bl CheckGlobalFlag
adds r1, r0, #0
cmp r1, #0
bne _0804AD68

72
asm/code_0804B058.s
View File

@ -171,7 +171,7 @@ _0804B170:
cmp r0, #0
beq _0804B198
ldrb r0, [r4, #1]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B198
ldrh r3, [r4, #4]
@ -312,7 +312,7 @@ _0804B28C: .4byte gUnk_02033A90
sub_0804B290: @ 0x0804B290
push {lr}
ldrb r0, [r0, #1]
bl sub_0807CCB4
bl SetLocalFlag
pop {pc}
.align 2, 0
@ -342,7 +342,7 @@ _0804B2A4:
cmp r0, #0
beq _0804B2FC
ldrb r0, [r4, #1]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0804B2FC
ldrb r1, [r4, #1]
@ -407,7 +407,7 @@ sub_0804B340: @ 0x0804B340
push {r4, lr}
adds r4, r0, #0
ldrh r0, [r4, #2]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B35A
ldrh r0, [r4, #6]
@ -701,7 +701,7 @@ sub_0804B4E4: @ 0x0804B4E4
cmp r0, #0
beq _0804B4FC
movs r0, #0x56
bl sub_0807CD04
bl SetGlobalFlag
_0804B4FC:
pop {pc}
.align 2, 0
@ -883,7 +883,7 @@ _0804B602:
cmp r5, #0
bge _0804B5F4
movs r0, #0x8b
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B648
ldr r4, _0804B620 @ =gUnk_080D6508
@ -900,67 +900,67 @@ _0804B628:
cmp r5, r6
bge _0804B648
ldrh r0, [r4]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0804B624
ldrh r0, [r4]
bl sub_0807CCB4
bl SetLocalFlag
movs r0, #0x8b
bl sub_0807CD34
bl ClearLocalFlag
movs r0, #0x8c
bl sub_0807CCB4
bl SetLocalFlag
_0804B648:
movs r0, #0x1f
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B658
ldr r0, _0804B6CC @ =gUnk_080D6360
bl LoadRoomEntityList
_0804B658:
movs r0, #0x20
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B668
ldr r0, _0804B6D0 @ =gUnk_080D6380
bl LoadRoomEntityList
_0804B668:
movs r0, #0x21
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B678
ldr r0, _0804B6D4 @ =gUnk_080D63A0
bl LoadRoomEntityList
_0804B678:
movs r0, #0x22
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B688
ldr r0, _0804B6D8 @ =gUnk_080D63C0
bl LoadRoomEntityList
_0804B688:
movs r0, #0x23
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B698
ldr r0, _0804B6DC @ =gUnk_080D63E0
bl LoadRoomEntityList
_0804B698:
movs r0, #0x24
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B6A8
ldr r0, _0804B6E0 @ =gUnk_080D6400
bl LoadRoomEntityList
_0804B6A8:
movs r0, #0x25
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B6B8
ldr r0, _0804B6E4 @ =gUnk_080D6420
bl LoadRoomEntityList
_0804B6B8:
movs r0, #0x26
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B6C8
ldr r0, _0804B6E8 @ =gUnk_080D6440
@ -992,7 +992,7 @@ sub_0804B6F0: @ 0x0804B6F0
ldr r0, _0804B714 @ =gUnk_080D6578
bl LoadRoomEntityList
movs r0, #0x73
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0804B722
ldr r0, _0804B718 @ =gUnk_080D6638
@ -1033,11 +1033,11 @@ _0804B748:
cmp r0, #0
bne _0804B77C
movs r0, #0x29
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0804B77C
movs r0, #0x6a
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B77C
ldr r0, _0804B778 @ =gUnk_080D6734
@ -1079,7 +1079,7 @@ _0804B7A4: .4byte gUnk_080D6924
sub_0804B7A8: @ 0x0804B7A8
push {r4, lr}
movs r0, #0x91
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B7C8
bl Random
@ -1087,12 +1087,12 @@ sub_0804B7A8: @ 0x0804B7A8
bl __modsi3
adds r4, r0, #0
movs r0, #1
bl sub_0807CD34
bl ClearLocalFlag
b _0804B7D0
_0804B7C8:
movs r4, #0
movs r0, #1
bl sub_0807CCB4
bl SetLocalFlag
_0804B7D0:
ldr r2, _0804B7E0 @ =gRoomVars
ldr r1, _0804B7E4 @ =gUnk_080D6A74
@ -1110,11 +1110,11 @@ _0804B7E4: .4byte gUnk_080D6A74
sub_0804B7E8: @ 0x0804B7E8
push {lr}
movs r0, #0x91
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B81E
movs r0, #0x91
bl sub_0807CD34
bl ClearLocalFlag
movs r1, #0x80
lsls r1, r1, #1
movs r0, #5
@ -1142,7 +1142,7 @@ _0804B828: .4byte gUnk_08010A5C
sub_0804B82C: @ 0x0804B82C
push {r4, lr}
movs r0, #0x91
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B84A
bl Random
@ -1150,12 +1150,12 @@ sub_0804B82C: @ 0x0804B82C
movs r0, #1
ands r4, r0
movs r0, #2
bl sub_0807CD34
bl ClearLocalFlag
b _0804B852
_0804B84A:
movs r4, #0
movs r0, #2
bl sub_0807CCB4
bl SetLocalFlag
_0804B852:
ldr r2, _0804B864 @ =gRoomVars
ldr r1, _0804B868 @ =gUnk_080D6B18
@ -1173,11 +1173,11 @@ _0804B868: .4byte gUnk_080D6B18
sub_0804B86C: @ 0x0804B86C
push {lr}
movs r0, #0x91
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B8A2
movs r0, #0x91
bl sub_0807CD34
bl ClearLocalFlag
movs r1, #0x80
lsls r1, r1, #1
movs r0, #5
@ -1205,7 +1205,7 @@ _0804B8AC: .4byte gUnk_08010A5C
sub_0804B8B0: @ 0x0804B8B0
push {r4, lr}
movs r0, #0x91
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B8D0
bl Random
@ -1213,12 +1213,12 @@ sub_0804B8B0: @ 0x0804B8B0
bl __modsi3
adds r4, r0, #0
movs r0, #3
bl sub_0807CD34
bl ClearLocalFlag
b _0804B8D8
_0804B8D0:
movs r4, #0
movs r0, #3
bl sub_0807CCB4
bl SetLocalFlag
_0804B8D8:
ldr r2, _0804B8E8 @ =gRoomVars
ldr r1, _0804B8EC @ =gUnk_080D6BB8
@ -1236,11 +1236,11 @@ _0804B8EC: .4byte gUnk_080D6BB8
sub_0804B8F0: @ 0x0804B8F0
push {lr}
movs r0, #0x91
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0804B926
movs r0, #0x91
bl sub_0807CD34
bl ClearLocalFlag
movs r1, #0x80
lsls r1, r1, #1
movs r0, #5

562
asm/code_0804B9F8.s
View File

File diff suppressed because it is too large Load Diff

50
asm/code_080526F8.s
View File

@ -188,7 +188,7 @@ sub_0805283C: @ 0x0805283C
movs r0, #0x8c
lsls r0, r0, #4
movs r1, #0x7c
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _08052864
movs r0, #0x33
@ -1272,14 +1272,14 @@ sub_080530C8: @ 0x080530C8
lsls r5, r5, #2
adds r0, r5, #0
movs r1, #0x78
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _080530E0
movs r4, #9
b _08053138
_080530E0:
movs r0, #6
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080530EE
movs r4, #8
@ -1287,21 +1287,21 @@ _080530E0:
_080530EE:
adds r0, r5, #0
movs r1, #0x32
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _080530FE
movs r4, #7
b _08053138
_080530FE:
movs r0, #5
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0805310C
movs r4, #6
b _08053138
_0805310C:
movs r0, #4
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0805311A
movs r4, #5
@ -1310,14 +1310,14 @@ _0805311A:
movs r0, #0x80
lsls r0, r0, #1
movs r1, #0x9c
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _0805312C
movs r4, #4
b _08053138
_0805312C:
movs r0, #2
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _08053138
movs r4, #2
@ -1332,7 +1332,7 @@ _08053140: .4byte gUnk_02002A40
sub_08053144: @ 0x08053144
push {lr}
movs r0, #0x51
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _08053154
movs r0, #0
@ -1370,11 +1370,11 @@ sub_08053178: @ 0x08053178
adds r0, #0x2e
strb r1, [r0]
movs r0, #0x15
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080531E6
movs r0, #0x51
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080531DC
bl sub_0805E8D4
@ -1729,11 +1729,11 @@ sub_08053460: @ 0x08053460
movs r0, #0x8c
lsls r0, r0, #4
movs r1, #0x79
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _08053480
movs r0, #0x1c
bl sub_0807CD80
bl ClearGlobalFlag
_08053480:
ldr r0, _08053490 @ =gUnk_080FCB38
bl sub_0805356C
@ -1763,12 +1763,12 @@ sub_080534AC: @ 0x080534AC
lsls r4, r4, #4
adds r0, r4, #0
movs r1, #0x7c
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _080534D6
adds r0, r4, #0
movs r1, #0x7c
bl sub_0807CD20
bl ClearLocalFlagByOffset
ldr r0, _080534D8 @ =gUnk_02002A40
ldr r1, _080534DC @ =0x0000048C
adds r0, r0, r1
@ -1821,32 +1821,32 @@ sub_08053518: @ 0x08053518
ldr r0, _08053568 @ =gUnk_080FCB62
bl sub_0805356C
movs r0, #0x1b
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _08053534
movs r0, #0x1a
bl sub_0807CD80
bl ClearGlobalFlag
_08053534:
movs r0, #0x40
bl GetInventoryValue
cmp r0, #0
bne _08053544
movs r0, #2
bl sub_0807CD80
bl ClearGlobalFlag
_08053544:
movs r0, #0x41
bl GetInventoryValue
cmp r0, #0
bne _08053554
movs r0, #3
bl sub_0807CD80
bl ClearGlobalFlag
_08053554:
movs r0, #0x42
bl GetInventoryValue
cmp r0, #0
bne _08053564
movs r0, #5
bl sub_0807CD80
bl ClearGlobalFlag
_08053564:
pop {pc}
.align 2, 0
@ -1864,7 +1864,7 @@ sub_0805356C: @ 0x0805356C
_0805357A:
ldrh r0, [r4]
ldrh r1, [r4, #2]
bl sub_0807CD20
bl ClearLocalFlagByOffset
adds r4, #4
ldrh r0, [r4]
cmp r0, r5
@ -2579,7 +2579,7 @@ _08053B0C: .4byte gUnk_02000080
sub_08053B10: @ 0x08053B10
push {lr}
movs r0, #1
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08053B34
ldr r0, _08053B38 @ =gUnk_02000080
@ -2665,7 +2665,7 @@ _08053BB8: .4byte gUnk_02000080
sub_08053BBC: @ 0x08053BBC
push {lr}
movs r0, #0
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08053BE0
ldr r0, _08053BE4 @ =gUnk_02000080
@ -2860,7 +2860,7 @@ sub_08053D34: @ 0x08053D34
lsls r4, r4, #3
adds r0, r4, #0
movs r1, #0x3d
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _08053D5C
movs r0, #0x74
@ -2870,7 +2870,7 @@ sub_08053D34: @ 0x08053D34
_08053D5C:
adds r0, r4, #0
movs r1, #0x3e
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _08053D72
movs r0, #0x74

34
asm/code_0805436C.s
View File

@ -740,7 +740,7 @@ sub_0805488C: @ 0x0805488C
bl sub_08054974
bl sub_0806F364
movs r0, #0xff
bl sub_0807CD8C
bl ClearRoomFlag
bl sub_080548E8
pop {r4, pc}
.align 2, 0
@ -900,7 +900,7 @@ sub_08054A14: @ 0x08054A14
adds r0, r0, r1
ldrh r0, [r0]
ldrh r1, [r2, #0x12]
bl sub_0807CC9C
bl SetLocalFlagByOffset
_08054A34:
pop {pc}
.align 2, 0
@ -1184,7 +1184,7 @@ sub_08054C58: @ 0x08054C58
cmp r0, #0
bne _08054C7C
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08054C7C
movs r0, #7
@ -1300,7 +1300,7 @@ sub_08054D3C: @ 0x08054D3C
cmp r0, #0
bne _08054D6A
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08054D6A
ldr r4, _08054D70 @ =gUnk_02000080
@ -1445,7 +1445,7 @@ sub_08054E5C: @ 0x08054E5C
cmp r0, #0
bne _08054E92
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08054E92
ldr r4, _08054E98 @ =gUnk_02000080
@ -1648,7 +1648,7 @@ _08054FCA:
movs r0, #0x80
lsls r0, r0, #3
movs r1, #0x77
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _08055004
ldrb r0, [r5, #2]
@ -1935,7 +1935,7 @@ sub_08055224: @ 0x08055224
cmp r0, #0
bne _08055240
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08055240
ldr r1, _08055248 @ =gUnk_02000080
@ -2088,7 +2088,7 @@ sub_08055350: @ 0x08055350
cmp r0, #0
bne _08055374
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08055374
movs r0, #7
@ -2231,7 +2231,7 @@ sub_08055468: @ 0x08055468
cmp r0, #0
bne _0805548C
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _0805548C
movs r0, #7
@ -2345,7 +2345,7 @@ sub_08055548: @ 0x08055548
cmp r0, #0
bne _08055576
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08055576
ldr r4, _0805557C @ =gUnk_02000080
@ -2409,7 +2409,7 @@ sub_080555B8: @ 0x080555B8
adds r0, r0, r1
ldrh r0, [r0]
ldrh r1, [r4, #0x12]
bl sub_0807CC9C
bl SetLocalFlagByOffset
ldrb r0, [r4, #2]
ldrb r1, [r4, #3]
bl sub_0804B0E8
@ -2443,7 +2443,7 @@ sub_0805560C: @ 0x0805560C
cmp r0, #0
bne _08055628
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08055628
ldr r1, _08055630 @ =gUnk_02000080
@ -2622,7 +2622,7 @@ sub_0805576C: @ 0x0805576C
cmp r0, #0
bne _0805578C
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _0805578C
ldr r0, _08055794 @ =gUnk_02000080
@ -2863,7 +2863,7 @@ sub_08055948: @ 0x08055948
cmp r0, #0
bne _0805596C
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _0805596C
bl sub_08055994
@ -2989,7 +2989,7 @@ sub_08055A3C: @ 0x08055A3C
cmp r0, #0
bne _08055A60
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08055A60
movs r0, #7
@ -3224,7 +3224,7 @@ sub_08055C04: @ 0x08055C04
cmp r0, #0
bne _08055C28
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08055C28
movs r0, #7
@ -3371,7 +3371,7 @@ sub_08055D2C: @ 0x08055D2C
cmp r0, #0
bne _08055D5A
movs r0, #0xff
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08055D5A
ldr r4, _08055D60 @ =gUnk_02000080

290
asm/code_08056418.s
View File

File diff suppressed because it is too large Load Diff

32
asm/code_0806ED78.s
View File

@ -665,26 +665,26 @@ _0806F214:
b _0806F248
_0806F21A:
adds r0, r4, #0
bl sub_0807CC3C
bl CheckRoomFlag
adds r5, r0, #0
_0806F222:
adds r0, r4, #0
bl sub_0807CD10
bl SetRoomFlag
b _0806F248
_0806F22A:
adds r0, r4, #0
bl sub_0807CBD0
bl CheckLocalFlag
adds r5, r0, #0
_0806F232:
adds r0, r4, #0
bl sub_0807CCB4
bl SetLocalFlag
b _0806F248
_0806F23A:
adds r0, r4, #0
bl GetProgressFlag
bl CheckGlobalFlag
adds r5, r0, #0
adds r0, r4, #0
bl sub_0807CD04
bl SetGlobalFlag
_0806F248:
cmp r5, #0
beq _0806F342
@ -712,34 +712,34 @@ _0806F270:
b _0806F248
_0806F276:
adds r0, r4, #0
bl sub_0807CC3C
bl CheckRoomFlag
adds r5, r0, #0
cmp r5, #0
beq _0806F222
adds r0, r4, #0
bl sub_0807CD8C
bl ClearRoomFlag
b _0806F248
_0806F28A:
adds r0, r4, #0
bl sub_0807CBD0
bl CheckLocalFlag
adds r5, r0, #0
cmp r5, #0
beq _0806F232
adds r0, r4, #0
bl sub_0807CD34
bl ClearLocalFlag
b _0806F248
_0806F29E:
adds r0, r4, #0
bl GetProgressFlag
bl CheckGlobalFlag
adds r5, r0, #0
cmp r5, #0
bne _0806F2B2
adds r0, r4, #0
bl sub_0807CD04
bl SetGlobalFlag
b _0806F248
_0806F2B2:
adds r0, r4, #0
bl sub_0807CD80
bl ClearGlobalFlag
b _0806F248
_0806F2BA:
ldr r4, [r6]
@ -767,15 +767,15 @@ _0806F2E0: @ jump table
.4byte _0806F314 @ case 4
_0806F2F4:
adds r0, r4, #0
bl sub_0807CC3C
bl CheckRoomFlag
b _0806F320
_0806F2FC:
adds r0, r4, #0
bl sub_0807CBD0
bl CheckLocalFlag
b _0806F320
_0806F304:
adds r0, r4, #0
bl GetProgressFlag
bl CheckGlobalFlag
b _0806F320
_0806F30C:
adds r0, r4, #0

22
asm/code_0807CAA0.s
View File

@ -65,8 +65,8 @@ _0807CB04: .4byte gUnk_02002A40
_0807CB08: .4byte gUnk_02033A90
_0807CB0C: .4byte 0x0000047C
thumb_func_start GetProgressFlagWithOffset
GetProgressFlagWithOffset: @ 0x0807CB10
thumb_func_start CheckLocalFlagByOffset
CheckLocalFlagByOffset: @ 0x0807CB10
push {lr}
adds r2, r0, #0
ldr r0, _0807CB20 @ =gUnk_02002C9C
@ -119,7 +119,7 @@ _0807CB88:
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r3, #0
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
_0807CB96:
adds r1, r0, #0
b _0807CBCA
@ -152,19 +152,19 @@ _0807CBCA:
pop {pc}
.align 2, 0
thumb_func_start sub_0807CBD0
sub_0807CBD0: @ 0x0807CBD0
thumb_func_start CheckLocalFlag
CheckLocalFlag: @ 0x0807CBD0
push {lr}
adds r1, r0, #0
ldr r0, _0807CBE0 @ =gUnk_02033A90
ldrh r0, [r0, #4]
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
pop {pc}
.align 2, 0
_0807CBE0: .4byte gUnk_02033A90
thumb_func_start sub_0807CBE4
sub_0807CBE4: @ 0x0807CBE4
thumb_func_start CheckFlags
CheckFlags: @ 0x0807CBE4
push {lr}
ldr r3, _0807CC14 @ =0x000003FF
ands r3, r0
@ -185,19 +185,19 @@ sub_0807CBE4: @ 0x0807CBE4
bne _0807CC2C
adds r0, r3, #0
adds r1, r2, #0
bl sub_0807CC88
bl CheckRoomFlags
b _0807CC2E
.align 2, 0
_0807CC14: .4byte 0x000003FF
_0807CC18:
adds r0, r3, #0
adds r1, r2, #0
bl sub_0807CC60
bl CheckLocalFlags
b _0807CC2E
_0807CC22:
adds r0, r3, #0
adds r1, r2, #0
bl sub_0807CC78
bl CheckGlobalFlags
b _0807CC2E
_0807CC2C:
movs r0, #0

108
asm/code_0807CC3C.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_0807CC3C
sub_0807CC3C: @ 0x0807CC3C
thumb_func_start CheckRoomFlag
CheckRoomFlag: @ 0x0807CC3C
push {lr}
adds r1, r0, #0
ldr r0, _0807CC48 @ =gUnk_02034364
@ -15,8 +15,8 @@ sub_0807CC3C: @ 0x0807CC3C
.align 2, 0
_0807CC48: .4byte gUnk_02034364
thumb_func_start sub_0807CC4C
sub_0807CC4C: @ 0x0807CC4C
thumb_func_start CheckLocalFlagsByOffset
CheckLocalFlagsByOffset: @ 0x0807CC4C
push {lr}
adds r3, r0, #0
ldr r0, _0807CC5C @ =gUnk_02002C9C
@ -27,31 +27,31 @@ sub_0807CC4C: @ 0x0807CC4C
.align 2, 0
_0807CC5C: .4byte gUnk_02002C9C
thumb_func_start sub_0807CC60
sub_0807CC60: @ 0x0807CC60
thumb_func_start CheckLocalFlags
CheckLocalFlags: @ 0x0807CC60
push {lr}
adds r3, r0, #0
adds r2, r1, #0
ldr r0, _0807CC74 @ =gUnk_02033A90
ldrh r0, [r0, #4]
adds r1, r3, #0
bl sub_0807CC4C
bl CheckLocalFlagsByOffset
pop {pc}
.align 2, 0
_0807CC74: .4byte gUnk_02033A90
thumb_func_start sub_0807CC78
sub_0807CC78: @ 0x0807CC78
thumb_func_start CheckGlobalFlags
CheckGlobalFlags: @ 0x0807CC78
push {lr}
adds r3, r0, #0
adds r2, r1, #0
movs r0, #0
adds r1, r3, #0
bl sub_0807CC4C
bl CheckLocalFlagsByOffset
pop {pc}
thumb_func_start sub_0807CC88
sub_0807CC88: @ 0x0807CC88
thumb_func_start CheckRoomFlags
CheckRoomFlags: @ 0x0807CC88
push {lr}
adds r3, r0, #0
adds r2, r1, #0
@ -62,8 +62,8 @@ sub_0807CC88: @ 0x0807CC88
.align 2, 0
_0807CC98: .4byte gUnk_02034364
thumb_func_start sub_0807CC9C
sub_0807CC9C: @ 0x0807CC9C
thumb_func_start SetLocalFlagByOffset
SetLocalFlagByOffset: @ 0x0807CC9C
push {lr}
adds r2, r0, #0
cmp r1, #0
@ -76,19 +76,19 @@ _0807CCAC:
.align 2, 0
_0807CCB0: .4byte gUnk_02002C9C
thumb_func_start sub_0807CCB4
sub_0807CCB4: @ 0x0807CCB4
thumb_func_start SetLocalFlag
SetLocalFlag: @ 0x0807CCB4
push {lr}
adds r1, r0, #0
ldr r0, _0807CCC4 @ =gUnk_02033A90
ldrh r0, [r0, #4]
bl sub_0807CC9C
bl SetLocalFlagByOffset
pop {pc}
.align 2, 0
_0807CCC4: .4byte gUnk_02033A90
thumb_func_start sub_0807CCC8
sub_0807CCC8: @ 0x0807CCC8
thumb_func_start SetFlag
SetFlag: @ 0x0807CCC8
push {lr}
adds r1, r0, #0
cmp r1, #0
@ -106,30 +106,30 @@ sub_0807CCC8: @ 0x0807CCC8
cmp r0, #2
bne _0807CD02
adds r0, r2, #0
bl sub_0807CD10
bl SetRoomFlag
b _0807CD02
.align 2, 0
_0807CCF0: .4byte 0x000003FF
_0807CCF4:
adds r0, r2, #0
bl sub_0807CCB4
bl SetLocalFlag
b _0807CD02
_0807CCFC:
adds r0, r2, #0
bl sub_0807CD04
bl SetGlobalFlag
_0807CD02:
pop {pc}
thumb_func_start sub_0807CD04
sub_0807CD04: @ 0x0807CD04
thumb_func_start SetGlobalFlag
SetGlobalFlag: @ 0x0807CD04
push {lr}
adds r1, r0, #0
movs r0, #0
bl sub_0807CC9C
bl SetLocalFlagByOffset
pop {pc}
thumb_func_start sub_0807CD10
sub_0807CD10: @ 0x0807CD10
thumb_func_start SetRoomFlag
SetRoomFlag: @ 0x0807CD10
push {lr}
adds r1, r0, #0
ldr r0, _0807CD1C @ =gUnk_02034364
@ -138,8 +138,8 @@ sub_0807CD10: @ 0x0807CD10
.align 2, 0
_0807CD1C: .4byte gUnk_02034364
thumb_func_start sub_0807CD20
sub_0807CD20: @ 0x0807CD20
thumb_func_start ClearLocalFlagByOffset
ClearLocalFlagByOffset: @ 0x0807CD20
push {lr}
adds r2, r0, #0
ldr r0, _0807CD30 @ =gUnk_02002C9C
@ -150,19 +150,19 @@ sub_0807CD20: @ 0x0807CD20
.align 2, 0
_0807CD30: .4byte gUnk_02002C9C
thumb_func_start sub_0807CD34
sub_0807CD34: @ 0x0807CD34
thumb_func_start ClearLocalFlag
ClearLocalFlag: @ 0x0807CD34
push {lr}
adds r1, r0, #0
ldr r0, _0807CD44 @ =gUnk_02033A90
ldrh r0, [r0, #4]
bl sub_0807CD20
bl ClearLocalFlagByOffset
pop {pc}
.align 2, 0
_0807CD44: .4byte gUnk_02033A90
thumb_func_start sub_0807CD48
sub_0807CD48: @ 0x0807CD48
thumb_func_start ClearFlag
ClearFlag: @ 0x0807CD48
push {lr}
ldr r2, _0807CD6C @ =0x000003FF
ands r2, r0
@ -177,30 +177,30 @@ sub_0807CD48: @ 0x0807CD48
cmp r1, #2
bne _0807CD7E
adds r0, r2, #0
bl sub_0807CD8C
bl ClearRoomFlag
b _0807CD7E
.align 2, 0
_0807CD6C: .4byte 0x000003FF
_0807CD70:
adds r0, r2, #0
bl sub_0807CD34
bl ClearLocalFlag
b _0807CD7E
_0807CD78:
adds r0, r2, #0
bl sub_0807CD80
bl ClearGlobalFlag
_0807CD7E:
pop {pc}
thumb_func_start sub_0807CD80
sub_0807CD80: @ 0x0807CD80
thumb_func_start ClearGlobalFlag
ClearGlobalFlag: @ 0x0807CD80
push {lr}
adds r1, r0, #0
movs r0, #0
bl sub_0807CD20
bl ClearLocalFlagByOffset
pop {pc}
thumb_func_start sub_0807CD8C
sub_0807CD8C: @ 0x0807CD8C
thumb_func_start ClearRoomFlag
ClearRoomFlag: @ 0x0807CD8C
push {lr}
adds r1, r0, #0
ldr r0, _0807CD98 @ =gUnk_02034364
@ -3053,7 +3053,7 @@ sub_0807E200: @ 0x0807E200
adds r4, r1, #0
ldr r0, [r4]
ldrh r0, [r0, #2]
bl sub_0807CBD0
bl CheckLocalFlag
str r0, [r4, #0x14]
ldr r2, _0807E21C @ =gUnk_02033280
ldrb r1, [r2, #7]
@ -3071,7 +3071,7 @@ sub_0807E220: @ 0x0807E220
ldr r1, [r4]
ldrh r0, [r1, #2]
ldrh r1, [r1, #4]
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
str r0, [r4, #0x14]
ldr r2, _0807E23C @ =gUnk_02033280
ldrb r1, [r2, #7]
@ -3088,7 +3088,7 @@ sub_0807E240: @ 0x0807E240
adds r4, r1, #0
ldr r0, [r4]
bl GetNextScriptCommandHalfwordAfterCommandMetadata
bl GetProgressFlag
bl CheckGlobalFlag
str r0, [r4, #0x14]
ldr r2, _0807E25C @ =gUnk_02033280
ldrb r1, [r2, #7]
@ -3105,7 +3105,7 @@ sub_0807E260: @ 0x0807E260
adds r4, r1, #0
ldr r0, [r4]
ldrh r0, [r0, #2]
bl sub_0807CC3C
bl CheckRoomFlag
str r0, [r4, #0x14]
ldr r2, _0807E27C @ =gUnk_02033280
ldrb r1, [r2, #7]
@ -3627,7 +3627,7 @@ sub_0807E628: @ 0x0807E628
push {lr}
ldr r0, [r1]
ldrh r0, [r0, #2]
bl sub_0807CCB4
bl SetLocalFlag
pop {pc}
thumb_func_start sub_0807E634
@ -3636,7 +3636,7 @@ sub_0807E634: @ 0x0807E634
ldr r1, [r1]
ldrh r0, [r1, #2]
ldrh r1, [r1, #4]
bl sub_0807CC9C
bl SetLocalFlagByOffset
pop {pc}
.align 2, 0
@ -3645,7 +3645,7 @@ sub_0807E644: @ 0x0807E644
push {lr}
ldr r0, [r1]
ldrh r0, [r0, #2]
bl sub_0807CD34
bl ClearLocalFlag
pop {pc}
thumb_func_start sub_0807E650
@ -3653,7 +3653,7 @@ sub_0807E650: @ 0x0807E650
push {lr}
ldr r0, [r1]
ldrh r0, [r0, #2]
bl sub_0807CD04
bl SetGlobalFlag
pop {pc}
thumb_func_start sub_0807E65C
@ -3661,7 +3661,7 @@ sub_0807E65C: @ 0x0807E65C
push {lr}
ldr r0, [r1]
ldrh r0, [r0, #2]
bl sub_0807CD80
bl ClearGlobalFlag
pop {pc}
thumb_func_start sub_0807E668
@ -3669,7 +3669,7 @@ sub_0807E668: @ 0x0807E668
push {lr}
ldr r0, [r1]
ldrh r0, [r0, #2]
bl sub_0807CD10
bl SetRoomFlag
pop {pc}
thumb_func_start sub_0807E674
@ -3677,7 +3677,7 @@ sub_0807E674: @ 0x0807E674
push {lr}
ldr r0, [r1]
ldrh r0, [r0, #2]
bl sub_0807CD8C
bl ClearRoomFlag
pop {pc}
thumb_func_start sub_0807E680
@ -6782,7 +6782,7 @@ sub_0807FC24: @ 0x0807FC24
movs r1, #0xcf
_0807FC32:
adds r0, r1, #0
bl sub_0807CCB4
bl SetLocalFlag
pop {pc}
.align 2, 0
_0807FC3C: .4byte gRoomControls

2
asm/code_080A3480.s
View File

@ -229,7 +229,7 @@ sub_080A3608: @ 0x080A3608
movs r4, #1
strb r4, [r0, #6]
movs r0, #0x55
bl sub_0807CD04
bl SetGlobalFlag
ldr r0, _080A3644 @ =gUnk_03001000
strb r4, [r0, #3]
ldr r2, _080A3648 @ =gUnk_02000080

2
asm/code_080A3BD0.s
View File

@ -1406,7 +1406,7 @@ sub_080A46C0: @ 0x080A46C0
movs r0, #0x6c
bl PlaySFX
movs r0, #2
bl sub_0807CD8C
bl ClearRoomFlag
bl sub_080A71DC
pop {pc}

18
asm/code_080A5574.s
View File

@ -1269,7 +1269,7 @@ sub_080A5F24: @ 0x080A5F24
movs r0, #0x8c
lsls r0, r0, #4
movs r1, #0x7b
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _080A5F40
movs r4, #0
@ -2360,7 +2360,7 @@ _080A67E0:
b _080A6822
_080A67E6:
movs r0, #0x18
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080A6822
movs r5, #0x70
@ -4995,7 +4995,7 @@ _080A7CB0:
cmp r2, #0
beq _080A7CD2
ldrb r0, [r4, #1]
bl sub_0807CCB4
bl SetLocalFlag
ldrb r0, [r4, #2]
ldrb r1, [r4, #3]
movs r2, #0
@ -6122,7 +6122,7 @@ sub_080A84C8: @ 0x080A84C8
subs r0, #4
strh r0, [r4, #0x36]
movs r0, #0x15
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080A84F0
adds r1, r4, #0
@ -10375,7 +10375,7 @@ _080AA4AA:
bne _080AA4A8
_080AA4B6:
ldrh r0, [r5, #0x24]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080AA4EE
cmp r4, #4
@ -10525,7 +10525,7 @@ _080AA5BA:
adds r1, r7, #0
bl sub_080AA654
ldrh r0, [r6, #0x24]
bl sub_0807CCC8
bl SetFlag
b _080AA648
.align 2, 0
_080AA5E8: .4byte gUnk_08129FF8
@ -10570,7 +10570,7 @@ _080AA618:
ldrb r1, [r1]
bl sub_0807BA8C
ldrh r0, [r6, #0x24]
bl sub_0807CCC8
bl SetFlag
_080AA648:
pop {r3, r4}
mov r8, r3
@ -10830,7 +10830,7 @@ sub_080AA834: @ 0x080AA834
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080AA848
bl sub_0805E780
@ -11158,7 +11158,7 @@ sub_080AAAA8: @ 0x080AAAA8
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
movs r1, #0x2e
ldrsh r0, [r4, r1]
ldr r2, _080AAAE4 @ =gRoomControls

20
asm/crenalBeanSprout.s
View File

@ -53,11 +53,11 @@ _08096362:
b _0809650A
_08096368:
movs r0, #0x1a
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080963DA
movs r0, #0x1b
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080963A4
ldr r0, _0809639C @ =gLinkEntity
@ -78,7 +78,7 @@ _0809639C: .4byte gLinkEntity
_080963A0: .4byte 0x00004022
_080963A4:
ldrb r0, [r5, #0xb]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _080963C8
adds r0, r5, #0
@ -120,11 +120,11 @@ _080963DA:
_080963F8: .4byte gRoomControls
_080963FC:
movs r0, #0x1a
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _08096450
movs r0, #0x1b
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _0809644C
ldr r0, _08096444 @ =gLinkEntity
@ -198,7 +198,7 @@ _08096494:
b _0809650A
_080964A6:
ldrb r0, [r5, #0xb]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _080964F8
adds r0, r5, #0
@ -509,7 +509,7 @@ sub_0809671C: @ 0x0809671C
push {r4, lr}
adds r4, r0, #0
movs r0, #0x1a
bl sub_0807CD04
bl SetGlobalFlag
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
@ -525,7 +525,7 @@ nullsub_121: @ 0x08096730
sub_08096734: @ 0x08096734
push {lr}
movs r0, #0x1a
bl sub_0807CD80
bl ClearGlobalFlag
pop {pc}
.align 2, 0
@ -682,7 +682,7 @@ sub_08096858: @ 0x08096858
push {r4, r5, r6, lr}
adds r5, r0, #0
ldrb r0, [r5, #0xb]
bl sub_0807CCB4
bl SetLocalFlag
movs r3, #0
movs r0, #0xf
strb r0, [r5, #0xe]
@ -957,7 +957,7 @@ sub_08096A78: @ 0x08096A78
push {r4, r5, r6, lr}
adds r4, r0, #0
movs r0, #0x1b
bl sub_0807CD04
bl SetGlobalFlag
ldrb r1, [r4, #0xa]
lsrs r1, r1, #1
adds r1, #8

2
asm/cuccoAggr.s
View File

@ -72,7 +72,7 @@ sub_08038D10: @ 0x08038D10
cmp r0, #0
bne _08038D3E
movs r0, #1
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _08038D3E
adds r0, r4, #0

4
asm/curtain.s
View File

@ -80,7 +80,7 @@ sub_08048224: @ 0x08048224
orrs r1, r0
strb r1, [r2]
movs r0, #0x72
bl sub_0807CBD0
bl CheckLocalFlag
adds r1, r0, #0
cmp r1, #0
bne _0804824E
@ -142,7 +142,7 @@ sub_08048294: @ 0x08048294
movs r0, #3
strb r0, [r4, #0xc]
movs r0, #0x72
bl sub_0807CCB4
bl SetLocalFlag
adds r0, r4, #0
movs r1, #1
bl UpdateSprite

4
asm/dampe.s
View File

@ -127,12 +127,12 @@ sub_0806BE84: @ 0x0806BE84
str r0, [r4, #0x14]
movs r5, #1
movs r0, #0x69
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806BEA6
movs r5, #0
movs r0, #0x69
bl sub_0807CCB4
bl SetLocalFlag
movs r0, #1
str r0, [r4, #0x14]
_0806BEA6:

18
asm/dog.s
View File

@ -117,7 +117,7 @@ _08069BF2:
cmp r0, #2
bne _08069C30
movs r0, #0xcf
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08069C30
ldr r0, _08069C38 @ =0x00004072
@ -599,7 +599,7 @@ sub_08069F90: @ 0x08069F90
cmp r0, #2
bne _08069FA8
movs r0, #0xcf
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08069FA8
movs r0, #1
@ -751,12 +751,12 @@ sub_0806A0A4: @ 0x0806A0A4
beq _0806A100
movs r5, #4
movs r0, #0xcf
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806A120
movs r5, #3
movs r0, #0xcf
bl sub_0807CCB4
bl SetLocalFlag
movs r1, #0x2e
ldrsh r0, [r4, r1]
ldr r2, _0806A0FC @ =gRoomControls
@ -785,17 +785,17 @@ _0806A0FC: .4byte gRoomControls
_0806A100:
movs r5, #2
movs r0, #0xcf
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806A120
movs r5, #1
movs r0, #0xdb
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806A120
movs r5, #0
movs r0, #0xdb
bl sub_0807CCB4
bl SetLocalFlag
_0806A120:
ldr r2, _0806A13C @ =gUnk_08111F74
ldr r0, _0806A140 @ =gUnk_02002A40
@ -830,11 +830,11 @@ sub_0806A144: @ 0x0806A144
cmp r0, #0
bne _0806A17A
movs r0, #0x29
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0806A17A
movs r0, #0x85
bl sub_0807CBD0
bl CheckLocalFlag
movs r4, #2
cmp r0, #0
bne _0806A17A

4
asm/drLeft.s
View File

@ -127,12 +127,12 @@ _0806C048:
bne _0806C078
movs r4, #6
movs r0, #0xaf
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806C086
movs r4, #5
movs r0, #0xaf
bl sub_0807CCB4
bl SetLocalFlag
b _0806C086
.align 2, 0
_0806C074: .4byte gUnk_02002A40

4
asm/dust.s
View File

@ -122,7 +122,7 @@ sub_080441E0: @ 0x080441E0
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
movs r0, #0x12
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080441F2
bl sub_0805E780
@ -447,7 +447,7 @@ _08044440:
cmp r0, #0
bne _08044458
movs r0, #0x12
bl sub_0807CD04
bl SetGlobalFlag
movs r0, #0x72
bl PlaySFX
bl sub_0805E780

6
asm/enemy49.s
View File

@ -192,7 +192,7 @@ sub_0803CFD8: @ 0x0803CFD8
b _0803CFEE
_0803CFE8:
ldrh r0, [r1]
bl sub_0807CBE4
bl CheckFlags
_0803CFEE:
pop {pc}
@ -209,7 +209,7 @@ sub_0803CFF0: @ 0x0803CFF0
cmp r2, r0
bne _0803D016
adds r0, r2, #0
bl sub_0807CBE4
bl CheckFlags
movs r1, #0
cmp r0, #0
bne _0803D012
@ -219,7 +219,7 @@ _0803D012:
b _0803D020
_0803D016:
ldrh r0, [r1]
bl sub_0807CBE4
bl CheckFlags
b _0803D020
_0803D01E:
movs r0, #0

4
asm/enemy64.s
View File

@ -95,7 +95,7 @@ sub_08049100: @ 0x08049100
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0x7c
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08049144
ldr r4, _08049140 @ =0x00004081
@ -1096,7 +1096,7 @@ sub_08049888: @ 0x08049888
movs r0, #0x72
bl PlaySFX
movs r0, #0x7c
bl sub_0807CCC8
bl SetFlag
movs r0, #1
bl sub_08078A90
_080498AE:

2
asm/enemyItem.s
View File

@ -13,7 +13,7 @@ sub_080A2448: @ 0x080A2448
adds r5, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080A245E
adds r0, r5, #0

6
asm/evilSpirit.s
View File

@ -39,7 +39,7 @@ sub_080862B8: @ 0x080862B8
push {r4, r5, lr}
adds r4, r0, #0
movs r0, #0x63
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _080862CA
bl sub_0805E780
@ -399,9 +399,9 @@ _08086566:
cmp r0, #0
beq _08086592
movs r0, #0x63
bl sub_0807CCB4
bl SetLocalFlag
movs r0, #0
bl sub_0807CD10
bl SetRoomFlag
movs r5, #0
_0808657E:
ldr r0, [r4, #0x54]

2
asm/evilSpirit/sub_080862B8.inc
View File

@ -9,7 +9,7 @@
push {r4, r5, lr}
adds r4, r0, #0
movs r0, #0x63
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _080862CA
bl sub_0805E780

8
asm/eyeSwitch.s
View File

@ -57,7 +57,7 @@ sub_080886A4: @ 0x080886A4
adds r0, r4, #0
adds r0, #0x84
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08088704
strb r6, [r4, #0xc]
@ -113,7 +113,7 @@ _08088728:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
_0808875A:
pop {r4, pc}
.align 2, 0
@ -162,7 +162,7 @@ sub_08088790: @ 0x08088790
cmp r1, r0
beq _080887BC
ldrh r0, [r2]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080887BC
movs r0, #0
@ -180,7 +180,7 @@ _080887BC:
movs r0, #4
strb r0, [r4, #0xc]
ldrh r0, [r5]
bl sub_0807CD48
bl ClearFlag
_080887D6:
pop {r4, r5, pc}

2
asm/eyegore.s
View File

@ -255,7 +255,7 @@ sub_08030BEC: @ 0x08030BEC
ldrh r0, [r1]
cmp r0, #0
beq _08030C08
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08030C08
adds r0, r4, #0

20
asm/ezloCap.s
View File

@ -362,23 +362,23 @@ _0806DB00: @ jump table
.4byte _0806DB34 @ case 4
_0806DB14:
movs r0, #0xee
bl sub_0807CCB4
bl SetLocalFlag
b _0806DB3A
_0806DB1C:
movs r0, #0xef
bl sub_0807CCB4
bl SetLocalFlag
b _0806DB3A
_0806DB24:
movs r0, #0xf0
bl sub_0807CCB4
bl SetLocalFlag
b _0806DB3A
_0806DB2C:
movs r0, #0xf1
bl sub_0807CCB4
bl SetLocalFlag
b _0806DB3A
_0806DB34:
movs r0, #0xf2
bl sub_0807CCB4
bl SetLocalFlag
_0806DB3A:
movs r0, #0xcd
bl PlaySFX
@ -392,23 +392,23 @@ sub_0806DB44: @ 0x0806DB44
movs r0, #0
str r0, [r4, #0x14]
movs r0, #0xee
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #0xef
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #0xf0
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #0xf1
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #0xf2
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #1

6
asm/fan.s
View File

@ -47,7 +47,7 @@ sub_0809ED54: @ 0x0809ED54
ldrh r0, [r1]
cmp r0, #0
beq _0809ED6A
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809ED86
_0809ED6A:
@ -85,13 +85,13 @@ sub_0809ED88: @ 0x0809ED88
ldrh r0, [r1]
cmp r0, r2
bne _0809EDB4
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _0809EDE2
b _0809EDBE
_0809EDB4:
ldrh r0, [r1]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809EDE2
_0809EDBE:

82
asm/figurineDevice.s
View File

@ -44,7 +44,7 @@ _08087BE0:
b _08087CA6
_08087BEA:
movs r0, #0x5e
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08087C16
adds r1, r4, #0
@ -165,23 +165,23 @@ _08087CCA:
strb r0, [r1]
bl sub_080791D0
movs r0, #0x5e
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08087CFA
movs r0, #2
strb r0, [r5]
bl sub_0807CD10
bl SetRoomFlag
movs r0, #7
movs r1, #0xff
bl sub_080A7138
b _08087D1A
_08087CFA:
movs r0, #5
bl sub_0807CD10
bl SetRoomFlag
b _08087D1A
_08087D02:
movs r0, #2
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _08087D1A
adds r1, r4, #0
@ -213,11 +213,11 @@ _08087D34:
b _08087DB0
_08087D3A:
movs r0, #0
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08087DB0
movs r0, #0x5e
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08087D54
movs r0, #1
@ -229,7 +229,7 @@ _08087D54:
b _08087DB0
_08087D5A:
movs r0, #0x5e
bl sub_0807CCB4
bl SetLocalFlag
_08087D60:
adds r1, r5, #0
adds r1, #0x7a
@ -238,7 +238,7 @@ _08087D60:
ldr r0, [r5, #0x54]
bl sub_08088328
movs r0, #0
bl sub_0807CD8C
bl ClearRoomFlag
movs r0, #0x22
movs r1, #2
movs r2, #0
@ -329,14 +329,14 @@ _08087E10:
bne _08087E5A
movs r0, #2
strb r0, [r2]
bl sub_0807CD10
bl SetRoomFlag
ldrb r1, [r4, #0xf]
movs r0, #7
bl sub_080A7138
b _08087E5A
_08087E3C:
movs r0, #2
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _08087E5A
ldrb r1, [r4, #0x18]
@ -345,7 +345,7 @@ _08087E3C:
ands r0, r1
strb r0, [r4, #0x18]
movs r0, #4
bl sub_0807CD8C
bl ClearRoomFlag
bl sub_0805E780
_08087E5A:
pop {r4, pc}
@ -375,7 +375,7 @@ _08087E7A:
cmp r0, #4
bne _08087EA4
movs r0, #1
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08087F4E
movs r0, #1
@ -383,7 +383,7 @@ _08087E7A:
adds r1, r4, #0
adds r1, #0x81
strb r0, [r1]
bl sub_0807CD8C
bl ClearRoomFlag
adds r0, r4, #0
bl sub_0808826C
b _08087F1C
@ -462,7 +462,7 @@ _08087F24:
movs r0, #4
strb r0, [r1]
movs r0, #3
bl sub_0807CD10
bl SetRoomFlag
ldr r0, _08087F50 @ =0x0000431A
bl TextboxTryNoOverlap
ldr r1, _08087F54 @ =gTextBox
@ -516,7 +516,7 @@ sub_08087F94: @ 0x08087F94
adds r5, r0, #0
adds r4, r1, #0
movs r0, #0x5f
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08088014
adds r0, r5, #0
@ -627,7 +627,7 @@ sub_0808804C: @ 0x0808804C
_08088060: .4byte gUnk_02002A40
_08088064:
movs r0, #6
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _08088072
movs r4, #7
@ -636,7 +636,7 @@ _08088072:
movs r0, #0x80
lsls r0, r0, #4
movs r1, #0x77
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _08088084
movs r4, #6
@ -645,21 +645,21 @@ _08088084:
movs r0, #0xc0
lsls r0, r0, #2
movs r1, #0x32
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _08088096
movs r4, #5
b _080880D0
_08088096:
movs r0, #5
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080880A4
movs r4, #4
b _080880D0
_080880A4:
movs r0, #4
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080880B2
movs r4, #3
@ -668,14 +668,14 @@ _080880B2:
movs r0, #0x80
lsls r0, r0, #1
movs r1, #0x9c
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
beq _080880C4
movs r4, #2
b _080880D0
_080880C4:
movs r0, #3
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080880D0
movs r4, #1
@ -734,13 +734,13 @@ _0808810A:
cmp r1, #0
beq _08088136
movs r0, #6
bl sub_0807CD10
bl SetRoomFlag
_08088136:
ldrb r0, [r4]
strb r0, [r5, #9]
_0808813A:
movs r0, #0x5f
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08088156
ldr r0, _0808815C @ =gUnk_02002A40
@ -750,7 +750,7 @@ _0808813A:
cmp r1, r0
beq _08088156
movs r0, #0x5f
bl sub_0807CD34
bl ClearLocalFlag
_08088156:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -789,7 +789,7 @@ _0808818C:
_08088194:
ldr r0, [r1]
ldrh r1, [r1, #4]
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
b _08088262
_0808819E:
ldrh r0, [r1, #4]
@ -877,7 +877,7 @@ _08088252:
cmp r0, #1
bls _08088268
movs r0, #0x12
bl GetProgressFlag
bl CheckGlobalFlag
_08088262:
cmp r0, #0
beq _08088268
@ -905,7 +905,7 @@ sub_0808826C: @ 0x0808826C
cmp r4, #0
bne _08088298
movs r0, #0x5f
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08088298
movs r4, #1
@ -1088,15 +1088,15 @@ _080883E2:
cmp r1, r0
beq _08088408
movs r0, #7
bl sub_0807CD10
bl SetRoomFlag
b _08088414
.align 2, 0
_08088404: .4byte gUnk_02002A40
_08088408:
movs r0, #0x5f
bl sub_0807CCB4
bl SetLocalFlag
movs r0, #8
bl sub_0807CD10
bl SetRoomFlag
_08088414:
mov r0, r8
strb r4, [r0]
@ -1162,11 +1162,11 @@ sub_08088478: @ 0x08088478
push {r4, lr}
movs r4, #0
movs r0, #8
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _080884A4
movs r0, #7
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _0808849C
ldr r1, _08088498 @ =0x00004322
@ -1288,11 +1288,11 @@ _08088570: .4byte gTextBox
sub_08088574: @ 0x08088574
push {lr}
movs r0, #9
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _08088594
movs r0, #0x5f
bl sub_0807CBD0
bl CheckLocalFlag
ldr r1, _08088590 @ =0x0000430C
cmp r0, #0
beq _08088596
@ -1319,11 +1319,11 @@ _080885AC: .4byte gTextBox
sub_080885B0: @ 0x080885B0
push {lr}
movs r0, #8
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _080885E8
movs r0, #7
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _0808860A
movs r0, #5
@ -1354,12 +1354,12 @@ _080885E8:
movs r2, #0
bl sub_080A7C00
movs r0, #0x59
bl sub_0807CD04
bl SetGlobalFlag
_0808860A:
movs r0, #8
bl sub_0807CD8C
bl ClearRoomFlag
movs r0, #7
bl sub_0807CD8C
bl ClearRoomFlag
pop {pc}
.align 2, 0
_08088618: .4byte gUnk_02002A40

4
asm/fireplace.s
View File

@ -37,7 +37,7 @@ sub_0809B708: @ 0x0809B708
adds r0, r6, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809B73A
adds r0, r6, #0
@ -103,7 +103,7 @@ sub_0809B7A0: @ 0x0809B7A0
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
bl sub_0805E780
_0809B7BC:
pop {r4, pc}

16
asm/forestMinish.s
View File

@ -277,7 +277,7 @@ sub_080601D4: @ 0x080601D4
push {r4, lr}
adds r4, r0, #0
movs r0, #4
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080601E6
movs r1, #2
@ -366,22 +366,22 @@ sub_08060270: @ 0x08060270
bne _08060294
movs r4, #1
movs r0, #0x29
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080602A8
movs r4, #0
movs r0, #0x29
bl sub_0807CD04
bl SetGlobalFlag
b _080602A8
_08060294:
movs r4, #3
movs r0, #0x76
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _080602A8
movs r4, #2
movs r0, #0x76
bl sub_0807CCB4
bl SetLocalFlag
_080602A8:
ldr r0, _080602B8 @ =gUnk_0810A35A
lsls r1, r4, #1
@ -486,7 +486,7 @@ sub_08060354: @ 0x08060354
ldr r0, [r1]
subs r4, r2, r0
movs r0, #0x3b
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _08060380
cmp r4, #4
@ -498,7 +498,7 @@ _08060378: .4byte gUnk_02002A40
_0806037C: .4byte 0x00008444
_08060380:
movs r0, #0x3c
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _08060398
cmp r4, #9
@ -509,7 +509,7 @@ _08060380:
_08060394: .4byte 0x00008444
_08060398:
movs r0, #0x3d
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080603B0
cmp r4, #0xe

2
asm/fourElements.s
View File

@ -301,7 +301,7 @@ sub_080A03E8: @ 0x080A03E8
strb r1, [r0]
bl sub_0807DF50
movs r0, #0
bl sub_0807CD10
bl SetRoomFlag
bl sub_0805E780
_080A041A:
pop {pc}

6
asm/frozenWaterElement.s
View File

@ -25,7 +25,7 @@ sub_0809BECC: @ 0x0809BECC
push {r4, lr}
adds r4, r0, #0
movs r0, #0x9b
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809BEDE
bl sub_0805E780
@ -69,7 +69,7 @@ sub_0809BF1C: @ 0x0809BF1C
movs r3, #0
bl sub_0805EC9C
movs r0, #0x37
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809BF6C
movs r0, #0x90
@ -120,7 +120,7 @@ sub_0809BF74: @ 0x0809BF74
adds r0, r7, #0
bl sub_0809C23C
movs r0, #0x9b
bl sub_0807CBE4
bl CheckFlags
bl sub_0805E780
b _0809C09A
_0809BFA0:

4
asm/gentariCurtains.s
View File

@ -26,7 +26,7 @@ sub_08092050: @ 0x08092050
adds r6, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809207A
movs r0, #3
@ -146,7 +146,7 @@ sub_0809214C: @ 0x0809214C
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08092160
movs r0, #2

2
asm/gina.s
View File

@ -78,7 +78,7 @@ _0806C1BE:
movs r0, #1
strb r0, [r4, #0xc]
movs r0, #0x88
bl sub_0807CCB4
bl SetLocalFlag
_0806C1D2:
pop {r4, pc}

2
asm/gleerok.s
View File

@ -479,7 +479,7 @@ sub_0802D3B8: @ 0x0802D3B8
push {r7}
adds r4, r0, #0
movs r0, #3
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0802D3DE
ldr r2, _0802D3F4 @ =gScreen

22
asm/gorman.s
View File

@ -149,55 +149,55 @@ sub_08069888: @ 0x08069888
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0x47
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080698A0
movs r4, #0
movs r0, #0x47
bl sub_0807CD04
bl SetGlobalFlag
b _08069906
_080698A0:
movs r0, #0x2b
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080698C2
movs r0, #0x2c
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080698C2
movs r0, #0x2d
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080698C2
movs r4, #1
b _08069906
_080698C2:
movs r0, #0x18
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080698D0
movs r4, #2
b _08069906
_080698D0:
movs r0, #0x48
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080698E4
movs r4, #3
movs r0, #0x48
bl sub_0807CD04
bl SetGlobalFlag
b _08069906
_080698E4:
movs r0, #0x2e
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _08069904
movs r0, #0x2f
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _08069904
movs r0, #0x30
bl GetProgressFlag
bl CheckGlobalFlag
movs r4, #4
cmp r0, #0
beq _08069906

8
asm/goronMerchant.s
View File

@ -228,24 +228,24 @@ _080696CA:
movs r5, #2
_080696D0:
movs r0, #0x3e
bl GetProgressFlag
bl CheckGlobalFlag
rsbs r1, r0, #0
orrs r1, r0
lsrs r4, r1, #0x1f
movs r0, #0x3f
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080696E8
movs r4, #2
_080696E8:
movs r0, #0x40
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _080696F4
movs r4, #3
_080696F4:
movs r0, #0x41
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _08069700
movs r4, #4

4
asm/guardWithSpear.s
View File

@ -188,7 +188,7 @@ sub_08063E54: @ 0x08063E54
cmp r1, #0
bne _08063E68
movs r0, #0xf
bl sub_0807CD10
bl SetRoomFlag
_08063E68:
pop {pc}
.align 2, 0
@ -926,7 +926,7 @@ sub_080643D8: @ 0x080643D8
push {r4, lr}
adds r4, r0, #0
movs r0, #2
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080643EA
movs r3, #0

6
asm/heartContainer.s
View File

@ -26,7 +26,7 @@ sub_0808E6A0: @ 0x0808E6A0
adds r4, r0, #0
adds r0, #0x84
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808E6B4
bl sub_0805E780
@ -61,7 +61,7 @@ sub_0808E6E4: @ 0x0808E6E4
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808E712
movs r0, #2
@ -139,7 +139,7 @@ sub_0808E764: @ 0x0808E764
adds r0, r4, #0
adds r0, #0x84
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
movs r0, #0x62
movs r1, #0
movs r2, #0

4
asm/hiddenLadderDown.s
View File

@ -64,7 +64,7 @@ sub_08091F14: @ 0x08091F14
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08091FEA
movs r0, #2
@ -159,7 +159,7 @@ sub_08092000: @ 0x08092000
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
_08092034:
pop {r4, pc}
.align 2, 0

10
asm/hittableLever.s
View File

@ -58,7 +58,7 @@ sub_0808A71C: @ 0x0808A71C
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808A760
strb r5, [r4, #0xa]
@ -72,7 +72,7 @@ _0808A764:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
_0808A76E:
adds r0, r4, #0
bl sub_0808A7D8
@ -109,15 +109,15 @@ sub_0808A778: @ 0x0808A778
adds r4, r5, #0
adds r4, #0x86
ldrh r0, [r4]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0808A7C2
ldrh r0, [r4]
bl sub_0807CD48
bl ClearFlag
b _0808A7C8
_0808A7C2:
ldrh r0, [r4]
bl sub_0807CCC8
bl SetFlag
_0808A7C8:
ldr r1, _0808A7D4 @ =0x00000117
adds r0, r5, #0

2
asm/houseDoorExterior.s
View File

@ -147,7 +147,7 @@ sub_080867CC: @ 0x080867CC
cmp r0, #2
bne _080867DE
movs r0, #0x18
bl GetProgressFlag
bl CheckGlobalFlag
b _080867E0
_080867DE:
movs r0, #1

4
asm/houseDoorInterior.s
View File

@ -29,7 +29,7 @@ sub_08092B8C: @ 0x08092B8C
ldrh r0, [r1]
cmp r0, #0
beq _08092BA6
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08092BA6
bl sub_0805E780
@ -86,7 +86,7 @@ sub_08092BF8: @ 0x08092BF8
ldrh r0, [r1]
cmp r0, #0
beq _08092C20
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08092C20
movs r0, #2

2
asm/initializeLink.s
View File

@ -32,7 +32,7 @@ InitializeLink: @ 0x080524A8
ldrb r0, [r0]
strb r0, [r6, #0xc]
movs r0, #0x14
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _080524FA
ldr r0, [r6, #0x30]

4
asm/itemOnGround.s
View File

@ -671,7 +671,7 @@ sub_08080F20: @ 0x08080F20
ldrh r0, [r1]
cmp r0, #0
beq _08080F3A
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08080F3A
bl sub_0805E780
@ -1312,7 +1312,7 @@ sub_08081404: @ 0x08081404
ldrh r0, [r1]
cmp r0, #0
beq _08081418
bl sub_0807CCC8
bl SetFlag
_08081418:
bl sub_0805E780
pop {pc}

4
asm/jailBars.s
View File

@ -26,7 +26,7 @@ sub_080A08C4: @ 0x080A08C4
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _080A08E2
movs r0, #1
@ -64,7 +64,7 @@ sub_080A0910: @ 0x080A0910
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080A0932
movs r0, #2

10
asm/jarPortal.s
View File

@ -47,7 +47,7 @@ sub_0808BE9C: @ 0x0808BE9C
adds r0, #0x68
strb r2, [r0]
ldrb r0, [r4, #0xa]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0808BEEE
adds r0, r4, #0
@ -101,11 +101,11 @@ sub_0808BF14: @ 0x0808BF14
cmp r0, #0
bne _0808BF3E
ldrb r0, [r4, #0xa]
bl sub_0807CCB4
bl SetLocalFlag
b _0808BF44
_0808BF3E:
ldrb r0, [r4, #0xa]
bl sub_0807CD34
bl ClearLocalFlag
_0808BF44:
adds r0, r4, #0
movs r1, #0
@ -201,11 +201,11 @@ sub_0808BFD8: @ 0x0808BFD8
cmp r0, #0
bne _0808C002
ldrb r0, [r4, #0xa]
bl sub_0807CD34
bl ClearLocalFlag
b _0808C008
_0808C002:
ldrb r0, [r4, #0xa]
bl sub_0807CCB4
bl SetLocalFlag
_0808C008:
adds r0, r4, #0
movs r1, #0

2
asm/kingDaltus.s
View File

@ -197,7 +197,7 @@ sub_0806673C: @ 0x0806673C
push {r4, lr}
adds r4, r0, #0
movs r0, #2
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _0806674E
movs r1, #0

26
asm/librari.s
View File

@ -93,7 +93,7 @@ sub_0806B260: @ 0x0806B260
cmp r0, #0
bne _0806B29E
movs r0, #0x29
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
beq _0806B286
movs r4, #2
@ -102,12 +102,12 @@ sub_0806B260: @ 0x0806B260
b _0806B2A0
_0806B286:
movs r0, #0x7a
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806B29A
movs r4, #0
movs r0, #0x7a
bl sub_0807CCB4
bl SetLocalFlag
b _0806B2A0
_0806B29A:
movs r4, #1
@ -130,43 +130,43 @@ sub_0806B2B4: @ 0x0806B2B4
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0xb3
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806B314
movs r0, #0
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _0806B2D6
movs r4, #1
movs r0, #0
bl sub_0807CD10
bl SetRoomFlag
b _0806B316
_0806B2D6:
movs r0, #1
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _0806B2EA
movs r4, #2
movs r0, #1
bl sub_0807CD10
bl SetRoomFlag
b _0806B316
_0806B2EA:
movs r0, #2
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
bne _0806B2FE
movs r4, #3
movs r0, #2
bl sub_0807CD10
bl SetRoomFlag
b _0806B316
_0806B2FE:
movs r4, #4
movs r0, #0
bl sub_0807CD8C
bl ClearRoomFlag
movs r0, #1
bl sub_0807CD8C
bl ClearRoomFlag
movs r0, #2
bl sub_0807CD8C
bl ClearRoomFlag
b _0806B316
_0806B314:
movs r4, #0

20
asm/librarians.s
View File

@ -53,7 +53,7 @@ sub_0806BA34: @ 0x0806BA34
movs r0, #0
str r0, [r4, #0x14]
movs r0, #0x73
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806BA60
ldr r0, _0806BA5C @ =0x00004913
@ -97,19 +97,19 @@ _0806BA98:
str r5, [r4, #0x14]
_0806BAA2:
movs r0, #0x6b
bl sub_0807CCB4
bl SetLocalFlag
movs r0, #0x6a
bl sub_0807CCB4
bl SetLocalFlag
b _0806BB06
.align 2, 0
_0806BAB0: .4byte 0x00004908
_0806BAB4:
movs r0, #0x6a
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806BB06
movs r0, #0x6b
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806BAD0
ldr r0, _0806BACC @ =0x00004901
@ -123,7 +123,7 @@ _0806BAD0:
_0806BAD6:
mov r8, r0
movs r0, #0x6b
bl sub_0807CCB4
bl SetLocalFlag
b _0806BB06
.align 2, 0
_0806BAE0: .4byte 0x00004902
@ -133,7 +133,7 @@ _0806BAE4:
ldr r0, _0806BAF4 @ =0x00004903
mov r8, r0
movs r0, #0x6d
bl sub_0807CCB4
bl SetLocalFlag
b _0806BB06
.align 2, 0
_0806BAF4: .4byte 0x00004903
@ -143,7 +143,7 @@ _0806BAF8:
ldr r0, _0806BB18 @ =0x00004904
mov r8, r0
movs r0, #0x70
bl sub_0807CCB4
bl SetLocalFlag
_0806BB06:
mov r0, r8
mov r1, sb
@ -224,7 +224,7 @@ sub_0806BB7C: @ 0x0806BB7C
cmp r0, #2
bne _0806BBAC
movs r0, #0x73
bl sub_0807CCB4
bl SetLocalFlag
movs r0, #1
str r0, [r4, #0x14]
_0806BBAC:
@ -240,7 +240,7 @@ sub_0806BBB0: @ 0x0806BBB0
cmp r0, #0
bne _0806BBCC
movs r0, #0x29
bl GetProgressFlag
bl CheckGlobalFlag
rsbs r1, r0, #0
orrs r1, r0
lsrs r1, r1, #0x1f

16
asm/lightableSwitch.s
View File

@ -87,15 +87,15 @@ sub_0809EA80: @ 0x0809EA80
adds r4, r5, #0
adds r4, #0x86
ldrh r0, [r4]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809EAA6
ldrh r0, [r4]
bl sub_0807CD48
bl ClearFlag
b _0809EAAC
_0809EAA6:
ldrh r0, [r4]
bl sub_0807CCC8
bl SetFlag
_0809EAAC:
movs r0, #0x88
lsls r0, r0, #1
@ -111,7 +111,7 @@ sub_0809EABC: @ 0x0809EABC
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
rsbs r1, r0, #0
orrs r1, r0
lsrs r1, r1, #0x1f
@ -244,7 +244,7 @@ sub_0809EB80: @ 0x0809EB80
adds r0, r4, #0
adds r0, #0x84
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809EBD2
strb r5, [r4, #0xc]
@ -273,7 +273,7 @@ sub_0809EBD8: @ 0x0809EBD8
adds r0, r2, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
movs r0, #0x88
lsls r0, r0, #1
bl sub_08004488
@ -287,7 +287,7 @@ sub_0809EC08: @ 0x0809EC08
adds r4, r0, #0
adds r0, #0x84
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809EC1E
movs r0, #3
@ -307,7 +307,7 @@ _0809EC1E:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CD48
bl ClearFlag
movs r0, #0x88
lsls r0, r0, #1
bl sub_08004488

8
asm/lilypadLarge.s
View File

@ -44,7 +44,7 @@ _08085520:
cmp r0, #0x1b
beq _08085544
ldrb r0, [r4, #0xb]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08085552
movs r0, #5
@ -54,7 +54,7 @@ _08085520:
_08085540: .4byte gUnk_02033A90
_08085544:
ldrb r0, [r4, #0xb]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08085552
bl sub_0805E780
@ -809,7 +809,7 @@ _08085ACC:
movs r0, #0x46
strh r0, [r1]
movs r0, #0x73
bl sub_0807CCB4
bl SetLocalFlag
b _08085B22
.align 2, 0
_08085B00: .4byte 0x007FFFFF
@ -1076,7 +1076,7 @@ sub_08085D10: @ 0x08085D10
cmp r0, #0
beq _08085D26
ldrb r0, [r4, #0xb]
bl sub_0807CCB4
bl SetLocalFlag
bl sub_0805E780
_08085D26:
pop {r4, pc}

2
asm/litArea.s
View File

@ -19,7 +19,7 @@ sub_080A2164: @ 0x080A2164
ldrh r0, [r1]
cmp r0, #0
beq _080A2180
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080A224E
_080A2180:

20
asm/lockedDoor.s
View File

@ -31,7 +31,7 @@ sub_08083338: @ 0x08083338
cmp r1, r0
beq _08083356
adds r0, r1, #0
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08083356
bl sub_0805E780
@ -132,7 +132,7 @@ _08083412:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _0808342E
ldrb r1, [r4, #0xa]
@ -152,7 +152,7 @@ _08083438:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _0808344E
_08083446:
@ -167,7 +167,7 @@ _08083456:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _080834A8
ldrb r0, [r4, #0x1e]
@ -344,7 +344,7 @@ sub_08083598: @ 0x08083598
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080835C6
b _080835C0
@ -352,7 +352,7 @@ _080835B2:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _080835C6
_080835C0:
@ -371,7 +371,7 @@ sub_080835C8: @ 0x080835C8
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _080835F4
b _080835F0
@ -379,7 +379,7 @@ _080835E2:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080835F4
_080835F0:
@ -402,7 +402,7 @@ sub_080835F8: @ 0x080835F8
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08083636
_08083616:
@ -415,7 +415,7 @@ _08083616:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
movs r0, #1
rsbs r0, r0, #0
bl sub_080526F8

2
asm/macroBook.s
View File

@ -208,7 +208,7 @@ _0809A8E2:
movs r0, #0xff
bl sub_08078A90
movs r0, #0x2a
bl sub_0807CD04
bl SetGlobalFlag
_0809A8FC:
adds r0, r4, #0
bl sub_080042B8

24
asm/marcy.s
View File

@ -39,7 +39,7 @@ sub_08062D18: @ 0x08062D18
cmp r0, #0
beq _08062D36
movs r0, #0x26
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08062D36
movs r4, #7
@ -49,7 +49,7 @@ _08062D36:
cmp r0, #0
beq _08062D4C
movs r0, #0x25
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08062D4C
movs r4, #6
@ -59,7 +59,7 @@ _08062D4C:
cmp r0, #0
beq _08062D62
movs r0, #0x24
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08062D62
movs r4, #5
@ -69,7 +69,7 @@ _08062D62:
cmp r0, #0
beq _08062D78
movs r0, #0x23
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08062D78
movs r4, #4
@ -79,7 +79,7 @@ _08062D78:
cmp r0, #0
beq _08062D8E
movs r0, #0x22
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08062D8E
movs r4, #3
@ -89,7 +89,7 @@ _08062D8E:
cmp r0, #0
beq _08062DA4
movs r0, #0x21
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08062DA4
movs r4, #2
@ -99,7 +99,7 @@ _08062DA4:
cmp r0, #0
beq _08062DBA
movs r0, #0x20
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _08062DBA
movs r4, #1
@ -107,7 +107,7 @@ _08062DBA:
strb r4, [r5, #0xb]
movs r4, #0
ldr r0, _08062DCC @ =0x00001C1F
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08062DD0
movs r4, #1
@ -116,16 +116,16 @@ _08062DBA:
_08062DCC: .4byte 0x00001C1F
_08062DD0:
movs r0, #0x8c
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08062DE4
movs r4, #2
movs r0, #0x8c
bl sub_0807CD34
bl ClearLocalFlag
b _08062DF0
_08062DE4:
movs r0, #0x8b
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08062DF0
movs r4, #3
@ -153,6 +153,6 @@ _08062E0E:
sub_08062E14: @ 0x08062E14
push {lr}
movs r0, #0x8b
bl sub_0807CCB4
bl SetLocalFlag
pop {pc}
.align 2, 0

6
asm/mask.s
View File

@ -33,7 +33,7 @@ sub_080929A4: @ 0x080929A4
adds r4, r5, #0
adds r4, #0x86
ldrh r0, [r4]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08092A08
ldrb r0, [r5, #0xb]
@ -67,7 +67,7 @@ _080929F4: .4byte gUnk_030010A0
_080929F8: .4byte 0x0000044F
_080929FC:
ldrh r0, [r4]
bl sub_0807CD48
bl ClearFlag
b _08092A08
_08092A04:
bl sub_0805E780
@ -222,7 +222,7 @@ _08092B32:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
_08092B3C:
adds r0, r4, #0
movs r1, #5

10
asm/mayorHagen.s
View File

@ -124,16 +124,16 @@ sub_0806CE80: @ 0x0806CE80
cmp r0, #0
bne _0806CEC0
movs r0, #0x70
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _0806CEBC
movs r0, #0x71
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806CEB8
movs r4, #0xb
movs r0, #0x71
bl sub_0807CCB4
bl SetLocalFlag
b _0806CED6
.align 2, 0
_0806CEB4: .4byte gUnk_02002A40
@ -145,12 +145,12 @@ _0806CEBC:
b _0806CED6
_0806CEC0:
movs r0, #0x89
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0806CED4
movs r4, #0xd
movs r0, #0x89
bl sub_0807CCB4
bl SetLocalFlag
b _0806CED6
_0806CED4:
movs r4, #0xe

4
asm/metalDoor.s
View File

@ -31,7 +31,7 @@ sub_080A0684: @ 0x080A0684
cmp r1, r0
beq _080A06A2
adds r0, r1, #0
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080A06A2
bl sub_0805E780
@ -186,7 +186,7 @@ sub_080A07BC: @ 0x080A07BC
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _080A07EA
movs r0, #4

4
asm/minecartDoor.s
View File

@ -202,7 +202,7 @@ sub_08096C3C: @ 0x08096C3C
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _08096CAE
_08096C56:
@ -294,7 +294,7 @@ sub_08096CEC: @ 0x08096CEC
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _08096D60
_08096D06:

2
asm/ministerPotho.s
View File

@ -193,7 +193,7 @@ sub_08066904: @ 0x08066904
push {r4, lr}
adds r4, r0, #0
movs r0, #2
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _08066916
movs r1, #0

2
asm/mountainMinish.s
View File

@ -449,7 +449,7 @@ sub_08068190: @ 0x08068190
movs r5, #8
_0806819C:
movs r0, #0x7e
bl sub_0807CBD0
bl CheckLocalFlag
rsbs r1, r0, #0
orrs r1, r0
lsrs r4, r1, #0x1f

2
asm/mutoh.s
View File

@ -125,7 +125,7 @@ sub_080670B4: @ 0x080670B4
cmp r0, #0
bne _080670D0
movs r0, #0x15
bl GetProgressFlag
bl CheckGlobalFlag
rsbs r1, r0, #0
orrs r1, r0
lsrs r4, r1, #0x1f

5
asm/mainLoop.s → asm/non_matching/mainLoop.inc
View File

@ -5,8 +5,6 @@
.text
thumb_func_start MainLoop
MainLoop: @ 0x08055E6C
push {r4, r5, r6, lr}
bl sub_08055F70
bl sub_080A3204
@ -113,4 +111,5 @@ _08055F64:
bl sub_08016E78
b _08055EC8
.align 2, 0
_08055F6C: .4byte gUnk_08100CBC
_08055F6C: .4byte gUnk_08100CBC
.syntax divided

2
asm/object12.s
View File

@ -30,7 +30,7 @@ sub_08084FD8: @ 0x08084FD8
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08084FF4
bl sub_0805E780

4
asm/object24.s
View File

@ -91,7 +91,7 @@ sub_0808886C: @ 0x0808886C
adds r0, r5, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
ldr r0, _080888B4 @ =0x0000016B
bl sub_08004488
b _080888F2
@ -156,7 +156,7 @@ sub_080888F4: @ 0x080888F4
adds r0, r5, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CD48
bl ClearFlag
adds r0, r5, #0
adds r1, r4, #0
bl UpdateSprite

4
asm/object2A.s
View File

@ -78,7 +78,7 @@ _08089B7C:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _08089B96
ldrb r1, [r4, #0x18]
@ -197,7 +197,7 @@ _08089C72:
adds r0, r5, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
adds r1, r0, #0
ldrb r0, [r5, #0xd]
cmp r0, #0

2
asm/object35.s
View File

@ -200,7 +200,7 @@ sub_0808B9D4: @ 0x0808B9D4
push {r4, lr}
adds r4, r0, #0
movs r0, #0
bl sub_0807CC3C
bl CheckRoomFlag
cmp r0, #0
beq _0808BA0A
movs r1, #0

6
asm/object36.s
View File

@ -25,7 +25,7 @@ sub_0808BB30: @ 0x0808BB30
push {r4, lr}
adds r4, r0, #0
movs r0, #0x17
bl GetProgressFlag
bl CheckGlobalFlag
adds r1, r0, #0
cmp r1, #0
beq _0808BB4C
@ -191,7 +191,7 @@ sub_0808BC3C: @ 0x0808BC3C
cmp r0, #0
bne _0808BCA0
movs r0, #0x17
bl sub_0807CD04
bl SetGlobalFlag
movs r0, #2
strb r0, [r5, #0xc]
movs r0, #0x80
@ -254,7 +254,7 @@ _0808BCFE:
sub_0808BD00: @ 0x0808BD00
push {lr}
movs r0, #0x17
bl sub_0807CD04
bl SetGlobalFlag
movs r0, #0x72
bl PlaySFX
bl sub_0805E780

2
asm/object3E.s
View File

@ -516,7 +516,7 @@ sub_0808D474: @ 0x0808D474
cmp r0, #0
bne _0808D4D4
movs r0, #0x7c
bl sub_0807CBD0
bl CheckLocalFlag
adds r1, r0, #0
cmp r1, #0
bne _0808D4D4

2
asm/object48.s
View File

@ -105,7 +105,7 @@ _0808E840:
beq _0808E894
strb r1, [r4, #0xb]
movs r0, #0x14
bl GetProgressFlag
bl CheckGlobalFlag
movs r2, #0x80
lsls r2, r2, #1
adds r1, r2, #0

2
asm/object52.s
View File

@ -15,7 +15,7 @@ sub_080910A0: @ 0x080910A0
cmp r0, #0
bne _080910C8
ldrb r0, [r4, #0xa]
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _080910B8
bl sub_0805E780

8
asm/object6A.s
View File

@ -806,7 +806,7 @@ _08095040:
movs r0, #4
strb r0, [r4, #0xc]
movs r0, #0x5b
bl GetProgressFlag
bl CheckGlobalFlag
cmp r0, #0
bne _08095086
movs r0, #0x1c
@ -814,7 +814,7 @@ _08095040:
movs r2, #0
bl sub_080A7C00
movs r0, #0x5b
bl sub_0807CD04
bl SetGlobalFlag
movs r0, #0x3c
strb r0, [r4, #0xe]
b _08095086
@ -2872,14 +2872,14 @@ sub_08096028: @ 0x08096028
lsls r5, r5, #2
adds r0, r5, #0
movs r1, #0x7b
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
bne _0809603E
movs r4, #4
_0809603E:
adds r0, r5, #0
movs r1, #0x7a
bl GetProgressFlagWithOffset
bl CheckLocalFlagByOffset
cmp r0, #0
bne _0809604C
movs r4, #3

6
asm/object74.s
View File

@ -40,7 +40,7 @@ sub_08097B84: @ 0x08097B84
cmp r1, r0
beq _08097BB0
adds r0, r1, #0
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08097BD4
_08097BB0:
@ -71,7 +71,7 @@ sub_08097BDC: @ 0x08097BDC
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _08097C10
movs r0, #1
@ -164,7 +164,7 @@ sub_08097C20: @ 0x08097C20
movs r0, #0x72
bl PlaySFX
movs r0, #0x63
bl sub_0807CD04
bl SetGlobalFlag
_08097CA6:
pop {r4, r5, r6, pc}
.align 2, 0

4
asm/object86.s
View File

@ -60,7 +60,7 @@ sub_08099E10: @ 0x08099E10
push {r4, r5, lr}
adds r4, r0, #0
movs r0, #0x74
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08099E54
adds r0, r4, #0
@ -141,7 +141,7 @@ sub_08099E8C: @ 0x08099E8C
bl sub_0805E4E0
_08099EB2:
movs r0, #0x75
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
beq _08099EC2
movs r0, #7

4
asm/object89.s
View File

@ -25,7 +25,7 @@ sub_0809AB04: @ 0x0809AB04
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0x31
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
beq _0809AB22
adds r0, r5, #0
@ -304,7 +304,7 @@ sub_0809ACE8: @ 0x0809ACE8
movs r0, #0x73
bl PlaySFX
movs r0, #0x31
bl sub_0807CCC8
bl SetFlag
adds r0, r4, #0
bl sub_0809AD8C
b _0809AD58

2
asm/object8A.s
View File

@ -150,7 +150,7 @@ _0809AEBC:
adds r2, r7, #0
bl SetTile
movs r0, #0x4f
bl sub_0807CBD0
bl CheckLocalFlag
cmp r0, #0
bne _0809AF00
ldr r0, _0809AEFC @ =0x0000402F

6
asm/object8B.s
View File

@ -85,7 +85,7 @@ _0809AFC4:
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CBE4
bl CheckFlags
cmp r0, #0
bne _0809B010
movs r3, #0x80
@ -296,7 +296,7 @@ _0809B178:
ldr r0, [r1, #0x50]
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CCC8
bl SetFlag
b _0809B228
.align 2, 0
_0809B1B4: .4byte 0x00004082
@ -327,7 +327,7 @@ _0809B1C0:
ldr r0, [r1, #0x50]
adds r0, #0x86
ldrh r0, [r0]
bl sub_0807CD48
bl ClearFlag
b _0809B228
.align 2, 0
_0809B1FC: .4byte 0x00004082

Some files were not shown because too many files have changed in this diff Show More