From bb5b77aec9ef9691784a6f0beb816766576f3c02 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 14 Apr 2024 14:47:33 +0200 Subject: [PATCH] Name `gAdventureFlags` --- asm/dtcm.s | 4 +- asm/main.inc | 2 +- asm/main.s | 18 +- asm/ov00/Actor/Actor.inc | 2 +- asm/ov00/Actor/Actor.s | 12 +- asm/ov00/Item/ItemManager.inc | 2 +- asm/ov00/Item/ItemManager.s | 46 +- asm/ov00/Player/LinkStateBase.inc | 2 +- asm/ov00/Player/LinkStateBase.s | 4 +- asm/ov00/Player/LinkStateDamage.inc | 2 +- asm/ov00/Player/LinkStateDamage.s | 10 +- asm/ov00/Player/LinkStateItem.inc | 2 +- asm/ov00/Player/LinkStateItem.s | 4 +- asm/ov00/Player/PlayerBase.inc | 2 +- asm/ov00/Player/PlayerBase.s | 4 +- asm/ov00/Player/PlayerControl.inc | 2 +- asm/ov00/Player/PlayerControl.s | 14 +- asm/ov00/ov00_020773c0.inc | 2 +- asm/ov00/ov00_020773c0.s | 4 +- asm/ov00/ov00_0207af9c.inc | 2 +- asm/ov00/ov00_0207af9c.s | 50 +- asm/ov00/ov00_020b1498.inc | 2 +- asm/ov00/ov00_020b1498.s | 68 +-- asm/ov00/ov00_020c3e54.inc | 2 +- asm/ov00/ov00_020c3e54.s | 64 +-- asm/ov02.inc | 2 +- asm/ov02.s | 44 +- asm/ov03.inc | 2 +- asm/ov03.s | 92 ++-- asm/ov04.inc | 2 +- asm/ov04.s | 76 +-- asm/ov05.inc | 2 +- asm/ov05.s | 96 ++-- asm/ov09.inc | 2 +- asm/ov09.s | 26 +- asm/ov12.inc | 2 +- asm/ov12.s | 36 +- asm/ov14/ov14_0211f640.inc | 2 +- asm/ov14/ov14_0211f640.s | 176 +++---- asm/ov14/ov14_0213b778.inc | 2 +- asm/ov14/ov14_0213b778.s | 196 +++---- asm/ov15.inc | 2 +- asm/ov15.s | 786 ++++++++++++++-------------- asm/ov17.inc | 2 +- asm/ov17.s | 104 ++-- asm/ov18.inc | 2 +- asm/ov18.s | 236 ++++----- asm/ov19.inc | 2 +- asm/ov19.s | 44 +- asm/ov20.inc | 2 +- asm/ov20.s | 52 +- asm/ov22.inc | 2 +- asm/ov22.s | 50 +- asm/ov23.inc | 2 +- asm/ov23.s | 88 ++-- asm/ov24.inc | 2 +- asm/ov24.s | 48 +- asm/ov25.inc | 2 +- asm/ov25.s | 108 ++-- asm/ov26.inc | 2 +- asm/ov26.s | 98 ++-- asm/ov27.inc | 2 +- asm/ov27.s | 152 +++--- asm/ov28.inc | 2 +- asm/ov28.s | 176 +++---- asm/ov29.inc | 2 +- asm/ov29.s | 8 +- asm/ov30.inc | 2 +- asm/ov30.s | 46 +- asm/ov31.inc | 2 +- asm/ov31.s | 56 +- asm/ov32.inc | 2 +- asm/ov32.s | 42 +- asm/ov34.inc | 2 +- asm/ov34.s | 8 +- asm/ov35.inc | 2 +- asm/ov35.s | 64 +-- asm/ov36.inc | 2 +- asm/ov36.s | 118 ++--- asm/ov37.inc | 2 +- asm/ov37.s | 4 +- asm/ov38.inc | 2 +- asm/ov38.s | 52 +- asm/ov39.inc | 2 +- asm/ov39.s | 38 +- asm/ov40.inc | 2 +- asm/ov40.s | 96 ++-- asm/ov41.inc | 2 +- asm/ov41.s | 42 +- asm/ov42.inc | 2 +- asm/ov42.s | 4 +- asm/ov43.inc | 2 +- asm/ov43.s | 14 +- asm/ov45.inc | 2 +- asm/ov45.s | 12 +- asm/ov46.inc | 2 +- asm/ov46.s | 22 +- asm/ov49.inc | 2 +- asm/ov49.s | 26 +- asm/ov50.inc | 2 +- asm/ov50.s | 10 +- asm/ov52.inc | 2 +- asm/ov52.s | 50 +- asm/ov55.inc | 2 +- asm/ov55.s | 10 +- asm/ov57.inc | 2 +- asm/ov57.s | 4 +- 107 files changed, 1909 insertions(+), 1909 deletions(-) diff --git a/asm/dtcm.s b/asm/dtcm.s index efa2e951..b3664d47 100644 --- a/asm/dtcm.s +++ b/asm/dtcm.s @@ -3947,8 +3947,8 @@ data_027e0f6c: .global data_027e0f70 data_027e0f70: .space 0x4 - .global data_027e0f74 -data_027e0f74: + .global gAdventureFlags +gAdventureFlags: .space 0x4 .global data_027e0f78 data_027e0f78: diff --git a/asm/main.inc b/asm/main.inc index 47ead978..e1c3a1ad 100644 --- a/asm/main.inc +++ b/asm/main.inc @@ -101,7 +101,7 @@ .extern data_027e0e2c .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f7c .extern data_027e0f80 .extern data_027e0f84 diff --git a/asm/main.s b/asm/main.s index 2f51b8c7..e59748c3 100644 --- a/asm/main.s +++ b/asm/main.s @@ -76426,7 +76426,7 @@ _02037d04: mov r0, r0, asr #0x18 ldmia sp!, {r4, r5, r6, pc} _02037d10: - ldr r0, _02037f48 ; =data_027e0f74 + ldr r0, _02037f48 ; =gAdventureFlags ldrh r1, [r4, #4] ldr r0, [r0] bl func_ov00_02097760 @@ -76580,7 +76580,7 @@ _02037f30: _02037f3c: .word data_027e0d54 _02037f40: .word data_027e0c68 _02037f44: .word data_027e0764 -_02037f48: .word data_027e0f74 +_02037f48: .word gAdventureFlags _02037f4c: .word data_027e0cb4 _02037f50: .word gItemManager _02037f54: .word data_027e0fe4 @@ -76722,7 +76722,7 @@ _02038114: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} _0203812c: - ldr r0, _02038578 ; =data_027e0f74 + ldr r0, _02038578 ; =gAdventureFlags ldr r1, [r4, #4] ldr r0, [r0] mov r2, #1 @@ -76731,7 +76731,7 @@ _0203812c: mov r0, #2 ldmia sp!, {r3, r4, r5, pc} _0203814c: - ldr r0, _02038578 ; =data_027e0f74 + ldr r0, _02038578 ; =gAdventureFlags ldr r1, [r4, #4] ldr r0, [r0] mov r2, #0 @@ -77030,7 +77030,7 @@ _02038568: .align 2, 0 arm_func_end func_02037f58 _02038574: .word data_027e103c -_02038578: .word data_027e0f74 +_02038578: .word gAdventureFlags _0203857c: .word data_027e0fc8 _02038580: .word 0x00007fff _02038584: .word data_027e0cb4 @@ -81026,7 +81026,7 @@ func_0203b5d0: ; 0x0203b5d0 bl func_ov00_02097628 cmp r0, #0 beq _0203b630 - ldr r0, _0203b760 ; =data_027e0f74 + ldr r0, _0203b760 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -81116,7 +81116,7 @@ _0203b700: .align 2, 0 arm_func_end func_0203b5d0 _0203b75c: .word data_027e0db0 -_0203b760: .word data_027e0f74 +_0203b760: .word gAdventureFlags .global func_0203b764 arm_func_start func_0203b764 @@ -81712,7 +81712,7 @@ _0203bf68: ldrb r0, [r4, #0x50] cmp r0, #0 bne _0203bfcc - ldr r0, _0203c07c ; =data_027e0f74 + ldr r0, _0203c07c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -81772,7 +81772,7 @@ _0203c06c: .word data_027e0618 _0203c070: .word data_027e103c _0203c074: .word data_027e077c _0203c078: .word data_02056be4 -_0203c07c: .word data_027e0f74 +_0203c07c: .word gAdventureFlags _0203c080: .word data_027e0db0 .global func_0203c084 diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 65fd6744..fb37d2e0 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -20,7 +20,7 @@ .extern data_027e0d0c .extern data_027e0d3c .extern data_027e0e60 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 4e331d42..80c871e8 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -803,7 +803,7 @@ _020c1d3c: arm_func_start _ZN5Actor18func_ov00_020c1d58Ev _ZN5Actor18func_ov00_020c1d58Ev: ; 0x020c1d58 stmdb sp!, {r3, lr} - ldr r0, _020c1d98 ; =data_027e0f74 + ldr r0, _020c1d98 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -820,7 +820,7 @@ _ZN5Actor18func_ov00_020c1d58Ev: ; 0x020c1d58 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c1d58Ev -_020c1d98: .word data_027e0f74 +_020c1d98: .word gAdventureFlags _020c1d9c: .word data_027e0f90 .global _ZN5Actor18func_ov00_020c1da0EiP5Vec3p @@ -994,7 +994,7 @@ _020c1fc4: .word data_027e0f90 _ZN5Actor18func_ov00_020c1fc8Ej: ; 0x020c1fc8 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x6c - ldr r2, _020c2224 ; =data_027e0f74 + ldr r2, _020c2224 ; =gAdventureFlags mov r4, r0 ldr r0, [r2] mov r6, r1 @@ -1149,7 +1149,7 @@ _020c2218: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c1fc8Ej -_020c2224: .word data_027e0f74 +_020c2224: .word gAdventureFlags _020c2228: .word data_027e0f94 _020c222c: .word data_027e0f90 _020c2230: .word gItemManager @@ -1323,7 +1323,7 @@ _ZN5Actor18func_ov00_020c243cEiPi: ; 0x020c243c mov r7, r0 movne r0, #0 strne r0, [r6] - ldr r0, _020c26f0 ; =data_027e0f74 + ldr r0, _020c26f0 ; =gAdventureFlags mov r5, r1 ldr r0, [r0] bl func_ov00_02097738 @@ -1514,7 +1514,7 @@ _020c26e4: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end _ZN5Actor18func_ov00_020c243cEiPi -_020c26f0: .word data_027e0f74 +_020c26f0: .word gAdventureFlags _020c26f4: .word data_027e0fe4 _020c26f8: .word 0x41525257 _020c26fc: .word 0x5342454d diff --git a/asm/ov00/Item/ItemManager.inc b/asm/ov00/Item/ItemManager.inc index c97c5129..d039d6eb 100644 --- a/asm/ov00/Item/ItemManager.inc +++ b/asm/ov00/Item/ItemManager.inc @@ -3,7 +3,7 @@ .extern _ZN11ItemManager12GetEquipItemEi .extern _ZNK11ItemManager10GetMaxAmmoEi .extern data_027e0e60 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0fbc .extern data_027e103c diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index e3e15022..e809ec59 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -557,7 +557,7 @@ _020adefa: mov r2, #1 orr r3, r2 str r3, [r0, r1] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x13 ldr r0, [r0] blx func_ov00_0209779c @@ -569,7 +569,7 @@ _020adf12: mov r1, #2 orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #9 ldr r0, [r0] mov r2, #1 @@ -582,7 +582,7 @@ _020adf2c: mov r1, #4 orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0xa ldr r0, [r0] mov r2, #1 @@ -595,7 +595,7 @@ _020adf46: mov r1, #8 orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0xb ldr r0, [r0] mov r2, #1 @@ -608,7 +608,7 @@ _020adf60: mov r1, #0x10 orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0xc ldr r0, [r0] mov r2, #1 @@ -622,7 +622,7 @@ _020adf7a: sub r1, #0x2c orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x2b ldr r0, [r0] mov r2, #1 @@ -636,7 +636,7 @@ _020adf96: add r1, #0xd4 orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x30 ldr r0, [r0] mov r2, #1 @@ -653,7 +653,7 @@ _020adfbe: mov r1, #0x40 orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x16 ldr r0, [r0] mov r2, #1 @@ -666,7 +666,7 @@ _020adfd8: mov r1, #0x80 orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x17 ldr r0, [r0] mov r2, #1 @@ -731,7 +731,7 @@ _020ae04e: lsl r1, r1, #0xc orr r1, r3 str r1, [r0, r2] - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x8c ldr r0, [r0] mov r2, #1 @@ -751,21 +751,21 @@ _020ae072: str r1, [r0, r2] b _020ae222 _020ae082: - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7e ldr r0, [r0] mov r2, #1 blx func_ov00_0209779c b _020ae222 _020ae090: - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] mov r2, #1 blx func_ov00_0209779c b _020ae222 _020ae09e: - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7f ldr r0, [r0] mov r2, #1 @@ -881,7 +881,7 @@ _020ae160: str r1, [r0, #0xc] b _020ae222 _020ae16c: - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags ldr r1, _020ae24c ; =0x00000126 ldr r0, [r0] mov r2, #1 @@ -891,7 +891,7 @@ _020ae16c: bl func_ov09_0211ca20 b _020ae222 _020ae182: - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags ldr r1, _020ae250 ; =0x00000127 ldr r0, [r0] mov r2, #1 @@ -901,7 +901,7 @@ _020ae182: bl func_ov09_0211ca20 b _020ae222 _020ae198: - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x4a ldr r0, [r0] lsl r1, r1, #2 @@ -912,7 +912,7 @@ _020ae198: bl func_ov09_0211ca20 b _020ae222 _020ae1b0: - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags ldr r1, _020ae254 ; =0x00000129 ldr r0, [r0] mov r2, #1 @@ -971,22 +971,22 @@ _020ae1fe: orr r0, r4 str r0, [r3, r2] _020ae222: - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] blx func_ov00_02097760 cmp r0, #0 beq _020ae270 - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags mov r1, #0x7e ldr r0, [r0] blx func_ov00_02097760 cmp r0, #0 beq _020ae270 - ldr r0, _020ae244 ; =data_027e0f74 + ldr r0, _020ae244 ; =gAdventureFlags b _020ae258 nop -_020ae244: .word data_027e0f74 +_020ae244: .word gAdventureFlags _020ae248: .word data_027e0fbc _020ae24c: .word 0x00000126 _020ae250: .word 0x00000127 @@ -997,7 +997,7 @@ _020ae258: blx func_ov00_02097760 cmp r0, #0 beq _020ae270 - ldr r0, _020ae274 ; =data_027e0f74 + ldr r0, _020ae274 ; =gAdventureFlags mov r1, #0x80 ldr r0, [r0] mov r2, #1 @@ -1005,7 +1005,7 @@ _020ae258: _020ae270: pop {r3, r4, r5, pc} nop -_020ae274: .word data_027e0f74 +_020ae274: .word gAdventureFlags .global _ZN11ItemManager13GiveEquipItemEij thumb_func_start _ZN11ItemManager13GiveEquipItemEij diff --git a/asm/ov00/Player/LinkStateBase.inc b/asm/ov00/Player/LinkStateBase.inc index e476aff2..50280740 100644 --- a/asm/ov00/Player/LinkStateBase.inc +++ b/asm/ov00/Player/LinkStateBase.inc @@ -13,7 +13,7 @@ .extern data_027e0d38 .extern data_027e0e58 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f94 .extern data_027e0fa0 .extern data_027e0fac diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index 4ea3de60..1049642d 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -91,7 +91,7 @@ _020a807c: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _020a8084: - ldr r0, _020a80f8 ; =data_027e0f74 + ldr r0, _020a80f8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -125,7 +125,7 @@ _020a80f0: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end _ZN13LinkStateBase8vfunc_24Ei -_020a80f8: .word data_027e0f74 +_020a80f8: .word gAdventureFlags _020a80fc: .word data_027e0c68 _020a8100: .word data_027e0f64 _020a8104: .word data_027e0fb8 diff --git a/asm/ov00/Player/LinkStateDamage.inc b/asm/ov00/Player/LinkStateDamage.inc index 4b7354b3..e321c8c1 100644 --- a/asm/ov00/Player/LinkStateDamage.inc +++ b/asm/ov00/Player/LinkStateDamage.inc @@ -37,7 +37,7 @@ .extern data_027e0d38 .extern data_027e0db0 .extern data_027e0e58 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_ov00_020e9360 .extern data_ov00_020e9c88 .extern data_ov00_020eec68 diff --git a/asm/ov00/Player/LinkStateDamage.s b/asm/ov00/Player/LinkStateDamage.s index 2706a921..628caf8e 100644 --- a/asm/ov00/Player/LinkStateDamage.s +++ b/asm/ov00/Player/LinkStateDamage.s @@ -589,7 +589,7 @@ _020ac698: ldr r0, [r0, #4] cmp r0, #0 bgt _020ac6c8 - ldr r0, _020ac7e4 ; =data_027e0f74 + ldr r0, _020ac7e4 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -672,7 +672,7 @@ _020ac7d4: .word data_027e0618 _020ac7d8: .word data_027e0c54 _020ac7dc: .word data_ov00_020eec68 _020ac7e0: .word data_027e0db0 -_020ac7e4: .word data_027e0f74 +_020ac7e4: .word gAdventureFlags _020ac7e8: .word data_027e077c _020ac7ec: .word data_02056be4 @@ -790,13 +790,13 @@ _020ac930: bl _ZNK11ItemManager7HasItemEi cmp r0, #0 bne _020ac9bc - ldr r0, _020ac9e0 ; =data_027e0f74 + ldr r0, _020ac9e0 ; =gAdventureFlags mov r1, #0xff ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _020ac9bc - ldr r0, _020ac9e0 ; =data_027e0f74 + ldr r0, _020ac9e0 ; =gAdventureFlags mov r1, #0xf ldr r0, [r0] mov r2, #1 @@ -813,7 +813,7 @@ _020ac9d0: .word data_027e0e58 _020ac9d4: .word data_ov00_020eec9c _020ac9d8: .word data_027e0618 _020ac9dc: .word gItemManager -_020ac9e0: .word data_027e0f74 +_020ac9e0: .word gAdventureFlags .global _ZN15LinkStateDamage18func_ov00_020ac9e4Ei arm_func_start _ZN15LinkStateDamage18func_ov00_020ac9e4Ei diff --git a/asm/ov00/Player/LinkStateItem.inc b/asm/ov00/Player/LinkStateItem.inc index 74d2b300..89401468 100644 --- a/asm/ov00/Player/LinkStateItem.inc +++ b/asm/ov00/Player/LinkStateItem.inc @@ -4,7 +4,7 @@ .extern _ZN13LinkStateBase18EquipItem_vfunc_28Ev .extern _ZN13LinkStateBase8vfunc_34EP5Vec3p .extern _ZN13PlayerControl13StopFollowingEv -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0fb8 .extern data_027e103c .extern data_027e1098 diff --git a/asm/ov00/Player/LinkStateItem.s b/asm/ov00/Player/LinkStateItem.s index 6ce1ab84..3f8ce179 100644 --- a/asm/ov00/Player/LinkStateItem.s +++ b/asm/ov00/Player/LinkStateItem.s @@ -184,7 +184,7 @@ _020abf6c: .word func_01fffcd8 .global _ZN13LinkStateItem18func_ov00_020abf70Ev arm_func_start _ZN13LinkStateItem18func_ov00_020abf70Ev _ZN13LinkStateItem18func_ov00_020abf70Ev: ; 0x020abf70 - ldr r1, _020abf88 ; =data_027e0f74 + ldr r1, _020abf88 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] ldr ip, _020abf8c ; =func_ov00_02097b9c @@ -192,7 +192,7 @@ _ZN13LinkStateItem18func_ov00_020abf70Ev: ; 0x020abf70 bx ip .align 2, 0 arm_func_end _ZN13LinkStateItem18func_ov00_020abf70Ev -_020abf88: .word data_027e0f74 +_020abf88: .word gAdventureFlags _020abf8c: .word func_ov00_02097b9c .global _ZN13LinkStateItem8vfunc_28Ev diff --git a/asm/ov00/Player/PlayerBase.inc b/asm/ov00/Player/PlayerBase.inc index 76dec98b..c7774566 100644 --- a/asm/ov00/Player/PlayerBase.inc +++ b/asm/ov00/Player/PlayerBase.inc @@ -8,7 +8,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f94 .extern data_027e0fa0 .extern data_027e0fac diff --git a/asm/ov00/Player/PlayerBase.s b/asm/ov00/Player/PlayerBase.s index 75fcaa90..3f0100f8 100644 --- a/asm/ov00/Player/PlayerBase.s +++ b/asm/ov00/Player/PlayerBase.s @@ -369,7 +369,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70 ldr r0, _020a7f68 ; =data_027e0e60 ldr r0, [r0] bl func_ov00_02082af4 - ldr r0, _020a7f80 ; =data_027e0f74 + ldr r0, _020a7f80 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097700 _020a7f40: @@ -392,7 +392,7 @@ _020a7f70: .word data_027e0fa0 _020a7f74: .word data_027e0fb0 _020a7f78: .word data_027e0fb8 _020a7f7c: .word data_027e0fe4 -_020a7f80: .word data_027e0f74 +_020a7f80: .word gAdventureFlags _020a7f84: .word data_027e0f64 .global _ZN10PlayerBase22TeleportToLastEntranceEb diff --git a/asm/ov00/Player/PlayerControl.inc b/asm/ov00/Player/PlayerControl.inc index d78f8879..d2d263f5 100644 --- a/asm/ov00/Player/PlayerControl.inc +++ b/asm/ov00/Player/PlayerControl.inc @@ -19,7 +19,7 @@ .extern data_027e0e2c .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac diff --git a/asm/ov00/Player/PlayerControl.s b/asm/ov00/Player/PlayerControl.s index 0c4f657f..1bd82637 100644 --- a/asm/ov00/Player/PlayerControl.s +++ b/asm/ov00/Player/PlayerControl.s @@ -216,7 +216,7 @@ _ZN13PlayerControl18func_ov00_020af06cEv: ; 0x020af06c ldrb r0, [r6, #0x7a] ldrb r5, [r6, #0x79] cmp r0, #0 - ldr r0, _020af27c ; =data_027e0f74 + ldr r0, _020af27c ; =gAdventureFlags strneb r5, [r6, #0x7b] ldr r0, [r0] bl func_ov00_02097738 @@ -348,7 +348,7 @@ _020af268: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end _ZN13PlayerControl18func_ov00_020af06cEv -_020af27c: .word data_027e0f74 +_020af27c: .word gAdventureFlags _020af280: .word data_027e0c68 _020af284: .word data_027e0d38 _020af288: .word gItemManager @@ -586,7 +586,7 @@ _ZN13PlayerControl18func_ov00_020af538Ev: ; 0x020af538 ldrb r0, [r4, #0x78] cmp r0, #0 beq _020af57c - ldr r0, _020af6c4 ; =data_027e0f74 + ldr r0, _020af6c4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -690,7 +690,7 @@ _020af694: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end _ZN13PlayerControl18func_ov00_020af538Ev -_020af6c4: .word data_027e0f74 +_020af6c4: .word gAdventureFlags _020af6c8: .word data_027e0c68 _020af6cc: .word data_027e0fac _020af6d0: .word data_027e0ffc @@ -752,12 +752,12 @@ _ZN13PlayerControl18func_ov00_020af778Ev: ; 0x020af778 ldrb r0, [sb, #0x78] cmp r0, #0 beq _020af7b8 - ldr r0, _020afabc ; =data_027e0f74 + ldr r0, _020afabc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _020af7b8 - ldr r0, _020afabc ; =data_027e0f74 + ldr r0, _020afabc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -969,7 +969,7 @@ _020afaa8: ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end _ZN13PlayerControl18func_ov00_020af778Ev -_020afabc: .word data_027e0f74 +_020afabc: .word gAdventureFlags _020afac0: .word data_027e0f90 _020afac4: .word gItemManager _020afac8: .word data_027e0fc8 diff --git a/asm/ov00/ov00_020773c0.inc b/asm/ov00/ov00_020773c0.inc index e7edf2e7..2d7d4768 100644 --- a/asm/ov00/ov00_020773c0.inc +++ b/asm/ov00/ov00_020773c0.inc @@ -28,7 +28,7 @@ .extern data_027e0e28 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f7c .extern data_027e1054 .extern data_ov00_020ec718 diff --git a/asm/ov00/ov00_020773c0.s b/asm/ov00/ov00_020773c0.s index 27673cf9..3a233d9b 100644 --- a/asm/ov00/ov00_020773c0.s +++ b/asm/ov00/ov00_020773c0.s @@ -3374,7 +3374,7 @@ func_ov00_02078b88: ; 0x02078b88 blt _02078bb8 cmp r1, #0x21 bge _02078bb8 - ldr r0, _02078bc0 ; =data_027e0f74 + ldr r0, _02078bc0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097c50 cmp r0, #0 @@ -3385,7 +3385,7 @@ _02078bb8: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_02078b88 -_02078bc0: .word data_027e0f74 +_02078bc0: .word gAdventureFlags .global func_ov00_02078bc4 thumb_func_start func_ov00_02078bc4 diff --git a/asm/ov00/ov00_0207af9c.inc b/asm/ov00/ov00_0207af9c.inc index 89ec0a6b..4064f595 100644 --- a/asm/ov00/ov00_0207af9c.inc +++ b/asm/ov00/ov00_0207af9c.inc @@ -108,7 +108,7 @@ .extern data_027e0f68 .extern data_027e0f6c .extern data_027e0f70 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f7c .extern data_027e0f80 diff --git a/asm/ov00/ov00_0207af9c.s b/asm/ov00/ov00_0207af9c.s index c149e3f1..4a8a363a 100644 --- a/asm/ov00/ov00_0207af9c.s +++ b/asm/ov00/ov00_0207af9c.s @@ -3504,7 +3504,7 @@ _0207d19c: _0207d1d4: cmp r6, #3 bne _0207d25c - ldr r0, _0207d3e4 ; =data_027e0f74 + ldr r0, _0207d3e4 ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] bl func_ov00_02097760 @@ -3642,7 +3642,7 @@ _0207d3d4: .word data_ov00_020e21d0 _0207d3d8: .word data_ov00_020e21f0 _0207d3dc: .word data_ov00_020e2210 _0207d3e0: .word data_ov00_020e2230 -_0207d3e4: .word data_027e0f74 +_0207d3e4: .word gAdventureFlags _0207d3e8: .word data_ov00_020e2250 _0207d3ec: .word data_ov00_020e226c _0207d3f0: .word data_ov00_020e2284 @@ -10838,7 +10838,7 @@ _02082ba0: cmp r0, #0 beq _02082c90 _02082bac: - ldr r0, _02082ce4 ; =data_027e0f74 + ldr r0, _02082ce4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_020976c8 ldr r0, _02082ce8 ; =data_027e0f64 @@ -10896,7 +10896,7 @@ _02082bac: bl func_ov00_020cfcec b _02082cd8 _02082c90: - ldr r0, _02082ce4 ; =data_027e0f74 + ldr r0, _02082ce4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_020976c8 ldrb r1, [r5, #0x13] @@ -10920,7 +10920,7 @@ _02082cd8: .align 2, 0 arm_func_end func_ov00_02082b3c _02082ce0: .word data_027e0d38 -_02082ce4: .word data_027e0f74 +_02082ce4: .word gAdventureFlags _02082ce8: .word data_027e0f64 _02082cec: .word data_027e0fe4 _02082cf0: .word data_027e0f68 @@ -19138,7 +19138,7 @@ func_ov00_0208967c: ; 0x0208967c cmp r0, #0 addeq sp, sp, #0x130 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - ldr r0, _02089a24 ; =data_027e0f74 + ldr r0, _02089a24 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -19379,7 +19379,7 @@ _020899b4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov00_0208967c -_02089a24: .word data_027e0f74 +_02089a24: .word gAdventureFlags _02089a28: .word data_027e0e60 .global func_ov00_02089a2c @@ -22614,7 +22614,7 @@ func_ov00_0208c39c: ; 0x0208c39c arm_func_start func_ov00_0208c3a4 func_ov00_0208c3a4: ; 0x0208c3a4 stmdb sp!, {r3, lr} - ldr r0, _0208c450 ; =data_027e0f74 + ldr r0, _0208c450 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -22659,7 +22659,7 @@ _0208c448: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_0208c3a4 -_0208c450: .word data_027e0f74 +_0208c450: .word gAdventureFlags _0208c454: .word data_027e0c68 _0208c458: .word data_027e077c _0208c45c: .word data_027e103c @@ -27790,7 +27790,7 @@ _020906fc: bl func_ov00_02090774 b _02090760 _0209072c: - ldr r0, _02090770 ; =data_027e0f74 + ldr r0, _02090770 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -27810,7 +27810,7 @@ _02090760: .align 2, 0 arm_func_end func_ov00_02090648 _0209076c: .word data_027e0f94 -_02090770: .word data_027e0f74 +_02090770: .word gAdventureFlags .global func_ov00_02090774 arm_func_start func_ov00_02090774 @@ -32238,7 +32238,7 @@ _02093e70: str r0, [sp, #0xc] cmp r4, #0 beq _02093f80 - ldr r0, _020940d4 ; =data_027e0f74 + ldr r0, _020940d4 ; =gAdventureFlags mov r1, r4 ldr r0, [r0] bl func_ov00_02097c18 @@ -32362,7 +32362,7 @@ _020940ac: arm_func_end func_ov00_02093e00 _020940cc: .word data_027e0e60 _020940d0: .word 0x00000e66 -_020940d4: .word data_027e0f74 +_020940d4: .word gAdventureFlags .global func_ov00_020940d8 arm_func_start func_ov00_020940d8 @@ -36782,7 +36782,7 @@ func_ov00_02097608: ; 0x02097608 .global func_ov00_02097628 arm_func_start func_ov00_02097628 func_ov00_02097628: ; 0x02097628 - ldr r0, _02097640 ; =data_027e0f74 + ldr r0, _02097640 ; =gAdventureFlags ldr r0, [r0] cmp r0, #0 movne r0, #1 @@ -36790,7 +36790,7 @@ func_ov00_02097628: ; 0x02097628 bx lr .align 2, 0 arm_func_end func_ov00_02097628 -_02097640: .word data_027e0f74 +_02097640: .word gAdventureFlags .global func_ov00_02097644 arm_func_start func_ov00_02097644 @@ -41668,7 +41668,7 @@ _0209b338: _0209b340: mov r5, #0xa2 _0209b344: - ldr r0, _0209b598 ; =data_027e0f74 + ldr r0, _0209b598 ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] bl func_ov00_02097760 @@ -41844,7 +41844,7 @@ _0209b588: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov00_0209afc4 -_0209b598: .word data_027e0f74 +_0209b598: .word gAdventureFlags _0209b59c: .word data_027e0d38 _0209b5a0: .word data_ov00_020db058 @@ -52820,7 +52820,7 @@ func_ov00_020a3f8c: ; 0x020a3f8c ldr r0, [r0, #4] cmp r0, #0x11 ldmneia sp!, {r3, pc} - ldr r0, _020a3fbc ; =data_027e0f74 + ldr r0, _020a3fbc ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] bl func_ov00_02097760 @@ -52830,7 +52830,7 @@ func_ov00_020a3f8c: ; 0x020a3f8c ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_020a3f8c -_020a3fbc: .word data_027e0f74 +_020a3fbc: .word gAdventureFlags .global func_ov00_020a3fc0 arm_func_start func_ov00_020a3fc0 @@ -55255,7 +55255,7 @@ func_ov00_020a5e9c: ; 0x020a5e9c bl func_ov00_02097628 cmp r0, #0 beq _020a5ed8 - ldr r0, _020a5ef0 ; =data_027e0f74 + ldr r0, _020a5ef0 ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] bl func_ov00_02097760 @@ -55272,7 +55272,7 @@ _020a5ed8: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_020a5e9c -_020a5ef0: .word data_027e0f74 +_020a5ef0: .word gAdventureFlags _020a5ef4: .word data_ov00_020e9e18 .global func_ov00_020a5ef8 @@ -55404,7 +55404,7 @@ func_ov00_020a602c: ; 0x020a602c ldr r1, [r4, #0x160] cmp r1, #0 ble _020a6064 - ldr r0, _020a6074 ; =data_027e0f74 + ldr r0, _020a6074 ; =gAdventureFlags mov r2, #1 ldr r0, [r0] bl func_ov00_0209779c @@ -55416,7 +55416,7 @@ _020a606c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020a602c -_020a6074: .word data_027e0f74 +_020a6074: .word gAdventureFlags .global func_ov00_020a6078 arm_func_start func_ov00_020a6078 @@ -55427,7 +55427,7 @@ func_ov00_020a6078: ; 0x020a6078 mov r5, #0 cmp r0, #0 ble _020a60c0 - ldr r4, _020a60c8 ; =data_027e0f74 + ldr r4, _020a60c8 ; =gAdventureFlags _020a6094: ldr r1, [r6, #0x15c] ldr r0, [r4] @@ -55445,7 +55445,7 @@ _020a60c0: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020a6078 -_020a60c8: .word data_027e0f74 +_020a60c8: .word gAdventureFlags .global func_ov00_020a60cc arm_func_start func_ov00_020a60cc diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index b3b84091..9b95bfff 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -150,7 +150,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index e2b81b9f..e9397616 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -824,7 +824,7 @@ _020b1e94: .word data_027e0c68 .global func_ov00_020b1e98 arm_func_start func_ov00_020b1e98 func_ov00_020b1e98: ; 0x020b1e98 - ldr r1, _020b1eb0 ; =data_027e0f74 + ldr r1, _020b1eb0 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] ldr ip, _020b1eb4 ; =func_ov00_02097b9c @@ -832,7 +832,7 @@ func_ov00_020b1e98: ; 0x020b1e98 bx ip .align 2, 0 arm_func_end func_ov00_020b1e98 -_020b1eb0: .word data_027e0f74 +_020b1eb0: .word gAdventureFlags _020b1eb4: .word func_ov00_02097b9c .global func_ov00_020b1eb8 @@ -1288,7 +1288,7 @@ _020b23e0: bl func_ov03_020f3f94 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _020b2498 ; =data_027e0f74 + ldr r0, _020b2498 ; =gAdventureFlags mov r1, #0x104 ldr r0, [r0] mov r2, #1 @@ -1325,7 +1325,7 @@ _020b2488: .word data_ov00_020eec68 _020b248c: .word 0x00000129 _020b2490: .word data_027e0f64 _020b2494: .word data_ov09_0211f5b4 -_020b2498: .word data_027e0f74 +_020b2498: .word gAdventureFlags _020b249c: .word 0x0000099a .global func_ov00_020b24a0 @@ -2061,7 +2061,7 @@ func_ov00_020b2e84: ; 0x020b2e84 ldr r1, [r4, #0x38] cmp r1, #0 blt _020b2ea4 - ldr r0, _020b2eb0 ; =data_027e0f74 + ldr r0, _020b2eb0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bcc _020b2ea4: @@ -2070,7 +2070,7 @@ _020b2ea4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020b2e84 -_020b2eb0: .word data_027e0f74 +_020b2eb0: .word gAdventureFlags .global func_ov00_020b2eb4 arm_func_start func_ov00_020b2eb4 @@ -2342,7 +2342,7 @@ _020b31cc: add r0, sp, #0x18 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _020b3274 ; =data_027e0f74 + ldr r0, _020b3274 ; =gAdventureFlags mvn r4, #0 mov r3, #0x19 ldr r0, [r0] @@ -2376,7 +2376,7 @@ _020b325c: _020b3268: .word data_027e0d38 _020b326c: .word data_027e077c _020b3270: .word data_027e0e60 -_020b3274: .word data_027e0f74 +_020b3274: .word gAdventureFlags .global func_ov00_020b3278 arm_func_start func_ov00_020b3278 @@ -2894,7 +2894,7 @@ _020b3968: strb r3, [sp, #0x22] strb r3, [sp, #0x23] ldrb r2, [r4, #0xa8] - ldr r0, _020b3d4c ; =data_027e0f74 + ldr r0, _020b3d4c ; =gAdventureFlags add r1, sp, #0x18 strb r2, [sp, #0x2e] strb r3, [r4, #0xa8] @@ -3130,7 +3130,7 @@ _020b3ce4: .align 2, 0 arm_func_end func_ov00_020b38dc _020b3d48: .word data_027e0d38 -_020b3d4c: .word data_027e0f74 +_020b3d4c: .word gAdventureFlags _020b3d50: .word data_02050f54 _020b3d54: .word 0xffffee66 _020b3d58: .word data_027e0618 @@ -5414,12 +5414,12 @@ _020b57a0: ldrb r0, [r6, #0x56] cmp r0, #0 bne _020b5a04 - ldr r0, _020b5c8c ; =data_027e0f74 + ldr r0, _020b5c8c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _020b5a04 - ldr r0, _020b5c8c ; =data_027e0f74 + ldr r0, _020b5c8c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -5739,7 +5739,7 @@ _020b5c68: _020b5c80: .word data_027e0fb8 _020b5c84: .word 0x0000071c _020b5c88: .word data_02050f54 -_020b5c8c: .word data_027e0f74 +_020b5c8c: .word gAdventureFlags _020b5c90: .word 0x00000ccd _020b5c94: .word data_027e0fc8 _020b5c98: .word data_027e0e60 @@ -9270,12 +9270,12 @@ _020b8970: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _020b8978: - ldr r0, _020b8b84 ; =data_027e0f74 + ldr r0, _020b8b84 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _020b8a04 - ldr r0, _020b8b84 ; =data_027e0f74 + ldr r0, _020b8b84 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -9415,7 +9415,7 @@ _020b8b70: _020b8b78: .word data_027e0618 _020b8b7c: .word data_027e0f90 _020b8b80: .word data_027e0f64 -_020b8b84: .word data_027e0f74 +_020b8b84: .word gAdventureFlags _020b8b88: .word gItemManager _020b8b8c: .word data_ov00_020e8b08 @@ -10006,12 +10006,12 @@ func_ov00_020b9330: ; 0x020b9330 add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, r6, r7, pc} _020b9384: - ldr r0, _020b9740 ; =data_027e0f74 + ldr r0, _020b9740 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _020b93b0 - ldr r0, _020b9740 ; =data_027e0f74 + ldr r0, _020b9740 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -10262,7 +10262,7 @@ _020b9738: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov00_020b9330 -_020b9740: .word data_027e0f74 +_020b9740: .word gAdventureFlags _020b9744: .word data_027e0c68 _020b9748: .word data_027e0fc8 _020b974c: .word data_027e0f94 @@ -11576,7 +11576,7 @@ _020ba8b8: addeq sp, sp, #0x24 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} - ldr r0, _020bac54 ; =data_027e0f74 + ldr r0, _020bac54 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -11804,7 +11804,7 @@ _020bac10: .align 2, 0 arm_func_end func_ov00_020ba874 _020bac50: .word data_027e0fc8 -_020bac54: .word data_027e0f74 +_020bac54: .word gAdventureFlags _020bac58: .word data_027e0c68 _020bac5c: .word data_ov00_020eec9c _020bac60: .word data_027e0f94 @@ -13266,7 +13266,7 @@ func_ov00_020bbbd0: ; 0x020bbbd0 cmp r0, #0 movne r6, #0 _020bbc00: - ldr r0, _020bbc60 ; =data_027e0f74 + ldr r0, _020bbc60 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -13292,7 +13292,7 @@ _020bbc00: arm_func_end func_ov00_020bbbd0 _020bbc58: .word data_027e0618 _020bbc5c: .word data_ov09_0211f5b4 -_020bbc60: .word data_027e0f74 +_020bbc60: .word gAdventureFlags _020bbc64: .word data_027e0c68 .global func_ov00_020bbc68 @@ -13649,7 +13649,7 @@ func_ov00_020bc0a8: ; 0x020bc0a8 addeq sp, sp, #0x18 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} - ldr r0, _020bc1b8 ; =data_027e0f74 + ldr r0, _020bc1b8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -13708,7 +13708,7 @@ _020bc114: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov00_020bc0a8 -_020bc1b8: .word data_027e0f74 +_020bc1b8: .word gAdventureFlags _020bc1bc: .word data_027e0fa0 _020bc1c0: .word data_ov00_020dc858 _020bc1c4: .word data_027e0fb8 @@ -14352,7 +14352,7 @@ _020bc95c: .word data_027e0e60 func_ov00_020bc960: ; 0x020bc960 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x18 - ldr r4, _020bca44 ; =data_027e0f74 + ldr r4, _020bca44 ; =gAdventureFlags mov r8, #0 mov r7, r0 sub lr, r8, #2 @@ -14374,7 +14374,7 @@ func_ov00_020bc960: ; 0x020bc960 bl func_ov00_02097738 cmp r0, #0 bne _020bca38 - ldr r0, _020bca44 ; =data_027e0f74 + ldr r0, _020bca44 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -14410,7 +14410,7 @@ _020bca38: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov00_020bc960 -_020bca44: .word data_027e0f74 +_020bca44: .word gAdventureFlags _020bca48: .word data_027e0fe4 .global func_ov00_020bca4c @@ -14649,7 +14649,7 @@ func_ov00_020bccc8: ; 0x020bccc8 add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _020bcda4 ; =data_027e0f74 + ldr r0, _020bcda4 ; =gAdventureFlags mvn ip, #0 mov r3, #1 ldr r0, [r0] @@ -14698,7 +14698,7 @@ _020bcd94: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020bccc8 -_020bcda4: .word data_027e0f74 +_020bcda4: .word gAdventureFlags _020bcda8: .word gItemManager _020bcdac: .word data_027e103c _020bcdb0: .word data_027e0d38 @@ -14712,7 +14712,7 @@ func_ov00_020bcdb8: ; 0x020bcdb8 bl func_ov00_020bbb64 cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _020bcde8 ; =data_027e0f74 + ldr r0, _020bcde8 ; =gAdventureFlags ldr r1, [r4, #0x38] ldr r0, [r0] bl func_ov00_02097bcc @@ -14721,7 +14721,7 @@ func_ov00_020bcdb8: ; 0x020bcdb8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020bcdb8 -_020bcde8: .word data_027e0f74 +_020bcde8: .word gAdventureFlags .global func_ov00_020bcdec arm_func_start func_ov00_020bcdec @@ -16492,7 +16492,7 @@ _020be338: _020be37c: cmp r4, #0 beq _020be39c - ldr r0, _020be408 ; =data_027e0f74 + ldr r0, _020be408 ; =gAdventureFlags mov r1, r4 ldr r0, [r0] bl func_ov00_02097760 @@ -16529,7 +16529,7 @@ _020be3e4: arm_func_end func_ov00_020be294 _020be400: .word data_027e0fc8 _020be404: .word data_027e0e60 -_020be408: .word data_027e0f74 +_020be408: .word gAdventureFlags .global func_ov00_020be40c arm_func_start func_ov00_020be40c diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index 35146f6d..3e59245d 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -110,7 +110,7 @@ .extern data_027e0f64 .extern data_027e0f6c .extern data_027e0f70 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f88 .extern data_027e0f90 diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index 84a7cf92..c9228372 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -10969,7 +10969,7 @@ func_ov00_020cc8dc: ; 0x020cc8dc arm_func_start func_ov00_020cc908 func_ov00_020cc908: ; 0x020cc908 stmdb sp!, {r4, lr} - ldr r2, _020cc924 ; =data_027e0f74 + ldr r2, _020cc924 ; =gAdventureFlags mov r4, r0 ldr r0, [r2] bl func_ov00_02097810 @@ -10977,7 +10977,7 @@ func_ov00_020cc908: ; 0x020cc908 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020cc908 -_020cc924: .word data_027e0f74 +_020cc924: .word gAdventureFlags .global func_ov00_020cc928 arm_func_start func_ov00_020cc928 @@ -10993,7 +10993,7 @@ func_ov00_020cc928: ; 0x020cc928 .global func_ov00_020cc940 arm_func_start func_ov00_020cc940 func_ov00_020cc940: ; 0x020cc940 - ldr r1, _020cc958 ; =data_027e0f74 + ldr r1, _020cc958 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] ldr ip, _020cc95c ; =func_ov00_02097b9c @@ -11001,13 +11001,13 @@ func_ov00_020cc940: ; 0x020cc940 bx ip .align 2, 0 arm_func_end func_ov00_020cc940 -_020cc958: .word data_027e0f74 +_020cc958: .word gAdventureFlags _020cc95c: .word func_ov00_02097b9c .global func_ov00_020cc960 arm_func_start func_ov00_020cc960 func_ov00_020cc960: ; 0x020cc960 - ldr r1, _020cc978 ; =data_027e0f74 + ldr r1, _020cc978 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] ldr ip, _020cc97c ; =func_ov00_02097bcc @@ -11015,21 +11015,21 @@ func_ov00_020cc960: ; 0x020cc960 bx ip .align 2, 0 arm_func_end func_ov00_020cc960 -_020cc978: .word data_027e0f74 +_020cc978: .word gAdventureFlags _020cc97c: .word func_ov00_02097bcc .global func_ov00_020cc980 arm_func_start func_ov00_020cc980 func_ov00_020cc980: ; 0x020cc980 stmdb sp!, {r3, lr} - ldr r1, _020cc9c0 ; =data_027e0f74 + ldr r1, _020cc9c0 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] ldr r1, [r2, #0x218] bl func_ov00_02097bac cmp r0, #0 beq _020cc9b8 - ldr r0, _020cc9c0 ; =data_027e0f74 + ldr r0, _020cc9c0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -11040,7 +11040,7 @@ _020cc9b8: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov00_020cc980 -_020cc9c0: .word data_027e0f74 +_020cc9c0: .word gAdventureFlags .global func_ov00_020cc9c4 arm_func_start func_ov00_020cc9c4 @@ -14741,7 +14741,7 @@ func_ov00_020cf678: ; 0x020cf678 ldrneb r0, [r0] cmpne r0, #0 beq _020cf6d4 - ldr r0, _020cf73c ; =data_027e0f74 + ldr r0, _020cf73c ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] bl func_ov00_02097760 @@ -14779,7 +14779,7 @@ _020cf734: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020cf678 -_020cf73c: .word data_027e0f74 +_020cf73c: .word gAdventureFlags _020cf740: .word data_027e077c _020cf744: .word data_02056be4 _020cf748: .word data_027e103c @@ -15339,7 +15339,7 @@ _020cfd28: mov r0, #0 ldmia sp!, {r3, pc} _020cfd50: - ldr r0, _020cfdcc ; =data_027e0f74 + ldr r0, _020cfdcc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -15373,7 +15373,7 @@ _020cfdb8: _020cfdc0: .word data_027e077c _020cfdc4: .word data_027e103c _020cfdc8: .word data_027e0d38 -_020cfdcc: .word data_027e0f74 +_020cfdcc: .word gAdventureFlags _020cfdd0: .word data_027e0c68 _020cfdd4: .word data_027e0e28 _020cfdd8: .word data_ov09_0211f5b4 @@ -18337,7 +18337,7 @@ _020d22d0: str r1, [r7, #0x58] ldmia sp!, {r3, r4, r5, r6, r7, pc} _020d22ec: - ldr r0, _020d27c8 ; =data_027e0f74 + ldr r0, _020d27c8 ; =gAdventureFlags ldr r1, [r6, #4] ldr r0, [r0] bl func_ov00_02097968 @@ -18680,7 +18680,7 @@ _020d27a8: _020d27bc: .word data_027e0c68 _020d27c0: .word data_027e0fe4 _020d27c4: .word data_ov00_020e8ae8 -_020d27c8: .word data_027e0f74 +_020d27c8: .word gAdventureFlags _020d27cc: .word data_ov00_020df28c _020d27d0: .word data_ov00_020df28c _020d27d4: .word data_027e0fc8 @@ -18866,7 +18866,7 @@ _020d2a0c: beq _020d2a8c add r0, sp, #0 bl func_ov00_0209a4f4 - ldr r0, _020d2b6c ; =data_027e0f74 + ldr r0, _020d2b6c ; =gAdventureFlags add r1, sp, #0 ldr r0, [r0] bl func_ov00_02097bdc @@ -18950,7 +18950,7 @@ _020d2b5c: .align 2, 0 arm_func_end func_ov00_020d29d4 _020d2b68: .word data_027e0f64 -_020d2b6c: .word data_027e0f74 +_020d2b6c: .word gAdventureFlags _020d2b70: .word data_027e0c68 _020d2b74: .word data_ov00_020e8ae8 @@ -19251,7 +19251,7 @@ func_ov00_020d2f08: ; 0x020d2f08 bne _020d2f84 add r0, sp, #0 bl func_ov00_0209a4f4 - ldr r0, _020d2fec ; =data_027e0f74 + ldr r0, _020d2fec ; =gAdventureFlags add r1, sp, #0 ldr r0, [r0] bl func_ov00_02097bdc @@ -19304,7 +19304,7 @@ _020d2fc4: .align 2, 0 arm_func_end func_ov00_020d2f08 _020d2fe8: .word data_027e0f64 -_020d2fec: .word data_027e0f74 +_020d2fec: .word gAdventureFlags .global func_ov00_020d2ff0 arm_func_start func_ov00_020d2ff0 @@ -19664,7 +19664,7 @@ _020d33d0: mov r1, #1 strb r2, [r4, #0x1b4] bl _ZN5Actor10SetUnk_11cEc - ldr r0, _020d34d0 ; =data_027e0f74 + ldr r0, _020d34d0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -19692,7 +19692,7 @@ _020d3414: mvnne r0, #0 strne r0, [sp, #4] ldr r1, [r4, #0x48] - ldr r0, _020d34d0 ; =data_027e0f74 + ldr r0, _020d34d0 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -19728,7 +19728,7 @@ _020d34b8: _020d34c4: .word data_027e0fc8 _020d34c8: .word data_027e0d38 _020d34cc: .word data_027e10a4 -_020d34d0: .word data_027e0f74 +_020d34d0: .word gAdventureFlags _020d34d4: .word data_027e0c68 .global func_ov00_020d34d8 @@ -19743,7 +19743,7 @@ func_ov00_020d34d8: ; 0x020d34d8 ldr r0, [r4, #0x30] cmp r0, #0 beq _020d350c - ldr r0, _020d3514 ; =data_027e0f74 + ldr r0, _020d3514 ; =gAdventureFlags ldr r1, [r4, #0x1bc] ldr r0, [r0] bl func_ov00_02097bcc @@ -19752,7 +19752,7 @@ _020d350c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov00_020d34d8 -_020d3514: .word data_027e0f74 +_020d3514: .word gAdventureFlags .global func_ov00_020d3518 arm_func_start func_ov00_020d3518 @@ -20227,7 +20227,7 @@ func_ov00_020d3a04: ; 0x020d3a04 _020d3a4c: cmp r5, #0 beq _020d3a6c - ldr r0, _020d3b08 ; =data_027e0f74 + ldr r0, _020d3b08 ; =gAdventureFlags mov r1, r5 ldr r0, [r0] bl func_ov00_02097760 @@ -20277,7 +20277,7 @@ _020d3afc: .align 2, 0 arm_func_end func_ov00_020d3a04 _020d3b04: .word data_027e0e60 -_020d3b08: .word data_027e0f74 +_020d3b08: .word gAdventureFlags _020d3b0c: .word data_027e0f90 _020d3b10: .word data_027e077c _020d3b14: .word data_027e0d38 @@ -20340,7 +20340,7 @@ _020d3b94: cmpeq r0, #6 ldmeqia sp!, {r4, pc} _020d3bc4: - ldr r0, _020d3c74 ; =data_027e0f74 + ldr r0, _020d3c74 ; =gAdventureFlags ldrh r1, [r4, #0x26] ldr r0, [r0] bl func_ov00_02097760 @@ -20390,7 +20390,7 @@ _020d3c50: arm_func_end func_ov00_020d3b6c _020d3c6c: .word data_027e0d38 _020d3c70: .word data_027e10a4 -_020d3c74: .word data_027e0f74 +_020d3c74: .word gAdventureFlags .global func_ov00_020d3c78 arm_func_start func_ov00_020d3c78 @@ -20843,7 +20843,7 @@ func_ov00_020d4134: ; 0x020d4134 mvnne r0, #0 strne r0, [sp, #4] ldr r1, [r5, #0x48] - ldr r0, _020d4238 ; =data_027e0f74 + ldr r0, _020d4238 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r5, #0x4c] ldr r0, [r0] @@ -20892,7 +20892,7 @@ _020d41f4: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020d4134 -_020d4238: .word data_027e0f74 +_020d4238: .word gAdventureFlags _020d423c: .word gItemManager .global func_ov00_020d4240 @@ -20907,7 +20907,7 @@ func_ov00_020d4240: ; 0x020d4240 ldrh r0, [r4, #0x22] cmp r0, #2 bne _020d4274 - ldr r0, _020d4284 ; =data_027e0f74 + ldr r0, _020d4284 ; =gAdventureFlags ldr r1, [r4, #0x160] ldr r0, [r0] bl func_ov00_02097bcc @@ -20918,7 +20918,7 @@ _020d4274: .align 2, 0 arm_func_end func_ov00_020d4240 _020d4280: .word data_027e0fc8 -_020d4284: .word data_027e0f74 +_020d4284: .word gAdventureFlags .global func_ov00_020d4288 arm_func_start func_ov00_020d4288 diff --git a/asm/ov02.inc b/asm/ov02.inc index 252d1a31..ffff038d 100644 --- a/asm/ov02.inc +++ b/asm/ov02.inc @@ -30,7 +30,7 @@ .extern data_027e0d44 .extern data_027e0d78 .extern data_027e0e60 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f88 .extern data_027e0f8c .extern data_027e0fbc diff --git a/asm/ov02.s b/asm/ov02.s index 50e485b7..5d0bc16b 100644 --- a/asm/ov02.s +++ b/asm/ov02.s @@ -455,7 +455,7 @@ _020ef310: mov r0, #0x27 str r0, [r5, #0x478] _020ef360: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x33 ldr r0, [r0] bl func_ov00_02097760 @@ -512,7 +512,7 @@ _020ef3f4: mov r0, #0x30 str r0, [r5, #0x5f8] _020ef438: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x76 ldr r0, [r0] bl func_ov00_02097760 @@ -533,7 +533,7 @@ _020ef438: mov r0, #0x34 str r0, [r5, #0x658] _020ef488: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x75 ldr r0, [r0] bl func_ov00_02097760 @@ -554,7 +554,7 @@ _020ef488: mov r0, #0x35 str r0, [r5, #0x6b8] _020ef4d8: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x77 ldr r0, [r0] bl func_ov00_02097760 @@ -575,7 +575,7 @@ _020ef4d8: mov r0, #0x36 str r0, [r5, #0x718] _020ef528: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x9b ldr r0, [r0] bl func_ov00_02097760 @@ -596,7 +596,7 @@ _020ef528: mov r0, #0x37 str r0, [r5, #0x778] _020ef578: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0xa5 ldr r0, [r0] bl func_ov00_02097760 @@ -686,7 +686,7 @@ _020ef67c: str r0, [r5, #0x8f8] b _020ef82c _020ef6d0: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0xb5 ldr r0, [r0] bl func_ov00_02097760 @@ -708,13 +708,13 @@ _020ef6d0: str r0, [r5, #0x8f8] b _020ef82c _020ef724: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags ldr r1, _020ef9a4 ; =0x00000123 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _020ef82c - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] bl func_ov00_02097760 @@ -735,7 +735,7 @@ _020ef724: mov r0, #0x18 str r0, [r5, #0xa18] _020ef78c: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x7e ldr r0, [r0] bl func_ov00_02097760 @@ -756,7 +756,7 @@ _020ef78c: mov r0, #0x17 str r0, [r5, #0x9b8] _020ef7dc: - ldr r0, _020ef9a0 ; =data_027e0f74 + ldr r0, _020ef9a0 ; =gAdventureFlags mov r1, #0x7f ldr r0, [r0] bl func_ov00_02097760 @@ -876,7 +876,7 @@ _020ef96c: arm_func_end func_ov02_020ef084 _020ef998: .word gItemManager _020ef99c: .word 0x91a2b3c5 -_020ef9a0: .word data_027e0f74 +_020ef9a0: .word gAdventureFlags _020ef9a4: .word 0x00000123 _020ef9a8: .word data_ov02_020f69e0 @@ -1379,7 +1379,7 @@ _020f0000: bl _ZNK11ItemManager7HasItemEi cmp r0, #0 bne _020f008c - ldr r0, _020f0724 ; =data_027e0f74 + ldr r0, _020f0724 ; =gAdventureFlags mov r1, #0xb5 ldr r0, [r0] bl func_ov00_02097760 @@ -1662,7 +1662,7 @@ _020f0474: add sb, sb, #1 cmp sb, #6 ble _020f0474 - ldr r0, _020f0724 ; =data_027e0f74 + ldr r0, _020f0724 ; =gAdventureFlags mov r1, #0xd4 ldr r0, [r0] bl func_ov00_02097760 @@ -1682,7 +1682,7 @@ _020f04d0: str r6, [sp] bl func_0203493c _020f04e0: - ldr r0, _020f0724 ; =data_027e0f74 + ldr r0, _020f0724 ; =gAdventureFlags mov r1, #0xd5 ldr r0, [r0] bl func_ov00_02097760 @@ -1702,7 +1702,7 @@ _020f0518: str r6, [sp] bl func_0203493c _020f0528: - ldr r0, _020f0724 ; =data_027e0f74 + ldr r0, _020f0724 ; =gAdventureFlags mov r1, #0xd6 ldr r0, [r0] bl func_ov00_02097760 @@ -1839,7 +1839,7 @@ _020f06e0: arm_func_end func_ov02_020eff70 _020f071c: .word data_ov09_0211f528 _020f0720: .word gItemManager -_020f0724: .word data_027e0f74 +_020f0724: .word gAdventureFlags _020f0728: .word 0x91a2b3c5 _020f072c: .word 0x88888889 _020f0730: .word data_027e0fbc @@ -2160,28 +2160,28 @@ func_ov02_020f0b3c: ; 0x020f0b3c cmp r0, #0 movne r4, #0x2f bne _020f0bcc - ldr r0, _020f0bd8 ; =data_027e0f74 + ldr r0, _020f0bd8 ; =gAdventureFlags mov r1, #0xa7 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r4, #0x2e bne _020f0bcc - ldr r0, _020f0bd8 ; =data_027e0f74 + ldr r0, _020f0bd8 ; =gAdventureFlags mov r1, #0xa4 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r4, #0x2d bne _020f0bcc - ldr r0, _020f0bd8 ; =data_027e0f74 + ldr r0, _020f0bd8 ; =gAdventureFlags mov r1, #0xa3 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r4, #0x2c bne _020f0bcc - ldr r0, _020f0bd8 ; =data_027e0f74 + ldr r0, _020f0bd8 ; =gAdventureFlags mov r1, #0xa2 ldr r0, [r0] bl func_ov00_02097760 @@ -2193,7 +2193,7 @@ _020f0bcc: .align 2, 0 arm_func_end func_ov02_020f0b3c _020f0bd4: .word gItemManager -_020f0bd8: .word data_027e0f74 +_020f0bd8: .word gAdventureFlags .global func_ov02_020f0bdc arm_func_start func_ov02_020f0bdc diff --git a/asm/ov03.inc b/asm/ov03.inc index 73f63b8d..c101437d 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -47,7 +47,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f7c .extern data_027e0f84 .extern data_027e0f88 diff --git a/asm/ov03.s b/asm/ov03.s index 442a9139..ea8a27a5 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -4429,12 +4429,12 @@ _020f128c: ldr r0, [r4, #4] cmp r0, #0 bne _020f1350 - ldr r0, _020f139c ; =data_027e0f74 + ldr r0, _020f139c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _020f1350 - ldr r0, _020f139c ; =data_027e0f74 + ldr r0, _020f139c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -4500,7 +4500,7 @@ _020f135c: arm_func_end func_ov03_020f125c _020f1394: .word data_027e077c _020f1398: .word data_027e103c -_020f139c: .word data_027e0f74 +_020f139c: .word gAdventureFlags _020f13a0: .word data_027e0c68 _020f13a4: .word data_027e0e28 _020f13a8: .word data_027e0fc8 @@ -5197,7 +5197,7 @@ func_ov03_020f1d04: ; 0x020f1d04 cmp r4, #0 mov r4, #1 bne _020f1da8 - ldr r0, _020f1db4 ; =data_027e0f74 + ldr r0, _020f1db4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -5233,7 +5233,7 @@ _020f1da8: .align 2, 0 arm_func_end func_ov03_020f1d04 _020f1db0: .word data_027e0d38 -_020f1db4: .word data_027e0f74 +_020f1db4: .word gAdventureFlags _020f1db8: .word data_027e0c68 _020f1dbc: .word data_027e0e28 _020f1dc0: .word data_ov09_0211f5b4 @@ -5683,7 +5683,7 @@ func_ov03_020f2294: ; 0x020f2294 bl func_ov03_020f26bc cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _020f2314 ; =data_027e0f74 + ldr r0, _020f2314 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -5713,7 +5713,7 @@ _020f22d0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov03_020f2294 -_020f2314: .word data_027e0f74 +_020f2314: .word gAdventureFlags _020f2318: .word data_027e0f90 _020f231c: .word data_027e103c _020f2320: .word 0x0000019f @@ -5726,7 +5726,7 @@ func_ov03_020f2324: ; 0x020f2324 bl func_ov03_020f26bc cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _020f23a4 ; =data_027e0f74 + ldr r0, _020f23a4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -5756,7 +5756,7 @@ _020f2360: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov03_020f2324 -_020f23a4: .word data_027e0f74 +_020f23a4: .word gAdventureFlags _020f23a8: .word data_027e0f90 _020f23ac: .word data_027e103c _020f23b0: .word 0x0000019f @@ -8350,13 +8350,13 @@ func_ov03_020f3cd0: ; 0x020f3cd0 stmdb sp!, {r3, lr} cmp r0, #2 bne _020f3d4c - ldr r0, _020f3d54 ; =data_027e0f74 + ldr r0, _020f3d54 ; =gAdventureFlags mov r1, #0x2b ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _020f3d0c - ldr r0, _020f3d54 ; =data_027e0f74 + ldr r0, _020f3d54 ; =gAdventureFlags mov r1, #0xa7 ldr r0, [r0] bl func_ov00_02097760 @@ -8366,7 +8366,7 @@ _020f3d0c: mov r0, #0 ldmia sp!, {r3, pc} _020f3d14: - ldr r0, _020f3d54 ; =data_027e0f74 + ldr r0, _020f3d54 ; =gAdventureFlags mov r1, #0xb4 ldr r0, [r0] bl func_ov00_02097760 @@ -8385,7 +8385,7 @@ _020f3d4c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov03_020f3cd0 -_020f3d54: .word data_027e0f74 +_020f3d54: .word gAdventureFlags _020f3d58: .word data_027e0d38 .global func_ov03_020f3d5c @@ -12242,7 +12242,7 @@ _020f5ee8: .word data_027e0c38 arm_func_start func_ov03_020f5eec func_ov03_020f5eec: ; 0x020f5eec stmdb sp!, {r4, r5, r6, lr} - ldr r1, _020f6150 ; =data_027e0f74 + ldr r1, _020f6150 ; =gAdventureFlags mov r6, r0 ldr r0, [r1] bl func_ov00_02097738 @@ -12408,7 +12408,7 @@ _020f6140: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov03_020f5eec -_020f6150: .word data_027e0f74 +_020f6150: .word gAdventureFlags _020f6154: .word gItemManager _020f6158: .word data_027e0e28 _020f615c: .word 0x00001388 @@ -12455,7 +12455,7 @@ func_ov03_020f6190: ; 0x020f6190 ldr r0, [r4, #0x20] cmp r0, #0x3c bge _020f61ec - ldr r0, _020f61fc ; =data_027e0f74 + ldr r0, _020f61fc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -12470,7 +12470,7 @@ _020f61ec: arm_func_end func_ov03_020f6190 _020f61f4: .word data_027e0618 _020f61f8: .word data_027e103c -_020f61fc: .word data_027e0f74 +_020f61fc: .word gAdventureFlags .global func_ov03_020f6200 arm_func_start func_ov03_020f6200 @@ -13316,7 +13316,7 @@ _020f6bc8: bl func_0203493c b _020f6cfc _020f6c88: - ldr r0, _020f6d30 ; =data_027e0f74 + ldr r0, _020f6d30 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -13340,7 +13340,7 @@ _020f6c88: bl func_0203493c b _020f6cfc _020f6ce4: - ldr r0, _020f6d30 ; =data_027e0f74 + ldr r0, _020f6d30 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -13362,7 +13362,7 @@ _020f6cfc: arm_func_end func_ov03_020f6b18 _020f6d28: .word data_027e0d38 _020f6d2c: .word data_02050f54 -_020f6d30: .word data_027e0f74 +_020f6d30: .word gAdventureFlags .global func_ov03_020f6d34 arm_func_start func_ov03_020f6d34 @@ -13515,7 +13515,7 @@ func_ov03_020f6ef8: ; 0x020f6ef8 cmp r0, #0 addgt sp, sp, #0x10 ldmgtia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _020f6ffc ; =data_027e0f74 + ldr r0, _020f6ffc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -13570,7 +13570,7 @@ _020f6f58: arm_func_end func_ov03_020f6ef8 _020f6ff4: .word data_027e077c _020f6ff8: .word data_027e0db0 -_020f6ffc: .word data_027e0f74 +_020f6ffc: .word gAdventureFlags _020f7000: .word data_027e0f90 _020f7004: .word data_027e0cbc _020f7008: .word data_027e0c38 @@ -14300,7 +14300,7 @@ _020f786c: ble _020f7808 cmp r8, #2 bne _020f7908 - ldr r0, _020f7bbc ; =data_027e0f74 + ldr r0, _020f7bbc ; =gAdventureFlags mov r1, #0xb7 ldr r0, [r0] bl func_ov00_02097760 @@ -14353,7 +14353,7 @@ _020f7908: mov r0, #1 orr r1, r1, #0x1000 ldr fp, _020f7bb0 ; =data_027e0d3c - ldr sl, _020f7bbc ; =data_027e0f74 + ldr sl, _020f7bbc ; =gAdventureFlags ldr r4, _020f7bb8 ; =data_027e0f7c str r1, [sp, #0x28] str r0, [sp, #0x20] @@ -14525,7 +14525,7 @@ _020f7bac: .word data_027e1054 _020f7bb0: .word data_027e0d3c _020f7bb4: .word data_027e0e60 _020f7bb8: .word data_027e0f7c -_020f7bbc: .word data_027e0f74 +_020f7bbc: .word gAdventureFlags _020f7bc0: .word data_027e0618 _020f7bc4: .word data_027e0d38 _020f7bc8: .word data_027e077c @@ -16451,7 +16451,7 @@ _020f91c0: blt _020f8f9c _020f91d4: ldr r4, _020f92ec ; =gItemManager - ldr sl, _020f92fc ; =data_027e0f74 + ldr sl, _020f92fc ; =gAdventureFlags mov r8, r7 add sb, r7, #0x20 mov r5, #0 @@ -16534,7 +16534,7 @@ _020f92ec: .word gItemManager _020f92f0: .word data_027e0f7c _020f92f4: .word data_027e0d38 _020f92f8: .word data_ov00_020eec9c -_020f92fc: .word data_027e0f74 +_020f92fc: .word gAdventureFlags _020f9300: .word 0x0000015f .global func_ov03_020f9304 @@ -16680,7 +16680,7 @@ func_ov03_020f9468: ; 0x020f9468 orr r1, r1, #0x1000 ldr r5, _020f9a64 ; =data_027e0f7c ldr r4, _020f9a68 ; =data_027e0d3c - ldr r6, _020f9a6c ; =data_027e0f74 + ldr r6, _020f9a6c ; =gAdventureFlags str r1, [sp, #0x5c] str r0, [sp, #0x54] mov sl, #0 @@ -17067,7 +17067,7 @@ _020f9a5c: .word data_027e0618 _020f9a60: .word data_027e0d38 _020f9a64: .word data_027e0f7c _020f9a68: .word data_027e0d3c -_020f9a6c: .word data_027e0f74 +_020f9a6c: .word gAdventureFlags _020f9a70: .word data_027e0c38 _020f9a74: .word gItemManager _020f9a78: .word data_ov03_020ff634 @@ -17155,7 +17155,7 @@ _020f9ab0: mov r2, #0x19 mov r3, #0x28 bl func_ov03_020f9db8 - ldr r0, _020f9db4 ; =data_027e0f74 + ldr r0, _020f9db4 ; =gAdventureFlags mov r1, #0x32 ldr r0, [r0] bl func_ov00_02097760 @@ -17286,7 +17286,7 @@ _020f9c24: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov03_020f9a7c -_020f9db4: .word data_027e0f74 +_020f9db4: .word gAdventureFlags .global func_ov03_020f9db8 arm_func_start func_ov03_020f9db8 @@ -19453,10 +19453,10 @@ _020fb194: ldr r2, [r2, #0x10] blx r2 _020fb1a4: - ldr r0, _020fb250 ; =data_027e0f74 + ldr r0, _020fb250 ; =gAdventureFlags ldr r0, [r0] bl func_ov05_02101ae8 - ldr r0, _020fb250 ; =data_027e0f74 + ldr r0, _020fb250 ; =gAdventureFlags ldr r0, [r0] bl func_ov05_02101af8 ldrb r0, [r4, #0x54] @@ -19499,7 +19499,7 @@ _020fb208: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov03_020fb148 -_020fb250: .word data_027e0f74 +_020fb250: .word gAdventureFlags _020fb254: .word data_027e071c .global func_ov03_020fb258 @@ -19979,7 +19979,7 @@ func_ov03_020fb5cc: ; 0x020fb5cc add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _020fb650 ; =data_027e0f74 + ldr r0, _020fb650 ; =gAdventureFlags mvn ip, #0 mov r3, #0x64 ldr r0, [r0] @@ -19997,7 +19997,7 @@ func_ov03_020fb5cc: ; 0x020fb5cc ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov03_020fb5cc -_020fb650: .word data_027e0f74 +_020fb650: .word gAdventureFlags .global func_ov03_020fb654 arm_func_start func_ov03_020fb654 @@ -20017,7 +20017,7 @@ func_ov03_020fb654: ; 0x020fb654 add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _020fb6d0 ; =data_027e0f74 + ldr r0, _020fb6d0 ; =gAdventureFlags mvn ip, #0 mov r3, #0x64 ldr r0, [r0] @@ -20035,7 +20035,7 @@ func_ov03_020fb654: ; 0x020fb654 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov03_020fb654 -_020fb6d0: .word data_027e0f74 +_020fb6d0: .word gAdventureFlags .global func_ov03_020fb6d4 arm_func_start func_ov03_020fb6d4 @@ -20251,13 +20251,13 @@ _020fb9a4: strb r0, [r4, #0x1bc] ldmia sp!, {r4, pc} _020fb9b4: - ldr r0, _020fbb04 ; =data_027e0f74 + ldr r0, _020fbb04 ; =gAdventureFlags ldr r1, [r4, #0x1cc] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _020fb9e4 - ldr r0, _020fbb04 ; =data_027e0f74 + ldr r0, _020fbb04 ; =gAdventureFlags ldr r1, [r4, #0x1cc] ldr r0, [r0] bl func_ov00_02097bcc @@ -20346,7 +20346,7 @@ _020fbaf0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov03_020fb970 -_020fbb04: .word data_027e0f74 +_020fbb04: .word gAdventureFlags _020fbb08: .word data_027e0d38 _020fbb0c: .word data_ov00_020eec68 _020fbb10: .word data_ov00_020eec9c @@ -20450,13 +20450,13 @@ _020fbc30: mov r0, r4 mov r1, #6 bl func_ov03_020fb970 - ldr r0, _020fbca4 ; =data_027e0f74 + ldr r0, _020fbca4 ; =gAdventureFlags ldr r1, [r4, #0x1cc] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _020fbca4 ; =data_027e0f74 + ldr r0, _020fbca4 ; =gAdventureFlags ldr r1, [r4, #0x1cc] ldr r0, [r0] bl func_ov00_02097bcc @@ -20473,7 +20473,7 @@ _020fbc98: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov03_020fbb34 -_020fbca4: .word data_027e0f74 +_020fbca4: .word gAdventureFlags .global func_ov03_020fbca8 arm_func_start func_ov03_020fbca8 @@ -20693,7 +20693,7 @@ func_ov03_020fbef0: ; 0x020fbef0 beq _020fbf20 b _020fbf2c _020fbf0c: - ldr r0, _020fbf34 ; =data_027e0f74 + ldr r0, _020fbf34 ; =gAdventureFlags mov r1, #0x56 ldr r0, [r0] bl func_ov00_02097760 @@ -20707,7 +20707,7 @@ _020fbf2c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov03_020fbef0 -_020fbf34: .word data_027e0f74 +_020fbf34: .word gAdventureFlags .global func_ov03_020fbf38 arm_func_start func_ov03_020fbf38 diff --git a/asm/ov04.inc b/asm/ov04.inc index 9093004d..63d8c7c4 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -70,7 +70,7 @@ .extern data_027e0f68 .extern data_027e0f6c .extern data_027e0f70 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f7c .extern data_027e0f90 diff --git a/asm/ov04.s b/asm/ov04.s index 1b177bdf..48999851 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -131,7 +131,7 @@ func_ov04_02100bcc: ; 0x02100bcc cmp r0, #2 bne _02100c34 mov r5, #0 - ldr r4, _02100c60 ; =data_027e0f74 + ldr r4, _02100c60 ; =gAdventureFlags ldr r6, _02100c64 ; =0x0000012a add r7, r5, #0 _02100bf0: @@ -142,7 +142,7 @@ _02100bf0: add r5, r5, #1 cmp r5, #4 blt _02100bf0 - ldr r0, _02100c60 ; =data_027e0f74 + ldr r0, _02100c60 ; =gAdventureFlags mov r1, #0x94 ldr r0, [r0] blx func_ov00_02097760 @@ -153,7 +153,7 @@ _02100bf0: ldrb r4, [r0] cmp r4, #0 ble _02100c2c - ldr r6, _02100c60 ; =data_027e0f74 + ldr r6, _02100c60 ; =gAdventureFlags ldr r7, _02100c64 ; =0x0000012a _02100c1c: ldr r0, [r6] @@ -181,7 +181,7 @@ _02100c34: nop thumb_func_end func_ov04_02100bcc _02100c5c: .word data_027e0618 -_02100c60: .word data_027e0f74 +_02100c60: .word gAdventureFlags _02100c64: .word 0x0000012a _02100c68: .word data_ov00_020ec678 @@ -3428,7 +3428,7 @@ func_ov04_021024c4: ; 0x021024c4 ldr r0, [r4, #8] cmp r0, #1 bne _02102578 - ldr r0, _021025d0 ; =data_027e0f74 + ldr r0, _021025d0 ; =gAdventureFlags add r1, r4, #0 ldr r0, [r0] bl func_ov04_0210455c @@ -3473,7 +3473,7 @@ _021025c0: .word data_027e0fe4 _021025c4: .word data_027e0d38 _021025c8: .word data_027e0f70 _021025cc: .word data_027e0f68 -_021025d0: .word data_027e0f74 +_021025d0: .word gAdventureFlags _021025d4: .word 0x414e4353 .global func_ov04_021025d8 @@ -7280,7 +7280,7 @@ _0210449c: thumb_func_start func_ov04_021044a8 func_ov04_021044a8: ; 0x021044a8 push {r3, lr} - ldr r0, _021044cc ; =data_027e0f74 + ldr r0, _021044cc ; =gAdventureFlags ldr r0, [r0] cmp r0, #0 bne _021044ca @@ -7293,20 +7293,20 @@ func_ov04_021044a8: ; 0x021044a8 beq _021044c6 bl func_ov04_0210441c _021044c6: - ldr r1, _021044cc ; =data_027e0f74 + ldr r1, _021044cc ; =gAdventureFlags str r0, [r1] _021044ca: pop {r3, pc} .align 2, 0 thumb_func_end func_ov04_021044a8 -_021044cc: .word data_027e0f74 +_021044cc: .word gAdventureFlags _021044d0: .word data_027e0ce0 .global func_ov04_021044d4 thumb_func_start func_ov04_021044d4 func_ov04_021044d4: ; 0x021044d4 push {r4, lr} - ldr r0, _021044f4 ; =data_027e0f74 + ldr r0, _021044f4 ; =gAdventureFlags ldr r4, [r0] cmp r4, #0 beq _021044f2 @@ -7316,14 +7316,14 @@ func_ov04_021044d4: ; 0x021044d4 add r0, r4, #0 blx _ZN9SysObjectdlEPv _021044ec: - ldr r0, _021044f4 ; =data_027e0f74 + ldr r0, _021044f4 ; =gAdventureFlags mov r1, #0 str r1, [r0] _021044f2: pop {r4, pc} .align 2, 0 thumb_func_end func_ov04_021044d4 -_021044f4: .word data_027e0f74 +_021044f4: .word gAdventureFlags .global func_ov04_021044f8 thumb_func_start func_ov04_021044f8 @@ -7539,7 +7539,7 @@ _02104682: ldr r3, [r0, #4] orr r1, r3 str r1, [r0, #4] - ldr r0, _021046c4 ; =data_027e0f74 + ldr r0, _021046c4 ; =gAdventureFlags add r1, r4, #0 ldr r0, [r0] blx func_ov00_02097a44 @@ -7556,7 +7556,7 @@ _021046b6: thumb_func_end func_ov04_0210455c _021046bc: .word data_027e0e60 _021046c0: .word data_ov00_020eab04 -_021046c4: .word data_027e0f74 +_021046c4: .word gAdventureFlags .global func_ov04_021046c8 thumb_func_start func_ov04_021046c8 @@ -7675,7 +7675,7 @@ _02104778: ldr r1, [r0, #0xc] cmp r1, #0x21 beq _021047a2 - ldr r0, _0210498c ; =data_027e0f74 + ldr r0, _0210498c ; =gAdventureFlags ldr r0, [r0] blx func_ov00_02097c38 cmp r0, #0 @@ -7846,7 +7846,7 @@ _021048cc: strb r1, [r0, #3] str r1, [r0, #4] str r1, [r0, #8] - ldr r0, _0210498c ; =data_027e0f74 + ldr r0, _0210498c ; =gAdventureFlags ldr r1, [sp] ldr r0, [r0] bl func_ov04_021044f8 @@ -7909,7 +7909,7 @@ _02104920: thumb_func_end func_ov04_021046dc _02104984: .word data_027e0d38 _02104988: .word data_027e0618 -_0210498c: .word data_027e0f74 +_0210498c: .word gAdventureFlags _02104990: .word data_027e0c54 _02104994: .word data_027e06d8 _02104998: .word data_02075dac @@ -7977,7 +7977,7 @@ _02104a3c: ldr r0, _02104ae4 ; =data_027e0f64 ldr r0, [r0] bl func_ov04_02103740 - ldr r0, _02104ae8 ; =data_027e0f74 + ldr r0, _02104ae8 ; =gAdventureFlags ldr r0, [r0] bl func_ov04_0210453c bl func_ov04_0210bd28 @@ -8023,7 +8023,7 @@ _02104ad8: .word data_ov00_020ee734 _02104adc: .word data_027e0f68 _02104ae0: .word data_027e0e60 _02104ae4: .word data_027e0f64 -_02104ae8: .word data_027e0f74 +_02104ae8: .word gAdventureFlags _02104aec: .word data_027e0fe4 _02104af0: .word data_027e0c68 _02104af4: .word data_027e103c @@ -9049,18 +9049,18 @@ _021052b6: bl func_ov03_020f3d5c cmp r0, #0 bne _021052ec - ldr r0, _02105314 ; =data_027e0f74 + ldr r0, _02105314 ; =gAdventureFlags mov r1, #0xe8 ldr r0, [r0] mov r2, #0 blx func_ov00_0209779c _021052ec: - ldr r0, _02105314 ; =data_027e0f74 + ldr r0, _02105314 ; =gAdventureFlags mov r1, #0x56 ldr r0, [r0] mov r2, #0 blx func_ov00_0209779c - ldr r0, _02105314 ; =data_027e0f74 + ldr r0, _02105314 ; =gAdventureFlags mov r1, #0x9e ldr r0, [r0] mov r2, #0 @@ -9073,7 +9073,7 @@ _02105304: _02105308: .word 0x7fffffff _0210530c: .word data_027e0618 _02105310: .word data_027e0dbc -_02105314: .word data_027e0f74 +_02105314: .word gAdventureFlags .global func_ov04_02105318 thumb_func_start func_ov04_02105318 @@ -9299,7 +9299,7 @@ func_ov04_021054a4: ; 0x021054a4 bne _021054d8 add r0, #0x20 strh r0, [r5] - ldr r0, _02105540 ; =data_027e0f74 + ldr r0, _02105540 ; =gAdventureFlags ldr r1, [r6, #0xc] ldr r0, [r0] blx func_ov00_02097c80 @@ -9359,7 +9359,7 @@ _0210553a: pop {r3, r4, r5, r6, r7, pc} nop thumb_func_end func_ov04_021054a4 -_02105540: .word data_027e0f74 +_02105540: .word gAdventureFlags _02105544: .word data_027e0d38 _02105548: .word data_027e0ce0 @@ -14653,7 +14653,7 @@ _02107cca: ldr r0, [sp] cmp r0, #0 beq _02107cde - ldr r0, _02107e04 ; =data_027e0f74 + ldr r0, _02107e04 ; =gAdventureFlags ldr r1, [r4, #0x18] ldr r0, [r0] blx func_ov00_02097cb0 @@ -14822,7 +14822,7 @@ _02107df4: _02107df8: .word 0x00007fff _02107dfc: .word data_027e0d38 _02107e00: .word data_027e0618 -_02107e04: .word data_027e0f74 +_02107e04: .word gAdventureFlags _02107e08: .word data_027e0ce0 .global func_ov04_02107e0c @@ -15154,7 +15154,7 @@ func_ov04_02108078: ; 0x02108078 cmp r4, #0x15 bge _021080a0 ldr r1, _02108270 ; =data_027e0d38 - ldr r0, _02108274 ; =data_027e0f74 + ldr r0, _02108274 ; =gAdventureFlags ldr r1, [r1] ldr r0, [r0] ldr r1, [r1, #0x18] @@ -15240,7 +15240,7 @@ _02108120: cmp r4, #0x15 bge _0210813a ldr r1, _02108270 ; =data_027e0d38 - ldr r0, _02108274 ; =data_027e0f74 + ldr r0, _02108274 ; =gAdventureFlags ldr r1, [r1] ldr r0, [r0] ldr r1, [r1, #0x18] @@ -15403,7 +15403,7 @@ _02108268: nop thumb_func_end func_ov04_02108078 _02108270: .word data_027e0d38 -_02108274: .word data_027e0f74 +_02108274: .word gAdventureFlags _02108278: .word data_ov00_020e9360 _0210827c: .word func_ov04_02108060 _02108280: .word data_027e01b8 @@ -18748,7 +18748,7 @@ _02109c70: mvn r0, r0 cmp r2, r0 beq _02109d32 - ldr r0, _02109d9c ; =data_027e0f74 + ldr r0, _02109d9c ; =gAdventureFlags add r1, r2, #0 ldr r0, [r0] blx func_ov00_02097cc8 @@ -18882,7 +18882,7 @@ _02109d8c: .word data_027e0f7c _02109d90: .word data_ov00_020eec68 _02109d94: .word data_ov00_020eec9c _02109d98: .word data_027e0618 -_02109d9c: .word data_027e0f74 +_02109d9c: .word gAdventureFlags _02109da0: .word data_027e0ffc _02109da4: .word data_027e101c _02109da8: .word data_ov00_020eec64 @@ -23845,7 +23845,7 @@ _0210c370: ldrb r0, [r0, #0x15] strb r0, [r2, #0x1d] beq _0210c3c4 - ldr r0, _0210c3f8 ; =data_027e0f74 + ldr r0, _0210c3f8 ; =gAdventureFlags ldr r0, [r0] blx func_ov00_02097ce0 add r1, r0, #0 @@ -23875,7 +23875,7 @@ _0210c3e8: .word 0x00000440 _0210c3ec: .word data_027e0f6c _0210c3f0: .word data_027e103c _0210c3f4: .word data_027e0d38 -_0210c3f8: .word data_027e0f74 +_0210c3f8: .word gAdventureFlags .global func_ov04_0210c3fc thumb_func_start func_ov04_0210c3fc @@ -23974,7 +23974,7 @@ func_ov04_0210c3fc: ; 0x0210c3fc add r1, sp, #4 bl func_ov04_02106970 _0210c4d0: - ldr r0, _0210c528 ; =data_027e0f74 + ldr r0, _0210c528 ; =gAdventureFlags ldrb r3, [r5, #0x13] ldr r0, [r0] ldr r2, [r6] @@ -24002,13 +24002,13 @@ _0210c518: .word data_027e0618 _0210c51c: .word data_ov09_0211f5b4 _0210c520: .word data_ov09_0211f530 _0210c524: .word data_ov00_020e9370 -_0210c528: .word data_027e0f74 +_0210c528: .word gAdventureFlags .global func_ov04_0210c52c thumb_func_start func_ov04_0210c52c func_ov04_0210c52c: ; 0x0210c52c push {r4, lr} - ldr r0, _0210c5a0 ; =data_027e0f74 + ldr r0, _0210c5a0 ; =gAdventureFlags ldr r0, [r0] blx func_ov00_02097684 ldr r0, _0210c5a4 ; =data_027e0618 @@ -24057,7 +24057,7 @@ _0210c552: pop {r4, pc} .align 2, 0 thumb_func_end func_ov04_0210c52c -_0210c5a0: .word data_027e0f74 +_0210c5a0: .word gAdventureFlags _0210c5a4: .word data_027e0618 _0210c5a8: .word data_ov09_0211f530 _0210c5ac: .word data_ov09_0211f5b4 diff --git a/asm/ov05.inc b/asm/ov05.inc index c361214b..15404348 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -159,7 +159,7 @@ .extern data_027e0f68 .extern data_027e0f6c .extern data_027e0f70 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f7c .extern data_027e0f88 diff --git a/asm/ov05.s b/asm/ov05.s index ed87b038..37433bff 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -1955,7 +1955,7 @@ _02102498: movne r1, r8 cmp r1, #0 beq _02102544 - ldr r0, _021026bc ; =data_027e0f74 + ldr r0, _021026bc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -2055,10 +2055,10 @@ _02102678: cmp r6, #0 cmpeq r8, #0 bne _0210269c - ldr r0, _021026bc ; =data_027e0f74 + ldr r0, _021026bc ; =gAdventureFlags ldr r0, [r0] bl func_ov05_02101ae8 - ldr r0, _021026bc ; =data_027e0f74 + ldr r0, _021026bc ; =gAdventureFlags ldr r0, [r0] bl func_ov05_02101af8 _0210269c: @@ -2072,7 +2072,7 @@ _021026ac: .word data_ov00_020ec7dc _021026b0: .word data_027e0d38 _021026b4: .word data_027e0e5c _021026b8: .word data_027e0c54 -_021026bc: .word data_027e0f74 +_021026bc: .word gAdventureFlags _021026c0: .word data_027e1038 _021026c4: .word data_027e0ff8 _021026c8: .word data_027e071c @@ -3706,7 +3706,7 @@ func_ov05_02103bb0: ; 0x02103bb0 arm_func_start func_ov05_02103bc8 func_ov05_02103bc8: ; 0x02103bc8 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _02103c64 ; =data_027e0f74 + ldr r1, _02103c64 ; =gAdventureFlags mov r5, r0 ldr r0, [r1] mov r4, r2 @@ -3748,7 +3748,7 @@ _02103c20: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov05_02103bc8 -_02103c64: .word data_027e0f74 +_02103c64: .word gAdventureFlags _02103c68: .word data_027e0618 .global func_ov05_02103c6c @@ -4763,7 +4763,7 @@ _0210481c: add sp, sp, #0x34 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} _0210485c: - ldr r0, _02104a30 ; =data_027e0f74 + ldr r0, _02104a30 ; =gAdventureFlags ldr r1, _02104a34 ; =0x0000015f ldr r0, [r0] bl func_ov00_02097760 @@ -4783,7 +4783,7 @@ _0210485c: str r4, [sp] bl func_ov05_02104744 _021048a8: - ldr r0, _02104a30 ; =data_027e0f74 + ldr r0, _02104a30 ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] bl func_ov00_02097760 @@ -4836,7 +4836,7 @@ _0210493c: cmp r0, #0 addne sp, sp, #0x34 ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _02104a30 ; =data_027e0f74 + ldr r0, _02104a30 ; =gAdventureFlags ldr r1, _02104a44 ; =0x00000125 ldr r0, [r0] bl func_ov00_02097760 @@ -4886,7 +4886,7 @@ _02104a04: arm_func_end func_ov05_021047c8 _02104a28: .word data_027e1054 _02104a2c: .word data_027e0d3c -_02104a30: .word data_027e0f74 +_02104a30: .word gAdventureFlags _02104a34: .word 0x0000015f _02104a38: .word gItemManager _02104a3c: .word data_027e0f7c @@ -5150,7 +5150,7 @@ func_ov05_02104d74: ; 0x02104d74 cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} - ldr r0, _02104e40 ; =data_027e0f74 + ldr r0, _02104e40 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -5196,7 +5196,7 @@ _02104e0c: .align 2, 0 arm_func_end func_ov05_02104d74 _02104e3c: .word data_027e0fc8 -_02104e40: .word data_027e0f74 +_02104e40: .word gAdventureFlags _02104e44: .word data_027e0f64 _02104e48: .word data_027e0f94 _02104e4c: .word data_027e0de4 @@ -5436,7 +5436,7 @@ func_ov05_02105140: ; 0x02105140 ldr r0, [r0] bl func_ov30_0218411c _021051b8: - ldr r0, _021052f8 ; =data_027e0f74 + ldr r0, _021052f8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -5527,7 +5527,7 @@ _021052e8: .word data_027e0d38 _021052ec: .word gOverlayManager _021052f0: .word 0x0000001e _021052f4: .word data_027e10b4 -_021052f8: .word data_027e0f74 +_021052f8: .word gAdventureFlags _021052fc: .word data_027e0c68 _02105300: .word data_027e077c @@ -9909,7 +9909,7 @@ func_ov05_02108e8c: ; 0x02108e8c ldmneia sp!, {r4, pc} bl func_ov05_021071f8 mov r1, #0 - ldr r2, _02108f30 ; =data_027e0f74 + ldr r2, _02108f30 ; =gAdventureFlags strh r1, [r0, #0x32] ldr r0, [r2] mov r3, r1 @@ -9939,7 +9939,7 @@ _02108ee8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov05_02108e8c -_02108f30: .word data_027e0f74 +_02108f30: .word gAdventureFlags _02108f34: .word data_027e071c .global func_ov05_02108f38 @@ -10215,7 +10215,7 @@ _021092f8: ldr r0, [r5, #0x38] cmp r0, #0 blt _021094f4 - ldr r0, _02109514 ; =data_027e0f74 + ldr r0, _02109514 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -10359,7 +10359,7 @@ _021094f4: arm_func_end func_ov05_021092bc _0210950c: .word data_027e071c _02109510: .word data_ov05_021127b0 -_02109514: .word data_027e0f74 +_02109514: .word gAdventureFlags _02109518: .word data_027e0f64 _0210951c: .word data_ov00_020eec68 _02109520: .word data_ov05_02112770 @@ -10509,7 +10509,7 @@ func_ov05_021096bc: ; 0x021096bc add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02109764 ; =data_027e0f74 + ldr r0, _02109764 ; =gAdventureFlags mvn ip, #0 mov r3, #0x14 ldr r0, [r0] @@ -10542,7 +10542,7 @@ _02109750: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov05_021096bc -_02109764: .word data_027e0f74 +_02109764: .word gAdventureFlags .global func_ov05_02109768 arm_func_start func_ov05_02109768 @@ -12038,7 +12038,7 @@ func_ov05_0210ab1c: ; 0x0210ab1c mov r0, r6 bl func_ov05_021107fc _0210ab84: - ldr r0, _0210ad70 ; =data_027e0f74 + ldr r0, _0210ad70 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -12169,7 +12169,7 @@ _0210ad54: arm_func_end func_ov05_0210ab1c _0210ad68: .word data_027e0fe4 _0210ad6c: .word data_027e0d38 -_0210ad70: .word data_027e0f74 +_0210ad70: .word gAdventureFlags _0210ad74: .word gItemManager _0210ad78: .word 0x00000aab _0210ad7c: .word 0x0000071c @@ -12191,7 +12191,7 @@ func_ov05_0210ad88: ; 0x0210ad88 bl _ZN12ActorManager8GetActorEP8ActorRef movs r4, r0 beq _0210ade0 - ldr r0, _0210b284 ; =data_027e0f74 + ldr r0, _0210b284 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -12511,7 +12511,7 @@ _0210b264: .align 2, 0 arm_func_end func_ov05_0210ad88 _0210b280: .word data_027e0fe4 -_0210b284: .word data_027e0f74 +_0210b284: .word gAdventureFlags _0210b288: .word data_02050f54 _0210b28c: .word 0x0000ffff _0210b290: .word data_027e0e60 @@ -12551,7 +12551,7 @@ _0210b2fc: bl _ZN13PlayerControl16CheckNotTouchingEv cmp r0, #0 bne _0210b324 - ldr r0, _0210b3b8 ; =data_027e0f74 + ldr r0, _0210b3b8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -12600,7 +12600,7 @@ _0210b3a0: arm_func_end func_ov05_0210b2a4 _0210b3b0: .word data_027e0fe4 _0210b3b4: .word data_027e0fb8 -_0210b3b8: .word data_027e0f74 +_0210b3b8: .word gAdventureFlags .global func_ov05_0210b3bc arm_func_start func_ov05_0210b3bc @@ -13210,7 +13210,7 @@ func_ov05_0210bb98: ; 0x0210bb98 bl func_ov00_020840c4 movs r4, r0 beq _0210bc04 - ldr r0, _0210bd5c ; =data_027e0f74 + ldr r0, _0210bd5c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -13315,7 +13315,7 @@ _0210bd48: .align 2, 0 arm_func_end func_ov05_0210bb98 _0210bd58: .word data_027e0e60 -_0210bd5c: .word data_027e0f74 +_0210bd5c: .word gAdventureFlags _0210bd60: .word data_027e0fb8 _0210bd64: .word data_ov05_021129d4 _0210bd68: .word data_ov05_021129c4 @@ -13362,7 +13362,7 @@ _0210bdec: bl _ZN13PlayerControl16CheckNotTouchingEv cmp r0, #0 bne _0210be14 - ldr r0, _0210bf48 ; =data_027e0f74 + ldr r0, _0210bf48 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -13453,7 +13453,7 @@ _0210beb8: arm_func_end func_ov05_0210bd70 _0210bf40: .word data_027e0e60 _0210bf44: .word data_027e0fb8 -_0210bf48: .word data_027e0f74 +_0210bf48: .word gAdventureFlags _0210bf4c: .word 0x00000155 .global func_ov05_0210bf50 @@ -15497,7 +15497,7 @@ _0210db2c: beq _0210db70 add r0, r6, #6 bl func_ov00_020d054c - ldr r0, _0210df68 ; =data_027e0f74 + ldr r0, _0210df68 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -15517,7 +15517,7 @@ _0210db88: add r0, r6, #6 bl func_ov00_020d0594 _0210db90: - ldr r0, _0210df68 ; =data_027e0f74 + ldr r0, _0210df68 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -15535,7 +15535,7 @@ _0210db90: mov r0, #0 strb r0, [r6, #0x92] _0210dbd4: - ldr r0, _0210df68 ; =data_027e0f74 + ldr r0, _0210df68 ; =gAdventureFlags mov r4, #0 ldr r0, [r0] bl func_ov00_02097738 @@ -15652,7 +15652,7 @@ _0210dd24: _0210dd68: cmp r4, #0 bne _0210dd9c - ldr r0, _0210df68 ; =data_027e0f74 + ldr r0, _0210df68 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -15713,7 +15713,7 @@ _0210de24: strb r1, [r6, #0x94] bl func_ov00_020d054c _0210de50: - ldr r0, _0210df68 ; =data_027e0f74 + ldr r0, _0210df68 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -15798,7 +15798,7 @@ _0210df58: .word data_027e0d38 _0210df5c: .word data_027e0d3c _0210df60: .word data_027e077c _0210df64: .word data_027e103c -_0210df68: .word data_027e0f74 +_0210df68: .word gAdventureFlags _0210df6c: .word data_027e0c68 _0210df70: .word data_027e0fc8 _0210df74: .word data_027e0db0 @@ -16393,7 +16393,7 @@ _0210e72c: mov r2, r4 bl func_ov00_020bc960 _0210e760: - ldr r0, _0210e898 ; =data_027e0f74 + ldr r0, _0210e898 ; =gAdventureFlags mov r4, #0 ldr r0, [r0] bl func_ov00_02097738 @@ -16475,7 +16475,7 @@ _0210e888: .word data_027e0fa0 _0210e88c: .word data_027e0fd0 _0210e890: .word data_027e0f94 _0210e894: .word data_027e0e60 -_0210e898: .word data_027e0f74 +_0210e898: .word gAdventureFlags _0210e89c: .word 0x66666667 _0210e8a0: .word data_027e0fac _0210e8a4: .word data_ov00_020eec9c @@ -17363,12 +17363,12 @@ _0210f4f0: _0210f52c: cmp r0, #2 bne _0210f5d8 - ldr r0, _0210f6d8 ; =data_027e0f74 + ldr r0, _0210f6d8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _0210f55c - ldr r0, _0210f6d8 ; =data_027e0f74 + ldr r0, _0210f6d8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -17478,7 +17478,7 @@ _0210f6c8: .word data_ov00_020eec9c _0210f6cc: .word data_027e103c _0210f6d0: .word data_ov05_02112a7c _0210f6d4: .word data_ov05_02112a9c -_0210f6d8: .word data_027e0f74 +_0210f6d8: .word gAdventureFlags .global func_ov05_0210f6dc arm_func_start func_ov05_0210f6dc @@ -18635,7 +18635,7 @@ _021106ac: cmp r5, #0 beq _02110784 _021106d4: - ldr r0, _021107dc ; =data_027e0f74 + ldr r0, _021107dc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -18708,7 +18708,7 @@ _021107cc: .word data_ov05_02112b74 _021107d0: .word data_ov05_02112b84 _021107d4: .word data_ov05_02112b64 _021107d8: .word data_ov05_02112acc -_021107dc: .word data_027e0f74 +_021107dc: .word gAdventureFlags _021107e0: .word data_027e0c68 _021107e4: .word data_ov09_0211f5b4 _021107e8: .word data_ov05_02112ba4 @@ -19651,7 +19651,7 @@ func_ov05_021113dc: ; 0x021113dc add sp, sp, #0x58 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} _02111450: - ldr r0, _02111a5c ; =data_027e0f74 + ldr r0, _02111a5c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -19862,7 +19862,7 @@ _02111744: mov r0, r5 mov r2, #0 bl func_ov05_0210f808 - ldr r1, _02111a5c ; =data_027e0f74 + ldr r1, _02111a5c ; =gAdventureFlags mov r4, r0 ldr r0, [r1] bl func_ov00_02097750 @@ -20063,7 +20063,7 @@ _02111a3c: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 arm_func_end func_ov05_021113dc -_02111a5c: .word data_027e0f74 +_02111a5c: .word gAdventureFlags _02111a60: .word data_027e0d38 _02111a64: .word data_027e0618 _02111a68: .word data_027e0fb8 @@ -20237,7 +20237,7 @@ func_ov05_02111c70: ; 0x02111c70 mov sb, r1 cmp r0, #0 bne _02111cac - ldr r0, _02111e10 ; =data_027e0f74 + ldr r0, _02111e10 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -20343,7 +20343,7 @@ _02111df8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov05_02111c70 -_02111e10: .word data_027e0f74 +_02111e10: .word gAdventureFlags _02111e14: .word data_027e0d38 _02111e18: .word data_027e0f68 _02111e1c: .word data_027e0f64 diff --git a/asm/ov09.inc b/asm/ov09.inc index 71ad498b..daab6b10 100644 --- a/asm/ov09.inc +++ b/asm/ov09.inc @@ -43,7 +43,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0fbc .extern data_027e0fe4 diff --git a/asm/ov09.s b/asm/ov09.s index ebf42de0..03147920 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -3614,7 +3614,7 @@ _021148ba: add r1, sp, #8 mov r2, #0x40 blx func_020078f4 - ldr r0, _02114998 ; =data_027e0f74 + ldr r0, _02114998 ; =gAdventureFlags add r1, sp, #8 ldr r0, [r0] blx func_ov00_02097644 @@ -3710,7 +3710,7 @@ _02114988: .word data_027e0fbc _0211498c: .word data_ov00_020e9e18 _02114990: .word data_ov09_0211f5b4 _02114994: .word data_ov00_020e9f08 -_02114998: .word data_027e0f74 +_02114998: .word gAdventureFlags _0211499c: .word data_ov00_020eaac4 _021149a0: .word 0x00000cac _021149a4: .word data_ov00_020eacc8 @@ -4898,7 +4898,7 @@ func_ov09_02115478: ; 0x02115478 arm_func_start func_ov09_021154e8 func_ov09_021154e8: ; 0x021154e8 stmdb sp!, {r4, r5, r6, lr} - ldr r3, _02115558 ; =data_027e0f74 + ldr r3, _02115558 ; =gAdventureFlags mov r6, r0 ldr r0, [r3] mov r5, r1 @@ -4929,13 +4929,13 @@ _02115548: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov09_021154e8 -_02115558: .word data_027e0f74 +_02115558: .word gAdventureFlags .global func_ov09_0211555c arm_func_start func_ov09_0211555c func_ov09_0211555c: ; 0x0211555c stmdb sp!, {r4, r5, r6, lr} - ldr r3, _0211560c ; =data_027e0f74 + ldr r3, _0211560c ; =gAdventureFlags mov r4, r0 ldr r0, [r3] mov r6, r1 @@ -4982,7 +4982,7 @@ _021155f0: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov09_0211555c -_0211560c: .word data_027e0f74 +_0211560c: .word gAdventureFlags .global func_ov09_02115610 arm_func_start func_ov09_02115610 @@ -5779,7 +5779,7 @@ _02116024: ldr r0, [r1, #0x14] cmp r0, #1 bne _02116062 - ldr r0, _0211606c ; =data_027e0f74 + ldr r0, _0211606c ; =gAdventureFlags ldr r1, [r1, #0x18] ldr r0, [r0] blx func_ov00_02097c68 @@ -5809,7 +5809,7 @@ _02116062: thumb_func_end func_ov09_02115fe4 _02116064: .word data_027e0d38 _02116068: .word data_027e0ce0 -_0211606c: .word data_027e0f74 +_0211606c: .word gAdventureFlags .global func_ov09_02116070 thumb_func_start func_ov09_02116070 @@ -14663,7 +14663,7 @@ func_ov09_0211b0dc: ; 0x0211b0dc ldrh r0, [r0, #2] tst r0, #8 beq _0211b164 - ldr r0, _0211b368 ; =data_027e0f74 + ldr r0, _0211b368 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -14689,7 +14689,7 @@ _0211b15c: mov r4, #1 b _0211b34c _0211b164: - ldr r0, _0211b368 ; =data_027e0f74 + ldr r0, _0211b368 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -14834,7 +14834,7 @@ _0211b35c: .align 2, 0 arm_func_end func_ov09_0211b0dc _0211b364: .word data_027e05f8 -_0211b368: .word data_027e0f74 +_0211b368: .word gAdventureFlags _0211b36c: .word data_027e0db0 _0211b370: .word data_027e0d38 _0211b374: .word data_ov00_020eec9c @@ -15701,7 +15701,7 @@ func_ov09_0211bcfc: ; 0x0211bcfc arm_func_start func_ov09_0211bd14 func_ov09_0211bd14: ; 0x0211bd14 stmdb sp!, {r3, lr} - ldr r0, _0211bd50 ; =data_027e0f74 + ldr r0, _0211bd50 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -15719,7 +15719,7 @@ _0211bd48: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov09_0211bd14 -_0211bd50: .word data_027e0f74 +_0211bd50: .word gAdventureFlags _0211bd54: .word data_027e0f90 .global func_ov09_0211bd58 diff --git a/asm/ov12.inc b/asm/ov12.inc index 89d7c781..2ed0d7b1 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -105,7 +105,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f68 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov12.s b/asm/ov12.s index 8e289181..5a943bb3 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -8651,7 +8651,7 @@ _02119c78: bl func_ov00_020b510c cmp r0, #0 beq _02119d0c - ldr r0, _02119dd8 ; =data_027e0f74 + ldr r0, _02119dd8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -8736,7 +8736,7 @@ _02119dc8: .word data_027e0fd4 _02119dcc: .word data_ov00_020eec9c _02119dd0: .word data_027e0fac _02119dd4: .word data_027e0fcc -_02119dd8: .word data_027e0f74 +_02119dd8: .word gAdventureFlags _02119ddc: .word data_027e0fc0 _02119de0: .word data_027e0e58 @@ -8824,7 +8824,7 @@ _02119f04: cmp r0, #0 subgt r0, r0, #1 strgth r0, [r6, #8] - ldr r0, _0211a3d4 ; =data_027e0f74 + ldr r0, _0211a3d4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -9151,7 +9151,7 @@ _0211a378: _0211a3c8: .word data_027e0f94 _0211a3cc: .word data_027e0fac _0211a3d0: .word data_ov12_02137c64 -_0211a3d4: .word data_027e0f74 +_0211a3d4: .word gAdventureFlags _0211a3d8: .word 0x66666667 _0211a3dc: .word data_027e0fcc _0211a3e0: .word data_027e0f64 @@ -10100,7 +10100,7 @@ func_ov12_0211af70: ; 0x0211af70 cmp r0, #1 cmpne r0, #0x33 bne _0211b018 - ldr r0, _0211b0c4 ; =data_027e0f74 + ldr r0, _0211b0c4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -10173,7 +10173,7 @@ _0211b0b8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov12_0211af70 -_0211b0c4: .word data_027e0f74 +_0211b0c4: .word gAdventureFlags _0211b0c8: .word data_027e0764 .global func_ov12_0211b0cc @@ -24531,7 +24531,7 @@ func_ov12_02126bc0: ; 0x02126bc0 cmp r0, #1 moveq r0, #1 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _02126c38 ; =data_027e0f74 + ldr r0, _02126c38 ; =gAdventureFlags mov r4, #0 ldr r0, [r0] bl func_ov00_02097738 @@ -24558,7 +24558,7 @@ _02126c30: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_02126bc0 -_02126c38: .word data_027e0f74 +_02126c38: .word gAdventureFlags _02126c3c: .word data_ov00_020ee698 _02126c40: .word data_027e05f8 @@ -38487,7 +38487,7 @@ func_ov12_021320f4: ; 0x021320f4 mov r1, #1 strb r2, [r4, #0x1b4] bl _ZN5Actor10SetUnk_11cEc - ldr r0, _021321dc ; =data_027e0f74 + ldr r0, _021321dc ; =gAdventureFlags ldr r5, [r4, #0x30] ldr r0, [r0] bl func_ov00_02097bbc @@ -38530,7 +38530,7 @@ _02132144: moveq r0, #1 streqb r0, [sp, #0x10] _021321b4: - ldr r0, _021321dc ; =data_027e0f74 + ldr r0, _021321dc ; =gAdventureFlags add r1, sp, #0 ldr r0, [r0] bl func_ov00_02097810 @@ -38543,7 +38543,7 @@ _021321d0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov12_021320f4 -_021321dc: .word data_027e0f74 +_021321dc: .word gAdventureFlags _021321e0: .word data_027e0c68 .global func_ov12_021321e4 @@ -38557,7 +38557,7 @@ func_ov12_021321e4: ; 0x021321e4 ldrne r0, [r4, #0x30] cmpne r0, #0 beq _02132214 - ldr r0, _0213221c ; =data_027e0f74 + ldr r0, _0213221c ; =gAdventureFlags ldr r1, [r4, #0x1bc] ldr r0, [r0] bl func_ov00_02097bcc @@ -38566,7 +38566,7 @@ _02132214: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov12_021321e4 -_0213221c: .word data_027e0f74 +_0213221c: .word gAdventureFlags .global func_ov12_02132220 arm_func_start func_ov12_02132220 @@ -40384,14 +40384,14 @@ _02133a54: .word 0x00000132 func_ov12_02133a58: ; 0x02133a58 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0xc - ldr r1, _02133b64 ; =data_027e0f74 + ldr r1, _02133b64 ; =gAdventureFlags mov r6, r0 ldr r0, [r1] bl func_ov00_02097738 cmp r0, #0 addne sp, sp, #0xc ldmneia sp!, {r3, r4, r5, r6, pc} - ldr r0, _02133b64 ; =data_027e0f74 + ldr r0, _02133b64 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -40451,7 +40451,7 @@ func_ov12_02133a58: ; 0x02133a58 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov12_02133a58 -_02133b64: .word data_027e0f74 +_02133b64: .word gAdventureFlags _02133b68: .word data_027e0c68 _02133b6c: .word data_ov12_021354b0 _02133b70: .word data_ov12_021354ac @@ -41126,7 +41126,7 @@ func_ov12_02134378: ; 0x02134378 ldrsh r0, [r4, #0x34] cmp r0, #0 ldmgtia sp!, {r4, pc} - ldr r0, _021343b8 ; =data_027e0f74 + ldr r0, _021343b8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -41136,7 +41136,7 @@ func_ov12_02134378: ; 0x02134378 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov12_02134378 -_021343b8: .word data_027e0f74 +_021343b8: .word gAdventureFlags .global func_ov12_021343bc arm_func_start func_ov12_021343bc diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index 7aeca4b5..d6ed30f1 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -112,7 +112,7 @@ .extern data_027e0f68 .extern data_027e0f6c .extern data_027e0f70 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f84 .extern data_027e0f90 diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index fbfc1ad3..16c4a6c6 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -5248,7 +5248,7 @@ _02123ba4: .word data_027e0f64 arm_func_start func_ov14_02123ba8 func_ov14_02123ba8: ; 0x02123ba8 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _02123c50 ; =data_027e0f74 + ldr r2, _02123c50 ; =gAdventureFlags mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -5284,18 +5284,18 @@ _02123c20: strb r0, [r5, #0x118] ldmia sp!, {r3, r4, r5, pc} _02123c2c: - ldr r0, _02123c50 ; =data_027e0f74 + ldr r0, _02123c50 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02123c50 ; =data_027e0f74 + ldr r0, _02123c50 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_02123ba8 -_02123c50: .word data_027e0f74 +_02123c50: .word gAdventureFlags .global func_ov14_02123c54 arm_func_start func_ov14_02123c54 @@ -6268,12 +6268,12 @@ _02124948: ldrb r0, [r5, #0x17e] cmp r0, #0 beq _021249a4 - ldr r0, _02124c64 ; =data_027e0f74 + ldr r0, _02124c64 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _021249a4 - ldr r0, _02124c64 ; =data_027e0f74 + ldr r0, _02124c64 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -6408,12 +6408,12 @@ _02124b50: bl _ZN5Actor18func_ov00_020c195cEv b _02124c2c _02124b5c: - ldr r0, _02124c64 ; =data_027e0f74 + ldr r0, _02124c64 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _02124b84 - ldr r0, _02124c64 ; =data_027e0f74 + ldr r0, _02124c64 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -6481,7 +6481,7 @@ _02124c54: .word data_027e0e60 _02124c58: .word 0x00000333 _02124c5c: .word data_ov14_02153bfc _02124c60: .word data_ov14_0215ac9c -_02124c64: .word data_027e0f74 +_02124c64: .word gAdventureFlags _02124c68: .word data_027e0f64 _02124c6c: .word data_027e0fc8 @@ -6494,12 +6494,12 @@ func_ov14_02124c70: ; 0x02124c70 mov r4, r1 cmp r0, #2 bne _02124cb8 - ldr r0, _02124d90 ; =data_027e0f74 + ldr r0, _02124d90 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _02124cb0 - ldr r0, _02124d90 ; =data_027e0f74 + ldr r0, _02124d90 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -6511,7 +6511,7 @@ _02124cb8: ldrb r0, [r5, #0x17f] cmp r0, #0 beq _02124cf4 - ldr r0, _02124d90 ; =data_027e0f74 + ldr r0, _02124d90 ; =gAdventureFlags ldr r1, [r5, #0x178] ldr r0, [r0] bl func_ov00_02097b9c @@ -6524,12 +6524,12 @@ _02124cb8: blx r2 ldmia sp!, {r3, r4, r5, pc} _02124cf4: - ldr r0, _02124d90 ; =data_027e0f74 + ldr r0, _02124d90 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _02124d7c - ldr r0, _02124d90 ; =data_027e0f74 + ldr r0, _02124d90 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -6570,7 +6570,7 @@ _02124d7c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_02124c70 -_02124d90: .word data_027e0f74 +_02124d90: .word gAdventureFlags _02124d94: .word data_027e077c .global func_ov14_02124d98 @@ -7262,13 +7262,13 @@ _02125620: ldrb r0, [r4, #0x71] cmp r0, #0 beq _0212567c - ldr r0, _021258a8 ; =data_027e0f74 + ldr r0, _021258a8 ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _021258a8 ; =data_027e0f74 + ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r1, _021258ac ; =data_ov14_02153c04 @@ -7294,7 +7294,7 @@ _02125698: ldrb r0, [r4, #0x71] cmp r0, #0 beq _021256dc - ldr r0, _021258a8 ; =data_027e0f74 + ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r1, _021258ac ; =data_ov14_02153c04 @@ -7337,13 +7337,13 @@ _02125738: ldrb r0, [r4, #0x71] cmp r0, #0 beq _02125794 - ldr r0, _021258a8 ; =data_027e0f74 + ldr r0, _021258a8 ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _021258a8 ; =data_027e0f74 + ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r1, _021258ac ; =data_ov14_02153c04 @@ -7369,7 +7369,7 @@ _021257b0: ldrb r0, [r4, #0x71] cmp r0, #0 beq _021257f4 - ldr r0, _021258a8 ; =data_027e0f74 + ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r1, _021258ac ; =data_ov14_02153c04 @@ -7400,7 +7400,7 @@ _02125810: blx r3 ldmia sp!, {r4, pc} _0212582c: - ldr r0, _021258a8 ; =data_027e0f74 + ldr r0, _021258a8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -7435,7 +7435,7 @@ _02125890: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0212559c -_021258a8: .word data_027e0f74 +_021258a8: .word gAdventureFlags _021258ac: .word data_ov14_02153c04 _021258b0: .word data_027e0e60 @@ -7554,7 +7554,7 @@ _021259c4: str r2, [sp, #0xb4] strb r1, [sp, #0xb9] ldr r1, [r4, #0x18] - ldr r0, _02125c14 ; =data_027e0f74 + ldr r0, _02125c14 ; =gAdventureFlags str r1, [sp, #0xd0] ldr r1, [r4, #0x1c] ldr r0, [r0] @@ -7610,7 +7610,7 @@ _02125aa8: mov r2, #0x1e ldrh r3, [r0, #0xc] mov r1, #6 - ldr r0, _02125c14 ; =data_027e0f74 + ldr r0, _02125c14 ; =gAdventureFlags str r3, [sp, #4] strb r2, [sp, #9] strb r1, [sp, #0xa] @@ -7702,7 +7702,7 @@ _02125c04: .align 2, 0 arm_func_end func_ov14_0212595c _02125c10: .word data_ov14_02153c04 -_02125c14: .word data_027e0f74 +_02125c14: .word gAdventureFlags _02125c18: .word data_027e0e60 _02125c1c: .word data_027e0ffc _02125c20: .word 0x000001af @@ -9039,7 +9039,7 @@ _02126b6c: ldrb r0, [r5, #0x7c] cmp r0, #0 beq _02126b90 - ldr r0, _02127024 ; =data_027e0f74 + ldr r0, _02127024 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] bl func_ov00_02097b9c @@ -9171,7 +9171,7 @@ _02126d58: ldrb r0, [r5, #0x7c] cmp r0, #0 beq _02126d7c - ldr r0, _02127024 ; =data_027e0f74 + ldr r0, _02127024 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] bl func_ov00_02097b9c @@ -9362,7 +9362,7 @@ _02127004: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_02126b04 -_02127024: .word data_027e0f74 +_02127024: .word gAdventureFlags _02127028: .word data_ov14_02153c38 _0212702c: .word data_027e0ffc _02127030: .word 0x000001b3 @@ -9444,7 +9444,7 @@ _0212713c: ldrb r0, [r4, #0x7c] cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02127184 ; =data_027e0f74 + ldr r0, _02127184 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c @@ -9461,7 +9461,7 @@ _0212713c: .align 2, 0 arm_func_end func_ov14_02127034 _02127180: .word data_027e0e60 -_02127184: .word data_027e0f74 +_02127184: .word gAdventureFlags .global func_ov14_02127188 arm_func_start func_ov14_02127188 @@ -9572,7 +9572,7 @@ _021272e4: strb r1, [sp, #0xd1] str r0, [sp, #0x150] _0212731c: - ldr r0, _021276ac ; =data_027e0f74 + ldr r0, _021276ac ; =gAdventureFlags add r1, sp, #0xbc ldr r0, [r0] bl func_ov00_02097810 @@ -9708,7 +9708,7 @@ _021274f4: moveq r0, #0 strb r0, [sp, #0x1c] ldrb r1, [r5, #0x86] - ldr r0, _021276ac ; =data_027e0f74 + ldr r0, _021276ac ; =gAdventureFlags strb r1, [sp, #0x1d] ldrb r3, [r5, #0x87] ldr r0, [r0] @@ -9729,7 +9729,7 @@ _02127548: ldrneb r0, [r5, #0x7c] cmpne r0, #0 beq _021276a0 - ldr r0, _021276ac ; =data_027e0f74 + ldr r0, _021276ac ; =gAdventureFlags mov r1, #2 ldr r0, [r0] bl func_ov00_02098064 @@ -9819,7 +9819,7 @@ _021276a0: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov14_02127188 -_021276ac: .word data_027e0f74 +_021276ac: .word gAdventureFlags _021276b0: .word data_027e0e60 _021276b4: .word data_027e0ffc _021276b8: .word 0x000001b5 @@ -10515,7 +10515,7 @@ func_ov14_02127eb8: ; 0x02127eb8 ldrh r1, [r0, #0x24] cmp r1, #1 bne _02127edc - ldr r2, _02127ef0 ; =data_027e0f74 + ldr r2, _02127ef0 ; =gAdventureFlags ldrh r1, [r0, #0x26] ldr r0, [r2] bl func_ov00_02097760 @@ -10528,7 +10528,7 @@ _02127edc: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_02127eb8 -_02127ef0: .word data_027e0f74 +_02127ef0: .word gAdventureFlags _02127ef4: .word data_027e0e60 .global func_ov14_02127ef8 @@ -11057,14 +11057,14 @@ _0212859c: ; jump table b _021286f8 ; case 19 b _02128770 ; case 20 _021285f0: - ldr r0, _02128994 ; =data_027e0f74 + ldr r0, _02128994 ; =gAdventureFlags ldr r1, [r7, #0xd0] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _02128994 ; =data_027e0f74 + ldr r0, _02128994 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_0209809c cmp r0, #0 @@ -11236,7 +11236,7 @@ _02128868: cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _02128994 ; =data_027e0f74 + ldr r0, _02128994 ; =gAdventureFlags ldr r1, [r7, #0xd0] ldr r0, [r0] bl func_ov00_02097bcc @@ -11263,7 +11263,7 @@ _021288d0: cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _02128994 ; =data_027e0f74 + ldr r0, _02128994 ; =gAdventureFlags ldr r1, [r7, #0xd0] ldr r0, [r0] bl func_ov00_02097bcc @@ -11305,7 +11305,7 @@ _02128984: .word data_027e104c _02128988: .word data_027e0c68 _0212898c: .word data_027e0ffc _02128990: .word 0x000001b2 -_02128994: .word data_027e0f74 +_02128994: .word gAdventureFlags _02128998: .word 0x0b60b60b _0212899c: .word data_02050f54 _021289a0: .word data_027e0f90 @@ -11350,7 +11350,7 @@ _02128a18: bl _ZN10PlayerBase10SetVisibleEb b _02128d64 _02128a2c: - ldr r0, _02128d74 ; =data_027e0f74 + ldr r0, _02128d74 ; =gAdventureFlags ldr r1, [r4, #0xd0] ldr r0, [r0] bl func_ov00_02097bcc @@ -11465,7 +11465,7 @@ _02128a84: ldrb ip, [sp, #0x62] ldrb r3, [sp, #0x63] ldrb r2, [sp, #0x64] - ldr r0, _02128d74 ; =data_027e0f74 + ldr r0, _02128d74 ; =gAdventureFlags add r1, sp, #0x68 ldr r0, [r0] strb r5, [sp, #0xf4] @@ -11575,7 +11575,7 @@ _02128d64: .align 2, 0 arm_func_end func_ov14_021289a4 _02128d70: .word data_027e0f90 -_02128d74: .word data_027e0f74 +_02128d74: .word gAdventureFlags _02128d78: .word data_027e0ffc _02128d7c: .word data_027e0f64 _02128d80: .word 0x00001266 @@ -16548,7 +16548,7 @@ func_ov14_0212cd08: ; 0x0212cd08 ldrh r1, [r4, #0x24] cmp r1, #0 beq _0212ce10 - ldr r0, _0212ce54 ; =data_027e0f74 + ldr r0, _0212ce54 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -16574,7 +16574,7 @@ _0212ce30: .align 2, 0 arm_func_end func_ov14_0212cd08 _0212ce50: .word 0x00000666 -_0212ce54: .word data_027e0f74 +_0212ce54: .word gAdventureFlags .global func_ov14_0212ce58 arm_func_start func_ov14_0212ce58 @@ -18501,7 +18501,7 @@ _0212e608: ldrh r1, [r4, #0x28] cmp r1, #0 beq _0212e694 - ldr r0, _0212e6e8 ; =data_027e0f74 + ldr r0, _0212e6e8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -18531,7 +18531,7 @@ _0212e6d8: .word data_027e0f68 _0212e6dc: .word 0x000007fc _0212e6e0: .word 0x00000ccd _0212e6e4: .word 0x00002666 -_0212e6e8: .word data_027e0f74 +_0212e6e8: .word gAdventureFlags .global func_ov14_0212e6ec arm_func_start func_ov14_0212e6ec @@ -18553,7 +18553,7 @@ _0212e704: ; jump table b _0212e884 ; case 7 b _0212e8b4 ; case 8 _0212e728: - ldr r0, _0212e8cc ; =data_027e0f74 + ldr r0, _0212e8cc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_0209809c cmp r0, #0 @@ -18669,7 +18669,7 @@ _0212e8b4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0212e6ec -_0212e8cc: .word data_027e0f74 +_0212e8cc: .word gAdventureFlags _0212e8d0: .word data_027e0c68 _0212e8d4: .word data_027e103c _0212e8d8: .word data_027e077c @@ -18747,7 +18747,7 @@ _0212e97c: str r1, [sp, #0x34] mov r0, #2 str r0, [sp] - ldr r0, _0212eb38 ; =data_027e0f74 + ldr r0, _0212eb38 ; =gAdventureFlags str r1, [sp, #4] ldr r0, [r0] mov r3, r2 @@ -18807,7 +18807,7 @@ _0212ea9c: mov r0, #2 str r0, [sp] mov r1, #0xa - ldr r0, _0212eb38 ; =data_027e0f74 + ldr r0, _0212eb38 ; =gAdventureFlags str r2, [sp, #4] ldr r0, [r0] mov r2, r1 @@ -18845,7 +18845,7 @@ _0212eb28: .word data_027e103c _0212eb2c: .word data_027e0f64 _0212eb30: .word 0x00001555 _0212eb34: .word 0x000004cd -_0212eb38: .word data_027e0f74 +_0212eb38: .word gAdventureFlags _0212eb3c: .word data_027e0f90 _0212eb40: .word data_027e0fe4 _0212eb44: .word data_027e0c68 @@ -20576,7 +20576,7 @@ _02130198: cmp r0, #0 beq _02130268 _02130254: - ldr r0, _021304c0 ; =data_027e0f74 + ldr r0, _021304c0 ; =gAdventureFlags add r1, sp, #0xd8 ldr r0, [r0] bl func_ov00_02097810 @@ -20670,7 +20670,7 @@ _02130318: cmp r0, #0 beq _021303c0 _021303ac: - ldr r0, _021304c0 ; =data_027e0f74 + ldr r0, _021304c0 ; =gAdventureFlags add r1, sp, #0x28 ldr r0, [r0] bl func_ov00_02097810 @@ -20748,7 +20748,7 @@ _021304ac: arm_func_end func_ov14_0213012c _021304b8: .word data_027e0e58 _021304bc: .word data_027e0e60 -_021304c0: .word data_027e0f74 +_021304c0: .word gAdventureFlags _021304c4: .word data_027e0ffc _021304c8: .word 0x000002a2 @@ -20916,13 +20916,13 @@ func_ov14_0213067c: ; 0x0213067c cmpne r1, #0 beq _021306d4 _02130698: - ldr r2, _021306dc ; =data_027e0f74 + ldr r2, _021306dc ; =gAdventureFlags ldr r1, [r0, #0x70] ldr r0, [r2] bl func_ov00_02097b9c cmp r0, #0 bne _021306c4 - ldr r0, _021306dc ; =data_027e0f74 + ldr r0, _021306dc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -20938,7 +20938,7 @@ _021306d4: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_0213067c -_021306dc: .word data_027e0f74 +_021306dc: .word gAdventureFlags .global func_ov14_021306e0 arm_func_start func_ov14_021306e0 @@ -20951,13 +20951,13 @@ func_ov14_021306e0: ; 0x021306e0 cmpne r1, #0 beq _02130738 _021306fc: - ldr r2, _02130740 ; =data_027e0f74 + ldr r2, _02130740 ; =gAdventureFlags ldr r1, [r0, #0x70] ldr r0, [r2] bl func_ov00_02097b9c cmp r0, #0 bne _02130728 - ldr r0, _02130740 ; =data_027e0f74 + ldr r0, _02130740 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -20973,7 +20973,7 @@ _02130738: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_021306e0 -_02130740: .word data_027e0f74 +_02130740: .word gAdventureFlags .global func_ov14_02130744 arm_func_start func_ov14_02130744 @@ -21501,23 +21501,23 @@ _02130e3c: blx r3 b _02130f68 _02130e7c: - ldr r0, _02130f84 ; =data_027e0f74 + ldr r0, _02130f84 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 beq _02130eec - ldr r0, _02130f84 ; =data_027e0f74 + ldr r0, _02130f84 ; =gAdventureFlags ldr r1, [r4, #0x70] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02130f68 - ldr r0, _02130f84 ; =data_027e0f74 + ldr r0, _02130f84 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d blo _02130f68 - ldr r0, _02130f84 ; =data_027e0f74 + ldr r0, _02130f84 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -21572,7 +21572,7 @@ _02130f74: .word 0x00000333 _02130f78: .word data_027e077c _02130f7c: .word 0xfffff333 _02130f80: .word 0x00000266 -_02130f84: .word data_027e0f74 +_02130f84: .word gAdventureFlags .global func_ov14_02130f88 arm_func_start func_ov14_02130f88 @@ -21696,7 +21696,7 @@ _02131100: str r2, [sp, #0x38] strb r1, [sp, #0x3d] ldr r1, [r4, #0x80] - ldr r0, _0213140c ; =data_027e0f74 + ldr r0, _0213140c ; =gAdventureFlags str r1, [sp, #0x54] ldr r1, [r4, #0x84] ldr r0, [r0] @@ -21888,7 +21888,7 @@ _021313fc: .word data_027e0764 _02131400: .word data_ov14_02157314 _02131404: .word data_027e0e58 _02131408: .word 0x0000025b -_0213140c: .word data_027e0f74 +_0213140c: .word gAdventureFlags _02131410: .word data_027e0e60 _02131414: .word 0xfffff333 @@ -22665,7 +22665,7 @@ func_ov14_02131d80: ; 0x02131d80 cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} - ldr r0, _02131eb8 ; =data_027e0f74 + ldr r0, _02131eb8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -22742,7 +22742,7 @@ _02131ea0: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov14_02131d80 -_02131eb8: .word data_027e0f74 +_02131eb8: .word gAdventureFlags _02131ebc: .word 0xfffffe66 .global func_ov14_02131ec0 @@ -23563,7 +23563,7 @@ _02132958: mov r3, #0x3c mov r2, #0x1e mov r1, #6 - ldr r0, _02132a84 ; =data_027e0f74 + ldr r0, _02132a84 ; =gAdventureFlags str r3, [sp, #8] strb r2, [sp, #0xd] strb r1, [sp, #0xe] @@ -23635,7 +23635,7 @@ _02132a74: .word data_027e0ffc _02132a78: .word 0x000001a9 _02132a7c: .word data_ov14_02153df8 _02132a80: .word data_027e0e58 -_02132a84: .word data_027e0f74 +_02132a84: .word gAdventureFlags _02132a88: .word 0x000001bd .global func_ov14_02132a8c @@ -24196,14 +24196,14 @@ _02133170: add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, r7, r8, pc} _021331ac: - ldr r0, _0213339c ; =data_027e0f74 + ldr r0, _0213339c ; =gAdventureFlags ldr r1, [r5, #0x94] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} - ldr r0, _0213339c ; =data_027e0f74 + ldr r0, _0213339c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -24332,7 +24332,7 @@ _02133394: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov14_02133128 -_0213339c: .word data_027e0f74 +_0213339c: .word gAdventureFlags _021333a0: .word data_027e0ffc _021333a4: .word data_027e0f64 _021333a8: .word data_027e0e58 @@ -24452,7 +24452,7 @@ _021334f0: str r2, [sp, #0x20] strb r1, [sp, #0x25] ldr r1, [r5, #0x18] - ldr r0, _021336f8 ; =data_027e0f74 + ldr r0, _021336f8 ; =gAdventureFlags str r1, [sp, #0x3c] ldr r1, [r5, #0x1c] ldr r0, [r0] @@ -24578,7 +24578,7 @@ _021336e8: .word data_027e0e58 _021336ec: .word 0x00000195 _021336f0: .word data_027e0ffc _021336f4: .word 0x0000033e -_021336f8: .word data_027e0f74 +_021336f8: .word gAdventureFlags _021336fc: .word 0x0000018f _02133700: .word 0x00000192 _02133704: .word 0x00000193 @@ -29449,7 +29449,7 @@ func_ov14_02137648: ; 0x02137648 arm_func_start func_ov14_02137650 func_ov14_02137650: ; 0x02137650 stmdb sp!, {r4, r5, r6, lr} - ldr r3, _0213774c ; =data_027e0f74 + ldr r3, _0213774c ; =gAdventureFlags mov r4, r0 ldr r0, [r3] mov r6, r1 @@ -29518,7 +29518,7 @@ _02137744: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_02137650 -_0213774c: .word data_027e0f74 +_0213774c: .word gAdventureFlags _02137750: .word data_027e0c68 _02137754: .word data_027e077c _02137758: .word data_027e0fc8 @@ -32245,7 +32245,7 @@ func_ov14_0213996c: ; 0x0213996c ldrh r1, [r4, #0x24] cmp r1, #0 ble _0213999c - ldr r0, _02139a48 ; =data_027e0f74 + ldr r0, _02139a48 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -32256,7 +32256,7 @@ _0213999c: ldrh r1, [r4, #0x26] cmp r1, #0 ble _021399c4 - ldr r0, _02139a48 ; =data_027e0f74 + ldr r0, _02139a48 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -32299,7 +32299,7 @@ _021399c4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0213996c -_02139a48: .word data_027e0f74 +_02139a48: .word gAdventureFlags _02139a4c: .word data_027e0d0c .global func_ov14_02139a50 @@ -32799,7 +32799,7 @@ _0213a048: strb r0, [sp, #9] str r1, [sp, #4] ldr r1, [r4, #0x14] - ldr r0, _0213a148 ; =data_027e0f74 + ldr r0, _0213a148 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r4, #0x18] ldr r0, [r0] @@ -32814,7 +32814,7 @@ _0213a048: add sp, sp, #0xb0 ldmia sp!, {r4, pc} _0213a0c4: - ldr r0, _0213a148 ; =data_027e0f74 + ldr r0, _0213a148 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 @@ -32840,7 +32840,7 @@ _0213a114: cmp r0, #0x1e addle sp, sp, #0xb0 ldmleia sp!, {r4, pc} - ldr r0, _0213a148 ; =data_027e0f74 + ldr r0, _0213a148 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097bcc @@ -32852,7 +32852,7 @@ _0213a13c: .align 2, 0 arm_func_end func_ov14_02139fdc _0213a144: .word data_027e077c -_0213a148: .word data_027e0f74 +_0213a148: .word gAdventureFlags .global func_ov14_0213a14c arm_func_start func_ov14_0213a14c diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index a3e8d9a2..41225864 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -52,7 +52,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index da491079..473a68b3 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -4997,7 +4997,7 @@ _0213f1bc: bl func_ov00_020b510c cmp r0, #0 beq _0213f218 - ldr r0, _0213f324 ; =data_027e0f74 + ldr r0, _0213f324 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -5091,7 +5091,7 @@ _0213f30c: _0213f318: .word gItemManager _0213f31c: .word data_027e0fd4 _0213f320: .word data_027e0fcc -_0213f324: .word data_027e0f74 +_0213f324: .word gAdventureFlags _0213f328: .word data_027e0fc0 _0213f32c: .word data_027e0f94 _0213f330: .word data_027e0d38 @@ -5136,12 +5136,12 @@ func_ov14_0213f37c: ; 0x0213f37c ldrsh r0, [r4, #0xa] cmp r0, #0 ldmleia sp!, {r4, pc} - ldr r0, _0213f454 ; =data_027e0f74 + ldr r0, _0213f454 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0213f454 ; =data_027e0f74 + ldr r0, _0213f454 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -5180,7 +5180,7 @@ _0213f434: arm_func_end func_ov14_0213f37c _0213f44c: .word data_027e0e60 _0213f450: .word data_027e077c -_0213f454: .word data_027e0f74 +_0213f454: .word gAdventureFlags _0213f458: .word data_027e0c68 _0213f45c: .word data_027e0d38 _0213f460: .word data_ov09_0211f5b4 @@ -5241,7 +5241,7 @@ func_ov14_0213f4cc: ; 0x0213f4cc add r5, r0, #0 add r4, r1, #0 blx func_ov00_020bcdb8 - ldr r0, _0213f590 ; =data_027e0f74 + ldr r0, _0213f590 ; =gAdventureFlags mov r1, #0 ldr r0, [r0] mov r2, #1 @@ -5334,7 +5334,7 @@ _0213f57a: pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end func_ov14_0213f4cc -_0213f590: .word data_027e0f74 +_0213f590: .word gAdventureFlags _0213f594: .word data_027e103c _0213f598: .word gItemManager _0213f59c: .word data_027e0fcc @@ -6482,7 +6482,7 @@ _02140118: cmp r0, #1 cmpne r0, #0x33 bne _021401dc - ldr r0, _021402b8 ; =data_027e0f74 + ldr r0, _021402b8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -6569,7 +6569,7 @@ _02140294: arm_func_end func_ov14_021400c0 _021402b0: .word data_027e0d38 _021402b4: .word data_027e0fc8 -_021402b8: .word data_027e0f74 +_021402b8: .word gAdventureFlags _021402bc: .word data_027e0764 .global func_ov14_021402c0 @@ -7178,14 +7178,14 @@ _02140ac4: bl func_ov00_020a5e9c cmp r0, #4 bne _02140bb8 - ldr r0, _0214114c ; =data_027e0f74 + ldr r0, _0214114c ; =gAdventureFlags ldr r1, _02141150 ; =0x00000186 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 addne sp, sp, #0x38 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _0214114c ; =data_027e0f74 + ldr r0, _0214114c ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] bl func_ov00_02097760 @@ -7201,7 +7201,7 @@ _02140ac4: add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _02140b78: - ldr r0, _0214114c ; =data_027e0f74 + ldr r0, _0214114c ; =gAdventureFlags mov r1, #0x62 ldr r0, [r0] bl func_ov00_02097760 @@ -7373,13 +7373,13 @@ _02140db0: bl func_ov00_020a5e9c cmp r0, #4 bne _02140e98 - ldr r0, _0214114c ; =data_027e0f74 + ldr r0, _0214114c ; =gAdventureFlags ldr r1, _02141150 ; =0x00000186 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02140eb4 - ldr r0, _0214114c ; =data_027e0f74 + ldr r0, _0214114c ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] bl func_ov00_02097760 @@ -7394,7 +7394,7 @@ _02140db0: bl func_020313c8 b _02140eb4 _02140e60: - ldr r0, _0214114c ; =data_027e0f74 + ldr r0, _0214114c ; =gAdventureFlags mov r1, #0x62 ldr r0, [r0] bl func_ov00_02097760 @@ -7593,7 +7593,7 @@ _0214113c: .word data_027e1054 _02141140: .word data_027e0d3c _02141144: .word data_02063e4c _02141148: .word data_027e0fe4 -_0214114c: .word data_027e0f74 +_0214114c: .word gAdventureFlags _02141150: .word 0x00000186 .global func_ov14_02141154 @@ -8784,7 +8784,7 @@ _02142144: ldrb r0, [r6, #0x3d] cmp r0, #0 beq _021421b0 - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] bl func_ov00_02097bac @@ -8798,13 +8798,13 @@ _02142144: blx r3 b _0214248c _02142184: - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0214248c - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -8883,7 +8883,7 @@ _021422b0: ldrb r0, [r6, #0x3c] cmp r0, #0 beq _0214231c - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] bl func_ov00_02097bac @@ -8897,13 +8897,13 @@ _021422b0: blx r3 b _0214248c _021422f0: - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0214248c - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -8943,20 +8943,20 @@ _02142390: add r1, sp, #0x14 mov r0, r6 bl func_ov14_02142cb4 - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r1, [r6, #0x44] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02142414 - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r1, [r6, #0x4c] sub r1, r1, #1 cmp r0, r1 bhs _02142414 - ldr r0, _021424a4 ; =data_027e0f74 + ldr r0, _021424a4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1f @@ -9015,7 +9015,7 @@ _0214248c: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov14_02142088 -_021424a4: .word data_027e0f74 +_021424a4: .word gAdventureFlags _021424a8: .word 0x0000019a _021424ac: .word data_027e0ffc _021424b0: .word 0x0000034b @@ -9114,7 +9114,7 @@ _021425ac: cmp r0, #0 ldrneb r0, [r5, #0x3b] cmpne r0, #0 - ldr r0, _02142774 ; =data_027e0f74 + ldr r0, _02142774 ; =gAdventureFlags movne r2, #1 moveq r2, #0 ldr r0, [r0] @@ -9173,7 +9173,7 @@ _0214268c: cmp r0, #0 ldrneb r0, [r5, #0x3b] cmpne r0, #0 - ldr r0, _02142774 ; =data_027e0f74 + ldr r0, _02142774 ; =gAdventureFlags movne r2, #1 moveq r2, #0 ldr r0, [r0] @@ -9211,7 +9211,7 @@ _02142768: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_021424b8 -_02142774: .word data_027e0f74 +_02142774: .word gAdventureFlags _02142778: .word data_027e0e60 .global func_ov14_0214277c @@ -10620,7 +10620,7 @@ func_ov14_021438f4: ; 0x021438f4 arm_func_start func_ov14_0214392c func_ov14_0214392c: ; 0x0214392c stmdb sp!, {r3, lr} - ldr r0, _021439c4 ; =data_027e0f74 + ldr r0, _021439c4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -10660,7 +10660,7 @@ _021439bc: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_0214392c -_021439c4: .word data_027e0f74 +_021439c4: .word gAdventureFlags _021439c8: .word data_027e077c _021439cc: .word data_027e103c _021439d0: .word data_027e0f90 @@ -11589,7 +11589,7 @@ func_ov14_0214418c: ; 0x0214418c cmp r0, #1 moveq r0, #1 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _021442a4 ; =data_027e0f74 + ldr r0, _021442a4 ; =gAdventureFlags mov r4, #0 ldr r0, [r0] bl func_ov00_02097738 @@ -11657,7 +11657,7 @@ _0214429c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_0214418c -_021442a4: .word data_027e0f74 +_021442a4: .word gAdventureFlags _021442a8: .word data_027e0f90 _021442ac: .word data_027e077c _021442b0: .word data_027e05f8 @@ -12408,7 +12408,7 @@ func_ov14_02144afc: ; 0x02144afc sub r0, r5, #1 cmp r1, r0 beq _02144b4c - ldr r0, _02144b60 ; =data_027e0f74 + ldr r0, _02144b60 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 @@ -12422,7 +12422,7 @@ _02144b54: .align 2, 0 arm_func_end func_ov14_02144afc _02144b5c: .word data_027e0c68 -_02144b60: .word data_027e0f74 +_02144b60: .word gAdventureFlags .global func_ov14_02144b64 arm_func_start func_ov14_02144b64 @@ -12522,7 +12522,7 @@ _02144ca4: ldrb r0, [r0, #4] cmp r0, #0 beq _02144cd8 - ldr r0, _02144cfc ; =data_027e0f74 + ldr r0, _02144cfc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -12540,7 +12540,7 @@ _02144ce4: .align 2, 0 arm_func_end func_ov14_02144b64 _02144cf8: .word data_027e0c68 -_02144cfc: .word data_027e0f74 +_02144cfc: .word gAdventureFlags .global func_ov14_02144d00 arm_func_start func_ov14_02144d00 @@ -12639,7 +12639,7 @@ func_ov14_02144d94: ; 0x02144d94 add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02144de8 ; =data_027e0f74 + ldr r0, _02144de8 ; =gAdventureFlags mvn ip, #0 mov r3, #0x32 ldr r0, [r0] @@ -12656,13 +12656,13 @@ func_ov14_02144d94: ; 0x02144d94 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02144d94 -_02144de8: .word data_027e0f74 +_02144de8: .word gAdventureFlags .global func_ov14_02144dec arm_func_start func_ov14_02144dec func_ov14_02144dec: ; 0x02144dec stmdb sp!, {r4, lr} - ldr r1, _02144e10 ; =data_027e0f74 + ldr r1, _02144e10 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x1b4] @@ -12672,7 +12672,7 @@ func_ov14_02144dec: ; 0x02144dec ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02144dec -_02144e10: .word data_027e0f74 +_02144e10: .word gAdventureFlags .global func_ov14_02144e14 arm_func_start func_ov14_02144e14 @@ -12697,27 +12697,27 @@ func_ov14_02144e28: ; 0x02144e28 .global func_ov14_02144e3c arm_func_start func_ov14_02144e3c func_ov14_02144e3c: ; 0x02144e3c - ldr r2, _02144e50 ; =data_027e0f74 + ldr r2, _02144e50 ; =gAdventureFlags ldr ip, _02144e54 ; =func_ov00_02097760 ldrh r1, [r0, #0x22] ldr r0, [r2] bx ip .align 2, 0 arm_func_end func_ov14_02144e3c -_02144e50: .word data_027e0f74 +_02144e50: .word gAdventureFlags _02144e54: .word func_ov00_02097760 .global func_ov14_02144e58 arm_func_start func_ov14_02144e58 func_ov14_02144e58: ; 0x02144e58 - ldr r2, _02144e6c ; =data_027e0f74 + ldr r2, _02144e6c ; =gAdventureFlags ldr ip, _02144e70 ; =func_ov00_02097760 ldrh r1, [r0, #0x26] ldr r0, [r2] bx ip .align 2, 0 arm_func_end func_ov14_02144e58 -_02144e6c: .word data_027e0f74 +_02144e6c: .word gAdventureFlags _02144e70: .word func_ov00_02097760 .global func_ov14_02144e74 @@ -15717,7 +15717,7 @@ func_ov14_02147548: ; 0x02147548 ldrh r1, [r4, #0x26] cmp r1, #0 beq _02147574 - ldr r0, _02147580 ; =data_027e0f74 + ldr r0, _02147580 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -15729,7 +15729,7 @@ _02147574: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02147548 -_02147580: .word data_027e0f74 +_02147580: .word gAdventureFlags .global func_ov14_02147584 arm_func_start func_ov14_02147584 @@ -18126,7 +18126,7 @@ _0214943c: ldr r2, [r0] ldr r2, [r2, #0xc] blx r2 - ldr r0, _021497f4 ; =data_027e0f74 + ldr r0, _021497f4 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] bl func_ov00_02097760 @@ -18376,7 +18376,7 @@ _021497dc: _021497e8: .word data_027e0e60 _021497ec: .word data_027e0f68 _021497f0: .word data_027e0fec -_021497f4: .word data_027e0f74 +_021497f4: .word gAdventureFlags _021497f8: .word data_027e0fe8 _021497fc: .word 0x5352574c _02149800: .word data_027e0fe4 @@ -19147,7 +19147,7 @@ _0214a1f0: strb r2, [sp, #0x19] strb r0, [sp, #0x1a] ldr r0, [r6, #0x1c] - ldr r1, _0214a3c4 ; =data_027e0f74 + ldr r1, _0214a3c4 ; =gAdventureFlags add r0, r0, #0x33 add r3, r0, #0x1300 ldr r0, [r1] @@ -19261,7 +19261,7 @@ _0214a3ac: _0214a3b8: .word data_027e0e60 _0214a3bc: .word data_027e0ffc _0214a3c0: .word 0x0000030f -_0214a3c4: .word data_027e0f74 +_0214a3c4: .word gAdventureFlags _0214a3c8: .word data_027e0e58 _0214a3cc: .word data_ov14_02153f04 _0214a3d0: .word 0x000001b9 @@ -20101,7 +20101,7 @@ func_ov14_0214adfc: ; 0x0214adfc _0214ae44: cmp r4, #0 beq _0214ae64 - ldr r0, _0214ae88 ; =data_027e0f74 + ldr r0, _0214ae88 ; =gAdventureFlags mov r1, r4 ldr r0, [r0] bl func_ov00_02097760 @@ -20120,7 +20120,7 @@ _0214ae7c: .align 2, 0 arm_func_end func_ov14_0214adfc _0214ae84: .word data_027e0e60 -_0214ae88: .word data_027e0f74 +_0214ae88: .word gAdventureFlags _0214ae8c: .word data_027e0f90 .global func_ov14_0214ae90 @@ -20221,7 +20221,7 @@ func_ov14_0214af4c: ; 0x0214af4c ldr r1, [r4, #0x168] cmp r1, #0 blt _0214afc0 - ldr r0, _0214b010 ; =data_027e0f74 + ldr r0, _0214b010 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bcc mvn r0, #0 @@ -20250,7 +20250,7 @@ _0214afe0: .align 2, 0 arm_func_end func_ov14_0214af4c _0214b00c: .word data_027e0c68 -_0214b010: .word data_027e0f74 +_0214b010: .word gAdventureFlags _0214b014: .word data_027e0fc8 .global func_ov14_0214b018 @@ -20311,7 +20311,7 @@ _0214b048: str r0, [r5, #0x164] _0214b0e8: ldr r1, [r5, #0x164] - ldr r0, _0214b294 ; =data_027e0f74 + ldr r0, _0214b294 ; =gAdventureFlags add r1, r1, #0x158 str r1, [r5, #0x160] ldrb r1, [r1, #0x54] @@ -20391,7 +20391,7 @@ _0214b1f4: ldr r0, [r5, #0x30] cmp r0, #0 bne _0214b230 - ldr r0, _0214b294 ; =data_027e0f74 + ldr r0, _0214b294 ; =gAdventureFlags mov r2, #0x3c ldr r0, [r0] add r1, sp, #0x3c @@ -20399,7 +20399,7 @@ _0214b1f4: bl func_ov00_02097810 b _0214b24c _0214b230: - ldr r0, _0214b294 ; =data_027e0f74 + ldr r0, _0214b294 ; =gAdventureFlags sub r2, r1, #1 ldr r0, [r0] add r1, sp, #0x3c @@ -20429,7 +20429,7 @@ _0214b284: .word data_027e0fc8 _0214b288: .word data_027e0fe4 _0214b28c: .word data_ov14_02159cec _0214b290: .word 0x47524d47 -_0214b294: .word data_027e0f74 +_0214b294: .word gAdventureFlags _0214b298: .word data_027e0c68 _0214b29c: .word data_027e0f94 @@ -20441,7 +20441,7 @@ func_ov14_0214b2a0: ; 0x0214b2a0 ldr r1, [r4, #0x168] cmp r1, #0 blt _0214b2c8 - ldr r0, _0214b2d4 ; =data_027e0f74 + ldr r0, _0214b2d4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bcc mvn r0, #0 @@ -20452,7 +20452,7 @@ _0214b2c8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214b2a0 -_0214b2d4: .word data_027e0f74 +_0214b2d4: .word gAdventureFlags .global func_ov14_0214b2d8 arm_func_start func_ov14_0214b2d8 @@ -20482,7 +20482,7 @@ func_ov14_0214b2d8: ; 0x0214b2d8 _0214b330: cmp r4, #0 beq _0214b350 - ldr r0, _0214b360 ; =data_027e0f74 + ldr r0, _0214b360 ; =gAdventureFlags mov r1, r4 ldr r0, [r0] bl func_ov00_02097760 @@ -20496,7 +20496,7 @@ _0214b358: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_0214b2d8 -_0214b360: .word data_027e0f74 +_0214b360: .word gAdventureFlags .global func_ov14_0214b364 arm_func_start func_ov14_0214b364 @@ -20799,14 +20799,14 @@ _0214b770: ldrb r0, [r4, #0xa4] cmp r0, #0 beq _0214b7f4 - ldr r0, _0214b95c ; =data_027e0f74 + ldr r0, _0214b95c ; =gAdventureFlags ldr r1, [r4, #0xa0] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} - ldr r0, _0214b95c ; =data_027e0f74 + ldr r0, _0214b95c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -20886,7 +20886,7 @@ _0214b888: add sp, sp, #0x18 ldmia sp!, {r4, pc} _0214b8c4: - ldr r0, _0214b95c ; =data_027e0f74 + ldr r0, _0214b95c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -20928,7 +20928,7 @@ _0214b948: _0214b950: .word data_ov00_020eec9c _0214b954: .word data_027e0ffc _0214b958: .word 0x00000369 -_0214b95c: .word data_027e0f74 +_0214b95c: .word gAdventureFlags _0214b960: .word data_027e0f64 .global func_ov14_0214b964 @@ -20980,7 +20980,7 @@ _0214b9c8: mov r2, #0x1e mov r1, #6 str r0, [sp, #4] - ldr r0, _0214bba8 ; =data_027e0f74 + ldr r0, _0214bba8 ; =gAdventureFlags strb r2, [sp, #9] strb r1, [sp, #0xa] ldr r1, [r5, #0x18] @@ -21062,7 +21062,7 @@ _0214bb28: mvnne r0, #0 cmpne r1, r0 beq _0214bb4c - ldr r0, _0214bba8 ; =data_027e0f74 + ldr r0, _0214bba8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bcc _0214bb4c: @@ -21094,7 +21094,7 @@ _0214bb9c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov14_0214b964 -_0214bba8: .word data_027e0f74 +_0214bba8: .word gAdventureFlags _0214bbac: .word data_027e0ffc _0214bbb0: .word 0x0000020a _0214bbb4: .word 0x0000020b @@ -21558,7 +21558,7 @@ func_ov14_0214c114: ; 0x0214c114 ldr r0, [r4, #0x130] cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0214c198 ; =data_027e0f74 + ldr r0, _0214c198 ; =gAdventureFlags ldrh r1, [r4, #0x26] ldr r0, [r0] bl func_ov00_02097760 @@ -21590,7 +21590,7 @@ _0214c168: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214c114 -_0214c198: .word data_027e0f74 +_0214c198: .word gAdventureFlags .global func_ov14_0214c19c arm_func_start func_ov14_0214c19c @@ -22346,7 +22346,7 @@ _0214cb1c: bl func_ov14_0214cbb0 ldmia sp!, {r4, pc} _0214cb40: - ldr r0, _0214cb98 ; =data_027e0f74 + ldr r0, _0214cb98 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097b9c @@ -22358,7 +22358,7 @@ _0214cb40: bl func_ov14_0214cbb0 ldmia sp!, {r4, pc} _0214cb6c: - ldr r0, _0214cb98 ; =data_027e0f74 + ldr r0, _0214cb98 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097bac @@ -22371,7 +22371,7 @@ _0214cb6c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214cae4 -_0214cb98: .word data_027e0f74 +_0214cb98: .word gAdventureFlags .global func_ov14_0214cb9c arm_func_start func_ov14_0214cb9c @@ -22399,7 +22399,7 @@ _0214cbc8: ; jump table b _0214cc10 ; case 3 b _0214cc2c ; case 4 _0214cbdc: - ldr r0, _0214cc34 ; =data_027e0f74 + ldr r0, _0214cc34 ; =gAdventureFlags ldr r1, [r4, #0x15c] ldr r0, [r0] bl func_ov00_02097968 @@ -22425,7 +22425,7 @@ _0214cc2c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214cbb0 -_0214cc34: .word data_027e0f74 +_0214cc34: .word gAdventureFlags .global func_ov14_0214cc38 arm_func_start func_ov14_0214cc38 @@ -22452,7 +22452,7 @@ func_ov14_0214cc58: ; 0x0214cc58 ldrh r1, [r4, #0x24] cmp r1, #0 beq _0214cc8c - ldr r0, _0214ccbc ; =data_027e0f74 + ldr r0, _0214ccbc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -22474,7 +22474,7 @@ _0214ccb4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214cc58 -_0214ccbc: .word data_027e0f74 +_0214ccbc: .word gAdventureFlags .global func_ov14_0214ccc0 arm_func_start func_ov14_0214ccc0 @@ -22482,14 +22482,14 @@ func_ov14_0214ccc0: ; 0x0214ccc0 stmdb sp!, {r3, lr} ldr r0, [r0, #0x15c] bl func_ov00_02097cf8 - ldr r2, _0214cce0 ; =data_027e0f74 + ldr r2, _0214cce0 ; =gAdventureFlags mov r1, r0 ldr r0, [r2] bl func_ov00_02097760 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov14_0214ccc0 -_0214cce0: .word data_027e0f74 +_0214cce0: .word gAdventureFlags .global func_ov14_0214cce4 arm_func_start func_ov14_0214cce4 @@ -25278,14 +25278,14 @@ _0214f1f4: ldrb r0, [r4, #0x7c] cmp r0, #0 beq _0214f218 - ldr r0, _0214f244 ; =data_027e0f74 + ldr r0, _0214f244 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _0214f218: - ldr r0, _0214f244 ; =data_027e0f74 + ldr r0, _0214f244 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0xa @@ -25298,7 +25298,7 @@ _0214f218: .align 2, 0 arm_func_end func_ov14_0214f184 _0214f240: .word data_ov00_020eec68 -_0214f244: .word data_027e0f74 +_0214f244: .word gAdventureFlags _0214f248: .word data_027e0fc8 .global func_ov14_0214f24c @@ -25380,7 +25380,7 @@ _0214f2d0: strb r0, [sp, #0xb] strb r1, [sp, #9] ldr r1, [r5, #0x18] - ldr r0, _0214f4f8 ; =data_027e0f74 + ldr r0, _0214f4f8 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r5, #0x1c] ldr r0, [r0] @@ -25491,7 +25491,7 @@ _0214f4e8: .align 2, 0 arm_func_end func_ov14_0214f24c _0214f4f4: .word data_ov14_02153fd4 -_0214f4f8: .word data_027e0f74 +_0214f4f8: .word gAdventureFlags _0214f4fc: .word data_ov00_020eec68 _0214f500: .word data_027e0e60 @@ -25753,7 +25753,7 @@ _0214f830: add sp, sp, #8 ldmia sp!, {r4, pc} _0214f86c: - ldr r0, _0214f8ec ; =data_027e0f74 + ldr r0, _0214f8ec ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c @@ -25789,7 +25789,7 @@ _0214f8e0: .align 2, 0 arm_func_end func_ov14_0214f7f0 _0214f8e8: .word data_027e0ffc -_0214f8ec: .word data_027e0f74 +_0214f8ec: .word gAdventureFlags .global func_ov14_0214f8f0 arm_func_start func_ov14_0214f8f0 @@ -26054,7 +26054,7 @@ _0214fc10: bl func_ov14_0214fca4 ldmia sp!, {r4, pc} _0214fc34: - ldr r0, _0214fc8c ; =data_027e0f74 + ldr r0, _0214fc8c ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097b9c @@ -26066,7 +26066,7 @@ _0214fc34: bl func_ov14_0214fca4 ldmia sp!, {r4, pc} _0214fc60: - ldr r0, _0214fc8c ; =data_027e0f74 + ldr r0, _0214fc8c ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097bac @@ -26079,7 +26079,7 @@ _0214fc60: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214fba0 -_0214fc8c: .word data_027e0f74 +_0214fc8c: .word gAdventureFlags .global func_ov14_0214fc90 arm_func_start func_ov14_0214fc90 @@ -26113,7 +26113,7 @@ _0214fcd0: mov r2, #0x32 mov r1, #9 str r0, [sp, #4] - ldr r0, _0214fd60 ; =data_027e0f74 + ldr r0, _0214fd60 ; =gAdventureFlags strb r2, [sp, #9] strb r1, [sp, #0xa] ldr r1, [r4, #0x48] @@ -26148,7 +26148,7 @@ _0214fd54: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_0214fca4 -_0214fd60: .word data_027e0f74 +_0214fd60: .word gAdventureFlags _0214fd64: .word data_ov00_020eec9c .global func_ov14_0214fd68 @@ -28927,7 +28927,7 @@ func_ov14_02151be8: ; 0x02151be8 arm_func_start func_ov14_02151bec func_ov14_02151bec: ; 0x02151bec stmdb sp!, {r4, lr} - ldr r1, _02151dc8 ; =data_027e0f74 + ldr r1, _02151dc8 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] bl func_ov00_02097738 @@ -28939,7 +28939,7 @@ func_ov14_02151bec: ; 0x02151bec ldr r0, [r0] cmp r0, #1 ldmneia sp!, {r4, pc} - ldr r0, _02151dc8 ; =data_027e0f74 + ldr r0, _02151dc8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -29057,7 +29057,7 @@ _02151db0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov14_02151bec -_02151dc8: .word data_027e0f74 +_02151dc8: .word gAdventureFlags _02151dcc: .word data_027e077c _02151dd0: .word data_027e0618 _02151dd4: .word data_027e0c68 @@ -29904,7 +29904,7 @@ _02152820: ldr r0, [r4, #0x84] cmp r0, #3 bne _02152860 - ldr r0, _0215287c ; =data_027e0f74 + ldr r0, _0215287c ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] bl func_ov00_02097760 @@ -29927,7 +29927,7 @@ _02152860: arm_func_end func_ov14_02152728 _02152874: .word data_027e103c _02152878: .word data_027e0d38 -_0215287c: .word data_027e0f74 +_0215287c: .word gAdventureFlags .global func_ov14_02152880 arm_func_start func_ov14_02152880 diff --git a/asm/ov15.inc b/asm/ov15.inc index da3958ec..1ff424b8 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -69,7 +69,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f7c .extern data_027e0f84 diff --git a/asm/ov15.s b/asm/ov15.s index 9acb5ed9..1dc16c9e 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -3222,7 +3222,7 @@ func_ov15_02122140: ; 0x02122140 ldrsh r0, [r4, #0x78] cmp r0, #0 beq _02122170 - ldr r0, _0212229c ; =data_027e0f74 + ldr r0, _0212229c ; =gAdventureFlags mov r1, #0x30 ldr r0, [r0] bl func_ov00_02097760 @@ -3314,7 +3314,7 @@ _02122240: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov15_02122140 -_0212229c: .word data_027e0f74 +_0212229c: .word gAdventureFlags _021222a0: .word data_027e0d0c _021222a4: .word 0x53454f43 _021222a8: .word 0x53454b45 @@ -8266,14 +8266,14 @@ _02126628: .global func_ov15_02126638 arm_func_start func_ov15_02126638 func_ov15_02126638: ; 0x02126638 - ldr r0, _0212664c ; =data_027e0f74 + ldr r0, _0212664c ; =gAdventureFlags ldr ip, _02126650 ; =func_ov00_02097760 mov r1, #0x32 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov15_02126638 -_0212664c: .word data_027e0f74 +_0212664c: .word gAdventureFlags _02126650: .word func_ov00_02097760 .global func_ov15_02126654 @@ -16114,7 +16114,7 @@ func_ov15_0212ca38: ; 0x0212ca38 strb r1, [r4, #0x1a9] ldr r0, [r0] bl func_ov15_02184644 - ldr r0, _0212cdf4 ; =data_027e0f74 + ldr r0, _0212cdf4 ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] bl func_ov00_02097760 @@ -16355,7 +16355,7 @@ _0212cde4: .align 2, 0 arm_func_end func_ov15_0212ca38 _0212cdf0: .word data_027e0fe4 -_0212cdf4: .word data_027e0f74 +_0212cdf4: .word gAdventureFlags _0212cdf8: .word data_ov15_0218a484 _0212cdfc: .word data_027e0fec _0212ce00: .word 0x0000ffff @@ -16629,7 +16629,7 @@ _0212d0d8: ldr r2, [sp, #0x54] str r3, [sp, #0xec] mov r3, #2 - ldr r0, _0212d298 ; =data_027e0f74 + ldr r0, _0212d298 ; =gAdventureFlags ldrb r1, [sp, #0x60] ldrb r7, [sp, #0x61] ldrb r6, [sp, #0x62] @@ -16681,7 +16681,7 @@ _0212d278: _0212d28c: .word data_027e0fe4 _0212d290: .word data_027e0f64 _0212d294: .word data_027e0f94 -_0212d298: .word data_027e0f74 +_0212d298: .word gAdventureFlags .global func_ov15_0212d29c arm_func_start func_ov15_0212d29c @@ -17615,7 +17615,7 @@ _0212df28: strb r3, [sp, #0x1c] strb r2, [sp, #0x1d] bl func_ov15_021413f8 - ldr r0, _0212e074 ; =data_027e0f74 + ldr r0, _0212e074 ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] mov r2, #1 @@ -17641,7 +17641,7 @@ _0212e064: .word data_027e0c68 _0212e068: .word 0x00050022 _0212e06c: .word data_027e0e60 _0212e070: .word data_027e10a4 -_0212e074: .word data_027e0f74 +_0212e074: .word gAdventureFlags .global func_ov15_0212e078 arm_func_start func_ov15_0212e078 @@ -19011,7 +19011,7 @@ func_ov15_0212f368: ; 0x0212f368 arm_func_start func_ov15_0212f36c func_ov15_0212f36c: ; 0x0212f36c stmdb sp!, {r3, lr} - ldr r0, _0212f390 ; =data_027e0f74 + ldr r0, _0212f390 ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] bl func_ov00_02097760 @@ -19021,7 +19021,7 @@ func_ov15_0212f36c: ; 0x0212f36c ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov15_0212f36c -_0212f390: .word data_027e0f74 +_0212f390: .word gAdventureFlags _0212f394: .word data_ov15_02185dc0 .global func_ov15_0212f398 @@ -19365,7 +19365,7 @@ func_ov15_0212f7b0: ; 0x0212f7b0 bl func_ov15_021845e8 mov r1, #7 str r1, [r4, #0x130] - ldr r0, _0212fc0c ; =data_027e0f74 + ldr r0, _0212fc0c ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] bl func_ov00_02097760 @@ -19376,7 +19376,7 @@ func_ov15_0212f7b0: ; 0x0212f7b0 ldrh r0, [r4, #0x24] cmp r0, #0 bne _0212f824 - ldr r0, _0212fc0c ; =data_027e0f74 + ldr r0, _0212fc0c ; =gAdventureFlags ldr r1, _0212fc10 ; =0x0000010f ldr r0, [r0] bl func_ov00_02097760 @@ -19480,7 +19480,7 @@ _0212f824: ldrh r0, [r4, #0x26] cmp r0, #0 beq _0212fad4 - ldr r0, _0212fc0c ; =data_027e0f74 + ldr r0, _0212fc0c ; =gAdventureFlags mov r1, #0xa ldr r0, [r0] bl func_ov00_02097760 @@ -19488,7 +19488,7 @@ _0212f824: addeq sp, sp, #0x5c moveq r0, #0 ldmeqia sp!, {r4, r5, pc} - ldr r0, _0212fc0c ; =data_027e0f74 + ldr r0, _0212fc0c ; =gAdventureFlags ldr r1, _0212fc10 ; =0x0000010f ldr r0, [r0] bl func_ov00_02097760 @@ -19501,7 +19501,7 @@ _0212f824: bl _ZN5Actor18func_Ov00_020c1bfcEi cmp r0, #0 beq _0212fab4 - ldr r0, _0212fc0c ; =data_027e0f74 + ldr r0, _0212fc0c ; =gAdventureFlags mov r1, #0xb8 ldr r0, [r0] mov r2, #0 @@ -19567,14 +19567,14 @@ _0212fad4: ldr r1, _0212fc10 ; =0x0000010f cmp r0, #0 beq _0212fbc8 - ldr r0, _0212fc0c ; =data_027e0f74 + ldr r0, _0212fc0c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 addne sp, sp, #0x5c movne r0, #0 ldmneia sp!, {r4, r5, pc} - ldr r0, _0212fc0c ; =data_027e0f74 + ldr r0, _0212fc0c ; =gAdventureFlags mov r1, #0xb8 ldr r0, [r0] bl func_ov00_02097760 @@ -19627,7 +19627,7 @@ _0212fbb0: str r4, [r0] b _0212fbe4 _0212fbc8: - ldr r0, _0212fc0c ; =data_027e0f74 + ldr r0, _0212fc0c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -19647,7 +19647,7 @@ _0212fbe4: .align 2, 0 arm_func_end func_ov15_0212f7b0 _0212fc08: .word data_027e0fe4 -_0212fc0c: .word data_027e0f74 +_0212fc0c: .word gAdventureFlags _0212fc10: .word 0x0000010f _0212fc14: .word data_027e10a0 _0212fc18: .word 0x00002666 @@ -19943,7 +19943,7 @@ _0212fe8c: str r8, [sp, #0x21c] ldr r8, [sp, #0x1a0] str r0, [sp, #0x240] - ldr r0, _0213053c ; =data_027e0f74 + ldr r0, _0213053c ; =gAdventureFlags ldrb r7, [sp, #0x1bc] ldrb r6, [sp, #0x1bd] ldrb lr, [sp, #0x1be] @@ -20225,7 +20225,7 @@ _02130220: strb r3, [sp, #0x13a] ldrb r7, [sp, #0xa7] ldrb r6, [sp, #0xa8] - ldr r0, _0213053c ; =data_027e0f74 + ldr r0, _0213053c ; =gAdventureFlags mov r3, #0x5c mov r2, #0 ldr r0, [r0] @@ -20259,7 +20259,7 @@ _0213052c: .word data_027e0d0c _02130530: .word 0x0000ffff _02130534: .word data_027e0f94 _02130538: .word data_027e0f64 -_0213053c: .word data_027e0f74 +_0213053c: .word gAdventureFlags _02130540: .word data_027e0e60 _02130544: .word data_027e10a4 _02130548: .word 0xffffc568 @@ -20466,13 +20466,13 @@ func_ov15_021307e8: ; 0x021307e8 bl _ZN5Actor18func_ov00_020c313cEj cmp r0, #0 beq _021308b0 - ldr r0, _02130908 ; =data_027e0f74 + ldr r0, _02130908 ; =gAdventureFlags ldr r1, [r5, #0x488] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 bne _02130848 - ldr r0, _02130908 ; =data_027e0f74 + ldr r0, _02130908 ; =gAdventureFlags ldr r1, [r5, #0x48c] ldr r0, [r0] bl func_ov00_02097b9c @@ -20538,7 +20538,7 @@ _021308f4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_021307e8 -_02130908: .word data_027e0f74 +_02130908: .word gAdventureFlags _0213090c: .word data_ov15_0218a5a0 _02130910: .word data_ov15_0218a5ac _02130914: .word data_ov15_02185e40 @@ -20569,7 +20569,7 @@ func_ov15_0213091c: ; 0x0213091c cmp r0, #0 addne sp, sp, #0x1c ldmneia sp!, {r4, r5, pc} - ldr r0, _02130a10 ; =data_027e0f74 + ldr r0, _02130a10 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] bl func_ov00_02097760 @@ -20610,7 +20610,7 @@ func_ov15_0213091c: ; 0x0213091c .align 2, 0 arm_func_end func_ov15_0213091c _02130a0c: .word 0x0000ffff -_02130a10: .word data_027e0f74 +_02130a10: .word gAdventureFlags _02130a14: .word data_027e0f64 _02130a18: .word data_027e0f94 @@ -20631,7 +20631,7 @@ func_ov15_02130a1c: ; 0x02130a1c ldrh r0, [r4, #0x24] cmp r0, #0 bne _02130a70 - ldr r0, _02130bb4 ; =data_027e0f74 + ldr r0, _02130bb4 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] bl func_ov00_02097760 @@ -20724,7 +20724,7 @@ _02130b30: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_02130a1c -_02130bb4: .word data_027e0f74 +_02130bb4: .word gAdventureFlags _02130bb8: .word data_027e0f94 .global func_ov15_02130bbc @@ -20736,7 +20736,7 @@ func_ov15_02130bbc: ; 0x02130bbc cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _02130c30 ; =data_027e0f74 + ldr r0, _02130c30 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] bl func_ov00_02097760 @@ -20762,7 +20762,7 @@ _02130c28: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02130bbc -_02130c30: .word data_027e0f74 +_02130c30: .word gAdventureFlags _02130c34: .word data_027e0f94 .global func_ov15_02130c38 @@ -21156,7 +21156,7 @@ _02131170: ldmneia sp!, {r3, r4, pc} ldr r2, [r4, #0x30] ldr r1, [r4, #0x330] - ldr r0, _021311c0 ; =data_027e0f74 + ldr r0, _021311c0 ; =gAdventureFlags str r2, [r1, #0x1a0] ldr r0, [r0] ldr r1, _021311c4 ; =0x0000010f @@ -21170,7 +21170,7 @@ _02131170: arm_func_end func_ov15_02131020 _021311b8: .word data_027e0f94 _021311bc: .word data_027e0fe4 -_021311c0: .word data_027e0f74 +_021311c0: .word gAdventureFlags _021311c4: .word 0x0000010f .global func_ov15_021311c8 @@ -21343,7 +21343,7 @@ _021312b0: str r3, [sp, #0x220] strb r6, [sp, #0x262] strb r5, [sp, #0x263] - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags ldrb r3, [sp, #0x1d0] mov r2, #0x5c ldr r0, [r0] @@ -21353,13 +21353,13 @@ _021312b0: strb r8, [sp, #0x1ea] bl func_ov00_02097810 str r0, [r4, #0x48c] - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021314a8 - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097bcc @@ -21478,7 +21478,7 @@ _021315c0: ldr r8, [sp, #0x9c] str r3, [sp, #0x120] ldr r3, [sp, #0xa0] - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags ldrb r7, [sp, #0xb4] ldrb r6, [sp, #0xb5] ldrb r5, [sp, #0xb6] @@ -21512,13 +21512,13 @@ _021315c0: strb r2, [sp, #0xd2] bl func_ov00_02097810 str r0, [r4, #0x488] - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x48c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02131714 - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x48c] ldr r0, [r0] bl func_ov00_02097bcc @@ -21573,13 +21573,13 @@ _02131740: mov r0, r4 mov r1, #0 bl _ZN5Actor10SetUnk_11cEc - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021317fc - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097bcc @@ -21646,7 +21646,7 @@ _021318c8: rsb r0, r0, #0 cmp r1, r0 bge _021318fc - ldr r0, _02131920 ; =data_027e0f74 + ldr r0, _02131920 ; =gAdventureFlags mov r1, #0xb8 ldr r0, [r0] mov r2, #1 @@ -21663,7 +21663,7 @@ _02131910: .word data_027e0f64 _02131914: .word data_027e0c68 _02131918: .word 0x00050020 _0213191c: .word 0x00001770 -_02131920: .word data_027e0f74 +_02131920: .word gAdventureFlags _02131924: .word data_027e0e2c _02131928: .word func_ov15_0212f3cc _0213192c: .word 0x00050021 @@ -21750,7 +21750,7 @@ _021319e4: strb r3, [r1, #0x239] bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02131ee4 ; =data_027e0f74 + ldr r0, _02131ee4 ; =gAdventureFlags mvn ip, #0 mov r3, #0x32 ldr r0, [r0] @@ -21856,13 +21856,13 @@ _02131b98: str r0, [r4, #0x138] mov r0, #3 strb r0, [r4, #0x490] - ldr r0, _02131ee4 ; =data_027e0f74 + ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02131c1c - ldr r0, _02131ee4 ; =data_027e0f74 + ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097bcc @@ -21870,7 +21870,7 @@ _02131c1c: add r0, sp, #0x28 bl func_ov00_0209a4f4 mov r3, #0 - ldr r0, _02131ee4 ; =data_027e0f74 + ldr r0, _02131ee4 ; =gAdventureFlags mvn lr, #0 mov ip, #0x32 mov r2, #6 @@ -21932,7 +21932,7 @@ _02131ce8: _02131d08: mov r0, r4 bl _ZN5Actor20IncreaseActiveFramesEv - ldr r0, _02131ee4 ; =data_027e0f74 + ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097b9c @@ -21982,13 +21982,13 @@ _02131d84: cmp r0, #0x1000000 addne sp, sp, #0x188 ldmneia sp!, {r4, pc} - ldr r0, _02131ee4 ; =data_027e0f74 + ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02131df8 - ldr r0, _02131ee4 ; =data_027e0f74 + ldr r0, _02131ee4 ; =gAdventureFlags ldr r1, [r4, #0x488] ldr r0, [r0] bl func_ov00_02097bcc @@ -22002,7 +22002,7 @@ _02131df8: str r2, [r4, #0x488] mov r1, #0 strb r1, [r4, #0x4c9] - ldr r0, _02131ee4 ; =data_027e0f74 + ldr r0, _02131ee4 ; =gAdventureFlags add r1, r2, #0x110 ldr r0, [r0] mov r2, #1 @@ -22057,7 +22057,7 @@ _02131ed0: _02131ed8: .word data_027e0f94 _02131edc: .word 0x00000171 _02131ee0: .word data_027e0d0c -_02131ee4: .word data_027e0f74 +_02131ee4: .word gAdventureFlags _02131ee8: .word 0x0000ffff _02131eec: .word data_027e0c68 _02131ef0: .word 0x00050049 @@ -22757,7 +22757,7 @@ func_ov15_0213287c: ; 0x0213287c beq _021328dc mov r1, #0 strb r1, [r4, #0x118] - ldr r0, _02132948 ; =data_027e0f74 + ldr r0, _02132948 ; =gAdventureFlags mov r1, #0xb8 ldr r0, [r0] mov r2, #1 @@ -22794,7 +22794,7 @@ _021328dc: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0213287c -_02132948: .word data_027e0f74 +_02132948: .word gAdventureFlags .global func_ov15_0213294c arm_func_start func_ov15_0213294c @@ -23053,7 +23053,7 @@ func_ov15_02132c48: ; 0x02132c48 beq _02132c80 cmp r0, #1 bne _02132c80 - ldr r0, _02132de4 ; =data_027e0f74 + ldr r0, _02132de4 ; =gAdventureFlags mov r1, #0x1d ldr r0, [r0] bl func_ov00_02097760 @@ -23154,7 +23154,7 @@ _02132db8: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov15_02132c48 -_02132de4: .word data_027e0f74 +_02132de4: .word gAdventureFlags _02132de8: .word data_027e0d0c .global func_ov15_02132dec @@ -23299,7 +23299,7 @@ _02132f8c: mov r6, #0x32 mov lr, #0 mov ip, #2 - ldr r0, _02133090 ; =data_027e0f74 + ldr r0, _02133090 ; =gAdventureFlags str r7, [sp, #0x18] strb r6, [sp, #0x1d] strb lr, [sp, #0x1e] @@ -23341,7 +23341,7 @@ _02133080: .word data_027e0764 _02133084: .word 0x00000666 _02133088: .word data_027e10a4 _0213308c: .word data_027e0f94 -_02133090: .word data_027e0f74 +_02133090: .word gAdventureFlags .global func_ov15_02133094 arm_func_start func_ov15_02133094 @@ -23409,7 +23409,7 @@ func_ov15_02133150: ; 0x02133150 ldr r0, [r5, #0x130] cmp r0, #8 beq _0213318c - ldr r0, _02133208 ; =data_027e0f74 + ldr r0, _02133208 ; =gAdventureFlags ldr r1, [r5, #0x36c] ldr r0, [r0] bl func_ov00_02097b9c @@ -23451,7 +23451,7 @@ _021331f4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02133150 -_02133208: .word data_027e0f74 +_02133208: .word gAdventureFlags _0213320c: .word data_ov15_0218a6e0 _02133210: .word data_ov15_0218a6ec _02133214: .word data_027e0f94 @@ -23763,7 +23763,7 @@ _02133630: mov r1, #5 strb r2, [r7, #0x376] bl func_ov15_02132dec - ldr r0, _02133ccc ; =data_027e0f74 + ldr r0, _02133ccc ; =gAdventureFlags mov r1, #0x36 ldr r0, [r0] bl func_ov00_02097760 @@ -23852,13 +23852,13 @@ _021337c8: mov r1, #1 ldr r0, [r0] bl func_ov15_021413d4 - ldr r0, _02133ccc ; =data_027e0f74 + ldr r0, _02133ccc ; =gAdventureFlags ldr r1, [r7, #0x36c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02133828 - ldr r0, _02133ccc ; =data_027e0f74 + ldr r0, _02133ccc ; =gAdventureFlags ldr r1, [r7, #0x36c] ldr r0, [r0] bl func_ov00_02097bcc @@ -24148,7 +24148,7 @@ _02133c00: bne _02133c6c mov r1, #0 strb r1, [r7, #0x373] - ldr r0, _02133ccc ; =data_027e0f74 + ldr r0, _02133ccc ; =gAdventureFlags strb r1, [r7, #0x374] ldr r0, [r0] mov r1, #0x36 @@ -24184,7 +24184,7 @@ _02133cbc: .word data_02050f54 _02133cc0: .word 0x00000aab _02133cc4: .word data_027e10a4 _02133cc8: .word data_027e0ffc -_02133ccc: .word data_027e0f74 +_02133ccc: .word gAdventureFlags _02133cd0: .word data_027e0d0c _02133cd4: .word 0x0000ffff _02133cd8: .word data_027e0764 @@ -26296,7 +26296,7 @@ _021358f4: .word data_ov00_020eec9c arm_func_start func_ov15_021358f8 func_ov15_021358f8: ; 0x021358f8 stmdb sp!, {r3, lr} - ldr r0, _0213592c ; =data_027e0f74 + ldr r0, _0213592c ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] bl func_ov00_02097760 @@ -26311,7 +26311,7 @@ _02135924: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov15_021358f8 -_0213592c: .word data_027e0f74 +_0213592c: .word gAdventureFlags .global func_ov15_02135930 arm_func_start func_ov15_02135930 @@ -27277,7 +27277,7 @@ func_ov15_02136630: ; 0x02136630 arm_func_start func_ov15_02136670 func_ov15_02136670: ; 0x02136670 stmdb sp!, {r4, lr} - ldr r1, _021366a8 ; =data_027e0f74 + ldr r1, _021366a8 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x30 @@ -27292,7 +27292,7 @@ func_ov15_02136670: ; 0x02136670 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02136670 -_021366a8: .word data_027e0f74 +_021366a8: .word gAdventureFlags .global func_ov15_021366ac arm_func_start func_ov15_021366ac @@ -27506,7 +27506,7 @@ func_ov15_021368d8: ; 0x021368d8 bl func_ov15_02137928 ldmia sp!, {r4, pc} _021368f4: - ldr r0, _02136a68 ; =data_027e0f74 + ldr r0, _02136a68 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -27531,7 +27531,7 @@ _02136944: ldrb r0, [r4, #0x25f] cmp r0, #0 bne _02136988 - ldr r0, _02136a68 ; =data_027e0f74 + ldr r0, _02136a68 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -27609,7 +27609,7 @@ _02136a54: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_021368d8 -_02136a68: .word data_027e0f74 +_02136a68: .word gAdventureFlags _02136a6c: .word data_027e0e2c .global func_ov15_02136a70 @@ -29000,7 +29000,7 @@ _02137d98: str r1, [r4, #0x268] bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02137df0 ; =data_027e0f74 + ldr r0, _02137df0 ; =gAdventureFlags mvn r4, #0 mov r3, #1 ldr r0, [r0] @@ -29018,7 +29018,7 @@ _02137d98: arm_func_end func_ov15_02137d1c _02137de8: .word data_027e0d38 _02137dec: .word data_ov00_020eec68 -_02137df0: .word data_027e0f74 +_02137df0: .word gAdventureFlags .global func_ov15_02137df4 arm_func_start func_ov15_02137df4 @@ -31511,13 +31511,13 @@ func_ov15_0213a184: ; 0x0213a184 strb r0, [r5, #0x4f1] strb r4, [r5, #0x26d] and r1, r4, #0xff - ldr r0, _0213a460 ; =data_027e0f74 + ldr r0, _0213a460 ; =gAdventureFlags strb r1, [r5, #0x26c] ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _0213a254 - ldr r0, _0213a460 ; =data_027e0f74 + ldr r0, _0213a460 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -31673,7 +31673,7 @@ _0213a404: _0213a454: .word gItemManager _0213a458: .word data_027e077c _0213a45c: .word data_027e103c -_0213a460: .word data_027e0f74 +_0213a460: .word gAdventureFlags _0213a464: .word data_027e0e2c _0213a468: .word data_027e0d38 _0213a46c: .word data_027e0fb8 @@ -31778,13 +31778,13 @@ func_ov15_0213a560: ; 0x0213a560 arm_func_start func_ov15_0213a570 func_ov15_0213a570: ; 0x0213a570 stmdb sp!, {r4, lr} - ldr r1, _0213a5e0 ; =data_027e0f74 + ldr r1, _0213a5e0 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] bl func_ov00_02097738 cmp r0, #0 bne _0213a5d0 - ldr r0, _0213a5e0 ; =data_027e0f74 + ldr r0, _0213a5e0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -31809,7 +31809,7 @@ _0213a5d8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0213a570 -_0213a5e0: .word data_027e0f74 +_0213a5e0: .word gAdventureFlags _0213a5e4: .word data_027e0e2c .global func_ov15_0213a5e8 @@ -35469,7 +35469,7 @@ _0213d70c: .word data_027e0f94 arm_func_start func_ov15_0213d710 func_ov15_0213d710: ; 0x0213d710 stmdb sp!, {r4, lr} - ldr r1, _0213d86c ; =data_027e0f74 + ldr r1, _0213d86c ; =gAdventureFlags mov r4, r0 ldr r0, [r1] bl func_ov00_02097738 @@ -35567,7 +35567,7 @@ _0213d854: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0213d710 -_0213d86c: .word data_027e0f74 +_0213d86c: .word gAdventureFlags _0213d870: .word data_027e0d38 _0213d874: .word data_027e10a4 _0213d878: .word data_027e103c @@ -36836,7 +36836,7 @@ _0213e95c: ldrh r1, [r4, #0x20] cmp r1, #0 beq _0213e98c - ldr r0, _0213ea48 ; =data_027e0f74 + ldr r0, _0213ea48 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -36897,7 +36897,7 @@ _0213e998: _0213ea3c: .word data_027e0d0c _0213ea40: .word 0x000010cd _0213ea44: .word 0xfffff99a -_0213ea48: .word data_027e0f74 +_0213ea48: .word gAdventureFlags _0213ea4c: .word 0x00001555 .global func_ov15_0213ea50 @@ -37111,7 +37111,7 @@ _0213eac8: ldr ip, [sp, #0x10c] str r6, [sp, #0x198] mov r6, #0x5c - ldr r1, _0213f4b0 ; =data_027e0f74 + ldr r1, _0213f4b0 ; =gAdventureFlags str r0, [sp, #0xc4] str r0, [sp, #0x158] ldr r0, [r1] @@ -37262,7 +37262,7 @@ _0213eac8: ldr r1, [sp, #0x3c] str r0, [sp, #0x188] and r5, r1, #0xff - ldr r0, _0213f4b0 ; =data_027e0f74 + ldr r0, _0213f4b0 ; =gAdventureFlags str sb, [sp, #0x198] ldr sb, [sp, #0x28] ldr r1, [sp, #0x1c] @@ -37583,7 +37583,7 @@ _0213f4a0: .word 0x000010cd _0213f4a4: .word 0x0000017a _0213f4a8: .word data_027e0f64 _0213f4ac: .word 0x00001388 -_0213f4b0: .word data_027e0f74 +_0213f4b0: .word gAdventureFlags _0213f4b4: .word data_027e0f94 _0213f4b8: .word data_027e0e60 _0213f4bc: .word data_027e0e58 @@ -38212,13 +38212,13 @@ _0213fd5c: ldr r0, [r0] mov r2, r1 bl func_ov00_020cfae8 - ldr r0, _0213fef8 ; =data_027e0f74 + ldr r0, _0213fef8 ; =gAdventureFlags ldr r1, [r5, #0x2fc] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0213fdd8 - ldr r0, _0213fef8 ; =data_027e0f74 + ldr r0, _0213fef8 ; =gAdventureFlags ldr r1, [r5, #0x2fc] ldr r0, [r0] bl func_ov00_02097bcc @@ -38229,7 +38229,7 @@ _0213fde0: ldrb r0, [r5, #0x344] cmp r0, #1 bne _0213fe04 - ldr r0, _0213fef8 ; =data_027e0f74 + ldr r0, _0213fef8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -38302,7 +38302,7 @@ _0213fedc: arm_func_end func_ov15_0213fce8 _0213fef0: .word data_027e0c68 _0213fef4: .word data_027e103c -_0213fef8: .word data_027e0f74 +_0213fef8: .word gAdventureFlags _0213fefc: .word data_ov00_020e83cc .global func_ov15_0213ff00 @@ -38657,7 +38657,7 @@ _021403e0: ldrh r1, [r4, #0x20] cmp r1, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02140420 ; =data_027e0f74 + ldr r0, _02140420 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -38672,7 +38672,7 @@ _021403e0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_021403bc -_02140420: .word data_027e0f74 +_02140420: .word gAdventureFlags .global func_ov15_02140424 arm_func_start func_ov15_02140424 @@ -38783,7 +38783,7 @@ _02140598: .word 0x0000ffff func_ov15_0214059c: ; 0x0214059c stmdb sp!, {r3, r4, lr} sub sp, sp, #0xbc - ldr r1, _021407ac ; =data_027e0f74 + ldr r1, _021407ac ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x2f8] @@ -38835,7 +38835,7 @@ _021405e4: ldr r1, _021407bc ; =data_027e0f64 mov r3, #0x32 mvn ip, #0 - ldr r0, _021407ac ; =data_027e0f74 + ldr r0, _021407ac ; =gAdventureFlags ldr r1, [r1] strb r3, [sp, #0x15] strb r2, [sp, #0x16] @@ -38922,7 +38922,7 @@ _0214079c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_0214059c -_021407ac: .word data_027e0f74 +_021407ac: .word gAdventureFlags _021407b0: .word data_ov15_02190458 _021407b4: .word data_027e10a4 _021407b8: .word data_027e0f68 @@ -39188,7 +39188,7 @@ func_ov15_021408bc: ; 0x021408bc ldr sl, [sp, #0x7c] str lr, [sp, #0x108] mov lr, #0x5c - ldr r1, _02140bfc ; =data_027e0f74 + ldr r1, _02140bfc ; =gAdventureFlags str r0, [sp, #0x34] str r0, [sp, #0xc8] ldr r0, [r1] @@ -39227,7 +39227,7 @@ _02140bec: .word 0x00000122 _02140bf0: .word data_027e0f64 _02140bf4: .word 0x0000157c _02140bf8: .word 0xfffff448 -_02140bfc: .word data_027e0f74 +_02140bfc: .word gAdventureFlags .global func_ov15_02140c00 arm_func_start func_ov15_02140c00 @@ -41530,7 +41530,7 @@ func_ov15_021428bc: ; 0x021428bc arm_func_start func_ov15_021428c4 func_ov15_021428c4: ; 0x021428c4 stmdb sp!, {r4, lr} - ldr r1, _021428ec ; =data_027e0f74 + ldr r1, _021428ec ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x348] @@ -41541,7 +41541,7 @@ func_ov15_021428c4: ; 0x021428c4 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_021428c4 -_021428ec: .word data_027e0f74 +_021428ec: .word gAdventureFlags .global func_ov15_021428f0 arm_func_start func_ov15_021428f0 @@ -42584,7 +42584,7 @@ _021436f8: strb r1, [r7, #0x34d] bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02143a28 ; =data_027e0f74 + ldr r0, _02143a28 ; =gAdventureFlags mvn r5, #0 mov r3, #1 ldr r0, [r0] @@ -42738,7 +42738,7 @@ _02143924: beq _02143954 bl func_ov15_02146c70 _02143954: - ldr r0, _02143a28 ; =data_027e0f74 + ldr r0, _02143a28 ; =gAdventureFlags ldr r1, [r7, #0x348] ldr r0, [r0] bl func_ov00_02097bcc @@ -42794,7 +42794,7 @@ _021439bc: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov15_021436c4 -_02143a28: .word data_027e0f74 +_02143a28: .word gAdventureFlags _02143a2c: .word 0xfffffccd _02143a30: .word data_027e0ffc _02143a34: .word 0x000003d3 @@ -42854,13 +42854,13 @@ _02143a90: str r0, [r4, #0x2bc] str r0, [r4, #0x2c0] _02143af8: - ldr r0, _02143d2c ; =data_027e0f74 + ldr r0, _02143d2c ; =gAdventureFlags ldr r1, _02143d30 ; =0x00000112 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02143b70 - ldr r0, _02143d2c ; =data_027e0f74 + ldr r0, _02143d2c ; =gAdventureFlags ldr r1, _02143d30 ; =0x00000112 ldr r0, [r0] mov r2, #1 @@ -43008,7 +43008,7 @@ _02143cfc: .align 2, 0 arm_func_end func_ov15_02143a44 _02143d28: .word data_ov00_020eec9c -_02143d2c: .word data_027e0f74 +_02143d2c: .word gAdventureFlags _02143d30: .word 0x00000112 _02143d34: .word data_027e0c68 _02143d38: .word data_ov15_02186130 @@ -43241,7 +43241,7 @@ _02144020: add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02144160 ; =data_027e0f74 + ldr r0, _02144160 ; =gAdventureFlags mvn ip, #0 mov r3, #1 ldr r0, [r0] @@ -43311,7 +43311,7 @@ _02144110: .align 2, 0 arm_func_end func_ov15_02143ff8 _0214415c: .word data_ov00_020eec68 -_02144160: .word data_027e0f74 +_02144160: .word gAdventureFlags _02144164: .word data_ov15_02186130 _02144168: .word 0x0000059a @@ -43350,7 +43350,7 @@ _021441a8: add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _021442dc ; =data_027e0f74 + ldr r0, _021442dc ; =gAdventureFlags mvn ip, #0 mov r3, #1 ldr r0, [r0] @@ -43415,7 +43415,7 @@ _0214428c: .align 2, 0 arm_func_end func_ov15_0214416c _021442d8: .word data_ov00_020eec68 -_021442dc: .word data_027e0f74 +_021442dc: .word gAdventureFlags _021442e0: .word data_027e0c68 .global func_ov15_021442e4 @@ -43457,7 +43457,7 @@ _02144344: strb r1, [r4, #0x34d] bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02144530 ; =data_027e0f74 + ldr r0, _02144530 ; =gAdventureFlags mvn r5, #0 mov r3, #1 ldr r0, [r0] @@ -43579,7 +43579,7 @@ _02144524: .align 2, 0 arm_func_end func_ov15_021442e4 _0214452c: .word data_ov00_020eec9c -_02144530: .word data_027e0f74 +_02144530: .word gAdventureFlags _02144534: .word data_ov15_0218613c _02144538: .word data_ov15_02186130 _0214453c: .word data_027e0ffc @@ -43627,7 +43627,7 @@ _021445a4: bl func_ov00_0209a4f4 mov r3, #1 mov r2, #0 - ldr r0, _0214475c ; =data_027e0f74 + ldr r0, _0214475c ; =gAdventureFlags mvn ip, #0 ldr r0, [r0] add r1, sp, #0x18 @@ -43737,7 +43737,7 @@ _02144754: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02144574 -_0214475c: .word data_027e0f74 +_0214475c: .word gAdventureFlags _02144760: .word data_027e0fa0 _02144764: .word data_027e0ffc _02144768: .word 0x000003ea @@ -43973,7 +43973,7 @@ _02144a40: strb r0, [sp, #0x12a] strb r1, [sp, #0x11e] ldr r1, [sb, #0x450] - ldr r0, _021457d0 ; =data_027e0f74 + ldr r0, _021457d0 ; =gAdventureFlags str r1, [sp, #0x140] ldr r1, [sb, #0x454] ldr r0, [r0] @@ -44568,7 +44568,7 @@ _02145370: _02145390: ldr r0, _02145820 ; =data_ov00_020eec68 bl func_ov00_020d71a0 - ldr r0, _021457d0 ; =data_027e0f74 + ldr r0, _021457d0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -44847,7 +44847,7 @@ _02145798: .align 2, 0 arm_func_end func_ov15_021449b0 _021457cc: .word data_027e0f64 -_021457d0: .word data_027e0f74 +_021457d0: .word gAdventureFlags _021457d4: .word data_027e0f94 _021457d8: .word data_027e0fac _021457dc: .word 0xfffffccd @@ -44984,7 +44984,7 @@ _02145960: ldrb r0, [r0, #0xc] cmp r0, #0 beq _021459f8 - ldr r0, _02145b5c ; =data_027e0f74 + ldr r0, _02145b5c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -45102,7 +45102,7 @@ _02145ac8: arm_func_end func_ov15_02145938 _02145b54: .word data_027e0d38 _02145b58: .word data_027e0d78 -_02145b5c: .word data_027e0f74 +_02145b5c: .word gAdventureFlags _02145b60: .word data_027e0fa0 _02145b64: .word data_ov15_02186154 _02145b68: .word data_ov00_020eec9c @@ -45760,7 +45760,7 @@ _02146324: ; jump table b _02146488 ; case 14 b _02146498 ; case 15 _02146364: - ldr r0, _021464ec ; =data_027e0f74 + ldr r0, _021464ec ; =gAdventureFlags mov r1, #0x16 ldr r0, [r0] bl func_ov00_02097760 @@ -45877,7 +45877,7 @@ _021464bc: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02146308 -_021464ec: .word data_027e0f74 +_021464ec: .word gAdventureFlags _021464f0: .word data_ov15_0218f400 _021464f4: .word data_ov15_0218b31c _021464f8: .word data_ov15_0218b320 @@ -47911,7 +47911,7 @@ _02147f18: cmp r4, #1 addle sp, sp, #0x1c ldmleia sp!, {r4, r5, r6, r7, r8, sb, pc} - ldr r0, _0214807c ; =data_027e0f74 + ldr r0, _0214807c ; =gAdventureFlags add r1, r1, #0xf3 ldr r0, [r0] bl func_ov00_02097760 @@ -47958,7 +47958,7 @@ _02148000: _02148070: .word data_027e10a4 _02148074: .word data_027e0764 _02148078: .word 0x0000071c -_0214807c: .word data_027e0f74 +_0214807c: .word gAdventureFlags .global func_ov15_02148080 arm_func_start func_ov15_02148080 @@ -53415,7 +53415,7 @@ func_ov15_0214ca50: ; 0x0214ca50 moveq r2, #1 cmp r2, #0 beq _0214ca9c - ldr r0, _0214cab0 ; =data_027e0f74 + ldr r0, _0214cab0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -53428,7 +53428,7 @@ _0214ca9c: _0214caa4: .word data_027e077c _0214caa8: .word data_02056be4 _0214caac: .word data_027e0618 -_0214cab0: .word data_027e0f74 +_0214cab0: .word gAdventureFlags .global func_ov15_0214cab4 arm_func_start func_ov15_0214cab4 @@ -56215,7 +56215,7 @@ func_ov15_0214eedc: ; 0x0214eedc func_ov15_0214ef04: ; 0x0214ef04 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x48 - ldr r1, _0214f10c ; =data_027e0f74 + ldr r1, _0214f10c ; =gAdventureFlags mov r7, r0 ldr r0, [r1] mov r1, #0x37 @@ -56351,7 +56351,7 @@ _0214f0d0: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 arm_func_end func_ov15_0214ef04 -_0214f10c: .word data_027e0f74 +_0214f10c: .word gAdventureFlags _0214f110: .word data_027e0ff0 .global func_ov15_0214f114 @@ -56364,7 +56364,7 @@ func_ov15_0214f114: ; 0x0214f114 cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r4, pc} - ldr r0, _0214f194 ; =data_027e0f74 + ldr r0, _0214f194 ; =gAdventureFlags ldr r1, _0214f198 ; =0x0000010f ldr r0, [r0] bl func_ov00_02097760 @@ -56391,7 +56391,7 @@ func_ov15_0214f114: ; 0x0214f114 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0214f114 -_0214f194: .word data_027e0f74 +_0214f194: .word gAdventureFlags _0214f198: .word 0x0000010f _0214f19c: .word data_027e0fe4 _0214f1a0: .word 0x4647474e @@ -56444,7 +56444,7 @@ _0214f1e8: strb r2, [r1, #0x239] bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _0214f72c ; =data_027e0f74 + ldr r0, _0214f72c ; =gAdventureFlags mvn ip, #0 mov r3, #0x32 ldr r0, [r0] @@ -56496,7 +56496,7 @@ _0214f2e4: strb r2, [r1, #0x239] bl func_ov00_0209a4f4 mov r3, #0 - ldr r0, _0214f72c ; =data_027e0f74 + ldr r0, _0214f72c ; =gAdventureFlags mvn lr, #0 mov ip, #0x32 mov r2, #2 @@ -56596,13 +56596,13 @@ _0214f43c: str r0, [r4, #0x130] mov r0, #0 str r0, [r4, #0x138] - ldr r0, _0214f72c ; =data_027e0f74 + ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0214f4bc - ldr r0, _0214f72c ; =data_027e0f74 + ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] bl func_ov00_02097bcc @@ -56610,7 +56610,7 @@ _0214f4bc: add r0, sp, #0x14 bl func_ov00_0209a4f4 mov r3, #0 - ldr r0, _0214f72c ; =data_027e0f74 + ldr r0, _0214f72c ; =gAdventureFlags mvn lr, #0 mov ip, #0x32 mov r2, #6 @@ -56696,7 +56696,7 @@ _0214f5ec: _0214f5fc: mov r0, r4 bl _ZN5Actor20IncreaseActiveFramesEv - ldr r0, _0214f72c ; =data_027e0f74 + ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] bl func_ov00_02097b9c @@ -56752,13 +56752,13 @@ _0214f68c: cmp r0, #0x1000000 addne sp, sp, #0x224 ldmneia sp!, {r3, r4, pc} - ldr r0, _0214f72c ; =data_027e0f74 + ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0214f6fc - ldr r0, _0214f72c ; =data_027e0f74 + ldr r0, _0214f72c ; =gAdventureFlags ldr r1, [r4, #0x1a8] ldr r0, [r0] bl func_ov00_02097bcc @@ -56778,7 +56778,7 @@ _0214f724: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov15_0214f1a4 -_0214f72c: .word data_027e0f74 +_0214f72c: .word gAdventureFlags _0214f730: .word data_027e0c68 _0214f734: .word 0x00050049 _0214f738: .word data_027e0f64 @@ -56972,7 +56972,7 @@ _0214f9d0: .word data_027e0ff0 func_ov15_0214f9d4: ; 0x0214f9d4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x60 - ldr r1, _0214fbdc ; =data_027e0f74 + ldr r1, _0214fbdc ; =gAdventureFlags str r0, [sp] ldr r0, [r1] ldr r1, _0214fbe0 ; =0x0000010f @@ -57105,7 +57105,7 @@ _0214fbb8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov15_0214f9d4 -_0214fbdc: .word data_027e0f74 +_0214fbdc: .word gAdventureFlags _0214fbe0: .word 0x0000010f _0214fbe4: .word data_027e10a4 _0214fbe8: .word data_027e0f94 @@ -58233,7 +58233,7 @@ _02150b84: ldr r0, [r0, #0x2c] cmp r0, #4 beq _02150df8 - ldr r0, _02150e9c ; =data_027e0f74 + ldr r0, _02150e9c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -58362,7 +58362,7 @@ _02150c24: strb r3, [sp, #0x114] str r2, [sp, #0x118] strb r1, [sp, #0x9a] - ldr r0, _02150e9c ; =data_027e0f74 + ldr r0, _02150e9c ; =gAdventureFlags add r1, sp, #0x84 ldr r0, [r0] bl func_ov00_02097810 @@ -58408,7 +58408,7 @@ _02150df8: ldrb r0, [r5, #0x2a3] cmp r0, #0 bne _02150e5c - ldr r0, _02150e9c ; =data_027e0f74 + ldr r0, _02150e9c ; =gAdventureFlags ldr r1, [r5, #0x294] ldr r0, [r0] bl func_ov00_02097bcc @@ -58434,7 +58434,7 @@ _02150e64: arm_func_end func_ov15_021509b8 _02150e94: .word data_027e0d3c _02150e98: .word data_027e10a4 -_02150e9c: .word data_027e0f74 +_02150e9c: .word gAdventureFlags _02150ea0: .word data_027e0c68 _02150ea4: .word 0x00050007 _02150ea8: .word data_027e103c @@ -60220,7 +60220,7 @@ _02152590: bl func_ov00_0209a4f4 mov r3, #1 mov r2, #0 - ldr r0, _02152684 ; =data_027e0f74 + ldr r0, _02152684 ; =gAdventureFlags mvn r5, #0 ldr r0, [r0] add r1, sp, #0x18 @@ -60281,7 +60281,7 @@ _0215265c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02152560 -_02152684: .word data_027e0f74 +_02152684: .word gAdventureFlags _02152688: .word data_027e0e60 _0215268c: .word data_027e0d38 _02152690: .word data_027e0fa0 @@ -60385,7 +60385,7 @@ func_ov15_021527d4: ; 0x021527d4 cmp r4, r1 addeq sp, sp, #0x48 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} - ldr r0, _021529b8 ; =data_027e0f74 + ldr r0, _021529b8 ; =gAdventureFlags ldr r1, _021529bc ; =0x00000111 ldr r0, [r0] mov r5, #0 @@ -60435,7 +60435,7 @@ _02152890: _021528b0: cmp r5, #4 bne _021528d0 - ldr r0, _021529b8 ; =data_027e0f74 + ldr r0, _021529b8 ; =gAdventureFlags mov r1, #0xe ldr r0, [r0] bl func_ov00_02097760 @@ -60502,7 +60502,7 @@ _021528d0: arm_func_end func_ov15_021527d4 _021529b0: .word data_027e1060 _021529b4: .word 0x0000ffff -_021529b8: .word data_027e0f74 +_021529b8: .word gAdventureFlags _021529bc: .word 0x00000111 _021529c0: .word gItemManager _021529c4: .word data_027e0764 @@ -60607,7 +60607,7 @@ _02152abc: str r2, [r5, #0x398] bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _0215346c ; =data_027e0f74 + ldr r0, _0215346c ; =gAdventureFlags mvn r6, #0 mov r3, #1 ldr r0, [r0] @@ -61029,11 +61029,11 @@ _021530c4: ldr r0, [r0] ldr r0, [r0, #4] bl func_ov00_020875f8 - ldr r0, _0215346c ; =data_027e0f74 + ldr r0, _0215346c ; =gAdventureFlags ldr r1, [r5, #0x348] ldr r0, [r0] bl func_ov00_02097bcc - ldr r0, _0215346c ; =data_027e0f74 + ldr r0, _0215346c ; =gAdventureFlags ldr r1, _0215349c ; =0x00000111 ldr r0, [r0] bl func_ov00_02097760 @@ -61240,7 +61240,7 @@ _02153454: arm_func_end func_ov15_02152a48 _02153464: .word data_027e0fe4 _02153468: .word data_027e0f94 -_0215346c: .word data_027e0f74 +_0215346c: .word gAdventureFlags _02153470: .word data_027e0f64 _02153474: .word data_027e0fac _02153478: .word data_02050f54 @@ -61492,7 +61492,7 @@ func_ov15_02153790: ; 0x02153790 bl func_ov00_0209a4f4 mov r3, #1 mov r2, #0 - ldr r0, _02153924 ; =data_027e0f74 + ldr r0, _02153924 ; =gAdventureFlags mvn r5, #0 ldr r0, [r0] add r1, sp, #0xc @@ -61548,14 +61548,14 @@ _02153898: ldr r0, [r5, #0x41c] cmp r0, #4 bne _021538d8 - ldr r0, _02153924 ; =data_027e0f74 + ldr r0, _02153924 ; =gAdventureFlags mov r1, #0xe ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c _021538d8: ldr r1, _02153930 ; =0x00003fff - ldr r0, _02153924 ; =data_027e0f74 + ldr r0, _02153924 ; =gAdventureFlags str r1, [r4, #0x3c8] ldr r0, [r0] ldr r1, _02153934 ; =0x00000111 @@ -61575,7 +61575,7 @@ _021538d8: .align 2, 0 arm_func_end func_ov15_02153790 _02153920: .word data_027e0f64 -_02153924: .word data_027e0f74 +_02153924: .word gAdventureFlags _02153928: .word data_027e0f94 _0215392c: .word data_027e0fe4 _02153930: .word 0x00003fff @@ -63948,7 +63948,7 @@ _02155abc: mov r0, r5 mov r1, #1 bl _ZN5Actor10SetUnk_11cEc - ldr r0, _02155b80 ; =data_027e0f74 + ldr r0, _02155b80 ; =gAdventureFlags ldr r1, _02155b84 ; =0x00000101 ldr r0, [r0] bl func_ov00_02097760 @@ -63980,7 +63980,7 @@ _02155b70: .word data_027e0fe8 _02155b74: .word 0x42554949 _02155b78: .word data_027e0c68 _02155b7c: .word 0x00050035 -_02155b80: .word data_027e0f74 +_02155b80: .word gAdventureFlags _02155b84: .word 0x00000101 .global func_ov15_02155b88 @@ -64132,7 +64132,7 @@ _02155da4: ldrb r0, [r6, #0x2f5] cmp r0, #0 beq _02155fec - ldr r0, _02156178 ; =data_027e0f74 + ldr r0, _02156178 ; =gAdventureFlags ldr r1, _0215617c ; =0x00000101 ldr r0, [r0] bl func_ov00_02097760 @@ -64145,13 +64145,13 @@ _02155da4: _02155dd8: mov r0, r6 bl _ZN5Actor20IncreaseActiveFramesEv - ldr r0, _02156178 ; =data_027e0f74 + ldr r0, _02156178 ; =gAdventureFlags ldr r1, _0215617c ; =0x00000101 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02155fa0 - ldr r0, _02156178 ; =data_027e0f74 + ldr r0, _02156178 ; =gAdventureFlags ldr r1, _0215617c ; =0x00000101 ldr r0, [r0] mov r2, #1 @@ -64245,7 +64245,7 @@ _02155dd8: strb r3, [sp, #0x10e] strb r2, [sp, #0x10f] strb r1, [sp, #0x110] - ldr r0, _02156178 ; =data_027e0f74 + ldr r0, _02156178 ; =gAdventureFlags mov r2, #0x5c ldr r0, [r0] add r1, sp, #0x80 @@ -64387,7 +64387,7 @@ _0215615c: .align 2, 0 arm_func_end func_ov15_02155b88 _02156174: .word 0xfffff99a -_02156178: .word data_027e0f74 +_02156178: .word gAdventureFlags _0215617c: .word 0x00000101 _02156180: .word data_027e0f64 _02156184: .word 0x00000171 @@ -64406,7 +64406,7 @@ func_ov15_0215619c: ; 0x0215619c bl _ZN5Actor18func_ov00_020c313cEj cmp r0, #0 beq _021561f0 - ldr r0, _02156204 ; =data_027e0f74 + ldr r0, _02156204 ; =gAdventureFlags ldr r1, [r5, #0x2d4] ldr r0, [r0] bl func_ov00_02097b9c @@ -64430,7 +64430,7 @@ _021561f0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0215619c -_02156204: .word data_027e0f74 +_02156204: .word gAdventureFlags _02156208: .word data_ov15_0218c0e4 _0215620c: .word data_ov15_0218c0f0 @@ -65862,7 +65862,7 @@ _02157548: and r0, r1, r0 cmp r0, #0x1000000 ldmneia sp!, {r4, pc} - ldr r0, _021575ac ; =data_027e0f74 + ldr r0, _021575ac ; =gAdventureFlags ldr r1, [r4, #0x2d4] ldr r0, [r0] bl func_ov00_02097bcc @@ -65873,7 +65873,7 @@ _02157548: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_021574f4 -_021575ac: .word data_027e0f74 +_021575ac: .word gAdventureFlags .global func_ov15_021575b0 arm_func_start func_ov15_021575b0 @@ -69308,7 +69308,7 @@ func_ov15_0215a440: ; 0x0215a440 func_ov15_0215a478: ; 0x0215a478 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x30 - ldr r1, _0215a748 ; =data_027e0f74 + ldr r1, _0215a748 ; =gAdventureFlags mov sl, r0 ldr r0, [r1] ldr r2, _0215a74c ; =data_027e10a8 @@ -69495,7 +69495,7 @@ _0215a6b0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov15_0215a478 -_0215a748: .word data_027e0f74 +_0215a748: .word gAdventureFlags _0215a74c: .word data_027e10a8 _0215a750: .word data_ov15_021865c8 _0215a754: .word data_ov15_021865dc @@ -69522,7 +69522,7 @@ func_ov15_0215a768: ; 0x0215a768 cmp r0, #0 mov r1, #0x37 beq _0215a820 - ldr r0, _0215a8c0 ; =data_027e0f74 + ldr r0, _0215a8c0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -69556,14 +69556,14 @@ _0215a7f8: strb r1, [r0] b _0215a860 _0215a820: - ldr r0, _0215a8c0 ; =data_027e0f74 + ldr r0, _0215a8c0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _0215a858 mov r1, #0 strb r1, [r4, #0x118] - ldr r0, _0215a8c0 ; =data_027e0f74 + ldr r0, _0215a8c0 ; =gAdventureFlags mov r1, #0x17c ldr r0, [r0] mov r2, #1 @@ -69600,7 +69600,7 @@ _0215a860: .align 2, 0 arm_func_end func_ov15_0215a768 _0215a8bc: .word data_027e0e60 -_0215a8c0: .word data_027e0f74 +_0215a8c0: .word gAdventureFlags _0215a8c4: .word data_ov15_021865e8 _0215a8c8: .word data_ov15_021865fc _0215a8cc: .word data_027e10a8 @@ -70005,7 +70005,7 @@ _0215ae58: b _0215ae94 _0215ae78: mov r5, #0 - ldr r0, _0215b28c ; =data_027e0f74 + ldr r0, _0215b28c ; =gAdventureFlags strb r5, [r4, #0x118] ldr r0, [r0] mov r1, #0x17c @@ -70277,7 +70277,7 @@ _0215b27c: .word data_ov15_021865c8 _0215b280: .word data_ov15_021865e8 _0215b284: .word data_ov15_021865dc _0215b288: .word data_ov15_021865fc -_0215b28c: .word data_027e0f74 +_0215b28c: .word gAdventureFlags _0215b290: .word data_ov15_0218c478 _0215b294: .word data_027e0e58 _0215b298: .word 0x0005000e @@ -71013,20 +71013,20 @@ func_ov15_0215bc20: ; 0x0215bc20 arm_func_start func_ov15_0215bc48 func_ov15_0215bc48: ; 0x0215bc48 stmdb sp!, {r4, lr} - ldr r1, _0215bcec ; =data_027e0f74 + ldr r1, _0215bcec ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, _0215bcf0 ; =0x00000186 mov r2, #0 bl func_ov00_0209779c - ldr r0, _0215bcec ; =data_027e0f74 + ldr r0, _0215bcec ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0215bcec ; =data_027e0f74 + ldr r0, _0215bcec ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] bl func_ov00_02097760 @@ -71055,7 +71055,7 @@ func_ov15_0215bc48: ; 0x0215bc48 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_0215bc48 -_0215bcec: .word data_027e0f74 +_0215bcec: .word gAdventureFlags _0215bcf0: .word 0x00000186 .global func_ov15_0215bcf4 @@ -71128,13 +71128,13 @@ func_ov15_0215bdac: ; 0x0215bdac ldrb r0, [r4, #0x1bb] cmp r0, #1 bne _0215be34 - ldr r0, _0215be44 ; =data_027e0f74 + ldr r0, _0215be44 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0215be04 - ldr r0, _0215be44 ; =data_027e0f74 + ldr r0, _0215be44 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097bcc @@ -71158,7 +71158,7 @@ _0215be34: .align 2, 0 arm_func_end func_ov15_0215bdac _0215be40: .word data_027e10a4 -_0215be44: .word data_027e0f74 +_0215be44: .word gAdventureFlags _0215be48: .word data_027e103c .global func_ov15_0215be4c @@ -71196,7 +71196,7 @@ _0215be90: ldr r1, [r0] mvn r5, #0 strb r3, [sp, #0x10d] - ldr r0, _0215c330 ; =data_027e0f74 + ldr r0, _0215c330 ; =gAdventureFlags strb r2, [sp, #0x10e] strb r2, [sp, #0x10f] str r5, [sp, #0x108] @@ -71294,7 +71294,7 @@ _0215bf70: strb r3, [sp, #0x14] strb r2, [sp, #0x15] bl func_ov15_021413f8 - ldr r0, _0215c330 ; =data_027e0f74 + ldr r0, _0215c330 ; =gAdventureFlags ldr r1, _0215c344 ; =0x00000186 ldr r0, [r0] mov r2, #1 @@ -71391,7 +71391,7 @@ _0215c154: mov r3, #0x32 ldr r1, [r0] mvn ip, #0 - ldr r0, _0215c330 ; =data_027e0f74 + ldr r0, _0215c330 ; =gAdventureFlags strb r3, [sp, #0x5d] strb r2, [sp, #0x5e] strb r2, [sp, #0x5f] @@ -71472,13 +71472,13 @@ _0215c29c: mov r2, #1 strb r2, [r4, #0x1bc] bl _ZN5Actor18func_ov00_020c1c20Eiii - ldr r0, _0215c330 ; =data_027e0f74 + ldr r0, _0215c330 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0215c31c - ldr r0, _0215c330 ; =data_027e0f74 + ldr r0, _0215c330 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097bcc @@ -71491,7 +71491,7 @@ _0215c324: .align 2, 0 arm_func_end func_ov15_0215be4c _0215c32c: .word data_027e0f64 -_0215c330: .word data_027e0f74 +_0215c330: .word gAdventureFlags _0215c334: .word data_027e10a4 _0215c338: .word data_027e0c68 _0215c33c: .word 0x0005004a @@ -71604,7 +71604,7 @@ _0215c474: mov r3, #0x32 ldr r1, [r0] mvn ip, #0 - ldr r0, _0215c580 ; =data_027e0f74 + ldr r0, _0215c580 ; =gAdventureFlags strb r3, [sp, #0x2d] strb r2, [sp, #0x2e] strb r2, [sp, #0x2f] @@ -71649,7 +71649,7 @@ _0215c570: .word data_027e103c _0215c574: .word data_027e0f94 _0215c578: .word data_027e0e60 _0215c57c: .word data_027e0f64 -_0215c580: .word data_027e0f74 +_0215c580: .word gAdventureFlags .global func_ov15_0215c584 arm_func_start func_ov15_0215c584 @@ -71679,7 +71679,7 @@ func_ov15_0215c584: ; 0x0215c584 strb ip, [sp, #0xa] strb ip, [sp, #0xb] ldr r3, [r0, #4] - ldr r0, _0215c698 ; =data_027e0f74 + ldr r0, _0215c698 ; =gAdventureFlags ldr r1, [r3, #0x26c] ldr r0, [r0] str r1, [sp, #0x20] @@ -71727,7 +71727,7 @@ _0215c660: arm_func_end func_ov15_0215c584 _0215c690: .word data_027e0e60 _0215c694: .word data_027e0f64 -_0215c698: .word data_027e0f74 +_0215c698: .word gAdventureFlags _0215c69c: .word data_027e10a4 _0215c6a0: .word data_027e103c @@ -73678,7 +73678,7 @@ _0215deb8: cmp r0, #3 bne _0215dfa4 ldrsb r2, [r4, #0x2c] - ldr r0, _0215dfec ; =data_027e0f74 + ldr r0, _0215dfec ; =gAdventureFlags ldr r1, _0215dff0 ; =data_ov15_02186700 ldr r0, [r0] ldr r1, [r1, r2, lsl #2] @@ -73714,7 +73714,7 @@ _0215dfdc: .word data_027e0764 _0215dfe0: .word 0x55555556 _0215dfe4: .word data_027e0d0c _0215dfe8: .word 0x00001666 -_0215dfec: .word data_027e0f74 +_0215dfec: .word gAdventureFlags _0215dff0: .word data_ov15_02186700 _0215dff4: .word 0x0000ffff @@ -76188,7 +76188,7 @@ _02160348: strh r0, [r4, #0x7a] mov r2, #1 strb r2, [r4, #0x3ee] - ldr r0, _021603dc ; =data_027e0f74 + ldr r0, _021603dc ; =gAdventureFlags ldrsb r3, [r4, #0x2c] ldr r1, _021603e0 ; =data_ov15_02186700 ldr r0, [r0] @@ -76224,7 +76224,7 @@ _021603d0: .align 2, 0 arm_func_end func_ov15_0216031c _021603d8: .word 0x00000333 -_021603dc: .word data_027e0f74 +_021603dc: .word gAdventureFlags _021603e0: .word data_ov15_02186700 .global func_ov15_021603e4 @@ -76620,7 +76620,7 @@ func_ov15_021607fc: ; 0x021607fc ldrh r1, [r4, #0x24] cmp r1, #0 beq _02160838 - ldr r0, _02160c08 ; =data_027e0f74 + ldr r0, _02160c08 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -76640,13 +76640,13 @@ _02160838: bl func_ov00_020a5e9c cmp r0, #8 bne _021608b4 - ldr r0, _02160c08 ; =data_027e0f74 + ldr r0, _02160c08 ; =gAdventureFlags mov r1, #0xb3 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02160898 - ldr r0, _02160c08 ; =data_027e0f74 + ldr r0, _02160c08 ; =gAdventureFlags mov r1, #0xa7 ldr r0, [r0] bl func_ov00_02097760 @@ -76882,7 +76882,7 @@ _02160b18: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov15_021607fc -_02160c08: .word data_027e0f74 +_02160c08: .word gAdventureFlags _02160c0c: .word data_027e0d38 _02160c10: .word data_ov15_0218672c _02160c14: .word data_027e0fec @@ -77060,7 +77060,7 @@ _02160e64: ldr r0, [r0, #0x2c] cmp r0, #4 beq _021610c0 - ldr r0, _02161170 ; =data_027e0f74 + ldr r0, _02161170 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -77175,7 +77175,7 @@ _02160ef8: mov r3, #0x5c str r2, [sp, #0xf0] mov r2, #0 - ldr r1, _02161170 ; =data_027e0f74 + ldr r1, _02161170 ; =gAdventureFlags str r0, [sp, #0x14] str r0, [sp, #0xa8] ldr r0, [r1] @@ -77229,7 +77229,7 @@ _021610c0: ldr r0, [r5, #0x130] cmp r0, #1 beq _02161124 - ldr r0, _02161170 ; =data_027e0f74 + ldr r0, _02161170 ; =gAdventureFlags ldr r1, [r5, #0x390] ldr r0, [r0] bl func_ov00_02097bcc @@ -77258,7 +77258,7 @@ _0216112c: arm_func_end func_ov15_02160d70 _02161168: .word data_027e0d3c _0216116c: .word data_027e10a4 -_02161170: .word data_027e0f74 +_02161170: .word gAdventureFlags _02161174: .word data_027e0c68 _02161178: .word 0x00050007 _0216117c: .word data_027e103c @@ -77835,13 +77835,13 @@ func_ov15_02161904: ; 0x02161904 arm_func_start func_ov15_02161920 func_ov15_02161920: ; 0x02161920 stmdb sp!, {r3, lr} - ldr r0, _02161964 ; =data_027e0f74 + ldr r0, _02161964 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02161954 - ldr r0, _02161964 ; =data_027e0f74 + ldr r0, _02161964 ; =gAdventureFlags mov r1, #0xf5 ldr r0, [r0] bl func_ov00_02097760 @@ -77855,7 +77855,7 @@ _0216195c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov15_02161920 -_02161964: .word data_027e0f74 +_02161964: .word gAdventureFlags _02161968: .word data_ov15_02186780 .global func_ov15_0216196c @@ -77974,24 +77974,24 @@ func_ov15_02161ac0: ; 0x02161ac0 ldr r1, _02161b94 ; =data_ov15_0218cc1c mov r4, r0 str r1, [r4] - ldr r0, _02161b98 ; =data_027e0f74 + ldr r0, _02161b98 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02161af8 - ldr r0, _02161b98 ; =data_027e0f74 + ldr r0, _02161b98 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] bl func_ov00_02097bcc _02161af8: - ldr r0, _02161b98 ; =data_027e0f74 + ldr r0, _02161b98 ; =gAdventureFlags ldr r1, [r4, #0x244] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02161b20 - ldr r0, _02161b98 ; =data_027e0f74 + ldr r0, _02161b98 ; =gAdventureFlags ldr r1, [r4, #0x244] ldr r0, [r0] bl func_ov00_02097bcc @@ -78029,7 +78029,7 @@ _02161b34: .align 2, 0 arm_func_end func_ov15_02161ac0 _02161b94: .word data_ov15_0218cc1c -_02161b98: .word data_027e0f74 +_02161b98: .word gAdventureFlags _02161b9c: .word data_027e0e2c .global func_ov15_02161ba0 @@ -78039,24 +78039,24 @@ func_ov15_02161ba0: ; 0x02161ba0 ldr r1, _02161c7c ; =data_ov15_0218cc1c mov r4, r0 str r1, [r4] - ldr r0, _02161c80 ; =data_027e0f74 + ldr r0, _02161c80 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02161bd8 - ldr r0, _02161c80 ; =data_027e0f74 + ldr r0, _02161c80 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] bl func_ov00_02097bcc _02161bd8: - ldr r0, _02161c80 ; =data_027e0f74 + ldr r0, _02161c80 ; =gAdventureFlags ldr r1, [r4, #0x244] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02161c00 - ldr r0, _02161c80 ; =data_027e0f74 + ldr r0, _02161c80 ; =gAdventureFlags ldr r1, [r4, #0x244] ldr r0, [r0] bl func_ov00_02097bcc @@ -78096,7 +78096,7 @@ _02161c14: .align 2, 0 arm_func_end func_ov15_02161ba0 _02161c7c: .word data_ov15_0218cc1c -_02161c80: .word data_027e0f74 +_02161c80: .word gAdventureFlags _02161c84: .word data_027e0e2c .global func_ov15_02161c88 @@ -78104,14 +78104,14 @@ _02161c84: .word data_027e0e2c func_ov15_02161c88: ; 0x02161c88 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x6c - ldr r1, _02162424 ; =data_027e0f74 + ldr r1, _02162424 ; =gAdventureFlags mov sl, r0 ldr r0, [r1] mov r1, #0x1f bl func_ov00_02097760 cmp r0, #0 beq _02161cc4 - ldr r0, _02162424 ; =data_027e0f74 + ldr r0, _02162424 ; =gAdventureFlags mov r1, #0xf5 ldr r0, [r0] bl func_ov00_02097760 @@ -78236,13 +78236,13 @@ _02161cd0: cmp r0, #0 mov r1, #0x62 bne _02161eac - ldr r0, _02162424 ; =data_027e0f74 + ldr r0, _02162424 ; =gAdventureFlags mov r2, #0 ldr r0, [r0] bl func_ov00_0209779c b _02161f2c _02161eac: - ldr r0, _02162424 ; =data_027e0f74 + ldr r0, _02162424 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -78272,14 +78272,14 @@ _02161f00: strb r5, [r1, #0x38] ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} _02161f18: - ldr r0, _02162424 ; =data_027e0f74 + ldr r0, _02162424 ; =gAdventureFlags mov r1, #0x62 ldr r0, [r0] mov r2, #0 bl func_ov00_0209779c _02161f2c: ldr r1, _02162438 ; =data_027e0fe4 - ldr r0, _02162424 ; =data_027e0f74 + ldr r0, _02162424 ; =gAdventureFlags ldr r2, [r1] mov r1, #0x52 strb r5, [r2, #0x38] @@ -78287,7 +78287,7 @@ _02161f2c: bl func_ov00_02097760 cmp r0, #0 beq _02161f88 - ldr r0, _02162424 ; =data_027e0f74 + ldr r0, _02162424 ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] bl func_ov00_02097760 @@ -78621,7 +78621,7 @@ _021623c4: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov15_02161c88 -_02162424: .word data_027e0f74 +_02162424: .word gAdventureFlags _02162428: .word data_027e0fec _0216242c: .word 0x00000999 _02162430: .word data_027e0e60 @@ -78833,7 +78833,7 @@ _021626dc: mov r1, r5 mov r2, #0 bl func_ov15_0216463c - ldr r0, _02162de0 ; =data_027e0f74 + ldr r0, _02162de0 ; =gAdventureFlags add r1, sp, #0xb4 ldr r0, [r0] bl func_ov00_02097810 @@ -78857,7 +78857,7 @@ _02162744: mov r1, r5 mov r2, #3 bl func_ov15_0216463c - ldr r0, _02162de0 ; =data_027e0f74 + ldr r0, _02162de0 ; =gAdventureFlags add r1, sp, #4 ldr r0, [r0] bl func_ov00_02097810 @@ -79002,13 +79002,13 @@ _02162984: ldr r0, _02162dfc ; =data_ov00_020eec68 mov r1, #0x1e bl func_ov00_020d716c - ldr r0, _02162de0 ; =data_027e0f74 + ldr r0, _02162de0 ; =gAdventureFlags ldr r1, [r5, #0x240] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021629c0 - ldr r0, _02162de0 ; =data_027e0f74 + ldr r0, _02162de0 ; =gAdventureFlags ldr r1, [r5, #0x240] ldr r0, [r0] bl func_ov00_02097bcc @@ -79105,7 +79105,7 @@ _021629c0: streqb r0, [sp, #0x2fa] movne r0, #0 strneb r0, [sp, #0x2fa] - ldr r0, _02162de0 ; =data_027e0f74 + ldr r0, _02162de0 ; =gAdventureFlags add r1, sp, #0x2e4 ldr r0, [r0] bl func_ov00_02097810 @@ -79242,7 +79242,7 @@ _02162b58: ldrb r3, [sp, #0x1c7] ldrb r2, [sp, #0x1c8] str r0, [sp, #0x248] - ldr r0, _02162de0 ; =data_027e0f74 + ldr r0, _02162de0 ; =gAdventureFlags str r1, [sp, #0x230] ldr r1, [sp, #0x1b0] str sb, [sp, #0x238] @@ -79283,7 +79283,7 @@ _02162dc4: .align 2, 0 arm_func_end func_ov15_02162688 _02162ddc: .word 0x0000ffff -_02162de0: .word data_027e0f74 +_02162de0: .word gAdventureFlags _02162de4: .word data_027e0c68 _02162de8: .word 0x00050014 _02162dec: .word data_027e0e2c @@ -79329,7 +79329,7 @@ _02162e74: ldr r0, [r4, #0x138] cmp r0, #0x3c blt _02163b90 - ldr r0, _02163c2c ; =data_027e0f74 + ldr r0, _02163c2c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -79431,7 +79431,7 @@ _02162f64: bl func_ov15_02164478 cmp r0, #0 beq _02163050 - ldr r0, _02163c2c ; =data_027e0f74 + ldr r0, _02163c2c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -80029,7 +80029,7 @@ _02163854: strb r3, [sp, #0x4c] strb r2, [sp, #0x4d] bl func_ov15_021413f8 - ldr r0, _02163c2c ; =data_027e0f74 + ldr r0, _02163c2c ; =gAdventureFlags mov r1, #0x62 ldr r0, [r0] mov r2, #1 @@ -80240,7 +80240,7 @@ _02163bf4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov15_02162e14 -_02163c2c: .word data_027e0f74 +_02163c2c: .word gAdventureFlags _02163c30: .word data_027e0c68 _02163c34: .word data_02050f54 _02163c38: .word data_027e0fe4 @@ -80376,20 +80376,20 @@ _02163dc4: mov r2, #1 strb r3, [r6, #0x254] bl func_ov15_0216463c - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x324 ldr r0, [r0] bl func_ov00_02097810 str r0, [r6, #0x244] add r0, sp, #0x324 bl func_ov00_0209a508 - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02163e4c - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] bl func_ov00_02097bcc @@ -80423,20 +80423,20 @@ _02163e90: mov r1, r6 mov r2, #2 bl func_ov15_0216463c - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x274 ldr r0, [r0] bl func_ov00_02097810 str r0, [r6, #0x240] add r0, sp, #0x274 bl func_ov00_0209a508 - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02163efc - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] bl func_ov00_02097bcc @@ -80459,7 +80459,7 @@ _02163f14: mov r1, r6 mov r2, #3 bl func_ov15_0216463c - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x1c4 ldr r0, [r0] bl func_ov00_02097810 @@ -80467,7 +80467,7 @@ _02163f14: add r0, sp, #0x1c4 bl func_ov00_0209a508 ldr r1, [r6, #0x48] - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags str r1, [r6, #0x368] ldr r1, [r6, #0x4c] str r1, [r6, #0x36c] @@ -80478,7 +80478,7 @@ _02163f14: bl func_ov00_02097b9c cmp r0, #0 beq _02163f9c - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] bl func_ov00_02097bcc @@ -80487,7 +80487,7 @@ _02163f9c: mov r1, r6 mov r2, #4 bl func_ov15_0216463c - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x114 ldr r0, [r0] bl func_ov00_02097810 @@ -80550,13 +80550,13 @@ _0216406c: add r1, r6, #0x374 strb r3, [r6, #0x3d0] bl func_02036ce4 - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021640c4 - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] bl func_ov00_02097bcc @@ -80666,7 +80666,7 @@ _021640c4: mov r1, r6 mov r2, #5 bl func_ov15_0216463c - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags add r1, sp, #0x64 ldr r0, [r0] bl func_ov00_02097810 @@ -80693,13 +80693,13 @@ _02164294: str r0, [r6, #0x288] str r0, [r6, #0x28c] _021642cc: - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021642f4 - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x240] ldr r0, [r0] bl func_ov00_02097bcc @@ -80720,13 +80720,13 @@ _02164324: ldrb r0, [r6, #0x11c] cmp r0, #0 bne _02164388 - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02164358 - ldr r0, _021643a8 ; =data_027e0f74 + ldr r0, _021643a8 ; =gAdventureFlags ldr r1, [r6, #0x244] ldr r0, [r0] bl func_ov00_02097bcc @@ -80754,7 +80754,7 @@ _02164388: arm_func_end func_ov15_02163d10 _021643a0: .word data_027e0f94 _021643a4: .word data_027e0f64 -_021643a8: .word data_027e0f74 +_021643a8: .word gAdventureFlags _021643ac: .word data_027e0c68 _021643b0: .word 0x00050015 _021643b4: .word 0x00050016 @@ -80793,13 +80793,13 @@ _02164410: strb r1, [r0, #0x16] strb r1, [r4, #0x3d1] strb r1, [r4, #0x3d0] - ldr r0, _02164474 ; =data_027e0f74 + ldr r0, _02164474 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02164458 - ldr r0, _02164474 ; =data_027e0f74 + ldr r0, _02164474 ; =gAdventureFlags ldr r1, [r4, #0x240] ldr r0, [r0] bl func_ov00_02097bcc @@ -80813,7 +80813,7 @@ _02164458: .align 2, 0 arm_func_end func_ov15_021643e4 _02164470: .word data_027e0e2c -_02164474: .word data_027e0f74 +_02164474: .word gAdventureFlags .global func_ov15_02164478 arm_func_start func_ov15_02164478 @@ -80827,7 +80827,7 @@ func_ov15_02164478: ; 0x02164478 ldrb r0, [r0, #0x34] cmp r0, #0 bne _021644c4 - ldr r0, _021645f0 ; =data_027e0f74 + ldr r0, _021645f0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -80917,7 +80917,7 @@ _021645e0: .align 2, 0 arm_func_end func_ov15_02164478 _021645ec: .word data_027e0d38 -_021645f0: .word data_027e0f74 +_021645f0: .word gAdventureFlags _021645f4: .word data_027e10a4 _021645f8: .word data_027e0f94 _021645fc: .word 0x0000ffff @@ -82110,14 +82110,14 @@ _02165620: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, pc} _0216569c: - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r1, [r5, #0xd8] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r3, r4, r5, r6, pc} - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82136,7 +82136,7 @@ _0216569c: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, pc} _02165700: - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82155,7 +82155,7 @@ _02165700: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, pc} _02165748: - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82183,7 +82183,7 @@ _0216579c: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, pc} _021657b0: - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82202,7 +82202,7 @@ _021657b0: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, pc} _021657f8: - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82238,7 +82238,7 @@ _02165840: cmp r1, #0x1000000 addne sp, sp, #0x24 ldmneia sp!, {r3, r4, r5, r6, pc} - ldr r2, _02165a28 ; =data_027e0f74 + ldr r2, _02165a28 ; =gAdventureFlags mov r1, r0, asr #0x10 ldr r0, [r2] bl func_ov00_020980bc @@ -82254,7 +82254,7 @@ _021658b4: ldr r0, [r5, #0xa8] cmp r0, #0xa000 bgt _021658f0 - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82267,7 +82267,7 @@ _021658b4: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, pc} _021658f0: - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82290,7 +82290,7 @@ _02165938: ldr r0, [r5, #0xa8] cmp r0, #0xa000 bgt _02165974 - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82303,7 +82303,7 @@ _02165938: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, pc} _02165974: - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r2, [r5, #8] @@ -82323,7 +82323,7 @@ _0216599c: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, pc} _021659bc: - ldr r0, _02165a28 ; =data_027e0f74 + ldr r0, _02165a28 ; =gAdventureFlags ldr r1, [r5, #0xd8] ldr r0, [r0] bl func_ov00_02097bac @@ -82353,7 +82353,7 @@ _02165a18: .word data_ov15_0218f8cc _02165a1c: .word func_ov15_02165a34 _02165a20: .word data_ov15_0218f8c0 _02165a24: .word data_027e0e60 -_02165a28: .word data_027e0f74 +_02165a28: .word gAdventureFlags _02165a2c: .word data_ov15_021867d8 _02165a30: .word data_027e0c68 @@ -82430,7 +82430,7 @@ _02165af4: sub r0, r0, #0x96 str r0, [sp, #0x180] _02165b24: - ldr r0, _02165e24 ; =data_027e0f74 + ldr r0, _02165e24 ; =gAdventureFlags mov r3, #0 mov r5, #0x1e mov r2, #6 @@ -82579,7 +82579,7 @@ _02165d4c: mov r2, r3 bl func_020370d0 _02165d5c: - ldr r0, _02165e24 ; =data_027e0f74 + ldr r0, _02165e24 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] bl func_ov00_020980bc @@ -82635,7 +82635,7 @@ _02165e14: .align 2, 0 arm_func_end func_ov15_02165a48 _02165e20: .word data_ov15_021867d8 -_02165e24: .word data_027e0f74 +_02165e24: .word gAdventureFlags _02165e28: .word data_ov00_020eec9c _02165e2c: .word data_027e0e58 _02165e30: .word data_027e0f94 @@ -83776,7 +83776,7 @@ func_ov15_02166ba0: ; 0x02166ba0 arm_func_start func_ov15_02166bd0 func_ov15_02166bd0: ; 0x02166bd0 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _02166cf8 ; =data_027e0f74 + ldr r1, _02166cf8 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x30 @@ -83853,7 +83853,7 @@ _02166ce8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02166bd0 -_02166cf8: .word data_027e0f74 +_02166cf8: .word gAdventureFlags _02166cfc: .word 0xfffffe66 _02166d00: .word 0x000004cd _02166d04: .word data_ov15_02186844 @@ -86682,7 +86682,7 @@ func_ov15_02169358: ; 0x02169358 mov r2, #1 mov r4, r0 bl _ZN5Actor18func_ov00_020c1c20Eiii - ldr r0, _021694e4 ; =data_027e0f74 + ldr r0, _021694e4 ; =gAdventureFlags mov r1, #0xb7 ldr r0, [r0] bl func_ov00_02097760 @@ -86777,7 +86777,7 @@ func_ov15_02169358: ; 0x02169358 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02169358 -_021694e4: .word data_027e0f74 +_021694e4: .word gAdventureFlags _021694e8: .word data_027e0fec _021694ec: .word data_027e0d0c _021694f0: .word data_027e0f6c @@ -86909,7 +86909,7 @@ func_ov15_02169684: ; 0x02169684 and r0, r1, r0 cmp r0, #0x1000000 bne _021696cc - ldr r0, _02169700 ; =data_027e0f74 + ldr r0, _02169700 ; =gAdventureFlags ldr r1, [r4, #0x2d8] ldr r0, [r0] bl func_ov00_02097b9c @@ -86932,7 +86932,7 @@ _021696e0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02169684 -_02169700: .word data_027e0f74 +_02169700: .word gAdventureFlags _02169704: .word data_ov15_0218d1bc _02169708: .word data_ov15_0218d1c8 @@ -87386,7 +87386,7 @@ _02169c3c: ldrb ip, [sp, #0x64] str r3, [sp, #0xe4] ldr r3, [sp, #0x58] - ldr r1, _02169e5c ; =data_027e0f74 + ldr r1, _02169e5c ; =gAdventureFlags str r3, [sp, #0xec] mov r3, #0x5c str r0, [sp, #0x14] @@ -87405,13 +87405,13 @@ _02169c3c: bl func_ov00_0209a508 b _02169e2c _02169dc8: - ldr r0, _02169e5c ; =data_027e0f74 + ldr r0, _02169e5c ; =gAdventureFlags ldr r1, [r5, #0x2d8] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02169df0 - ldr r0, _02169e5c ; =data_027e0f74 + ldr r0, _02169e5c ; =gAdventureFlags ldr r1, [r5, #0x2d8] ldr r0, [r0] bl func_ov00_02097bcc @@ -87446,7 +87446,7 @@ _02169e4c: .word data_027e0c68 _02169e50: .word 0x00050023 _02169e54: .word data_027e0f64 _02169e58: .word 0x00000bb8 -_02169e5c: .word data_027e0f74 +_02169e5c: .word gAdventureFlags _02169e60: .word 0x00050024 .global func_ov15_02169e64 @@ -87634,7 +87634,7 @@ _0216a0a4: beq _0216a0cc bl func_ov15_02168d58 _0216a0cc: - ldr r0, _0216a0fc ; =data_027e0f74 + ldr r0, _0216a0fc ; =gAdventureFlags mov r1, #0xb7 ldr r0, [r0] mov r2, #1 @@ -87649,7 +87649,7 @@ _0216a0ec: .word data_027e10a4 _0216a0f0: .word data_027e0d3c _0216a0f4: .word data_027e103c _0216a0f8: .word data_027e0fe4 -_0216a0fc: .word data_027e0f74 +_0216a0fc: .word gAdventureFlags .global func_ov15_0216a100 arm_func_start func_ov15_0216a100 @@ -87979,7 +87979,7 @@ func_ov15_0216a590: ; 0x0216a590 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 mov r0, #1 - ldr r1, _0216a734 ; =data_027e0f74 + ldr r1, _0216a734 ; =gAdventureFlags str r0, [sp, #4] ldr r0, [r1] ldr r1, [sp, #4] @@ -88062,13 +88062,13 @@ _0216a6a8: _0216a6c4: cmp fp, #0 bne _0216a704 - ldr r0, _0216a734 ; =data_027e0f74 + ldr r0, _0216a734 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] bl func_ov00_02097760 cmp r0, #1 bne _0216a6fc - ldr r0, _0216a734 ; =data_027e0f74 + ldr r0, _0216a734 ; =gAdventureFlags mov r1, #0x52 ldr r0, [r0] bl func_ov00_02097760 @@ -88093,7 +88093,7 @@ _0216a728: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov15_0216a590 -_0216a734: .word data_027e0f74 +_0216a734: .word gAdventureFlags _0216a738: .word data_027e0c68 _0216a73c: .word data_ov09_0211f5b4 _0216a740: .word data_027e0d38 @@ -88365,7 +88365,7 @@ func_ov15_0216aa84: ; 0x0216aa84 mov r5, r0 mov r4, r1 blx func_ov03_020fab5c - ldr r0, _0216aad0 ; =data_027e0f74 + ldr r0, _0216aad0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -88384,7 +88384,7 @@ _0216aac4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_0216aa84 -_0216aad0: .word data_027e0f74 +_0216aad0: .word gAdventureFlags _0216aad4: .word data_ov09_0211f5dc _0216aad8: .word data_ov00_020eec68 @@ -91841,7 +91841,7 @@ func_ov15_0216d8c8: ; 0x0216d8c8 cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} - ldr r0, _0216d964 ; =data_027e0f74 + ldr r0, _0216d964 ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] mov r2, #1 @@ -91852,7 +91852,7 @@ func_ov15_0216d8c8: ; 0x0216d8c8 arm_func_end func_ov15_0216d8c8 _0216d95c: .word data_027e0e60 _0216d960: .word data_027e0d38 -_0216d964: .word data_027e0f74 +_0216d964: .word gAdventureFlags .global func_ov15_0216d968 arm_func_start func_ov15_0216d968 @@ -91905,7 +91905,7 @@ _0216d9b0: bl func_ov05_02100ae0 cmp r0, #0 beq _0216da38 - ldr r0, _0216daa0 ; =data_027e0f74 + ldr r0, _0216daa0 ; =gAdventureFlags mov r1, #0x56 ldr r0, [r0] mov r2, #1 @@ -91940,7 +91940,7 @@ _0216da84: _0216da94: .word data_027e0c68 _0216da98: .word data_027e0e60 _0216da9c: .word data_027e0d38 -_0216daa0: .word data_027e0f74 +_0216daa0: .word gAdventureFlags _0216daa4: .word data_027e0fe4 .global func_ov15_0216daa8 @@ -92198,7 +92198,7 @@ _0216de0c: mov r0, #0 ldmia sp!, {r4, pc} _0216de14: - ldr r0, _0216de3c ; =data_027e0f74 + ldr r0, _0216de3c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -92211,7 +92211,7 @@ _0216de30: .align 2, 0 arm_func_end func_ov15_0216dd8c _0216de38: .word data_027e0c68 -_0216de3c: .word data_027e0f74 +_0216de3c: .word gAdventureFlags .global func_ov15_0216de40 arm_func_start func_ov15_0216de40 @@ -93640,7 +93640,7 @@ _0216f158: bl func_01ff9bc4 add r0, r4, #0x15c bl func_ov00_020c5e20 - ldr r0, _0216f324 ; =data_027e0f74 + ldr r0, _0216f324 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -93743,7 +93743,7 @@ _0216f2b4: _0216f318: .word data_027e10a4 _0216f31c: .word data_027e0fac _0216f320: .word data_027e0f94 -_0216f324: .word data_027e0f74 +_0216f324: .word gAdventureFlags _0216f328: .word 0x55555556 .global func_ov15_0216f32c @@ -94695,7 +94695,7 @@ _0216fe54: ldr r0, [sp, #0x270] ldrb r6, [sp, #0x280] str r0, [sp, #0x304] - ldr r0, _02170638 ; =data_027e0f74 + ldr r0, _02170638 ; =gAdventureFlags ldrb lr, [sp, #0x281] ldrb ip, [sp, #0x282] ldrb r3, [sp, #0x283] @@ -94742,13 +94742,13 @@ _0216fe54: bl func_ov00_0209a508 b _0217060c _0217007c: - ldr r0, _02170638 ; =data_027e0f74 + ldr r0, _02170638 ; =gAdventureFlags ldr r1, [r5, #0x53c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021700a4 - ldr r0, _02170638 ; =data_027e0f74 + ldr r0, _02170638 ; =gAdventureFlags ldr r1, [r5, #0x53c] ldr r0, [r0] bl func_ov00_02097bcc @@ -94907,7 +94907,7 @@ _0217029c: add r6, sp, #0x4c ldmia r0, {r0, r1, r2} stmia r6, {r0, r1, r2} - ldr r0, _02170638 ; =data_027e0f74 + ldr r0, _02170638 ; =gAdventureFlags str r7, [sp, #0x174] ldr r7, [sp, #0x4c] ldr r6, [sp, #0x50] @@ -95059,7 +95059,7 @@ _021703e8: ldr r0, [sp, #0xa8] ldr sb, [sp, #0xa0] str r0, [sp, #0x13c] - ldr r0, _02170638 ; =data_027e0f74 + ldr r0, _02170638 ; =gAdventureFlags ldrb r8, [sp, #0xb8] ldrb r7, [sp, #0xb9] ldrb r6, [sp, #0xba] @@ -95117,7 +95117,7 @@ _02170628: .word data_027e103c _0217062c: .word data_027e0e60 _02170630: .word data_027e0f94 _02170634: .word data_027e0f64 -_02170638: .word data_027e0f74 +_02170638: .word gAdventureFlags _0217063c: .word data_027e10a4 _02170640: .word data_027e0fac _02170644: .word data_02050f54 @@ -95178,13 +95178,13 @@ func_ov15_021706b4: ; 0x021706b4 and r0, r1, r0 cmp r0, #0x1000000 bne _02170734 - ldr r0, _02170750 ; =data_027e0f74 + ldr r0, _02170750 ; =gAdventureFlags ldr r1, [r5, #0x53c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 bne _02170734 - ldr r0, _02170750 ; =data_027e0f74 + ldr r0, _02170750 ; =gAdventureFlags ldr r1, [r5, #0x540] ldr r0, [r0] bl func_ov00_02097b9c @@ -95201,7 +95201,7 @@ _0217073c: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_021706b4 -_02170750: .word data_027e0f74 +_02170750: .word gAdventureFlags .global func_ov15_02170754 arm_func_start func_ov15_02170754 @@ -95604,7 +95604,7 @@ _02170ac8: ldrb r3, [sp, #0x177] ldrb r2, [sp, #0x178] str r0, [sp, #0x1f4] - ldr r0, _02170ff8 ; =data_027e0f74 + ldr r0, _02170ff8 ; =gAdventureFlags str r1, [sp, #0x1d8] ldr r1, [sp, #0x15c] str sb, [sp, #0x1e0] @@ -95632,13 +95632,13 @@ _02170ac8: strb sl, [sp, #0x192] bl func_ov00_02097810 str r0, [r4, #0x540] - ldr r0, _02170ff8 ; =data_027e0f74 + ldr r0, _02170ff8 ; =gAdventureFlags ldr r1, [r4, #0x53c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02170db8 - ldr r0, _02170ff8 ; =data_027e0f74 + ldr r0, _02170ff8 ; =gAdventureFlags ldr r1, [r4, #0x53c] ldr r0, [r0] bl func_ov00_02097bcc @@ -95767,13 +95767,13 @@ _02170eec: cmp r0, #0x1000000 addne sp, sp, #0x294 ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _02170ff8 ; =data_027e0f74 + ldr r0, _02170ff8 ; =gAdventureFlags ldr r1, [r4, #0x540] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02170fc4 - ldr r0, _02170ff8 ; =data_027e0f74 + ldr r0, _02170ff8 ; =gAdventureFlags ldr r1, [r4, #0x540] ldr r0, [r0] bl func_ov00_02097bcc @@ -95794,7 +95794,7 @@ _02170fe8: .word 0x00050027 _02170fec: .word data_027e0f64 _02170ff0: .word data_02050f54 _02170ff4: .word 0x0000276c -_02170ff8: .word data_027e0f74 +_02170ff8: .word gAdventureFlags _02170ffc: .word data_ov15_02190458 _02171000: .word data_ov00_020eec68 _02171004: .word 0x00050028 @@ -96206,7 +96206,7 @@ _021715ac: mov r1, #1 bl _ZN5Actor10SetUnk_11cEc ldrb r1, [r4, #0x56c] - ldr r0, _02171918 ; =data_027e0f74 + ldr r0, _02171918 ; =gAdventureFlags add r1, r1, #1 strb r1, [r4, #0x56c] ldr r0, [r0] @@ -96214,7 +96214,7 @@ _021715ac: bl func_ov00_02097b9c cmp r0, #0 beq _0217161c - ldr r0, _02171918 ; =data_027e0f74 + ldr r0, _02171918 ; =gAdventureFlags ldr r1, [r4, #0x53c] ldr r0, [r0] bl func_ov00_02097bcc @@ -96286,7 +96286,7 @@ _02171640: ldr r1, _02171928 ; =data_027e0f64 mov r3, #0x32 mvn ip, #0 - ldr r0, _02171918 ; =data_027e0f74 + ldr r0, _02171918 ; =gAdventureFlags ldr r1, [r1] strb r3, [sp, #0x141] strb r2, [sp, #0x142] @@ -96418,7 +96418,7 @@ _02171908: .word 0x000002e9 _0217190c: .word 0x0000ffff _02171910: .word data_027e0c68 _02171914: .word 0x00050029 -_02171918: .word data_027e0f74 +_02171918: .word gAdventureFlags _0217191c: .word data_ov15_02190458 _02171920: .word data_027e10a4 _02171924: .word data_027e0f68 @@ -101518,7 +101518,7 @@ _02175e80: ; jump table b _021760a4 ; case 6 b _0217601c ; case 7 _02175ea0: - ldr r0, _021760dc ; =data_027e0f74 + ldr r0, _021760dc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -101673,7 +101673,7 @@ _021760a4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov15_02175e48 -_021760dc: .word data_027e0f74 +_021760dc: .word gAdventureFlags _021760e0: .word data_027e0de4 _021760e4: .word func_ov15_02176118 _021760e8: .word data_ov15_0218dd94 @@ -102795,7 +102795,7 @@ func_ov15_0217708c: ; 0x0217708c mov r0, #1 str r0, [sp] ldr fp, [sp] - ldr r1, _021771fc ; =data_027e0f74 + ldr r1, _021771fc ; =gAdventureFlags mov r4, fp ldr r0, [r1] mov r5, fp @@ -102866,13 +102866,13 @@ _02177170: _02177198: cmp r4, #0 bne _021771d4 - ldr r0, _021771fc ; =data_027e0f74 + ldr r0, _021771fc ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] bl func_ov00_02097760 cmp r0, #1 bne _021771d0 - ldr r0, _021771fc ; =data_027e0f74 + ldr r0, _021771fc ; =gAdventureFlags mov r1, #0x52 ldr r0, [r0] bl func_ov00_02097760 @@ -102894,7 +102894,7 @@ _021771f4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov15_0217708c -_021771fc: .word data_027e0f74 +_021771fc: .word gAdventureFlags _02177200: .word data_027e0c68 _02177204: .word data_ov09_0211f5b4 _02177208: .word data_027e0d38 @@ -103010,14 +103010,14 @@ func_ov15_02177330: ; 0x02177330 bl func_ov00_020a5e9c cmp r0, #0x32 beq _02177390 - ldr r0, _021773a0 ; =data_027e0f74 + ldr r0, _021773a0 ; =gAdventureFlags mov r1, #0xf8 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r4, #2 bne _02177390 - ldr r0, _021773a0 ; =data_027e0f74 + ldr r0, _021773a0 ; =gAdventureFlags mov r1, #0xf7 ldr r0, [r0] bl func_ov00_02097760 @@ -103033,7 +103033,7 @@ _02177390: .align 2, 0 arm_func_end func_ov15_02177330 _0217739c: .word data_027e0d38 -_021773a0: .word data_027e0f74 +_021773a0: .word gAdventureFlags _021773a4: .word data_ov15_02186dac .global func_ov15_021773a8 @@ -103319,13 +103319,13 @@ func_ov15_021776c4: ; 0x021776c4 bl func_ov00_020a5e9c cmp r0, #0x32 beq _02177774 - ldr r0, _021777fc ; =data_027e0f74 + ldr r0, _021777fc ; =gAdventureFlags mov r1, #0xf8 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _0217774c - ldr r0, _021777fc ; =data_027e0f74 + ldr r0, _021777fc ; =gAdventureFlags mov r1, #0xf7 ldr r0, [r0] bl func_ov00_02097760 @@ -103379,7 +103379,7 @@ _021777ec: .word data_027e0e60 _021777f0: .word data_027e0f6c _021777f4: .word data_027e0d38 _021777f8: .word data_027e10b0 -_021777fc: .word data_027e0f74 +_021777fc: .word gAdventureFlags _02177800: .word data_ov00_020eec68 _02177804: .word data_ov15_02190458 @@ -103408,13 +103408,13 @@ func_ov15_02177808: ; 0x02177808 bl func_ov00_020a5e9c cmp r0, #0x32 beq _021778b8 - ldr r0, _02177948 ; =data_027e0f74 + ldr r0, _02177948 ; =gAdventureFlags mov r1, #0xf8 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02177890 - ldr r0, _02177948 ; =data_027e0f74 + ldr r0, _02177948 ; =gAdventureFlags mov r1, #0xf7 ldr r0, [r0] bl func_ov00_02097760 @@ -103470,7 +103470,7 @@ _02177938: .word data_027e0e60 _0217793c: .word data_027e0f6c _02177940: .word data_027e0d38 _02177944: .word data_027e10b0 -_02177948: .word data_027e0f74 +_02177948: .word gAdventureFlags _0217794c: .word data_ov00_020eec68 _02177950: .word data_ov15_02190458 @@ -103626,7 +103626,7 @@ func_ov15_02177964: ; 0x02177964 cmp r0, #0x32 beq _02177c5c mov r1, #0x5e - ldr r0, _02177f0c ; =data_027e0f74 + ldr r0, _02177f0c ; =gAdventureFlags strh r1, [r4, #0x7a] ldr r0, [r0] mov r1, #0xf8 @@ -103644,7 +103644,7 @@ func_ov15_02177964: ; 0x02177964 str r0, [sp, #0xc] b _02177c20 _02177bd4: - ldr r0, _02177f0c ; =data_027e0f74 + ldr r0, _02177f0c ; =gAdventureFlags mov r1, #0xf7 ldr r0, [r0] bl func_ov00_02097760 @@ -103856,7 +103856,7 @@ _02177efc: .word data_027e0764 _02177f00: .word 0x0000a332 _02177f04: .word 0x00003666 _02177f08: .word data_027e0d38 -_02177f0c: .word data_027e0f74 +_02177f0c: .word gAdventureFlags _02177f10: .word data_027e103c _02177f14: .word data_ov15_02186dc4 _02177f18: .word data_027e0fe8 @@ -103990,7 +103990,7 @@ _021780a0: bl func_ov00_020cf9dc b _02178114 _021780c8: - ldr r0, _0217813c ; =data_027e0f74 + ldr r0, _0217813c ; =gAdventureFlags mov r1, #0xf8 ldr r0, [r0] mov r2, #1 @@ -104023,7 +104023,7 @@ _0217812c: .word data_027e0fe4 _02178130: .word data_027e0d0c _02178134: .word 0x00000ccd _02178138: .word data_027e103c -_0217813c: .word data_027e0f74 +_0217813c: .word gAdventureFlags _02178140: .word data_027e0c68 _02178144: .word 0x00050047 @@ -104122,7 +104122,7 @@ func_ov15_02178258: ; 0x02178258 ldmeqia sp!, {r4, pc} mov r0, r4 bl func_ov15_0217a680 - ldr r0, _02178390 ; =data_027e0f74 + ldr r0, _02178390 ; =gAdventureFlags ldr r1, [r4, #0x370] ldr r0, [r0] bl func_ov00_02097b9c @@ -104195,7 +104195,7 @@ _021782bc: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov15_02178258 -_02178390: .word data_027e0f74 +_02178390: .word gAdventureFlags _02178394: .word data_027e077c _02178398: .word data_027e0f94 _0217839c: .word data_027e0f6c @@ -104567,13 +104567,13 @@ _021788cc: _02178910: cmp r2, #0xb4 ble _02178954 - ldr r0, _021789c0 ; =data_027e0f74 + ldr r0, _021789c0 ; =gAdventureFlags ldr r1, [r5, #0x370] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02178940 - ldr r0, _021789c0 ; =data_027e0f74 + ldr r0, _021789c0 ; =gAdventureFlags ldr r1, [r5, #0x370] ldr r0, [r0] bl func_ov00_02097bcc @@ -104613,7 +104613,7 @@ _021789b0: .word data_027e0ffc _021789b4: .word 0x00000461 _021789b8: .word 0xffffc4cd _021789bc: .word 0xffffe4a8 -_021789c0: .word data_027e0f74 +_021789c0: .word gAdventureFlags .global func_ov15_021789c4 arm_func_start func_ov15_021789c4 @@ -104698,7 +104698,7 @@ func_ov15_02178a6c: ; 0x02178a6c cmp r0, #0x1000000 bne _02178b18 mov r1, #0 - ldr r0, _02178b68 ; =data_027e0f74 + ldr r0, _02178b68 ; =gAdventureFlags strb r1, [r4, #0x474] ldr r0, [r0] mov r1, #0x18 @@ -104733,7 +104733,7 @@ _02178b18: arm_func_end func_ov15_02178a6c _02178b60: .word data_027e0ffc _02178b64: .word 0x00000461 -_02178b68: .word data_027e0f74 +_02178b68: .word gAdventureFlags _02178b6c: .word data_027e103c _02178b70: .word data_027e10a4 _02178b74: .word data_ov15_0218ddcc @@ -104857,7 +104857,7 @@ _02178cfc: bl _ZN5Actor18func_ov00_020c198cEv cmp r0, #0 beq _02178d40 - ldr r0, _02178d70 ; =data_027e0f74 + ldr r0, _02178d70 ; =gAdventureFlags mov r1, #0x18 ldr r0, [r0] bl func_ov00_02097968 @@ -104878,7 +104878,7 @@ _02178d40: _02178d64: .word data_027e0e60 _02178d68: .word data_ov15_0218ddcc _02178d6c: .word data_ov15_0218ddc8 -_02178d70: .word data_027e0f74 +_02178d70: .word gAdventureFlags .global func_ov15_02178d74 arm_func_start func_ov15_02178d74 @@ -106839,7 +106839,7 @@ func_ov15_0217a850: ; 0x0217a850 ldr r7, [sp, #0x70] ldr r6, [sp, #0x74] mov fp, #0x5c - ldr r1, _0217aa2c ; =data_027e0f74 + ldr r1, _0217aa2c ; =gAdventureFlags str r0, [sp, #0xf4] ldr r0, [r1] add r1, sp, #0x80 @@ -106865,7 +106865,7 @@ func_ov15_0217a850: ; 0x0217a850 _0217aa20: .word data_027e0e60 _0217aa24: .word data_027e0f64 _0217aa28: .word 0x000024cd -_0217aa2c: .word data_027e0f74 +_0217aa2c: .word gAdventureFlags .global func_ov15_0217aa30 arm_func_start func_ov15_0217aa30 @@ -111138,7 +111138,7 @@ func_ov15_0217e354: ; 0x0217e354 arm_func_start func_ov15_0217e368 func_ov15_0217e368: ; 0x0217e368 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} - ldr r0, _0217e4a4 ; =data_027e0f74 + ldr r0, _0217e4a4 ; =gAdventureFlags mov r4, #1 ldr r0, [r0] mov r5, r4 @@ -111206,13 +111206,13 @@ _0217e42c: _0217e460: cmp r5, #0 bne _0217e49c - ldr r0, _0217e4a4 ; =data_027e0f74 + ldr r0, _0217e4a4 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] bl func_ov00_02097760 cmp r0, #1 bne _0217e498 - ldr r0, _0217e4a4 ; =data_027e0f74 + ldr r0, _0217e4a4 ; =gAdventureFlags mov r1, #0x52 ldr r0, [r0] bl func_ov00_02097760 @@ -111225,7 +111225,7 @@ _0217e49c: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 arm_func_end func_ov15_0217e368 -_0217e4a4: .word data_027e0f74 +_0217e4a4: .word gAdventureFlags _0217e4a8: .word data_027e0c68 _0217e4ac: .word data_ov09_0211f5b4 _0217e4b0: .word data_027e0d38 @@ -112380,7 +112380,7 @@ func_ov15_0217f47c: ; 0x0217f47c ldmgeia sp!, {r3, r4, r5, r6, r7, pc} mov r0, #0x28 mul r4, r1, r0 - ldr r0, _0217f5d0 ; =data_027e0f74 + ldr r0, _0217f5d0 ; =gAdventureFlags ldr r1, _0217f5d4 ; =data_ov15_0218e6f0 ldr r0, [r0] ldr r1, [r1, r4] @@ -112465,7 +112465,7 @@ _0217f5c4: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov15_0217f47c -_0217f5d0: .word data_027e0f74 +_0217f5d0: .word gAdventureFlags _0217f5d4: .word data_ov15_0218e6f0 _0217f5d8: .word data_ov15_0218e6e8 _0217f5dc: .word data_ov15_0218e6ea @@ -113329,7 +113329,7 @@ _02180058: beq _021800c0 b _021800fc _02180078: - ldr r0, _02180334 ; =data_027e0f74 + ldr r0, _02180334 ; =gAdventureFlags mov r1, #0x1e ldr r0, [r0] bl func_ov00_02097760 @@ -113339,7 +113339,7 @@ _02180078: mov r0, sl ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _0218009c: - ldr r0, _02180334 ; =data_027e0f74 + ldr r0, _02180334 ; =gAdventureFlags mov r1, #0x33 ldr r0, [r0] bl func_ov00_02097760 @@ -113349,7 +113349,7 @@ _0218009c: mov r0, sl ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _021800c0: - ldr r0, _02180334 ; =data_027e0f74 + ldr r0, _02180334 ; =gAdventureFlags mov r1, #0x33 ldr r0, [r0] bl func_ov00_02097760 @@ -113525,7 +113525,7 @@ _02180324: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02180330: .word data_027e0d0c -_02180334: .word data_027e0f74 +_02180334: .word gAdventureFlags _02180338: .word data_027e0dcc _0218033c: .word 0xcccccccd _02180340: .word 0x00000708 @@ -113702,7 +113702,7 @@ _02180424: mov r8, #0x32 mov r7, #0 mov r6, #2 - ldr r0, _02180adc ; =data_027e0f74 + ldr r0, _02180adc ; =gAdventureFlags str sb, [sp, #0x208] strb r8, [sp, #0x20d] strb r7, [sp, #0x20e] @@ -113931,7 +113931,7 @@ _021806b8: ldrb r3, [sp, #0x14f] ldrb r2, [sp, #0x150] str r0, [sp, #0x1cc] - ldr r0, _02180adc ; =data_027e0f74 + ldr r0, _02180adc ; =gAdventureFlags str r1, [sp, #0x1b4] ldr r1, [sp, #0x134] str sb, [sp, #0x1bc] @@ -114010,7 +114010,7 @@ _02180a3c: mov r8, #0x32 mov r7, #0 mov r6, #2 - ldr r0, _02180adc ; =data_027e0f74 + ldr r0, _02180adc ; =gAdventureFlags str sb, [sp, #0x40] strb r8, [sp, #0x45] strb r7, [sp, #0x46] @@ -114039,7 +114039,7 @@ _02180acc: .word data_027e0d0c _02180ad0: .word data_027e10a4 _02180ad4: .word data_027e0f94 _02180ad8: .word data_027e0f64 -_02180adc: .word data_027e0f74 +_02180adc: .word gAdventureFlags _02180ae0: .word data_027e0764 _02180ae4: .word data_027e0c68 _02180ae8: .word 0x00050048 @@ -114423,20 +114423,20 @@ _02180fc0: ldr r0, [r4, #0x390] cmp r0, #0 bge _021810a4 - ldr r0, _0218137c ; =data_027e0f74 + ldr r0, _0218137c ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02181038 - ldr r0, _0218137c ; =data_027e0f74 + ldr r0, _0218137c ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097bcc _02181038: add r0, sp, #0x64 bl func_ov00_0209a4f4 - ldr r0, _0218137c ; =data_027e0f74 + ldr r0, _0218137c ; =gAdventureFlags ldr r5, [sp, #0x58] ldr r3, [sp, #0x5c] ldr r2, [sp, #0x60] @@ -114632,7 +114632,7 @@ _021812e4: add sp, sp, #0x114 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} _02181338: - ldr r0, _0218137c ; =data_027e0f74 + ldr r0, _0218137c ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097bcc @@ -114651,7 +114651,7 @@ _0218136c: .word data_ov15_0218e8c8 _02181370: .word data_02050f54 _02181374: .word data_ov00_020eec9c _02181378: .word 0x0000025d -_0218137c: .word data_027e0f74 +_0218137c: .word gAdventureFlags _02181380: .word 0x00000aab _02181384: .word 0x00000133 _02181388: .word data_027e10a4 @@ -114785,7 +114785,7 @@ _021814f0: ldmneia sp!, {r4, pc} mov r0, #0 strb r0, [r4, #0x400] - ldr r0, _02181570 ; =data_027e0f74 + ldr r0, _02181570 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097bcc @@ -114799,7 +114799,7 @@ _021814f0: arm_func_end func_ov15_02181440 _02181568: .word data_027e0f64 _0218156c: .word data_027e0c68 -_02181570: .word data_027e0f74 +_02181570: .word gAdventureFlags .global func_ov15_02181574 arm_func_start func_ov15_02181574 @@ -114979,7 +114979,7 @@ func_ov15_02181618: ; 0x02181618 str r6, [sp, #0xb8] ldr r6, [sp, #0x40] str r0, [sp, #0xdc] - ldr r0, _021818c8 ; =data_027e0f74 + ldr r0, _021818c8 ; =gAdventureFlags ldrb r5, [sp, #0x60] ldrb lr, [sp, #0x61] ldrb ip, [sp, #0x62] @@ -115033,7 +115033,7 @@ _021818b0: arm_func_end func_ov15_02181618 _021818c0: .word data_027e0f94 _021818c4: .word data_027e0f64 -_021818c8: .word data_027e0f74 +_021818c8: .word gAdventureFlags .global func_ov15_021818cc arm_func_start func_ov15_021818cc @@ -115247,7 +115247,7 @@ func_ov15_02181b5c: ; 0x02181b5c cmp r0, #0x5000 addge sp, sp, #0x14 ldmgeia sp!, {r3, r4, pc} - ldr r0, _02181c48 ; =data_027e0f74 + ldr r0, _02181c48 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097b9c @@ -115263,7 +115263,7 @@ func_ov15_02181b5c: ; 0x02181b5c addeq sp, sp, #0x14 ldmeqia sp!, {r3, r4, pc} _02181c10: - ldr r0, _02181c48 ; =data_027e0f74 + ldr r0, _02181c48 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097bcc @@ -115279,7 +115279,7 @@ _02181c10: _02181c3c: .word data_027e0f94 _02181c40: .word data_027e0f64 _02181c44: .word 0x00000133 -_02181c48: .word data_027e0f74 +_02181c48: .word gAdventureFlags .global func_ov15_02181c4c arm_func_start func_ov15_02181c4c @@ -115296,7 +115296,7 @@ func_ov15_02181c4c: ; 0x02181c4c blt _02181c9c cmp r0, #2 ldmneia sp!, {r4, pc} - ldr r0, _02181cb4 ; =data_027e0f74 + ldr r0, _02181cb4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bcc mvn r0, #0 @@ -115313,7 +115313,7 @@ _02181c9c: .align 2, 0 arm_func_end func_ov15_02181c4c _02181cb0: .word data_027e0fe4 -_02181cb4: .word data_027e0f74 +_02181cb4: .word gAdventureFlags .global func_ov15_02181cb8 arm_func_start func_ov15_02181cb8 @@ -115768,7 +115768,7 @@ _02182140: str r2, [sp, #0xf4] ldr r2, [sp, #0x7c] str r0, [sp, #0x118] - ldr r0, _02182588 ; =data_027e0f74 + ldr r0, _02182588 ; =gAdventureFlags str r1, [sp, #0xf8] ldr r1, [sp, #0x80] str sl, [sp, #0x100] @@ -115877,7 +115877,7 @@ _021824dc: str r0, [r4, #0x37c] mov r0, #4 strb r0, [r4, #0x39e] - ldr r0, _02182588 ; =data_027e0f74 + ldr r0, _02182588 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097bcc @@ -115915,7 +115915,7 @@ _02182548: _0218257c: .word data_027e0e60 _02182580: .word data_027e0f94 _02182584: .word data_027e0f64 -_02182588: .word data_027e0f74 +_02182588: .word gAdventureFlags _0218258c: .word data_027e10a4 .global func_ov15_02182590 @@ -115975,13 +115975,13 @@ _02182644: mov r1, #1 ldr r0, [r0] bl func_ov15_021413d4 - ldr r0, _021826a8 ; =data_027e0f74 + ldr r0, _021826a8 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0218268c - ldr r0, _021826a8 ; =data_027e0f74 + ldr r0, _021826a8 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097bcc @@ -115995,7 +115995,7 @@ _0218268c: _0218269c: .word data_027e10a4 _021826a0: .word data_027e0f94 _021826a4: .word 0x00000aab -_021826a8: .word data_027e0f74 +_021826a8: .word gAdventureFlags .global func_ov15_021826ac arm_func_start func_ov15_021826ac @@ -116969,7 +116969,7 @@ _02183374: ; jump table b _02183384 ; case 2 b _02183550 ; case 3 _02183384: - ldr r0, _02183568 ; =data_027e0f74 + ldr r0, _02183568 ; =gAdventureFlags ldr r1, [r4, #0x38c] ldr r0, [r0] bl func_ov00_02097bcc @@ -117059,7 +117059,7 @@ _02183384: strb lr, [sp, #0xf4] strb ip, [sp, #0xf5] strb r3, [sp, #0xf6] - ldr r0, _02183568 ; =data_027e0f74 + ldr r0, _02183568 ; =gAdventureFlags ldrb ip, [sp, #0x63] ldrb r3, [sp, #0x64] mov r2, #0x5c @@ -117095,7 +117095,7 @@ _0218355c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov15_02183350 -_02183568: .word data_027e0f74 +_02183568: .word gAdventureFlags _0218356c: .word data_027e0f64 _02183570: .word 0x00001770 _02183574: .word 0x000009c4 @@ -117778,7 +117778,7 @@ _02183de4: moveq r5, #0 cmp r0, #1 bne _02183fbc - ldr r0, _021840f4 ; =data_027e0f74 + ldr r0, _021840f4 ; =gAdventureFlags mov r1, #0x15c ldr r0, [r0] bl func_ov00_02097760 @@ -117973,7 +117973,7 @@ _021840e4: .word data_027e0ff0 _021840e8: .word data_027e0764 _021840ec: .word data_027e0d38 _021840f0: .word data_027e1060 -_021840f4: .word data_027e0f74 +_021840f4: .word gAdventureFlags _021840f8: .word 0x000005dd _021840fc: .word data_027e1070 _02184100: .word data_027e1080 diff --git a/asm/ov17.inc b/asm/ov17.inc index a9e17ed1..e0960531 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -24,7 +24,7 @@ .extern data_027e0f68 .extern data_027e0f6c .extern data_027e0f70 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f84 .extern data_027e0f90 diff --git a/asm/ov17.s b/asm/ov17.s index 9c4e0c41..00986a3a 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -1344,7 +1344,7 @@ _0215c32c: strb r2, [sp, #0x61] strb r0, [sp, #0x62] ldr r0, [r5, #0x1c] - ldr r1, _0215c658 ; =data_027e0f74 + ldr r1, _0215c658 ; =gAdventureFlags add r0, r0, #0x33 add r3, r0, #0x1300 ldr r0, [r1] @@ -1547,7 +1547,7 @@ _0215c648: .align 2, 0 arm_func_end func_ov17_0215c2bc _0215c654: .word data_027e0e60 -_0215c658: .word data_027e0f74 +_0215c658: .word gAdventureFlags _0215c65c: .word data_027e0e58 _0215c660: .word data_027e0ffc _0215c664: .word 0x000014cd @@ -7471,14 +7471,14 @@ _02161258: ldrb r0, [r4, #0x7c] cmp r0, #0 beq _0216127c - ldr r0, _021612a8 ; =data_027e0f74 + ldr r0, _021612a8 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _0216127c: - ldr r0, _021612a8 ; =data_027e0f74 + ldr r0, _021612a8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0xa @@ -7491,7 +7491,7 @@ _0216127c: .align 2, 0 arm_func_end func_ov17_021611cc _021612a4: .word data_027e0f90 -_021612a8: .word data_027e0f74 +_021612a8: .word gAdventureFlags _021612ac: .word data_027e0fc8 .global func_ov17_021612b0 @@ -7572,7 +7572,7 @@ _02161334: strb r0, [sp, #0xb] strb r1, [sp, #9] ldr r1, [r5, #0x18] - ldr r0, _021614ec ; =data_027e0f74 + ldr r0, _021614ec ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r5, #0x1c] ldr r0, [r0] @@ -7654,7 +7654,7 @@ _021614dc: .align 2, 0 arm_func_end func_ov17_021612b0 _021614e8: .word data_ov17_0216b0d8 -_021614ec: .word data_027e0f74 +_021614ec: .word gAdventureFlags _021614f0: .word data_027e0e60 .global func_ov17_021614f4 @@ -7926,7 +7926,7 @@ _02161864: mov r1, #0x1b4 bl func_ov00_020cecd8 _02161894: - ldr r0, _02161914 ; =data_027e0f74 + ldr r0, _02161914 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c @@ -7962,7 +7962,7 @@ _02161908: .align 2, 0 arm_func_end func_ov17_02161824 _02161910: .word data_027e0ffc -_02161914: .word data_027e0f74 +_02161914: .word gAdventureFlags .global func_ov17_02161918 arm_func_start func_ov17_02161918 @@ -8254,7 +8254,7 @@ func_ov17_02161c84: ; 0x02161c84 ldrh r1, [r4, #0x26] cmp r1, #0 beq _02161cb0 - ldr r0, _02161cc0 ; =data_027e0f74 + ldr r0, _02161cc0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -8267,7 +8267,7 @@ _02161cb0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02161c84 -_02161cc0: .word data_027e0f74 +_02161cc0: .word gAdventureFlags .global func_ov17_02161cc4 arm_func_start func_ov17_02161cc4 @@ -8277,7 +8277,7 @@ func_ov17_02161cc4: ; 0x02161cc4 ldrh r1, [r4, #0x26] cmp r1, #0 beq _02161cf0 - ldr r0, _02161d00 ; =data_027e0f74 + ldr r0, _02161d00 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -8290,7 +8290,7 @@ _02161cf0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02161cc4 -_02161d00: .word data_027e0f74 +_02161d00: .word gAdventureFlags .global func_ov17_02161d04 arm_func_start func_ov17_02161d04 @@ -8300,7 +8300,7 @@ func_ov17_02161d04: ; 0x02161d04 ldrh r1, [r4, #0x26] cmp r1, #0 beq _02161d30 - ldr r0, _02161d4c ; =data_027e0f74 + ldr r0, _02161d4c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -8316,7 +8316,7 @@ _02161d30: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02161d04 -_02161d4c: .word data_027e0f74 +_02161d4c: .word gAdventureFlags .global func_ov17_02161d50 arm_func_start func_ov17_02161d50 @@ -13128,7 +13128,7 @@ _02165824: bl func_ov17_02165c48 b _02165930 _02165858: - ldr r0, _0216594c ; =data_027e0f74 + ldr r0, _0216594c ; =gAdventureFlags ldr r1, [r5, #0x164] ldr r0, [r0] bl func_ov00_02097bac @@ -13198,7 +13198,7 @@ _02165930: arm_func_end func_ov17_021657bc _02165944: .word data_027e0ffc _02165948: .word 0x0000047c -_0216594c: .word data_027e0f74 +_0216594c: .word gAdventureFlags .global func_ov17_02165950 arm_func_start func_ov17_02165950 @@ -13239,7 +13239,7 @@ _021659b0: bl func_ov17_02165c48 b _02165c00 _021659d4: - ldr r0, _02165c20 ; =data_027e0f74 + ldr r0, _02165c20 ; =gAdventureFlags ldr r1, [r5, #0x164] ldr r0, [r0] bl func_ov00_02097bac @@ -13267,13 +13267,13 @@ _02165a20: bl func_ov17_02165c48 b _02165c00 _02165a34: - ldr r0, _02165c20 ; =data_027e0f74 + ldr r0, _02165c20 ; =gAdventureFlags ldr r1, [r5, #0x164] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02165c00 - ldr r0, _02165c20 ; =data_027e0f74 + ldr r0, _02165c20 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -13396,7 +13396,7 @@ _02165c00: arm_func_end func_ov17_02165950 _02165c18: .word data_027e0ffc _02165c1c: .word 0x0000047c -_02165c20: .word data_027e0f74 +_02165c20: .word gAdventureFlags _02165c24: .word data_027e0e58 _02165c28: .word 0x000001e3 _02165c2c: .word 0x000001e1 @@ -13464,7 +13464,7 @@ _02165ce4: mov r0, #0x64 mov r2, #0x1f str r0, [sp, #4] - ldr r0, _02165e40 ; =data_027e0f74 + ldr r0, _02165e40 ; =gAdventureFlags strb r2, [sp, #9] strb r1, [sp, #0xa] strb r1, [sp, #0xb] @@ -13548,7 +13548,7 @@ _02165e2c: arm_func_end func_ov17_02165c48 _02165e38: .word data_027e0f6c _02165e3c: .word data_027e0e58 -_02165e40: .word data_027e0f74 +_02165e40: .word gAdventureFlags _02165e44: .word data_027e0e60 .global func_ov17_02165e48 @@ -13749,7 +13749,7 @@ _021660a0: ldrneb r0, [r4, #0x2a] cmpne r0, #0 beq _02166114 - ldr r0, _021661e4 ; =data_027e0f74 + ldr r0, _021661e4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -13764,7 +13764,7 @@ _0216610c: mov r0, #0 ldmia sp!, {r4, pc} _02166114: - ldr r0, _021661e4 ; =data_027e0f74 + ldr r0, _021661e4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -13791,7 +13791,7 @@ _0216614c: ldrneb r0, [r4, #0x2a] cmpne r0, #0 beq _021661a8 - ldr r0, _021661e4 ; =data_027e0f74 + ldr r0, _021661e4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -13806,7 +13806,7 @@ _021661a0: mov r0, #0 ldmia sp!, {r4, pc} _021661a8: - ldr r0, _021661e4 ; =data_027e0f74 + ldr r0, _021661e4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -13825,7 +13825,7 @@ _021661d8: .align 2, 0 arm_func_end func_ov17_02166068 _021661e0: .word data_027e0e60 -_021661e4: .word data_027e0f74 +_021661e4: .word gAdventureFlags .global func_ov17_021661e8 arm_func_start func_ov17_021661e8 @@ -15717,11 +15717,11 @@ _02167af4: add sp, sp, #0x24 ldmia sp!, {r4, r5, pc} _02167b30: - ldr r0, _02167cc4 ; =data_027e0f74 + ldr r0, _02167cc4 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] bl func_ov00_02097b9c - ldr r0, _02167cc4 ; =data_027e0f74 + ldr r0, _02167cc4 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] bl func_ov00_02097bac @@ -15791,7 +15791,7 @@ _02167bd4: add sp, sp, #0x24 ldmia sp!, {r4, r5, pc} _02167c48: - ldr r0, _02167cc4 ; =data_027e0f74 + ldr r0, _02167cc4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -15826,7 +15826,7 @@ _02167cbc: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov17_02167aac -_02167cc4: .word data_027e0f74 +_02167cc4: .word gAdventureFlags _02167cc8: .word data_027e0fe4 _02167ccc: .word data_027e0fb8 _02167cd0: .word data_027e0f64 @@ -15864,7 +15864,7 @@ _02167d1c: mov r2, #0x1e mov r3, #0 mov r1, #3 - ldr r0, _02167e4c ; =data_027e0f74 + ldr r0, _02167e4c ; =gAdventureFlags str ip, [sp, #0x40] strb r2, [sp, #0x45] strb r3, [sp, #0x47] @@ -15937,7 +15937,7 @@ _02167e40: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov17_02167cd4 -_02167e4c: .word data_027e0f74 +_02167e4c: .word gAdventureFlags _02167e50: .word data_027e0fe8 _02167e54: .word 0x41525257 _02167e58: .word data_027e0ffc @@ -18156,7 +18156,7 @@ func_ov17_02169a58: ; 0x02169a58 cmp r0, #2 addne sp, sp, #0x18 ldmneia sp!, {r4, pc} - ldr r0, _02169b3c ; =data_027e0f74 + ldr r0, _02169b3c ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c @@ -18202,7 +18202,7 @@ _02169b08: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02169a58 -_02169b3c: .word data_027e0f74 +_02169b3c: .word gAdventureFlags _02169b40: .word data_027e0fe4 _02169b44: .word data_027e0f64 @@ -18230,7 +18230,7 @@ _02169b74: ldr r1, [r4, #0x64] cmp r1, r0 beq _02169c98 - ldr r0, _02169ca4 ; =data_027e0f74 + ldr r0, _02169ca4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bcc mvn r0, #0 @@ -18281,7 +18281,7 @@ _02169c1c: strb r2, [sp, #0xa] strb r1, [sp, #0xb] ldr r1, [r4, #0x18] - ldr r0, _02169ca4 ; =data_027e0f74 + ldr r0, _02169ca4 ; =gAdventureFlags str r1, [sp, #0x20] ldr r2, [r4, #0x1c] add r1, sp, #0 @@ -18305,7 +18305,7 @@ _02169c98: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_02169b48 -_02169ca4: .word data_027e0f74 +_02169ca4: .word gAdventureFlags _02169ca8: .word data_027e0ffc _02169cac: .word 0x0000034e _02169cb0: .word 0x0000034f @@ -18659,14 +18659,14 @@ func_ov17_0216a06c: ; 0x0216a06c ldrb r0, [r5, #0x7c] cmp r0, #0 beq _0216a0cc - ldr r0, _0216a0f4 ; =data_027e0f74 + ldr r0, _0216a0f4 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _0216a0cc: - ldr r0, _0216a0f4 ; =data_027e0f74 + ldr r0, _0216a0f4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0xa @@ -18678,7 +18678,7 @@ _0216a0cc: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_0216a06c -_0216a0f4: .word data_027e0f74 +_0216a0f4: .word gAdventureFlags _0216a0f8: .word data_027e0fc8 .global func_ov17_0216a0fc @@ -18759,7 +18759,7 @@ _0216a180: strb r0, [sp, #0xb] strb r1, [sp, #9] ldr r1, [r5, #0x18] - ldr r0, _0216a340 ; =data_027e0f74 + ldr r0, _0216a340 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r5, #0x1c] ldr r0, [r0] @@ -18843,7 +18843,7 @@ _0216a330: .align 2, 0 arm_func_end func_ov17_0216a0fc _0216a33c: .word data_ov17_0216b1f8 -_0216a340: .word data_027e0f74 +_0216a340: .word gAdventureFlags _0216a344: .word data_027e0e60 .global func_ov17_0216a348 @@ -19104,7 +19104,7 @@ _0216a674: add sp, sp, #8 ldmia sp!, {r4, pc} _0216a6b0: - ldr r0, _0216a730 ; =data_027e0f74 + ldr r0, _0216a730 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c @@ -19140,7 +19140,7 @@ _0216a724: .align 2, 0 arm_func_end func_ov17_0216a634 _0216a72c: .word data_027e0ffc -_0216a730: .word data_027e0f74 +_0216a730: .word gAdventureFlags .global func_ov17_0216a734 arm_func_start func_ov17_0216a734 @@ -19528,13 +19528,13 @@ _0216ac3c: blx r3 ldmia sp!, {r4, pc} _0216ac6c: - ldr r0, _0216ace8 ; =data_027e0f74 + ldr r0, _0216ace8 ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0216ace8 ; =data_027e0f74 + ldr r0, _0216ace8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -19547,7 +19547,7 @@ _0216ac6c: blx r3 ldmia sp!, {r4, pc} _0216acb4: - ldr r0, _0216ace8 ; =data_027e0f74 + ldr r0, _0216ace8 ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097bac @@ -19562,7 +19562,7 @@ _0216acb4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_0216abfc -_0216ace8: .word data_027e0f74 +_0216ace8: .word gAdventureFlags .global func_ov17_0216acec arm_func_start func_ov17_0216acec @@ -19619,7 +19619,7 @@ _0216ad7c: mov r2, #0x1e mov r1, #6 str r0, [sp, #0x1c] - ldr r0, _0216af2c ; =data_027e0f74 + ldr r0, _0216af2c ; =gAdventureFlags strb r2, [sp, #0x21] strb r1, [sp, #0x22] ldr r1, [r4, #0x18] @@ -19727,7 +19727,7 @@ _0216af20: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov17_0216ad30 -_0216af2c: .word data_027e0f74 +_0216af2c: .word gAdventureFlags _0216af30: .word data_027e0e58 _0216af34: .word data_027e0ffc _0216af38: .word data_ov17_0216b230 diff --git a/asm/ov18.inc b/asm/ov18.inc index 72bc4acf..82c3830d 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -29,7 +29,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f94 .extern data_027e0fc8 diff --git a/asm/ov18.s b/asm/ov18.s index fd374835..34ddc178 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -751,7 +751,7 @@ func_ov18_0215beb8: ; 0x0215beb8 ldr r0, [r0, #0x14] cmp r0, #0 bne _0215bf7c - ldr r0, _0215bfbc ; =data_027e0f74 + ldr r0, _0215bfbc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -803,7 +803,7 @@ _0215bf7c: .align 2, 0 arm_func_end func_ov18_0215beb8 _0215bfb8: .word data_027e0d38 -_0215bfbc: .word data_027e0f74 +_0215bfbc: .word gAdventureFlags _0215bfc0: .word data_027e0c68 _0215bfc4: .word data_027e0f64 @@ -2675,13 +2675,13 @@ _0215d714: bl func_ov00_020cec60 b _0215d9a8 _0215d748: - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r1, [r5, #0x168] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0215d788 - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x87 @@ -2703,7 +2703,7 @@ _0215d788: bl func_0202d7ac cmp r0, #0 bne _0215d7dc - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x14 @@ -2714,7 +2714,7 @@ _0215d788: bl func_ov18_0215dad0 b _0215d9a8 _0215d7dc: - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 rsb r0, r0, #0x69 @@ -2741,13 +2741,13 @@ _0215d82c: bl func_0202b2e8 b _0215d9a8 _0215d840: - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r1, [r5, #0x168] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0215d9a8 - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -2757,7 +2757,7 @@ _0215d840: mov r2, #0 bl func_ov18_0215dad0 _0215d87c: - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 rsb r0, r0, #0xb4 @@ -2768,7 +2768,7 @@ _0215d87c: bl func_0202b308 b _0215d9a8 _0215d8a4: - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r1, [r5, #0x168] ldr r0, [r0] bl func_ov00_02097b9c @@ -2798,7 +2798,7 @@ _0215d8ec: bl func_ov18_0215dad0 b _0215d9a8 _0215d910: - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 rsb r0, r0, #0xb4 @@ -2807,7 +2807,7 @@ _0215d910: add r0, r5, #0x48 add r1, r5, #0x184 bl func_0202b308 - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x78 @@ -2829,7 +2829,7 @@ _0215d95c: bl func_ov18_0215dad0 b _0215d9a8 _0215d984: - ldr r0, _0215daac ; =data_027e0f74 + ldr r0, _0215daac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 rsb r0, r0, #0xb4 @@ -2909,7 +2909,7 @@ _0215da88: _0215daa0: .word data_027e0d38 _0215daa4: .word data_027e0ffc _0215daa8: .word 0x0000035f -_0215daac: .word data_027e0f74 +_0215daac: .word gAdventureFlags _0215dab0: .word data_ov00_020eec9c _0215dab4: .word 0x0000048a _0215dab8: .word data_027e0d78 @@ -2995,7 +2995,7 @@ _0215dbb0: mov r2, #0x87 mov r0, #0x2d strb r0, [sp, #0xb9] - ldr r0, _0215dea4 ; =data_027e0f74 + ldr r0, _0215dea4 ; =gAdventureFlags str r2, [sp, #0xb4] strb r1, [sp, #0xba] strb r1, [sp, #0xbb] @@ -3081,7 +3081,7 @@ _0215dcf8: mov r1, #3 str ip, [sp, #4] strb r3, [sp, #9] - ldr r0, _0215dea4 ; =data_027e0f74 + ldr r0, _0215dea4 ; =gAdventureFlags strb r2, [sp, #0xa] strb r2, [sp, #0xb] strb r5, [sp, #0xd] @@ -3138,7 +3138,7 @@ _0215ddf0: bl func_ov00_020ceacc b _0215de94 _0215de04: - ldr r0, _0215dea4 ; =data_027e0f74 + ldr r0, _0215dea4 ; =gAdventureFlags ldr r1, [r4, #0x168] ldr r0, [r0] bl func_ov00_02097bcc @@ -3183,7 +3183,7 @@ _0215de94: .align 2, 0 arm_func_end func_ov18_0215dad0 _0215dea0: .word data_ov00_020eec68 -_0215dea4: .word data_027e0f74 +_0215dea4: .word gAdventureFlags _0215dea8: .word data_02050f54 _0215deac: .word data_027e103c _0215deb0: .word data_027e0d38 @@ -4128,7 +4128,7 @@ _0215eb0c: add r8, r8, #2 bne _0215eb0c ldrb r2, [r3] - ldr r0, _0215ee68 ; =data_027e0f74 + ldr r0, _0215ee68 ; =gAdventureFlags mov r1, #0x1f strb r2, [r8] ldr r0, [r0] @@ -4348,7 +4348,7 @@ _0215ee44: _0215ee5c: .word data_027e0f68 _0215ee60: .word 0x0000099a _0215ee64: .word data_ov18_0216c488 -_0215ee68: .word data_027e0f74 +_0215ee68: .word gAdventureFlags _0215ee6c: .word func_ov18_0215f048 _0215ee70: .word data_027e0fe8 _0215ee74: .word 0x48534b42 @@ -5337,14 +5337,14 @@ func_ov18_0215fa64: ; 0x0215fa64 mov r0, #1 ldmia sp!, {r3, pc} _0215fa7c: - ldr r2, _0215fa90 ; =data_027e0f74 + ldr r2, _0215fa90 ; =gAdventureFlags ldrh r1, [r0, #0x2a] ldr r0, [r2] bl func_ov00_02097760 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_0215fa64 -_0215fa90: .word data_027e0f74 +_0215fa90: .word gAdventureFlags .global func_ov18_0215fa94 arm_func_start func_ov18_0215fa94 @@ -9712,7 +9712,7 @@ _02163108: cmp r1, #0 addeq sp, sp, #0x20 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _02163254 ; =data_027e0f74 + ldr r0, _02163254 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -9733,7 +9733,7 @@ _02163244: .word data_027e0764 _02163248: .word 0x3fa47ae1 _0216324c: .word data_ov18_0216b52c _02163250: .word 0x00000333 -_02163254: .word data_027e0f74 +_02163254: .word gAdventureFlags .global func_ov18_02163258 arm_func_start func_ov18_02163258 @@ -10525,7 +10525,7 @@ _02163c98: cmp r1, #0 addeq sp, sp, #0x1c ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _02163d60 ; =data_027e0f74 + ldr r0, _02163d60 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -10542,7 +10542,7 @@ _02163d50: .word 0x47ae147b _02163d54: .word 0x3fa47ae1 _02163d58: .word data_ov18_0216b534 _02163d5c: .word 0x00000333 -_02163d60: .word data_027e0f74 +_02163d60: .word gAdventureFlags .global func_ov18_02163d64 arm_func_start func_ov18_02163d64 @@ -11681,13 +11681,13 @@ _02164bec: .word 0x00000488 arm_func_start func_ov18_02164bf0 func_ov18_02164bf0: ; 0x02164bf0 stmdb sp!, {r3, lr} - ldr r0, _02164c30 ; =data_027e0f74 + ldr r0, _02164c30 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164c28 - ldr r0, _02164c30 ; =data_027e0f74 + ldr r0, _02164c30 ; =gAdventureFlags mov r1, #0x30 ldr r0, [r0] bl func_ov00_02097760 @@ -11699,19 +11699,19 @@ _02164c28: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164bf0 -_02164c30: .word data_027e0f74 +_02164c30: .word gAdventureFlags .global func_ov18_02164c34 arm_func_start func_ov18_02164c34 func_ov18_02164c34: ; 0x02164c34 stmdb sp!, {r3, lr} - ldr r0, _02164c74 ; =data_027e0f74 + ldr r0, _02164c74 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164c6c - ldr r0, _02164c74 ; =data_027e0f74 + ldr r0, _02164c74 ; =gAdventureFlags mov r1, #0x95 ldr r0, [r0] bl func_ov00_02097760 @@ -11723,19 +11723,19 @@ _02164c6c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164c34 -_02164c74: .word data_027e0f74 +_02164c74: .word gAdventureFlags .global func_ov18_02164c78 arm_func_start func_ov18_02164c78 func_ov18_02164c78: ; 0x02164c78 stmdb sp!, {r3, lr} - ldr r0, _02164cb8 ; =data_027e0f74 + ldr r0, _02164cb8 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164cb0 - ldr r0, _02164cb8 ; =data_027e0f74 + ldr r0, _02164cb8 ; =gAdventureFlags mov r1, #0x96 ldr r0, [r0] bl func_ov00_02097760 @@ -11747,19 +11747,19 @@ _02164cb0: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164c78 -_02164cb8: .word data_027e0f74 +_02164cb8: .word gAdventureFlags .global func_ov18_02164cbc arm_func_start func_ov18_02164cbc func_ov18_02164cbc: ; 0x02164cbc stmdb sp!, {r3, lr} - ldr r0, _02164cfc ; =data_027e0f74 + ldr r0, _02164cfc ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164cf4 - ldr r0, _02164cfc ; =data_027e0f74 + ldr r0, _02164cfc ; =gAdventureFlags mov r1, #0x97 ldr r0, [r0] bl func_ov00_02097760 @@ -11771,19 +11771,19 @@ _02164cf4: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164cbc -_02164cfc: .word data_027e0f74 +_02164cfc: .word gAdventureFlags .global func_ov18_02164d00 arm_func_start func_ov18_02164d00 func_ov18_02164d00: ; 0x02164d00 stmdb sp!, {r3, lr} - ldr r0, _02164d40 ; =data_027e0f74 + ldr r0, _02164d40 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164d38 - ldr r0, _02164d40 ; =data_027e0f74 + ldr r0, _02164d40 ; =gAdventureFlags mov r1, #0x98 ldr r0, [r0] bl func_ov00_02097760 @@ -11795,19 +11795,19 @@ _02164d38: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164d00 -_02164d40: .word data_027e0f74 +_02164d40: .word gAdventureFlags .global func_ov18_02164d44 arm_func_start func_ov18_02164d44 func_ov18_02164d44: ; 0x02164d44 stmdb sp!, {r3, lr} - ldr r0, _02164d84 ; =data_027e0f74 + ldr r0, _02164d84 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164d7c - ldr r0, _02164d84 ; =data_027e0f74 + ldr r0, _02164d84 ; =gAdventureFlags mov r1, #0x94 ldr r0, [r0] bl func_ov00_02097760 @@ -11819,19 +11819,19 @@ _02164d7c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164d44 -_02164d84: .word data_027e0f74 +_02164d84: .word gAdventureFlags .global func_ov18_02164d88 arm_func_start func_ov18_02164d88 func_ov18_02164d88: ; 0x02164d88 stmdb sp!, {r3, lr} - ldr r0, _02164dc8 ; =data_027e0f74 + ldr r0, _02164dc8 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164dc0 - ldr r0, _02164dc8 ; =data_027e0f74 + ldr r0, _02164dc8 ; =gAdventureFlags mov r1, #0x52 ldr r0, [r0] bl func_ov00_02097760 @@ -11843,19 +11843,19 @@ _02164dc0: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164d88 -_02164dc8: .word data_027e0f74 +_02164dc8: .word gAdventureFlags .global func_ov18_02164dcc arm_func_start func_ov18_02164dcc func_ov18_02164dcc: ; 0x02164dcc stmdb sp!, {r3, lr} - ldr r0, _02164e20 ; =data_027e0f74 + ldr r0, _02164e20 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164e18 - ldr r0, _02164e20 ; =data_027e0f74 + ldr r0, _02164e20 ; =gAdventureFlags mov r1, #0x2c ldr r0, [r0] bl func_ov00_02097760 @@ -11872,20 +11872,20 @@ _02164e18: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164dcc -_02164e20: .word data_027e0f74 +_02164e20: .word gAdventureFlags _02164e24: .word data_027e0dbc .global func_ov18_02164e28 arm_func_start func_ov18_02164e28 func_ov18_02164e28: ; 0x02164e28 stmdb sp!, {r3, lr} - ldr r0, _02164e7c ; =data_027e0f74 + ldr r0, _02164e7c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164e74 - ldr r0, _02164e7c ; =data_027e0f74 + ldr r0, _02164e7c ; =gAdventureFlags mov r1, #0x58 ldr r0, [r0] bl func_ov00_02097760 @@ -11902,20 +11902,20 @@ _02164e74: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164e28 -_02164e7c: .word data_027e0f74 +_02164e7c: .word gAdventureFlags _02164e80: .word data_027e0dbc .global func_ov18_02164e84 arm_func_start func_ov18_02164e84 func_ov18_02164e84: ; 0x02164e84 stmdb sp!, {r3, lr} - ldr r0, _02164ed8 ; =data_027e0f74 + ldr r0, _02164ed8 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164ed0 - ldr r0, _02164ed8 ; =data_027e0f74 + ldr r0, _02164ed8 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] bl func_ov00_02097760 @@ -11932,26 +11932,26 @@ _02164ed0: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164e84 -_02164ed8: .word data_027e0f74 +_02164ed8: .word gAdventureFlags _02164edc: .word data_027e0dbc .global func_ov18_02164ee0 arm_func_start func_ov18_02164ee0 func_ov18_02164ee0: ; 0x02164ee0 stmdb sp!, {r3, lr} - ldr r0, _02164f4c ; =data_027e0f74 + ldr r0, _02164f4c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164f44 - ldr r0, _02164f4c ; =data_027e0f74 + ldr r0, _02164f4c ; =gAdventureFlags mov r1, #0x7e ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164f44 - ldr r0, _02164f4c ; =data_027e0f74 + ldr r0, _02164f4c ; =gAdventureFlags mov r1, #0xb9 ldr r0, [r0] bl func_ov00_02097760 @@ -11968,20 +11968,20 @@ _02164f44: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164ee0 -_02164f4c: .word data_027e0f74 +_02164f4c: .word gAdventureFlags _02164f50: .word data_027e0dbc .global func_ov18_02164f54 arm_func_start func_ov18_02164f54 func_ov18_02164f54: ; 0x02164f54 stmdb sp!, {r3, lr} - ldr r0, _02164fa8 ; =data_027e0f74 + ldr r0, _02164fa8 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164fa0 - ldr r0, _02164fa8 ; =data_027e0f74 + ldr r0, _02164fa8 ; =gAdventureFlags mov r1, #0x7f ldr r0, [r0] bl func_ov00_02097760 @@ -11998,20 +11998,20 @@ _02164fa0: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164f54 -_02164fa8: .word data_027e0f74 +_02164fa8: .word gAdventureFlags _02164fac: .word data_027e0dbc .global func_ov18_02164fb0 arm_func_start func_ov18_02164fb0 func_ov18_02164fb0: ; 0x02164fb0 stmdb sp!, {r3, lr} - ldr r0, _02165004 ; =data_027e0f74 + ldr r0, _02165004 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02164ffc - ldr r0, _02165004 ; =data_027e0f74 + ldr r0, _02165004 ; =gAdventureFlags mov r1, #0x99 ldr r0, [r0] bl func_ov00_02097760 @@ -12028,20 +12028,20 @@ _02164ffc: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02164fb0 -_02165004: .word data_027e0f74 +_02165004: .word gAdventureFlags _02165008: .word data_027e0dbc .global func_ov18_0216500c arm_func_start func_ov18_0216500c func_ov18_0216500c: ; 0x0216500c stmdb sp!, {r3, lr} - ldr r0, _0216504c ; =data_027e0f74 + ldr r0, _0216504c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02165044 - ldr r0, _0216504c ; =data_027e0f74 + ldr r0, _0216504c ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] bl func_ov00_02097760 @@ -12053,19 +12053,19 @@ _02165044: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_0216500c -_0216504c: .word data_027e0f74 +_0216504c: .word gAdventureFlags .global func_ov18_02165050 arm_func_start func_ov18_02165050 func_ov18_02165050: ; 0x02165050 stmdb sp!, {r3, lr} - ldr r0, _021650a4 ; =data_027e0f74 + ldr r0, _021650a4 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _0216509c - ldr r0, _021650a4 ; =data_027e0f74 + ldr r0, _021650a4 ; =gAdventureFlags mov r1, #0x9c ldr r0, [r0] bl func_ov00_02097760 @@ -12082,20 +12082,20 @@ _0216509c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02165050 -_021650a4: .word data_027e0f74 +_021650a4: .word gAdventureFlags _021650a8: .word data_027e0dbc .global func_ov18_021650ac arm_func_start func_ov18_021650ac func_ov18_021650ac: ; 0x021650ac stmdb sp!, {r3, lr} - ldr r0, _021650ec ; =data_027e0f74 + ldr r0, _021650ec ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _021650e4 - ldr r0, _021650ec ; =data_027e0f74 + ldr r0, _021650ec ; =gAdventureFlags ldr r1, _021650f0 ; =0x00000123 ldr r0, [r0] bl func_ov00_02097760 @@ -12107,20 +12107,20 @@ _021650e4: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_021650ac -_021650ec: .word data_027e0f74 +_021650ec: .word gAdventureFlags _021650f0: .word 0x00000123 .global func_ov18_021650f4 arm_func_start func_ov18_021650f4 func_ov18_021650f4: ; 0x021650f4 stmdb sp!, {r3, lr} - ldr r0, _02165134 ; =data_027e0f74 + ldr r0, _02165134 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _0216512c - ldr r0, _02165134 ; =data_027e0f74 + ldr r0, _02165134 ; =gAdventureFlags ldr r1, _02165138 ; =0x0000012a ldr r0, [r0] bl func_ov00_02097760 @@ -12132,20 +12132,20 @@ _0216512c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_021650f4 -_02165134: .word data_027e0f74 +_02165134: .word gAdventureFlags _02165138: .word 0x0000012a .global func_ov18_0216513c arm_func_start func_ov18_0216513c func_ov18_0216513c: ; 0x0216513c stmdb sp!, {r3, lr} - ldr r0, _0216517c ; =data_027e0f74 + ldr r0, _0216517c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02165174 - ldr r0, _0216517c ; =data_027e0f74 + ldr r0, _0216517c ; =gAdventureFlags ldr r1, _02165180 ; =0x0000012b ldr r0, [r0] bl func_ov00_02097760 @@ -12157,20 +12157,20 @@ _02165174: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_0216513c -_0216517c: .word data_027e0f74 +_0216517c: .word gAdventureFlags _02165180: .word 0x0000012b .global func_ov18_02165184 arm_func_start func_ov18_02165184 func_ov18_02165184: ; 0x02165184 stmdb sp!, {r3, lr} - ldr r0, _021651c4 ; =data_027e0f74 + ldr r0, _021651c4 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _021651bc - ldr r0, _021651c4 ; =data_027e0f74 + ldr r0, _021651c4 ; =gAdventureFlags mov r1, #0x12c ldr r0, [r0] bl func_ov00_02097760 @@ -12182,19 +12182,19 @@ _021651bc: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02165184 -_021651c4: .word data_027e0f74 +_021651c4: .word gAdventureFlags .global func_ov18_021651c8 arm_func_start func_ov18_021651c8 func_ov18_021651c8: ; 0x021651c8 stmdb sp!, {r3, lr} - ldr r0, _02165208 ; =data_027e0f74 + ldr r0, _02165208 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02165200 - ldr r0, _02165208 ; =data_027e0f74 + ldr r0, _02165208 ; =gAdventureFlags ldr r1, _0216520c ; =0x0000012d ldr r0, [r0] bl func_ov00_02097760 @@ -12206,20 +12206,20 @@ _02165200: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_021651c8 -_02165208: .word data_027e0f74 +_02165208: .word gAdventureFlags _0216520c: .word 0x0000012d .global func_ov18_02165210 arm_func_start func_ov18_02165210 func_ov18_02165210: ; 0x02165210 stmdb sp!, {r3, lr} - ldr r0, _02165250 ; =data_027e0f74 + ldr r0, _02165250 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02165248 - ldr r0, _02165250 ; =data_027e0f74 + ldr r0, _02165250 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] bl func_ov00_02097760 @@ -12231,19 +12231,19 @@ _02165248: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02165210 -_02165250: .word data_027e0f74 +_02165250: .word gAdventureFlags .global func_ov18_02165254 arm_func_start func_ov18_02165254 func_ov18_02165254: ; 0x02165254 stmdb sp!, {r3, lr} - ldr r0, _02165294 ; =data_027e0f74 + ldr r0, _02165294 ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _0216528c - ldr r0, _02165294 ; =data_027e0f74 + ldr r0, _02165294 ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] bl func_ov00_02097760 @@ -12255,19 +12255,19 @@ _0216528c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02165254 -_02165294: .word data_027e0f74 +_02165294: .word gAdventureFlags .global func_ov18_02165298 arm_func_start func_ov18_02165298 func_ov18_02165298: ; 0x02165298 stmdb sp!, {r3, lr} - ldr r0, _021652d8 ; =data_027e0f74 + ldr r0, _021652d8 ; =gAdventureFlags mov r1, #0x37 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _021652d0 - ldr r0, _021652d8 ; =data_027e0f74 + ldr r0, _021652d8 ; =gAdventureFlags ldr r1, _021652dc ; =0x0000017b ldr r0, [r0] bl func_ov00_02097760 @@ -12279,7 +12279,7 @@ _021652d0: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov18_02165298 -_021652d8: .word data_027e0f74 +_021652d8: .word gAdventureFlags _021652dc: .word 0x0000017b .global func_ov18_021652e0 @@ -12288,7 +12288,7 @@ func_ov18_021652e0: ; 0x021652e0 stmdb sp!, {r4, r5, r6, r7, r8, lr} ldr r6, _0216533c ; =data_ov18_0216ce8c ldr r7, _02165340 ; =data_ov18_0216cee8 - ldr r5, _02165344 ; =data_027e0f74 + ldr r5, _02165344 ; =gAdventureFlags ldr r4, _02165348 ; =0x00000187 mov r8, #0 _021652f8: @@ -12315,7 +12315,7 @@ _02165328: arm_func_end func_ov18_021652e0 _0216533c: .word data_ov18_0216ce8c _02165340: .word data_ov18_0216cee8 -_02165344: .word data_027e0f74 +_02165344: .word gAdventureFlags _02165348: .word 0x00000187 .global func_ov18_0216534c @@ -12324,7 +12324,7 @@ func_ov18_0216534c: ; 0x0216534c stmdb sp!, {r4, r5, r6, r7, r8, lr} ldr r6, _021653ac ; =data_ov18_0216ce8c ldr r7, _021653b0 ; =data_ov18_0216cee8 - ldr r5, _021653b4 ; =data_027e0f74 + ldr r5, _021653b4 ; =gAdventureFlags ldr r4, _021653b8 ; =0x00000187 mov r8, #0 _02165364: @@ -12352,7 +12352,7 @@ _02165398: arm_func_end func_ov18_0216534c _021653ac: .word data_ov18_0216ce8c _021653b0: .word data_ov18_0216cee8 -_021653b4: .word data_027e0f74 +_021653b4: .word gAdventureFlags _021653b8: .word 0x00000187 .global func_ov18_021653bc @@ -12443,7 +12443,7 @@ func_ov18_02165420: ; 0x02165420 add r0, r4, #0x1d8 mov r1, #0 bl func_ov14_02145f0c - ldr r0, _0216567c ; =data_027e0f74 + ldr r0, _0216567c ; =gAdventureFlags mov r1, #0x9a ldr r0, [r0] bl func_ov00_02097760 @@ -12557,7 +12557,7 @@ _0216566c: .word data_027e0fec _02165670: .word data_ov18_0216b55c _02165674: .word data_ov18_0216b548 _02165678: .word data_ov18_0216b53c -_0216567c: .word data_027e0f74 +_0216567c: .word gAdventureFlags _02165680: .word data_027e0fe8 _02165684: .word 0x5053544d _02165688: .word data_ov18_0216cf44 @@ -12578,7 +12578,7 @@ func_ov18_02165690: ; 0x02165690 ldr r1, [r1, r2, lsl #2] cmp r1, r0 beq _021656d0 - ldr r0, _021656e0 ; =data_027e0f74 + ldr r0, _021656e0 ; =gAdventureFlags mov r2, #1 ldr r0, [r0] bl func_ov00_0209779c @@ -12589,7 +12589,7 @@ _021656d0: .align 2, 0 arm_func_end func_ov18_02165690 _021656dc: .word data_ov18_0216cee8 -_021656e0: .word data_027e0f74 +_021656e0: .word gAdventureFlags .global func_ov18_021656e4 arm_func_start func_ov18_021656e4 @@ -13276,7 +13276,7 @@ func_ov18_02165e30: ; 0x02165e30 add r0, r0, #0x12 cmp r4, r0 bne _02165f30 - ldr r0, _02165f48 ; =data_027e0f74 + ldr r0, _02165f48 ; =gAdventureFlags mov r1, #0x8c ldr r0, [r0] bl func_ov00_02097760 @@ -13292,7 +13292,7 @@ _02165f30: .align 2, 0 arm_func_end func_ov18_02165e30 _02165f44: .word 0x00040004 -_02165f48: .word data_027e0f74 +_02165f48: .word gAdventureFlags _02165f4c: .word 0x00040017 .global func_ov18_02165f50 @@ -13416,7 +13416,7 @@ _021660d0: b _0216664c _021660ec: add r1, r0, #1 - ldr r0, _02166658 ; =data_027e0f74 + ldr r0, _02166658 ; =gAdventureFlags strb r1, [r5, #0x51c] mov r1, #0 ldr r0, [r0] @@ -13433,7 +13433,7 @@ _0216611c: ldrsh r0, [r0, #0x20] cmp r0, #0x90 bne _0216664c - ldr r0, _02166658 ; =data_027e0f74 + ldr r0, _02166658 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -13600,7 +13600,7 @@ _02166388: add r0, r5, #0x1d8 mov r1, #2 bl func_ov14_02145f0c - ldr r0, _02166658 ; =data_027e0f74 + ldr r0, _02166658 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -13785,7 +13785,7 @@ _0216664c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov18_02166098 -_02166658: .word data_027e0f74 +_02166658: .word gAdventureFlags _0216665c: .word data_027e103c _02166660: .word data_ov18_0216d604 _02166664: .word data_027e0ffc @@ -14504,7 +14504,7 @@ func_ov18_02166f20: ; 0x02166f20 add ip, r4, #0x500 mov r2, r1 strh r0, [ip, #0x18] - ldr r0, _02167060 ; =data_027e0f74 + ldr r0, _02167060 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097ff4 add r0, r4, #0x14 @@ -14526,7 +14526,7 @@ func_ov18_02166f20: ; 0x02166f20 _02167054: .word data_ov18_0216d604 _02167058: .word data_02050f54 _0216705c: .word data_ov18_0216d0bc -_02167060: .word data_027e0f74 +_02167060: .word gAdventureFlags .global func_ov18_02167064 arm_func_start func_ov18_02167064 @@ -15344,7 +15344,7 @@ _02167bac: bl _ZN12ActorManager8GetActorEP8ActorRef bl func_ov18_02165690 _02167bdc: - ldr r0, _02167e00 ; =data_027e0f74 + ldr r0, _02167e00 ; =gAdventureFlags mov r1, #0 ldr r0, [r0] mov r3, r1 @@ -15487,7 +15487,7 @@ _02167df0: .word data_027e0f64 _02167df4: .word 0x00001555 _02167df8: .word data_02050f54 _02167dfc: .word data_027e0fe4 -_02167e00: .word data_027e0f74 +_02167e00: .word gAdventureFlags .global func_ov18_02167e04 arm_func_start func_ov18_02167e04 @@ -15529,7 +15529,7 @@ func_ov18_02167e04: ; 0x02167e04 mov r3, #0 strb r3, [r4, #0x475] strb r3, [r4, #0x474] - ldr r0, _02167ec4 ; =data_027e0f74 + ldr r0, _02167ec4 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -15542,7 +15542,7 @@ func_ov18_02167e04: ; 0x02167e04 .align 2, 0 arm_func_end func_ov18_02167e04 _02167ec0: .word data_027e0f64 -_02167ec4: .word data_027e0f74 +_02167ec4: .word gAdventureFlags .global func_ov18_02167ec8 arm_func_start func_ov18_02167ec8 @@ -18491,7 +18491,7 @@ _0216a5dc: ; jump table b _0216a674 ; case 12 b _0216a674 ; case 13 _0216a614: - ldr r0, _0216a6ac ; =data_027e0f74 + ldr r0, _0216a6ac ; =gAdventureFlags mov r1, #0x31 ldr r0, [r0] bl func_ov00_02097760 @@ -18533,7 +18533,7 @@ _0216a674: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov18_0216a5c4 -_0216a6ac: .word data_027e0f74 +_0216a6ac: .word gAdventureFlags _0216a6b0: .word data_027e0e60 .global func_ov18_0216a6b4 diff --git a/asm/ov19.inc b/asm/ov19.inc index 257aab42..1e644666 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -98,7 +98,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f84 .extern data_027e0f90 diff --git a/asm/ov19.s b/asm/ov19.s index 89a6dfeb..ac1bc646 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -175,7 +175,7 @@ func_ov19_0216d8ec: ; 0x0216d8ec arm_func_start func_ov19_0216d8f8 func_ov19_0216d8f8: ; 0x0216d8f8 stmdb sp!, {r4, lr} - ldr r1, _0216da10 ; =data_027e0f74 + ldr r1, _0216da10 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x1e @@ -246,7 +246,7 @@ func_ov19_0216d8f8: ; 0x0216d8f8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov19_0216d8f8 -_0216da10: .word data_027e0f74 +_0216da10: .word gAdventureFlags _0216da14: .word data_ov19_02176340 _0216da18: .word 0xffffe4cd @@ -1537,7 +1537,7 @@ func_ov19_0216eac8: ; 0x0216eac8 arm_func_start func_ov19_0216eacc func_ov19_0216eacc: ; 0x0216eacc stmdb sp!, {r3, r4, r5, lr} - ldr r1, _0216eb28 ; =data_027e0f74 + ldr r1, _0216eb28 ; =gAdventureFlags mov r5, r0 ldr r0, [r1] mov r1, #0x1e @@ -1562,7 +1562,7 @@ _0216eafc: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov19_0216eacc -_0216eb28: .word data_027e0f74 +_0216eb28: .word gAdventureFlags _0216eb2c: .word gItemManager _0216eb30: .word 0x0000048d _0216eb34: .word data_027e0ffc @@ -2562,7 +2562,7 @@ _0216f828: cmp r0, #0 addeq sp, sp, #0x1c8 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0216f938 ; =data_027e0f74 + ldr r0, _0216f938 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 str r0, [r5, #8] @@ -2574,7 +2574,7 @@ _0216f828: _0216f86c: mov r1, #0 bl func_ov19_0216dac8 - ldr r0, _0216f938 ; =data_027e0f74 + ldr r0, _0216f938 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r1, [r5, #8] @@ -2589,7 +2589,7 @@ _0216f86c: add sp, sp, #0x1c8 ldmia sp!, {r3, r4, r5, pc} _0216f8ac: - ldr r0, _0216f938 ; =data_027e0f74 + ldr r0, _0216f938 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 ldr r1, [r5, #8] @@ -2628,7 +2628,7 @@ _0216f928: .word 0x00001388 _0216f92c: .word 0x00006590 _0216f930: .word 0x7e07e07f _0216f934: .word data_027e0c68 -_0216f938: .word data_027e0f74 +_0216f938: .word gAdventureFlags .global func_ov19_0216f93c arm_func_start func_ov19_0216f93c @@ -3777,7 +3777,7 @@ _02170870: ldmneia sp!, {r3, r4, r5, r6, r7, r8, pc} add r0, r5, #0x18 bl func_ov00_020b7e6c - ldr r0, _021708dc ; =data_027e0f74 + ldr r0, _021708dc ; =gAdventureFlags mov r1, #7 ldr r0, [r0] bl func_ov00_02097968 @@ -3800,7 +3800,7 @@ _021708cc: .word 0x00001007 _021708d0: .word 0x00001008 _021708d4: .word 0x00001009 _021708d8: .word 0x0000030d -_021708dc: .word data_027e0f74 +_021708dc: .word gAdventureFlags .global func_ov19_021708e0 arm_func_start func_ov19_021708e0 @@ -6897,7 +6897,7 @@ _021730d0: mov r2, #0x1e mov r1, #6 str r0, [sp, #4] - ldr r0, _02173148 ; =data_027e0f74 + ldr r0, _02173148 ; =gAdventureFlags strb r2, [sp, #9] strb r1, [sp, #0xa] ldr r1, [r4, #0x18] @@ -6923,7 +6923,7 @@ _0217313c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov19_02173084 -_02173148: .word data_027e0f74 +_02173148: .word gAdventureFlags .global func_ov19_0217314c arm_func_start func_ov19_0217314c @@ -7346,7 +7346,7 @@ _02173674: add sp, sp, #8 ldmia sp!, {r4, pc} _0217369c: - ldr r0, _0217378c ; =data_027e0f74 + ldr r0, _0217378c ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097bac @@ -7361,14 +7361,14 @@ _0217369c: add sp, sp, #8 ldmia sp!, {r4, pc} _021736d4: - ldr r0, _0217378c ; =data_027e0f74 + ldr r0, _0217378c ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r4, pc} - ldr r0, _0217378c ; =data_027e0f74 + ldr r0, _0217378c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0xa @@ -7378,7 +7378,7 @@ _021736d4: ldr r0, [r0] bl func_ov00_020bcfb8 _02173714: - ldr r0, _0217378c ; =data_027e0f74 + ldr r0, _0217378c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #5 @@ -7412,7 +7412,7 @@ _0217377c: arm_func_end func_ov19_0217358c _02173784: .word 0x00000666 _02173788: .word data_027e0ffc -_0217378c: .word data_027e0f74 +_0217378c: .word gAdventureFlags _02173790: .word data_027e0fc8 _02173794: .word 0x000001b3 @@ -7476,7 +7476,7 @@ _0217383c: add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _021738b8 ; =data_027e0f74 + ldr r0, _021738b8 ; =gAdventureFlags mov ip, #0x1e mov r3, #0x28 ldr r0, [r0] @@ -7500,7 +7500,7 @@ _021738ac: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov19_02173798 -_021738b8: .word data_027e0f74 +_021738b8: .word gAdventureFlags .global func_ov19_021738bc arm_func_start func_ov19_021738bc @@ -8388,7 +8388,7 @@ func_ov19_02174454: ; 0x02174454 ldrh r1, [r4, #0x24] cmp r1, #0 ble _0217448c - ldr r0, _02174548 ; =data_027e0f74 + ldr r0, _02174548 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -8400,7 +8400,7 @@ _0217448c: ldrh r1, [r4, #0x26] cmp r1, #0 ble _021744b8 - ldr r0, _02174548 ; =data_027e0f74 + ldr r0, _02174548 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -8447,7 +8447,7 @@ _021744b8: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov19_02174454 -_02174548: .word data_027e0f74 +_02174548: .word gAdventureFlags _0217454c: .word data_027e0e60 _02174550: .word data_ov19_02176b88 diff --git a/asm/ov20.inc b/asm/ov20.inc index 7fd6afdd..141d7c14 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -23,7 +23,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f68 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov20.s b/asm/ov20.s index c8695cd0..a43a644d 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -132,7 +132,7 @@ _0216d844: .word func_ov20_0216da18 func_ov20_0216d848: ; 0x0216d848 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x44 - ldr r1, _0216d9fc ; =data_027e0f74 + ldr r1, _0216d9fc ; =gAdventureFlags mov sl, r0 ldr r0, [r1] mov r1, #0x1d @@ -243,7 +243,7 @@ _0216d968: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov20_0216d848 -_0216d9fc: .word data_027e0f74 +_0216d9fc: .word gAdventureFlags _0216da00: .word data_ov20_02178320 _0216da04: .word 0x46425331 _0216da08: .word data_027e0fe8 @@ -291,7 +291,7 @@ func_ov20_0216da64: ; 0x0216da64 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 bl _ZN5Actor4KillEv - ldr r0, _0216dabc ; =data_027e0f74 + ldr r0, _0216dabc ; =gAdventureFlags mov r1, #0x1d ldr r0, [r0] mov r2, #1 @@ -313,7 +313,7 @@ _0216da98: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov20_0216da64 -_0216dabc: .word data_027e0f74 +_0216dabc: .word gAdventureFlags _0216dac0: .word gItemManager .global func_ov20_0216dac4 @@ -2058,7 +2058,7 @@ _0216f42c: add r0, r4, #0x2b8 add r0, r0, #0x800 bl func_ov00_020b7e6c - ldr r0, _0216f4b0 ; =data_027e0f74 + ldr r0, _0216f4b0 ; =gAdventureFlags mov r1, #6 ldr r0, [r0] bl func_ov00_02097968 @@ -2089,7 +2089,7 @@ _0216f4a0: .word 0x0000100b _0216f4a4: .word 0x0000100c _0216f4a8: .word 0x0000100d _0216f4ac: .word 0x0000030d -_0216f4b0: .word data_027e0f74 +_0216f4b0: .word gAdventureFlags .global func_ov20_0216f4b4 arm_func_start func_ov20_0216f4b4 @@ -6463,13 +6463,13 @@ _02172dac: ; jump table ldmia sp!, {r4, pc} ; case 9 b _02173000 ; case 10 _02172dd8: - ldr r0, _02173018 ; =data_027e0f74 + ldr r0, _02173018 ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02173018 ; =data_027e0f74 + ldr r0, _02173018 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_0209809c cmp r0, #0 @@ -6517,7 +6517,7 @@ _02172e54: ldr r1, [r1, r2, lsl #5] cmp r1, r0 beq _02172eb8 - ldr r0, _02173018 ; =data_027e0f74 + ldr r0, _02173018 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -6620,7 +6620,7 @@ _02173000: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov20_02172d94 -_02173018: .word data_027e0f74 +_02173018: .word gAdventureFlags _0217301c: .word data_027e0c68 _02173020: .word data_ov20_021788f8 _02173024: .word 0x00000187 @@ -6898,7 +6898,7 @@ _021732a8: ldrb ip, [sp, #0x62] ldrb r3, [sp, #0x63] ldrb r2, [sp, #0x64] - ldr r0, _02173564 ; =data_027e0f74 + ldr r0, _02173564 ; =gAdventureFlags ldr r6, [sp, #0x5c] ldr r0, [r0] add r1, sp, #0x68 @@ -6952,7 +6952,7 @@ _021734ac: bl func_02036edc b _0217354c _021734c0: - ldr r0, _02173564 ; =data_027e0f74 + ldr r0, _02173564 ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] bl func_ov00_02097bcc @@ -6966,7 +6966,7 @@ _021734c0: _021734ec: cmp r2, #0 bne _0217350c - ldr r0, _02173564 ; =data_027e0f74 + ldr r0, _02173564 ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] bl func_ov00_02097bcc @@ -6984,7 +6984,7 @@ _0217350c: str r0, [r4, #4] b _0217354c _02173534: - ldr r0, _02173564 ; =data_027e0f74 + ldr r0, _02173564 ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] bl func_ov00_02097bcc @@ -6999,7 +6999,7 @@ _0217354c: _02173558: .word data_027e0f64 _0217355c: .word 0x00001555 _02173560: .word 0x00000333 -_02173564: .word data_027e0f74 +_02173564: .word gAdventureFlags _02173568: .word data_027e0c68 _0217356c: .word data_ov00_020eec9c _02173570: .word 0x0000036b @@ -8070,7 +8070,7 @@ func_ov20_02174254: ; 0x02174254 ldrh r1, [r4, #0x20] cmp r1, #0 beq _021742bc - ldr r0, _02174308 ; =data_027e0f74 + ldr r0, _02174308 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -8100,7 +8100,7 @@ _021742fc: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov20_02174254 -_02174308: .word data_027e0f74 +_02174308: .word gAdventureFlags _0217430c: .word data_027e0e58 _02174310: .word 0x000001d7 @@ -9915,7 +9915,7 @@ _02175a54: str r1, [sp, #0xf0] ldmia r0, {r0, r1, r2} stmia r3, {r0, r1, r2} - ldr r0, _02175f1c ; =data_027e0f74 + ldr r0, _02175f1c ; =gAdventureFlags ldr r5, [sp, #0xd4] ldr r3, [sp, #0xd8] ldr r2, [sp, #0xdc] @@ -9931,7 +9931,7 @@ _02175a54: add sp, sp, #0x19c ldmia sp!, {r4, r5, pc} _02175ae0: - ldr r0, _02175f1c ; =data_027e0f74 + ldr r0, _02175f1c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 @@ -10207,7 +10207,7 @@ _02175ec8: cmp r0, #0 addeq sp, sp, #0x19c ldmeqia sp!, {r4, r5, pc} - ldr r0, _02175f1c ; =data_027e0f74 + ldr r0, _02175f1c ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097bcc @@ -10220,7 +10220,7 @@ _02175ec8: _02175f10: .word data_027e0f94 _02175f14: .word data_027e0e60 _02175f18: .word data_027e077c -_02175f1c: .word data_027e0f74 +_02175f1c: .word gAdventureFlags _02175f20: .word data_027e0ffc _02175f24: .word 0x00000391 _02175f28: .word data_027e0fe4 @@ -10510,7 +10510,7 @@ func_ov20_02176234: ; 0x02176234 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0217635c ; =data_027e0f74 + ldr r0, _0217635c ; =gAdventureFlags mov r1, #0xa ldr r0, [r0] bl func_ov00_02097760 @@ -10564,7 +10564,7 @@ _021762c8: mov r1, #1 strb r1, [r4, #0x4d5] strb r1, [r4, #0x4d6] - ldr r0, _0217635c ; =data_027e0f74 + ldr r0, _0217635c ; =gAdventureFlags mov r1, #0x3f ldr r0, [r0] bl func_ov00_02097760 @@ -10582,7 +10582,7 @@ _021762c8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov20_02176234 -_0217635c: .word data_027e0f74 +_0217635c: .word gAdventureFlags _02176360: .word data_027e0f68 _02176364: .word data_027e0fec _02176368: .word data_ov20_02177aa0 @@ -10729,7 +10729,7 @@ _021764c4: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, pc} _021764d0: - ldr r0, _021766a4 ; =data_027e0f74 + ldr r0, _021766a4 ; =gAdventureFlags mov r1, #0xa ldr r0, [r0] bl func_ov00_02097760 @@ -10858,7 +10858,7 @@ _02176694: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov20_02176460 -_021766a4: .word data_027e0f74 +_021766a4: .word gAdventureFlags _021766a8: .word data_027e0ffc _021766ac: .word 0x00000366 _021766b0: .word data_027e0e58 diff --git a/asm/ov22.inc b/asm/ov22.inc index e77b0e55..586b5ffb 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -83,7 +83,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f84 .extern data_027e0f90 diff --git a/asm/ov22.s b/asm/ov22.s index b0cdf2b0..cf8a5be5 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -1175,13 +1175,13 @@ _0216e614: ldrb r0, [r4, #0x64] cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0216e770 ; =data_027e0f74 + ldr r0, _0216e770 ; =gAdventureFlags ldr r1, [r4, #0x70] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0216e770 ; =data_027e0f74 + ldr r0, _0216e770 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -1238,13 +1238,13 @@ _0216e700: ldrb r0, [r4, #0x64] cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0216e770 ; =data_027e0f74 + ldr r0, _0216e770 ; =gAdventureFlags ldr r1, [r4, #0x70] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0216e770 ; =data_027e0f74 + ldr r0, _0216e770 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -1266,7 +1266,7 @@ _0216e754: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov22_0216e594 -_0216e770: .word data_027e0f74 +_0216e770: .word gAdventureFlags _0216e774: .word 0xffffe4cd .global func_ov22_0216e778 @@ -1320,7 +1320,7 @@ _0216e7f0: strb r0, [sp, #0xe3] strb r1, [sp, #0xe1] ldrb r1, [r4, #0x66] - ldr r0, _0216ec88 ; =data_027e0f74 + ldr r0, _0216ec88 ; =gAdventureFlags ldr r3, [r4, #0x20] sub r1, r1, #1 mov r5, r1, lsl #0xc @@ -1483,7 +1483,7 @@ _0216ea68: mov r2, #0x64 mov r1, #6 mov r3, #0x69 - ldr r0, _0216ec88 ; =data_027e0f74 + ldr r0, _0216ec88 ; =gAdventureFlags strb r2, [sp, #0x31] strb r1, [sp, #0x32] str r3, [sp, #0x2c] @@ -1620,7 +1620,7 @@ _0216ec74: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov22_0216e778 -_0216ec88: .word data_027e0f74 +_0216ec88: .word gAdventureFlags _0216ec8c: .word data_027e0e60 _0216ec90: .word data_027e0ffc _0216ec94: .word 0x00000335 @@ -2770,7 +2770,7 @@ _0216fb14: strb r0, [r5, #0x69f] b _0216fcd0 _0216fb20: - ldr r0, _0216fd5c ; =data_027e0f74 + ldr r0, _0216fd5c ; =gAdventureFlags mov r1, #0x53 ldr r0, [r0] bl func_ov00_02097760 @@ -2869,7 +2869,7 @@ _0216fbc4: mov r4, #2 b _0216fcd0 _0216fca4: - ldr r0, _0216fd5c ; =data_027e0f74 + ldr r0, _0216fd5c ; =gAdventureFlags mov r1, #0x63 ldr r0, [r0] bl func_ov00_02097760 @@ -2920,7 +2920,7 @@ _0216fd04: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov22_0216fa7c -_0216fd5c: .word data_027e0f74 +_0216fd5c: .word gAdventureFlags _0216fd60: .word data_02050f54 _0216fd64: .word 0x534e4d42 _0216fd68: .word func_ov22_0216f5a8 @@ -4702,7 +4702,7 @@ _021714b0: .word data_ov22_0217966c arm_func_start func_ov22_021714b4 func_ov22_021714b4: ; 0x021714b4 stmdb sp!, {r4, lr} - ldr r1, _02171628 ; =data_027e0f74 + ldr r1, _02171628 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x7d @@ -4803,7 +4803,7 @@ _021715f8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov22_021714b4 -_02171628: .word data_027e0f74 +_02171628: .word gAdventureFlags _0217162c: .word 0x00000b33 _02171630: .word data_ov22_02179430 _02171634: .word 0x00000333 @@ -9441,7 +9441,7 @@ func_ov22_02175238: ; 0x02175238 ldrh r0, [r4, #0x24] cmp r0, #1 bne _02175320 - ldr r0, _02175340 ; =data_027e0f74 + ldr r0, _02175340 ; =gAdventureFlags mov r1, #0xd ldr r0, [r0] bl func_ov00_02097c18 @@ -9473,7 +9473,7 @@ _02175320: .align 2, 0 arm_func_end func_ov22_02175238 _0217533c: .word 0x00000e66 -_02175340: .word data_027e0f74 +_02175340: .word gAdventureFlags .global func_ov22_02175344 arm_func_start func_ov22_02175344 @@ -10319,7 +10319,7 @@ _02175d78: blx r3 ldmia sp!, {r4, pc} _02175da4: - ldr r0, _02175e2c ; =data_027e0f74 + ldr r0, _02175e2c ; =gAdventureFlags ldr r1, [r4, #0x38] ldr r0, [r0] bl func_ov00_02097bac @@ -10333,13 +10333,13 @@ _02175da4: blx r3 ldmia sp!, {r4, pc} _02175dd8: - ldr r0, _02175e2c ; =data_027e0f74 + ldr r0, _02175e2c ; =gAdventureFlags ldr r1, [r4, #0x38] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02175e2c ; =data_027e0f74 + ldr r0, _02175e2c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -10356,7 +10356,7 @@ _02175dd8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov22_02175d40 -_02175e2c: .word data_027e0f74 +_02175e2c: .word gAdventureFlags .global func_ov22_02175e30 arm_func_start func_ov22_02175e30 @@ -10401,7 +10401,7 @@ _02175e80: strb r2, [sp, #9] strb r1, [sp, #0xa] ldr r1, [r5, #0x18] - ldr r0, _02175f58 ; =data_027e0f74 + ldr r0, _02175f58 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r5, #0x1c] ldr r0, [r0] @@ -10441,7 +10441,7 @@ _02175f48: .align 2, 0 arm_func_end func_ov22_02175e30 _02175f54: .word 0xffffe333 -_02175f58: .word data_027e0f74 +_02175f58: .word gAdventureFlags .global func_ov22_02175f5c arm_func_start func_ov22_02175f5c @@ -13441,7 +13441,7 @@ func_ov22_0217843c: ; 0x0217843c blx r1 mov r0, #5 str r0, [r4, #0x12c] - ldr r0, _021784f4 ; =data_027e0f74 + ldr r0, _021784f4 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] bl func_ov00_02097760 @@ -13456,7 +13456,7 @@ _021784e4: .word data_ov22_0217898c _021784e8: .word data_ov22_0217a3cc _021784ec: .word data_ov22_0217a3d0 _021784f0: .word data_ov22_02178980 -_021784f4: .word data_027e0f74 +_021784f4: .word gAdventureFlags .global func_ov22_021784f8 arm_func_start func_ov22_021784f8 @@ -13494,7 +13494,7 @@ func_ov22_021784f8: ; 0x021784f8 blx r1 mov r0, #5 str r0, [r4, #0x12c] - ldr r0, _021785b0 ; =data_027e0f74 + ldr r0, _021785b0 ; =gAdventureFlags mov r1, #0x7d ldr r0, [r0] bl func_ov00_02097760 @@ -13509,7 +13509,7 @@ _021785a0: .word data_ov22_0217898c _021785a4: .word data_ov22_02178980 _021785a8: .word data_ov22_0217a3d8 _021785ac: .word data_ov22_0217a3dc -_021785b0: .word data_027e0f74 +_021785b0: .word gAdventureFlags .global func_ov22_021785b4 arm_func_start func_ov22_021785b4 diff --git a/asm/ov23.inc b/asm/ov23.inc index 53896535..1866cc45 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -114,7 +114,7 @@ .extern data_027e0f68 .extern data_027e0f6c .extern data_027e0f70 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov23.s b/asm/ov23.s index 51c8c893..1324c183 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -5232,7 +5232,7 @@ _02171a38: add sp, sp, #0x4c ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} _02171a94: - ldr r0, _02172090 ; =data_027e0f74 + ldr r0, _02172090 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -5636,7 +5636,7 @@ _02172080: .word 0x0000038b _02172084: .word data_ov23_0217a2c4 _02172088: .word data_027e0fb8 _0217208c: .word 0x0000059a -_02172090: .word data_027e0f74 +_02172090: .word gAdventureFlags _02172094: .word 0x00000666 _02172098: .word 0x00000333 _0217209c: .word data_027e0d38 @@ -9387,7 +9387,7 @@ _02175270: mvn r3, #0 mov r2, #0x32 str r3, [sp, #4] - ldr r0, _02175344 ; =data_027e0f74 + ldr r0, _02175344 ; =gAdventureFlags strb r2, [sp, #9] strb r1, [sp, #0xa] strb r1, [sp, #0xb] @@ -9439,7 +9439,7 @@ _02175334: .word data_027e103c _02175338: .word data_027e0fc8 _0217533c: .word data_ov23_0217a62c _02175340: .word data_ov23_0217a61c -_02175344: .word data_027e0f74 +_02175344: .word gAdventureFlags _02175348: .word data_027e0c68 _0217534c: .word 0x0069032f @@ -9450,7 +9450,7 @@ func_ov23_02175350: ; 0x02175350 ldrh r1, [r0, #0x24] cmp r1, #0 beq _02175378 - ldr r0, _02175380 ; =data_027e0f74 + ldr r0, _02175380 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -9461,7 +9461,7 @@ _02175378: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov23_02175350 -_02175380: .word data_027e0f74 +_02175380: .word gAdventureFlags .global func_ov23_02175384 arm_func_start func_ov23_02175384 @@ -9522,7 +9522,7 @@ _02175440: ldrh r1, [r6, #0x22] cmp r1, #0 beq _02175470 - ldr r0, _02175710 ; =data_027e0f74 + ldr r0, _02175710 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -9668,7 +9668,7 @@ _02175664: mov r0, r6 mov r1, #1 bl func_ov23_02175178 - ldr r0, _02175710 ; =data_027e0f74 + ldr r0, _02175710 ; =gAdventureFlags ldr r1, [r6, #0x168] ldr r0, [r0] bl func_ov00_02097bcc @@ -9709,7 +9709,7 @@ _021756d4: arm_func_end func_ov23_02175384 _02175708: .word data_027e0fc8 _0217570c: .word 0x66666667 -_02175710: .word data_027e0f74 +_02175710: .word gAdventureFlags _02175714: .word data_027e077c _02175718: .word data_ov23_0217a61c @@ -9737,7 +9737,7 @@ _02175760: ldr r0, [r6, #0x130] cmp r0, #4 bne _021757b4 - ldr r0, _02175870 ; =data_027e0f74 + ldr r0, _02175870 ; =gAdventureFlags ldr r1, [r6, #0x168] ldr r0, [r0] bl func_ov00_02097b9c @@ -9749,7 +9749,7 @@ _02175760: mov r0, r6 mov r1, #1 bl func_ov23_02175178 - ldr r0, _02175870 ; =data_027e0f74 + ldr r0, _02175870 ; =gAdventureFlags ldr r1, [r6, #0x168] ldr r0, [r0] bl func_ov00_02097bcc @@ -9807,7 +9807,7 @@ _02175844: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov23_0217571c -_02175870: .word data_027e0f74 +_02175870: .word gAdventureFlags _02175874: .word data_027e0fc8 .global func_ov23_02175878 @@ -10503,7 +10503,7 @@ func_ov23_02176100: ; 0x02176100 ldrb r0, [r0, #4] cmp r0, #0 bne _0217614c - ldr r0, _0217618c ; =data_027e0f74 + ldr r0, _0217618c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -10528,7 +10528,7 @@ _02176154: .align 2, 0 arm_func_end func_ov23_02176100 _02176188: .word data_027e0c68 -_0217618c: .word data_027e0f74 +_0217618c: .word gAdventureFlags .global func_ov23_02176190 arm_func_start func_ov23_02176190 @@ -10613,7 +10613,7 @@ func_ov23_0217625c: ; 0x0217625c cmp r0, #0 addgt sp, sp, #0x10 ldmgtia sp!, {r4, pc} - ldr r0, _021763a4 ; =data_027e0f74 + ldr r0, _021763a4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -10682,7 +10682,7 @@ _02176380: .align 2, 0 arm_func_end func_ov23_0217625c _021763a0: .word data_027e0db0 -_021763a4: .word data_027e0f74 +_021763a4: .word gAdventureFlags _021763a8: .word data_027e077c _021763ac: .word data_02056be4 _021763b0: .word data_027e0618 @@ -11042,7 +11042,7 @@ _02176838: add sp, sp, #0xc ldmia sp!, {r3, r4, pc} _02176870: - ldr r0, _02176a28 ; =data_027e0f74 + ldr r0, _02176a28 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097bac @@ -11057,20 +11057,20 @@ _02176870: add sp, sp, #0xc ldmia sp!, {r3, r4, pc} _021768a8: - ldr r0, _02176a28 ; =data_027e0f74 + ldr r0, _02176a28 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, pc} - ldr r0, _02176a28 ; =data_027e0f74 + ldr r0, _02176a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d addlo sp, sp, #0xc ldmloia sp!, {r3, r4, pc} - ldr r0, _02176a28 ; =data_027e0f74 + ldr r0, _02176a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -11111,7 +11111,7 @@ _0217693c: add sp, sp, #0xc ldmia sp!, {r3, r4, pc} _02176974: - ldr r0, _02176a28 ; =data_027e0f74 + ldr r0, _02176a28 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097bac @@ -11126,14 +11126,14 @@ _02176974: add sp, sp, #0xc ldmia sp!, {r3, r4, pc} _021769ac: - ldr r0, _02176a28 ; =data_027e0f74 + ldr r0, _02176a28 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, pc} - ldr r0, _02176a28 ; =data_027e0f74 + ldr r0, _02176a28 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -11160,7 +11160,7 @@ _02176a20: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov23_021767f4 -_02176a28: .word data_027e0f74 +_02176a28: .word gAdventureFlags _02176a2c: .word data_027e0ffc _02176a30: .word 0x000003fe _02176a34: .word data_ov23_0217a7b0 @@ -11206,7 +11206,7 @@ _02176aa0: str r2, [sp, #0xc0] strb r1, [sp, #0xc5] ldr r1, [r4, #0x18] - ldr r0, _02176bb0 ; =data_027e0f74 + ldr r0, _02176bb0 ; =gAdventureFlags str r1, [sp, #0xdc] ldr r1, [r4, #0x1c] ldr r0, [r0] @@ -11249,7 +11249,7 @@ _02176b50: mov r2, #0x1e mov r1, #6 str r0, [sp, #0x10] - ldr r0, _02176bb0 ; =data_027e0f74 + ldr r0, _02176bb0 ; =gAdventureFlags strb r2, [sp, #0x15] strb r1, [sp, #0x16] ldr r1, [r4, #0x18] @@ -11270,7 +11270,7 @@ _02176ba4: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov23_02176a3c -_02176bb0: .word data_027e0f74 +_02176bb0: .word gAdventureFlags _02176bb4: .word data_ov23_0217a7b0 .global func_ov23_02176bb8 @@ -11755,7 +11755,7 @@ _02177178: add sp, sp, #4 ldmia sp!, {r3, r4, pc} _021771ac: - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] bl func_ov00_02097bac @@ -11770,20 +11770,20 @@ _021771ac: add sp, sp, #4 ldmia sp!, {r3, r4, pc} _021771e4: - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e addlo sp, sp, #4 ldmloia sp!, {r3, r4, pc} - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -11824,7 +11824,7 @@ _02177288: add r0, r4, #0x58 bl func_ov00_020b7e6c _021772b0: - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] bl func_ov00_02097bac @@ -11854,7 +11854,7 @@ _021772ec: add sp, sp, #4 ldmia sp!, {r3, r4, pc} _02177320: - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] bl func_ov00_02097bac @@ -11869,20 +11869,20 @@ _02177320: add sp, sp, #4 ldmia sp!, {r3, r4, pc} _02177358: - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e addlo sp, sp, #4 ldmloia sp!, {r3, r4, pc} - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -11923,7 +11923,7 @@ _021773fc: add r0, r4, #0x58 bl func_ov00_020b7e6c _02177424: - ldr r0, _02177460 ; =data_027e0f74 + ldr r0, _02177460 ; =gAdventureFlags ldr r1, [r4, #0x44] ldr r0, [r0] bl func_ov00_02097bac @@ -11941,7 +11941,7 @@ _02177458: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov23_0217712c -_02177460: .word data_027e0f74 +_02177460: .word gAdventureFlags _02177464: .word data_027e0e58 _02177468: .word 0x0000015f _0217746c: .word 0xfffffd9a @@ -11997,7 +11997,7 @@ _021774dc: strb r2, [sp, #0xb9] strb r1, [sp, #0xba] ldr r1, [r5, #0x38] - ldr r0, _02177674 ; =data_027e0f74 + ldr r0, _02177674 ; =gAdventureFlags str r1, [sp, #0xd0] ldr r1, [r5, #0x3c] ldr r0, [r0] @@ -12052,7 +12052,7 @@ _021775c0: strb r2, [sp, #9] strb r1, [sp, #0xa] ldr r1, [r5, #0x38] - ldr r0, _02177674 ; =data_027e0f74 + ldr r0, _02177674 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r5, #0x3c] ldr r0, [r0] @@ -12088,7 +12088,7 @@ _02177664: .align 2, 0 arm_func_end func_ov23_02177474 _02177670: .word 0xfffff19a -_02177674: .word data_027e0f74 +_02177674: .word gAdventureFlags _02177678: .word data_027e0ffc _0217767c: .word 0x000003f5 _02177680: .word 0x000003f6 @@ -12958,12 +12958,12 @@ _021780ec: mov r0, #0 ldmia sp!, {r4, pc} _021780f4: - ldr r0, _02178160 ; =data_027e0f74 + ldr r0, _02178160 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _0217811c - ldr r0, _02178160 ; =data_027e0f74 + ldr r0, _02178160 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -12990,7 +12990,7 @@ _0217814c: _02178154: .word data_027e0fd8 _02178158: .word data_027e0fd0 _0217815c: .word data_027e0fd4 -_02178160: .word data_027e0f74 +_02178160: .word gAdventureFlags .global func_ov23_02178164 arm_func_start func_ov23_02178164 diff --git a/asm/ov24.inc b/asm/ov24.inc index 4fc309b6..3410934d 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -17,7 +17,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov24.s b/asm/ov24.s index 98b94c97..b2c3e44a 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -779,7 +779,7 @@ _0216e070: ldr r0, [r4, #0x174] cmp r0, #0 bne _0216e0a0 - ldr r0, _0216e178 ; =data_027e0f74 + ldr r0, _0216e178 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -802,7 +802,7 @@ _0216e0c4: ldr r0, [r4, #0x174] cmp r0, #0 bne _0216e0f4 - ldr r0, _0216e178 ; =data_027e0f74 + ldr r0, _0216e178 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -818,7 +818,7 @@ _0216e0f4: bl func_ov24_0216e4c8 b _0216e16c _0216e118: - ldr r0, _0216e178 ; =data_027e0f74 + ldr r0, _0216e178 ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] bl func_ov00_02097bac @@ -830,7 +830,7 @@ _0216e118: bl func_ov24_0216e4c8 b _0216e16c _0216e144: - ldr r0, _0216e178 ; =data_027e0f74 + ldr r0, _0216e178 ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] bl func_ov00_02097bac @@ -846,7 +846,7 @@ _0216e16c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov24_0216e03c -_0216e178: .word data_027e0f74 +_0216e178: .word gAdventureFlags .global func_ov24_0216e17c arm_func_start func_ov24_0216e17c @@ -886,18 +886,18 @@ _0216e1d4: bl func_ov24_0216e4c8 b _0216e42c _0216e1f8: - ldr r0, _0216e49c ; =data_027e0f74 + ldr r0, _0216e49c ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0216e42c - ldr r0, _0216e49c ; =data_027e0f74 + ldr r0, _0216e49c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d blo _0216e280 - ldr r0, _0216e49c ; =data_027e0f74 + ldr r0, _0216e49c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -952,7 +952,7 @@ _0216e2dc: add r7, r7, #2 blo _0216e2a8 _0216e2ec: - ldr r0, _0216e49c ; =data_027e0f74 + ldr r0, _0216e49c ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] bl func_ov00_02097bac @@ -964,18 +964,18 @@ _0216e2ec: bl func_ov24_0216e4c8 b _0216e42c _0216e318: - ldr r0, _0216e49c ; =data_027e0f74 + ldr r0, _0216e49c ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0216e42c - ldr r0, _0216e49c ; =data_027e0f74 + ldr r0, _0216e49c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d blo _0216e3a0 - ldr r0, _0216e49c ; =data_027e0f74 + ldr r0, _0216e49c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -1027,7 +1027,7 @@ _0216e3d0: add sb, sb, #2 blo _0216e3d0 _0216e404: - ldr r0, _0216e49c ; =data_027e0f74 + ldr r0, _0216e49c ; =gAdventureFlags ldr r1, [r4, #0x170] ldr r0, [r0] bl func_ov00_02097bac @@ -1069,7 +1069,7 @@ _0216e438: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov24_0216e17c -_0216e49c: .word data_027e0f74 +_0216e49c: .word gAdventureFlags _0216e4a0: .word data_027e0f64 _0216e4a4: .word data_027e0ffc _0216e4a8: .word 0x00000355 @@ -1164,7 +1164,7 @@ _0216e5bc: strb r3, [sp, #0xb9] strb r2, [sp, #0xba] bl func_ov24_0216e7b8 - ldr r0, _0216e6f4 ; =data_027e0f74 + ldr r0, _0216e6f4 ; =gAdventureFlags mov r2, #0 ldr r0, [r0] add r1, sp, #0xb0 @@ -1206,7 +1206,7 @@ _0216e644: cmp r0, #0 ldrneb r0, [r4, #0x2e] cmpne r0, #0 - ldr r0, _0216e6f4 ; =data_027e0f74 + ldr r0, _0216e6f4 ; =gAdventureFlags movne r2, #1 moveq r2, #0 ldr r0, [r0] @@ -1237,7 +1237,7 @@ _0216e6e4: .align 2, 0 arm_func_end func_ov24_0216e4c8 _0216e6f0: .word data_027e0e60 -_0216e6f4: .word data_027e0f74 +_0216e6f4: .word gAdventureFlags .global func_ov24_0216e6f8 arm_func_start func_ov24_0216e6f8 @@ -2804,7 +2804,7 @@ func_ov24_0216fa3c: ; 0x0216fa3c add r0, sp, #0xc bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _0216fbc4 ; =data_027e0f74 + ldr r0, _0216fbc4 ; =gAdventureFlags mov ip, #1 mov r3, #0x32 ldr r0, [r0] @@ -2864,7 +2864,7 @@ _0216fba8: arm_func_end func_ov24_0216fa3c _0216fbbc: .word data_027e0f64 _0216fbc0: .word data_027e0fc8 -_0216fbc4: .word data_027e0f74 +_0216fbc4: .word gAdventureFlags _0216fbc8: .word data_027e0fe4 _0216fbcc: .word 0x574c4354 _0216fbd0: .word data_027e0e60 @@ -13735,14 +13735,14 @@ _02178994: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} _021789c8: - ldr r0, _02178a9c ; =data_027e0f74 + ldr r0, _02178a9c ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _02178a9c ; =data_027e0f74 + ldr r0, _02178a9c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -13793,7 +13793,7 @@ _02178a90: .align 2, 0 arm_func_end func_ov24_0217890c _02178a98: .word data_027e0ffc -_02178a9c: .word data_027e0f74 +_02178a9c: .word gAdventureFlags _02178aa0: .word 0x00000333 .global func_ov24_02178aa4 @@ -13856,7 +13856,7 @@ _02178b48: str r2, [sp, #0xc] strb r1, [sp, #0x11] ldr r1, [r4, #0x18] - ldr r0, _02178c68 ; =data_027e0f74 + ldr r0, _02178c68 ; =gAdventureFlags str r1, [sp, #0x28] ldr r1, [r4, #0x1c] ldr r0, [r0] @@ -13922,7 +13922,7 @@ _02178c54: arm_func_end func_ov24_02178aa4 _02178c60: .word data_027e0ffc _02178c64: .word 0x000001b3 -_02178c68: .word data_027e0f74 +_02178c68: .word gAdventureFlags _02178c6c: .word data_027e0e58 _02178c70: .word 0x00001019 _02178c74: .word 0x0000101a diff --git a/asm/ov25.inc b/asm/ov25.inc index 9a67809e..5e5f87d2 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -89,7 +89,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov25.s b/asm/ov25.s index a2847d08..b31cbdd1 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -90,7 +90,7 @@ _0216d734: mov r0, r4 str r1, [r4, #0x920] bl func_ov25_0216d7d8 - ldr r0, _0216d7d0 ; =data_027e0f74 + ldr r0, _0216d7d0 ; =gAdventureFlags mov r1, #0x150 ldr r0, [r0] mov r2, #0 @@ -99,7 +99,7 @@ _0216d734: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 arm_func_end func_ov25_0216d714 -_0216d7d0: .word data_027e0f74 +_0216d7d0: .word gAdventureFlags .global func_ov25_0216d7d4 arm_func_start func_ov25_0216d7d4 @@ -569,7 +569,7 @@ func_ov25_0216de24: ; 0x0216de24 func_ov25_0216de38: ; 0x0216de38 stmdb sp!, {r4, lr} sub sp, sp, #0x18 - ldr r1, _0216dfe8 ; =data_027e0f74 + ldr r1, _0216dfe8 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x35 @@ -685,7 +685,7 @@ _0216dfd0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov25_0216de38 -_0216dfe8: .word data_027e0f74 +_0216dfe8: .word gAdventureFlags _0216dfec: .word data_ov25_02179be0 _0216dff0: .word data_027e0e60 @@ -2975,7 +2975,7 @@ _0216fdf8: _0216feb0: mov r0, #2 stmia sp, {r0, r2} - ldr r0, _0216ff14 ; =data_027e0f74 + ldr r0, _0216ff14 ; =gAdventureFlags mov r1, #0xf ldr r0, [r0] mov r3, r1 @@ -3001,7 +3001,7 @@ _0216ff04: .word data_027e0f64 _0216ff08: .word 0x00001555 _0216ff0c: .word data_027e0c68 _0216ff10: .word 0x0071001e -_0216ff14: .word data_027e0f74 +_0216ff14: .word gAdventureFlags .global func_ov25_0216ff18 arm_func_start func_ov25_0216ff18 @@ -3922,7 +3922,7 @@ _02170bf0: add r1, r4, #0x48 bl func_ov25_02171508 mov r1, #0 - ldr r0, _02170d68 ; =data_027e0f74 + ldr r0, _02170d68 ; =gAdventureFlags strb r1, [r4, #0x11a] ldr r0, [r0] mov r1, #0x35 @@ -3957,7 +3957,7 @@ _02170cb8: ldr r0, [r0] mov r2, #0x1000 bl func_ov00_020bb810 - ldr r0, _02170d68 ; =data_027e0f74 + ldr r0, _02170d68 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_020980ac cmp r0, #0 @@ -4001,7 +4001,7 @@ _02170d58: .word data_027e0fb8 _02170d5c: .word data_027e0fac _02170d60: .word data_ov25_0217a880 _02170d64: .word data_027e0ff0 -_02170d68: .word data_027e0f74 +_02170d68: .word gAdventureFlags _02170d6c: .word data_027e0f64 .global func_ov25_02170d70 @@ -6506,7 +6506,7 @@ _02172e74: ldr r0, _02173224 ; =data_ov25_0217953c ldr r1, _02173228 ; =func_ov25_021729ac str r0, [r5, #0x408] - ldr r0, _0217322c ; =data_027e0f74 + ldr r0, _0217322c ; =gAdventureFlags str r1, [r5, #0x414] ldr r0, [r0] mov r1, #0x3e @@ -6529,7 +6529,7 @@ _02172eb8: ldrh r0, [r5, #0x20] cmp r0, #0 bne _02173088 - ldr r0, _0217322c ; =data_027e0f74 + ldr r0, _0217322c ; =gAdventureFlags mov r1, #0x23 ldr r0, [r0] bl func_ov00_02097760 @@ -6554,7 +6554,7 @@ _02172f2c: mov r1, #2 bl func_ov25_02173ab4 _02172f34: - ldr r0, _0217322c ; =data_027e0f74 + ldr r0, _0217322c ; =gAdventureFlags mov r1, #0x25 ldr r0, [r0] bl func_ov00_02097760 @@ -6583,7 +6583,7 @@ _02172f34: add r2, r5, #0x48 bl func_ov00_020c4048 _02172fa4: - ldr r0, _0217322c ; =data_027e0f74 + ldr r0, _0217322c ; =gAdventureFlags mov r1, #0x26 ldr r0, [r0] bl func_ov00_02097760 @@ -6612,7 +6612,7 @@ _02172fa4: add r2, r5, #0x48 bl func_ov00_020c4048 _02173014: - ldr r0, _0217322c ; =data_027e0f74 + ldr r0, _0217322c ; =gAdventureFlags mov r1, #0x34 ldr r0, [r0] bl func_ov00_02097760 @@ -6655,7 +6655,7 @@ _021730a4: _021730ac: mov r4, #0x26 _021730b0: - ldr r0, _0217322c ; =data_027e0f74 + ldr r0, _0217322c ; =gAdventureFlags mov r1, r4 ldr r0, [r0] bl func_ov00_02097760 @@ -6764,7 +6764,7 @@ _0217321c: .word data_ov25_021795a0 _02173220: .word data_027e0f6c _02173224: .word data_ov25_0217953c _02173228: .word func_ov25_021729ac -_0217322c: .word data_027e0f74 +_0217322c: .word gAdventureFlags _02173230: .word data_027e0fe8 _02173234: .word 0x43425331 @@ -7570,7 +7570,7 @@ _02173c58: add r0, r0, #0x400 str r1, [r4, #0x12c] bl func_ov25_02175598 - ldr r0, _0217401c ; =data_027e0f74 + ldr r0, _0217401c ; =gAdventureFlags mov r1, #0x150 ldr r0, [r0] mov r2, #1 @@ -7583,7 +7583,7 @@ _02173c9c: ldr r1, [r4, #0x1e8] mov r2, #0x1000 str r2, [r1, #0x10] - ldr r0, _0217401c ; =data_027e0f74 + ldr r0, _0217401c ; =gAdventureFlags mov r1, #0x150 ldr r0, [r0] mov r2, #1 @@ -7602,7 +7602,7 @@ _02173ccc: mov r0, r4 str r1, [r4, #0x12c] bl _ZN5Actor14ResetWallTouchEv - ldr r0, _0217401c ; =data_027e0f74 + ldr r0, _0217401c ; =gAdventureFlags mov r1, #0x150 ldr r0, [r0] mov r2, #1 @@ -7621,7 +7621,7 @@ _02173d14: mov r0, r4 str r1, [r4, #0x12c] bl _ZN5Actor14ResetWallTouchEv - ldr r0, _0217401c ; =data_027e0f74 + ldr r0, _0217401c ; =gAdventureFlags mov r1, #0x150 ldr r0, [r0] mov r2, #1 @@ -7647,7 +7647,7 @@ _02173d5c: mov r0, #0x2000 rsblt r0, r0, #0 strh r0, [r4, #0x78] - ldr r0, _0217401c ; =data_027e0f74 + ldr r0, _0217401c ; =gAdventureFlags strb r2, [r4, #0x285] ldr r0, [r0] bl func_ov00_0209779c @@ -7740,7 +7740,7 @@ _02173e74: rsblt r0, r0, #0 strh r0, [r4, #0x78] mov r2, #0 - ldr r0, _0217401c ; =data_027e0f74 + ldr r0, _0217401c ; =gAdventureFlags strb r2, [r4, #0x285] ldr r0, [r0] mov r1, #0x150 @@ -7777,7 +7777,7 @@ _02173f0c: rsblt r0, r0, #0 strh r0, [r4, #0x78] mov r2, #0 - ldr r0, _0217401c ; =data_027e0f74 + ldr r0, _0217401c ; =gAdventureFlags strb r2, [r4, #0x285] ldr r0, [r0] mov r1, #0x150 @@ -7822,7 +7822,7 @@ _0217400c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov25_02173ab4 -_0217401c: .word data_027e0f74 +_0217401c: .word gAdventureFlags _02174020: .word data_027e0764 _02174024: .word 0x000e0059 _02174028: .word 0x000e005a @@ -7945,13 +7945,13 @@ _0217419c: bl func_ov25_0217358c cmp r0, #0 beq _021741f4 - ldr r0, _02175074 ; =data_027e0f74 + ldr r0, _02175074 ; =gAdventureFlags ldr r1, _02175078 ; =0x00000152 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _021741e8 - ldr r0, _02175074 ; =data_027e0f74 + ldr r0, _02175074 ; =gAdventureFlags ldr r1, _02175078 ; =0x00000152 ldr r0, [r0] mov r2, #1 @@ -8037,7 +8037,7 @@ _021742e8: _021742f0: mov r5, #0x26 _021742f4: - ldr r0, _02175074 ; =data_027e0f74 + ldr r0, _02175074 ; =gAdventureFlags mov r1, r5 ldr r0, [r0] bl func_ov00_02097760 @@ -8803,21 +8803,21 @@ _02174e3c: ; jump table b _02174e64 ; case 2 b _02174e7c ; case 3 _02174e4c: - ldr r0, _02175074 ; =data_027e0f74 + ldr r0, _02175074 ; =gAdventureFlags mov r1, #0x25 ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c b _02174e90 _02174e64: - ldr r0, _02175074 ; =data_027e0f74 + ldr r0, _02175074 ; =gAdventureFlags mov r1, #0x26 ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c b _02174e90 _02174e7c: - ldr r0, _02175074 ; =data_027e0f74 + ldr r0, _02175074 ; =gAdventureFlags mov r1, #0x34 ldr r0, [r0] mov r2, #1 @@ -8836,7 +8836,7 @@ _02174e90: mov r0, r4 mov r1, #1 bl _ZN5Actor10SetUnk_11cEc - ldr r0, _02175074 ; =data_027e0f74 + ldr r0, _02175074 ; =gAdventureFlags mov r1, #0x150 ldr r0, [r0] mov r2, #0 @@ -8951,7 +8951,7 @@ _0217503c: b _02175114 .align 2, 0 arm_func_end func_ov25_02174100 -_02175074: .word data_027e0f74 +_02175074: .word gAdventureFlags _02175078: .word 0x00000152 _0217507c: .word data_027e0e60 _02175080: .word 0xb60b60b7 @@ -9217,7 +9217,7 @@ func_ov25_021753e0: ; 0x021753e0 arm_func_start func_ov25_0217540c func_ov25_0217540c: ; 0x0217540c stmdb sp!, {r4, lr} - ldr r2, _02175428 ; =data_027e0f74 + ldr r2, _02175428 ; =gAdventureFlags mov r4, r0 ldr r0, [r2] bl func_ov00_02097810 @@ -9225,7 +9225,7 @@ func_ov25_0217540c: ; 0x0217540c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov25_0217540c -_02175428: .word data_027e0f74 +_02175428: .word gAdventureFlags .global func_ov25_0217542c arm_func_start func_ov25_0217542c @@ -9241,7 +9241,7 @@ func_ov25_0217542c: ; 0x0217542c .global func_ov25_02175444 arm_func_start func_ov25_02175444 func_ov25_02175444: ; 0x02175444 - ldr r1, _0217545c ; =data_027e0f74 + ldr r1, _0217545c ; =gAdventureFlags mov r2, r0 ldr r0, [r1] ldr ip, _02175460 ; =func_ov00_02097b9c @@ -9249,13 +9249,13 @@ func_ov25_02175444: ; 0x02175444 bx ip .align 2, 0 arm_func_end func_ov25_02175444 -_0217545c: .word data_027e0f74 +_0217545c: .word gAdventureFlags _02175460: .word func_ov00_02097b9c .global func_ov25_02175464 arm_func_start func_ov25_02175464 func_ov25_02175464: ; 0x02175464 - ldr r1, _0217547c ; =data_027e0f74 + ldr r1, _0217547c ; =gAdventureFlags mov r2, r0 ldr r0, [r1] ldr ip, _02175480 ; =func_ov00_02097bcc @@ -9263,21 +9263,21 @@ func_ov25_02175464: ; 0x02175464 bx ip .align 2, 0 arm_func_end func_ov25_02175464 -_0217547c: .word data_027e0f74 +_0217547c: .word gAdventureFlags _02175480: .word func_ov00_02097bcc .global func_ov25_02175484 arm_func_start func_ov25_02175484 func_ov25_02175484: ; 0x02175484 stmdb sp!, {r3, lr} - ldr r1, _021754c4 ; =data_027e0f74 + ldr r1, _021754c4 ; =gAdventureFlags mov r2, r0 ldr r0, [r1] ldr r1, [r2, #0x580] bl func_ov00_02097bac cmp r0, #0 beq _021754bc - ldr r0, _021754c4 ; =data_027e0f74 + ldr r0, _021754c4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -9288,7 +9288,7 @@ _021754bc: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov25_02175484 -_021754c4: .word data_027e0f74 +_021754c4: .word gAdventureFlags .global func_ov25_021754c8 arm_func_start func_ov25_021754c8 @@ -10217,7 +10217,7 @@ _021760ec: add r0, sp, #0x8c bl func_ov00_0209a4f4 mov r3, #0 - ldr r0, _02176338 ; =data_027e0f74 + ldr r0, _02176338 ; =gAdventureFlags mvn ip, #0 mov r5, #0x64 mov r2, #1 @@ -10253,7 +10253,7 @@ _0217613c: _02176178: mov r0, #1 str r0, [sp] - ldr r0, _02176338 ; =data_027e0f74 + ldr r0, _02176338 ; =gAdventureFlags str r3, [sp, #4] mov r1, #0xf ldr r0, [r0] @@ -10318,7 +10318,7 @@ _021761b8: _02176274: mov r0, #1 str r0, [sp] - ldr r0, _02176338 ; =data_027e0f74 + ldr r0, _02176338 ; =gAdventureFlags str r3, [sp, #4] mov r1, #0xf ldr r0, [r0] @@ -10328,7 +10328,7 @@ _02176274: add sp, sp, #0x13c ldmia sp!, {r4, r5, r6, r7, pc} _021762a0: - ldr r0, _02176338 ; =data_027e0f74 + ldr r0, _02176338 ; =gAdventureFlags ldr r1, [r4, #0x1d0] ldr r0, [r0] bl func_ov00_02097bcc @@ -10376,7 +10376,7 @@ _02176330: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov25_02176088 -_02176338: .word data_027e0f74 +_02176338: .word gAdventureFlags _0217633c: .word data_027e0fc8 _02176340: .word data_027e0c68 _02176344: .word 0x00710012 @@ -10479,7 +10479,7 @@ _02176464: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} _02176480: - ldr r0, _02176958 ; =data_027e0f74 + ldr r0, _02176958 ; =gAdventureFlags ldr r1, [r4, #0x1d0] ldr r0, [r0] bl func_ov00_02097b9c @@ -10564,7 +10564,7 @@ _02176588: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} _021765b8: - ldr r0, _02176958 ; =data_027e0f74 + ldr r0, _02176958 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_020980ac cmp r0, #0 @@ -10586,7 +10586,7 @@ _021765e4: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} _02176608: - ldr r0, _02176958 ; =data_027e0f74 + ldr r0, _02176958 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_020980ac cmp r0, #0 @@ -10603,14 +10603,14 @@ _02176608: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} _02176648: - ldr r0, _02176958 ; =data_027e0f74 + ldr r0, _02176958 ; =gAdventureFlags ldr r1, [r4, #0x1d0] ldr r0, [r0] bl func_ov00_02097bac cmp r0, #0 addeq sp, sp, #0x24 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} - ldr r0, _02176958 ; =data_027e0f74 + ldr r0, _02176958 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -10823,7 +10823,7 @@ _0217694c: .align 2, 0 arm_func_end func_ov25_021763a4 _02176954: .word data_027e0e60 -_02176958: .word data_027e0f74 +_02176958: .word gAdventureFlags _0217695c: .word data_027e0c68 _02176960: .word data_027e0fe4 _02176964: .word data_027e0f64 @@ -10835,7 +10835,7 @@ func_ov25_0217696c: ; 0x0217696c stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r2, #0 - ldr r0, _021769b4 ; =data_027e0f74 + ldr r0, _021769b4 ; =gAdventureFlags str r2, [r5, #0x154] mov r4, r1 ldr r0, [r0] @@ -10853,7 +10853,7 @@ _021769a0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov25_0217696c -_021769b4: .word data_027e0f74 +_021769b4: .word gAdventureFlags .global func_ov25_021769b8 arm_func_start func_ov25_021769b8 diff --git a/asm/ov26.inc b/asm/ov26.inc index 534f5b33..3f3d2f91 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -32,7 +32,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f7c .extern data_027e0f84 .extern data_027e0f90 diff --git a/asm/ov26.s b/asm/ov26.s index f7af3eba..5dcdf16c 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -1304,14 +1304,14 @@ func_ov26_0216e4c0: ; 0x0216e4c0 .global func_ov26_0216e4d0 arm_func_start func_ov26_0216e4d0 func_ov26_0216e4d0: ; 0x0216e4d0 - ldr r0, _0216e4e4 ; =data_027e0f74 + ldr r0, _0216e4e4 ; =gAdventureFlags ldr ip, _0216e4e8 ; =func_ov00_02097760 mov r1, #0x11 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov26_0216e4d0 -_0216e4e4: .word data_027e0f74 +_0216e4e4: .word gAdventureFlags _0216e4e8: .word func_ov00_02097760 .global func_ov26_0216e4ec @@ -1950,7 +1950,7 @@ _0216ebec: ldrsh r0, [r0, #0x5c] cmp r0, #0 bgt _0216ec8c - ldr r0, _0216eca4 ; =data_027e0f74 + ldr r0, _0216eca4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -1985,7 +1985,7 @@ _0216ec94: arm_func_end func_ov26_0216ebc0 _0216ec9c: .word data_027e0e60 _0216eca0: .word data_027e0c68 -_0216eca4: .word data_027e0f74 +_0216eca4: .word gAdventureFlags _0216eca8: .word data_027e071c _0216ecac: .word data_027e077c _0216ecb0: .word data_02056be4 @@ -4685,7 +4685,7 @@ _02171020: bl func_ov26_02170938 b _02171718 _0217103c: - ldr r0, _02171740 ; =data_027e0f74 + ldr r0, _02171740 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -5174,7 +5174,7 @@ _02171718: _02171734: .word data_027e0764 _02171738: .word data_027e0ffc _0217173c: .word 0x000001c1 -_02171740: .word data_027e0f74 +_02171740: .word gAdventureFlags _02171744: .word data_ov00_020e8398 _02171748: .word data_027e0ff0 _0217174c: .word data_027e0f94 @@ -5643,7 +5643,7 @@ _02171d5c: b _02171dc0 _02171d8c: ldr r1, [r4, #4] - ldr r0, _02171dd0 ; =data_027e0f74 + ldr r0, _02171dd0 ; =gAdventureFlags bic r1, r1, #4 str r1, [r4, #4] ldr r2, [r4, #0xb4] @@ -5663,7 +5663,7 @@ _02171dc0: arm_func_end func_ov26_02171d28 _02171dc8: .word data_ov26_02179440 _02171dcc: .word data_027e0ffc -_02171dd0: .word data_027e0f74 +_02171dd0: .word gAdventureFlags _02171dd4: .word data_ov26_0217944c .global func_ov26_02171dd8 @@ -5713,7 +5713,7 @@ _02171e20: func_ov26_02171e4c: ; 0x02171e4c stmdb sp!, {r4, lr} mov r4, r0 - ldr r0, _02171e8c ; =data_027e0f74 + ldr r0, _02171e8c ; =gAdventureFlags ldr r2, [r4, #0xb4] ldr r1, _02171e90 ; =data_ov26_0217944c ldr r0, [r0] @@ -5729,7 +5729,7 @@ func_ov26_02171e4c: ; 0x02171e4c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02171e4c -_02171e8c: .word data_027e0f74 +_02171e8c: .word gAdventureFlags _02171e90: .word data_ov26_0217944c _02171e94: .word data_027e0e60 @@ -6340,7 +6340,7 @@ _02172698: str r2, [sp, #4] strb r1, [sp, #9] ldr r1, [r4, #0x18] - ldr r0, _021727a8 ; =data_027e0f74 + ldr r0, _021727a8 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r4, #0x1c] ldr r0, [r0] @@ -6369,7 +6369,7 @@ _02172704: _0217271c: cmp r2, #0 bne _0217273c - ldr r0, _021727a8 ; =data_027e0f74 + ldr r0, _021727a8 ; =gAdventureFlags ldr r1, [r4, #0x64] ldr r0, [r0] bl func_ov00_02097bcc @@ -6407,7 +6407,7 @@ _0217279c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02172648 -_021727a8: .word data_027e0f74 +_021727a8: .word gAdventureFlags _021727ac: .word 0xfffff666 _021727b0: .word data_027e0e60 @@ -6869,7 +6869,7 @@ _02172d60: ; jump table b _02172f60 ; case 9 b _02172f90 ; case 10 _02172d8c: - ldr r0, _02172fb8 ; =data_027e0f74 + ldr r0, _02172fb8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_0209809c cmp r0, #0 @@ -7022,7 +7022,7 @@ _02172f90: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02172d48 -_02172fb8: .word data_027e0f74 +_02172fb8: .word gAdventureFlags _02172fbc: .word data_027e0c68 _02172fc0: .word data_027e103c _02172fc4: .word data_027e077c @@ -7079,7 +7079,7 @@ _02173010: str r1, [sp, #0xe0] mov r0, #2 stmia sp, {r0, r1} - ldr r0, _021732ac ; =data_027e0f74 + ldr r0, _021732ac ; =gAdventureFlags mov r3, r2 ldr r0, [r0] bl func_ov00_02098074 @@ -7132,7 +7132,7 @@ _02173130: mov r0, #2 str r0, [sp] mov r1, #0xa - ldr r0, _021732ac ; =data_027e0f74 + ldr r0, _021732ac ; =gAdventureFlags str r2, [sp, #4] ldr r0, [r0] mov r2, r1 @@ -7165,7 +7165,7 @@ _02173160: _021731b8: mov r1, #0 strh r1, [r4, #0x64] - ldr r0, _021732ac ; =data_027e0f74 + ldr r0, _021732ac ; =gAdventureFlags mov r1, #0x82 ldr r0, [r0] mov r2, #1 @@ -7177,7 +7177,7 @@ _021731b8: add r0, sp, #0xc bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _021732ac ; =data_027e0f74 + ldr r0, _021732ac ; =gAdventureFlags mvn ip, #0 mov r3, #0xf ldr r0, [r0] @@ -7208,7 +7208,7 @@ _02173250: blx func_0203fe60 b _02173288 _02173260: - ldr r0, _021732ac ; =data_027e0f74 + ldr r0, _021732ac ; =gAdventureFlags ldr r1, [r4, #0x6c] ldr r0, [r0] bl func_ov00_02097bcc @@ -7230,7 +7230,7 @@ _0217329c: .word data_027e0f64 _021732a0: .word 0x00001555 _021732a4: .word 0x00001733 _021732a8: .word 0xfffff99a -_021732ac: .word data_027e0f74 +_021732ac: .word gAdventureFlags _021732b0: .word data_027e0f90 _021732b4: .word data_027e0fe4 _021732b8: .word data_027e0c68 @@ -7289,7 +7289,7 @@ _0217334c: .word func_ov26_02173350 arm_func_start func_ov26_02173350 func_ov26_02173350: ; 0x02173350 stmdb sp!, {r4, lr} - ldr r1, _021733a8 ; =data_027e0f74 + ldr r1, _021733a8 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x82 @@ -7312,7 +7312,7 @@ func_ov26_02173350: ; 0x02173350 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02173350 -_021733a8: .word data_027e0f74 +_021733a8: .word gAdventureFlags _021733ac: .word data_027e0618 .global func_ov26_021733b0 @@ -7612,7 +7612,7 @@ func_ov26_02173758: ; 0x02173758 ldr r0, [r5, #8] cmp r0, #8 bne _021737b4 - ldr r0, _021737d4 ; =data_027e0f74 + ldr r0, _021737d4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -7637,7 +7637,7 @@ _021737b4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov26_02173758 -_021737d4: .word data_027e0f74 +_021737d4: .word gAdventureFlags .global func_ov26_021737d8 arm_func_start func_ov26_021737d8 @@ -7775,7 +7775,7 @@ func_ov26_02173944: ; 0x02173944 mov r5, #0 cmp r1, #0 beq _02173988 - ldr r0, _02173ab4 ; =data_027e0f74 + ldr r0, _02173ab4 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -7864,7 +7864,7 @@ _02173a90: .align 2, 0 arm_func_end func_ov26_02173944 _02173ab0: .word data_027e104c -_02173ab4: .word data_027e0f74 +_02173ab4: .word gAdventureFlags _02173ab8: .word data_ov26_0217947c _02173abc: .word data_ov26_02179480 @@ -9513,7 +9513,7 @@ _021749e4: ; jump table b _02174c20 ; case 11 b _02174c48 ; case 12 _02174a18: - ldr r0, _02174ca0 ; =data_027e0f74 + ldr r0, _02174ca0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_0209809c cmp r0, #0 @@ -9692,7 +9692,7 @@ _02174c90: .word data_027e0d78 _02174c94: .word data_027e104c _02174c98: .word data_ov26_02179520 _02174c9c: .word data_ov26_0217ac20 -_02174ca0: .word data_027e0f74 +_02174ca0: .word gAdventureFlags _02174ca4: .word data_027e077c _02174ca8: .word data_027e0c68 @@ -9760,7 +9760,7 @@ _02174d14: str r0, [sp] mov r1, #0 mov r2, #0xa - ldr r0, _02174fec ; =data_027e0f74 + ldr r0, _02174fec ; =gAdventureFlags str r1, [sp, #4] ldr r0, [r0] mov r3, r2 @@ -9794,7 +9794,7 @@ _02174d14: mov r0, #1 strb r0, [sp, #0x1d] strb r0, [sp, #0x1f] - ldr r0, _02174fec ; =data_027e0f74 + ldr r0, _02174fec ; =gAdventureFlags add r1, sp, #0xc ldr r0, [r0] bl func_ov00_02097810 @@ -9844,7 +9844,7 @@ _02174ea4: mov r1, #1 ldr r0, [r0] bl _ZN10PlayerBase10SetVisibleEb - ldr r0, _02174fec ; =data_027e0f74 + ldr r0, _02174fec ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097bcc @@ -9880,7 +9880,7 @@ _02174f30: bl func_ov09_0211a52c b _02174fcc _02174f58: - ldr r0, _02174fec ; =data_027e0f74 + ldr r0, _02174fec ; =gAdventureFlags ldr r1, [r4, #0x68] ldr r0, [r0] bl func_ov00_02097bcc @@ -9922,7 +9922,7 @@ _02174fdc: .word data_027e103c _02174fe0: .word data_027e0f64 _02174fe4: .word 0x0000071c _02174fe8: .word 0x0000199a -_02174fec: .word data_027e0f74 +_02174fec: .word gAdventureFlags _02174ff0: .word data_027e0f90 _02174ff4: .word data_027e0c68 _02174ff8: .word data_027e1048 @@ -10067,7 +10067,7 @@ func_ov26_02175194: ; 0x02175194 ldrh r1, [r4, #0x2a] cmp r1, #0 beq _021751c0 - ldr r0, _021751ec ; =data_027e0f74 + ldr r0, _021751ec ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -10088,7 +10088,7 @@ _021751e4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_02175194 -_021751ec: .word data_027e0f74 +_021751ec: .word gAdventureFlags .global func_ov26_021751f0 arm_func_start func_ov26_021751f0 @@ -13288,7 +13288,7 @@ func_ov26_021778e8: ; 0x021778e8 bl func_ov00_0209d90c mov r4, r0 ldr r5, [r4, #4] - ldr r0, _021779d4 ; =data_027e0f74 + ldr r0, _021779d4 ; =gAdventureFlags str r5, [sp, #8] ldr r2, [r4, #8] ldr r0, [r0] @@ -13331,7 +13331,7 @@ _021779ac: arm_func_end func_ov26_021778e8 _021779cc: .word gItemManager _021779d0: .word data_027e0f7c -_021779d4: .word data_027e0f74 +_021779d4: .word gAdventureFlags _021779d8: .word data_027e0d3c .global func_ov26_021779dc @@ -13407,7 +13407,7 @@ func_ov26_02177a70: ; 0x02177a70 arm_func_start func_ov26_02177a98 func_ov26_02177a98: ; 0x02177a98 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r1, _02177b84 ; =data_027e0f74 + ldr r1, _02177b84 ; =gAdventureFlags mov r5, r0 ldr r0, [r1] mov r1, #0x16 @@ -13468,7 +13468,7 @@ _02177b40: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov26_02177a98 -_02177b84: .word data_027e0f74 +_02177b84: .word gAdventureFlags _02177b88: .word data_ov26_0217aea4 _02177b8c: .word data_ov26_021795c8 @@ -14477,13 +14477,13 @@ _02178784: blx r3 b _02178968 _021787b4: - ldr r0, _02178980 ; =data_027e0f74 + ldr r0, _02178980 ; =gAdventureFlags ldr r1, [r5, #0x40] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02178968 - ldr r0, _02178980 ; =data_027e0f74 + ldr r0, _02178980 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0xf @@ -14491,7 +14491,7 @@ _021787b4: bl func_ov26_02178994 bl func_ov05_0210a018 _021787e8: - ldr r0, _02178980 ; =data_027e0f74 + ldr r0, _02178980 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x3c @@ -14579,7 +14579,7 @@ _02178924: bl func_ov00_020bb68c b _02178968 _02178938: - ldr r0, _02178980 ; =data_027e0f74 + ldr r0, _02178980 ; =gAdventureFlags ldr r1, [r5, #0x40] ldr r0, [r0] bl func_ov00_02097bac @@ -14600,7 +14600,7 @@ _02178968: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov26_0217873c -_02178980: .word data_027e0f74 +_02178980: .word gAdventureFlags _02178984: .word 0x0000019a _02178988: .word 0xffffeccd _0217898c: .word data_027e0ffc @@ -14648,7 +14648,7 @@ _021789e0: strb r3, [sp, #0x21] strb r2, [sp, #0x22] bl func_ov26_02178c94 - ldr r0, _02178b30 ; =data_027e0f74 + ldr r0, _02178b30 ; =gAdventureFlags ldr lr, [sp, #0xc] ldr ip, [sp, #0x10] ldr r3, [sp, #0x14] @@ -14727,7 +14727,7 @@ _02178b24: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov26_021789a4 -_02178b30: .word data_027e0f74 +_02178b30: .word gAdventureFlags _02178b34: .word data_027e0f64 _02178b38: .word data_027e0fc8 @@ -15259,7 +15259,7 @@ func_ov26_02179114: ; 0x02179114 add r1, r4, #0x38 ldr r0, [r0] bl func_ov00_02093a5c - ldr r0, _0217923c ; =data_027e0f74 + ldr r0, _0217923c ; =gAdventureFlags mov r1, #0xc9 ldr r0, [r0] bl func_ov00_02097760 @@ -15273,7 +15273,7 @@ func_ov26_02179114: ; 0x02179114 arm_func_end func_ov26_02179114 _02179234: .word 0x00004ccd _02179238: .word data_027e0f6c -_0217923c: .word data_027e0f74 +_0217923c: .word gAdventureFlags .global func_ov26_02179240 arm_func_start func_ov26_02179240 diff --git a/asm/ov27.inc b/asm/ov27.inc index c706fc76..24ecafb1 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -82,7 +82,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov27.s b/asm/ov27.s index 900ea941..0a80b4d4 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -129,7 +129,7 @@ func_ov27_0216d7f4: ; 0x0216d7f4 func_ov27_0216d810: ; 0x0216d810 stmdb sp!, {r4, lr} sub sp, sp, #0x38 - ldr r1, _0216da0c ; =data_027e0f74 + ldr r1, _0216da0c ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x62 @@ -138,13 +138,13 @@ func_ov27_0216d810: ; 0x0216d810 addeq sp, sp, #0x38 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0216da0c ; =data_027e0f74 + ldr r0, _0216da0c ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _0216d86c - ldr r0, _0216da0c ; =data_027e0f74 + ldr r0, _0216da0c ; =gAdventureFlags ldr r1, _0216da10 ; =0x00000186 ldr r0, [r0] bl func_ov00_02097760 @@ -155,7 +155,7 @@ _0216d86c: mov r0, #0 ldmia sp!, {r4, pc} _0216d878: - ldr r0, _0216da0c ; =data_027e0f74 + ldr r0, _0216da0c ; =gAdventureFlags mov r1, #0xf4 ldr r0, [r0] bl func_ov00_02097760 @@ -258,7 +258,7 @@ _0216d878: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov27_0216d810 -_0216da0c: .word data_027e0f74 +_0216da0c: .word gAdventureFlags _0216da10: .word 0x00000186 _0216da14: .word data_ov27_02178d08 _0216da18: .word func_ov27_0216d6d4 @@ -399,7 +399,7 @@ _0216db58: mov r0, #0 strb r0, [sp, #0x368] strb r0, [sp, #0x36a] - ldr r0, _0216e928 ; =data_027e0f74 + ldr r0, _0216e928 ; =gAdventureFlags str r2, [sp, #0x358] ldr r0, [r0] str r7, [sp, #0x374] @@ -413,7 +413,7 @@ _0216db58: bl func_ov00_0209a508 b _0216e8fc _0216dc58: - ldr r0, _0216e928 ; =data_027e0f74 + ldr r0, _0216e928 ; =gAdventureFlags ldr r1, [r5, #0x1b4] ldr r0, [r0] bl func_ov00_02097bcc @@ -805,7 +805,7 @@ _0216e204: mov r2, #0x32 str r3, [sp, #0x2a8] strb r2, [sp, #0x2ad] - ldr r0, _0216e928 ; =data_027e0f74 + ldr r0, _0216e928 ; =gAdventureFlags strb r1, [sp, #0x2ae] strb r1, [sp, #0x2af] ldr r1, [r5, #0x48] @@ -941,7 +941,7 @@ _0216e2b8: ldrb r3, [sp, #0x1ef] ldrb r2, [sp, #0x1f0] str r0, [sp, #0x26c] - ldr r0, _0216e928 ; =data_027e0f74 + ldr r0, _0216e928 ; =gAdventureFlags ldr r1, [sp, #0x1d4] ldr sl, [sp, #0x1dc] ldr sb, [sp, #0x1e0] @@ -1079,7 +1079,7 @@ _0216e4f4: ldrb r3, [sp, #0xd7] ldrb r2, [sp, #0xd8] str r0, [sp, #0x154] - ldr r0, _0216e928 ; =data_027e0f74 + ldr r0, _0216e928 ; =gAdventureFlags ldr r1, [sp, #0xbc] ldr ip, [sp, #0xc4] ldr fp, [sp, #0xc8] @@ -1171,7 +1171,7 @@ _0216e764: strb r0, [r5, #0x4b3] b _0216e8fc _0216e7c4: - ldr r0, _0216e928 ; =data_027e0f74 + ldr r0, _0216e928 ; =gAdventureFlags ldr r1, [r5, #0x1b4] ldr r0, [r0] bl func_ov00_02097bcc @@ -1265,7 +1265,7 @@ _0216e918: .word data_027e0d0c _0216e91c: .word data_027e0e60 _0216e920: .word data_027e0c68 _0216e924: .word 0x00060003 -_0216e928: .word data_027e0f74 +_0216e928: .word gAdventureFlags _0216e92c: .word data_027e0764 _0216e930: .word data_027e0ffc _0216e934: .word 0x00000236 @@ -1528,7 +1528,7 @@ _0216eb54: str r2, [sp, #0xbc] str r1, [sp, #0x114] str r0, [sp, #0x104] - ldr r0, _0216ed50 ; =data_027e0f74 + ldr r0, _0216ed50 ; =gAdventureFlags ldrb r6, [sp, #0x78] ldrb r5, [sp, #0x79] ldrb lr, [sp, #0x7a] @@ -1567,7 +1567,7 @@ _0216ed38: _0216ed44: .word data_027e0e60 _0216ed48: .word data_027e0f64 _0216ed4c: .word 0x00001333 -_0216ed50: .word data_027e0f74 +_0216ed50: .word gAdventureFlags .global func_ov27_0216ed54 arm_func_start func_ov27_0216ed54 @@ -1851,7 +1851,7 @@ _0216f0f0: ldrb r0, [r6, #0x4b2] cmp r0, #0 bne _0216f1c4 - ldr r0, _0216f340 ; =data_027e0f74 + ldr r0, _0216f340 ; =gAdventureFlags mov r1, #0x51 ldr r0, [r0] bl func_ov00_02097760 @@ -1998,7 +1998,7 @@ _0216f330: .word 0x0000019d _0216f334: .word 0x5342454d _0216f338: .word 0x524f5045 _0216f33c: .word 0x000001bd -_0216f340: .word data_027e0f74 +_0216f340: .word gAdventureFlags _0216f344: .word 0x00006aab .global func_ov27_0216f348 @@ -3624,7 +3624,7 @@ _02170978: ldr lr, [sp] add r0, r0, #0x33 add r5, r0, #0x1300 - ldr r1, _02170a30 ; =data_027e0f74 + ldr r1, _02170a30 ; =gAdventureFlags ldr ip, [sp, #8] mov r3, #0 mov r2, #1 @@ -3650,7 +3650,7 @@ _02170978: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov27_02170934 -_02170a30: .word data_027e0f74 +_02170a30: .word gAdventureFlags .global func_ov27_02170a34 arm_func_start func_ov27_02170a34 @@ -4573,14 +4573,14 @@ _021716e8: .word data_027e0764 arm_func_start func_ov27_021716ec func_ov27_021716ec: ; 0x021716ec stmdb sp!, {r4, lr} - ldr r0, _02171728 ; =data_027e0f74 + ldr r0, _02171728 ; =gAdventureFlags mov r4, r1 ldr r0, [r0] ldr r1, [r4] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02171728 ; =data_027e0f74 + ldr r0, _02171728 ; =gAdventureFlags ldr r1, [r4] ldr r0, [r0] bl func_ov00_02097bcc @@ -4589,7 +4589,7 @@ func_ov27_021716ec: ; 0x021716ec ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov27_021716ec -_02171728: .word data_027e0f74 +_02171728: .word gAdventureFlags .global func_ov27_0217172c arm_func_start func_ov27_0217172c @@ -4698,7 +4698,7 @@ func_ov27_0217184c: ; 0x0217184c strb r0, [sp, #0x8b] strb r1, [sp, #0x89] ldr r1, [r4, #0x48] - ldr r0, _02171ae0 ; =data_027e0f74 + ldr r0, _02171ae0 ; =gAdventureFlags str r1, [sp, #0xa0] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -4814,7 +4814,7 @@ _021718e0: str r2, [sp, #0xbc] str r1, [sp, #0x114] str r0, [sp, #0xfc] - ldr r0, _02171ae0 ; =data_027e0f74 + ldr r0, _02171ae0 ; =gAdventureFlags ldrb r6, [sp, #0x78] ldrb r5, [sp, #0x79] ldrb lr, [sp, #0x7a] @@ -4851,7 +4851,7 @@ _02171ad0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov27_0217184c -_02171ae0: .word data_027e0f74 +_02171ae0: .word gAdventureFlags _02171ae4: .word data_027e0f64 _02171ae8: .word 0x00001333 @@ -5225,7 +5225,7 @@ func_ov27_02171f3c: ; 0x02171f3c cmp r0, #0 beq _0217245c ldrh r1, [r1, #0x78] - ldr r0, _02172478 ; =data_027e0f74 + ldr r0, _02172478 ; =gAdventureFlags mov r3, #0 mov r1, r1, asr #0x4 mov r5, r1, lsl #0x1 @@ -5270,7 +5270,7 @@ _02172018: cmp r0, #0 bne _021720c4 ldr r1, [r6, #0x38c] - ldr r0, _02172478 ; =data_027e0f74 + ldr r0, _02172478 ; =gAdventureFlags ldrh r1, [r1, #0x78] mov r3, #0 ldr r2, _0217247c ; =data_02050f54 @@ -5549,7 +5549,7 @@ _0217245c: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov27_02171f3c -_02172478: .word data_027e0f74 +_02172478: .word gAdventureFlags _0217247c: .word data_02050f54 _02172480: .word 0x0000019a _02172484: .word data_027e0e60 @@ -6096,7 +6096,7 @@ _02172be8: subge r0, r2, #0x9000 strge r0, [r4, #0x50] _02172c40: - ldr r0, _02172ce0 ; =data_027e0f74 + ldr r0, _02172ce0 ; =gAdventureFlags mov r1, #0xc7 ldr r0, [r0] bl func_ov00_02097760 @@ -6138,7 +6138,7 @@ _02172cd0: .word 0xffffd666 _02172cd4: .word 0xffff6666 _02172cd8: .word 0xffffe99a _02172cdc: .word 0x00000999 -_02172ce0: .word data_027e0f74 +_02172ce0: .word gAdventureFlags _02172ce4: .word 0xffffee66 .global func_ov27_02172ce8 @@ -6272,7 +6272,7 @@ func_ov27_02172e1c: ; 0x02172e1c ldreqb r0, [r4, #0x5b4] cmpeq r0, #1 bne _02172e64 - ldr r0, _02172ea4 ; =data_027e0f74 + ldr r0, _02172ea4 ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] mov r2, #0 @@ -6296,7 +6296,7 @@ _02172e64: arm_func_end func_ov27_02172e1c _02172e9c: .word data_ov27_02179784 _02172ea0: .word data_027e0f6c -_02172ea4: .word data_027e0f74 +_02172ea4: .word gAdventureFlags .global func_ov27_02172ea8 arm_func_start func_ov27_02172ea8 @@ -6314,7 +6314,7 @@ func_ov27_02172ea8: ; 0x02172ea8 ldreqb r0, [r4, #0x5b4] cmpeq r0, #1 bne _02172ef0 - ldr r0, _02172f38 ; =data_027e0f74 + ldr r0, _02172f38 ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] mov r2, #0 @@ -6340,7 +6340,7 @@ _02172ef0: arm_func_end func_ov27_02172ea8 _02172f30: .word data_ov27_02179784 _02172f34: .word data_027e0f6c -_02172f38: .word data_027e0f74 +_02172f38: .word gAdventureFlags .global func_ov27_02172f3c arm_func_start func_ov27_02172f3c @@ -6356,7 +6356,7 @@ _02172f44: .word func_ov14_02144d00 func_ov27_02172f48: ; 0x02172f48 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x2c - ldr r1, _02173108 ; =data_027e0f74 + ldr r1, _02173108 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, _0217310c ; =0x00000186 @@ -6365,13 +6365,13 @@ func_ov27_02172f48: ; 0x02172f48 addne sp, sp, #0x2c movne r0, #0 ldmneia sp!, {r3, r4, pc} - ldr r0, _02173108 ; =data_027e0f74 + ldr r0, _02173108 ; =gAdventureFlags mov r1, #0x62 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02172fac - ldr r0, _02173108 ; =data_027e0f74 + ldr r0, _02173108 ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] bl func_ov00_02097760 @@ -6380,7 +6380,7 @@ func_ov27_02172f48: ; 0x02172f48 moveq r0, #0 ldmeqia sp!, {r3, r4, pc} _02172fac: - ldr r0, _02173108 ; =data_027e0f74 + ldr r0, _02173108 ; =gAdventureFlags mov r1, #0x81 ldr r0, [r0] bl func_ov00_02097760 @@ -6469,7 +6469,7 @@ _02172fac: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov27_02172f48 -_02173108: .word data_027e0f74 +_02173108: .word gAdventureFlags _0217310c: .word 0x00000186 _02173110: .word data_ov27_02178f1c _02173114: .word data_ov27_021798bc @@ -6920,7 +6920,7 @@ func_ov27_02173710: ; 0x02173710 ldrb r0, [r1, #4] cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _021737ac ; =data_027e0f74 + ldr r0, _021737ac ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -6957,7 +6957,7 @@ _02173798: .align 2, 0 arm_func_end func_ov27_02173710 _021737a8: .word data_027e0c68 -_021737ac: .word data_027e0f74 +_021737ac: .word gAdventureFlags _021737b0: .word data_ov27_0217970c _021737b4: .word 0x00060008 @@ -8116,7 +8116,7 @@ func_ov27_02174454: ; 0x02174454 ldrb r3, [sp, #0x6f] ldrb r2, [sp, #0x70] str r0, [sp, #0xf8] - ldr r0, _02174700 ; =data_027e0f74 + ldr r0, _02174700 ; =gAdventureFlags str r1, [sp, #0xe8] ldr r1, [sp, #0x60] str r6, [sp, #0xf0] @@ -8156,7 +8156,7 @@ _021746f0: .word data_027e0c68 _021746f4: .word 0x00060015 _021746f8: .word data_027e0e60 _021746fc: .word data_027e0f64 -_02174700: .word data_027e0f74 +_02174700: .word gAdventureFlags .global func_ov27_02174704 arm_func_start func_ov27_02174704 @@ -8249,13 +8249,13 @@ func_ov27_021747d4: ; 0x021747d4 bl func_0202b154 cmp r0, #0 beq _021748c8 - ldr r0, _021748dc ; =data_027e0f74 + ldr r0, _021748dc ; =gAdventureFlags ldr r1, [r5, #0x1b4] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02174860 - ldr r0, _021748dc ; =data_027e0f74 + ldr r0, _021748dc ; =gAdventureFlags ldr r1, [r5, #0x1b4] ldr r0, [r0] bl func_ov00_02097bcc @@ -8295,7 +8295,7 @@ _021748c8: arm_func_end func_ov27_021747d4 _021748d4: .word data_027e0e60 _021748d8: .word 0x00000222 -_021748dc: .word data_027e0f74 +_021748dc: .word gAdventureFlags _021748e0: .word 0x00000266 _021748e4: .word data_027e0d0c @@ -8592,7 +8592,7 @@ _02174c30: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _02174c68 - ldr r0, _02174d2c ; =data_027e0f74 + ldr r0, _02174d2c ; =gAdventureFlags ldr r1, _02174d30 ; =0x0000013e ldr r0, [r0] bl func_ov00_02097760 @@ -8605,7 +8605,7 @@ _02174c68: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _02174c98 - ldr r0, _02174d2c ; =data_027e0f74 + ldr r0, _02174d2c ; =gAdventureFlags ldr r1, _02174d34 ; =0x0000013f ldr r0, [r0] bl func_ov00_02097760 @@ -8618,7 +8618,7 @@ _02174c98: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _02174cc8 - ldr r0, _02174d2c ; =data_027e0f74 + ldr r0, _02174d2c ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] bl func_ov00_02097760 @@ -8626,21 +8626,21 @@ _02174c98: moveq r0, #2 ldmeqia sp!, {r3, r4, r5, pc} _02174cc8: - ldr r0, _02174d2c ; =data_027e0f74 + ldr r0, _02174d2c ; =gAdventureFlags ldr r1, _02174d30 ; =0x0000013e ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r0, #3 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02174d2c ; =data_027e0f74 + ldr r0, _02174d2c ; =gAdventureFlags ldr r1, _02174d34 ; =0x0000013f ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r0, #4 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02174d2c ; =data_027e0f74 + ldr r0, _02174d2c ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] bl func_ov00_02097760 @@ -8654,7 +8654,7 @@ _02174d20: .align 2, 0 arm_func_end func_ov27_02174bdc _02174d28: .word gItemManager -_02174d2c: .word data_027e0f74 +_02174d2c: .word gAdventureFlags _02174d30: .word 0x0000013e _02174d34: .word 0x0000013f @@ -9310,7 +9310,7 @@ func_ov27_02175570: ; 0x02175570 ldr r0, [r2] add r1, r1, #0x400 bl func_ov00_02093af0 - ldr r0, _02175654 ; =data_027e0f74 + ldr r0, _02175654 ; =gAdventureFlags mov r1, #0xab ldr r0, [r0] bl func_ov00_02097760 @@ -9318,7 +9318,7 @@ func_ov27_02175570: ; 0x02175570 moveq r0, #0 streqb r0, [r4, #0x4e3] beq _02175610 - ldr r0, _02175654 ; =data_027e0f74 + ldr r0, _02175654 ; =gAdventureFlags mov r1, #0xac ldr r0, [r0] bl func_ov00_02097760 @@ -9326,7 +9326,7 @@ func_ov27_02175570: ; 0x02175570 moveq r0, #1 streqb r0, [r4, #0x4e3] beq _02175610 - ldr r0, _02175654 ; =data_027e0f74 + ldr r0, _02175654 ; =gAdventureFlags mov r1, #0xad ldr r0, [r0] bl func_ov00_02097760 @@ -9334,7 +9334,7 @@ func_ov27_02175570: ; 0x02175570 moveq r0, #2 streqb r0, [r4, #0x4e3] beq _02175610 - ldr r0, _02175654 ; =data_027e0f74 + ldr r0, _02175654 ; =gAdventureFlags mov r1, #0xae ldr r0, [r0] bl func_ov00_02097760 @@ -9363,7 +9363,7 @@ _02175610: .align 2, 0 arm_func_end func_ov27_02175570 _02175650: .word data_027e0f6c -_02175654: .word data_027e0f74 +_02175654: .word gAdventureFlags _02175658: .word data_027e0c68 _0217565c: .word 0x00060023 @@ -10364,7 +10364,7 @@ _02176294: ldrb r5, [sp, #0x62] ldrb lr, [sp, #0x63] ldrb ip, [sp, #0x64] - ldr r0, _02176444 ; =data_027e0f74 + ldr r0, _02176444 ; =gAdventureFlags str r3, [sp, #0xe4] ldr r3, [sp, #0x58] str r1, [sp, #0xe8] @@ -10398,7 +10398,7 @@ _02176434: .word 0x0000019a _02176438: .word data_027e0c68 _0217643c: .word 0x00060024 _02176440: .word data_027e0f64 -_02176444: .word data_027e0f74 +_02176444: .word gAdventureFlags _02176448: .word 0x00060025 .global func_ov27_0217644c @@ -10502,7 +10502,7 @@ _02176494: ldrb r5, [sp, #0x62] ldrb lr, [sp, #0x63] ldrb ip, [sp, #0x64] - ldr r0, _02176720 ; =data_027e0f74 + ldr r0, _02176720 ; =gAdventureFlags str r3, [sp, #0xe4] ldr r3, [sp, #0x58] str r1, [sp, #0xe8] @@ -10593,7 +10593,7 @@ _0217670c: .align 2, 0 arm_func_end func_ov27_0217644c _0217671c: .word data_027e0f64 -_02176720: .word data_027e0f74 +_02176720: .word gAdventureFlags _02176724: .word data_027e0c68 _02176728: .word 0x00060025 @@ -10650,13 +10650,13 @@ func_ov27_021767a8: ; 0x021767a8 add r0, r4, #0x1d8 str r1, [r4, #0x138] bl func_ov14_02145f0c - ldr r0, _021769e8 ; =data_027e0f74 + ldr r0, _021769e8 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021767ec - ldr r0, _021769e8 ; =data_027e0f74 + ldr r0, _021769e8 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097bcc @@ -10751,7 +10751,7 @@ _021767ec: ldrb r6, [sp, #0x62] ldrb r5, [sp, #0x63] ldrb lr, [sp, #0x64] - ldr r0, _021769e8 ; =data_027e0f74 + ldr r0, _021769e8 ; =gAdventureFlags str ip, [sp, #0xe4] ldr ip, [sp, #0x58] str r3, [sp, #0xe8] @@ -10791,7 +10791,7 @@ _021769bc: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov27_021767a8 -_021769e8: .word data_027e0f74 +_021769e8: .word gAdventureFlags _021769ec: .word data_027e0f64 _021769f0: .word 0x00001333 _021769f4: .word 0x000005dc @@ -10814,13 +10814,13 @@ func_ov27_02176a00: ; 0x02176a00 blx r1 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _02176aa4 ; =data_027e0f74 + ldr r0, _02176aa4 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02176a5c - ldr r0, _02176aa4 ; =data_027e0f74 + ldr r0, _02176aa4 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097bcc @@ -10846,7 +10846,7 @@ _02176a94: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov27_02176a00 -_02176aa4: .word data_027e0f74 +_02176aa4: .word gAdventureFlags _02176aa8: .word data_027e0dbc .global func_ov27_02176aac @@ -11552,13 +11552,13 @@ _021773f4: strb r1, [r0, #0x7a] b _02177664 _02177460: - ldr r0, _02177680 ; =data_027e0f74 + ldr r0, _02177680 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02177664 - ldr r0, _02177680 ; =data_027e0f74 + ldr r0, _02177680 ; =gAdventureFlags ldr r1, [r4, #0x1b4] ldr r0, [r0] bl func_ov00_02097bcc @@ -11670,7 +11670,7 @@ _0217749c: strb r3, [sp, #0xf7] strb r2, [sp, #0xf8] str r1, [sp, #0xfc] - ldr r0, _02177680 ; =data_027e0f74 + ldr r0, _02177680 ; =gAdventureFlags mov r2, #1 ldr r0, [r0] add r1, sp, #0x68 @@ -11692,7 +11692,7 @@ _02177670: .word data_027e0f90 _02177674: .word data_027e103c _02177678: .word data_027e0fb8 _0217767c: .word data_027e0cbc -_02177680: .word data_027e0f74 +_02177680: .word gAdventureFlags _02177684: .word data_027e0f64 _02177688: .word 0x00001333 _0217768c: .word 0x000005dc @@ -12493,7 +12493,7 @@ func_ov27_0217804c: ; 0x0217804c blx ip mov r0, #1 strb r0, [r4, #0x490] - ldr r0, _02178194 ; =data_027e0f74 + ldr r0, _02178194 ; =gAdventureFlags mov r1, #0xe8 ldr r0, [r0] bl func_ov00_02097760 @@ -12530,7 +12530,7 @@ _0217817c: _02178188: .word data_ov27_021790dc _0217818c: .word data_ov27_021790ec _02178190: .word 0x00000ccd -_02178194: .word data_027e0f74 +_02178194: .word gAdventureFlags _02178198: .word data_027e0f6c .global func_ov27_0217819c @@ -13053,7 +13053,7 @@ func_ov27_02178870: ; 0x02178870 ldrh r0, [r1, #2] cmp r0, #0xf bne _021788a8 - ldr r0, _021788b0 ; =data_027e0f74 + ldr r0, _021788b0 ; =gAdventureFlags mov r1, #0xe8 ldr r0, [r0] bl func_ov00_02097760 @@ -13068,7 +13068,7 @@ _021788a8: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov27_02178870 -_021788b0: .word data_027e0f74 +_021788b0: .word gAdventureFlags .global func_ov27_021788b4 arm_func_start func_ov27_021788b4 diff --git a/asm/ov28.inc b/asm/ov28.inc index 63c0b4a3..3032ee0e 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -85,7 +85,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f84 .extern data_027e0f94 diff --git a/asm/ov28.s b/asm/ov28.s index 89def983..12d5dda3 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -161,7 +161,7 @@ func_ov28_0216d6e0: ; 0x0216d6e0 mov r2, #0 strb r2, [r4, #0x8e5] ldr r1, _0216d904 ; =data_ov28_02179b00 - ldr r0, _0216d908 ; =data_027e0f74 + ldr r0, _0216d908 ; =gAdventureFlags str r4, [r1, #0x20] ldr r0, [r0] mov r1, #0x57 @@ -174,7 +174,7 @@ _0216d8f8: .word data_ov28_02178968 _0216d8fc: .word data_027e0fec _0216d900: .word data_ov28_02178a64 _0216d904: .word data_ov28_02179b00 -_0216d908: .word data_027e0f74 +_0216d908: .word gAdventureFlags .global func_ov28_0216d90c arm_func_start func_ov28_0216d90c @@ -182,13 +182,13 @@ func_ov28_0216d90c: ; 0x0216d90c stmdb sp!, {r4, lr} ldr r1, _0216d9d8 ; =data_ov28_02178968 mov r4, r0 - ldr r0, _0216d9dc ; =data_027e0f74 + ldr r0, _0216d9dc ; =gAdventureFlags str r1, [r4] ldr r0, [r0] mov r1, #0x56 mov r2, #0 bl func_ov00_0209779c - ldr r0, _0216d9dc ; =data_027e0f74 + ldr r0, _0216d9dc ; =gAdventureFlags mov r1, #0x57 ldr r0, [r0] mov r2, #0 @@ -233,7 +233,7 @@ func_ov28_0216d90c: ; 0x0216d90c .align 2, 0 arm_func_end func_ov28_0216d90c _0216d9d8: .word data_ov28_02178968 -_0216d9dc: .word data_027e0f74 +_0216d9dc: .word gAdventureFlags _0216d9e0: .word data_ov28_02179b00 .global func_ov28_0216d9e4 @@ -242,13 +242,13 @@ func_ov28_0216d9e4: ; 0x0216d9e4 stmdb sp!, {r4, lr} ldr r1, _0216dab8 ; =data_ov28_02178968 mov r4, r0 - ldr r0, _0216dabc ; =data_027e0f74 + ldr r0, _0216dabc ; =gAdventureFlags str r1, [r4] ldr r0, [r0] mov r1, #0x56 mov r2, #0 bl func_ov00_0209779c - ldr r0, _0216dabc ; =data_027e0f74 + ldr r0, _0216dabc ; =gAdventureFlags mov r1, #0x57 ldr r0, [r0] mov r2, #0 @@ -295,7 +295,7 @@ func_ov28_0216d9e4: ; 0x0216d9e4 .align 2, 0 arm_func_end func_ov28_0216d9e4 _0216dab8: .word data_ov28_02178968 -_0216dabc: .word data_027e0f74 +_0216dabc: .word gAdventureFlags _0216dac0: .word data_ov28_02179b00 .global func_ov28_0216dac4 @@ -542,14 +542,14 @@ func_ov28_0216dce8: ; 0x0216dce8 mov r0, r4 bl func_ov28_0216dac4 mov r1, #0 - ldr r0, _0216dec4 ; =data_027e0f74 + ldr r0, _0216dec4 ; =gAdventureFlags strb r1, [r4, #0x8e7] ldr r0, [r0] mov r1, #0x56 bl func_ov00_02097760 cmp r0, #0 bne _0216de78 - ldr r0, _0216dec4 ; =data_027e0f74 + ldr r0, _0216dec4 ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] bl func_ov00_02097760 @@ -579,13 +579,13 @@ _0216deb4: .word data_ov28_02178b60 _0216deb8: .word data_ov28_02178b64 _0216debc: .word data_ov28_02178b70 _0216dec0: .word data_ov28_02178b74 -_0216dec4: .word data_027e0f74 +_0216dec4: .word gAdventureFlags .global func_ov28_0216dec8 arm_func_start func_ov28_0216dec8 func_ov28_0216dec8: ; 0x0216dec8 stmdb sp!, {r4, lr} - ldr r1, _0216df04 ; =data_027e0f74 + ldr r1, _0216df04 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x57 @@ -602,7 +602,7 @@ _0216def8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_0216dec8 -_0216df04: .word data_027e0f74 +_0216df04: .word gAdventureFlags _0216df08: .word 0x006f000c .global func_ov28_0216df0c @@ -1478,7 +1478,7 @@ func_ov28_0216ead4: ; 0x0216ead4 cmp r0, #0 movle r0, #0 strleb r0, [r5, #0x8e8] - ldr r0, _0216eebc ; =data_027e0f74 + ldr r0, _0216eebc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -1735,7 +1735,7 @@ _0216edf8: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov28_0216ead4 -_0216eebc: .word data_027e0f74 +_0216eebc: .word gAdventureFlags _0216eec0: .word 0x00000333 _0216eec4: .word 0x00000e39 _0216eec8: .word 0x0000011f @@ -2572,13 +2572,13 @@ func_ov28_0216f918: ; 0x0216f918 ldr r1, _0216fb2c ; =0x000009c4 cmp r0, r1 blo _0216f964 - ldr r0, _0216fb30 ; =data_027e0f74 + ldr r0, _0216fb30 ; =gAdventureFlags ldr r1, _0216fb34 ; =0x00000176 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _0216f964 - ldr r0, _0216fb30 ; =data_027e0f74 + ldr r0, _0216fb30 ; =gAdventureFlags ldr r1, _0216fb34 ; =0x00000176 ldr r0, [r0] mov r2, #1 @@ -2709,7 +2709,7 @@ _0216fb20: .align 2, 0 arm_func_end func_ov28_0216f918 _0216fb2c: .word 0x000009c4 -_0216fb30: .word data_027e0f74 +_0216fb30: .word gAdventureFlags _0216fb34: .word 0x00000176 _0216fb38: .word 0x000005dc _0216fb3c: .word data_027e0764 @@ -3016,7 +3016,7 @@ _0216febc: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _0216fef4 - ldr r0, _0216ffb8 ; =data_027e0f74 + ldr r0, _0216ffb8 ; =gAdventureFlags ldr r1, _0216ffbc ; =0x0000013e ldr r0, [r0] bl func_ov00_02097760 @@ -3029,7 +3029,7 @@ _0216fef4: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _0216ff24 - ldr r0, _0216ffb8 ; =data_027e0f74 + ldr r0, _0216ffb8 ; =gAdventureFlags ldr r1, _0216ffc0 ; =0x0000013f ldr r0, [r0] bl func_ov00_02097760 @@ -3042,7 +3042,7 @@ _0216ff24: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _0216ff54 - ldr r0, _0216ffb8 ; =data_027e0f74 + ldr r0, _0216ffb8 ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] bl func_ov00_02097760 @@ -3050,21 +3050,21 @@ _0216ff24: moveq r0, #2 ldmeqia sp!, {r3, r4, r5, pc} _0216ff54: - ldr r0, _0216ffb8 ; =data_027e0f74 + ldr r0, _0216ffb8 ; =gAdventureFlags ldr r1, _0216ffbc ; =0x0000013e ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r0, #3 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _0216ffb8 ; =data_027e0f74 + ldr r0, _0216ffb8 ; =gAdventureFlags ldr r1, _0216ffc0 ; =0x0000013f ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r0, #4 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _0216ffb8 ; =data_027e0f74 + ldr r0, _0216ffb8 ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] bl func_ov00_02097760 @@ -3078,7 +3078,7 @@ _0216ffac: .align 2, 0 arm_func_end func_ov28_0216fe68 _0216ffb4: .word gItemManager -_0216ffb8: .word data_027e0f74 +_0216ffb8: .word gAdventureFlags _0216ffbc: .word 0x0000013e _0216ffc0: .word 0x0000013f @@ -3500,13 +3500,13 @@ func_ov28_021704b0: ; 0x021704b0 blx r1 cmp r0, #0 beq _02170618 - ldr r0, _02170624 ; =data_027e0f74 + ldr r0, _02170624 ; =gAdventureFlags ldr r1, _02170628 ; =0x00000126 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02170524 - ldr r0, _02170624 ; =data_027e0f74 + ldr r0, _02170624 ; =gAdventureFlags ldr r1, _0217062c ; =0x0000012a ldr r0, [r0] bl func_ov00_02097760 @@ -3520,13 +3520,13 @@ func_ov28_021704b0: ; 0x021704b0 bl func_ov00_02084b38 b _02170604 _02170524: - ldr r0, _02170624 ; =data_027e0f74 + ldr r0, _02170624 ; =gAdventureFlags ldr r1, _02170634 ; =0x00000127 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02170570 - ldr r0, _02170624 ; =data_027e0f74 + ldr r0, _02170624 ; =gAdventureFlags ldr r1, _02170638 ; =0x0000012b ldr r0, [r0] bl func_ov00_02097760 @@ -3540,13 +3540,13 @@ _02170524: bl func_ov00_02084b38 b _02170604 _02170570: - ldr r0, _02170624 ; =data_027e0f74 + ldr r0, _02170624 ; =gAdventureFlags mov r1, #0x128 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _021705bc - ldr r0, _02170624 ; =data_027e0f74 + ldr r0, _02170624 ; =gAdventureFlags mov r1, #0x12c ldr r0, [r0] bl func_ov00_02097760 @@ -3560,13 +3560,13 @@ _02170570: bl func_ov00_02084b38 b _02170604 _021705bc: - ldr r0, _02170624 ; =data_027e0f74 + ldr r0, _02170624 ; =gAdventureFlags ldr r1, _0217063c ; =0x00000129 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02170604 - ldr r0, _02170624 ; =data_027e0f74 + ldr r0, _02170624 ; =gAdventureFlags ldr r1, _02170640 ; =0x0000012d ldr r0, [r0] bl func_ov00_02097760 @@ -3590,7 +3590,7 @@ _02170618: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_021704b0 -_02170624: .word data_027e0f74 +_02170624: .word gAdventureFlags _02170628: .word 0x00000126 _0217062c: .word 0x0000012a _02170630: .word data_027e0e60 @@ -4756,7 +4756,7 @@ func_ov28_021713c8: ; 0x021713c8 cmp r0, #0 beq _02171440 mov r2, #1 - ldr r0, _02171480 ; =data_027e0f74 + ldr r0, _02171480 ; =gAdventureFlags strb r2, [r4, #0x1ac] mov r1, #0 ldr r0, [r0] @@ -4790,7 +4790,7 @@ _02171450: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_021713c8 -_02171480: .word data_027e0f74 +_02171480: .word gAdventureFlags _02171484: .word data_027e0f64 .global func_ov28_02171488 @@ -4990,7 +4990,7 @@ _021716f8: cmp r0, #5 addne sp, sp, #0x18 ldmneia sp!, {r4, pc} - ldr r0, _021718c0 ; =data_027e0f74 + ldr r0, _021718c0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -5045,7 +5045,7 @@ _021716f8: strb r2, [r4, #0x514] strb r1, [r4, #0x1ac] bl func_ov28_02170ad4 - ldr r0, _021718c0 ; =data_027e0f74 + ldr r0, _021718c0 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -5075,7 +5075,7 @@ _02171858: cmp r0, #0 beq _021718b0 mov r2, #1 - ldr r0, _021718c0 ; =data_027e0f74 + ldr r0, _021718c0 ; =gAdventureFlags strb r2, [r4, #0x1ac] mov r1, #0 ldr r0, [r0] @@ -5097,7 +5097,7 @@ _021718b0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_021716a0 -_021718c0: .word data_027e0f74 +_021718c0: .word gAdventureFlags _021718c4: .word data_027e077c _021718c8: .word data_027e0c68 _021718cc: .word data_027e0fc8 @@ -5138,7 +5138,7 @@ _0217192c: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _02171964 - ldr r0, _02171a28 ; =data_027e0f74 + ldr r0, _02171a28 ; =gAdventureFlags ldr r1, _02171a2c ; =0x0000013e ldr r0, [r0] bl func_ov00_02097760 @@ -5151,7 +5151,7 @@ _02171964: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _02171994 - ldr r0, _02171a28 ; =data_027e0f74 + ldr r0, _02171a28 ; =gAdventureFlags ldr r1, _02171a30 ; =0x0000013f ldr r0, [r0] bl func_ov00_02097760 @@ -5164,7 +5164,7 @@ _02171994: blx _ZNK11ItemManager10GetUnk_098Ej cmp r0, #0 beq _021719c4 - ldr r0, _02171a28 ; =data_027e0f74 + ldr r0, _02171a28 ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] bl func_ov00_02097760 @@ -5172,21 +5172,21 @@ _02171994: moveq r0, #2 ldmeqia sp!, {r3, r4, r5, pc} _021719c4: - ldr r0, _02171a28 ; =data_027e0f74 + ldr r0, _02171a28 ; =gAdventureFlags ldr r1, _02171a2c ; =0x0000013e ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r0, #3 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02171a28 ; =data_027e0f74 + ldr r0, _02171a28 ; =gAdventureFlags ldr r1, _02171a30 ; =0x0000013f ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 movne r0, #4 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02171a28 ; =data_027e0f74 + ldr r0, _02171a28 ; =gAdventureFlags mov r1, #0x140 ldr r0, [r0] bl func_ov00_02097760 @@ -5200,7 +5200,7 @@ _02171a1c: .align 2, 0 arm_func_end func_ov28_021718d8 _02171a24: .word gItemManager -_02171a28: .word data_027e0f74 +_02171a28: .word gAdventureFlags _02171a2c: .word 0x0000013e _02171a30: .word 0x0000013f @@ -5742,14 +5742,14 @@ _02172140: .word data_02050f54 .global func_ov28_02172144 arm_func_start func_ov28_02172144 func_ov28_02172144: ; 0x02172144 - ldr r0, _02172158 ; =data_027e0f74 + ldr r0, _02172158 ; =gAdventureFlags ldr ip, _0217215c ; =func_ov00_02097760 mov r1, #0x31 ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov28_02172144 -_02172158: .word data_027e0f74 +_02172158: .word gAdventureFlags _0217215c: .word func_ov00_02097760 .global func_ov28_02172160 @@ -6143,14 +6143,14 @@ _02172654: .word data_02050f54 .global func_ov28_02172658 arm_func_start func_ov28_02172658 func_ov28_02172658: ; 0x02172658 - ldr r0, _0217266c ; =data_027e0f74 + ldr r0, _0217266c ; =gAdventureFlags ldr ip, _02172670 ; =func_ov00_02097760 mov r1, #0x2f ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov28_02172658 -_0217266c: .word data_027e0f74 +_0217266c: .word gAdventureFlags _02172670: .word func_ov00_02097760 .global func_ov28_02172674 @@ -7102,7 +7102,7 @@ func_ov28_02173210: ; 0x02173210 mov r0, r4 strb r1, [r4, #0x26c] bl func_ov28_02173178 - ldr r0, _021732b4 ; =data_027e0f74 + ldr r0, _021732b4 ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] bl func_ov00_02097760 @@ -7132,7 +7132,7 @@ _02173294: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_02173210 -_021732b4: .word data_027e0f74 +_021732b4: .word gAdventureFlags _021732b8: .word data_ov28_021782ec .global func_ov28_021732bc @@ -7276,7 +7276,7 @@ _02173440: ldr r0, [r4, #0x130] cmp r0, #4 beq _021734e0 - ldr r0, _02173500 ; =data_027e0f74 + ldr r0, _02173500 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -7319,7 +7319,7 @@ _021734f8: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov28_021733ec -_02173500: .word data_027e0f74 +_02173500: .word gAdventureFlags _02173504: .word data_027e077c _02173508: .word data_027e0fc8 _0217350c: .word data_027e0c68 @@ -7490,7 +7490,7 @@ func_ov28_021736d0: ; 0x021736d0 cmp r0, #0 movle r0, #0 strleb r0, [r4, #0x26d] - ldr r0, _02173740 ; =data_027e0f74 + ldr r0, _02173740 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -7510,7 +7510,7 @@ func_ov28_021736d0: ; 0x021736d0 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_021736d0 -_02173740: .word data_027e0f74 +_02173740: .word gAdventureFlags _02173744: .word data_027e0c68 .global func_ov28_02173748 @@ -7572,13 +7572,13 @@ func_ov28_021737cc: ; 0x021737cc ldrb r0, [r0, #0x11a] cmp r0, #0 bne _02173850 - ldr r0, _02173860 ; =data_027e0f74 + ldr r0, _02173860 ; =gAdventureFlags mov r1, #0xe3 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _02173850 - ldr r0, _02173860 ; =data_027e0f74 + ldr r0, _02173860 ; =gAdventureFlags mov r1, #0xe7 ldr r0, [r0] bl func_ov00_02097760 @@ -7595,7 +7595,7 @@ _02173850: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_021737cc -_02173860: .word data_027e0f74 +_02173860: .word gAdventureFlags _02173864: .word data_ov09_0211f5b4 .global func_ov28_02173868 @@ -7665,7 +7665,7 @@ func_ov28_021738e0: ; 0x021738e0 blx r1 cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02173944 ; =data_027e0f74 + ldr r0, _02173944 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -7685,7 +7685,7 @@ func_ov28_021738e0: ; 0x021738e0 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_021738e0 -_02173944: .word data_027e0f74 +_02173944: .word gAdventureFlags _02173948: .word data_027e0fc8 _0217394c: .word data_ov09_0211f5b4 @@ -8435,7 +8435,7 @@ func_ov28_021742b0: ; 0x021742b0 mvn r3, #0 mov r2, #0x1e mov r1, #6 - ldr r0, _02174380 ; =data_027e0f74 + ldr r0, _02174380 ; =gAdventureFlags str r3, [sp, #4] strb r2, [sp, #9] strb r1, [sp, #0xa] @@ -8466,7 +8466,7 @@ func_ov28_021742b0: ; 0x021742b0 arm_func_end func_ov28_021742b0 _02174378: .word 0x00000666 _0217437c: .word data_ov28_021794e4 -_02174380: .word data_027e0f74 +_02174380: .word gAdventureFlags _02174384: .word data_027e0e60 .global func_ov28_02174388 @@ -8474,7 +8474,7 @@ _02174384: .word data_027e0e60 func_ov28_02174388: ; 0x02174388 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x14 - ldr r1, _021744b0 ; =data_027e0f74 + ldr r1, _021744b0 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x228] @@ -8482,7 +8482,7 @@ func_ov28_02174388: ; 0x02174388 cmp r0, #0 addeq sp, sp, #0x14 ldmeqia sp!, {r3, r4, pc} - ldr r0, _021744b0 ; =data_027e0f74 + ldr r0, _021744b0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x19 @@ -8538,7 +8538,7 @@ _02174428: str r0, [r4, #0x238] ldmia sp!, {r3, r4, pc} _02174488: - ldr r0, _021744b0 ; =data_027e0f74 + ldr r0, _021744b0 ; =gAdventureFlags ldr r1, [r4, #0x228] ldr r0, [r0] bl func_ov00_02097bcc @@ -8550,7 +8550,7 @@ _02174488: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov28_02174388 -_021744b0: .word data_027e0f74 +_021744b0: .word gAdventureFlags _021744b4: .word data_027e0e58 _021744b8: .word data_ov00_020eec9c _021744bc: .word data_02050f54 @@ -8587,7 +8587,7 @@ func_ov28_02174504: ; 0x02174504 ldrsh r0, [r0, #0xc] cmp r0, #5 ldmleia sp!, {r4, pc} - ldr r0, _0217454c ; =data_027e0f74 + ldr r0, _0217454c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -8601,7 +8601,7 @@ func_ov28_02174504: ; 0x02174504 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_02174504 -_0217454c: .word data_027e0f74 +_0217454c: .word gAdventureFlags _02174550: .word data_027e0c68 .global func_ov28_02174554 @@ -8622,7 +8622,7 @@ func_ov28_02174554: ; 0x02174554 mov r3, #0 mov r2, #0x14 mov r1, #0x1e - ldr r0, _02174668 ; =data_027e0f74 + ldr r0, _02174668 ; =gAdventureFlags str r2, [sp, #4] strb r3, [sp, #0xa] strb r3, [sp, #0xb] @@ -8647,7 +8647,7 @@ func_ov28_02174554: ; 0x02174554 strb r2, [sp, #0xa] strb r1, [sp, #0xb] ldr r1, [r4, #0x48] - ldr r0, _02174668 ; =data_027e0f74 + ldr r0, _02174668 ; =gAdventureFlags str r1, [sp, #0x20] ldr r1, [r4, #0x4c] ldr r0, [r0] @@ -8678,21 +8678,21 @@ func_ov28_02174554: ; 0x02174554 .align 2, 0 arm_func_end func_ov28_02174554 _02174664: .word data_027e0ffc -_02174668: .word data_027e0f74 +_02174668: .word gAdventureFlags _0217466c: .word data_ov28_021794e4 .global func_ov28_02174670 arm_func_start func_ov28_02174670 func_ov28_02174670: ; 0x02174670 stmdb sp!, {r4, lr} - ldr r1, _021746c8 ; =data_027e0f74 + ldr r1, _021746c8 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x230] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _021746c8 ; =data_027e0f74 + ldr r0, _021746c8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0xa @@ -8708,7 +8708,7 @@ func_ov28_02174670: ; 0x02174670 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_02174670 -_021746c8: .word data_027e0f74 +_021746c8: .word gAdventureFlags .global func_ov28_021746cc arm_func_start func_ov28_021746cc @@ -8804,7 +8804,7 @@ func_ov28_0217475c: ; 0x0217475c ldr r0, [r0] mov r3, #2 bl func_ov00_0207c1b0 - ldr r0, _02174828 ; =data_027e0f74 + ldr r0, _02174828 ; =gAdventureFlags ldr r1, [r4, #0x230] ldr r0, [r0] bl func_ov00_02097bcc @@ -8819,7 +8819,7 @@ func_ov28_0217475c: ; 0x0217475c arm_func_end func_ov28_0217475c _02174820: .word data_027e0e58 _02174824: .word 0x000001a5 -_02174828: .word data_027e0f74 +_02174828: .word gAdventureFlags _0217482c: .word data_ov00_020eec9c .global func_ov28_02174830 @@ -9018,7 +9018,7 @@ _02174a58: .word data_ov00_020eec68 arm_func_start func_ov28_02174a5c func_ov28_02174a5c: ; 0x02174a5c stmdb sp!, {r4, lr} - ldr r1, _02174b90 ; =data_027e0f74 + ldr r1, _02174b90 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] bl func_ov00_02097738 @@ -9100,7 +9100,7 @@ _02174b40: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_02174a5c -_02174b90: .word data_027e0f74 +_02174b90: .word gAdventureFlags _02174b94: .word data_ov00_020eec68 _02174b98: .word data_027e077c _02174b9c: .word data_027e0c68 @@ -9139,7 +9139,7 @@ func_ov28_02174bd8: ; 0x02174bd8 bl func_ov28_02175028 ldr r0, _02174c04 ; =data_ov09_0211f5b4 blx func_ov03_020f4048 - ldr r0, _02174c08 ; =data_027e0f74 + ldr r0, _02174c08 ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] mov r2, #1 @@ -9148,7 +9148,7 @@ func_ov28_02174bd8: ; 0x02174bd8 .align 2, 0 arm_func_end func_ov28_02174bd8 _02174c04: .word data_ov09_0211f5b4 -_02174c08: .word data_027e0f74 +_02174c08: .word gAdventureFlags .global func_ov28_02174c0c arm_func_start func_ov28_02174c0c @@ -9371,7 +9371,7 @@ _02174ec0: .word data_ov28_02179c54 arm_func_start func_ov28_02174ec4 func_ov28_02174ec4: ; 0x02174ec4 stmdb sp!, {r4, lr} - ldr r1, _02174f38 ; =data_027e0f74 + ldr r1, _02174f38 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] bl func_ov00_02097738 @@ -9403,7 +9403,7 @@ _02174f30: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov28_02174ec4 -_02174f38: .word data_027e0f74 +_02174f38: .word gAdventureFlags _02174f3c: .word data_027e0c68 _02174f40: .word data_ov28_02179c2c @@ -10691,13 +10691,13 @@ func_ov28_02175f48: ; 0x02175f48 bl func_ov28_02175ae0 mov r0, #0 str r0, [r4, #0x5f4] - ldr r0, _021761ec ; =data_027e0f74 + ldr r0, _021761ec ; =gAdventureFlags mov r1, #0x124 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _021760ac - ldr r0, _021761ec ; =data_027e0f74 + ldr r0, _021761ec ; =gAdventureFlags mov r1, #0xb5 ldr r0, [r0] bl func_ov00_02097760 @@ -10732,7 +10732,7 @@ _021760a4: mov r0, #1 ldmia sp!, {r4, pc} _021760ac: - ldr r0, _021761ec ; =data_027e0f74 + ldr r0, _021761ec ; =gAdventureFlags ldr r1, _021761f0 ; =0x00000123 ldr r0, [r0] bl func_ov00_02097760 @@ -10820,7 +10820,7 @@ _021761dc: .word data_ov28_021798ec _021761e0: .word data_ov28_021798f0 _021761e4: .word data_ov28_02178360 _021761e8: .word func_ov28_021754e4 -_021761ec: .word data_027e0f74 +_021761ec: .word gAdventureFlags _021761f0: .word 0x00000123 .global func_ov28_021761f4 diff --git a/asm/ov29.inc b/asm/ov29.inc index 5a159987..69781e88 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -81,7 +81,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov29.s b/asm/ov29.s index 16ce4d41..20f8f2ca 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -628,7 +628,7 @@ func_ov29_0216ddb0: ; 0x0216ddb0 cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc} - ldr r0, _0216dfec ; =data_027e0f74 + ldr r0, _0216dfec ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -772,7 +772,7 @@ _0216df70: .align 2, 0 arm_func_end func_ov29_0216ddb0 _0216dfe8: .word data_ov29_0217a4ac -_0216dfec: .word data_027e0f74 +_0216dfec: .word gAdventureFlags _0216dff0: .word data_ov29_0217a504 _0216dff4: .word data_027e104c _0216dff8: .word data_ov00_020eec9c @@ -11284,7 +11284,7 @@ func_ov29_02176e94: ; 0x02176e94 arm_func_start func_ov29_02176ea8 func_ov29_02176ea8: ; 0x02176ea8 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _02176fac ; =data_027e0f74 + ldr r1, _02176fac ; =gAdventureFlags mov r4, r0 ldr r0, [r1] bl func_ov00_02097738 @@ -11354,7 +11354,7 @@ _02176f60: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov29_02176ea8 -_02176fac: .word data_027e0f74 +_02176fac: .word gAdventureFlags _02176fb0: .word data_ov29_0217a4ac _02176fb4: .word gItemManager _02176fb8: .word data_027e103c diff --git a/asm/ov30.inc b/asm/ov30.inc index e1431adb..b2d6ddc4 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -18,7 +18,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fc8 diff --git a/asm/ov30.s b/asm/ov30.s index 176bac8e..9b56d1ce 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -2422,7 +2422,7 @@ _0217dca8: add sp, sp, #0xbc ldmia sp!, {r3, r4, r5, r6, pc} _0217dccc: - ldr r0, _0217df4c ; =data_027e0f74 + ldr r0, _0217df4c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -2496,13 +2496,13 @@ _0217dd8c: mov r0, r4 str r2, [r1, #0x10] bl func_ov30_02183e30 - ldr r0, _0217df4c ; =data_027e0f74 + ldr r0, _0217df4c ; =gAdventureFlags mov r1, #0x46 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _0217de10 - ldr r0, _0217df4c ; =data_027e0f74 + ldr r0, _0217df4c ; =gAdventureFlags mov r1, #0x46 ldr r0, [r0] mov r2, #1 @@ -2562,13 +2562,13 @@ _0217de88: mov r0, r4 str r2, [r1, #0x10] bl func_ov30_02183e30 - ldr r0, _0217df4c ; =data_027e0f74 + ldr r0, _0217df4c ; =gAdventureFlags mov r1, #0x46 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _0217df0c - ldr r0, _0217df4c ; =data_027e0f74 + ldr r0, _0217df4c ; =gAdventureFlags mov r1, #0x46 ldr r0, [r0] mov r2, #1 @@ -2594,7 +2594,7 @@ _0217df40: .align 2, 0 arm_func_end func_ov30_0217dbc8 _0217df48: .word data_027e0f64 -_0217df4c: .word data_027e0f74 +_0217df4c: .word gAdventureFlags _0217df50: .word 0x43485334 _0217df54: .word data_027e0ffc @@ -2764,7 +2764,7 @@ _0217e160: add sp, sp, #0xcc ldmia sp!, {r4, r5, r6, r7, pc} _0217e184: - ldr r0, _0217e3c0 ; =data_027e0f74 + ldr r0, _0217e3c0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -2918,7 +2918,7 @@ _0217e3b8: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov30_0217e0b0 -_0217e3c0: .word data_027e0f74 +_0217e3c0: .word gAdventureFlags _0217e3c4: .word data_027e0f64 _0217e3c8: .word data_027e0c68 _0217e3cc: .word 0x000e0055 @@ -3989,13 +3989,13 @@ _0217f1e8: ; jump table b _0217f2f4 ; case 2 b _0217f470 ; case 3 _0217f1f8: - ldr r0, _0217f544 ; =data_027e0f74 + ldr r0, _0217f544 ; =gAdventureFlags mov r1, #0x158 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _0217f23c - ldr r0, _0217f544 ; =data_027e0f74 + ldr r0, _0217f544 ; =gAdventureFlags mov r1, #0x158 ldr r0, [r0] mov r2, #1 @@ -4213,7 +4213,7 @@ _0217f53c: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 arm_func_end func_ov30_0217f1c4 -_0217f544: .word data_027e0f74 +_0217f544: .word gAdventureFlags _0217f548: .word data_027e0e60 _0217f54c: .word data_027e0ffc _0217f550: .word data_ov00_020e8398 @@ -5415,7 +5415,7 @@ func_ov30_02180548: ; 0x02180548 bl func_ov00_02082d08 cmp r0, #7 bne _02180594 - ldr r0, _021805a4 ; =data_027e0f74 + ldr r0, _021805a4 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] bl func_ov00_02097760 @@ -5429,7 +5429,7 @@ _02180594: arm_func_end func_ov30_02180548 _0218059c: .word data_027e0d38 _021805a0: .word data_027e0e60 -_021805a4: .word data_027e0f74 +_021805a4: .word gAdventureFlags _021805a8: .word data_ov30_021887ac .global func_ov30_021805ac @@ -5447,7 +5447,7 @@ func_ov30_021805ac: ; 0x021805ac bl func_ov00_02082d08 cmp r0, #7 bne _021805f8 - ldr r0, _02180608 ; =data_027e0f74 + ldr r0, _02180608 ; =gAdventureFlags mov r1, #0x14 ldr r0, [r0] bl func_ov00_02097760 @@ -5461,7 +5461,7 @@ _021805f8: arm_func_end func_ov30_021805ac _02180600: .word data_027e0d38 _02180604: .word data_027e0e60 -_02180608: .word data_027e0f74 +_02180608: .word gAdventureFlags _0218060c: .word data_ov30_021887b4 .global func_ov30_02180610 @@ -8157,7 +8157,7 @@ func_ov30_021823f8: ; 0x021823f8 ldrh r1, [r4, #0x24] cmp r1, #0 ble _02182424 - ldr r0, _02182450 ; =data_027e0f74 + ldr r0, _02182450 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -8167,7 +8167,7 @@ _02182424: ldrh r1, [r4, #0x26] cmp r1, #0 ble _02182448 - ldr r0, _02182450 ; =data_027e0f74 + ldr r0, _02182450 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -8178,7 +8178,7 @@ _02182448: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov30_021823f8 -_02182450: .word data_027e0f74 +_02182450: .word gAdventureFlags .global func_ov30_02182454 arm_func_start func_ov30_02182454 @@ -10133,7 +10133,7 @@ _02183df4: ldr r0, _02183e28 ; =0x43485334 cmp r1, r0 bne _02183e20 - ldr r0, _02183e2c ; =data_027e0f74 + ldr r0, _02183e2c ; =gAdventureFlags mov r1, #0x35 ldr r0, [r0] bl func_ov00_02097760 @@ -10146,7 +10146,7 @@ _02183e20: .align 2, 0 arm_func_end func_ov30_02183db8 _02183e28: .word 0x43485334 -_02183e2c: .word data_027e0f74 +_02183e2c: .word gAdventureFlags .global func_ov30_02183e30 arm_func_start func_ov30_02183e30 @@ -13096,13 +13096,13 @@ _0218622c: add sp, sp, #0x68 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0218623c: - ldr r0, _021863e0 ; =data_027e0f74 + ldr r0, _021863e0 ; =gAdventureFlags mov r1, #0x11c ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _02186280 - ldr r0, _021863e0 ; =data_027e0f74 + ldr r0, _021863e0 ; =gAdventureFlags mov r1, #0x11c ldr r0, [r0] mov r2, #1 @@ -13210,7 +13210,7 @@ _021863cc: _021863d4: .word data_027e0f94 _021863d8: .word 0x43485334 _021863dc: .word 0x43485336 -_021863e0: .word data_027e0f74 +_021863e0: .word gAdventureFlags .global func_ov30_021863e4 arm_func_start func_ov30_021863e4 diff --git a/asm/ov31.inc b/asm/ov31.inc index 56950d36..32721921 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -25,7 +25,7 @@ .extern data_027e0e28 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f94 .extern data_027e0fc8 .extern data_027e0fe0 diff --git a/asm/ov31.s b/asm/ov31.s index a5dc4e51..2dfc7085 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -1340,14 +1340,14 @@ func_ov31_0217ce90: ; 0x0217ce90 cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0217cebc ; =data_027e0f74 + ldr r0, _0217cebc ; =gAdventureFlags mov r1, #0x78 ldr r0, [r0] bl func_ov00_02097760 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov31_0217ce90 -_0217cebc: .word data_027e0f74 +_0217cebc: .word gAdventureFlags .global func_ov31_0217cec0 arm_func_start func_ov31_0217cec0 @@ -5303,21 +5303,21 @@ func_ov31_0217fd84: ; 0x0217fd84 beq _0217fddc cmp r0, #2 ldmneia sp!, {r4, pc} - ldr r0, _0217fdfc ; =data_027e0f74 + ldr r0, _0217fdfc ; =gAdventureFlags mov r1, #0x67 ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c b _0217fdf0 _0217fdc4: - ldr r0, _0217fdfc ; =data_027e0f74 + ldr r0, _0217fdfc ; =gAdventureFlags mov r1, #0x68 ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c b _0217fdf0 _0217fddc: - ldr r0, _0217fdfc ; =data_027e0f74 + ldr r0, _0217fdfc ; =gAdventureFlags mov r1, #0x68 ldr r0, [r0] mov r2, #1 @@ -5328,7 +5328,7 @@ _0217fdf0: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217fd84 -_0217fdfc: .word data_027e0f74 +_0217fdfc: .word gAdventureFlags .global func_ov31_0217fe00 arm_func_start func_ov31_0217fe00 @@ -5351,7 +5351,7 @@ _0217fe28: .word gItemManager arm_func_start func_ov31_0217fe2c func_ov31_0217fe2c: ; 0x0217fe2c stmdb sp!, {r4, lr} - ldr r1, _0217fe54 ; =data_027e0f74 + ldr r1, _0217fe54 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x6b @@ -5362,7 +5362,7 @@ func_ov31_0217fe2c: ; 0x0217fe2c ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217fe2c -_0217fe54: .word data_027e0f74 +_0217fe54: .word gAdventureFlags .global func_ov31_0217fe58 arm_func_start func_ov31_0217fe58 @@ -5385,7 +5385,7 @@ _0217fe80: .word gItemManager arm_func_start func_ov31_0217fe84 func_ov31_0217fe84: ; 0x0217fe84 stmdb sp!, {r4, lr} - ldr r1, _0217feac ; =data_027e0f74 + ldr r1, _0217feac ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x6a @@ -5396,7 +5396,7 @@ func_ov31_0217fe84: ; 0x0217fe84 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217fe84 -_0217feac: .word data_027e0f74 +_0217feac: .word gAdventureFlags .global func_ov31_0217feb0 arm_func_start func_ov31_0217feb0 @@ -5419,7 +5419,7 @@ _0217fed8: .word gItemManager arm_func_start func_ov31_0217fedc func_ov31_0217fedc: ; 0x0217fedc stmdb sp!, {r4, lr} - ldr r1, _0217ff04 ; =data_027e0f74 + ldr r1, _0217ff04 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x6c @@ -5430,7 +5430,7 @@ func_ov31_0217fedc: ; 0x0217fedc ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217fedc -_0217ff04: .word data_027e0f74 +_0217ff04: .word gAdventureFlags .global func_ov31_0217ff08 arm_func_start func_ov31_0217ff08 @@ -5496,21 +5496,21 @@ func_ov31_0217ff9c: ; 0x0217ff9c beq _0217fff4 cmp r0, #2 ldmneia sp!, {r4, pc} - ldr r0, _02180014 ; =data_027e0f74 + ldr r0, _02180014 ; =gAdventureFlags mov r1, #0x69 ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c b _02180008 _0217ffdc: - ldr r0, _02180014 ; =data_027e0f74 + ldr r0, _02180014 ; =gAdventureFlags mov r1, #0x6d ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c b _02180008 _0217fff4: - ldr r0, _02180014 ; =data_027e0f74 + ldr r0, _02180014 ; =gAdventureFlags mov r1, #0x71 ldr r0, [r0] mov r2, #1 @@ -5521,7 +5521,7 @@ _02180008: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_0217ff9c -_02180014: .word data_027e0f74 +_02180014: .word gAdventureFlags .global func_ov31_02180018 arm_func_start func_ov31_02180018 @@ -6423,28 +6423,28 @@ _021808a0: movne r0, #0xf ldmia sp!, {r4, pc} _021808b0: - ldr r0, _02180958 ; =data_027e0f74 + ldr r0, _02180958 ; =gAdventureFlags mov r1, #0x69 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 moveq r0, #0xc ldmeqia sp!, {r4, pc} - ldr r0, _02180958 ; =data_027e0f74 + ldr r0, _02180958 ; =gAdventureFlags mov r1, #0x6b ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 moveq r0, #7 ldmeqia sp!, {r4, pc} - ldr r0, _02180958 ; =data_027e0f74 + ldr r0, _02180958 ; =gAdventureFlags mov r1, #0x6c ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 moveq r0, #8 ldmeqia sp!, {r4, pc} - ldr r0, _02180958 ; =data_027e0f74 + ldr r0, _02180958 ; =gAdventureFlags mov r1, #0x67 ldr r0, [r0] bl func_ov00_02097760 @@ -6469,7 +6469,7 @@ _02180950: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_02180858 -_02180958: .word data_027e0f74 +_02180958: .word gAdventureFlags _0218095c: .word gItemManager .global func_ov31_02180960 @@ -6811,7 +6811,7 @@ _02180d0c: ldrb r0, [r0, #0x29] cmp r0, #0 bne _02180d40 - ldr r0, _02180dd8 ; =data_027e0f74 + ldr r0, _02180dd8 ; =gAdventureFlags mov r1, #0x6a ldr r0, [r0] bl func_ov00_02097760 @@ -6820,7 +6820,7 @@ _02180d0c: moveq r0, #6 ldmia sp!, {r3, pc} _02180d40: - ldr r0, _02180dd8 ; =data_027e0f74 + ldr r0, _02180dd8 ; =gAdventureFlags mov r1, #0x68 ldr r0, [r0] bl func_ov00_02097760 @@ -6843,7 +6843,7 @@ _02180d78: ldrb r0, [r0, #0x29] cmp r0, #0 bne _02180dac - ldr r0, _02180dd8 ; =data_027e0f74 + ldr r0, _02180dd8 ; =gAdventureFlags mov r1, #0x6d ldr r0, [r0] bl func_ov00_02097760 @@ -6852,7 +6852,7 @@ _02180d78: moveq r0, #0xd ldmia sp!, {r3, pc} _02180dac: - ldr r0, _02180dd8 ; =data_027e0f74 + ldr r0, _02180dd8 ; =gAdventureFlags mov r1, #0x71 ldr r0, [r0] bl func_ov00_02097760 @@ -6866,7 +6866,7 @@ _02180dcc: .align 2, 0 arm_func_end func_ov31_02180ce8 _02180dd4: .word data_027e0fe4 -_02180dd8: .word data_027e0f74 +_02180dd8: .word gAdventureFlags .global func_ov31_02180ddc arm_func_start func_ov31_02180ddc @@ -7482,7 +7482,7 @@ _021814b4: .word data_ov31_02183d7c func_ov31_021814b8: ; 0x021814b8 stmdb sp!, {r4, lr} sub sp, sp, #8 - ldr r1, _0218159c ; =data_027e0f74 + ldr r1, _0218159c ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x148 @@ -7540,7 +7540,7 @@ _02181568: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov31_021814b8 -_0218159c: .word data_027e0f74 +_0218159c: .word gAdventureFlags _021815a0: .word data_ov31_02183d68 _021815a4: .word data_ov31_02183d6c _021815a8: .word data_ov31_02181b24 diff --git a/asm/ov32.inc b/asm/ov32.inc index c5a50827..26fc7ee5 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -78,7 +78,7 @@ .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f84 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov32.s b/asm/ov32.s index b7aa83c0..911520dc 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -6947,13 +6947,13 @@ _02181720: blx r3 b _02181cb4 _0218174c: - ldr r0, _02181cdc ; =data_027e0f74 + ldr r0, _02181cdc ; =gAdventureFlags ldr r1, [r4, #0x60] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02181cb4 - ldr r0, _02181cdc ; =data_027e0f74 + ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -6982,7 +6982,7 @@ _021817c4: add r0, r4, #0x200 bl func_ov00_020b7e6c _021817cc: - ldr r0, _02181cdc ; =data_027e0f74 + ldr r0, _02181cdc ; =gAdventureFlags ldr r1, [r4, #0x60] ldr r0, [r0] bl func_ov00_02097bac @@ -6996,7 +6996,7 @@ _021817cc: blx r3 b _02181cb4 _02181800: - ldr r0, _02181cdc ; =data_027e0f74 + ldr r0, _02181cdc ; =gAdventureFlags ldr r1, [r4, #0x60] ldr r0, [r0] bl func_ov00_02097b9c @@ -7049,7 +7049,7 @@ _02181848: str ip, [r4, #0x94] str ip, [r4, #0x98] _021818cc: - ldr r0, _02181cdc ; =data_027e0f74 + ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x2d @@ -7112,7 +7112,7 @@ _021819a0: bl Approach_thunk b _02181cb4 _021819b4: - ldr r0, _02181cdc ; =data_027e0f74 + ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_0209809c cmp r0, #0 @@ -7214,12 +7214,12 @@ _02181afc: b _02181cb4 _02181b28: bl func_ov32_021829ec - ldr r0, _02181cdc ; =data_027e0f74 + ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 bne _02181cb4 - ldr r0, _02181cdc ; =data_027e0f74 + ldr r0, _02181cdc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bbc cmp r0, #0 @@ -7330,7 +7330,7 @@ _02181cb4: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov32_021816ac -_02181cdc: .word data_027e0f74 +_02181cdc: .word gAdventureFlags _02181ce0: .word 0x0000019a _02181ce4: .word data_027e0e58 _02181ce8: .word data_027e0764 @@ -7397,7 +7397,7 @@ _02181db0: mov r3, #0x69 mov r2, #0x1e mov r1, #6 - ldr r0, _0218227c ; =data_027e0f74 + ldr r0, _0218227c ; =gAdventureFlags str r3, [sp, #0x128] strb r2, [sp, #0x12d] strb r1, [sp, #0x12e] @@ -7461,7 +7461,7 @@ _02181ea4: mov r3, #0x69 mov r2, #0x1e mov r1, #6 - ldr r0, _0218227c ; =data_027e0f74 + ldr r0, _0218227c ; =gAdventureFlags str r3, [sp, #0x78] strb r2, [sp, #0x7d] strb r1, [sp, #0x7e] @@ -7605,7 +7605,7 @@ _02182080: str r1, [sp, #0x28] mov r0, #2 stmia sp, {r0, r1} - ldr r0, _0218227c ; =data_027e0f74 + ldr r0, _0218227c ; =gAdventureFlags mov r3, r2 ldr r0, [r0] bl func_ov00_02098074 @@ -7695,7 +7695,7 @@ _02182214: mov r0, #2 stmia sp, {r0, r3} mov r1, #0xa - ldr r0, _0218227c ; =data_027e0f74 + ldr r0, _0218227c ; =gAdventureFlags mov r2, r1 ldr r0, [r0] mov r3, r1 @@ -7721,7 +7721,7 @@ _0218226c: .align 2, 0 arm_func_end func_ov32_02181d00 _02182278: .word 0xffffeccd -_0218227c: .word data_027e0f74 +_0218227c: .word gAdventureFlags _02182280: .word data_027e0ffc _02182284: .word 0x0000039b _02182288: .word data_027e0e58 @@ -8515,12 +8515,12 @@ func_ov32_02182c40: ; 0x02182c40 mvn r0, #0 cmp r1, r0 beq _02182d68 - ldr r0, _02182d7c ; =data_027e0f74 + ldr r0, _02182d7c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 bne _02182cbc - ldr r0, _02182d7c ; =data_027e0f74 + ldr r0, _02182d7c ; =gAdventureFlags ldr r1, [r5, #0xb0] ldr r0, [r0] bl func_ov00_02097bac @@ -8536,7 +8536,7 @@ func_ov32_02182c40: ; 0x02182c40 add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, pc} _02182cbc: - ldr r0, _02182d7c ; =data_027e0f74 + ldr r0, _02182d7c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -8547,7 +8547,7 @@ _02182cbc: mov r3, #0 bl func_ov00_020ceacc _02182ce4: - ldr r0, _02182d7c ; =data_027e0f74 + ldr r0, _02182d7c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x1e @@ -8591,7 +8591,7 @@ _02182d68: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 arm_func_end func_ov32_02182c40 -_02182d7c: .word data_027e0f74 +_02182d7c: .word gAdventureFlags _02182d80: .word data_027e0ffc _02182d84: .word 0x0000039f _02182d88: .word data_027e0f68 @@ -8628,7 +8628,7 @@ func_ov32_02182db4: ; 0x02182db4 mov r3, #0xa0 mov r2, #0x1e mov r1, #6 - ldr r0, _02182e98 ; =data_027e0f74 + ldr r0, _02182e98 ; =gAdventureFlags str r3, [sp, #0x10] strb r2, [sp, #0x15] strb r1, [sp, #0x16] @@ -8677,7 +8677,7 @@ _02182e80: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov32_02182db4 -_02182e98: .word data_027e0f74 +_02182e98: .word gAdventureFlags _02182e9c: .word data_027e0ffc .global func_ov32_02182ea0 diff --git a/asm/ov34.inc b/asm/ov34.inc index f6c8bdb9..8d20373a 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -13,7 +13,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f94 .extern data_027e0fc8 .extern data_027e0fe0 diff --git a/asm/ov34.s b/asm/ov34.s index ef9da509..2958d034 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -900,7 +900,7 @@ func_ov34_0217c920: ; 0x0217c920 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} _0217c950: - ldr r0, _0217cde8 ; =data_027e0f74 + ldr r0, _0217cde8 ; =gAdventureFlags mov r1, #0xd ldr r0, [r0] bl func_ov00_02097c18 @@ -1205,7 +1205,7 @@ _0217cd8c: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov34_0217c920 -_0217cde8: .word data_027e0f74 +_0217cde8: .word gAdventureFlags _0217cdec: .word 0x00001e66 _0217cdf0: .word data_027e0d0c _0217cdf4: .word data_ov34_021861a0 @@ -7544,7 +7544,7 @@ _02182814: ldr r1, [r1, #0x54] cmp r1, r0 bne _02182848 - ldr r0, _02182afc ; =data_027e0f74 + ldr r0, _02182afc ; =gAdventureFlags mov r1, #0xd ldr r0, [r0] bl func_ov00_02097968 @@ -7729,7 +7729,7 @@ _02182aec: .word 0x00003b33 _02182af0: .word 0x00001003 _02182af4: .word data_027e0e58 _02182af8: .word data_ov34_021861a0 -_02182afc: .word data_027e0f74 +_02182afc: .word gAdventureFlags _02182b00: .word 0x00001005 _02182b04: .word 0x00001006 _02182b08: .word 0x00001004 diff --git a/asm/ov35.inc b/asm/ov35.inc index 5fff4ad2..b0f7ac0b 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -80,7 +80,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac diff --git a/asm/ov35.s b/asm/ov35.s index 5014a89e..29338c22 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -3424,7 +3424,7 @@ _0217eb50: ldr r0, [r0, #8] add r3, sp, #0x30 bl func_ov00_020888e8 - ldr r0, _0217ebb0 ; =data_027e0f74 + ldr r0, _0217ebb0 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -3440,7 +3440,7 @@ _0217eb94: arm_func_end func_ov35_0217e9ec _0217eba8: .word data_027e0f64 _0217ebac: .word 0x00001e94 -_0217ebb0: .word data_027e0f74 +_0217ebb0: .word gAdventureFlags .global func_ov35_0217ebb4 arm_func_start func_ov35_0217ebb4 @@ -3595,7 +3595,7 @@ func_ov35_0217ed90: ; 0x0217ed90 movne r0, #0 ldmneia sp!, {r3, r4, pc} _0217edc0: - ldr r0, _0217f044 ; =data_027e0f74 + ldr r0, _0217f044 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] bl func_ov00_02097760 @@ -3761,7 +3761,7 @@ _0217ef90: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov35_0217ed90 -_0217f044: .word data_027e0f74 +_0217f044: .word gAdventureFlags _0217f048: .word 0x00001333 _0217f04c: .word data_027e0fe8 _0217f050: .word 0x52594453 @@ -4067,7 +4067,7 @@ _0217f2f8: ldr r8, [sp, #0x434] str r1, [sp, #0x4b4] ldr r1, [sp, #0x438] - ldr r0, _021800a4 ; =data_027e0f74 + ldr r0, _021800a4 ; =gAdventureFlags str ip, [sp, #0x4b8] ldr ip, [sp, #0x43c] str fp, [sp, #0x4bc] @@ -4655,7 +4655,7 @@ _0217fd30: ldr r2, [sp, #0x320] str r1, [sp, #0x3a0] ldr r1, [sp, #0x324] - ldr r0, _021800a4 ; =data_027e0f74 + ldr r0, _021800a4 ; =gAdventureFlags str ip, [sp, #0x3a4] ldr ip, [sp, #0x328] str fp, [sp, #0x3a8] @@ -4787,7 +4787,7 @@ _0217fee0: str r1, [sp, #0x50] bl func_ov00_0209a4f4 mov r1, #3 - ldr r0, _021800a4 ; =data_027e0f74 + ldr r0, _021800a4 ; =gAdventureFlags mvn r2, #0 str r2, [sp, #0x244] mov r2, #0x32 @@ -4861,7 +4861,7 @@ _02180084: .align 2, 0 arm_func_end func_ov35_0217f234 _021800a0: .word data_027e0f64 -_021800a4: .word data_027e0f74 +_021800a4: .word gAdventureFlags _021800a8: .word data_027e0c68 _021800ac: .word data_027e0fc8 _021800b0: .word data_027e071c @@ -5015,7 +5015,7 @@ _0218010c: add r0, r0, r3 str r0, [r4, #0x50c] str r1, [r4, #0x510] - ldr r0, _021800a4 ; =data_027e0f74 + ldr r0, _021800a4 ; =gAdventureFlags str r2, [r4, #0x514] ldr r0, [r0] add r1, sp, #0x190 @@ -5289,7 +5289,7 @@ _021805ac: ldr sb, [sp, #0xa4] ldr r2, [sp, #0xa8] ldr r1, [sp, #0xac] - ldr r0, _021800a4 ; =data_027e0f74 + ldr r0, _021800a4 ; =gAdventureFlags ldr ip, [sp, #0xb0] ldr fp, [sp, #0xb4] ldr sl, [sp, #0xb8] @@ -5587,7 +5587,7 @@ _02180b64: .word data_027e0fc8 arm_func_start func_ov35_02180b68 func_ov35_02180b68: ; 0x02180b68 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _02180bb0 ; =data_027e0f74 + ldr r2, _02180bb0 ; =gAdventureFlags mov r5, r0 mov r4, r1 ldr r0, [r2] @@ -5607,7 +5607,7 @@ _02180b98: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov35_02180b68 -_02180bb0: .word data_027e0f74 +_02180bb0: .word gAdventureFlags .global func_ov35_02180bb4 arm_func_start func_ov35_02180bb4 @@ -5650,7 +5650,7 @@ func_ov35_02180bf0: ; 0x02180bf0 arm_func_start func_ov35_02180c18 func_ov35_02180c18: ; 0x02180c18 stmdb sp!, {r4, lr} - ldr r1, _02180c48 ; =data_027e0f74 + ldr r1, _02180c48 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x544] @@ -5663,7 +5663,7 @@ func_ov35_02180c18: ; 0x02180c18 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov35_02180c18 -_02180c48: .word data_027e0f74 +_02180c48: .word gAdventureFlags .global func_ov35_02180c4c arm_func_start func_ov35_02180c4c @@ -6064,13 +6064,13 @@ _021811b4: cmp r0, #0 addne sp, sp, #0x10 ldmneia sp!, {r4, pc} - ldr r0, _02181268 ; =data_027e0f74 + ldr r0, _02181268 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021811f0 - ldr r0, _02181268 ; =data_027e0f74 + ldr r0, _02181268 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] bl func_ov00_02097bcc @@ -6107,7 +6107,7 @@ _021811f0: arm_func_end func_ov35_021810bc _02181260: .word data_027e0f64 _02181264: .word data_027e071c -_02181268: .word data_027e0f74 +_02181268: .word gAdventureFlags _0218126c: .word data_027e0fc8 _02181270: .word data_ov35_02185c70 _02181274: .word data_ov35_02185ce0 @@ -6581,13 +6581,13 @@ func_ov35_0218187c: ; 0x0218187c bl func_0202e58c cmp r0, #0 ldmeqia sp!, {r4, r5, r6, pc} - ldr r0, _02181988 ; =data_027e0f74 + ldr r0, _02181988 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021818ec - ldr r0, _02181988 ; =data_027e0f74 + ldr r0, _02181988 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] bl func_ov00_02097bcc @@ -6633,7 +6633,7 @@ _021818ec: .align 2, 0 arm_func_end func_ov35_0218187c _02181984: .word data_027e0c54 -_02181988: .word data_027e0f74 +_02181988: .word gAdventureFlags _0218198c: .word data_02050f54 _02181990: .word 0xffffe4cd @@ -6733,13 +6733,13 @@ _02181ad0: cmp r0, #0 addne sp, sp, #0x14 ldmneia sp!, {r3, r4, pc} - ldr r0, _02181b50 ; =data_027e0f74 + ldr r0, _02181b50 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02181b24 - ldr r0, _02181b50 ; =data_027e0f74 + ldr r0, _02181b50 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] bl func_ov00_02097bcc @@ -6757,7 +6757,7 @@ _02181b40: .word data_027e0ffc _02181b44: .word data_027e0c54 _02181b48: .word func_ov35_0217e9ec _02181b4c: .word data_027e0f64 -_02181b50: .word data_027e0f74 +_02181b50: .word gAdventureFlags .global func_ov35_02181b54 arm_func_start func_ov35_02181b54 @@ -7114,13 +7114,13 @@ _02182038: cmp r0, #0 addeq sp, sp, #0x8c ldmeqia sp!, {r4, r5, pc} - ldr r0, _021820a4 ; =data_027e0f74 + ldr r0, _021820a4 ; =gAdventureFlags ldr r1, [r5, #0x544] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02182078 - ldr r0, _021820a4 ; =data_027e0f74 + ldr r0, _021820a4 ; =gAdventureFlags ldr r1, [r5, #0x544] ldr r0, [r0] bl func_ov00_02097bcc @@ -7138,7 +7138,7 @@ _02182094: .word 0x00001333 _02182098: .word data_ov35_02185c70 _0218209c: .word data_ov35_02185cd0 _021820a0: .word data_027e0f64 -_021820a4: .word data_027e0f74 +_021820a4: .word gAdventureFlags .global func_ov35_021820a8 arm_func_start func_ov35_021820a8 @@ -7701,7 +7701,7 @@ _02182830: .word data_027e0fc8 func_ov35_02182834: ; 0x02182834 stmdb sp!, {r4, lr} sub sp, sp, #0x18 - ldr r1, _02182938 ; =data_027e0f74 + ldr r1, _02182938 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x1f @@ -7737,19 +7737,19 @@ func_ov35_02182834: ; 0x02182834 cmp r0, #0x3c addlt sp, sp, #0x18 ldmltia sp!, {r4, pc} - ldr r0, _02182938 ; =data_027e0f74 + ldr r0, _02182938 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _021828f4 - ldr r0, _02182938 ; =data_027e0f74 + ldr r0, _02182938 ; =gAdventureFlags ldr r1, [r4, #0x544] ldr r0, [r0] bl func_ov00_02097bcc _021828f4: mvn r1, #0 - ldr r0, _02182938 ; =data_027e0f74 + ldr r0, _02182938 ; =gAdventureFlags str r1, [r4, #0x544] ldr r0, [r0] mov r1, #0x1f @@ -7759,7 +7759,7 @@ _021828f4: mov r1, #0x1d ldr r0, [r0] blx _ZN11ItemManager7AddItemEi - ldr r0, _02182938 ; =data_027e0f74 + ldr r0, _02182938 ; =gAdventureFlags mov r1, #8 ldr r0, [r0] bl func_ov00_02097968 @@ -7767,7 +7767,7 @@ _021828f4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov35_02182834 -_02182938: .word data_027e0f74 +_02182938: .word gAdventureFlags _0218293c: .word 0x0000099a _02182940: .word data_027e0e58 _02182944: .word gItemManager diff --git a/asm/ov36.inc b/asm/ov36.inc index 796b9c0a..baa4a373 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -18,7 +18,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fa0 diff --git a/asm/ov36.s b/asm/ov36.s index df7ef8c9..2df1606b 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -1609,7 +1609,7 @@ func_ov36_0217d294: ; 0x0217d294 func_ov36_0217d2a0: ; 0x0217d2a0 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x70 - ldr r1, _0217d680 ; =data_027e0f74 + ldr r1, _0217d680 ; =gAdventureFlags mov r5, r0 ldr r0, [r1] mov r1, #0x7e @@ -1618,7 +1618,7 @@ func_ov36_0217d2a0: ; 0x0217d2a0 addne sp, sp, #0x70 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _0217d680 ; =data_027e0f74 + ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xe ldr r0, [r0] bl func_ov00_02097c18 @@ -1699,19 +1699,19 @@ _0217d368: str r0, [r5, #0xb4] add r1, r6, #0x800 str r1, [r5, #0x860] - ldr r0, _0217d680 ; =data_027e0f74 + ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xeb ldr r0, [r0] str lr, [sp, #0x38] str ip, [sp, #0x3c] str r3, [sp, #0x40] bl func_ov00_0209779c - ldr r0, _0217d680 ; =data_027e0f74 + ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xec ldr r0, [r0] mov r2, #0 bl func_ov00_0209779c - ldr r0, _0217d680 ; =data_027e0f74 + ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xed ldr r0, [r0] mov r2, #0 @@ -1836,17 +1836,17 @@ _0217d56c: mov r2, #3 mov r3, #0 bl func_ov00_02084b38 - ldr r0, _0217d680 ; =data_027e0f74 + ldr r0, _0217d680 ; =gAdventureFlags mov r1, #0xeb ldr r0, [r0] mov r2, #0 bl func_ov00_0209779c - ldr r0, _0217d680 ; =data_027e0f74 + ldr r0, _0217d680 ; =gAdventureFlags ldr r1, _0217d6b4 ; =0x0000011e ldr r0, [r0] mov r2, #0 bl func_ov00_0209779c - ldr r0, _0217d680 ; =data_027e0f74 + ldr r0, _0217d680 ; =gAdventureFlags ldr r1, _0217d6b8 ; =0x0000011f ldr r0, [r0] mov r2, #0 @@ -1859,7 +1859,7 @@ _0217d56c: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 arm_func_end func_ov36_0217d2a0 -_0217d680: .word data_027e0f74 +_0217d680: .word gAdventureFlags _0217d684: .word data_027e0fe8 _0217d688: .word 0x4c4f4e44 _0217d68c: .word data_027e0fe4 @@ -2120,7 +2120,7 @@ func_ov36_0217da08: ; 0x0217da08 ldmneia sp!, {r4, pc} tst r0, #1 bne _0217da58 - ldr r0, _0217da68 ; =data_027e0f74 + ldr r0, _0217da68 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c @@ -2140,7 +2140,7 @@ _0217da60: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov36_0217da08 -_0217da68: .word data_027e0f74 +_0217da68: .word gAdventureFlags .global func_ov36_0217da6c arm_func_start func_ov36_0217da6c @@ -2701,13 +2701,13 @@ _0217e260: cmp r0, #0x1000000 addne sp, sp, #0x44 ldmneia sp!, {r3, r4, r5, r6, pc} - ldr r0, _0217e3d0 ; =data_027e0f74 + ldr r0, _0217e3d0 ; =gAdventureFlags ldr r1, [r5, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0217e2a4 - ldr r0, _0217e3d0 ; =data_027e0f74 + ldr r0, _0217e3d0 ; =gAdventureFlags ldr r1, [r5, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -2792,7 +2792,7 @@ _0217e3c0: .word data_027e0f64 _0217e3c4: .word 0x00000112 _0217e3c8: .word data_027e0ffc _0217e3cc: .word 0x000002c2 -_0217e3d0: .word data_027e0f74 +_0217e3d0: .word gAdventureFlags _0217e3d4: .word data_027e0fe4 _0217e3d8: .word 0x504c444d _0217e3dc: .word 0x0000199a @@ -5469,7 +5469,7 @@ _02180860: mov r2, #2 strb r2, [sp, #0x2e] ldr r1, [r1] - ldr r0, _0218099c ; =data_027e0f74 + ldr r0, _0218099c ; =gAdventureFlags ldr r4, [r1, #4] ldr r0, [r0] ldr r1, [r4, #0x26c] @@ -5520,7 +5520,7 @@ _0218098c: .word data_02050f54 _02180990: .word 0x000004cd _02180994: .word data_027e0e60 _02180998: .word data_027e0f64 -_0218099c: .word data_027e0f74 +_0218099c: .word gAdventureFlags _021809a0: .word data_027e0c68 _021809a4: .word 0x0069032e _021809a8: .word data_027e0ffc @@ -5705,13 +5705,13 @@ _02180bd0: ldr r3, [r3, #0x7c] blx r3 _02180c58: - ldr r0, _02180d18 ; =data_027e0f74 + ldr r0, _02180d18 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02180c80 - ldr r0, _02180d18 ; =data_027e0f74 + ldr r0, _02180d18 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -5760,7 +5760,7 @@ _02180d08: .word data_027e0ffc _02180d0c: .word 0x000002c7 _02180d10: .word 0x000002c1 _02180d14: .word data_027e0fc8 -_02180d18: .word data_027e0f74 +_02180d18: .word gAdventureFlags .global func_ov36_02180d1c arm_func_start func_ov36_02180d1c @@ -6032,13 +6032,13 @@ _021810d0: bl func_0202e58c cmp r0, #0 beq _02181128 - ldr r0, _02181540 ; =data_027e0f74 + ldr r0, _02181540 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0218110c - ldr r0, _02181540 ; =data_027e0f74 + ldr r0, _02181540 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -6070,13 +6070,13 @@ _02181138: cmp r0, #1 bhi _021811a4 _0218116c: - ldr r0, _02181540 ; =data_027e0f74 + ldr r0, _02181540 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02181194 - ldr r0, _02181540 ; =data_027e0f74 + ldr r0, _02181540 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -6223,7 +6223,7 @@ _021811a4: ldrb r3, [sp, #0x63] ldrb r2, [sp, #0x64] str r0, [sp, #0xe0] - ldr r0, _02181540 ; =data_027e0f74 + ldr r0, _02181540 ; =gAdventureFlags str r1, [sp, #0xc4] ldr r1, [sp, #0x48] str sb, [sp, #0xcc] @@ -6325,7 +6325,7 @@ _021814ec: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov36_0218108c -_02181540: .word data_027e0f74 +_02181540: .word gAdventureFlags _02181544: .word gItemManager _02181548: .word data_027e0f64 _0218154c: .word 0x000004cd @@ -6443,7 +6443,7 @@ _0218166c: ldrb r3, [sp, #0x63] ldrb r2, [sp, #0x64] str r0, [sp, #0xdc] - ldr r0, _0218178c ; =data_027e0f74 + ldr r0, _0218178c ; =gAdventureFlags str r1, [sp, #0xbc] ldr r1, [sp, #0x44] str sl, [sp, #0xc4] @@ -6482,7 +6482,7 @@ _0218166c: arm_func_end func_ov36_0218156c _02181784: .word data_ov36_02186cdc _02181788: .word data_027e0f64 -_0218178c: .word data_027e0f74 +_0218178c: .word gAdventureFlags .global func_ov36_02181790 arm_func_start func_ov36_02181790 @@ -6496,7 +6496,7 @@ func_ov36_02181790: ; 0x02181790 add r0, r4, #0x158 bl func_ov36_0217c7e8 _021817b0: - ldr r0, _021818a4 ; =data_027e0f74 + ldr r0, _021818a4 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c @@ -6519,13 +6519,13 @@ _021817f4: bl func_0202e58c cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _021818a4 ; =data_027e0f74 + ldr r0, _021818a4 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02181830 - ldr r0, _021818a4 ; =data_027e0f74 + ldr r0, _021818a4 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -6562,7 +6562,7 @@ _02181848: .align 2, 0 arm_func_end func_ov36_02181790 _021818a0: .word data_ov36_02186ce0 -_021818a4: .word data_027e0f74 +_021818a4: .word gAdventureFlags _021818a8: .word data_027e0ffc _021818ac: .word 0x000002c6 _021818b0: .word data_027e0f64 @@ -6609,7 +6609,7 @@ _021818fc: moveq r1, #0x19 add r0, r4, #0x158 bl func_ov36_0217ca34 - ldr r0, _02181b88 ; =data_027e0f74 + ldr r0, _02181b88 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -6695,7 +6695,7 @@ _021818fc: ldrb r3, [sp, #0x63] ldrb r2, [sp, #0x64] str r0, [sp, #0xdc] - ldr r0, _02181b88 ; =data_027e0f74 + ldr r0, _02181b88 ; =gAdventureFlags ldr r1, [sp, #0x44] ldr sl, [sp, #0x4c] ldr sb, [sp, #0x50] @@ -6756,7 +6756,7 @@ _02181b40: arm_func_end func_ov36_021818b4 _02181b80: .word data_027e103c _02181b84: .word data_027e0d0c -_02181b88: .word data_027e0f74 +_02181b88: .word gAdventureFlags _02181b8c: .word data_ov00_020eec68 _02181b90: .word data_027e0f64 _02181b94: .word 0x0000038e @@ -6778,7 +6778,7 @@ func_ov36_02181ba8: ; 0x02181ba8 ldr r0, [r1, #0x10] cmp r0, #0 bne _02181c58 - ldr r0, _02181f08 ; =data_027e0f74 + ldr r0, _02181f08 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_0209809c cmp r0, #0 @@ -6938,7 +6938,7 @@ _02181dc8: add sp, sp, #0x14 ldmia sp!, {r3, r4, pc} _02181e34: - ldr r0, _02181f08 ; =data_027e0f74 + ldr r0, _02181f08 ; =gAdventureFlags ldr r1, _02181f34 ; =0x0000011e ldr r0, [r0] bl func_ov00_02097760 @@ -6956,12 +6956,12 @@ _02181e34: ldr r0, [r0] mov r2, #0 bl func_ov00_0207c5d4 - ldr r0, _02181f08 ; =data_027e0f74 + ldr r0, _02181f08 ; =gAdventureFlags ldr r1, _02181f34 ; =0x0000011e ldr r0, [r0] mov r2, #1 bl func_ov00_0209779c - ldr r0, _02181f08 ; =data_027e0f74 + ldr r0, _02181f08 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -6993,7 +6993,7 @@ _02181e34: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov36_02181ba8 -_02181f08: .word data_027e0f74 +_02181f08: .word gAdventureFlags _02181f0c: .word data_027e0ffc _02181f10: .word 0x000002cb _02181f14: .word 0x000001ad @@ -7166,7 +7166,7 @@ _02181ffc: ldr r0, [r4, #0x758] str r0, [sp, #0x1b0] ldr r1, [r4, #0x75c] - ldr r0, _02182948 ; =data_027e0f74 + ldr r0, _02182948 ; =gAdventureFlags str r1, [sp, #0x1b4] ldr r1, [r4, #0x760] ldr r0, [r0] @@ -7224,7 +7224,7 @@ _02181ffc: add r0, sp, #0x178 bl func_ov00_0209a508 _02182270: - ldr r0, _02182948 ; =data_027e0f74 + ldr r0, _02182948 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c @@ -7338,7 +7338,7 @@ _021823ec: strb r0, [r4, #0x8aa] mov r0, #0 str r0, [r4, #0x138] - ldr r0, _02182948 ; =data_027e0f74 + ldr r0, _02182948 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -7416,7 +7416,7 @@ _0218248c: ldrb r8, [sp, #0xc2] ldrb r7, [sp, #0xc3] ldrb r6, [sp, #0xc4] - ldr r0, _02182948 ; =data_027e0f74 + ldr r0, _02182948 ; =gAdventureFlags str r5, [sp, #0x144] ldr r5, [sp, #0xb8] str r1, [sp, #0x148] @@ -7634,7 +7634,7 @@ _0218287c: cmp r0, #0 addeq sp, sp, #0x228 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - ldr r0, _02182948 ; =data_027e0f74 + ldr r0, _02182948 ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -7684,7 +7684,7 @@ _02182940: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 arm_func_end func_ov36_02181fd0 -_02182948: .word data_027e0f74 +_02182948: .word gAdventureFlags _0218294c: .word data_027e0f90 _02182950: .word 0x00000bb8 _02182954: .word data_027e0f64 @@ -7757,13 +7757,13 @@ _021829ec: bic r2, r2, #0x200000 str r2, [r4, #0x878] bl func_ov36_0217ca34 - ldr r0, _02182c7c ; =data_027e0f74 + ldr r0, _02182c7c ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02182a7c - ldr r0, _02182c7c ; =data_027e0f74 + ldr r0, _02182c7c ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -7858,7 +7858,7 @@ _02182a7c: ldrb lr, [sp, #0x6e] ldrb ip, [sp, #0x6f] ldrb r3, [sp, #0x70] - ldr r0, _02182c7c ; =data_027e0f74 + ldr r0, _02182c7c ; =gAdventureFlags ldr sl, [sp, #0x5c] ldr sb, [sp, #0x60] ldr r8, [sp, #0x64] @@ -7898,7 +7898,7 @@ _02182c6c: .word data_027e0ffc _02182c70: .word data_027e0fc8 _02182c74: .word data_ov00_020eec68 _02182c78: .word data_027e0d0c -_02182c7c: .word data_027e0f74 +_02182c7c: .word gAdventureFlags _02182c80: .word 0x0000038e _02182c84: .word 0x00000dac @@ -8146,19 +8146,19 @@ func_ov36_02182f88: ; 0x02182f88 cmp r0, #0x3c addlt sp, sp, #0x18 ldmltia sp!, {r4, pc} - ldr r0, _0218306c ; =data_027e0f74 + ldr r0, _0218306c ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _02183030 - ldr r0, _0218306c ; =data_027e0f74 + ldr r0, _0218306c ; =gAdventureFlags ldr r1, [r4, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc _02183030: mvn r1, #0 - ldr r0, _0218306c ; =data_027e0f74 + ldr r0, _0218306c ; =gAdventureFlags str r1, [r4, #0x66c] ldr r0, [r0] mov r1, #0xe @@ -8174,7 +8174,7 @@ _02183030: arm_func_end func_ov36_02182f88 _02183064: .word 0x0000099a _02183068: .word data_027e0e58 -_0218306c: .word data_027e0f74 +_0218306c: .word gAdventureFlags .global func_ov36_02183070 arm_func_start func_ov36_02183070 @@ -8727,7 +8727,7 @@ _02183614: ldrb r3, [sp, #0x97] ldrb r2, [sp, #0x98] str r0, [sp, #0x118] - ldr r0, _02183a24 ; =data_027e0f74 + ldr r0, _02183a24 ; =gAdventureFlags str r1, [sp, #0x100] ldr r1, [sp, #0x80] str sb, [sp, #0x108] @@ -8845,7 +8845,7 @@ _02183a14: .word data_027e0f64 _02183a18: .word 0x000004cd _02183a1c: .word 0x00001e84 _02183a20: .word 0x0000038e -_02183a24: .word data_027e0f74 +_02183a24: .word gAdventureFlags _02183a28: .word 0x00000333 .global func_ov36_02183a2c @@ -10016,7 +10016,7 @@ _02184a5c: func_ov36_02184a64: ; 0x02184a64 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x118 - ldr r2, _02184dd8 ; =data_027e0f74 + ldr r2, _02184dd8 ; =gAdventureFlags mov r5, r0 mov r6, r1 ldr r0, [r2] @@ -10024,7 +10024,7 @@ func_ov36_02184a64: ; 0x02184a64 bl func_ov00_02097b9c cmp r0, #0 beq _02184a9c - ldr r0, _02184dd8 ; =data_027e0f74 + ldr r0, _02184dd8 ; =gAdventureFlags ldr r1, [r5, #0x66c] ldr r0, [r0] bl func_ov00_02097bcc @@ -10211,7 +10211,7 @@ _02184c94: ldr r8, [sp, #0x58] ldr r4, [sp, #0x5c] str r1, [sp, #0xdc] - ldr fp, _02184dd8 ; =data_027e0f74 + ldr fp, _02184dd8 ; =gAdventureFlags str r0, [sp, #0xe0] ldr r0, [fp] add r1, sp, #0x68 @@ -10243,7 +10243,7 @@ _02184dc8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_ov36_02184a64 -_02184dd8: .word data_027e0f74 +_02184dd8: .word gAdventureFlags _02184ddc: .word data_027e0f64 _02184de0: .word data_027e0e60 _02184de4: .word 0x0000038e diff --git a/asm/ov37.inc b/asm/ov37.inc index 578c9bf9..2c27631f 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -75,7 +75,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fa0 diff --git a/asm/ov37.s b/asm/ov37.s index edf2df65..95cff6cd 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -3662,7 +3662,7 @@ _0217f0ac: add r0, r4, #0x3bc add r0, r0, #0x2c00 bl func_ov00_020b7e6c - ldr r0, _0217f11c ; =data_027e0f74 + ldr r0, _0217f11c ; =gAdventureFlags mov r1, #0xf ldr r0, [r0] bl func_ov00_02097968 @@ -3685,7 +3685,7 @@ _0217f10c: .word 0x00001023 _0217f110: .word 0x00001024 _0217f114: .word 0x00001025 _0217f118: .word 0x0000030d -_0217f11c: .word data_027e0f74 +_0217f11c: .word gAdventureFlags .global func_ov37_0217f120 arm_func_start func_ov37_0217f120 diff --git a/asm/ov38.inc b/asm/ov38.inc index 0d787ac3..bc28a18e 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -18,7 +18,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f94 .extern data_027e0fc8 .extern data_027e0fe0 diff --git a/asm/ov38.s b/asm/ov38.s index 7a573657..092df813 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -1346,7 +1346,7 @@ func_ov38_0217cf90: ; 0x0217cf90 ldr r1, _0217d504 ; =gItemManager mov r2, #0 ldr r3, [r1] - ldr r1, _0217d508 ; =data_027e0f74 + ldr r1, _0217d508 ; =gAdventureFlags strh r2, [r3, #0xba] mov sl, r0 ldr r0, [r1] @@ -1354,7 +1354,7 @@ func_ov38_0217cf90: ; 0x0217cf90 bl func_ov00_02097760 cmp r0, #0 bne _0217cfdc - ldr r0, _0217d508 ; =data_027e0f74 + ldr r0, _0217d508 ; =gAdventureFlags mov r1, #0x11 ldr r0, [r0] bl func_ov00_02097c18 @@ -1697,7 +1697,7 @@ _0217d360: .align 2, 0 arm_func_end func_ov38_0217cf90 _0217d504: .word gItemManager -_0217d508: .word data_027e0f74 +_0217d508: .word gAdventureFlags _0217d50c: .word data_ov38_021889b8 _0217d510: .word func_ov38_0217cc2c _0217d514: .word data_ov38_02188a24 @@ -8893,7 +8893,7 @@ func_ov38_02183aa4: ; 0x02183aa4 mvn r0, #0 cmp r1, r0 beq _02183ae0 - ldr r0, _02183b5c ; =data_027e0f74 + ldr r0, _02183b5c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 @@ -8903,7 +8903,7 @@ _02183ae0: mvn r0, #0 cmp r1, r0 beq _02183b48 - ldr r0, _02183b5c ; =data_027e0f74 + ldr r0, _02183b5c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 @@ -8935,7 +8935,7 @@ _02183b48: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov38_02183aa4 -_02183b5c: .word data_027e0f74 +_02183b5c: .word gAdventureFlags .global func_ov38_02183b60 arm_func_start func_ov38_02183b60 @@ -11442,7 +11442,7 @@ func_ov38_02185e38: ; 0x02185e38 str r2, [r1, #0x210] bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02185eb4 ; =data_027e0f74 + ldr r0, _02185eb4 ; =gAdventureFlags mvn ip, #0 mov r3, #0x32 ldr r0, [r0] @@ -11465,7 +11465,7 @@ func_ov38_02185e38: ; 0x02185e38 .align 2, 0 arm_func_end func_ov38_02185e38 _02185eb0: .word data_ov38_021891e0 -_02185eb4: .word data_027e0f74 +_02185eb4: .word gAdventureFlags _02185eb8: .word data_ov38_02188ca0 .global func_ov38_02185ebc @@ -11609,7 +11609,7 @@ _02185f5c: ldr r0, [r2, #0x1d4] str r0, [sp, #0x124] ldr r1, [r2, #0x1d8] - ldr r0, _02186a34 ; =data_027e0f74 + ldr r0, _02186a34 ; =gAdventureFlags str r1, [sp, #0x128] ldr r1, [r2, #0x1dc] ldr r0, [r0] @@ -11629,7 +11629,7 @@ _02185f5c: str r3, [sp, #0x138] bl func_ov00_02097810 str r0, [r4, #0x2ec] - ldr r0, _02186a34 ; =data_027e0f74 + ldr r0, _02186a34 ; =gAdventureFlags ldr r1, [r4, #0x2e8] ldr r0, [r0] bl func_ov00_02097bcc @@ -12204,7 +12204,7 @@ _021869a8: add sp, sp, #0x154 ldmia sp!, {r4, r5, pc} _021869dc: - ldr r0, _02186a34 ; =data_027e0f74 + ldr r0, _02186a34 ; =gAdventureFlags ldr r1, [r4, #0x2ec] ldr r0, [r0] bl func_ov00_02097bcc @@ -12228,7 +12228,7 @@ _02186a24: .word 0x00000333 _02186a28: .word data_027e0f64 _02186a2c: .word data_ov38_02189360 _02186a30: .word data_ov38_021893d4 -_02186a34: .word data_027e0f74 +_02186a34: .word gAdventureFlags _02186a38: .word data_ov38_021892f0 _02186a3c: .word data_02050f54 _02186a40: .word 0x00000f9a @@ -12368,7 +12368,7 @@ func_ov38_02186b08: ; 0x02186b08 mov r1, #0xce mov r2, #0 bl func_ov00_020d70a4 - ldr r0, _02186c80 ; =data_027e0f74 + ldr r0, _02186c80 ; =gAdventureFlags add r1, sp, #0x14 ldr r0, [r0] bl func_ov00_02097810 @@ -12393,7 +12393,7 @@ _02186c70: .word data_027e0fc8 _02186c74: .word gItemManager _02186c78: .word data_ov38_02188ca0 _02186c7c: .word data_ov00_020eec68 -_02186c80: .word data_027e0f74 +_02186c80: .word gAdventureFlags .global func_ov38_02186c84 arm_func_start func_ov38_02186c84 @@ -12922,7 +12922,7 @@ _021873c8: add sp, sp, #0x8c ldmia sp!, {r4, r5, pc} _0218746c: - ldr r0, _02187510 ; =data_027e0f74 + ldr r0, _02187510 ; =gAdventureFlags ldr r1, [r4, #0x2e8] ldr r0, [r0] bl func_ov00_02097bcc @@ -12965,7 +12965,7 @@ _02187500: .word 0xfffffac4 _02187504: .word 0x000073a0 _02187508: .word data_027e0fc8 _0218750c: .word data_ov00_020eec68 -_02187510: .word data_027e0f74 +_02187510: .word gAdventureFlags _02187514: .word data_ov38_02188ca0 _02187518: .word gItemManager _0218751c: .word data_02057200 @@ -12983,7 +12983,7 @@ func_ov38_02187520: ; 0x02187520 str r2, [r1, #0x210] bl func_ov00_0209a4f4 mov r3, #0 - ldr r0, _021875c0 ; =data_027e0f74 + ldr r0, _021875c0 ; =gAdventureFlags mvn lr, #0 mov ip, #0x32 mov r2, #1 @@ -13015,7 +13015,7 @@ func_ov38_02187520: ; 0x02187520 .align 2, 0 arm_func_end func_ov38_02187520 _021875bc: .word data_ov38_021891e0 -_021875c0: .word data_027e0f74 +_021875c0: .word gAdventureFlags _021875c4: .word data_027e0f64 _021875c8: .word data_ov38_02188ca0 @@ -13027,7 +13027,7 @@ func_ov38_021875cc: ; 0x021875cc ldr r1, [r1, #0x130] cmp r1, #4 bne _021875f4 - ldr r2, _02187620 ; =data_027e0f74 + ldr r2, _02187620 ; =gAdventureFlags ldr r1, [r0, #0x2e8] ldr r0, [r2] bl func_ov00_02097bcc @@ -13046,7 +13046,7 @@ _021875f4: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov38_021875cc -_02187620: .word data_027e0f74 +_02187620: .word gAdventureFlags _02187624: .word data_ov38_021891e0 _02187628: .word data_027e0fc8 @@ -13191,7 +13191,7 @@ func_ov38_0218762c: ; 0x0218762c str r5, [r0, #0x1a0] str r1, [sp, #0xb0] ldr r1, [sp, #0x14] - ldr r3, _02187954 ; =data_027e0f74 + ldr r3, _02187954 ; =gAdventureFlags str r1, [sp, #0xb4] ldr r1, [sp, #0x18] str sb, [sp, #0x68] @@ -13257,7 +13257,7 @@ _02187944: .word data_ov38_021891e0 _02187948: .word data_027e0f64 _0218794c: .word data_ov38_02189360 _02187950: .word data_ov38_021893d4 -_02187954: .word data_027e0f74 +_02187954: .word gAdventureFlags _02187958: .word 0x00000bb8 _0218795c: .word data_027e0fc8 _02187960: .word data_ov38_02188ca0 @@ -13654,7 +13654,7 @@ _02187f44: ldr r0, [r0, #0x68] cmp r0, #4 bne _02187fac - ldr r0, _02188094 ; =data_027e0f74 + ldr r0, _02188094 ; =gAdventureFlags ldr r1, [r5, #0x2e8] ldr r0, [r0] bl func_ov00_02097bcc @@ -13663,14 +13663,14 @@ _02187f44: str r1, [r5, #0x2e8] ldr r2, [r0] ldr r1, [r0, #4] - ldr r0, _02188094 ; =data_027e0f74 + ldr r0, _02188094 ; =gAdventureFlags str r2, [r5, #0x2e0] str r1, [r5, #0x2e4] ldr r0, [r0] mov r1, #0xf7 mov r2, #1 bl func_ov00_0209779c - ldr r0, _02188094 ; =data_027e0f74 + ldr r0, _02188094 ; =gAdventureFlags mov r1, #0x11 ldr r0, [r0] bl func_ov00_02097968 @@ -13737,7 +13737,7 @@ _02188084: .word data_ov38_021893d4 _02188088: .word data_ov38_021892f8 _0218808c: .word 0x00001a2c _02188090: .word data_ov38_021893d8 -_02188094: .word data_027e0f74 +_02188094: .word gAdventureFlags _02188098: .word data_02057200 _0218809c: .word data_027e0f94 _021880a0: .word 0x00006ccd diff --git a/asm/ov39.inc b/asm/ov39.inc index c2e52b82..d4bfd401 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -72,7 +72,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac diff --git a/asm/ov39.s b/asm/ov39.s index d56e0dba..9d373280 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -4921,7 +4921,7 @@ _02180004: ldr r1, _02180f24 ; =data_027e0f64 mov r3, #0x32 mvn r4, #0 - ldr r0, _02180f28 ; =data_027e0f74 + ldr r0, _02180f28 ; =gAdventureFlags ldr r1, [r1] strb r3, [sp, #0x89] strb r2, [sp, #0x8a] @@ -5882,7 +5882,7 @@ _02180e94: cmp r0, #0 addne sp, sp, #0x130 ldmneia sp!, {r4, r5, r6, pc} - ldr r0, _02180f28 ; =data_027e0f74 + ldr r0, _02180f28 ; =gAdventureFlags ldr r1, [r5, #0x190] ldr r0, [r0] bl func_ov00_02097bcc @@ -5915,7 +5915,7 @@ _02180f14: _02180f1c: .word data_027e071c _02180f20: .word data_027e0fc8 _02180f24: .word data_027e0f64 -_02180f28: .word data_027e0f74 +_02180f28: .word gAdventureFlags _02180f2c: .word 0x00001b33 _02180f30: .word 0x00000b33 _02180f34: .word 0x00000666 @@ -7524,7 +7524,7 @@ func_ov39_021824b4: ; 0x021824b4 strb r1, [sp, #0x17] str r3, [sp, #0x10] ldr r3, [r0, #4] - ldr r0, _021825b8 ; =data_027e0f74 + ldr r0, _021825b8 ; =gAdventureFlags ldr r1, [r3, #0x26c] ldr r0, [r0] str r1, [sp, #0x2c] @@ -7550,7 +7550,7 @@ _021825a4: arm_func_end func_ov39_021824b4 _021825b0: .word data_027e0ffc _021825b4: .word data_027e0f64 -_021825b8: .word data_027e0f74 +_021825b8: .word gAdventureFlags .global func_ov39_021825bc arm_func_start func_ov39_021825bc @@ -7614,7 +7614,7 @@ _02182670: .word data_027e0e60 func_ov39_02182674: ; 0x02182674 stmdb sp!, {r3, r4, lr} sub sp, sp, #0xc - ldr r1, _021827a8 ; =data_027e0f74 + ldr r1, _021827a8 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x190] @@ -7628,7 +7628,7 @@ func_ov39_02182674: ; 0x02182674 cmp r0, #0 bne _021826e4 ldr r1, [r4, #0x158] - ldr r0, _021827a8 ; =data_027e0f74 + ldr r0, _021827a8 ; =gAdventureFlags orr r1, r1, #0x4000 str r1, [r4, #0x158] ldr r0, [r0] @@ -7693,7 +7693,7 @@ _0218273c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov39_02182674 -_021827a8: .word data_027e0f74 +_021827a8: .word gAdventureFlags _021827ac: .word data_ov29_0217bd28 .global func_ov39_021827b0 @@ -8618,7 +8618,7 @@ func_ov39_021833a4: ; 0x021833a4 str r0, [sp, #0x28] ldr r0, [r3, #4] bl func_ov00_02087d34 - ldr r0, _02183520 ; =data_027e0f74 + ldr r0, _02183520 ; =gAdventureFlags mov r2, #1 ldr r0, [r0] add r1, sp, #0 @@ -8643,7 +8643,7 @@ _02183510: .word 0x000006b8 _02183514: .word data_02050f54 _02183518: .word 0x00001022 _0218351c: .word data_027e0f64 -_02183520: .word data_027e0f74 +_02183520: .word gAdventureFlags _02183524: .word data_ov00_020eec68 .global func_ov39_02183528 @@ -8948,7 +8948,7 @@ func_ov39_021838c4: ; 0x021838c4 add r2, r4, #0x48 mov r3, #0 bl func_ov00_020ceacc - ldr r0, _02183c20 ; =data_027e0f74 + ldr r0, _02183c20 ; =gAdventureFlags ldr r1, [r4, #0x190] ldr r0, [r0] bl func_ov00_02097bcc @@ -9111,7 +9111,7 @@ func_ov39_021838c4: ; 0x021838c4 ldr r3, [sp] add r0, r0, #0x66 add r5, r0, #0xe00 - ldr r1, _02183c20 ; =data_027e0f74 + ldr r1, _02183c20 ; =gAdventureFlags ldr r2, [sp, #8] ldr r0, [r1] add r1, sp, #0x74 @@ -9135,7 +9135,7 @@ _02183c10: .word data_027e0ffc _02183c14: .word 0x00000321 _02183c18: .word data_027e0fc8 _02183c1c: .word 0x00000326 -_02183c20: .word data_027e0f74 +_02183c20: .word gAdventureFlags _02183c24: .word data_027e0f64 _02183c28: .word 0x000009c4 @@ -9230,7 +9230,7 @@ func_ov39_02183ccc: ; 0x02183ccc ldr r0, [r0] ldr r0, [r0, #8] bl func_ov00_020875f8 - ldr r0, _02184314 ; =data_027e0f74 + ldr r0, _02184314 ; =gAdventureFlags ldr r1, [r7, #0x190] ldr r0, [r0] bl func_ov00_02097bcc @@ -9322,7 +9322,7 @@ func_ov39_02183ccc: ; 0x02183ccc ldr r3, [sp, #0x38] add r0, r0, #0x66 add r4, r0, #0xe00 - ldr r1, _02184314 ; =data_027e0f74 + ldr r1, _02184314 ; =gAdventureFlags ldr r2, [sp, #0x40] ldr r0, [r1] add r1, sp, #0xac @@ -9596,7 +9596,7 @@ _02183f0c: arm_func_end func_ov39_02183ccc _0218430c: .word data_027e0f64 _02184310: .word 0x000009c4 -_02184314: .word data_027e0f74 +_02184314: .word gAdventureFlags _02184318: .word data_02050f54 _0218431c: .word data_027e071c _02184320: .word 0x000014cd @@ -10095,11 +10095,11 @@ _02184a48: cmp r0, #0xdc addne sp, sp, #0x38 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _02184ab0 ; =data_027e0f74 + ldr r0, _02184ab0 ; =gAdventureFlags ldr r1, [r4, #0x190] ldr r0, [r0] bl func_ov00_02097bcc - ldr r0, _02184ab0 ; =data_027e0f74 + ldr r0, _02184ab0 ; =gAdventureFlags mov r1, #0x13 ldr r0, [r0] bl func_ov00_02097968 @@ -10118,7 +10118,7 @@ _02184aa0: .word 0x00001015 _02184aa4: .word 0x00001016 _02184aa8: .word 0x00001017 _02184aac: .word 0x0000030d -_02184ab0: .word data_027e0f74 +_02184ab0: .word gAdventureFlags .global func_ov39_02184ab4 arm_func_start func_ov39_02184ab4 diff --git a/asm/ov40.inc b/asm/ov40.inc index 7e721f91..b7d31285 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -33,7 +33,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f80 .extern data_027e0f90 diff --git a/asm/ov40.s b/asm/ov40.s index 31b61711..4da86ba6 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -1131,7 +1131,7 @@ _0217ccdc: bl func_0201e50c ldmia sp!, {r4, pc} _0217cd00: - ldr r0, _0217cd20 ; =data_027e0f74 + ldr r0, _0217cd20 ; =gAdventureFlags ldr r1, [r4, #8] ldr r0, [r0] bl func_ov00_02097fd0 @@ -1141,7 +1141,7 @@ _0217cd00: .align 2, 0 arm_func_end func_ov40_0217ccb0 _0217cd1c: .word data_027e0fec -_0217cd20: .word data_027e0f74 +_0217cd20: .word gAdventureFlags .global func_ov40_0217cd24 arm_func_start func_ov40_0217cd24 @@ -1367,7 +1367,7 @@ _0217cff4: mov r6, r0 b _0217d040 _0217d024: - ldr r0, _0217d0ac ; =data_027e0f74 + ldr r0, _0217d0ac ; =gAdventureFlags ldr r1, [r4, #8] ldr r0, [r0] bl func_ov00_02097fd0 @@ -1404,7 +1404,7 @@ _0217d040: .align 2, 0 arm_func_end func_ov40_0217cfc4 _0217d0a8: .word data_027e0fec -_0217d0ac: .word data_027e0f74 +_0217d0ac: .word gAdventureFlags .global func_ov40_0217d0b0 arm_func_start func_ov40_0217d0b0 @@ -1435,7 +1435,7 @@ _0217d0e0: mov r4, r0 b _0217d12c _0217d110: - ldr r0, _0217d1a4 ; =data_027e0f74 + ldr r0, _0217d1a4 ; =gAdventureFlags ldr r1, [r5, #8] ldr r0, [r0] bl func_ov00_02097fd0 @@ -1477,7 +1477,7 @@ _0217d174: .align 2, 0 arm_func_end func_ov40_0217d0b0 _0217d1a0: .word data_027e0fec -_0217d1a4: .word data_027e0f74 +_0217d1a4: .word gAdventureFlags .global func_ov40_0217d1a8 arm_func_start func_ov40_0217d1a8 @@ -1508,7 +1508,7 @@ _0217d1d8: mov r4, r0 b _0217d224 _0217d208: - ldr r0, _0217d29c ; =data_027e0f74 + ldr r0, _0217d29c ; =gAdventureFlags ldr r1, [r5, #8] ldr r0, [r0] bl func_ov00_02097fd0 @@ -1550,7 +1550,7 @@ _0217d26c: .align 2, 0 arm_func_end func_ov40_0217d1a8 _0217d298: .word data_027e0fec -_0217d29c: .word data_027e0f74 +_0217d29c: .word gAdventureFlags .global func_ov40_0217d2a0 arm_func_start func_ov40_0217d2a0 @@ -4414,7 +4414,7 @@ _0217f54c: ; jump table b _0217f840 ; case 12 _0217f580: ldr r1, [r3] - ldr r0, _0217f854 ; =data_027e0f74 + ldr r0, _0217f854 ; =gAdventureFlags mov r1, r1, lsl #0x8 ldr r0, [r0] mov r1, r1, lsr #0x10 @@ -4463,7 +4463,7 @@ _0217f600: beq _0217f658 mov r3, #0 str r3, [sp] - ldr r0, _0217f854 ; =data_027e0f74 + ldr r0, _0217f854 ; =gAdventureFlags str r3, [sp, #4] ldr r0, [r0] mov r2, #0x64 @@ -4530,7 +4530,7 @@ _0217f6f0: mov r2, r3, lsl #0x11 mov r3, r0, lsl #0x11 mov r1, lr, lsl #0x11 - ldr r0, _0217f854 ; =data_027e0f74 + ldr r0, _0217f854 ; =gAdventureFlags str ip, [sp, #4] ldr r0, [r0] mov r1, r1, lsr #0x10 @@ -4559,7 +4559,7 @@ _0217f75c: mov r2, r3, lsl #0x11 mov r3, r0, lsl #0x11 mov r1, lr, lsl #0x11 - ldr r0, _0217f854 ; =data_027e0f74 + ldr r0, _0217f854 ; =gAdventureFlags str ip, [sp, #4] ldr r0, [r0] mov r1, r1, lsr #0x10 @@ -4569,7 +4569,7 @@ _0217f75c: add sp, sp, #8 ldmia sp!, {r3, pc} _0217f7cc: - ldr r0, _0217f854 ; =data_027e0f74 + ldr r0, _0217f854 ; =gAdventureFlags mov r1, #0 ldr r0, [r0] mov r3, r1 @@ -4578,7 +4578,7 @@ _0217f7cc: add sp, sp, #8 ldmia sp!, {r3, pc} _0217f7ec: - ldr r0, _0217f854 ; =data_027e0f74 + ldr r0, _0217f854 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -4587,7 +4587,7 @@ _0217f7ec: add sp, sp, #8 ldmia sp!, {r3, pc} _0217f80c: - ldr r0, _0217f854 ; =data_027e0f74 + ldr r0, _0217f854 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] mov r2, r1 @@ -4610,7 +4610,7 @@ _0217f84c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov40_0217f534 -_0217f854: .word data_027e0f74 +_0217f854: .word gAdventureFlags _0217f858: .word gItemManager _0217f85c: .word data_027e0d38 _0217f860: .word data_027e103c @@ -8527,7 +8527,7 @@ func_ov40_021827b0: ; 0x021827b0 mov r1, r0 cmp r1, r2 beq _021827e8 - ldr r0, _02182818 ; =data_027e0f74 + ldr r0, _02182818 ; =gAdventureFlags mov r2, #1 ldr r0, [r0] bl func_ov00_0209779c @@ -8547,7 +8547,7 @@ _02182804: .align 2, 0 arm_func_end func_ov40_021827b0 _02182814: .word 0x00000187 -_02182818: .word data_027e0f74 +_02182818: .word gAdventureFlags _0218281c: .word gItemManager .global func_ov40_02182820 @@ -8696,7 +8696,7 @@ func_ov40_02182980: ; 0x02182980 mov r3, #0x47 mov r4, #0 sub r2, r3, #0x49 - ldr r0, _02182a5c ; =data_027e0f74 + ldr r0, _02182a5c ; =gAdventureFlags mov r1, #0xff str r2, [sp, #0x14] str r3, [sp, #8] @@ -8721,7 +8721,7 @@ func_ov40_02182980: ; 0x02182980 beq _02182a3c mov r3, #0 str r3, [sp] - ldr r0, _02182a5c ; =data_027e0f74 + ldr r0, _02182a5c ; =gAdventureFlags str r3, [sp, #4] ldr r0, [r0] mov r2, #0x64 @@ -8739,7 +8739,7 @@ _02182a50: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov40_02182980 -_02182a5c: .word data_027e0f74 +_02182a5c: .word gAdventureFlags _02182a60: .word data_027e0d38 .global func_ov40_02182a64 @@ -9883,7 +9883,7 @@ func_ov40_021837ec: ; 0x021837ec beq _021838c8 cmp r1, #1 bne _02183890 - ldr r0, _02183a04 ; =data_027e0f74 + ldr r0, _02183a04 ; =gAdventureFlags ldr r1, [r5, #0x1c] ldr r0, [r0] bl func_ov00_02097fd0 @@ -9940,7 +9940,7 @@ _021838c8: beq _02183934 cmp r0, #1 bne _02183934 - ldr r0, _02183a04 ; =data_027e0f74 + ldr r0, _02183a04 ; =gAdventureFlags ldr r1, [r5, #0x34] ldr r0, [r0] bl func_ov00_02097fd0 @@ -9968,7 +9968,7 @@ _02183934: beq _02183990 cmp r0, #1 bne _02183990 - ldr r0, _02183a04 ; =data_027e0f74 + ldr r0, _02183a04 ; =gAdventureFlags ldr r1, [r5, #0x4c] ldr r0, [r0] bl func_ov00_02097fd0 @@ -9992,7 +9992,7 @@ _02183990: beq _021839ec cmp r0, #1 bne _021839ec - ldr r0, _02183a04 ; =data_027e0f74 + ldr r0, _02183a04 ; =gAdventureFlags ldr r1, [r5, #0x64] ldr r0, [r0] bl func_ov00_02097fd0 @@ -10019,7 +10019,7 @@ _021839ec: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov40_021837ec -_02183a04: .word data_027e0f74 +_02183a04: .word gAdventureFlags .global func_ov40_02183a08 arm_func_start func_ov40_02183a08 @@ -10524,7 +10524,7 @@ func_ov40_02184058: ; 0x02184058 mov r0, #0x1000 str r0, [r4, #0x88] ldr r1, [r4, #0x7c] - ldr r0, _02184174 ; =data_027e0f74 + ldr r0, _02184174 ; =gAdventureFlags str r1, [r4, #0x8c] ldr r1, [r4, #0x80] str r1, [r4, #0x90] @@ -10594,7 +10594,7 @@ _02184120: ldmia sp!, {r4, r5, pc} .align 2, 0 arm_func_end func_ov40_02184058 -_02184174: .word data_027e0f74 +_02184174: .word gAdventureFlags _02184178: .word data_ov40_021881e8 .global func_ov40_0218417c @@ -12523,7 +12523,7 @@ _021858f4: ldr r0, [r0] mov r1, #0xd bl func_ov00_02082650 - ldr r0, _02185b44 ; =data_027e0f74 + ldr r0, _02185b44 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097c08 sub r0, r0, #0x13 @@ -12605,7 +12605,7 @@ _02185a18: ldr r0, [r0] mov r1, #0xe bl func_ov00_02082650 - ldr r0, _02185b44 ; =data_027e0f74 + ldr r0, _02185b44 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097c08 sub r0, r0, #0x13 @@ -12685,7 +12685,7 @@ _02185b38: .align 2, 0 arm_func_end func_ov40_02185878 _02185b40: .word data_027e0e60 -_02185b44: .word data_027e0f74 +_02185b44: .word gAdventureFlags .global func_ov40_02185b48 arm_func_start func_ov40_02185b48 @@ -14007,7 +14007,7 @@ func_ov40_02186c44: ; 0x02186c44 stmdb sp!, {r3, lr} cmp r1, #0x8f bne _02186c7c - ldr r0, _02186c84 ; =data_027e0f74 + ldr r0, _02186c84 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097e6c cmp r0, #0 @@ -14015,7 +14015,7 @@ func_ov40_02186c44: ; 0x02186c44 ldr r0, _02186c88 ; =data_ov00_020eec9c mov r1, #4 bl func_ov00_020d77e4 - ldr r0, _02186c84 ; =data_027e0f74 + ldr r0, _02186c84 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097e7c _02186c7c: @@ -14023,7 +14023,7 @@ _02186c7c: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov40_02186c44 -_02186c84: .word data_027e0f74 +_02186c84: .word gAdventureFlags _02186c88: .word data_ov00_020eec9c .global func_ov40_02186c8c @@ -14310,12 +14310,12 @@ _02187058: bl func_ov40_02186f94 b _02187094 _02187068: - ldr r0, _021870a0 ; =data_027e0f74 + ldr r0, _021870a0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097e6c cmp r0, #0 beq _02187094 - ldr r0, _021870a0 ; =data_027e0f74 + ldr r0, _021870a0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097ea4 mov r0, r4 @@ -14327,7 +14327,7 @@ _02187094: .align 2, 0 arm_func_end func_ov40_02187004 _0218709c: .word data_027e05f8 -_021870a0: .word data_027e0f74 +_021870a0: .word gAdventureFlags .global func_ov40_021870a4 arm_func_start func_ov40_021870a4 @@ -14359,12 +14359,12 @@ _021870f8: bl func_ov40_02186f94 b _02187134 _02187108: - ldr r0, _02187140 ; =data_027e0f74 + ldr r0, _02187140 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097e6c cmp r0, #0 beq _02187134 - ldr r0, _02187140 ; =data_027e0f74 + ldr r0, _02187140 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097ea4 mov r0, r4 @@ -14376,7 +14376,7 @@ _02187134: .align 2, 0 arm_func_end func_ov40_021870a4 _0218713c: .word data_027e0d78 -_02187140: .word data_027e0f74 +_02187140: .word gAdventureFlags .global func_ov40_02187144 arm_func_start func_ov40_02187144 @@ -14656,7 +14656,7 @@ _02187464: cmp r0, #0 moveq r0, #0 streq r0, [sl, #0x804] - ldr r0, _02187550 ; =data_027e0f74 + ldr r0, _02187550 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097c08 cmp r0, #0x15 @@ -14712,7 +14712,7 @@ _021874c4: arm_func_end func_ov40_02187410 _02187548: .word gItemManager _0218754c: .word 0x91a2b3c5 -_02187550: .word data_027e0f74 +_02187550: .word gAdventureFlags _02187554: .word data_ov40_02188330 _02187558: .word data_ov40_02188300 @@ -14907,12 +14907,12 @@ func_ov40_02187788: ; 0x02187788 ldrh r0, [r0, #2] tst r0, #8 beq _021877e4 - ldr r0, _021877f0 ; =data_027e0f74 + ldr r0, _021877f0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097e6c cmp r0, #0 beq _021877e4 - ldr r0, _021877f0 ; =data_027e0f74 + ldr r0, _021877f0 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097ea4 mov r0, r4 @@ -14926,7 +14926,7 @@ _021877e4: .align 2, 0 arm_func_end func_ov40_02187788 _021877ec: .word data_027e05f8 -_021877f0: .word data_027e0f74 +_021877f0: .word gAdventureFlags .global func_ov40_021877f4 arm_func_start func_ov40_021877f4 @@ -14941,12 +14941,12 @@ func_ov40_021877f4: ; 0x021877f4 ldrh r0, [r0, #0x34] tst r0, #1 beq _02187850 - ldr r0, _0218785c ; =data_027e0f74 + ldr r0, _0218785c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097e6c cmp r0, #0 beq _02187850 - ldr r0, _0218785c ; =data_027e0f74 + ldr r0, _0218785c ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097ea4 mov r0, r4 @@ -14960,7 +14960,7 @@ _02187850: .align 2, 0 arm_func_end func_ov40_021877f4 _02187858: .word data_027e0d78 -_0218785c: .word data_027e0f74 +_0218785c: .word gAdventureFlags .global func_ov40_02187860 arm_func_start func_ov40_02187860 diff --git a/asm/ov41.inc b/asm/ov41.inc index 3f22ddeb..ffcad088 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -73,7 +73,7 @@ .extern data_027e0e60 .extern data_027e0f68 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f90 .extern data_027e0f94 diff --git a/asm/ov41.s b/asm/ov41.s index c30b9adb..6a875b0e 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -1973,7 +1973,7 @@ _0218ae0c: .word 0x00000329 arm_func_start func_ov41_0218ae10 func_ov41_0218ae10: ; 0x0218ae10 stmdb sp!, {r4, lr} - ldr r1, _0218af14 ; =data_027e0f74 + ldr r1, _0218af14 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #2 @@ -2054,7 +2054,7 @@ _0218af0c: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov41_0218ae10 -_0218af14: .word data_027e0f74 +_0218af14: .word gAdventureFlags _0218af18: .word 0x00640005 _0218af1c: .word 0x00640001 _0218af20: .word 0x00640097 @@ -2891,7 +2891,7 @@ _0218b9b4: bl _ZNK11ItemManager7HasItemEi cmp r0, #0 beq _0218ba48 - ldr r0, _0218be10 ; =data_027e0f74 + ldr r0, _0218be10 ; =gAdventureFlags mov r1, #2 ldr r0, [r0] bl func_ov00_02097760 @@ -3177,7 +3177,7 @@ _0218be00: .word data_027e0ffc _0218be04: .word 0x00000329 _0218be08: .word data_ov00_020eec68 _0218be0c: .word gItemManager -_0218be10: .word data_027e0f74 +_0218be10: .word gAdventureFlags _0218be14: .word data_027e0fd0 _0218be18: .word data_027e0d04 _0218be1c: .word data_027e0c68 @@ -3519,13 +3519,13 @@ func_ov41_0218c204: ; 0x0218c204 ble _0218c3b0 cmp r1, #0x1800 bge _0218c3b0 - ldr r0, _0218c3c8 ; =data_027e0f74 + ldr r0, _0218c3c8 ; =gAdventureFlags mov r1, #2 ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _0218c3b0 - ldr r0, _0218c3c8 ; =data_027e0f74 + ldr r0, _0218c3c8 ; =gAdventureFlags mov r1, #1 ldr r0, [r0] bl func_ov00_02097760 @@ -3611,7 +3611,7 @@ _0218c3b0: _0218c3bc: .word data_027e0f94 _0218c3c0: .word data_027e0fc8 _0218c3c4: .word 0x0000319a -_0218c3c8: .word data_027e0f74 +_0218c3c8: .word gAdventureFlags _0218c3cc: .word data_027e0fe4 _0218c3d0: .word data_02050f54 @@ -3751,14 +3751,14 @@ _0218c55c: arm_func_start func_ov41_0218c564 func_ov41_0218c564: ; 0x0218c564 stmdb sp!, {r4, lr} - ldr r1, _0218c5dc ; =data_027e0f74 + ldr r1, _0218c5dc ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0xfe bl func_ov00_02097760 cmp r0, #0 beq _0218c5cc - ldr r0, _0218c5dc ; =data_027e0f74 + ldr r0, _0218c5dc ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] bl func_ov00_02097760 @@ -3784,7 +3784,7 @@ _0218c5cc: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov41_0218c564 -_0218c5dc: .word data_027e0f74 +_0218c5dc: .word gAdventureFlags .global func_ov41_0218c5e0 arm_func_start func_ov41_0218c5e0 @@ -3989,7 +3989,7 @@ func_ov41_0218c834: ; 0x0218c834 addne sp, sp, #0x18 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} - ldr r0, _0218cbe0 ; =data_027e0f74 + ldr r0, _0218cbe0 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] bl func_ov00_02097760 @@ -4022,7 +4022,7 @@ func_ov41_0218c834: ; 0x0218c834 bl _ZN5Actor14DistanceToLinkEv cmp r0, #0x2000 ble _0218ca3c - ldr r0, _0218cbe0 ; =data_027e0f74 + ldr r0, _0218cbe0 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] bl func_ov00_02097760 @@ -4219,7 +4219,7 @@ _0218cbd0: .align 2, 0 arm_func_end func_ov41_0218c834 _0218cbdc: .word data_027e0f68 -_0218cbe0: .word data_027e0f74 +_0218cbe0: .word gAdventureFlags _0218cbe4: .word data_027e0fc8 _0218cbe8: .word data_027e0fe4 _0218cbec: .word data_027e0e60 @@ -4283,13 +4283,13 @@ _0218cc70: bl _ZN5Actor16XzDistanceToLinkEv cmp r0, #0x4000 blt _0218ce78 - ldr r0, _0218ce90 ; =data_027e0f74 + ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xfe ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _0218ccf0 - ldr r0, _0218ce90 ; =data_027e0f74 + ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] bl func_ov00_02097760 @@ -4316,13 +4316,13 @@ _0218ccf0: b _0218ce78 _0218cd14: bl func_ov14_021452b0 - ldr r0, _0218ce90 ; =data_027e0f74 + ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xfe ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _0218ce78 - ldr r0, _0218ce90 ; =data_027e0f74 + ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] bl func_ov00_02097760 @@ -4361,7 +4361,7 @@ _0218cda4: blx r1 cmp r0, #0 beq _0218cdf0 - ldr r0, _0218ce90 ; =data_027e0f74 + ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] bl func_ov00_02097760 @@ -4375,13 +4375,13 @@ _0218cde8: mov r1, #2 bl func_ov41_0218c720 _0218cdf0: - ldr r0, _0218ce90 ; =data_027e0f74 + ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xfe ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 beq _0218ce78 - ldr r0, _0218ce90 ; =data_027e0f74 + ldr r0, _0218ce90 ; =gAdventureFlags mov r1, #0xf6 ldr r0, [r0] bl func_ov00_02097760 @@ -4420,7 +4420,7 @@ _0218ce78: .align 2, 0 arm_func_end func_ov41_0218cc28 _0218ce8c: .word 0x00001001 -_0218ce90: .word data_027e0f74 +_0218ce90: .word gAdventureFlags .global func_ov41_0218ce94 arm_func_start func_ov41_0218ce94 diff --git a/asm/ov42.inc b/asm/ov42.inc index e8113ebd..6bc1aa00 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -59,7 +59,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0f94 .extern data_027e0fb8 diff --git a/asm/ov42.s b/asm/ov42.s index 86ebd696..91a89cce 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -2155,7 +2155,7 @@ func_ov42_0218b084: ; 0x0218b084 bl func_ov42_0218b0dc ldmia sp!, {r3, pc} _0218b0a4: - ldr r0, _0218b0d8 ; =data_027e0f74 + ldr r0, _0218b0d8 ; =gAdventureFlags mov r1, #0x1f ldr r0, [r0] bl func_ov00_02097760 @@ -2171,7 +2171,7 @@ _0218b0cc: ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov42_0218b084 -_0218b0d8: .word data_027e0f74 +_0218b0d8: .word gAdventureFlags .global func_ov42_0218b0dc arm_func_start func_ov42_0218b0dc diff --git a/asm/ov43.inc b/asm/ov43.inc index 55a99c8b..b39ab615 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -11,7 +11,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac diff --git a/asm/ov43.s b/asm/ov43.s index ca1cb83d..746c7a03 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -3766,13 +3766,13 @@ _0218c870: and r0, r1, r0 cmp r0, #0x1000000 bne _0218c970 - ldr r0, _0218c9d0 ; =data_027e0f74 + ldr r0, _0218c9d0 ; =gAdventureFlags ldr r1, [r4, #0x218] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 beq _0218c8b0 - ldr r0, _0218c9d0 ; =data_027e0f74 + ldr r0, _0218c9d0 ; =gAdventureFlags ldr r1, [r4, #0x218] ldr r0, [r0] bl func_ov00_02097bcc @@ -3856,7 +3856,7 @@ _0218c9c0: .word 0x00000133 _0218c9c4: .word data_02050f54 _0218c9c8: .word data_027e0ffc _0218c9cc: .word 0x00000327 -_0218c9d0: .word data_027e0f74 +_0218c9d0: .word gAdventureFlags .global func_ov43_0218c9d4 arm_func_start func_ov43_0218c9d4 @@ -3873,7 +3873,7 @@ func_ov43_0218c9d4: ; 0x0218c9d4 arm_func_start func_ov43_0218c9ec func_ov43_0218c9ec: ; 0x0218c9ec stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0218ca50 ; =data_027e0f74 + ldr r2, _0218ca50 ; =gAdventureFlags mov r5, r0 mov r4, r1 ldr r0, [r2] @@ -3902,7 +3902,7 @@ _0218ca44: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov43_0218c9ec -_0218ca50: .word data_027e0f74 +_0218ca50: .word gAdventureFlags .global func_ov43_0218ca54 arm_func_start func_ov43_0218ca54 @@ -4045,7 +4045,7 @@ _0218cb34: ldr r7, [sp, #0x4c] str r1, [sp, #0xdc] ldr r1, [sp, #0x50] - ldr r0, _0218cd2c ; =data_027e0f74 + ldr r0, _0218cd2c ; =gAdventureFlags str r7, [sp, #0xe0] ldr r7, [sp, #0x54] ldrb r6, [sp, #0x60] @@ -4096,7 +4096,7 @@ _0218cd1c: .word 0x50424652 _0218cd20: .word 0x50425a4b _0218cd24: .word data_027e0fc8 _0218cd28: .word data_027e0f64 -_0218cd2c: .word data_027e0f74 +_0218cd2c: .word gAdventureFlags _0218cd30: .word 0x00000333 .global func_ov43_0218cd34 diff --git a/asm/ov45.inc b/asm/ov45.inc index 074a4a45..4a32c10e 100644 --- a/asm/ov45.inc +++ b/asm/ov45.inc @@ -20,7 +20,7 @@ .extern data_027e0e28 .extern data_027e0e58 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f94 .extern data_027e0fb8 .extern data_027e0fc8 diff --git a/asm/ov45.s b/asm/ov45.s index d114ff09..7c07050c 100644 --- a/asm/ov45.s +++ b/asm/ov45.s @@ -213,7 +213,7 @@ func_ov45_02189764: ; 0x02189764 ldr r1, [r4, #0x50] str r1, [r4, #0x488] bl func_ov45_02189938 - ldr r0, _0218988c ; =data_027e0f74 + ldr r0, _0218988c ; =gAdventureFlags ldr r1, _02189890 ; =0x0000010a ldr r0, [r0] bl func_ov00_02097760 @@ -246,7 +246,7 @@ _0218987c: .word func_ov45_02189594 _02189880: .word data_ov45_0218e278 _02189884: .word data_ov45_0218e4c0 _02189888: .word data_ov45_0218e4c4 -_0218988c: .word data_027e0f74 +_0218988c: .word gAdventureFlags _02189890: .word 0x0000010a _02189894: .word data_027e0fb8 @@ -1714,7 +1714,7 @@ func_ov45_0218aaf8: ; 0x0218aaf8 ldrb r0, [r4, #0x2a1] cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0218ab48 ; =data_027e0f74 + ldr r0, _0218ab48 ; =gAdventureFlags mov r1, #0x15 ldr r0, [r0] bl func_ov00_02097760 @@ -1731,7 +1731,7 @@ func_ov45_0218aaf8: ; 0x0218aaf8 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov45_0218aaf8 -_0218ab48: .word data_027e0f74 +_0218ab48: .word gAdventureFlags .global func_ov45_0218ab4c arm_func_start func_ov45_0218ab4c @@ -2245,7 +2245,7 @@ _0218b0f8: arm_func_start func_ov45_0218b100 func_ov45_0218b100: ; 0x0218b100 stmdb sp!, {r4, lr} - ldr r1, _0218b130 ; =data_027e0f74 + ldr r1, _0218b130 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x15 @@ -2258,7 +2258,7 @@ func_ov45_0218b100: ; 0x0218b100 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov45_0218b100 -_0218b130: .word data_027e0f74 +_0218b130: .word gAdventureFlags .global func_ov45_0218b134 arm_func_start func_ov45_0218b134 diff --git a/asm/ov46.inc b/asm/ov46.inc index a9574031..bfac6810 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -17,7 +17,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f94 .extern data_027e0fc8 .extern data_027e0fcc diff --git a/asm/ov46.s b/asm/ov46.s index 316007e2..90459ad0 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -1598,7 +1598,7 @@ _02191454: strb r0, [r4, #0x4d4] add r0, r4, #0x400 mov r2, #0 - ldr r1, _0219157c ; =data_027e0f74 + ldr r1, _0219157c ; =gAdventureFlags strh r2, [r0, #0xd2] ldr r0, [r1] ldr r1, _02191580 ; =0x00000125 @@ -1665,7 +1665,7 @@ _0219156c: .word data_027e103c _02191570: .word data_027e1054 _02191574: .word data_ov00_020eec60 _02191578: .word data_027e0ffc -_0219157c: .word data_027e0f74 +_0219157c: .word gAdventureFlags _02191580: .word 0x00000125 _02191584: .word data_ov00_020eec9c _02191588: .word data_027e0c68 @@ -2542,7 +2542,7 @@ func_ov46_02192138: ; 0x02192138 ldreqh r0, [r5, #0x22] cmpeq r0, #3 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _021921b0 ; =data_027e0f74 + ldr r0, _021921b0 ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] bl func_ov00_02097760 @@ -2556,7 +2556,7 @@ func_ov46_02192138: ; 0x02192138 .align 2, 0 arm_func_end func_ov46_02192138 _021921ac: .word data_ov46_02194478 -_021921b0: .word data_027e0f74 +_021921b0: .word gAdventureFlags .global func_ov46_021921b4 arm_func_start func_ov46_021921b4 @@ -2669,7 +2669,7 @@ _021922fc: str r0, [r4, #0x39c] b _02192368 _02192310: - ldr r0, _02192408 ; =data_027e0f74 + ldr r0, _02192408 ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] bl func_ov00_02097760 @@ -2704,7 +2704,7 @@ _02192378: ; jump table b _021923a8 ; case 2 b _02192388 ; case 3 _02192388: - ldr r0, _02192408 ; =data_027e0f74 + ldr r0, _02192408 ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] bl func_ov00_02097760 @@ -2741,7 +2741,7 @@ _021923f8: .word data_ov46_0219443c _021923fc: .word data_ov46_02194a64 _02192400: .word data_ov46_02194a68 _02192404: .word 0x00001001 -_02192408: .word data_027e0f74 +_02192408: .word gAdventureFlags _0219240c: .word data_027e0dbc .global func_ov46_02192410 @@ -2766,7 +2766,7 @@ func_ov46_02192434: ; 0x02192434 ldrh r0, [r4, #0x22] cmp r0, #3 bne _021924a8 - ldr r0, _021924f4 ; =data_027e0f74 + ldr r0, _021924f4 ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] bl func_ov00_02097760 @@ -2817,7 +2817,7 @@ _021924d8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov46_02192434 -_021924f4: .word data_027e0f74 +_021924f4: .word gAdventureFlags _021924f8: .word 0x00001001 _021924fc: .word data_027e0c68 @@ -2832,7 +2832,7 @@ func_ov46_02192500: ; 0x02192500 beq _02192538 cmp r0, #3 ldmneia sp!, {r4, pc} - ldr r0, _0219254c ; =data_027e0f74 + ldr r0, _0219254c ; =gAdventureFlags mov r1, #0xa8 ldr r0, [r0] bl func_ov00_02097760 @@ -2846,7 +2846,7 @@ _02192538: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov46_02192500 -_0219254c: .word data_027e0f74 +_0219254c: .word gAdventureFlags _02192550: .word 0x0000038e .global func_ov46_02192554 diff --git a/asm/ov49.inc b/asm/ov49.inc index 7085bcb1..fa9f665f 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -14,7 +14,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fc8 diff --git a/asm/ov49.s b/asm/ov49.s index 6b804fd2..6fb35e3f 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -3119,7 +3119,7 @@ _02197e70: bl func_ov49_02198040 ldmia sp!, {r4, pc} _02197ed0: - ldr r0, _02197f00 ; =data_027e0f74 + ldr r0, _02197f00 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097b9c @@ -3133,7 +3133,7 @@ _02197ed0: .align 2, 0 arm_func_end func_ov49_02197e10 _02197efc: .word data_027e0fc8 -_02197f00: .word data_027e0f74 +_02197f00: .word gAdventureFlags .global func_ov49_02197f04 arm_func_start func_ov49_02197f04 @@ -3161,13 +3161,13 @@ _02197f3c: blx r2 ldmia sp!, {r3, r4, r5, pc} _02197f54: - ldr r0, _02198034 ; =data_027e0f74 + ldr r0, _02198034 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _02198034 ; =data_027e0f74 + ldr r0, _02198034 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0xf @@ -3178,13 +3178,13 @@ _02197f54: bl func_ov49_02198040 ldmia sp!, {r3, r4, r5, pc} _02197f94: - ldr r0, _02198034 ; =data_027e0f74 + ldr r0, _02198034 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097b9c cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _02198034 ; =data_027e0f74 + ldr r0, _02198034 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x3c @@ -3200,7 +3200,7 @@ _02197fd4: bl func_ov00_020d7d18 ldmia sp!, {r3, r4, r5, pc} _02197fe4: - ldr r0, _02198034 ; =data_027e0f74 + ldr r0, _02198034 ; =gAdventureFlags ldr r1, [r4, #0x158] ldr r0, [r0] bl func_ov00_02097b9c @@ -3212,7 +3212,7 @@ _02197fe4: bl func_ov49_02198040 ldmia sp!, {r3, r4, r5, pc} _02198010: - ldr r0, _02198034 ; =data_027e0f74 + ldr r0, _02198034 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02098058 cmp r0, #0x78 @@ -3223,7 +3223,7 @@ _02198010: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov49_02197f04 -_02198034: .word data_027e0f74 +_02198034: .word gAdventureFlags _02198038: .word data_ov00_020eec9c _0219803c: .word 0x0000048f @@ -3248,7 +3248,7 @@ _02198074: add r0, sp, #0 bl func_ov00_0209a4f4 mov r2, #0 - ldr r0, _02198150 ; =data_027e0f74 + ldr r0, _02198150 ; =gAdventureFlags mov ip, #0x96 mov r3, #0x32 ldr r0, [r0] @@ -3307,7 +3307,7 @@ _02198144: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov49_02198040 -_02198150: .word data_027e0f74 +_02198150: .word gAdventureFlags _02198154: .word data_027e0f64 _02198158: .word data_027e0fc8 _0219815c: .word data_ov00_020eec9c @@ -3335,7 +3335,7 @@ func_ov49_02198184: ; 0x02198184 ldrh r1, [r4, #0x22] cmp r1, #0 beq _021981b0 - ldr r0, _021981dc ; =data_027e0f74 + ldr r0, _021981dc ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 @@ -3356,7 +3356,7 @@ _021981d4: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov49_02198184 -_021981dc: .word data_027e0f74 +_021981dc: .word gAdventureFlags .rodata .global data_ov49_021981e0 diff --git a/asm/ov50.inc b/asm/ov50.inc index 232a480d..7a4b5226 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -70,7 +70,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0f94 .extern data_027e0fac diff --git a/asm/ov50.s b/asm/ov50.s index 0d8542c4..10a0202e 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -691,7 +691,7 @@ _02195e40: add sp, sp, #0x3c ldmia sp!, {r3, r4, r5, r6, pc} _02195e54: - ldr r0, _021960ac ; =data_027e0f74 + ldr r0, _021960ac ; =gAdventureFlags ldr r1, [r5, #0x178] ldr r0, [r0] bl func_ov00_02097b9c @@ -855,7 +855,7 @@ _0219609c: arm_func_end func_ov50_02195ce8 _021960a4: .word data_027e0fc8 _021960a8: .word 0x00001333 -_021960ac: .word data_027e0f74 +_021960ac: .word gAdventureFlags _021960b0: .word data_027e0f64 _021960b4: .word 0x00000266 _021960b8: .word data_027e0e58 @@ -958,7 +958,7 @@ _02196200: mvn r4, #0 mov r3, #0x1e mov r1, #0 - ldr r0, _021963ec ; =data_027e0f74 + ldr r0, _021963ec ; =gAdventureFlags str r4, [sp, #0x10] strb r3, [sp, #0x15] strb r2, [sp, #0x16] @@ -1038,7 +1038,7 @@ _021962e4: ldr r1, [r5, #0x178] cmp r1, #0 blt _02196358 - ldr r0, _021963ec ; =data_027e0f74 + ldr r0, _021963ec ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097bcc mvn r0, #0 @@ -1086,7 +1086,7 @@ _021963dc: .word data_027e0ffc _021963e0: .word 0x00000396 _021963e4: .word data_027e0e60 _021963e8: .word data_027e0fc8 -_021963ec: .word data_027e0f74 +_021963ec: .word gAdventureFlags .global func_ov50_021963f0 arm_func_start func_ov50_021963f0 diff --git a/asm/ov52.inc b/asm/ov52.inc index a978b5a0..755846dc 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -64,7 +64,7 @@ .extern data_027e0e58 .extern data_027e0e60 .extern data_027e0f68 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f78 .extern data_027e0fa0 .extern data_027e0fb8 diff --git a/asm/ov52.s b/asm/ov52.s index 83038bf5..987c00ca 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -91,12 +91,12 @@ func_ov52_021955e4: ; 0x021955e4 ldrb r0, [r0, #0x14] cmp r0, #1 ldmneia sp!, {r3, pc} - ldr r0, _02195640 ; =data_027e0f74 + ldr r0, _02195640 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _02195640 ; =data_027e0f74 + ldr r0, _02195640 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097750 cmp r0, #0 @@ -112,7 +112,7 @@ func_ov52_021955e4: ; 0x021955e4 ldmia sp!, {r3, pc} .align 2, 0 arm_func_end func_ov52_021955e4 -_02195640: .word data_027e0f74 +_02195640: .word gAdventureFlags _02195644: .word data_ov52_02197c40 _02195648: .word 0x00002328 @@ -335,7 +335,7 @@ func_ov52_02195870: ; 0x02195870 stmdb sp!, {r4, lr} mov r4, r0 bl func_ov52_02195b5c - ldr r0, _0219589c ; =data_027e0f74 + ldr r0, _0219589c ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] mov r2, #1 @@ -345,7 +345,7 @@ func_ov52_02195870: ; 0x02195870 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov52_02195870 -_0219589c: .word data_027e0f74 +_0219589c: .word gAdventureFlags .global func_ov52_021958a0 arm_func_start func_ov52_021958a0 @@ -386,7 +386,7 @@ _02195904: .word data_ov52_02197c40 func_ov52_02195908: ; 0x02195908 stmdb sp!, {r4, lr} sub sp, sp, #0x18 - ldr r1, _02195a04 ; =data_027e0f74 + ldr r1, _02195a04 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x100 @@ -449,7 +449,7 @@ func_ov52_02195908: ; 0x02195908 ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov52_02195908 -_02195a04: .word data_027e0f74 +_02195a04: .word gAdventureFlags _02195a08: .word data_027e0e60 _02195a0c: .word gOverlayManager _02195a10: .word 0x00000004 @@ -624,7 +624,7 @@ _02195c5c: ldr r0, [r0, #0x130] cmp r0, #6 ldmneia sp!, {r4, pc} - ldr r0, _02195d24 ; =data_027e0f74 + ldr r0, _02195d24 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -676,7 +676,7 @@ _02195d14: .word data_ov52_02197c70 _02195d18: .word data_ov00_020eec9c _02195d1c: .word 0x000003fd _02195d20: .word data_027e0e60 -_02195d24: .word data_027e0f74 +_02195d24: .word gAdventureFlags _02195d28: .word data_ov00_020eec68 .global func_ov52_02195d2c @@ -733,7 +733,7 @@ func_ov52_02195da0: ; 0x02195da0 cmp r0, #0 addne sp, sp, #0x3c ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} - ldr r0, _02196108 ; =data_027e0f74 + ldr r0, _02196108 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -950,7 +950,7 @@ _02195ff8: .align 2, 0 arm_func_end func_ov52_02195da0 _02196104: .word data_027e0618 -_02196108: .word data_027e0f74 +_02196108: .word gAdventureFlags _0219610c: .word data_ov52_02197c70 _02196110: .word data_ov00_020eec9c @@ -1010,13 +1010,13 @@ func_ov52_02196198: ; 0x02196198 ldr r1, _021963f8 ; =0x0000041a cmp r0, r1 bhi _02196294 - ldr r0, _021963fc ; =data_027e0f74 + ldr r0, _021963fc ; =gAdventureFlags ldr r1, _02196400 ; =0x0000011d ldr r0, [r0] bl func_ov00_02097760 cmp r0, #0 bne _021961e4 - ldr r0, _021963fc ; =data_027e0f74 + ldr r0, _021963fc ; =gAdventureFlags ldr r1, _02196400 ; =0x0000011d ldr r0, [r0] mov r2, #1 @@ -1167,7 +1167,7 @@ _021963ec: .align 2, 0 arm_func_end func_ov52_02196198 _021963f8: .word 0x0000041a -_021963fc: .word data_027e0f74 +_021963fc: .word gAdventureFlags _02196400: .word 0x0000011d _02196404: .word data_027e0764 _02196408: .word data_ov52_02197888 @@ -2015,7 +2015,7 @@ _02196ea4: .word data_ov52_02197c74 func_ov52_02196ea8: ; 0x02196ea8 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x7c - ldr r1, _0219706c ; =data_027e0f74 + ldr r1, _0219706c ; =gAdventureFlags mov r4, r0 ldr r0, [r1] mov r1, #0x9f @@ -2063,7 +2063,7 @@ func_ov52_02196ea8: ; 0x02196ea8 add r3, sp, #0x50 bl func_ov00_020c4048 _02196f6c: - ldr r0, _0219706c ; =data_027e0f74 + ldr r0, _0219706c ; =gAdventureFlags mov r1, #0x100 ldr r0, [r0] bl func_ov00_02097760 @@ -2132,7 +2132,7 @@ _0219705c: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov52_02196ea8 -_0219706c: .word data_027e0f74 +_0219706c: .word gAdventureFlags _02197070: .word data_ov52_021978c8 _02197074: .word data_027e0fe8 _02197078: .word 0x4d544354 @@ -2369,7 +2369,7 @@ func_ov52_02197330: ; 0x02197330 cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, pc} - ldr r0, _021973b0 ; =data_027e0f74 + ldr r0, _021973b0 ; =gAdventureFlags mov r1, #0x9e ldr r0, [r0] bl func_ov00_02097760 @@ -2384,7 +2384,7 @@ _021973a0: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov52_02197330 -_021973b0: .word data_027e0f74 +_021973b0: .word gAdventureFlags _021973b4: .word data_ov09_0211f5b4 .global func_ov52_021973b8 @@ -2435,7 +2435,7 @@ func_ov52_021973f8: ; 0x021973f8 ldrb r0, [r0, #0x10] cmp r0, #0 beq _02197480 - ldr r0, _02197490 ; =data_027e0f74 + ldr r0, _02197490 ; =gAdventureFlags mov r1, #0x9e ldr r0, [r0] bl func_ov00_02097760 @@ -2452,7 +2452,7 @@ _02197480: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov52_021973f8 -_02197490: .word data_027e0f74 +_02197490: .word gAdventureFlags _02197494: .word data_ov09_0211f5b4 .global func_ov52_02197498 @@ -2501,7 +2501,7 @@ func_ov52_021974e0: ; 0x021974e0 cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, pc} - ldr r0, _02197560 ; =data_027e0f74 + ldr r0, _02197560 ; =gAdventureFlags mov r1, #0x9e ldr r0, [r0] bl func_ov00_02097760 @@ -2516,7 +2516,7 @@ _02197550: ldmia sp!, {r3, r4, pc} .align 2, 0 arm_func_end func_ov52_021974e0 -_02197560: .word data_027e0f74 +_02197560: .word gAdventureFlags _02197564: .word data_ov09_0211f5b4 .global func_ov52_02197568 @@ -2531,7 +2531,7 @@ func_ov52_02197568: ; 0x02197568 ldrb r0, [r4, #0x4a4] cmp r0, #0 bne _021975a8 - ldr r0, _021975b4 ; =data_027e0f74 + ldr r0, _021975b4 ; =gAdventureFlags mov r1, #0x9f ldr r0, [r0] bl func_ov00_02097760 @@ -2544,7 +2544,7 @@ _021975a8: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov52_02197568 -_021975b4: .word data_027e0f74 +_021975b4: .word gAdventureFlags _021975b8: .word 0x00870006 .global func_ov52_021975bc diff --git a/asm/ov55.inc b/asm/ov55.inc index 3bf6ad00..36ec77f7 100644 --- a/asm/ov55.inc +++ b/asm/ov55.inc @@ -22,7 +22,7 @@ .extern data_027e0c54 .extern data_027e0e60 .extern data_027e0f64 -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f90 .extern data_027e0fb8 .extern data_027e0fcc diff --git a/asm/ov55.s b/asm/ov55.s index d53dfb29..51f3b14a 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -660,7 +660,7 @@ _021994d4: str r1, [sp, #0x100] ldr r1, [sp, #0x78] str r0, [sp, #0x110] - ldr r0, _0219964c ; =data_027e0f74 + ldr r0, _0219964c ; =gAdventureFlags ldrb r5, [sp, #0x84] ldrb lr, [sp, #0x85] ldrb ip, [sp, #0x86] @@ -713,7 +713,7 @@ _0219963c: .word data_027e0c54 _02199640: .word data_027e0e60 _02199644: .word 0x0000105b _02199648: .word 0x0000038e -_0219964c: .word data_027e0f74 +_0219964c: .word gAdventureFlags _02199650: .word data_027e103c .global func_ov55_02199654 @@ -721,7 +721,7 @@ _02199650: .word data_027e103c func_ov55_02199654: ; 0x02199654 stmdb sp!, {r4, lr} sub sp, sp, #0x68 - ldr r1, _02199794 ; =data_027e0f74 + ldr r1, _02199794 ; =gAdventureFlags mov r4, r0 ldr r0, [r1] ldr r1, [r4, #0x5c] @@ -757,7 +757,7 @@ _021996d4: bl _ZN13LinkStateBase18func_ov00_020a8b3cEi cmp r0, #0 beq _02199714 - ldr r0, _02199794 ; =data_027e0f74 + ldr r0, _02199794 ; =gAdventureFlags ldr r1, [r4, #0x5c] ldr r0, [r0] bl func_ov00_02097bcc @@ -806,7 +806,7 @@ _02199784: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_ov55_02199654 -_02199794: .word data_027e0f74 +_02199794: .word gAdventureFlags _02199798: .word data_027e0f64 _0219979c: .word 0x00000e39 _021997a0: .word data_ov55_02199890 diff --git a/asm/ov57.inc b/asm/ov57.inc index c01269b7..879d210b 100644 --- a/asm/ov57.inc +++ b/asm/ov57.inc @@ -27,7 +27,7 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f6c -.extern data_027e0f74 +.extern gAdventureFlags .extern data_027e0f94 .extern data_027e0fb8 .extern data_027e0fc8 diff --git a/asm/ov57.s b/asm/ov57.s index d3fc7f1d..1aceef73 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -1033,7 +1033,7 @@ _02199a44: cmp r4, #0 addne sp, sp, #0x74 ldmneia sp!, {r4, r5, pc} - ldr r0, _02199ac8 ; =data_027e0f74 + ldr r0, _02199ac8 ; =gAdventureFlags ldr r0, [r0] bl func_ov00_02097738 cmp r0, #0 @@ -1065,7 +1065,7 @@ _02199a44: _02199abc: .word data_ov57_0219a994 _02199ac0: .word data_02050f54 _02199ac4: .word data_027e03c8 -_02199ac8: .word data_027e0f74 +_02199ac8: .word gAdventureFlags _02199acc: .word data_027e0de4 _02199ad0: .word func_ov57_021990ec _02199ad4: .word func_ov57_021990f8