diff --git a/asm/beanstalk.s b/asm/beanstalk.s index 4b9d9763..0d16237f 100644 --- a/asm/beanstalk.s +++ b/asm/beanstalk.s @@ -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 diff --git a/asm/bigBarrel.s b/asm/bigBarrel.s index 63988361..147dbf73 100644 --- a/asm/bigBarrel.s +++ b/asm/bigBarrel.s @@ -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 diff --git a/asm/bigIceBlock.s b/asm/bigIceBlock.s index dcdb329b..d7a21c50 100644 --- a/asm/bigIceBlock.s +++ b/asm/bigIceBlock.s @@ -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 diff --git a/asm/bigPushableLever.s b/asm/bigPushableLever.s index dcd2c5f6..04c7fdcd 100644 --- a/asm/bigPushableLever.s +++ b/asm/bigPushableLever.s @@ -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] diff --git a/asm/bigVortex.s b/asm/bigVortex.s index 6603bb99..0de7797e 100644 --- a/asm/bigVortex.s +++ b/asm/bigVortex.s @@ -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: diff --git a/asm/bird.s b/asm/bird.s index 9a6ca8f8..18b7f9ab 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -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 diff --git a/asm/bladeBrothers.s b/asm/bladeBrothers.s index c5effab6..e5f82866 100644 --- a/asm/bladeBrothers.s +++ b/asm/bladeBrothers.s @@ -492,7 +492,7 @@ _08068D4C: b _08068DAA _08068D50: movs r0, #3 - bl sub_0807CBD0 + bl CheckLocalFlag b _08068DAE _08068D58: ldr r0, _08068D64 @ =gUnk_02002A40 diff --git a/asm/bollard.s b/asm/bollard.s index 6fd9b4ea..cb40d9ed 100644 --- a/asm/bollard.s +++ b/asm/bollard.s @@ -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: diff --git a/asm/book.s b/asm/book.s index 0999be8e..d0e57eb4 100644 --- a/asm/book.s +++ b/asm/book.s @@ -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 diff --git a/asm/bossDoor.s b/asm/bossDoor.s index 56db090a..3740d1ba 100644 --- a/asm/bossDoor.s +++ b/asm/bossDoor.s @@ -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 diff --git a/asm/businessScrub.s b/asm/businessScrub.s index 1525bdaf..6ab8b0df 100644 --- a/asm/businessScrub.s +++ b/asm/businessScrub.s @@ -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 diff --git a/asm/button.s b/asm/button.s index 233cb07b..5c5101f1 100644 --- a/asm/button.s +++ b/asm/button.s @@ -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] diff --git a/asm/carpenter.s b/asm/carpenter.s index ddd2ad28..f5946665 100644 --- a/asm/carpenter.s +++ b/asm/carpenter.s @@ -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 diff --git a/asm/castleMaid.s b/asm/castleMaid.s index bbee91ad..8669d836 100644 --- a/asm/castleMaid.s +++ b/asm/castleMaid.s @@ -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 diff --git a/asm/castorWildsStatue.s b/asm/castorWildsStatue.s index 9917cc38..326cb38e 100644 --- a/asm/castorWildsStatue.s +++ b/asm/castorWildsStatue.s @@ -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 diff --git a/asm/chestSpawner.s b/asm/chestSpawner.s index b8f89590..6d210b89 100644 --- a/asm/chestSpawner.s +++ b/asm/chestSpawner.s @@ -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 diff --git a/asm/clothesRack.s b/asm/clothesRack.s index 6ffe5360..d9494c91 100644 --- a/asm/clothesRack.s +++ b/asm/clothesRack.s @@ -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 diff --git a/asm/cloud.s b/asm/cloud.s index 730cd649..f838812e 100644 --- a/asm/cloud.s +++ b/asm/cloud.s @@ -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 diff --git a/asm/code_08018500.s b/asm/code_08018500.s index ea628c52..07ff741e 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -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] diff --git a/asm/code_08019444.s b/asm/code_08019444.s index 6cb4e864..72aa683c 100644 --- a/asm/code_08019444.s +++ b/asm/code_08019444.s @@ -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 diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index 2c1c61de..bdbf7158 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -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 diff --git a/asm/code_0804AA84.s b/asm/code_0804AA84.s index 14250a42..e5b3dda0 100644 --- a/asm/code_0804AA84.s +++ b/asm/code_0804AA84.s @@ -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 diff --git a/asm/code_0804B058.s b/asm/code_0804B058.s index 479e1911..5b111fdf 100644 --- a/asm/code_0804B058.s +++ b/asm/code_0804B058.s @@ -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 diff --git a/asm/code_0804B9F8.s b/asm/code_0804B9F8.s index 28cb7b21..cb9ed8ab 100644 --- a/asm/code_0804B9F8.s +++ b/asm/code_0804B9F8.s @@ -108,7 +108,7 @@ _0804BA98: .4byte gUnk_080D71F0 sub_0804BA9C: @ 0x0804BA9C push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BAB2 ldr r0, _0804BAB8 @ =gRoomVars @@ -127,14 +127,14 @@ _0804BABC: .4byte gUnk_080D7348 sub_0804BAC0: @ 0x0804BAC0 push {lr} movs r0, #3 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804BAD2 ldr r0, _0804BAE8 @ =gUnk_080D7328 bl LoadRoomEntityList _0804BAD2: movs r0, #0x64 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BAF4 ldr r0, _0804BAEC @ =gUnk_02033A90 @@ -149,7 +149,7 @@ _0804BAEC: .4byte gUnk_02033A90 _0804BAF0: .4byte 0x00000864 _0804BAF4: movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BB0C ldr r0, _0804BB10 @ =gUnk_02033A90 @@ -169,7 +169,7 @@ _0804BB14: .4byte 0x00000864 sub_0804BB18: @ 0x0804BB18 push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BB2E ldr r0, _0804BB34 @ =gRoomVars @@ -188,29 +188,29 @@ _0804BB38: .4byte gUnk_080D7410 sub_0804BB3C: @ 0x0804BB3C push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804BB7C movs r0, #3 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804BB58 ldr r0, _0804BB8C @ =gUnk_080D73B0 bl LoadRoomEntityList _0804BB58: movs r0, #2 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804BB72 movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BB72 ldr r0, _0804BB90 @ =gUnk_080D73E0 bl LoadRoomEntityList _0804BB72: movs r0, #0x64 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BB8A _0804BB7C: @@ -238,7 +238,7 @@ sub_0804BB9C: @ 0x0804BB9C sub_0804BBA0: @ 0x0804BBA0 push {lr} movs r0, #0x64 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BBBA ldr r0, _0804BBDC @ =gUnk_02033A90 @@ -250,7 +250,7 @@ sub_0804BBA0: @ 0x0804BBA0 str r0, [r1] _0804BBBA: movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BBE8 ldr r0, _0804BBE4 @ =gUnk_080D7618 @@ -269,7 +269,7 @@ _0804BBE0: .4byte 0x00000864 _0804BBE4: .4byte gUnk_080D7618 _0804BBE8: movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804BC10 ldr r0, _0804BC04 @ =gUnk_080D74C8 @@ -286,7 +286,7 @@ _0804BC08: .4byte gUnk_02033A90 _0804BC0C: .4byte 0x00000864 _0804BC10: movs r0, #2 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804BC28 ldr r0, _0804BC24 @ =gUnk_080D7588 @@ -311,7 +311,7 @@ sub_0804BC34: @ 0x0804BC34 sub_0804BC38: @ 0x0804BC38 push {lr} movs r0, #0x9c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804BC4A ldr r0, _0804BC4C @ =gUnk_080D7690 @@ -325,14 +325,14 @@ _0804BC4C: .4byte gUnk_080D7690 sub_0804BC50: @ 0x0804BC50 push {lr} movs r0, #0x9f - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804BC68 ldr r1, _0804BC6C @ =gUnk_030010A0 movs r0, #5 strb r0, [r1, #0xf] movs r0, #0x1c - bl sub_0807CD80 + bl ClearGlobalFlag _0804BC68: movs r0, #1 pop {pc} @@ -343,7 +343,7 @@ _0804BC6C: .4byte gUnk_030010A0 sub_0804BC70: @ 0x0804BC70 push {lr} movs r0, #0x9f - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804BCA0 movs r1, #0x80 @@ -364,7 +364,7 @@ sub_0804BC70: @ 0x0804BC70 bl sub_080751E8 _0804BCA0: movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804BCBC bl sub_08052878 @@ -375,7 +375,7 @@ _0804BCB4: .4byte gRoomControls _0804BCB8: .4byte gUnk_08009E88 _0804BCBC: movs r0, #0x64 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804BCD0 ldr r0, _0804BCD4 @ =gUnk_02033A90 @@ -620,7 +620,7 @@ sub_0804BDCC: @ 0x0804BDCC sub_0804BDD0: @ 0x0804BDD0 push {lr} movs r0, #3 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804BDE8 ldr r0, _0804BDE4 @ =gUnk_080D827C @@ -741,11 +741,11 @@ sub_0804BE4C: @ 0x0804BE4C sub_0804BE50: @ 0x0804BE50 push {lr} movs r0, #0x68 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804BE62 movs r0, #0x68 - bl sub_0807CCB4 + bl SetLocalFlag _0804BE62: movs r0, #0x2f bl sub_0801E7F4 @@ -962,7 +962,7 @@ sub_0804C014: @ 0x0804C014 sub_0804C018: @ 0x0804C018 push {r4, lr} movs r0, #0x20 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804C044 movs r0, #0x3c @@ -979,7 +979,7 @@ _0804C03C: .4byte gUnk_080D90C8 _0804C040: .4byte gUnk_080D9108 _0804C044: movs r0, #0x21 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804C054 ldr r0, _0804C0D0 @ =gUnk_080D9108 @@ -1022,7 +1022,7 @@ _0804C090: movs r2, #1 bl SetTile movs r0, #0x62 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C0C8 ldr r0, _0804C0FC @ =gUnk_030010A0 @@ -1034,7 +1034,7 @@ _0804C090: bl PlaySFX _0804C0C8: movs r0, #0x62 - bl sub_0807CD80 + bl ClearGlobalFlag pop {r4, pc} .align 2, 0 _0804C0D0: .4byte gUnk_080D9108 @@ -1177,7 +1177,7 @@ _0804C1DE: movs r0, #1 bl sub_080AF250 movs r0, #0x62 - bl sub_0807CD04 + bl SetGlobalFlag bl sub_0804C290 ldrb r1, [r4, #0xd] movs r0, #0xf @@ -1193,7 +1193,7 @@ _0804C206: movs r0, #1 bl sub_080AF250 movs r0, #0x5c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804C228 ldr r1, _0804C244 @ =0x00000107 @@ -1204,7 +1204,7 @@ _0804C228: ldr r0, _0804C248 @ =gUnk_080D9328 bl sub_0804B1AC movs r0, #0x62 - bl sub_0807CD04 + bl SetGlobalFlag bl sub_0804C290 ldrb r1, [r5, #0xd] movs r0, #0xf @@ -1332,11 +1332,11 @@ sub_0804C2F0: @ 0x0804C2F0 movs r0, #2 bl sub_08058324 movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C312 movs r0, #0x2a - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804C312 ldr r0, _0804C314 @ =gUnk_080D9800 @@ -1374,7 +1374,7 @@ sub_0804C330: @ 0x0804C330 sub_0804C334: @ 0x0804C334 push {lr} movs r0, #0x1e - bl sub_0807CD04 + bl SetGlobalFlag movs r0, #0x5b bl sub_0801E7F4 cmp r0, #0 @@ -1478,7 +1478,7 @@ nullsub_202: @ 0x0804C3C8 sub_0804C3CC: @ 0x0804C3CC push {lr} movs r0, #0x39 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804C3DE ldr r1, _0804C3E4 @ =gRoomVars @@ -1677,16 +1677,16 @@ _0804C4A8: bl LoadRoomEntityList _0804C4AE: movs r0, #0x54 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C4F0 bl sub_08060354 cmp r0, #0 beq _0804C4F0 movs r0, #0 - bl sub_0807CD10 + bl SetRoomFlag movs r0, #0x3b - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804C4DC movs r4, #0xc8 @@ -1696,7 +1696,7 @@ _0804C4AE: _0804C4D8: .4byte gUnk_080DAB64 _0804C4DC: movs r0, #0x3c - bl GetProgressFlag + bl CheckGlobalFlag movs r4, #0x91 lsls r4, r4, #7 cmp r0, #0 @@ -1706,7 +1706,7 @@ _0804C4DC: b _0804C522 _0804C4F0: movs r0, #0x3d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C500 movs r4, #0x92 @@ -1714,7 +1714,7 @@ _0804C4F0: b _0804C522 _0804C500: movs r0, #0x3c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C510 movs r4, #0x94 @@ -1722,7 +1722,7 @@ _0804C500: b _0804C522 _0804C510: movs r0, #0x3b - bl GetProgressFlag + bl CheckGlobalFlag movs r4, #0x92 lsls r4, r4, #8 cmp r0, #0 @@ -1823,7 +1823,7 @@ sub_0804C5DC: @ 0x0804C5DC sub_0804C5E0: @ 0x0804C5E0 push {lr} movs r0, #0x56 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C5F2 ldr r0, _0804C5F8 @ =gUnk_080DAEE8 @@ -1843,7 +1843,7 @@ sub_0804C5FC: @ 0x0804C5FC sub_0804C600: @ 0x0804C600 push {lr} movs r0, #0x56 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C612 ldr r0, _0804C618 @ =gUnk_080DAF80 @@ -1863,7 +1863,7 @@ sub_0804C61C: @ 0x0804C61C sub_0804C620: @ 0x0804C620 push {lr} movs r0, #0x56 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C632 ldr r0, _0804C638 @ =gUnk_080DB018 @@ -1989,7 +1989,7 @@ sub_0804C6B8: @ 0x0804C6B8 cmp r0, #0 bne _0804C6E4 movs r0, #0x71 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804C6E4 ldr r0, _0804C6E0 @ =gUnk_080DB4D0 @@ -2065,11 +2065,11 @@ sub_0804C728: @ 0x0804C728 sub_0804C730: @ 0x0804C730 push {lr} movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C74C movs r0, #0x73 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804C74C ldr r1, _0804C750 @ =gRoomVars @@ -2092,7 +2092,7 @@ sub_0804C758: @ 0x0804C758 cmp r0, #0 bne _0804C77A movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804C77A ldr r0, _0804C784 @ =gUnk_080DB820 @@ -2117,7 +2117,7 @@ sub_0804C78C: @ 0x0804C78C cmp r0, #0 bne _0804C7A2 movs r0, #0x73 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804C7A8 _0804C7A2: @@ -2138,7 +2138,7 @@ sub_0804C7B4: @ 0x0804C7B4 sub_0804C7B8: @ 0x0804C7B8 push {r4, r5, lr} movs r0, #0x60 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804C7CA ldr r0, _0804C7E4 @ =gUnk_080DBB50 @@ -2162,7 +2162,7 @@ _0804C7F0: bl LoadRoomEntityList _0804C7F6: movs r0, #0x62 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804C818 movs r5, #0xa0 @@ -2304,7 +2304,7 @@ sub_0804C884: @ 0x0804C884 movs r0, #0x80 lsls r0, r0, #2 movs r1, #0x80 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _0804C8CA ldr r0, _0804C8B0 @ =gUnk_080DC3F0 @@ -2326,7 +2326,7 @@ _0804C8CA: movs r0, #0x80 lsls r0, r0, #2 movs r1, #0x83 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _0804C8E8 movs r0, #0x11 @@ -2337,7 +2337,7 @@ _0804C8CA: bl LoadRoomEntityList _0804C8E8: movs r0, #0x8d - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804C8F8 ldr r0, _0804C90C @ =gUnk_080DC4C0 @@ -2622,14 +2622,14 @@ sub_0804CA0C: @ 0x0804CA0C sub_0804CA10: @ 0x0804CA10 push {lr} movs r0, #0x56 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804CA22 ldr r0, _0804CA34 @ =gUnk_080DD214 bl LoadRoomEntityList _0804CA22: movs r0, #0x7f - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804CA3C ldr r0, _0804CA38 @ =gUnk_080DD274 @@ -2643,7 +2643,7 @@ _0804CA3C: bl LoadRoomEntityList _0804CA42: movs r0, #0x8e - bl sub_0807CCB4 + bl SetLocalFlag pop {pc} .align 2, 0 _0804CA4C: .4byte gUnk_080DD294 @@ -2708,14 +2708,14 @@ sub_0804CA9C: @ 0x0804CA9C sub_0804CAA0: @ 0x0804CAA0 push {lr} movs r0, #0x24 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804CAB2 ldr r0, _0804CAC4 @ =0x000006DE bl sub_0809F814 _0804CAB2: movs r0, #0xf3 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804CAC8 movs r0, #0xe0 @@ -2728,7 +2728,7 @@ _0804CAC8: bl LoadRoomEntityList _0804CACE: movs r0, #0xf5 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804CAE8 ldr r0, _0804CAE4 @ =0x00000BA3 @@ -2755,7 +2755,7 @@ sub_0804CAF8: @ 0x0804CAF8 push {lr} bl sub_080300E8 movs r0, #0x24 - bl sub_0807CCB4 + bl SetLocalFlag pop {pc} .align 2, 0 @@ -2794,7 +2794,7 @@ sub_0804CB2C: @ 0x0804CB2C movs r0, #0x80 lsls r0, r0, #1 movs r1, #0x27 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 beq _0804CB42 movs r0, #0x85 @@ -2822,11 +2822,11 @@ sub_0804CB50: @ 0x0804CB50 push {lr} bl sub_080300E8 movs r0, #4 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804CB70 movs r0, #3 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804CB70 ldr r0, _0804CB74 @ =gUnk_080DE008 @@ -2846,14 +2846,14 @@ sub_0804CB7C: @ 0x0804CB7C push {lr} bl sub_080300E8 movs r0, #0x30 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804CB92 ldr r0, _0804CBA4 @ =gUnk_080DE1E0 bl LoadRoomEntityList _0804CB92: movs r0, #0x31 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804CBA2 ldr r0, _0804CBA8 @ =gUnk_080DE200 @@ -2883,7 +2883,7 @@ sub_0804CBB0: @ 0x0804CBB0 cmp r1, r0 bge _0804CBD6 movs r0, #0x17 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804CBD6 ldr r0, _0804CBE0 @ =gUnk_080DE4C8 @@ -2914,7 +2914,7 @@ sub_0804CBEC: @ 0x0804CBEC sub_0804CBF0: @ 0x0804CBF0 push {lr} movs r0, #0x4b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804CC08 ldr r0, _0804CC04 @ =gUnk_080DE814 @@ -2924,7 +2924,7 @@ sub_0804CBF0: @ 0x0804CBF0 _0804CC04: .4byte gUnk_080DE814 _0804CC08: movs r0, #0x4c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804CC2C ldr r0, _0804CC24 @ =gUnk_080DE834 @@ -2943,7 +2943,7 @@ _0804CC2C: movs r2, #1 bl SetTileType movs r0, #0x24 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804CC4A ldr r1, _0804CC50 @ =0x00000205 @@ -3025,7 +3025,7 @@ _0804CCA0: bl SetTileType _0804CCB4: movs r0, #0x15 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804CCCA movs r1, #0xc1 @@ -3035,7 +3035,7 @@ _0804CCB4: bl SetTileType _0804CCCA: movs r0, #0x16 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804CCE0 movs r1, #0xc6 @@ -3168,12 +3168,12 @@ sub_0804CD44: @ 0x0804CD44 sub_0804CD48: @ 0x0804CD48 push {r4, lr} movs r0, #0x48 - bl sub_0807CBD0 + bl CheckLocalFlag adds r4, r0, #0 cmp r4, #0 bne _0804CD80 movs r0, #0x48 - bl sub_0807CCB4 + bl SetLocalFlag movs r0, #5 movs r1, #0 bl sub_080A7138 @@ -3192,7 +3192,7 @@ sub_0804CD48: @ 0x0804CD48 bl sub_0801DA90 _0804CD80: movs r0, #2 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804CDA8 ldr r0, _0804CDA4 @ =gUnk_080DF94C @@ -3262,13 +3262,13 @@ sub_0804CDF4: @ 0x0804CDF4 sub_0804CDF8: @ 0x0804CDF8 push {lr} movs r0, #2 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804CE18 movs r0, #0x80 lsls r0, r0, #1 movs r1, #1 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _0804CE18 ldr r0, _0804CE1C @ =gUnk_080DFB78 @@ -3402,7 +3402,7 @@ nullsub_270: @ 0x0804CE7C sub_0804CE80: @ 0x0804CE80 push {lr} movs r0, #3 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804CE92 ldr r1, _0804CE98 @ =gRoomVars @@ -3489,7 +3489,7 @@ sub_0804CED4: @ 0x0804CED4 sub_0804CED8: @ 0x0804CED8 push {lr} movs r0, #3 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804CF18 ldr r1, _0804CF04 @ =gUnk_0200B650 @@ -3658,7 +3658,7 @@ sub_0804CFAC: @ 0x0804CFAC sub_0804CFB0: @ 0x0804CFB0 push {lr} movs r0, #0x31 - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _0804CFFE ldr r1, _0804CFD0 @ =gUnk_030010A0 @@ -3837,7 +3837,7 @@ sub_0804D070: @ 0x0804D070 sub_0804D074: @ 0x0804D074 push {lr} movs r0, #4 - bl sub_0807CD04 + bl SetGlobalFlag bl sub_080530C8 movs r0, #3 bl sub_0805B4D0 @@ -3846,7 +3846,7 @@ sub_0804D074: @ 0x0804D074 cmp r0, #0 bne _0804D0A0 movs r0, #0x45 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804D0A0 ldr r0, _0804D0A4 @ =gUnk_080E3850 @@ -3871,15 +3871,15 @@ sub_0804D0AC: @ 0x0804D0AC sub_0804D0B4: @ 0x0804D0B4 push {lr} movs r0, #0x29 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D0D2 movs r0, #0x29 - bl sub_0807CCB4 + bl SetLocalFlag movs r0, #0x4b - bl sub_0807CCB4 + bl SetLocalFlag movs r0, #0x4e - bl sub_0807CCB4 + bl SetLocalFlag _0804D0D2: pop {pc} @@ -4025,7 +4025,7 @@ sub_0804D140: @ 0x0804D140 lsls r0, r0, #1 bl sub_0805308C movs r0, #5 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804D160 ldr r0, _0804D15C @ =gUnk_080E49F4 @@ -4069,11 +4069,11 @@ sub_0804D188: @ 0x0804D188 sub_0804D18C: @ 0x0804D18C push {lr} movs r0, #0x48 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D1A4 movs r0, #0x46 - bl sub_0807CD34 + bl ClearLocalFlag ldr r0, _0804D1A8 @ =gUnk_080E4BD8 bl LoadRoomEntityList _0804D1A4: @@ -4091,7 +4091,7 @@ sub_0804D1B0: @ 0x0804D1B0 push {lr} bl sub_0804D0B4 movs r0, #0x6c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804D1CC ldr r0, _0804D1C8 @ =gUnk_080E4CD8 @@ -4104,11 +4104,11 @@ _0804D1CC: bl LoadRoomEntityList _0804D1D2: movs r0, #0x4b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D1E2 movs r0, #0x49 - bl sub_0807CD34 + bl ClearLocalFlag _0804D1E2: pop {pc} .align 2, 0 @@ -4203,7 +4203,7 @@ sub_0804D228: @ 0x0804D228 sub_0804D22C: @ 0x0804D22C push {lr} movs r0, #0x59 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D244 ldr r0, _0804D240 @ =gUnk_080E5660 @@ -4279,7 +4279,7 @@ sub_0804D27C: @ 0x0804D27C push {lr} bl sub_0804D0B4 movs r0, #0x4b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D298 ldr r0, _0804D294 @ =gUnk_080E5E3C @@ -4384,7 +4384,7 @@ sub_0804D2E4: @ 0x0804D2E4 sub_0804D2E8: @ 0x0804D2E8 push {lr} movs r0, #0x32 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D2FA ldr r0, _0804D2FC @ =gUnk_080E693C @@ -4480,14 +4480,14 @@ sub_0804D340: @ 0x0804D340 bl SetTileType bl sub_08054570 movs r0, #0xc4 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D362 ldr r0, _0804D378 @ =gUnk_080E718C bl LoadRoomEntityList _0804D362: movs r0, #0xc5 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D372 ldr r0, _0804D37C @ =gUnk_080E71AC @@ -4510,14 +4510,14 @@ sub_0804D384: @ 0x0804D384 movs r0, #0 bl sub_0805AF60 movs r0, #6 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804D39C ldr r0, _0804D3B0 @ =gUnk_080E7314 bl LoadRoomEntityList _0804D39C: movs r0, #0x7b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D3B8 ldr r0, _0804D3B4 @ =gUnk_080E72C4 @@ -4528,7 +4528,7 @@ _0804D3B0: .4byte gUnk_080E7314 _0804D3B4: .4byte gUnk_080E72C4 _0804D3B8: movs r0, #6 - bl sub_0807CD04 + bl SetGlobalFlag movs r0, #0x43 bl GetInventoryValue cmp r0, #0 @@ -5085,7 +5085,7 @@ sub_0804D644: @ 0x0804D644 movs r0, #0 bl sub_0805AF60 movs r0, #0x70 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D65C ldr r0, _0804D660 @ =gUnk_080EA09C @@ -5308,7 +5308,7 @@ sub_0804D780: @ 0x0804D780 movs r0, #4 bl sub_0805B4D0 movs r0, #0x77 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D7A0 ldr r0, _0804D79C @ =gUnk_080EAD68 @@ -5318,7 +5318,7 @@ sub_0804D780: @ 0x0804D780 _0804D79C: .4byte gUnk_080EAD68 _0804D7A0: movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag adds r5, r0, #0 cmp r5, #0 bne _0804D7D0 @@ -5401,17 +5401,17 @@ sub_0804D834: @ 0x0804D834 strb r1, [r4] strb r0, [r4, #1] movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804D894 movs r0, #0x7f - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D878 ldr r0, _0804D870 @ =gUnk_080EAEC0 bl LoadRoomEntityList movs r0, #0x7f - bl sub_0807CCB4 + bl SetLocalFlag ldr r0, _0804D874 @ =0x00000864 adds r1, r4, r0 movs r0, #0x11 @@ -5436,7 +5436,7 @@ _0804D88C: .4byte gUnk_080EAF20 _0804D890: .4byte 0x00000864 _0804D894: movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804D8AC ldr r1, _0804D8C4 @ =0x00000864 @@ -5448,14 +5448,14 @@ _0804D894: str r1, [r0] _0804D8AC: movs r0, #1 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804D8BC ldr r0, _0804D8C8 @ =gUnk_080EAE60 bl LoadRoomEntityList _0804D8BC: movs r0, #0x5d - bl sub_0807CD80 + bl ClearGlobalFlag pop {r4, pc} .align 2, 0 _0804D8C4: .4byte 0x00000864 @@ -5535,7 +5535,7 @@ nullsub_326: @ 0x0804D900 sub_0804D904: @ 0x0804D904 push {r4, r5, lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag adds r5, r0, #0 cmp r5, #0 beq _0804D93C @@ -5560,18 +5560,18 @@ _0804D934: .4byte gUnk_080EB604 _0804D938: .4byte gUnk_02033A90 _0804D93C: movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804D96A ldr r4, _0804D970 @ =gRoomVars str r5, [r4, #0x6c] movs r0, #0x7a - bl sub_0807CBD0 + bl CheckLocalFlag adds r5, r0, #0 cmp r5, #0 bne _0804D96A movs r0, #0x1c - bl sub_0807CD04 + bl SetGlobalFlag ldr r0, _0804D974 @ =gUnk_080EB5D4 str r0, [r4, #0x6c] adds r1, r4, #0 @@ -5591,7 +5591,7 @@ _0804D978: .4byte sub_0804D9B0 sub_0804D97C: @ 0x0804D97C push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804D996 ldr r0, _0804D9A8 @ =gUnk_02033A90 @@ -5603,7 +5603,7 @@ sub_0804D97C: @ 0x0804D97C str r0, [r1] _0804D996: movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804D9A4 bl sub_0804D9B0 @@ -5703,7 +5703,7 @@ nullsub_331: @ 0x0804DA28 sub_0804DA2C: @ 0x0804DA2C push {lr} movs r0, #0x77 - bl sub_0807CBD0 + bl CheckLocalFlag adds r1, r0, #0 cmp r1, #0 bne _0804DA40 @@ -5720,7 +5720,7 @@ _0804DA44: .4byte gRoomVars sub_0804DA48: @ 0x0804DA48 push {lr} movs r0, #0x77 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804DA60 ldr r0, _0804DA5C @ =gUnk_080EB9F4 @@ -5730,22 +5730,22 @@ sub_0804DA48: @ 0x0804DA48 _0804DA5C: .4byte gUnk_080EB9F4 _0804DA60: movs r0, #0x78 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804DA76 ldr r0, _0804DA90 @ =gUnk_080EBAA4 bl LoadRoomEntityList movs r0, #0x75 - bl sub_0807CCB4 + bl SetLocalFlag _0804DA76: movs r0, #0x7b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DA8C ldr r0, _0804DA94 @ =gUnk_080EBAF4 bl LoadRoomEntityList movs r0, #0x76 - bl sub_0807CCB4 + bl SetLocalFlag _0804DA8C: pop {pc} .align 2, 0 @@ -5831,11 +5831,11 @@ sub_0804DAD0: @ 0x0804DAD0 sub_0804DAD4: @ 0x0804DAD4 push {lr} movs r0, #0x86 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DAF0 movs r0, #0x4c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804DAF0 ldr r0, _0804DAF4 @ =gUnk_080EC2CC @@ -5864,11 +5864,11 @@ sub_0804DB00: @ 0x0804DB00 sub_0804DB04: @ 0x0804DB04 push {lr} movs r0, #0x86 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DB20 movs r0, #0x4d - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804DB20 ldr r0, _0804DB24 @ =gUnk_080EC4E8 @@ -5907,11 +5907,11 @@ sub_0804DB38: @ 0x0804DB38 sub_0804DB3C: @ 0x0804DB3C push {lr} movs r0, #0x86 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DB58 movs r0, #0x53 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804DB58 ldr r0, _0804DB5C @ =gUnk_080EC820 @@ -5940,11 +5940,11 @@ sub_0804DB68: @ 0x0804DB68 sub_0804DB6C: @ 0x0804DB6C push {lr} movs r0, #0x86 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DB88 movs r0, #0x56 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804DB88 ldr r0, _0804DB8C @ =gUnk_080ECA60 @@ -6018,7 +6018,7 @@ nullsub_348: @ 0x0804DBBC sub_0804DBC0: @ 0x0804DBC0 push {lr} movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DBD2 ldr r1, _0804DBD8 @ =gRoomVars @@ -6034,7 +6034,7 @@ _0804DBD8: .4byte gRoomVars sub_0804DBDC: @ 0x0804DBDC push {lr} movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DC08 movs r0, #0x90 @@ -6082,7 +6082,7 @@ nullsub_350: @ 0x0804DC24 sub_0804DC28: @ 0x0804DC28 push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804DC3E ldr r0, _0804DC44 @ =gRoomVars @@ -6101,7 +6101,7 @@ _0804DC48: .4byte gUnk_080ED1E4 sub_0804DC4C: @ 0x0804DC4C push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804DC66 ldr r0, _0804DC68 @ =gUnk_02033A90 @@ -6331,7 +6331,7 @@ nullsub_371: @ 0x0804DD14 sub_0804DD18: @ 0x0804DD18 push {lr} movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DD2C ldr r1, _0804DD30 @ =gRoomVars @@ -6348,7 +6348,7 @@ _0804DD30: .4byte gRoomVars sub_0804DD34: @ 0x0804DD34 push {lr} movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DD60 movs r0, #3 @@ -6386,7 +6386,7 @@ nullsub_372: @ 0x0804DD74 sub_0804DD78: @ 0x0804DD78 push {lr} movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DD8A ldr r1, _0804DD90 @ =gRoomVars @@ -6402,7 +6402,7 @@ _0804DD90: .4byte gRoomVars sub_0804DD94: @ 0x0804DD94 push {lr} movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DDC0 ldr r0, _0804DDC4 @ =0x00000392 @@ -6446,7 +6446,7 @@ sub_0804DDDC: @ 0x0804DDDC sub_0804DDE0: @ 0x0804DDE0 push {lr} movs r0, #1 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804DDF2 ldr r0, _0804DDF4 @ =gUnk_080EE71C @@ -6475,19 +6475,19 @@ sub_0804DE00: @ 0x0804DE00 cmp r0, #0 beq _0804DE32 movs r0, #0x19 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804DE22 movs r0, #0x19 - bl sub_0807CD04 + bl SetGlobalFlag b _0804DE32 _0804DE22: movs r0, #0x18 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804DE32 movs r0, #0x18 - bl sub_0807CD04 + bl SetGlobalFlag _0804DE32: ldr r5, _0804DE50 @ =gUnk_080D4250 ldr r4, _0804DE54 @ =gUnk_02002A40 @@ -6509,7 +6509,7 @@ _0804DE54: .4byte gUnk_02002A40 _0804DE58: .4byte gUnk_02017654 _0804DE5C: movs r0, #0x1c - bl sub_0807CD04 + bl SetGlobalFlag ldr r4, _0804DEB4 @ =gUnk_02033A90 ldr r0, _0804DEB8 @ =0x0000085C adds r4, r4, r0 @@ -6537,7 +6537,7 @@ _0804DE5C: bl sub_08052EA0 bl sub_0804AF90 movs r0, #0xcd - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804DEC4 movs r1, #0x80 @@ -6585,7 +6585,7 @@ _0804DF00: lsls r4, r4, #2 adds r0, r4, #0 movs r1, #0x84 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _0804DF1C ldr r0, _0804DF80 @ =gUnk_080EEB6C @@ -6593,7 +6593,7 @@ _0804DF00: _0804DF1C: adds r0, r4, #0 movs r1, #0x85 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _0804DF2E ldr r0, _0804DF84 @ =gUnk_080EEB8C @@ -6604,7 +6604,7 @@ _0804DF2E: cmp r0, #0 bne _0804DF48 movs r0, #2 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804DF48 ldr r0, _0804DF88 @ =gUnk_080EE88C @@ -6625,7 +6625,7 @@ _0804DF58: bl LoadRoomEntityList _0804DF68: movs r0, #0x12 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804DF98 ldr r0, _0804DF94 @ =gUnk_080EE93C @@ -6652,27 +6652,27 @@ _0804DF9E: cmp r0, #3 bls _0804E02A movs r0, #0x2e - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E024 movs r0, #0x2f - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E024 movs r0, #0x30 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E024 movs r0, #0x2b - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E000 movs r0, #0x2c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E000 movs r0, #0x2d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E000 ldr r0, _0804DFFC @ =gUnk_080EE95C @@ -6684,7 +6684,7 @@ _0804DFF8: .4byte gUnk_02002A40 _0804DFFC: .4byte gUnk_080EE95C _0804E000: movs r0, #0x18 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E018 ldr r0, _0804E014 @ =gUnk_080EE97C @@ -6703,7 +6703,7 @@ _0804E024: bl LoadRoomEntityList _0804E02A: movs r0, #0x2b - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E044 ldr r0, _0804E040 @ =gUnk_080EE9FC @@ -6714,7 +6714,7 @@ _0804E03C: .4byte gUnk_080EE99C _0804E040: .4byte gUnk_080EE9FC _0804E044: movs r0, #0x2c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E05C ldr r0, _0804E058 @ =gUnk_080EEA1C @@ -6724,7 +6724,7 @@ _0804E044: _0804E058: .4byte gUnk_080EEA1C _0804E05C: movs r0, #0x2d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E074 ldr r0, _0804E070 @ =gUnk_080EEA3C @@ -6745,15 +6745,15 @@ _0804E07A: cmp r0, #0 bne _0804E0B0 movs r0, #0x2b - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E0AA movs r0, #0x2c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E0AA movs r0, #0x2d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E0B0 _0804E0AA: @@ -6761,7 +6761,7 @@ _0804E0AA: bl LoadRoomEntityList _0804E0B0: movs r0, #0xd0 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E0CA movs r0, #0x14 @@ -6776,7 +6776,7 @@ _0804E0CA: cmp r0, #3 bls _0804E0E2 movs r0, #0x1d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E0E2 ldr r0, _0804E124 @ =gUnk_080EEA7C @@ -6787,7 +6787,7 @@ _0804E0E2: cmp r0, #5 bhi _0804E0FA movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E0FA ldr r0, _0804E128 @ =gUnk_080EEA9C @@ -6861,7 +6861,7 @@ _0804E17C: cmp r0, #0 bne _0804E168 movs r0, #0xd1 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E1BA ldr r4, _0804E198 @ =gUnk_080EED7A @@ -6890,7 +6890,7 @@ _0804E1B4: bne _0804E1A0 _0804E1BA: movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E1F2 ldr r4, _0804E1D0 @ =gUnk_080EED8C @@ -7071,7 +7071,7 @@ _0804E278: .4byte gUnk_080F09A0 sub_0804E27C: @ 0x0804E27C push {r4, lr} movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E2AC ldr r0, _0804E2A0 @ =gUnk_080F0650 @@ -7082,7 +7082,7 @@ sub_0804E27C: @ 0x0804E27C movs r1, #0x13 str r1, [r0] movs r0, #0x64 - bl sub_0807CD04 + bl SetGlobalFlag b _0804E2C0 .align 2, 0 _0804E2A0: .4byte gUnk_080F0650 @@ -7090,7 +7090,7 @@ _0804E2A4: .4byte gUnk_02033A90 _0804E2A8: .4byte 0x00000864 _0804E2AC: movs r0, #0x64 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E2C0 ldr r0, _0804E300 @ =gUnk_02033A90 @@ -7100,7 +7100,7 @@ _0804E2AC: str r1, [r0] _0804E2C0: movs r0, #0x9c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E318 ldr r0, _0804E308 @ =gUnk_080F0800 @@ -7183,13 +7183,13 @@ _0804E376: movs r2, #1 bl SetTileType movs r0, #0x10 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804E3A6 ldr r0, _0804E3B4 @ =gUnk_080F0920 bl LoadRoomEntityList movs r0, #0x10 - bl sub_0807CD34 + bl ClearLocalFlag _0804E3A6: bl sub_080AF284 pop {r4, pc} @@ -7202,7 +7202,7 @@ _0804E3B4: .4byte gUnk_080F0920 sub_0804E3B8: @ 0x0804E3B8 push {lr} movs r0, #1 - bl sub_0807CD34 + bl ClearLocalFlag movs r0, #1 pop {pc} @@ -7210,18 +7210,18 @@ sub_0804E3B8: @ 0x0804E3B8 sub_0804E3C4: @ 0x0804E3C4 push {r4, r5, r6, lr} movs r0, #5 - bl GetProgressFlag + bl CheckGlobalFlag rsbs r1, r0, #0 orrs r1, r0 lsrs r6, r1, #0x1f movs r0, #6 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E3DE movs r6, #2 _0804E3DE: movs r0, #0x55 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E3EA movs r6, #3 @@ -7254,11 +7254,11 @@ _0804E3EA: adds r0, r0, r4 ldrb r6, [r0] movs r0, #0xc6 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E436 movs r0, #0xc6 - bl sub_0807CCB4 + bl SetLocalFlag movs r6, #0xe _0804E436: lsls r0, r6, #3 @@ -7284,7 +7284,7 @@ sub_0804E45C: @ 0x0804E45C sub_0804E460: @ 0x0804E460 push {lr} movs r0, #0x4a - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E478 ldr r0, _0804E474 @ =gUnk_080F1C68 @@ -7309,7 +7309,7 @@ sub_0804E484: @ 0x0804E484 sub_0804E488: @ 0x0804E488 push {lr} movs r0, #0x2e - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E4A0 ldr r0, _0804E49C @ =gUnk_080F1D90 @@ -7319,7 +7319,7 @@ sub_0804E488: @ 0x0804E488 _0804E49C: .4byte gUnk_080F1D90 _0804E4A0: movs r0, #0x2f - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E4B8 ldr r0, _0804E4B4 @ =gUnk_080F1DB0 @@ -7329,7 +7329,7 @@ _0804E4A0: _0804E4B4: .4byte gUnk_080F1DB0 _0804E4B8: movs r0, #0x30 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E4C8 ldr r0, _0804E4CC @ =gUnk_080F1DD0 @@ -7374,7 +7374,7 @@ sub_0804E4E4: @ 0x0804E4E4 cmp r0, #0 bne _0804E506 movs r0, #0x2a - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E506 ldr r0, _0804E51C @ =gUnk_080F2194 @@ -7414,7 +7414,7 @@ _0804E53C: cmp r0, #0 bne _0804E564 movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E564 ldr r0, _0804E560 @ =gUnk_080F238C @@ -7469,7 +7469,7 @@ _0804E5B8: cmp r0, #0 bne _0804E5F0 movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E5D8 _0804E5CC: @@ -7519,11 +7519,11 @@ sub_0804E618: @ 0x0804E618 cmp r0, #0 beq _0804E67A movs r0, #0x42 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E65C movs r0, #0x43 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E650 ldr r0, _0804E648 @ =gUnk_080F2718 @@ -7542,7 +7542,7 @@ _0804E650: _0804E658: .4byte gUnk_080F2758 _0804E65C: movs r0, #0x3f - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E674 ldr r0, _0804E670 @ =gUnk_080F27D8 @@ -7567,7 +7567,7 @@ sub_0804E680: @ 0x0804E680 sub_0804E684: @ 0x0804E684 push {lr} movs r0, #0x2b - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E69C ldr r0, _0804E698 @ =gUnk_080F28D4 @@ -7577,7 +7577,7 @@ sub_0804E684: @ 0x0804E684 _0804E698: .4byte gUnk_080F28D4 _0804E69C: movs r0, #0x2c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E6B4 ldr r0, _0804E6B0 @ =gUnk_080F28F4 @@ -7587,7 +7587,7 @@ _0804E69C: _0804E6B0: .4byte gUnk_080F28F4 _0804E6B4: movs r0, #0x2d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E6C4 ldr r0, _0804E6C8 @ =gUnk_080F2914 @@ -7636,7 +7636,7 @@ sub_0804E6E4: @ 0x0804E6E4 sub_0804E6E8: @ 0x0804E6E8 push {lr} movs r0, #0x49 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E70A ldr r0, _0804E71C @ =gUnk_02033A90 @@ -7651,7 +7651,7 @@ sub_0804E6E8: @ 0x0804E6E8 bl PlaySFX _0804E70A: movs r0, #0x13 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E71A ldr r0, _0804E724 @ =gUnk_080F2E2C @@ -7672,7 +7672,7 @@ sub_0804E728: @ 0x0804E728 sub_0804E72C: @ 0x0804E72C push {lr} movs r0, #0x49 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E74E ldr r0, _0804E760 @ =gUnk_02033A90 @@ -7687,7 +7687,7 @@ sub_0804E72C: @ 0x0804E72C bl PlaySFX _0804E74E: movs r0, #0x13 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E76C ldr r0, _0804E768 @ =gUnk_080F2E94 @@ -7714,7 +7714,7 @@ sub_0804E778: @ 0x0804E778 sub_0804E77C: @ 0x0804E77C push {lr} movs r0, #0x69 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804E792 movs r0, #0x3c @@ -7742,7 +7742,7 @@ sub_0804E7A4: @ 0x0804E7A4 cmp r0, #1 bne _0804E7CC movs r0, #0x5b - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E7CC ldr r0, _0804E7D0 @ =gLinkState @@ -7768,11 +7768,11 @@ sub_0804E7D8: @ 0x0804E7D8 sub_0804E7DC: @ 0x0804E7DC push {r4, lr} movs r0, #0x13 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E818 movs r0, #0x46 - bl sub_0807CBD0 + bl CheckLocalFlag adds r4, r0, #0 cmp r4, #0 bne _0804E818 @@ -7793,7 +7793,7 @@ sub_0804E7DC: @ 0x0804E7DC bl sub_080751E8 _0804E818: movs r0, #0x49 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E838 ldr r0, _0804E854 @ =gUnk_02033A90 @@ -7909,7 +7909,7 @@ sub_0804E8F8: @ 0x0804E8F8 sub_0804E8FC: @ 0x0804E8FC push {lr} movs r0, #0x1d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804E914 ldr r0, _0804E910 @ =gUnk_080F36FC @@ -7939,7 +7939,7 @@ sub_0804E92C: @ 0x0804E92C sub_0804E930: @ 0x0804E930 push {lr} movs r0, #0x1d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E942 ldr r0, _0804E944 @ =gUnk_080F37D0 @@ -7972,7 +7972,7 @@ sub_0804E954: @ 0x0804E954 cmp r0, #0 bne _0804E97A movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E97A movs r0, #0x3b @@ -7998,11 +7998,11 @@ _0804E994: .4byte 0x0000082D sub_0804E998: @ 0x0804E998 push {lr} movs r0, #5 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E9BC movs r0, #4 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E9BC ldr r1, _0804E9B4 @ =gRoomVars @@ -8026,11 +8026,11 @@ _0804E9CC: .4byte gUnk_080F3D44 sub_0804E9D0: @ 0x0804E9D0 push {r4, lr} movs r0, #5 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804E9EC movs r0, #4 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804E9EC ldr r0, _0804EAC4 @ =gUnk_080F3C64 @@ -8048,7 +8048,7 @@ _0804E9FC: cmp r0, #3 bls _0804EA14 movs r0, #0x5c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804EA14 ldr r0, _0804EAD0 @ =gUnk_080F3C44 @@ -8340,7 +8340,7 @@ nullsub_395: @ 0x0804EBD8 sub_0804EBDC: @ 0x0804EBDC push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804EBF2 ldr r0, _0804EBF8 @ =gRoomVars @@ -8359,7 +8359,7 @@ _0804EBFC: .4byte gUnk_080F4EB0 sub_0804EC00: @ 0x0804EC00 push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804EC1A ldr r0, _0804EC48 @ =gUnk_02033A90 @@ -8371,18 +8371,18 @@ sub_0804EC00: @ 0x0804EC00 str r0, [r1] _0804EC1A: movs r0, #0x14 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804EC2A ldr r0, _0804EC50 @ =gUnk_080F4D50 bl LoadRoomEntityList _0804EC2A: movs r0, #0x3e - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EC64 movs r0, #0x3b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EC58 ldr r0, _0804EC54 @ =gUnk_080F4DB0 @@ -8451,7 +8451,7 @@ nullsub_396: @ 0x0804ECB8 sub_0804ECBC: @ 0x0804ECBC push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804ECDA ldr r1, _0804ECE0 @ =gRoomVars @@ -8481,7 +8481,7 @@ sub_0804ECEC: @ 0x0804ECEC ldr r0, _0804ED10 @ =gUnk_080F5328 bl LoadRoomEntityList movs r0, #0x14 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804ED0E ldr r0, _0804ED14 @ =gUnk_080F5308 @@ -8516,7 +8516,7 @@ sub_0804ED34: @ 0x0804ED34 push {lr} bl sub_080AF2E4 movs r0, #0x5d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804ED4E ldr r0, _0804ED50 @ =gUnk_02033A90 @@ -8539,14 +8539,14 @@ sub_0804ED58: @ 0x0804ED58 sub_0804ED5C: @ 0x0804ED5C push {lr} movs r0, #0x79 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804ED6E ldr r0, _0804EDA8 @ =gUnk_080F54E8 bl LoadRoomEntityList _0804ED6E: movs r0, #0x7a - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EDB0 movs r0, #2 @@ -8573,7 +8573,7 @@ _0804EDA8: .4byte gUnk_080F54E8 _0804EDAC: .4byte gUnk_080F5508 _0804EDB0: movs r0, #0x7b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EDE4 movs r0, #3 @@ -8595,7 +8595,7 @@ _0804EDB0: _0804EDE0: .4byte gUnk_080F5558 _0804EDE4: movs r0, #0x7c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EE10 movs r0, #6 @@ -8616,28 +8616,28 @@ _0804EE10: bl LoadRoomEntityList _0804EE16: movs r0, #0x7a - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804EE26 ldr r0, _0804EE60 @ =gUnk_080F5528 bl LoadRoomEntityList _0804EE26: movs r0, #0x7b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804EE36 ldr r0, _0804EE64 @ =gUnk_080F5578 bl LoadRoomEntityList _0804EE36: movs r0, #0x7c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804EE46 ldr r0, _0804EE68 @ =gUnk_080F55B8 bl LoadRoomEntityList _0804EE46: movs r0, #0x5d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804EE5A ldr r0, _0804EE6C @ =gUnk_02033A90 @@ -8664,18 +8664,18 @@ sub_0804EE74: @ 0x0804EE74 sub_0804EE78: @ 0x0804EE78 push {lr} movs r0, #0x78 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EE94 movs r0, #0x7c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804EE94 ldr r0, _0804EEAC @ =gUnk_080F5660 bl LoadRoomEntityList _0804EE94: movs r0, #0x5d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804EEA8 ldr r0, _0804EEB0 @ =gUnk_02033A90 @@ -8707,14 +8707,14 @@ sub_0804EEBC: @ 0x0804EEBC movs r0, #0x80 lsls r0, r0, #2 movs r1, #0x8f - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 beq _0804EEE2 ldr r0, _0804EEF8 @ =gUnk_080F57E8 bl LoadRoomEntityList _0804EEE2: movs r0, #0x55 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EF00 ldr r0, _0804EEFC @ =gUnk_080F57A8 @@ -8754,7 +8754,7 @@ _0804EF3C: .4byte gUnk_080F57C8 _0804EF40: .4byte gUnk_080F5888 _0804EF44: movs r0, #0xcd - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EF54 ldr r0, _0804EF80 @ =gUnk_080F58A8 @@ -8765,14 +8765,14 @@ _0804EF54: cmp r0, #0 bne _0804EF68 movs r0, #4 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804EF92 _0804EF68: ldr r0, _0804EF84 @ =gUnk_080F5868 bl LoadRoomEntityList movs r0, #0x56 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804EF8C ldr r0, _0804EF88 @ =gUnk_080F5828 @@ -8843,7 +8843,7 @@ nullsub_398: @ 0x0804EFD8 sub_0804EFDC: @ 0x0804EFDC push {lr} movs r0, #0x50 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804EFEE ldr r1, _0804EFF4 @ =gUnk_030010A0 @@ -8866,7 +8866,7 @@ sub_0804EFF8: @ 0x0804EFF8 bl LoadRoomEntityList _0804F008: movs r0, #0x50 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804F01C ldr r2, _0804F028 @ =gUnk_08011C50 @@ -8891,7 +8891,7 @@ sub_0804F030: @ 0x0804F030 movs r0, #0x80 lsls r0, r0, #1 movs r1, #0xd1 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _0804F046 ldr r0, _0804F048 @ =gUnk_080F5E68 @@ -8917,7 +8917,7 @@ sub_0804F050: @ 0x0804F050 bl LoadRoomEntityList _0804F060: movs r0, #0x92 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804F080 ldr r0, _0804F07C @ =gUnk_080F5F58 @@ -8959,17 +8959,17 @@ nullsub_400: @ 0x0804F098 sub_0804F09C: @ 0x0804F09C push {lr} movs r0, #0x24 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804F0BC movs r0, #0x80 lsls r0, r0, #1 movs r1, #0xdc - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 beq _0804F0BC movs r0, #0x58 - bl sub_0807CD04 + bl SetGlobalFlag _0804F0BC: movs r0, #1 pop {pc} @@ -8980,11 +8980,11 @@ sub_0804F0C0: @ 0x0804F0C0 movs r0, #0x80 lsls r0, r0, #1 movs r1, #0xdc - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 beq _0804F0D6 movs r0, #0x90 - bl sub_0807CCB4 + bl SetLocalFlag _0804F0D6: movs r0, #0xf bl sub_0801E7F4 @@ -8994,7 +8994,7 @@ _0804F0D6: bl LoadRoomEntityList _0804F0E6: movs r0, #0x58 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804F106 ldr r4, _0804F11C @ =0x00004072 @@ -9030,7 +9030,7 @@ sub_0804F128: @ 0x0804F128 sub_0804F12C: @ 0x0804F12C push {lr} movs r0, #0x58 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804F144 ldr r0, _0804F140 @ =gUnk_080F62E4 @@ -9040,7 +9040,7 @@ sub_0804F12C: @ 0x0804F12C _0804F140: .4byte gUnk_080F62E4 _0804F144: movs r0, #0x63 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804F154 ldr r0, _0804F158 @ =gUnk_080F6324 @@ -9069,7 +9069,7 @@ sub_0804F164: @ 0x0804F164 sub_0804F168: @ 0x0804F168 push {lr} movs r0, #0xb1 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804F180 ldr r0, _0804F17C @ =gUnk_080F6564 @@ -9096,13 +9096,13 @@ sub_0804F190: @ 0x0804F190 movs r0, #5 bl sub_0805B4D0 movs r0, #6 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804F1B6 movs r0, #0x80 lsls r0, r0, #1 movs r1, #5 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _0804F1B6 ldr r0, _0804F1D4 @ =gUnk_080F66AC @@ -9242,7 +9242,7 @@ sub_0804F230: @ 0x0804F230 sub_0804F23C: @ 0x0804F23C push {lr} movs r0, #0x6d - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804F252 movs r1, #0x80 @@ -9251,7 +9251,7 @@ sub_0804F23C: @ 0x0804F23C bl DoFade _0804F252: movs r0, #0x49 - bl sub_0807CD04 + bl SetGlobalFlag movs r0, #1 pop {pc} @@ -9261,16 +9261,16 @@ sub_0804F25C: @ 0x0804F25C movs r0, #0 bl sub_0805ADD8 movs r0, #0x6d - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804F27A ldr r0, _0804F2B0 @ =gUnk_080F70A8 bl LoadRoomEntityList movs r0, #0x1c - bl sub_0807CD80 + bl ClearGlobalFlag _0804F27A: movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804F28E ldr r0, _0804F2B4 @ =gUnk_02033A90 @@ -9433,11 +9433,11 @@ sub_0804F3B0: @ 0x0804F3B0 movs r0, #0x80 lsls r0, r0, #2 movs r1, #0x8f - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 beq _0804F3DC movs r0, #0x1d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804F3EC ldr r0, _0804F3D8 @ =gUnk_080F77C0 @@ -9454,7 +9454,7 @@ _0804F3DC: bl LoadRoomEntityList _0804F3EC: movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804F406 movs r0, #0x40 @@ -9484,7 +9484,7 @@ _0804F42A: cmp r0, #3 bls _0804F442 movs r0, #0x5c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804F442 ldr r0, _0804F464 @ =gUnk_080F78A0 @@ -9506,7 +9506,7 @@ _0804F464: .4byte gUnk_080F78A0 sub_0804F468: @ 0x0804F468 push {lr} movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804F48A movs r0, #0x11 @@ -9521,7 +9521,7 @@ sub_0804F468: @ 0x0804F468 str r1, [r0] _0804F48A: movs r0, #3 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804F4BA movs r0, #3 @@ -9529,7 +9529,7 @@ _0804F48A: cmp r0, #0 beq _0804F4BA movs r0, #0x8c - bl sub_0807CBD0 + bl CheckLocalFlag adds r3, r0, #0 cmp r3, #0 bne _0804F4BA @@ -9543,11 +9543,11 @@ _0804F48A: str r3, [r1, #0x74] _0804F4BA: movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804F4CA movs r0, #0x64 - bl sub_0807CD80 + bl ClearGlobalFlag _0804F4CA: movs r0, #1 pop {pc} @@ -9572,7 +9572,7 @@ sub_0804F4F4: @ 0x0804F4F4 push {r4, lr} bl sub_0804F4E4 movs r0, #0x8b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804F540 ldr r0, _0804F558 @ =gUnk_080F7D70 @@ -9601,7 +9601,7 @@ sub_0804F4F4: @ 0x0804F4F4 bl SetTileType _0804F540: movs r0, #0x15 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804F554 ldr r0, _0804F570 @ =gUnk_02033A90 @@ -9625,7 +9625,7 @@ _0804F574: .4byte 0x00000864 sub_0804F578: @ 0x0804F578 push {lr} movs r0, #0x8e - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804F590 ldr r0, _0804F58C @ =gUnk_080F7DC0 @@ -10163,7 +10163,7 @@ sub_0804FA00: @ 0x0804FA00 cmp r0, #3 bls _0804FA20 movs r0, #0x5c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804FA20 ldr r0, _0804FA28 @ =gUnk_080F806C @@ -10185,7 +10185,7 @@ sub_0804FA30: @ 0x0804FA30 movs r0, #0 bl sub_0805ADD8 movs r0, #3 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804FA5C movs r0, #3 @@ -10193,7 +10193,7 @@ sub_0804FA30: @ 0x0804FA30 cmp r0, #0 beq _0804FA5C movs r0, #0x9c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804FA5C ldr r0, _0804FA60 @ =gUnk_080F82E0 @@ -10220,7 +10220,7 @@ sub_0804FA68: @ 0x0804FA68 movs r0, #0x80 lsls r0, r0, #2 movs r1, #0x42 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _0804FA8E ldr r0, _0804FA90 @ =gUnk_080F8430 @@ -10239,7 +10239,7 @@ sub_0804FA94: @ 0x0804FA94 sub_0804FA98: @ 0x0804FA98 push {lr} movs r0, #0x57 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804FAB0 ldr r0, _0804FAAC @ =gUnk_080F85D8 @@ -10256,7 +10256,7 @@ _0804FAB6: cmp r0, #0 bne _0804FAC6 movs r0, #8 - bl sub_0807CD34 + bl ClearLocalFlag _0804FAC6: pop {pc} .align 2, 0 @@ -10391,18 +10391,18 @@ sub_0804FB2C: @ 0x0804FB2C sub_0804FB30: @ 0x0804FB30 push {lr} movs r0, #0x11 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0804FB64 movs r0, #0 - bl sub_0807CD10 + bl SetRoomFlag movs r0, #1 - bl sub_0807CD10 + bl SetRoomFlag movs r0, #0x80 lsls r0, r0, #1 bl sub_0805308C movs r0, #0x12 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804FB64 movs r0, #0x73 @@ -11080,7 +11080,7 @@ nullsub_463: @ 0x0804FDDC sub_0804FDE0: @ 0x0804FDE0 push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804FDF6 ldr r0, _0804FDFC @ =gRoomVars @@ -11099,7 +11099,7 @@ _0804FE00: .4byte gUnk_080FAD48 sub_0804FE04: @ 0x0804FE04 push {lr} movs r0, #0x51 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804FE28 ldr r0, _0804FE20 @ =gUnk_02033A90 @@ -11153,11 +11153,11 @@ sub_0804FE58: @ 0x0804FE58 movs r0, #1 bl sub_0805B4D0 movs r0, #3 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804FE7A movs r0, #2 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804FE7A ldr r0, _0804FEA0 @ =gUnk_080FAFE4 @@ -11178,7 +11178,7 @@ _0804FE8E: cmp r0, #0 beq _0804FE9E movs r0, #0x56 - bl sub_0807CD04 + bl SetGlobalFlag _0804FE9E: pop {pc} .align 2, 0 @@ -11380,11 +11380,11 @@ sub_0804FF5C: @ 0x0804FF5C sub_0804FF60: @ 0x0804FF60 push {lr} movs r0, #0x70 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0804FF72 movs r0, #0x70 - bl sub_0807CCB4 + bl SetLocalFlag _0804FF72: pop {pc} diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index e1bb44fb..11787dad 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -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 diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s index 61bfc626..84221cde 100644 --- a/asm/code_0805436C.s +++ b/asm/code_0805436C.s @@ -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 diff --git a/asm/code_08056418.s b/asm/code_08056418.s index fd06db94..bdcf0f6b 100644 --- a/asm/code_08056418.s +++ b/asm/code_08056418.s @@ -2466,7 +2466,7 @@ _080576EC: ldrb r0, [r4, #0xa] strb r0, [r5, #0x17] movs r0, #0x14 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _08057740 movs r0, #1 @@ -3027,7 +3027,7 @@ _08057B54: cmp r1, #2 bne _08057B9A ldrh r0, [r5, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08057B9A ldrh r0, [r5, #0x32] @@ -3075,7 +3075,7 @@ sub_08057BA4: @ 0x08057BA4 movs r0, #8 strb r0, [r4, #0xe] ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08057BF6 ldrh r0, [r4, #0x32] @@ -3134,7 +3134,7 @@ sub_08057C28: @ 0x08057C28 cmp r0, #0 bne _08057C44 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08057C9C ldrb r0, [r4, #0xd] @@ -4085,7 +4085,7 @@ sub_08058398: @ 0x08058398 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080583AA bl sub_0805E780 @@ -4130,7 +4130,7 @@ sub_080583EC: @ 0x080583EC push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08058404 movs r0, #2 @@ -4327,7 +4327,7 @@ _08058590: strb r1, [r0] bl UnfreezeTime ldrh r0, [r4, #0x3c] - bl sub_0807CCC8 + bl SetFlag bl sub_0805E780 _080585A6: pop {r4, pc} @@ -4347,7 +4347,7 @@ sub_080585B0: @ 0x080585B0 bl sub_0805E780 _080585C2: ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080585D4 bl sub_0801855C @@ -4361,7 +4361,7 @@ _080585D8: .4byte gUnk_02033A90 sub_080585DC: @ 0x080585DC push {lr} ldrh r0, [r0, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080585EC bl sub_0805E780 @@ -4400,7 +4400,7 @@ sub_08058620: @ 0x08058620 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _08058648 movs r0, #1 @@ -4426,7 +4426,7 @@ sub_08058650: @ 0x08058650 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08058698 adds r0, r4, #0 @@ -4472,7 +4472,7 @@ sub_080586A8: @ 0x080586A8 cmp r0, #0 bne _080586E4 ldrh r0, [r4, #0x3e] - bl sub_0807CCC8 + bl SetFlag ldrh r0, [r4, #0x3c] cmp r0, #0 beq _080586E0 @@ -4733,7 +4733,7 @@ sub_08058894: @ 0x08058894 str r0, [r4, #0x28] movs r0, #0x15 movs r1, #2 - bl sub_0807CC60 + bl CheckLocalFlags rsbs r1, r0, #0 orrs r1, r0 lsrs r1, r1, #0x1f @@ -4949,7 +4949,7 @@ sub_08058A04: @ 0x08058A04 cmp r0, #0xc bhi _08058A78 movs r0, #0x17 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _08058A78 mov r0, r8 @@ -5379,7 +5379,7 @@ sub_08058D34: @ 0x08058D34 ldr r0, _08058DCC @ =gUnk_02000070 strb r4, [r0] movs r0, #0x17 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _08058DA8 movs r0, #0x4a @@ -5415,7 +5415,7 @@ sub_08058DE8: @ 0x08058DE8 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08058DFC bl sub_0805E780 @@ -5465,7 +5465,7 @@ sub_08058E34: @ 0x08058E34 cmp r0, #0 bne _08058E5E ldrh r0, [r4, #0x3e] - bl sub_0807CCC8 + bl SetFlag ldrb r0, [r4, #0xa] cmp r0, #0 beq _08058E58 @@ -5487,7 +5487,7 @@ sub_08058E60: @ 0x08058E60 movs r0, #1 strb r0, [r4, #0xc] ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08058E80 adds r0, r4, #0 @@ -5495,7 +5495,7 @@ sub_08058E60: @ 0x08058E60 b _08058EC8 _08058E80: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08058EC8 ldrb r0, [r4, #0xb] @@ -5554,7 +5554,7 @@ sub_08058EE4: @ 0x08058EE4 strb r0, [r6, #0xc] _08058EF2: ldrb r0, [r6, #0xb] - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 beq _08058F40 movs r5, #0x94 @@ -5595,7 +5595,7 @@ sub_08058F44: @ 0x08058F44 adds r4, r0, #0 adds r5, r1, #0 adds r0, r2, #0 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 bne _08058F80 adds r0, r4, #0 @@ -5678,7 +5678,7 @@ _08058FDC: _08058FE2: strb r0, [r4, #0xf] ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08059060 adds r0, r4, #0 @@ -5686,7 +5686,7 @@ _08058FE2: b _08059060 _08058FF6: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08059060 movs r0, #2 @@ -5729,7 +5729,7 @@ _08059034: _0805904C: .4byte gLinkEntity _08059050: ldrh r0, [r4, #0x3e] - bl sub_0807CCC8 + bl SetFlag movs r0, #1 bl sub_08078A90 bl sub_0805E780 @@ -5775,19 +5775,19 @@ sub_08059094: @ 0x08059094 movs r0, #1 strb r0, [r4, #0xc] movs r0, #0x60 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _080590CC movs r0, #0x5f - bl sub_0807CCB4 + bl SetLocalFlag b _080590C8 _080590B6: movs r0, #0x60 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _080590C8 movs r0, #0x5f - bl sub_0807CD34 + bl ClearLocalFlag movs r5, #1 _080590C8: cmp r5, #0 @@ -5816,23 +5816,23 @@ sub_080590E0: @ 0x080590E0 bl sub_0805E3A0 _080590F6: movs r0, #0x6c - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805911A movs r0, #0x4b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _08059112 movs r0, #0x4a - bl sub_0807CCB4 + bl SetLocalFlag b _08059120 _08059112: movs r0, #0x4a - bl sub_0807CD34 + bl ClearLocalFlag b _08059120 _0805911A: movs r0, #0x4a - bl sub_0807CD34 + bl ClearLocalFlag _08059120: pop {pc} .align 2, 0 @@ -5877,7 +5877,7 @@ sub_08059124: @ 0x08059124 b _080591C8 _08059174: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08059182 bl sub_0805E780 @@ -5903,7 +5903,7 @@ _08059182: _080591A8: .4byte 0x00000365 _080591AC: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080591C8 adds r0, r4, #0 @@ -5928,7 +5928,7 @@ sub_080591CC: @ 0x080591CC movs r0, #1 strb r0, [r4, #0xc] ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags strb r0, [r4, #0xb] lsls r0, r0, #0x18 cmp r0, #0 @@ -5940,7 +5940,7 @@ sub_080591CC: @ 0x080591CC _080591F0: .4byte gRoomVars _080591F4: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags adds r1, r0, #0 ldrb r0, [r4, #0xb] cmp r0, r1 @@ -6046,7 +6046,7 @@ sub_080592A4: @ 0x080592A4 movs r0, #1 strb r0, [r4, #0xc] ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080592EA adds r0, r4, #0 @@ -6055,7 +6055,7 @@ sub_080592A4: @ 0x080592A4 b _080592EA _080592C8: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080592EA adds r0, r4, #0 @@ -6148,7 +6148,7 @@ sub_08059368: @ 0x08059368 cmp r0, r1 bne _08059384 ldrh r0, [r2, #0x3e] - bl sub_0807CCC8 + bl SetFlag bl sub_0805E780 _08059384: pop {pc} @@ -6240,13 +6240,13 @@ sub_08059424: @ 0x08059424 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08059436 bl sub_0805E780 _08059436: ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08059476 movs r0, #0xf @@ -6282,7 +6282,7 @@ _08059478: .4byte gRoomControls sub_0805947C: @ 0x0805947C push {lr} ldrh r0, [r0, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _080594CE movs r0, #3 @@ -6344,7 +6344,7 @@ _080594F2: movs r0, #0x8c lsls r0, r0, #4 movs r1, #0x85 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _08059540 movs r0, #2 @@ -6365,7 +6365,7 @@ _0805952A: movs r0, #0x8c lsls r0, r0, #4 movs r1, #0x85 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 beq _08059540 bl sub_0801855C @@ -6959,18 +6959,18 @@ sub_080599B8: @ 0x080599B8 movs r0, #1 strb r0, [r4, #0xc] ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080599EA bl sub_0805E780 b _080599EA _080599D6: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080599EA ldrh r0, [r4, #0x3c] - bl sub_0807CCC8 + bl SetFlag bl sub_0805E780 _080599EA: pop {r4, pc} @@ -7128,7 +7128,7 @@ sub_08059B18: @ 0x08059B18 push {r6, r7} sub sp, #4 movs r0, #0x18 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _08059BEC movs r6, #0 @@ -7224,7 +7224,7 @@ _08059BE4: .4byte gUnk_086E8460 _08059BE8: .4byte 0x06001800 _08059BEC: movs r0, #0x19 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _08059C5E movs r6, #0 @@ -7721,7 +7721,7 @@ _08059FBC: @ jump table .4byte _0805A036 @ case 23 _0805A01C: movs r0, #0x16 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A02A movs r0, #0 @@ -8055,7 +8055,7 @@ sub_0805A298: @ 0x0805A298 adds r0, r4, #0 bl sub_0805A89C ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0805A2BA adds r1, r4, #0 @@ -8100,7 +8100,7 @@ sub_0805A2E4: @ 0x0805A2E4 movs r0, #1 bl sub_0805AAF0 ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0805A324 strb r5, [r4, #0xc] @@ -8115,7 +8115,7 @@ _0805A31C: .4byte gScreen _0805A320: .4byte 0x0000B7FF _0805A324: movs r0, #0x48 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A332 movs r0, #4 @@ -8186,9 +8186,9 @@ sub_0805A394: @ 0x0805A394 bne _0805A3C4 _0805A3AA: movs r0, #0x48 - bl sub_0807CCB4 + bl SetLocalFlag movs r0, #0 - bl sub_0807CD8C + bl ClearRoomFlag ldr r2, _0805A3C8 @ =gScreen ldrh r1, [r2] ldr r0, _0805A3CC @ =0x0000B7FF @@ -8231,11 +8231,11 @@ _0805A3F8: ldrb r0, [r1] bl sub_0805AAF0 ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0805A428 ldrh r0, [r4, #0x3c] - bl sub_0807CD48 + bl ClearFlag movs r0, #1 strb r0, [r4, #0xc] ldr r2, _0805A420 @ =gScreen @@ -8249,7 +8249,7 @@ _0805A420: .4byte gScreen _0805A424: .4byte 0x0000B7FF _0805A428: ldrh r0, [r4, #0x3c] - bl sub_0807CCC8 + bl SetFlag movs r0, #3 strb r0, [r4, #0xc] ldr r2, _0805A444 @ =gScreen @@ -8282,7 +8282,7 @@ sub_0805A464: @ 0x0805A464 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A47E movs r0, #2 @@ -8303,7 +8303,7 @@ sub_0805A480: @ 0x0805A480 movs r0, #3 strb r0, [r1, #0xc] ldrh r0, [r1, #0x3c] - bl sub_0807CCC8 + bl SetFlag _0805A494: pop {pc} .align 2, 0 @@ -8313,7 +8313,7 @@ sub_0805A498: @ 0x0805A498 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0805A4B2 movs r0, #4 @@ -8334,7 +8334,7 @@ sub_0805A4B4: @ 0x0805A4B4 movs r0, #1 strb r0, [r1, #0xc] ldrh r0, [r1, #0x3c] - bl sub_0807CD48 + bl ClearFlag _0805A4C8: pop {pc} .align 2, 0 @@ -8377,7 +8377,7 @@ sub_0805A500: @ 0x0805A500 bl sub_0805A89C str r5, [r4, #0x28] movs r0, #0x36 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A538 adds r3, r4, #0 @@ -8397,7 +8397,7 @@ sub_0805A500: @ 0x0805A500 _0805A534: .4byte gScreen _0805A538: movs r0, #0x34 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A560 adds r3, r4, #0 @@ -8493,7 +8493,7 @@ sub_0805A5FC: @ 0x0805A5FC push {r4, lr} adds r4, r0, #0 movs r0, #0x34 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A616 movs r0, #2 @@ -8521,7 +8521,7 @@ sub_0805A628: @ 0x0805A628 push {r4, lr} adds r4, r0, #0 movs r0, #0x36 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A64A movs r0, #4 @@ -8795,7 +8795,7 @@ _0805A81C: @ jump table .4byte _0805A88A @ case 4 _0805A830: ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A83E movs r0, #1 @@ -8816,7 +8816,7 @@ _0805A840: b _0805A89A _0805A858: ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0805A89A movs r0, #2 @@ -8830,7 +8830,7 @@ _0805A866: b _0805A89A _0805A872: ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805A89A movs r0, #4 @@ -9490,7 +9490,7 @@ sub_0805AD60: @ 0x0805AD60 movs r0, #1 strb r0, [r4, #0xc] ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805AD76 bl sub_0805E780 @@ -9505,7 +9505,7 @@ sub_0805AD80: @ 0x0805AD80 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805ADD0 ldrb r1, [r4, #0xa] @@ -9959,7 +9959,7 @@ _0805B128: cmp r0, #0xa bne _0805B15E movs r0, #0x4b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0805B15E movs r0, #0x28 @@ -10688,7 +10688,7 @@ sub_0805B680: @ 0x0805B680 cmp r0, #0 bne _0805B6B8 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805B6B8 adds r0, r4, #0 @@ -10714,7 +10714,7 @@ sub_0805B6C0: @ 0x0805B6C0 cmp r0, #0 beq _0805B6EC ldrh r0, [r4, #0x3e] - bl sub_0807CCC8 + bl SetFlag ldrb r0, [r4, #0xa] cmp r0, #0 bne _0805B6F2 @@ -10723,7 +10723,7 @@ sub_0805B6C0: @ 0x0805B6C0 b _0805B6F2 _0805B6EC: ldrh r0, [r4, #0x3e] - bl sub_0807CD48 + bl ClearFlag _0805B6F2: pop {r4, pc} @@ -10745,7 +10745,7 @@ sub_0805B70C: @ 0x0805B70C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805B71E movs r0, #1 @@ -10775,7 +10775,7 @@ sub_0805B744: @ 0x0805B744 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags adds r1, r0, #0 cmp r1, #0 beq _0805B766 @@ -10835,7 +10835,7 @@ sub_0805B7A0: @ 0x0805B7A0 adds r1, #0x86 strh r0, [r1] ldrh r0, [r5, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805B7EC adds r0, r5, #0 @@ -10981,7 +10981,7 @@ sub_0805B8CC: @ 0x0805B8CC cmp r0, #4 bne _0805B8DA movs r0, #0x18 - bl GetProgressFlag + bl CheckGlobalFlag b _0805B8E8 _0805B8DA: cmp r0, #4 @@ -11468,14 +11468,14 @@ sub_0805BC8C: @ 0x0805BC8C movs r0, #0x1e strb r0, [r4, #0xf] ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805BCAE adds r0, r4, #0 bl sub_0805BE94 _0805BCAE: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805BCD0 ldrb r0, [r4, #0xf] @@ -11514,7 +11514,7 @@ _0805BCEE: movs r0, #0x1e strb r0, [r4, #0xf] ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805BD5A adds r0, r4, #0 @@ -11525,7 +11525,7 @@ _0805BCEE: b _0805BD5A _0805BD0E: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805BD5A ldrb r0, [r4, #0xf] @@ -11544,7 +11544,7 @@ _0805BD0E: b _0805BD5A _0805BD38: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _0805BD5A ldrb r0, [r4, #0xf] @@ -11569,7 +11569,7 @@ sub_0805BD5C: @ 0x0805BD5C cmp r0, #0 bne _0805BD94 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805BD76 adds r0, r4, #0 @@ -11597,7 +11597,7 @@ _0805BD94: cmp r0, #0x76 bne _0805BDB0 ldrh r0, [r4, #0x3e] - bl sub_0807CCC8 + bl SetFlag ldrb r0, [r4, #0xe] bl sub_0805308C bl sub_0805E780 @@ -11627,7 +11627,7 @@ sub_0805BDB4: @ 0x0805BDB4 ldrb r2, [r4, #0xb] bl sub_080A29C8 ldrh r0, [r4, #0x3e] - bl sub_0807CD48 + bl ClearFlag ldrh r0, [r4, #0x20] ldrb r1, [r4, #0xb] bl sub_0807BA8C @@ -11637,11 +11637,11 @@ sub_0805BDB4: @ 0x0805BDB4 b _0805BE26 _0805BDF4: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _0805BE08 ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805BE0E _0805BE08: @@ -11671,7 +11671,7 @@ _0805BE2C: cmp r0, #0x76 bne _0805BE6C ldrh r0, [r4, #0x3e] - bl sub_0807CCC8 + bl SetFlag ldrb r0, [r4, #0xe] bl sub_0805308C movs r0, #2 @@ -11686,7 +11686,7 @@ _0805BE2C: b _0805BE6C _0805BE58: ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805BE6C adds r0, r4, #0 @@ -11822,7 +11822,7 @@ sub_0805BF30: @ 0x0805BF30 bl sub_0805BFC4 strb r0, [r4, #0xa] ldrh r0, [r4, #0x3e] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805BF74 adds r0, r4, #0 @@ -11851,7 +11851,7 @@ sub_0805BF78: @ 0x0805BF78 adds r0, r4, #0 bl sub_0805C02C ldrh r0, [r4, #0x3e] - bl sub_0807CCB4 + bl SetLocalFlag _0805BFA0: pop {r4, pc} .align 2, 0 @@ -12837,7 +12837,7 @@ _0805C778: _0805C784: .4byte gRoomControls _0805C788: ldrb r0, [r5, #0xb] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0805C796 movs r0, #2 @@ -12865,7 +12865,7 @@ sub_0805C7A0: @ 0x0805C7A0 movs r0, #2 strb r0, [r4, #0xc] ldrb r0, [r4, #0xb] - bl sub_0807CCB4 + bl SetLocalFlag _0805C7BC: adds r0, r4, #0 bl sub_0805C7CC @@ -12936,7 +12936,7 @@ sub_0805C81C: @ 0x0805C81C lsls r0, r0, #2 ldrb r1, [r4, #0xa] adds r1, #0x67 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 beq _0805C85C ldr r0, _0805C858 @ =gUnk_030010A0 @@ -13072,7 +13072,7 @@ sub_0805C920: @ 0x0805C920 ldrb r1, [r0, #0xa] adds r1, #0x67 adds r0, r2, #0 - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset pop {pc} .align 2, 0 @@ -13421,7 +13421,7 @@ sub_0805CB90: @ 0x0805CB90 adds r0, r4, #0 bl sub_0805CBD0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805CBCE adds r0, r4, #0 @@ -13435,7 +13435,7 @@ _0805CBB8: cmp r0, #0 beq _0805CBCE ldrh r0, [r4, #0x3e] - bl sub_0807CCC8 + bl SetFlag adds r0, r4, #0 bl sub_0805E900 _0805CBCE: @@ -13925,7 +13925,7 @@ sub_0805CFF0: @ 0x0805CFF0 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #2] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0805D012 ldrh r0, [r4, #4] @@ -13935,7 +13935,7 @@ sub_0805CFF0: @ 0x0805CFF0 cmp r1, r0 bne _0805D012 ldrh r0, [r4, #2] - bl sub_0807CCB4 + bl SetLocalFlag _0805D012: pop {r4, pc} @@ -13961,7 +13961,7 @@ sub_0805D02C: @ 0x0805D02C push {r5, r6, r7} adds r6, r0, #0 ldrh r0, [r6, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805D046 bl sub_0805E780 @@ -14069,7 +14069,7 @@ sub_0805D0FC: @ 0x0805D0FC cmp r0, #0 bne _0805D118 ldrh r0, [r4, #0x3e] - bl sub_0807CCC8 + bl SetFlag adds r0, r4, #0 bl sub_0805E900 _0805D118: @@ -14260,17 +14260,17 @@ sub_0805D280: @ 0x0805D280 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805D292 bl sub_0805E780 _0805D292: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805D2A6 ldrh r0, [r4, #0x3c] - bl sub_0807CCC8 + bl SetFlag bl sub_0805E780 _0805D2A6: movs r0, #1 @@ -14292,7 +14292,7 @@ sub_0805D2C0: @ 0x0805D2C0 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805D2EE ldr r0, _0805D2F0 @ =gUnk_03003DC0 @@ -14338,7 +14338,7 @@ _0805D31A: ldrh r0, [r4, #0x3c] cmp r0, #0 beq _0805D324 - bl sub_0807CCC8 + bl SetFlag _0805D324: bl sub_0805E780 _0805D328: @@ -14363,7 +14363,7 @@ sub_0805D344: @ 0x0805D344 push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags movs r0, #1 strb r0, [r4, #0xc] ldrb r0, [r4, #0xe] @@ -14385,7 +14385,7 @@ sub_0805D36C: @ 0x0805D36C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805D382 movs r0, #2 @@ -14417,17 +14417,17 @@ _0805D3A4: adds r0, r1, #0 bl PlaySFX ldrh r0, [r4, #0x3c] - bl sub_0807CCC8 + bl SetFlag b _0805D3C6 _0805D3B2: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _0805D3C6 movs r0, #1 strb r0, [r4, #0xc] ldrh r0, [r4, #0x3c] - bl sub_0807CD48 + bl ClearFlag _0805D3C6: pop {r4, pc} @@ -14666,11 +14666,11 @@ _0805D5A4: ldrh r0, [r6, #0x3e] cmp r0, #0 beq _0805D628 - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805D628 ldrh r0, [r6, #0x3e] - bl sub_0807CD48 + bl ClearFlag movs r0, #1 strb r0, [r6, #0xc] ldrb r0, [r6, #0xf] @@ -14724,7 +14724,7 @@ _0805D604: cmp r0, #0x20 bne _0805D628 ldrh r0, [r6, #0x3c] - bl sub_0807CCC8 + bl SetFlag b _0805D628 _0805D622: movs r0, #0x72 @@ -14750,70 +14750,70 @@ _0805D642: adds r0, #1 strb r0, [r6, #0xc] movs r0, #0x42 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0805D6E4 movs r0, #0x43 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0805D6E4 movs r0, #0x44 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0805D6E4 movs r0, #0x3e - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0805D680 movs r0, #2 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0805D6E4 movs r0, #0x3e - bl sub_0807CD04 + bl SetGlobalFlag b _0805D6D2 _0805D680: movs r0, #0x3f - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0805D69C movs r0, #3 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0805D6E4 movs r0, #0x3f - bl sub_0807CD04 + bl SetGlobalFlag b _0805D6D2 _0805D69C: movs r0, #0x40 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0805D6B8 movs r0, #4 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0805D6E4 movs r0, #0x40 - bl sub_0807CD04 + bl SetGlobalFlag b _0805D6D2 _0805D6B8: movs r0, #0x41 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0805D6E4 movs r0, #5 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0805D6E4 movs r0, #0x41 - bl sub_0807CD04 + bl SetGlobalFlag _0805D6D2: movs r0, #0x42 - bl sub_0807CD80 + bl ClearGlobalFlag movs r0, #0x43 - bl sub_0807CD80 + bl ClearGlobalFlag movs r0, #0x44 - bl sub_0807CD80 + bl ClearGlobalFlag _0805D6E4: adds r1, r6, #0 adds r1, #0x22 @@ -14832,7 +14832,7 @@ _0805D6E4: _0805D700: adds r0, r5, #0 adds r0, #0x42 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0805D760 bl Random @@ -14885,7 +14885,7 @@ _0805D76A: adds r4, r5, #0 adds r4, #0x42 adds r0, r4, #0 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0805D78E adds r0, r6, #0 @@ -14897,7 +14897,7 @@ _0805D76A: cmp r0, #0 bge _0805D78E adds r0, r4, #0 - bl sub_0807CD04 + bl SetGlobalFlag _0805D78E: adds r5, #1 cmp r5, #2 @@ -15592,17 +15592,17 @@ sub_0805DC9C: @ 0x0805DC9C push {r4, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3c] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805DCAE bl sub_0805E780 _0805DCAE: ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805DCC2 ldrh r0, [r4, #0x3c] - bl sub_0807CCC8 + bl SetFlag bl sub_0805E780 _0805DCC2: movs r0, #1 @@ -15614,7 +15614,7 @@ sub_0805DCC8: @ 0x0805DCC8 push {r4, r5, lr} adds r4, r0, #0 ldrh r0, [r4, #0x3e] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0805DD1E movs r0, #2 @@ -15679,7 +15679,7 @@ sub_0805DD24: @ 0x0805DD24 movs r0, #3 strb r0, [r4, #0xc] ldrh r0, [r4, #0x3c] - bl sub_0807CCC8 + bl SetFlag adds r1, r4, #0 adds r1, #0x36 ldrb r0, [r1] @@ -15838,7 +15838,7 @@ sub_0805DE68: @ 0x0805DE68 push {r4, lr} adds r4, r0, #0 movs r0, #0x7b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0805DE7A bl sub_0805E780 @@ -16024,7 +16024,7 @@ sub_0805DFCC: @ 0x0805DFCC cmp r0, #0 bne _0805DFE0 movs r0, #0x1c - bl sub_0807CD80 + bl ClearGlobalFlag bl sub_0805E094 _0805DFE0: pop {pc} diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index b386af30..7cbb4aa4 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -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 diff --git a/asm/code_0807CAA0.s b/asm/code_0807CAA0.s index 17988e0d..a6da3977 100644 --- a/asm/code_0807CAA0.s +++ b/asm/code_0807CAA0.s @@ -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 diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index 4c3dd565..b7402419 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -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 diff --git a/asm/code_080A3480.s b/asm/code_080A3480.s index de21ab08..6b1e51dc 100644 --- a/asm/code_080A3480.s +++ b/asm/code_080A3480.s @@ -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 diff --git a/asm/code_080A3BD0.s b/asm/code_080A3BD0.s index 7647d8ea..3b5cf987 100644 --- a/asm/code_080A3BD0.s +++ b/asm/code_080A3BD0.s @@ -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} diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index 2b1c0da1..a56971c0 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -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 diff --git a/asm/crenalBeanSprout.s b/asm/crenalBeanSprout.s index 0aafbf48..87f10173 100644 --- a/asm/crenalBeanSprout.s +++ b/asm/crenalBeanSprout.s @@ -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 diff --git a/asm/cuccoAggr.s b/asm/cuccoAggr.s index d8d5b4aa..4708ab40 100644 --- a/asm/cuccoAggr.s +++ b/asm/cuccoAggr.s @@ -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 diff --git a/asm/curtain.s b/asm/curtain.s index 97fe57e9..902ff2b3 100644 --- a/asm/curtain.s +++ b/asm/curtain.s @@ -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 diff --git a/asm/dampe.s b/asm/dampe.s index 3947697c..a902f945 100644 --- a/asm/dampe.s +++ b/asm/dampe.s @@ -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: diff --git a/asm/dog.s b/asm/dog.s index 55920205..a4232899 100644 --- a/asm/dog.s +++ b/asm/dog.s @@ -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 diff --git a/asm/drLeft.s b/asm/drLeft.s index 1774fcb9..d28c8727 100644 --- a/asm/drLeft.s +++ b/asm/drLeft.s @@ -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 diff --git a/asm/dust.s b/asm/dust.s index 420ec4ed..7acba6d2 100644 --- a/asm/dust.s +++ b/asm/dust.s @@ -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 diff --git a/asm/enemy49.s b/asm/enemy49.s index 22dae3e8..2baa60eb 100644 --- a/asm/enemy49.s +++ b/asm/enemy49.s @@ -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 diff --git a/asm/enemy64.s b/asm/enemy64.s index 17e55f66..4e7665bd 100644 --- a/asm/enemy64.s +++ b/asm/enemy64.s @@ -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: diff --git a/asm/enemyItem.s b/asm/enemyItem.s index b9a8d7dc..5958947c 100644 --- a/asm/enemyItem.s +++ b/asm/enemyItem.s @@ -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 diff --git a/asm/evilSpirit.s b/asm/evilSpirit.s index 442ad702..660d17b2 100644 --- a/asm/evilSpirit.s +++ b/asm/evilSpirit.s @@ -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] diff --git a/asm/evilSpirit/sub_080862B8.inc b/asm/evilSpirit/sub_080862B8.inc index 8b6eb27d..30dcad89 100644 --- a/asm/evilSpirit/sub_080862B8.inc +++ b/asm/evilSpirit/sub_080862B8.inc @@ -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 diff --git a/asm/eyeSwitch.s b/asm/eyeSwitch.s index 0cf6cd42..56420a21 100644 --- a/asm/eyeSwitch.s +++ b/asm/eyeSwitch.s @@ -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} diff --git a/asm/eyegore.s b/asm/eyegore.s index ec1d5335..0949b2ec 100644 --- a/asm/eyegore.s +++ b/asm/eyegore.s @@ -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 diff --git a/asm/ezloCap.s b/asm/ezloCap.s index 6835e215..7c941b7a 100644 --- a/asm/ezloCap.s +++ b/asm/ezloCap.s @@ -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 diff --git a/asm/fan.s b/asm/fan.s index 20d57cf6..35a64229 100644 --- a/asm/fan.s +++ b/asm/fan.s @@ -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: diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index 41f86cd7..5d89bae8 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -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 diff --git a/asm/fireplace.s b/asm/fireplace.s index 50d6f66c..7db839b6 100644 --- a/asm/fireplace.s +++ b/asm/fireplace.s @@ -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} diff --git a/asm/forestMinish.s b/asm/forestMinish.s index d61e7bb0..084ca011 100644 --- a/asm/forestMinish.s +++ b/asm/forestMinish.s @@ -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 diff --git a/asm/fourElements.s b/asm/fourElements.s index 618ec6d5..3fd7dc9f 100644 --- a/asm/fourElements.s +++ b/asm/fourElements.s @@ -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} diff --git a/asm/frozenWaterElement.s b/asm/frozenWaterElement.s index fbb6f2ec..52aad0c4 100644 --- a/asm/frozenWaterElement.s +++ b/asm/frozenWaterElement.s @@ -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: diff --git a/asm/gentariCurtains.s b/asm/gentariCurtains.s index 29c8c1dc..6aad8295 100644 --- a/asm/gentariCurtains.s +++ b/asm/gentariCurtains.s @@ -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 diff --git a/asm/gina.s b/asm/gina.s index fd6abe7f..9094d4d2 100644 --- a/asm/gina.s +++ b/asm/gina.s @@ -78,7 +78,7 @@ _0806C1BE: movs r0, #1 strb r0, [r4, #0xc] movs r0, #0x88 - bl sub_0807CCB4 + bl SetLocalFlag _0806C1D2: pop {r4, pc} diff --git a/asm/gleerok.s b/asm/gleerok.s index d0c34ccd..57d9869d 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -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 diff --git a/asm/gorman.s b/asm/gorman.s index e222aec3..4dd9950c 100644 --- a/asm/gorman.s +++ b/asm/gorman.s @@ -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 diff --git a/asm/goronMerchant.s b/asm/goronMerchant.s index 76bab5e2..6fd30c25 100644 --- a/asm/goronMerchant.s +++ b/asm/goronMerchant.s @@ -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 diff --git a/asm/guardWithSpear.s b/asm/guardWithSpear.s index 64bda413..8f6c996a 100644 --- a/asm/guardWithSpear.s +++ b/asm/guardWithSpear.s @@ -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 diff --git a/asm/heartContainer.s b/asm/heartContainer.s index f31a2955..38bb4277 100644 --- a/asm/heartContainer.s +++ b/asm/heartContainer.s @@ -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 diff --git a/asm/hiddenLadderDown.s b/asm/hiddenLadderDown.s index 4dd5131f..5df97a90 100644 --- a/asm/hiddenLadderDown.s +++ b/asm/hiddenLadderDown.s @@ -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 diff --git a/asm/hittableLever.s b/asm/hittableLever.s index ad642c12..f6f7978f 100644 --- a/asm/hittableLever.s +++ b/asm/hittableLever.s @@ -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 diff --git a/asm/houseDoorExterior.s b/asm/houseDoorExterior.s index 124dac61..38d694a6 100644 --- a/asm/houseDoorExterior.s +++ b/asm/houseDoorExterior.s @@ -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 diff --git a/asm/houseDoorInterior.s b/asm/houseDoorInterior.s index 2421526f..8dad43bb 100644 --- a/asm/houseDoorInterior.s +++ b/asm/houseDoorInterior.s @@ -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 diff --git a/asm/initializeLink.s b/asm/initializeLink.s index 3d339ef7..8968f0ef 100644 --- a/asm/initializeLink.s +++ b/asm/initializeLink.s @@ -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] diff --git a/asm/itemOnGround.s b/asm/itemOnGround.s index 8d0156ec..232cedc9 100644 --- a/asm/itemOnGround.s +++ b/asm/itemOnGround.s @@ -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} diff --git a/asm/jailBars.s b/asm/jailBars.s index c1eea107..e3c96e05 100644 --- a/asm/jailBars.s +++ b/asm/jailBars.s @@ -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 diff --git a/asm/jarPortal.s b/asm/jarPortal.s index c5ac690a..b8cf6f41 100644 --- a/asm/jarPortal.s +++ b/asm/jarPortal.s @@ -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 diff --git a/asm/kingDaltus.s b/asm/kingDaltus.s index ea52b762..42e5f635 100644 --- a/asm/kingDaltus.s +++ b/asm/kingDaltus.s @@ -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 diff --git a/asm/librari.s b/asm/librari.s index 4db43c87..71ae8e77 100644 --- a/asm/librari.s +++ b/asm/librari.s @@ -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 diff --git a/asm/librarians.s b/asm/librarians.s index 34b35f17..feb666de 100644 --- a/asm/librarians.s +++ b/asm/librarians.s @@ -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 diff --git a/asm/lightableSwitch.s b/asm/lightableSwitch.s index 4d7e3e12..3239e101 100644 --- a/asm/lightableSwitch.s +++ b/asm/lightableSwitch.s @@ -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 diff --git a/asm/lilypadLarge.s b/asm/lilypadLarge.s index b1cdee40..7ffba32e 100644 --- a/asm/lilypadLarge.s +++ b/asm/lilypadLarge.s @@ -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} diff --git a/asm/litArea.s b/asm/litArea.s index fc172762..482de0ef 100644 --- a/asm/litArea.s +++ b/asm/litArea.s @@ -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: diff --git a/asm/lockedDoor.s b/asm/lockedDoor.s index 15be1150..943a39a6 100644 --- a/asm/lockedDoor.s +++ b/asm/lockedDoor.s @@ -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 diff --git a/asm/macroBook.s b/asm/macroBook.s index d358edbf..febe12aa 100644 --- a/asm/macroBook.s +++ b/asm/macroBook.s @@ -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 diff --git a/asm/marcy.s b/asm/marcy.s index 48f4f082..7e36a9ae 100644 --- a/asm/marcy.s +++ b/asm/marcy.s @@ -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 diff --git a/asm/mask.s b/asm/mask.s index 59c3edc3..59d3a91d 100644 --- a/asm/mask.s +++ b/asm/mask.s @@ -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 diff --git a/asm/mayorHagen.s b/asm/mayorHagen.s index d1d31a14..73fc8768 100644 --- a/asm/mayorHagen.s +++ b/asm/mayorHagen.s @@ -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 diff --git a/asm/metalDoor.s b/asm/metalDoor.s index 7de6a34b..375536f9 100644 --- a/asm/metalDoor.s +++ b/asm/metalDoor.s @@ -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 diff --git a/asm/minecartDoor.s b/asm/minecartDoor.s index 21a40ca0..3193ef17 100644 --- a/asm/minecartDoor.s +++ b/asm/minecartDoor.s @@ -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: diff --git a/asm/ministerPotho.s b/asm/ministerPotho.s index 8adc1ea9..daaddb97 100644 --- a/asm/ministerPotho.s +++ b/asm/ministerPotho.s @@ -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 diff --git a/asm/mountainMinish.s b/asm/mountainMinish.s index bba15ae5..26df1e04 100644 --- a/asm/mountainMinish.s +++ b/asm/mountainMinish.s @@ -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 diff --git a/asm/mutoh.s b/asm/mutoh.s index 48d686e3..5f07e875 100644 --- a/asm/mutoh.s +++ b/asm/mutoh.s @@ -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 diff --git a/asm/mainLoop.s b/asm/non_matching/mainLoop.inc similarity index 96% rename from asm/mainLoop.s rename to asm/non_matching/mainLoop.inc index 00932b59..651625a1 100644 --- a/asm/mainLoop.s +++ b/asm/non_matching/mainLoop.inc @@ -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 \ No newline at end of file +_08055F6C: .4byte gUnk_08100CBC + .syntax divided \ No newline at end of file diff --git a/asm/object12.s b/asm/object12.s index 33786818..4c67193a 100644 --- a/asm/object12.s +++ b/asm/object12.s @@ -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 diff --git a/asm/object24.s b/asm/object24.s index 6bbf4329..af7343da 100644 --- a/asm/object24.s +++ b/asm/object24.s @@ -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 diff --git a/asm/object2A.s b/asm/object2A.s index 6e5d0343..c7a2f5fa 100644 --- a/asm/object2A.s +++ b/asm/object2A.s @@ -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 diff --git a/asm/object35.s b/asm/object35.s index 8b9c9542..452fdf92 100644 --- a/asm/object35.s +++ b/asm/object35.s @@ -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 diff --git a/asm/object36.s b/asm/object36.s index 05a2dc5f..410f47a5 100644 --- a/asm/object36.s +++ b/asm/object36.s @@ -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 diff --git a/asm/object3E.s b/asm/object3E.s index e8d937e3..cf9987ae 100644 --- a/asm/object3E.s +++ b/asm/object3E.s @@ -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 diff --git a/asm/object48.s b/asm/object48.s index e2f6d780..fcd1fcd2 100644 --- a/asm/object48.s +++ b/asm/object48.s @@ -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 diff --git a/asm/object52.s b/asm/object52.s index 0b88fc67..1b3f1262 100644 --- a/asm/object52.s +++ b/asm/object52.s @@ -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 diff --git a/asm/object6A.s b/asm/object6A.s index 7b011185..2da7c46a 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -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 diff --git a/asm/object74.s b/asm/object74.s index a1f898f4..13422e9e 100644 --- a/asm/object74.s +++ b/asm/object74.s @@ -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 diff --git a/asm/object86.s b/asm/object86.s index 243b61da..46e63124 100644 --- a/asm/object86.s +++ b/asm/object86.s @@ -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 diff --git a/asm/object89.s b/asm/object89.s index 0e0b4041..567af691 100644 --- a/asm/object89.s +++ b/asm/object89.s @@ -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 diff --git a/asm/object8A.s b/asm/object8A.s index 03c422d9..e41de6bc 100644 --- a/asm/object8A.s +++ b/asm/object8A.s @@ -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 diff --git a/asm/object8B.s b/asm/object8B.s index e6f3697f..72eafa19 100644 --- a/asm/object8B.s +++ b/asm/object8B.s @@ -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 diff --git a/asm/object8E.s b/asm/object8E.s index fa33b3ad..cb6cb29e 100644 --- a/asm/object8E.s +++ b/asm/object8E.s @@ -499,7 +499,7 @@ _0809BBF8: movs r0, #3 strb r0, [r4, #0xc] movs r0, #0x35 - bl sub_0807CCB4 + bl SetLocalFlag movs r0, #0x72 bl PlaySFX b _0809BC68 @@ -533,7 +533,7 @@ _0809BC48: movs r0, #1 strb r0, [r1, #0xd] movs r0, #0x64 - bl sub_0807CD10 + bl SetRoomFlag bl sub_0805E780 _0809BC68: pop {r4, r5, pc} @@ -674,7 +674,7 @@ _0809BD64: orrs r0, r1 strh r0, [r2] movs r0, #0x37 - bl sub_0807CCB4 + bl SetLocalFlag movs r0, #0x9a lsls r0, r0, #1 bl PlaySFX diff --git a/asm/object91.s b/asm/object91.s index 346e457c..972a1712 100644 --- a/asm/object91.s +++ b/asm/object91.s @@ -446,7 +446,7 @@ _0809C6F6: b _0809C7C4 _0809C738: movs r0, #0x37 - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0809C74A adds r0, r5, #0 @@ -948,7 +948,7 @@ sub_0809CAC8: @ 0x0809CAC8 ldr r0, _0809CB40 @ =gLinkEntity str r0, [r2, #0x30] movs r0, #0x9b - bl sub_0807CCB4 + bl SetLocalFlag ldr r0, [r5, #0x50] bl DeleteEntity adds r4, r5, #0 diff --git a/asm/object96.s b/asm/object96.s index e1839bd0..205d6a42 100644 --- a/asm/object96.s +++ b/asm/object96.s @@ -199,7 +199,7 @@ _0809D8E8: ldrh r0, [r6, #0x1c] cmp r0, #0 beq _0809D906 - bl sub_0807CCC8 + bl SetFlag _0809D906: bl sub_0805E780 _0809D90A: diff --git a/asm/object97.s b/asm/object97.s index 8442b2fc..5be7d62c 100644 --- a/asm/object97.s +++ b/asm/object97.s @@ -70,7 +70,7 @@ sub_0809D9D8: @ 0x0809D9D8 b _0809DA28 _0809DA1E: movs r0, #0x20 - bl sub_0807CD04 + bl SetGlobalFlag bl sub_0805E780 _0809DA28: pop {r4, pc} @@ -202,7 +202,7 @@ sub_0809DB14: @ 0x0809DB14 cmp r5, #0 bne _0809DB36 movs r0, #0x20 - bl sub_0807CD04 + bl SetGlobalFlag ldr r0, [r4, #0x54] str r5, [r0, #0x50] bl sub_0805E780 @@ -446,7 +446,7 @@ sub_0809DC80: @ 0x0809DC80 _0809DCFC: .4byte 0xFFF00000 _0809DD00: movs r0, #0x20 - bl sub_0807CD04 + bl SetGlobalFlag bl sub_0805E780 _0809DD0A: pop {r4, pc} @@ -591,7 +591,7 @@ sub_0809DDE4: @ 0x0809DDE4 cmp r5, #0 bne _0809DE2A movs r0, #0x20 - bl sub_0807CD04 + bl SetGlobalFlag ldr r0, [r4, #0x54] str r5, [r0, #0x50] bl sub_0805E780 diff --git a/asm/objectA.s b/asm/objectA.s index 955e2663..0c48f0dc 100644 --- a/asm/objectA.s +++ b/asm/objectA.s @@ -36,7 +36,7 @@ _08083ABC: adds r0, r6, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08083B1C ldrh r0, [r4] @@ -111,7 +111,7 @@ _08083B24: adds r0, r6, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag adds r0, r6, #0 bl sub_080A29BC movs r0, #1 diff --git a/asm/objectA6.s b/asm/objectA6.s index ea41a149..d92ff4c4 100644 --- a/asm/objectA6.s +++ b/asm/objectA6.s @@ -26,7 +26,7 @@ sub_0809F920: @ 0x0809F920 adds r4, r0, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0809F934 bl sub_0805E780 @@ -88,7 +88,7 @@ _0809F99A: adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag bl sub_0805E780 _0809F9A8: pop {r4, pc} diff --git a/asm/objectAB.s b/asm/objectAB.s index 129d8a2e..3c7a9554 100644 --- a/asm/objectAB.s +++ b/asm/objectAB.s @@ -53,7 +53,7 @@ sub_080A012C: @ 0x080A012C push {r4, lr} adds r4, r0, #0 movs r0, #0 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 beq _080A0154 adds r0, r4, #0 @@ -77,7 +77,7 @@ sub_080A0158: @ 0x080A0158 push {r4, lr} adds r4, r0, #0 movs r0, #1 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 beq _080A018A adds r0, r4, #0 diff --git a/asm/objectB9.s b/asm/objectB9.s index a8c713ae..ed569791 100644 --- a/asm/objectB9.s +++ b/asm/objectB9.s @@ -304,11 +304,11 @@ _080A1424: _080A142C: .4byte gUnk_02002A40 _080A1430: movs r0, #0x4f - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _080A1442 movs r0, #0x4f - bl sub_0807CD04 + bl SetGlobalFlag b _080A1444 _080A1442: movs r6, #1 @@ -379,44 +379,44 @@ _080A14B8: cmp r0, #0 beq _080A14C8 movs r0, #0x4b - bl sub_0807CD04 + bl SetGlobalFlag b _080A14CE _080A14C8: movs r0, #0x4b - bl sub_0807CD80 + bl ClearGlobalFlag _080A14CE: movs r0, #2 ands r0, r4 cmp r0, #0 beq _080A14DE movs r0, #0x4c - bl sub_0807CD04 + bl SetGlobalFlag b _080A14E4 _080A14DE: movs r0, #0x4c - bl sub_0807CD80 + bl ClearGlobalFlag _080A14E4: movs r0, #4 ands r0, r4 cmp r0, #0 beq _080A14F4 movs r0, #0x4d - bl sub_0807CD04 + bl SetGlobalFlag b _080A14FA _080A14F4: movs r0, #0x4d - bl sub_0807CD80 + bl ClearGlobalFlag _080A14FA: movs r0, #8 ands r0, r4 cmp r0, #0 beq _080A150A movs r0, #0x4e - bl sub_0807CD04 + bl SetGlobalFlag b _080A1510 _080A150A: movs r0, #0x4e - bl sub_0807CD80 + bl ClearGlobalFlag _080A1510: pop {r4, pc} .align 2, 0 @@ -425,26 +425,26 @@ _080A1510: sub_080A1514: @ 0x080A1514 push {r4, lr} movs r0, #0x4b - bl GetProgressFlag + bl CheckGlobalFlag rsbs r1, r0, #0 orrs r1, r0 lsrs r4, r1, #0x1f movs r0, #0x4c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _080A1530 movs r0, #2 orrs r4, r0 _080A1530: movs r0, #0x4d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _080A153E movs r0, #4 orrs r4, r0 _080A153E: movs r0, #0x4e - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _080A154C movs r0, #8 @@ -551,7 +551,7 @@ sub_080A1608: @ 0x080A1608 push {r4, lr} ldr r4, _080A163C @ =0x00003002 movs r0, #1 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 beq _080A1618 adds r4, #4 diff --git a/asm/objectBA.s b/asm/objectBA.s index 78a74666..7b612c7f 100644 --- a/asm/objectBA.s +++ b/asm/objectBA.s @@ -35,7 +35,7 @@ sub_080A1704: @ 0x080A1704 push {r5, r6, r7} mov sl, r0 movs r0, #0x7b - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080A171E bl sub_0805E780 @@ -676,7 +676,7 @@ sub_080A1C04: @ 0x080A1C04 cmp r0, #0 bne _080A1C40 movs r0, #0x7b - bl sub_0807CCC8 + bl SetFlag ldr r0, _080A1C3C @ =gUnk_0813ABD0 movs r1, #8 bl sub_0808091C diff --git a/asm/objectBlockingStairs.s b/asm/objectBlockingStairs.s index 7452f3e6..50926a26 100644 --- a/asm/objectBlockingStairs.s +++ b/asm/objectBlockingStairs.s @@ -76,7 +76,7 @@ _08092F48: ldrh r0, [r1] cmp r0, #0 beq _08092F5E - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _08092F5E movs r5, #1 @@ -104,7 +104,7 @@ sub_08092F68: @ 0x08092F68 ldrh r0, [r1] cmp r0, #0 beq _08092FA8 - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _08092F92 b _080930E6 @@ -554,7 +554,7 @@ sub_080932D8: @ 0x080932D8 adds r4, r0, r1 ldr r0, [r4] ldrh r1, [r4, #4] - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 beq _080932F4 movs r0, #1 @@ -564,7 +564,7 @@ _080932F0: .4byte gUnk_08122898 _080932F4: ldr r0, [r4] ldrh r1, [r4, #6] - bl GetProgressFlagWithOffset + bl CheckLocalFlagByOffset cmp r0, #0 bne _08093304 movs r0, #0 @@ -585,7 +585,7 @@ sub_08093308: @ 0x08093308 bne _08093324 ldr r0, [r1] ldrh r1, [r1, #4] - bl sub_0807CC9C + bl SetLocalFlagByOffset b _08093330 .align 2, 0 _08093320: .4byte gUnk_08122898 @@ -594,7 +594,7 @@ _08093324: bne _08093330 ldr r0, [r1] ldrh r1, [r1, #6] - bl sub_0807CC9C + bl SetLocalFlagByOffset _08093330: pop {pc} .align 2, 0 diff --git a/asm/objectD.s b/asm/objectD.s index 4f2585e0..6727028f 100644 --- a/asm/objectD.s +++ b/asm/objectD.s @@ -79,7 +79,7 @@ sub_0808434C: @ 0x0808434C adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080843EC _080843C8: @@ -88,7 +88,7 @@ _080843C8: adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag adds r0, r5, #0 movs r1, #1 bl UpdateSprite @@ -147,7 +147,7 @@ sub_08084428: @ 0x08084428 adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag movs r0, #0x86 lsls r0, r0, #1 bl sub_08004488 diff --git a/asm/objectOnPillar.s b/asm/objectOnPillar.s index 95a6ef8b..f618a8fb 100644 --- a/asm/objectOnPillar.s +++ b/asm/objectOnPillar.s @@ -26,7 +26,7 @@ sub_08096E28: @ 0x08096E28 adds r4, r0, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags adds r5, r0, #0 cmp r5, #0 bne _08096EBC @@ -502,7 +502,7 @@ _080971B8: adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag ldr r0, _080971D8 @ =0x0000010B bl sub_08004488 adds r0, r4, #0 @@ -706,7 +706,7 @@ _08097350: cmp r0, r3 bne _08097364 ldrb r0, [r1, #1] - bl sub_0807CBD0 + bl CheckLocalFlag b _0809736E .align 2, 0 _08097360: .4byte gUnk_02017660 diff --git a/asm/octorokGolden.s b/asm/octorokGolden.s index e3f34dc5..a4db8824 100644 --- a/asm/octorokGolden.s +++ b/asm/octorokGolden.s @@ -86,7 +86,7 @@ sub_08037CC0: @ 0x08037CC0 cmp r0, #0 bne _08037CD6 ldrb r0, [r4, #0xb] - bl sub_0807CD04 + bl SetGlobalFlag _08037CD6: adds r0, r4, #0 movs r1, #0xff @@ -100,7 +100,7 @@ sub_08037CE4: @ 0x08037CE4 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xb] - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _08037CF6 bl sub_0805E780 diff --git a/asm/percy.s b/asm/percy.s index 141f7578..47ee13f6 100644 --- a/asm/percy.s +++ b/asm/percy.s @@ -194,12 +194,12 @@ sub_0806B504: @ 0x0806B504 b _0806B52A _0806B518: movs r0, #0x86 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0806B52A movs r4, #0 movs r0, #0x86 - bl sub_0807CCB4 + bl SetLocalFlag _0806B52A: ldr r0, _0806B53C @ =gUnk_08112E54 lsls r1, r4, #1 @@ -236,14 +236,14 @@ _0806B562: adds r1, r2, #0 bl TextboxNoOverlap movs r0, #0x3f - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0806B606 ldrb r0, [r4, #0x18] adds r0, #1 strb r0, [r4, #0x18] movs r0, #0x3f - bl sub_0807CCB4 + bl SetLocalFlag b _0806B600 .align 2, 0 _0806B584: .4byte 0x00002312 @@ -292,7 +292,7 @@ _0806B5DC: bl sub_080A7C18 _0806B5E6: movs r0, #0xf - bl sub_0807CD10 + bl SetRoomFlag b _0806B600 _0806B5EE: ldr r0, _0806B5FC @ =gLinkEntity diff --git a/asm/phonograph.s b/asm/phonograph.s index 0acc0f97..8e1fbcb3 100644 --- a/asm/phonograph.s +++ b/asm/phonograph.s @@ -81,7 +81,7 @@ _0806E988: _0806E9A8: movs r5, #0x1c movs r0, #0x55 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0806E9B6 movs r5, #0x34 diff --git a/asm/picolyteBottles.s b/asm/picolyteBottles.s index 2a6ef7fa..84de31aa 100644 --- a/asm/picolyteBottles.s +++ b/asm/picolyteBottles.s @@ -118,7 +118,7 @@ _0806DF96: movs r0, #0xff strb r0, [r4, #0xe] movs r0, #0 - bl sub_0807CD10 + bl SetRoomFlag _0806DFB0: pop {r4, pc} .align 2, 0 @@ -191,7 +191,7 @@ sub_0806E014: @ 0x0806E014 adds r7, r0, #0 strb r0, [r5, #0xe] movs r0, #0x93 - bl sub_0807CBD0 + bl CheckLocalFlag adds r1, r0, #0 cmp r1, #0 bne _0806E088 diff --git a/asm/pinwheel.s b/asm/pinwheel.s index 0fa40a59..d5c0f046 100644 --- a/asm/pinwheel.s +++ b/asm/pinwheel.s @@ -55,7 +55,7 @@ sub_080A23DC: @ 0x080A23DC orrs r0, r1 strb r0, [r3] ldrh r0, [r2] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _080A2410 movs r0, #2 @@ -78,7 +78,7 @@ sub_080A2420: @ 0x080A2420 adds r4, r0, #0 adds r0, #0x68 ldrh r0, [r0] - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _080A243A movs r0, #2 diff --git a/asm/pita.s b/asm/pita.s index 71a595bd..ad7859fc 100644 --- a/asm/pita.s +++ b/asm/pita.s @@ -98,11 +98,11 @@ _08062F06: movs r4, #3 _08062F12: movs r0, #0x5b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _08062F24 movs r0, #0x5b - bl sub_0807CCB4 + bl SetLocalFlag movs r4, #4 _08062F24: bl Random diff --git a/asm/postman.s b/asm/postman.s index 612346a1..02c2b5a4 100644 --- a/asm/postman.s +++ b/asm/postman.s @@ -751,7 +751,7 @@ _080609A8: CreateZeldaFollower: @ 0x080609AC push {r4, lr} movs r0, #0x1c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _080609E0 movs r0, #0x2e diff --git a/asm/pot.s b/asm/pot.s index 4844f85e..226f3f89 100644 --- a/asm/pot.s +++ b/asm/pot.s @@ -37,7 +37,7 @@ sub_0808222C: @ 0x0808222C adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0808224C bl sub_0805E780 @@ -863,7 +863,7 @@ _08082874: adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag _08082884: bl sub_0805E780 pop {r4, r5, pc} diff --git a/asm/pullableLever.s b/asm/pullableLever.s index 80ad6303..cb6d0594 100644 --- a/asm/pullableLever.s +++ b/asm/pullableLever.s @@ -579,7 +579,7 @@ _080915E0: adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag b _08091656 .align 2, 0 _0809163C: .4byte gUnk_080C9160 @@ -651,7 +651,7 @@ _080916AA: adds r5, r4, #0 adds r5, #0x86 ldrh r0, [r5] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080916C8 adds r0, r4, #0 @@ -660,7 +660,7 @@ _080916AA: cmp r0, #0 bne _080916C8 ldrh r0, [r5] - bl sub_0807CD48 + bl ClearFlag _080916C8: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/pushableFurniture.s b/asm/pushableFurniture.s index e577411e..5da5e2e2 100644 --- a/asm/pushableFurniture.s +++ b/asm/pushableFurniture.s @@ -135,7 +135,7 @@ _0808FA42: adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags b _0808FA7C _0808FA5E: adds r2, r4, #0 @@ -152,7 +152,7 @@ _0808FA5E: b _0808FAA2 _0808FA76: ldrb r0, [r2] - bl sub_0807CBD0 + bl CheckLocalFlag _0808FA7C: cmp r0, #0 beq _0808FAA2 @@ -475,7 +475,7 @@ _0808FCCC: bne _0808FCE4 adds r0, #5 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag b _0808FD0C _0808FCE4: adds r2, r4, #0 @@ -497,7 +497,7 @@ _0808FCE4: b _0808FD0C _0808FD06: ldrb r0, [r2] - bl sub_0807CCB4 + bl SetLocalFlag _0808FD0C: adds r0, r4, #0 adds r0, #0x80 diff --git a/asm/pushableGrave.s b/asm/pushableGrave.s index b40dff5e..60494fc6 100644 --- a/asm/pushableGrave.s +++ b/asm/pushableGrave.s @@ -361,7 +361,7 @@ _08097844: ldrh r0, [r1] cmp r0, #0 beq _08097852 - bl sub_0807CCC8 + bl SetFlag _08097852: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -383,7 +383,7 @@ _0809786E: adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags adds r4, r5, #0 adds r4, #0x68 adds r6, r5, #0 @@ -481,7 +481,7 @@ _08097948: adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08097986 movs r0, #2 @@ -527,7 +527,7 @@ _0809799E: adds r0, r1, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080979AE movs r4, #1 diff --git a/asm/pushableLever.s b/asm/pushableLever.s index 41f5c05e..868009fd 100644 --- a/asm/pushableLever.s +++ b/asm/pushableLever.s @@ -108,13 +108,13 @@ sub_08098304: @ 0x08098304 adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag b _08098336 _0809832C: adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CD48 + bl ClearFlag _08098336: adds r0, r4, #0 bl sub_08098340 @@ -140,7 +140,7 @@ sub_08098354: @ 0x08098354 adds r6, r0, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _080983BC strb r0, [r6, #0xb] diff --git a/asm/pushableRock.s b/asm/pushableRock.s index bff1ba90..c18890e0 100644 --- a/asm/pushableRock.s +++ b/asm/pushableRock.s @@ -239,11 +239,11 @@ _0808A69E: adds r5, r4, #0 adds r5, #0x86 ldrh r0, [r5] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _0808A6D8 ldrh r0, [r5] - bl sub_0807CCC8 + bl SetFlag movs r0, #0xcd bl PlaySFX adds r0, r4, #0 diff --git a/asm/railtrack.s b/asm/railtrack.s index 9a9c4b02..f54a95ab 100644 --- a/asm/railtrack.s +++ b/asm/railtrack.s @@ -66,7 +66,7 @@ _080851EE: adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags adds r1, r5, #0 adds r1, #0x7a strh r0, [r1] @@ -120,7 +120,7 @@ sub_08085264: @ 0x08085264 adds r5, r4, #0 adds r5, #0x86 ldrh r0, [r5] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080852AE movs r0, #2 @@ -131,7 +131,7 @@ sub_08085264: @ 0x08085264 cmp r0, #1 bne _0808528A ldrh r0, [r5] - bl sub_0807CD48 + bl ClearFlag _0808528A: adds r0, r4, #0 adds r0, #0x7c @@ -171,7 +171,7 @@ sub_080852B4: @ 0x080852B4 adds r0, r5, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags adds r1, r5, #0 adds r1, #0x7a strh r0, [r1] @@ -213,7 +213,7 @@ _08085324: adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 bne _08085354 movs r0, #1 @@ -223,7 +223,7 @@ _08085338: adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags adds r1, r4, #0 adds r1, #0x7a ldrh r1, [r1] diff --git a/asm/rem.s b/asm/rem.s index 56290723..7f16cffc 100644 --- a/asm/rem.s +++ b/asm/rem.s @@ -175,7 +175,7 @@ _0806A486: movs r1, #0xa bl UpdateSprite movs r0, #0x62 - bl sub_0807CD34 + bl ClearLocalFlag b _0806A4CA _0806A4A8: adds r0, r2, #0 @@ -735,7 +735,7 @@ sub_0806A8C8: @ 0x0806A8C8 push {r4, r5, lr} adds r5, r0, #0 movs r0, #0x60 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0806A8F0 movs r0, #0x37 @@ -878,7 +878,7 @@ sub_0806A9B0: @ 0x0806A9B0 movs r1, #9 bl UpdateSprite movs r0, #0x62 - bl sub_0807CCB4 + bl SetLocalFlag pop {r4, pc} .align 2, 0 _0806A9E4: .4byte gUnk_081122A0 @@ -962,7 +962,7 @@ _0806AA6A: _0806AA70: str r0, [r5, #0x14] movs r0, #0x8f - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0806AA84 ldr r2, _0806AA80 @ =gUnk_081122A8 @@ -1050,7 +1050,7 @@ _0806AB1C: cmp r7, r0 bne _0806AB2C movs r0, #0x8f - bl sub_0807CCB4 + bl SetLocalFlag movs r0, #1 str r0, [r5, #0x14] _0806AB2C: diff --git a/asm/ropeGolden.s b/asm/ropeGolden.s index 7c1b8511..3bb80994 100644 --- a/asm/ropeGolden.s +++ b/asm/ropeGolden.s @@ -87,7 +87,7 @@ sub_08038234: @ 0x08038234 cmp r0, #0 bne _0803824A ldrb r0, [r4, #0xb] - bl sub_0807CD04 + bl SetGlobalFlag _0803824A: adds r0, r4, #0 movs r1, #0xff @@ -101,7 +101,7 @@ sub_08038258: @ 0x08038258 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xb] - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0803826A bl sub_0805E780 diff --git a/asm/simon.s b/asm/simon.s index e8efe9ca..fb20b96b 100644 --- a/asm/simon.s +++ b/asm/simon.s @@ -76,7 +76,7 @@ _0806C27C: .4byte gRoomControls sub_0806C280: @ 0x0806C280 push {lr} movs r0, #0x50 - bl sub_0807CD04 + bl SetGlobalFlag ldr r0, _0806C298 @ =gUnk_0813AD74 bl sub_08080840 ldr r1, _0806C29C @ =gUnk_030010A0 diff --git a/asm/sittingPerson.s b/asm/sittingPerson.s index 2daa1b91..1e943866 100644 --- a/asm/sittingPerson.s +++ b/asm/sittingPerson.s @@ -180,16 +180,16 @@ sub_0806387C: @ 0x0806387C adds r6, r0, #0 movs r4, #3 movs r0, #0xda - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _08063896 movs r4, #0 movs r0, #0xda - bl sub_0807CCB4 + bl SetLocalFlag b _080638D6 _08063896: movs r0, #0xd1 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _080638D6 movs r5, #0 @@ -210,7 +210,7 @@ _080638B2: ble _080638D6 movs r4, #2 movs r0, #0xd1 - bl sub_0807CCB4 + bl SetLocalFlag ldr r0, _080638FC @ =0x00000A17 movs r1, #1 bl sub_0807BA8C @@ -247,12 +247,12 @@ sub_0806390C: @ 0x0806390C adds r4, r0, #0 movs r5, #1 movs r0, #0xd9 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0806392E movs r5, #0 movs r0, #0xd9 - bl sub_0807CCB4 + bl SetLocalFlag adds r0, r4, #0 adds r0, #0x84 ldr r1, [r0] diff --git a/asm/smallIceBlock.s b/asm/smallIceBlock.s index 3839d299..fe5e4c28 100644 --- a/asm/smallIceBlock.s +++ b/asm/smallIceBlock.s @@ -42,7 +42,7 @@ sub_080991CC: @ 0x080991CC adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _080991EC bl sub_0805E780 @@ -113,7 +113,7 @@ sub_08099248: @ 0x08099248 adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag b _0809930E .align 2, 0 _0809927C: .4byte 0x000001B3 @@ -620,7 +620,7 @@ sub_0809963C: @ 0x0809963C bl sub_0804B128 adds r4, r0, #0 ldrh r0, [r4] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _08099684 ldr r0, _08099694 @ =gRoomControls diff --git a/asm/stockwell.s b/asm/stockwell.s index eb262e92..648300e9 100644 --- a/asm/stockwell.s +++ b/asm/stockwell.s @@ -553,7 +553,7 @@ _0806543C: mov r0, sb cmp r0, #0 beq _0806547C - bl sub_0807CCB4 + bl SetLocalFlag _0806547C: ldr r1, [r7, #0x5c] movs r0, #2 diff --git a/asm/sturgeon.s b/asm/sturgeon.s index 60430285..fa0783c2 100644 --- a/asm/sturgeon.s +++ b/asm/sturgeon.s @@ -311,7 +311,7 @@ sub_08064CD8: @ 0x08064CD8 cmp r0, #0 bne _08064CF4 movs r0, #0x73 - bl sub_0807CBD0 + bl CheckLocalFlag rsbs r1, r0, #0 orrs r1, r0 lsrs r4, r1, #0x1f diff --git a/asm/tektiteGolden.s b/asm/tektiteGolden.s index aceacaab..63b0d36a 100644 --- a/asm/tektiteGolden.s +++ b/asm/tektiteGolden.s @@ -93,7 +93,7 @@ sub_08037F58: @ 0x08037F58 cmp r0, #0 bne _08037F6E ldrb r0, [r4, #0xb] - bl sub_0807CD04 + bl SetGlobalFlag _08037F6E: ldrb r0, [r4, #0xa] movs r2, #0x58 @@ -128,7 +128,7 @@ sub_08037FA0: @ 0x08037FA0 push {r4, r5, lr} adds r5, r0, #0 ldrb r0, [r5, #0xb] - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _08037FB2 bl sub_0805E780 diff --git a/asm/tingleSiblings.s b/asm/tingleSiblings.s index e64d2c57..31da5881 100644 --- a/asm/tingleSiblings.s +++ b/asm/tingleSiblings.s @@ -269,7 +269,7 @@ sub_08064F28: @ 0x08064F28 adds r0, r0, r1 ldrb r7, [r0] adds r0, r7, #0 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 bne _08064F84 ldr r4, _08064F64 @ =gUnk_02002A40 @@ -302,7 +302,7 @@ _08064F7E: b _08064FD2 _08064F84: movs r0, #0x3a - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _08064FCE ldr r0, _08064FB0 @ =gUnk_02002A40 @@ -316,7 +316,7 @@ _08064F84: movs r5, #8 movs r4, #0 movs r0, #0x3a - bl sub_0807CD04 + bl SetGlobalFlag movs r0, #1 mov r1, r8 str r0, [r1, #0x14] @@ -360,18 +360,18 @@ _08064FD2: str r0, [r1, #0x10] _08064FF4: adds r0, r7, #0 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 bne _08065010 adds r0, r7, #0 - bl sub_0807CD10 + bl SetRoomFlag b _08065016 .align 2, 0 _08065008: .4byte gUnk_0810FC08 _0806500C: .4byte gTextBox _08065010: adds r0, r7, #0 - bl sub_0807CD8C + bl ClearRoomFlag _08065016: pop {r3} mov r8, r3 diff --git a/asm/townMinish.s b/asm/townMinish.s index 212f7df9..98abbecf 100644 --- a/asm/townMinish.s +++ b/asm/townMinish.s @@ -583,11 +583,11 @@ sub_0806B004: @ 0x0806B004 adds r5, r1, #0 movs r4, #0 movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0806B050 movs r0, #0x73 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0806B048 movs r0, #0x46 @@ -596,14 +596,14 @@ sub_0806B004: @ 0x0806B004 bne _0806B044 movs r4, #3 movs r0, #0x78 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0806B050 movs r4, #2 movs r0, #1 str r0, [r5, #0x14] movs r0, #0x78 - bl sub_0807CCB4 + bl SetLocalFlag b _0806B050 _0806B044: movs r4, #4 @@ -611,7 +611,7 @@ _0806B044: _0806B048: movs r4, #1 movs r0, #0x6a - bl sub_0807CCB4 + bl SetLocalFlag _0806B050: ldr r0, _0806B060 @ =gUnk_08112C40 lsls r1, r4, #1 @@ -629,12 +629,12 @@ sub_0806B064: @ 0x0806B064 adds r5, r0, #0 movs r4, #0 movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0806B082 movs r4, #1 movs r0, #0x73 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0806B082 movs r4, #2 @@ -660,11 +660,11 @@ sub_0806B098: @ 0x0806B098 bne _0806B0C0 movs r4, #1 movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0806B0C0 movs r0, #0x2a - bl GetProgressFlag + bl CheckGlobalFlag rsbs r1, r0, #0 orrs r1, r0 lsrs r4, r1, #0x1f @@ -735,17 +735,17 @@ sub_0806B134: @ 0x0806B134 beq _0806B158 movs r4, #2 movs r0, #0x7b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0806B160 movs r4, #1 movs r0, #0x7b - bl sub_0807CCB4 + bl SetLocalFlag b _0806B160 _0806B158: movs r4, #0 movs r0, #0x4a - bl sub_0807CD04 + bl SetGlobalFlag _0806B160: ldr r0, _0806B17C @ =gUnk_02002A40 ldrb r0, [r0, #8] diff --git a/asm/townsperson.s b/asm/townsperson.s index a086875b..7f61ff10 100644 --- a/asm/townsperson.s +++ b/asm/townsperson.s @@ -616,11 +616,11 @@ sub_0806200C: @ 0x0806200C adds r5, r0, #0 movs r4, #0 movs r0, #0x29 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _08062034 movs r0, #0x6b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _08062034 movs r0, #0x39 diff --git a/asm/treeHidingPortal.s b/asm/treeHidingPortal.s index 00e374d9..ef03e6d2 100644 --- a/asm/treeHidingPortal.s +++ b/asm/treeHidingPortal.s @@ -26,7 +26,7 @@ sub_0809E83C: @ 0x0809E83C adds r4, r0, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0809E856 adds r0, r4, #0 @@ -55,7 +55,7 @@ sub_0809E86C: @ 0x0809E86C cmp r0, #0 beq _0809E89A movs r0, #0x14 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0809E89A ldr r0, _0809E8B8 @ =gUnk_030010A0 @@ -121,7 +121,7 @@ sub_0809E8EC: @ 0x0809E8EC adds r0, r1, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CCC8 + bl SetFlag movs r0, #0 bl sub_08078A90 movs r0, #0x73 diff --git a/asm/upperInn.s b/asm/upperInn.s index 6faf2906..8879cfe9 100644 --- a/asm/upperInn.s +++ b/asm/upperInn.s @@ -13,15 +13,15 @@ sub_0804B938: @ 0x0804B938 cmp r0, #3 bls _0804B9F2 movs r0, #0x2b - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804B970 movs r0, #0x2f - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804B984 movs r0, #0x30 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804B9BC ldr r0, _0804B96C @ =gUnk_080D6C64 @@ -32,11 +32,11 @@ _0804B968: .4byte gUnk_02002A40 _0804B96C: .4byte gUnk_080D6C64 _0804B970: movs r0, #0x2c - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804B9A8 movs r0, #0x2e - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804B990 _0804B984: @@ -47,7 +47,7 @@ _0804B984: _0804B98C: .4byte gUnk_080D6D04 _0804B990: movs r0, #0x30 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0804B9D2 ldr r0, _0804B9A4 @ =gUnk_080D6C94 @@ -57,11 +57,11 @@ _0804B990: _0804B9A4: .4byte gUnk_080D6C94 _0804B9A8: movs r0, #0x2d - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804B9EC movs r0, #0x2e - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804B9C8 _0804B9BC: @@ -72,7 +72,7 @@ _0804B9BC: _0804B9C4: .4byte gUnk_080D6CE4 _0804B9C8: movs r0, #0x2f - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 beq _0804B9E0 _0804B9D2: diff --git a/asm/vaatiReborn.s b/asm/vaatiReborn.s index 508adb30..faf1766a 100644 --- a/asm/vaatiReborn.s +++ b/asm/vaatiReborn.s @@ -184,7 +184,7 @@ sub_0806B7BC: @ 0x0806B7BC push {r4, r5, lr} adds r5, r0, #0 movs r0, #3 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 bne _0806B7CC b _0806B968 @@ -354,7 +354,7 @@ _0806B906: cmp r0, #0 beq _0806B91E movs r0, #0 - bl sub_0807CD10 + bl SetRoomFlag bl sub_0805E780 _0806B91E: ldrb r0, [r5, #0xf] diff --git a/asm/vaatiRebornEnemy.s b/asm/vaatiRebornEnemy.s index 056cd2e8..f60391ba 100644 --- a/asm/vaatiRebornEnemy.s +++ b/asm/vaatiRebornEnemy.s @@ -69,7 +69,7 @@ sub_0803D134: @ 0x0803D134 push {r4, r5, r6, lr} adds r5, r0, #0 movs r0, #0x7b - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0803D146 bl sub_0805E780 @@ -77,7 +77,7 @@ _0803D146: adds r0, r5, #0 bl sub_0804A720 movs r0, #0 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 bne _0803D158 b _0803D25A @@ -87,7 +87,7 @@ _0803D158: cmp r0, #0x41 bhi _0803D25A movs r0, #0 - bl sub_0807CD8C + bl ClearRoomFlag movs r2, #0 movs r0, #3 strb r0, [r5, #0xc] @@ -1109,7 +1109,7 @@ sub_0803D8FC: @ 0x0803D8FC cmp r0, #0 bne _0803D918 movs r0, #1 - bl sub_0807CD10 + bl SetRoomFlag b _0803D968 _0803D918: movs r0, #7 diff --git a/asm/vaatiTransfigured.s b/asm/vaatiTransfigured.s index c4ed1a0b..784571c1 100644 --- a/asm/vaatiTransfigured.s +++ b/asm/vaatiTransfigured.s @@ -99,7 +99,7 @@ sub_0803F818: @ 0x0803F818 adds r5, r0, #0 bl sub_0804A720 movs r0, #0 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 beq _0803F910 ldr r0, _0803F8FC @ =gUnk_03003DBC @@ -1210,7 +1210,7 @@ sub_0804006C: @ 0x0804006C cmp r0, #0 bne _080400C2 movs r0, #2 - bl sub_0807CD10 + bl SetRoomFlag movs r0, #8 strb r0, [r4, #0xf] b _080400BA diff --git a/asm/vaatiWrath.s b/asm/vaatiWrath.s index 4305a8fd..8f0064fc 100644 --- a/asm/vaatiWrath.s +++ b/asm/vaatiWrath.s @@ -1424,7 +1424,7 @@ sub_08041E50: @ 0x08041E50 cmp r5, #0 bne _08041E76 movs r0, #0x51 - bl sub_0807CD04 + bl SetGlobalFlag ldr r0, [r4, #0x64] ldr r0, [r0, #8] str r5, [r0, #0x64] diff --git a/asm/warpPoint.s b/asm/warpPoint.s index 12f7e292..571c4a48 100644 --- a/asm/warpPoint.s +++ b/asm/warpPoint.s @@ -74,7 +74,7 @@ sub_0808B474: @ 0x0808B474 adds r0, r4, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0808B4E0 adds r0, r4, #0 @@ -126,7 +126,7 @@ sub_0808B530: @ 0x0808B530 adds r4, r0, #0 adds r0, #0x86 ldrh r0, [r0] - bl sub_0807CBE4 + bl CheckFlags cmp r0, #0 beq _0808B562 adds r0, r4, #0 diff --git a/asm/waterfallOpening.s b/asm/waterfallOpening.s index ee10b786..404ae0a5 100644 --- a/asm/waterfallOpening.s +++ b/asm/waterfallOpening.s @@ -43,7 +43,7 @@ _0809FFA2: cmp r0, #0 beq _080A0068 movs r0, #0xff - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 beq _080A00AA ldrb r2, [r4, #0xd] diff --git a/asm/windTribeTeleporter.s b/asm/windTribeTeleporter.s index 8df2c44b..8fb86470 100644 --- a/asm/windTribeTeleporter.s +++ b/asm/windTribeTeleporter.s @@ -200,7 +200,7 @@ _080A1088: cmp r0, #3 bne _080A10A2 movs r0, #0xf9 - bl sub_0807CCB4 + bl SetLocalFlag _080A10A2: ldrb r1, [r4, #0xb] lsls r0, r1, #2 diff --git a/asm/windTribespeople.s b/asm/windTribespeople.s index 49a26321..b9a8c71f 100644 --- a/asm/windTribespeople.s +++ b/asm/windTribespeople.s @@ -76,15 +76,15 @@ _0806C7F4: cmp r0, #3 bne _0806C82C movs r0, #0x58 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0806C82C movs r0, #0x63 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0806C82C movs r0, #0 - bl sub_0807CC3C + bl CheckRoomFlag cmp r0, #0 beq _0806C82C movs r0, #7 @@ -243,14 +243,14 @@ sub_0806C944: @ 0x0806C944 push {r4, lr} adds r4, r0, #0 movs r0, #0x58 - bl GetProgressFlag + bl CheckGlobalFlag cmp r0, #0 bne _0806C956 movs r1, #0 b _0806C964 _0806C956: movs r0, #0x63 - bl sub_0807CBD0 + bl CheckLocalFlag movs r1, #2 cmp r0, #0 beq _0806C964 @@ -271,7 +271,7 @@ sub_0806C978: @ 0x0806C978 push {r4, lr} adds r4, r0, #0 movs r0, #0x58 - bl GetProgressFlag + bl CheckGlobalFlag rsbs r1, r0, #0 orrs r1, r0 lsrs r1, r1, #0x1f @@ -290,14 +290,14 @@ sub_0806C99C: @ 0x0806C99C push {r4, r5, lr} adds r5, r0, #0 movs r0, #0x58 - bl GetProgressFlag + bl CheckGlobalFlag rsbs r1, r0, #0 orrs r1, r0 asrs r4, r1, #0x1f movs r0, #2 ands r4, r0 movs r0, #0x63 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 beq _0806C9BC adds r4, #1 @@ -318,7 +318,7 @@ sub_0806C9D0: @ 0x0806C9D0 adds r5, r0, #0 movs r4, #0 movs r0, #0x64 - bl sub_0807CBD0 + bl CheckLocalFlag cmp r0, #0 bne _0806C9E2 movs r4, #1 @@ -338,7 +338,7 @@ sub_0806C9F8: @ 0x0806C9F8 push {r4, lr} adds r4, r0, #0 movs r0, #0x58 - bl GetProgressFlag + bl CheckGlobalFlag rsbs r1, r0, #0 orrs r1, r0 lsrs r1, r1, #0x1f diff --git a/asm/wizzrobeIce.s b/asm/wizzrobeIce.s index 6231122c..e208540f 100644 --- a/asm/wizzrobeIce.s +++ b/asm/wizzrobeIce.s @@ -454,7 +454,7 @@ sub_08030118: @ 0x08030118 lsls r0, r0, #2 adds r1, r2, #0 adds r1, #0x67 - bl sub_0807CC9C + bl SetLocalFlagByOffset b _0803014C .align 2, 0 _0803013C: .4byte gUnk_030010A0 @@ -463,7 +463,7 @@ _08030140: lsls r0, r0, #2 adds r1, r2, #0 adds r1, #0x67 - bl sub_0807CD20 + bl ClearLocalFlagByOffset _0803014C: pop {pc} .align 2, 0 diff --git a/asm/zelda.s b/asm/zelda.s index 47757132..531eb319 100644 --- a/asm/zelda.s +++ b/asm/zelda.s @@ -135,7 +135,7 @@ sub_08066D94: @ 0x08066D94 push {r4, r5, lr} adds r5, r0, #0 movs r0, #0x1c - bl sub_0807CD04 + bl SetGlobalFlag movs r0, #0x2e movs r1, #0 movs r2, #0 diff --git a/include/greatFairy.h b/include/greatFairy.h index 3b56b722..3c058c64 100644 --- a/include/greatFairy.h +++ b/include/greatFairy.h @@ -4,7 +4,7 @@ extern u32 __modsi3(u32, u32); extern void UpdateSprite(Entity *, u32); extern void sub_08087380(); -extern u32 sub_0807CC3C(); +extern u32 CheckRoomFlag(); extern Entity *sub_080873AC(Entity*, u32, u32); extern void PositionRelative(); extern void CopyPosition(); diff --git a/linker.ld b/linker.ld index a47607e6..80b4ccc0 100644 --- a/linker.ld +++ b/linker.ld @@ -450,7 +450,7 @@ SECTIONS { asm/code_0805436C.o(.text); src/sub_08055E08.o(.text); asm/sub_08055E24.o(.text); - asm/mainLoop.o(.text); + src/mainLoop.o(.text); asm/sub_08055F70.o(.text); asm/code_08055FF4.o(.text); src/textbox.o(.text); diff --git a/src/getProgressFlag.c b/src/getProgressFlag.c index 200167f4..fe9197fd 100644 --- a/src/getProgressFlag.c +++ b/src/getProgressFlag.c @@ -1,7 +1,7 @@ #include "global.h" -u32 extern GetProgressFlagWithOffset(u32, u32); +u32 extern CheckLocalFlagByOffset(u32, u32); -u32 GetProgressFlag (u32 index) { - return GetProgressFlagWithOffset(0, index); +u32 CheckGlobalFlag (u32 index) { + return CheckLocalFlagByOffset(0, index); } \ No newline at end of file diff --git a/src/greatFairy.c b/src/greatFairy.c index bd5c8aef..df4a2b00 100644 --- a/src/greatFairy.c +++ b/src/greatFairy.c @@ -49,7 +49,7 @@ void sub_08086B10(Entity *ent) Entity *ripple; // r5@16 u32 event; - event = sub_0807CC3C(0); + event = CheckRoomFlag(0); if (event == 0) { return; } diff --git a/src/loadRoom.c b/src/loadRoom.c index 9ef70edc..c2eedb70 100644 --- a/src/loadRoom.c +++ b/src/loadRoom.c @@ -2,7 +2,7 @@ /* called when loading any room */ void LoadRoomEntityList(); - s32 GetProgressFlag(u32 flag); + s32 CheckGlobalFlag(u32 flag); extern s32* sub_0804B128(u8 unk); extern void sub_0804B058(s32 *unk); extern void sub_0804B1AC(); @@ -20,7 +20,7 @@ void LoadRoom(void) sub_0804B128(0); LoadRoomEntityList(); - iVar1 = GetProgressFlag(21); + iVar1 = CheckGlobalFlag(21); if (iVar1 != 0) { dat = sub_0804B128(2); sub_0804B058(dat); diff --git a/src/mainLoop.c b/src/mainLoop.c index e4fb08b8..858f5249 100644 --- a/src/mainLoop.c +++ b/src/mainLoop.c @@ -1,76 +1,112 @@ -/* #include "global.h" #include "mainLoop.h" +#ifdef NON_MATCHING -void MainLoop() +typedef struct { + u8 interruptFlag; + u8 field_0x1; + u8 loadType; + u8 funcIndex; + u8 transition; + u16 field_0x5; + u8 muteAudio; + u8 field_0x8; + u8 countdown; + u8 field_0xa; + u8 field_0xb; + u16 ticks; + u8 field_0xe; + u8 field_0xf; +} MainStruct; + +extern void sub_08055F70(void); +extern void sub_080A3204(void); +extern void sub_0805616C(void); +extern void sub_0807CE90(void); +extern void sub_080560B8(void); +extern void sub_08056208(void); +extern void sub_0804FFE4(void); +extern void sub_0804FF84(u32); +extern void sub_08056418(void); +extern void sub_080ADD30(void); +extern void sub_0801D630(void *,u32); +extern void sub_08056010(u32); +extern void ReadKeyInput(); +extern u32 sub_08055FF4(); +extern void sub_080560A8(void); +extern void sub_08056458(void); +extern void sub_08050154(void); +extern void sub_080A3480(void); +extern void sub_08016E78(void); +extern void sub_08056260(void); + +extern u8 gUnk_02000014; +extern u32 gUnk_020176A0; +extern u32 gRand; +extern MainStruct gUnk_03001000; +extern void (* gUnk_08100CBC[])(); +extern void VBlankInterruptWait(void); + +void MainLoop(void) { - s32 v0; // r0@1 - s32 v1; // r0@1 - s32 v2; // r0@1 - s32 v3; // r0@1 - s32 v4; // r0@1 - s32 v5; // r0@1 - s32 v6; // r0@1 - s32 i; // r0@1 - s32 v8; // r0@2 - s32 v9; // r0@6 - s32 v10; // r4@10 - s32 v11; // r0@12 - s32 v12; // r0@13 - s32 v13; // r0@13 - s32 v14; // r0@13 - s32 * v15; - u32 in_r2; - - v0 = sub_08055F70(); - v1 = sub_080A3204(v0); - v2 = sub_0805616C(v1); - v3 = sub_0807CE90(v2); - v4 = sub_080560B8(v3); - sub_08056208(v4); - - v15 = &gUnk_02000010; - *(u8 *)(v15 + 1) = 193; - sub_0804FFE4(); - DmaSet(3, 83886080, 33650336, -2080374656); - v5 = sub_0804FF84(1); - v6 = sub_08056418(v5); - sub_080ADD30(v6); - gRand = 19088743; - v9 = sub_0801D630(50335744, in_r2, 16); - for ( i = sub_08056010(0); ; i = sub_08016E78(v9) ) - { - v8 = ReadKeyInput(); - if ( sub_08055FF4(v8) ) - sub_080560A8(); - if ( gUnk_03001000.field_0x1 && gUnk_03001000.field_0x1 == 1 ) - { - v9 = sub_08056260(); - } - else - { - for ( ; gUnk_03001000.field_0x8; --gUnk_03001000.field_0x8 ) - VBlankIntrWait(); - if ( gUnk_03001000.field_0x9 ) - { - --gUnk_03001000.field_0x9; - v10 = gUnk_03001000.field_0xa; - while ( 1 ) - { - v11 = v10--; - if ( v11 <= 0 ) - break; - VBlankIntrWait(); + bool32 codeInputted; + u8 cVar1; + u32 uVar2; + + sub_08055F70(); + sub_080A3204(); + sub_0805616C(); + sub_0807CE90(); + sub_080560B8(); + sub_08056208(); + gUnk_02000014 = 193; + sub_0804FFE4(); + DmaSet(3, 0x5000000U, &gUnk_020176A0, 0x84000080U); + sub_0804FF84(1); + sub_08056418(); + sub_080ADD30(); + gRand = 0x1234567; + sub_0801D630(&gUnk_03001000,16); + sub_08056010(0); + do { + ReadKeyInput(); + codeInputted = sub_08055FF4(); + if (codeInputted) { + sub_080560A8(); } - } - ++gUnk_03001000.ticks; - v12 = _call_via_r0((u32)*(&gUnk_08100CBC + gUnk_03001000.field_0x2)); - v13 = sub_08056458(v12); - v14 = sub_08050154(v13); - v9 = sub_080A3480(v14); - } - } + if ((gUnk_03001000.field_0x1 == 0) || (gUnk_03001000.field_0x1 != 1)) { + if (gUnk_03001000.field_0x8 != '\0') { + while (codeInputted) { + VBlankInterruptWait(); + cVar1 = gUnk_03001000.field_0x8 + -1; + codeInputted = gUnk_03001000.field_0x8 != '\x01'; + gUnk_03001000.field_0x8 = cVar1; + } + } + if (gUnk_03001000.countdown != '\0') { + gUnk_03001000.countdown = gUnk_03001000.countdown + -1; + uVar2 = gUnk_03001000.field_0xa; + while (0 < uVar2) { + VBlankIntrWait(); + uVar2 = uVar2 - 1; + } + } + gUnk_03001000.ticks = gUnk_03001000.ticks + 1; + gUnk_08100CBC[gUnk_03001000.loadType](); + sub_08056458(); + sub_08050154(); + sub_080A3480(); + } + else { + sub_08056260(); + } + sub_08016E78(); + } while( TRUE ); } - - */ \ No newline at end of file +#else +NAKED +void MainLoop(void) { + asm(".include \"asm/non_matching/mainLoop.inc\""); +} +#endif \ No newline at end of file